From f6e5ea8a2c0872acd83b98dd37e32f28006407b7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 23 Jan 2023 22:58:03 +0100 Subject: [PATCH 1/8] documentation-highlighter: Only depend on needed files Makes the build independency of the default.nix and update.sh file by explicitly specifying the files that are needed in the result This allows changing those files without causing a rebuild --- pkgs/misc/documentation-highlighter/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 2a34e36742d57..22ea3a5f86e37 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -7,6 +7,16 @@ runCommand "documentation-highlighter" { platforms = lib.platforms.all; maintainers = [ lib.maintainers.grahamc ]; }; + src = lib.sources.cleanSourceWith { + src = ./.; + filter = path: type: lib.elem path (map toString [ + ./highlight.pack.js + ./LICENSE + ./loader.js + ./mono-blue.css + ./README.md + ]); + }; } '' - cp -r ${./.} $out + cp -r "$src" "$out" '' From d66bed8856ef0a9184a4775242df74e0402abca4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 23 Jan 2023 22:59:27 +0100 Subject: [PATCH 2/8] zsh-clipboard: Make independent of Nix file This way, changing the Nix file won't change the derivation --- pkgs/shells/zsh/zsh-clipboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/shells/zsh/zsh-clipboard/default.nix index eb395d7447284..fce8f26dd0308 100644 --- a/pkgs/shells/zsh/zsh-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-clipboard/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "zsh-clipboard"; version = "1.0"; - src = ./.; + dontUnpack = true; strictDeps = true; dontBuild = true; installPhase = '' - install -D -m0444 -t $out/share/zsh/plugins/clipboard ./clipboard.plugin.zsh + install -D -m0444 -T ${./clipboard.plugin.zsh} $out/share/zsh/plugins/clipboard/clipboard.plugin.zsh ''; meta = with lib; { From b0b8993bbd049aa8a1b7643351582e0e2c4bc600 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 17 Jan 2023 04:13:08 +0100 Subject: [PATCH 3/8] Implement unit directory reading --- pkgs/top-level/stage.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index e5412c409ed57..6902677b097fe 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -8,7 +8,15 @@ arguments. Normal users should not import this directly but instead import `pkgs/default.nix` or `default.nix`. */ - +let + # Cache mapping from attributes to unit directories up here so it can get + # reused every time this file is called + unitDirs = builtins.foldl' (result: shard: + result // builtins.mapAttrs (name: type: + ../unit + "/${shard}/${name}/pkg-fun.nix" + ) (builtins.readDir (../unit + "/${shard}")) + ) {} (builtins.attrNames (builtins.readDir ../unit)); +in { ## Misc parameters kept the same for all stages ## @@ -269,6 +277,9 @@ let }); }; + + unitPackages = self: super: lib.mapAttrs (name: file: self.callPackage file {}) unitDirs; + # The complete chain of package set builders, applied from top to bottom. # stdenvOverlays must be last as it brings package forward from the # previous bootstrapping phases which have already been overlayed. @@ -277,6 +288,7 @@ let stdenvAdapters trivialBuilders splice + unitPackages allPackages otherPackageSets aliases From 24ce47888a3cd9e52ba77b716ab7f52b531f2557 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 24 Jan 2023 00:59:57 +0100 Subject: [PATCH 4/8] Run automatic migration Using https://github.com/nixpkgs-architecture/nix-spp/commit/94a4f56ed13c1354c57369ebf7c2f8c014c30f6a --- pkgs/top-level/all-packages.nix | 21667 +--------------- .../_0/_0verkill/pkg-fun.nix} | 0 .../0x => unit/_0/_0x}/add-Cargo-lock.diff | 0 .../default.nix => unit/_0/_0x/pkg-fun.nix} | 0 .../default.nix => unit/_1/_1oom/pkg-fun.nix} | 0 .../_1/_1password/pkg-fun.nix} | 0 .../_2/_2048-in-terminal/pkg-fun.nix} | 0 .../_2/_20kly/pkg-fun.nix} | 0 .../_3/_3270font/pkg-fun.nix} | 0 .../_3/_389-ds-base/pkg-fun.nix} | 0 .../misc/3llo => unit/_3/_3llo}/Gemfile | 0 .../misc/3llo => unit/_3/_3llo}/Gemfile.lock | 0 .../misc/3llo => unit/_3/_3llo}/gemset.nix | 0 .../default.nix => unit/_3/_3llo/pkg-fun.nix} | 0 .../default.nix => unit/_3/_3mux/pkg-fun.nix} | 0 .../_3/_3proxy/pkg-fun.nix} | 0 .../_4/_4th}/001-install-manual-fixup.diff | 0 .../default.nix => unit/_4/_4th/pkg-fun.nix} | 0 .../default.nix => unit/_4/_4ti2/pkg-fun.nix} | 0 .../_6/_6tunnel/pkg-fun.nix} | 0 .../default.nix => unit/_7/_7kaa/pkg-fun.nix} | 0 .../_9/_915resolution/pkg-fun.nix} | 0 .../_9/_9menu/pkg-fun.nix} | 0 .../_9/_9pfs}/fix-darwin-build.patch | 0 .../default.nix => unit/_9/_9pfs/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../a2/a2jmidid/pkg-fun.nix} | 0 .../default.nix => unit/a2/a2ps/pkg-fun.nix} | 0 .../a5/a52dec/pkg-fun.nix} | 0 .../default.nix => unit/aa/aaa/pkg-fun.nix} | 0 .../aa/aacgain/pkg-fun.nix} | 0 .../libraries => unit/aa}/aalib/darwin.patch | 0 .../default.nix => unit/aa/aalib/pkg-fun.nix} | 0 .../aa/aaphoto/pkg-fun.nix} | 0 .../aa/aardvark-dns/pkg-fun.nix} | 0 .../aa/aaxtomp3/pkg-fun.nix} | 0 .../ab/abbaye-des-morts/pkg-fun.nix} | 0 .../ab/abc-verifier/pkg-fun.nix} | 0 .../default.nix => unit/ab/abcl/pkg-fun.nix} | 0 .../ab/abcm2ps/pkg-fun.nix} | 0 .../ab/abcmidi/pkg-fun.nix} | 0 .../ab/abduco/pkg-fun.nix} | 0 .../ab/abi-compliance-checker/pkg-fun.nix} | 0 .../ab/abi-dumper/pkg-fun.nix} | 0 .../ab/abiword/pkg-fun.nix} | 0 .../default.nix => unit/ab/ablog/pkg-fun.nix} | 0 .../default.nix => unit/ab/abook/pkg-fun.nix} | 0 .../ab/abootimg/pkg-fun.nix} | 0 .../ab/abseil-cpp_202103/pkg-fun.nix} | 0 .../ab/abseil-cpp_202111/pkg-fun.nix} | 0 .../ab/abseil-cpp_202206/pkg-fun.nix} | 0 .../ab/abuild/pkg-fun.nix} | 0 pkgs/{games => unit/ab}/abuse/abuse.sh | 0 .../default.nix => unit/ab/abuse/pkg-fun.nix} | 0 .../ac/accelergy/pkg-fun.nix} | 0 ...ble-methods-that-change-files-in-etc.patch | 0 .../drop-prefix-check-extensions.patch | 0 .../ac}/accountsservice/fix-paths.patch | 0 .../ac}/accountsservice/no-create-dirs.patch | 0 .../ac/accountsservice/pkg-fun.nix} | 0 .../default.nix => unit/ac/acct/pkg-fun.nix} | 0 .../ac/accuraterip-checksum/pkg-fun.nix} | 0 .../fixup-miscompilations.patch | 0 .../ac/ace-of-penguins/pkg-fun.nix} | 0 .../default.nix => unit/ac/ace/pkg-fun.nix} | 0 .../default.nix => unit/ac/acgtk/pkg-fun.nix} | 0 .../default.nix => unit/ac/acl/pkg-fun.nix} | 0 .../ac/acme-sh/pkg-fun.nix} | 0 .../default.nix => unit/ac/acme/pkg-fun.nix} | 0 .../default.nix => unit/ac/acorn/pkg-fun.nix} | 0 .../ac/acousticbrainz-client/pkg-fun.nix} | 0 .../ac/acoustidFingerprinter/pkg-fun.nix} | 0 .../default.nix => unit/ac/acpi/pkg-fun.nix} | 0 .../ac/acpica-tools/pkg-fun.nix} | 0 .../default.nix => unit/ac/acpid/pkg-fun.nix} | 0 .../ac/acpilight/pkg-fun.nix} | 0 .../ac/acpitool/pkg-fun.nix} | 0 .../default.nix => unit/ac/acr/pkg-fun.nix} | 0 .../ac/acsccid/pkg-fun.nix} | 0 .../default.nix => unit/ac/act/pkg-fun.nix} | 0 .../ac/actionlint/pkg-fun.nix} | 0 .../ac/activate-linux/pkg-fun.nix} | 0 .../ac/activemq/pkg-fun.nix} | 0 .../ac/actkbd/pkg-fun.nix} | 0 .../ad/adafruit-ampy/pkg-fun.nix} | 0 .../ad/adapta-backgrounds/pkg-fun.nix} | 0 .../ad/adapta-gtk-theme/pkg-fun.nix} | 0 .../ad/adapta-kde-theme/pkg-fun.nix} | 0 .../default.nix => unit/ad/adcli/pkg-fun.nix} | 0 .../ad/addOpenGLRunpath/pkg-fun.nix} | 0 .../ad/addOpenGLRunpath}/setup-hook.sh | 0 .../ad/addic7ed-cli/pkg-fun.nix} | 0 .../ad/addlicense/pkg-fun.nix} | 0 .../ad/adementary-theme/pkg-fun.nix} | 0 .../ad/adenum/pkg-fun.nix} | 0 .../{servers => unit/ad}/adguardhome/bins.nix | 0 .../ad/adguardhome/pkg-fun.nix} | 0 .../ad}/adguardhome/update.sh | 0 .../default.nix => unit/ad/adl/pkg-fun.nix} | 0 .../ad/adminer/pkg-fun.nix} | 0 .../default.nix => unit/ad/adms/pkg-fun.nix} | 0 .../default.nix => unit/ad/adns/pkg-fun.nix} | 0 .../default.nix => unit/ad/adolc/pkg-fun.nix} | 0 .../default.nix => unit/ad/adom/pkg-fun.nix} | 0 .../ad/adreaper/pkg-fun.nix} | 0 .../ad/adrgen/pkg-fun.nix} | 0 .../ad/adriconf/pkg-fun.nix} | 0 .../ad/adslib/pkg-fun.nix} | 0 .../ad/adtool/pkg-fun.nix} | 0 .../ad/advancecomp/pkg-fun.nix} | 0 .../ad/adw-gtk3/pkg-fun.nix} | 0 .../default.nix => unit/ae/aefs/pkg-fun.nix} | 0 .../ae/aeolus/pkg-fun.nix} | 0 .../default.nix => unit/ae/aerc/pkg-fun.nix} | 0 .../ae}/aerc/runtime-sharedir.patch | 0 .../ae/aerospike/pkg-fun.nix} | 0 .../ae/aescrypt/pkg-fun.nix} | 0 .../ae/aesfix/pkg-fun.nix} | 0 .../ae/aeskeyfind/pkg-fun.nix} | 0 .../ae/aespipe/pkg-fun.nix} | 0 .../ae/aether-lv2/pkg-fun.nix} | 0 .../ae/aether/pkg-fun.nix} | 0 .../default.nix => unit/ae/aewan/pkg-fun.nix} | 0 .../af/afetch/pkg-fun.nix} | 0 .../default.nix => unit/af/afew/pkg-fun.nix} | 0 .../af/afflib/pkg-fun.nix} | 0 .../afio/0001-makefile-fix-installation.patch | 0 .../default.nix => unit/af/afio/pkg-fun.nix} | 0 .../af/afpfs-ng/pkg-fun.nix} | 0 .../default.nix => unit/af/aften/pkg-fun.nix} | 0 .../af}/aften/simd-fallback.patch | 0 .../af/afterburn/pkg-fun.nix} | 0 .../default.nix => unit/af/afuse/pkg-fun.nix} | 0 .../default.nix => unit/ag/agave/pkg-fun.nix} | 0 .../ag/agda-pkg/pkg-fun.nix} | 0 .../default.nix => unit/ag/age/pkg-fun.nix} | 0 .../ag/agebox/pkg-fun.nix} | 0 .../default.nix => unit/ag/agedu/pkg-fun.nix} | 0 .../ag/agenda/pkg-fun.nix} | 0 .../default.nix => unit/ag/agg/pkg-fun.nix} | 0 .../default.nix => unit/ag/agi/pkg-fun.nix} | 0 .../ag/agkozak-zsh-prompt/pkg-fun.nix} | 0 .../default.nix => unit/ag/agola/pkg-fun.nix} | 0 .../default.nix => unit/ag/agrep/pkg-fun.nix} | 0 .../default.nix => unit/ah/aha/pkg-fun.nix} | 0 .../default.nix => unit/ah/ahcpd/pkg-fun.nix} | 0 .../ah/ahoviewer/pkg-fun.nix} | 0 .../default.nix => unit/ai/aide/pkg-fun.nix} | 0 .../default.nix => unit/ai/aiger/pkg-fun.nix} | 0 .../ai/aileron/pkg-fun.nix} | 0 .../default.nix => unit/ai/air/pkg-fun.nix} | 0 .../ai/aircrack-ng/pkg-fun.nix} | 0 .../ai/airgeddon/pkg-fun.nix} | 0 .../ai/airshipper/pkg-fun.nix} | 0 .../ai/airsonic/pkg-fun.nix} | 0 .../ai/airspy/pkg-fun.nix} | 0 .../ai/airspyhf/pkg-fun.nix} | 0 .../ai/airstrike/pkg-fun.nix} | 0 .../ai/airwave/pkg-fun.nix} | 0 .../ai/airwindows-lv2/pkg-fun.nix} | 0 .../ai/aixlog/pkg-fun.nix} | 0 .../aj/aj-snapshot/pkg-fun.nix} | 0 .../ak/akira-unstable/pkg-fun.nix} | 0 pkgs/{servers => unit/ak}/akkoma/mix.nix | 0 .../ak/akkoma/pkg-fun.nix} | 0 .../ak}/akku/hardcode-libcurl.patch | 0 .../default.nix => unit/ak/akku/pkg-fun.nix} | 0 .../default.nix => unit/al/alan/pkg-fun.nix} | 0 .../alan/2.nix => unit/al/alan_2/pkg-fun.nix} | 0 .../default.nix => unit/al/alass/pkg-fun.nix} | 0 .../al/albatross/pkg-fun.nix} | 0 .../al/alchemy/pkg-fun.nix} | 0 .../default.nix => unit/al/alda/pkg-fun.nix} | 0 .../default.nix => unit/al/aldo/pkg-fun.nix} | 0 .../al/alegreya-sans/pkg-fun.nix} | 0 .../al/alegreya/pkg-fun.nix} | 0 .../al/alejandra/pkg-fun.nix} | 0 .../al/alembic/pkg-fun.nix} | 0 .../al/alephone-durandal/pkg-fun.nix} | 0 .../al/alephone-eternal/pkg-fun.nix} | 0 .../al/alephone-evil/pkg-fun.nix} | 0 .../al/alephone-infinity/pkg-fun.nix} | 0 .../al/alephone-marathon/pkg-fun.nix} | 0 .../al/alephone-pheonix/pkg-fun.nix} | 0 .../al/alephone-red/pkg-fun.nix} | 0 .../al/alephone-rubicon-x/pkg-fun.nix} | 0 .../al/alephone/pkg-fun.nix} | 0 .../al/alerta-server/pkg-fun.nix} | 0 .../client.nix => unit/al/alerta/pkg-fun.nix} | 0 .../al/alertmanager-bot/pkg-fun.nix} | 0 .../al/alertmanager-irc-relay/pkg-fun.nix} | 0 .../al/alfaview/pkg-fun.nix} | 0 .../al}/alglib/patch-alglib-CMakeLists.patch | 0 .../al/alglib/pkg-fun.nix} | 0 .../algol68g/0001-plotutils-png-support.diff | 0 .../al/algol68g/pkg-fun.nix} | 0 .../default.nix => unit/al/alice/pkg-fun.nix} | 0 .../al/alienarena/pkg-fun.nix} | 0 .../default.nix => unit/al/align/pkg-fun.nix} | 0 .../al/aliyun-cli/pkg-fun.nix} | 0 .../default.nix => unit/al/aliza/pkg-fun.nix} | 0 .../al/alkalami/pkg-fun.nix} | 0 .../al/allegro4}/encoding.patch | 0 .../allegro4}/nix-unstable-sandbox-fix.patch | 0 .../al/allegro4/pkg-fun.nix} | 0 .../5.nix => unit/al/allegro5/pkg-fun.nix} | 0 .../al/alliance/pkg-fun.nix} | 0 .../al/allmark/pkg-fun.nix} | 0 .../al/allure/pkg-fun.nix} | 0 .../al/almanah/pkg-fun.nix} | 0 .../al/almonds/pkg-fun.nix} | 0 .../default.nix => unit/al/alock/pkg-fun.nix} | 0 .../default.nix => unit/al/alot/pkg-fun.nix} | 0 .../al/alpine-make-vm-image/pkg-fun.nix} | 0 .../al/alpnpass/pkg-fun.nix} | 0 .../default.nix => unit/al/alps/pkg-fun.nix} | 0 .../al/alsa-firmware/pkg-fun.nix} | 0 .../alsa-lib/alsa-plugin-conf-multilib.patch | 0 .../al/alsa-lib/pkg-fun.nix} | 0 .../al/alsa-oss/pkg-fun.nix} | 0 .../al/alsa-plugins-wrapper/pkg-fun.nix} | 0 .../al/alsa-plugins/pkg-fun.nix} | 0 .../al/alsa-scarlett-gui/pkg-fun.nix} | 0 .../al/alsa-tools/pkg-fun.nix} | 0 .../al/alsa-topology-conf/pkg-fun.nix} | 0 .../al/alsa-ucm-conf/pkg-fun.nix} | 0 .../al}/alsaequal/caps_9.x.patch | 0 .../al}/alsaequal/false_error.patch | 0 .../al}/alsaequal/makefile.patch | 0 .../al/alsaequal/pkg-fun.nix} | 0 .../al/alt-ergo/pkg-fun.nix} | 0 .../al/altair/pkg-fun.nix} | 0 .../al/altermime/pkg-fun.nix} | 0 .../al/althttpd/pkg-fun.nix} | 0 .../al/alttab/pkg-fun.nix} | 0 .../al/alttpr-opentracker}/deps.nix | 0 .../al/alttpr-opentracker/pkg-fun.nix} | 0 .../default.nix => unit/al/alure/pkg-fun.nix} | 0 .../al/alure2/pkg-fun.nix} | 0 .../am/AMB-plugins/pkg-fun.nix} | 0 .../default.nix => unit/am/amass/pkg-fun.nix} | 0 .../am/amazon-ec2-utils/pkg-fun.nix} | 0 .../amazon-ecr-credential-helper/pkg-fun.nix} | 0 .../am/amazon-ecs-cli/pkg-fun.nix} | 0 .../am/amber-theme/pkg-fun.nix} | 0 .../am/amberol/pkg-fun.nix} | 0 .../am/amd-blis/pkg-fun.nix} | 0 .../am}/amd-libflame/add-lapacke.diff | 0 .../am/amd-libflame/pkg-fun.nix} | 0 .../am/amdvlk/pkg-fun.nix} | 0 .../libraries => unit/am}/amdvlk/test.nix | 0 .../default.nix => unit/am/ameba/pkg-fun.nix} | 0 .../am/amfora/pkg-fun.nix} | 0 .../am/amidst/pkg-fun.nix} | 0 .../default.nix => unit/am/amiri/pkg-fun.nix} | 0 .../default.nix => unit/am/aml/pkg-fun.nix} | 0 .../default.nix => unit/am/amoco/pkg-fun.nix} | 0 .../am/amoeba-data/pkg-fun.nix} | 0 .../am}/amoeba/include-string-h.patch | 0 .../am/amoeba/pkg-fun.nix} | 0 .../am/among-sus/pkg-fun.nix} | 0 .../default.nix => unit/am/amp/pkg-fun.nix} | 0 .../default.nix => unit/am/amrnb/pkg-fun.nix} | 0 .../default.nix => unit/am/amrwb/pkg-fun.nix} | 0 .../am/ams-lv2/pkg-fun.nix} | 0 .../default.nix => unit/am/ams/pkg-fun.nix} | 0 .../default.nix => unit/am/amtk/pkg-fun.nix} | 0 .../am/amtterm/pkg-fun.nix} | 0 .../default.nix => unit/am/amule/pkg-fun.nix} | 0 .../an/analog/pkg-fun.nix} | 0 .../an/ananicy-cpp/pkg-fun.nix} | 0 .../an/ananicy/pkg-fun.nix} | 0 .../an/anarchism/pkg-fun.nix} | 0 .../default.nix => unit/an/anbox/pkg-fun.nix} | 0 .../an/andagii/pkg-fun.nix} | 0 .../an/anders/pkg-fun.nix} | 0 .../an/andika/pkg-fun.nix} | 0 .../an/android-backup-extractor/pkg-fun.nix} | 0 .../an/android-udev-rules/pkg-fun.nix} | 0 .../an/andyetitmoves/pkg-fun.nix} | 0 .../an/anewer/pkg-fun.nix} | 0 .../an/angband/pkg-fun.nix} | 0 .../an/angelscript/pkg-fun.nix} | 0 .../an/angelscript_2_22/pkg-fun.nix} | 0 .../an/angle-grinder/pkg-fun.nix} | 0 .../default.nix => unit/an/angsd/pkg-fun.nix} | 0 .../an/ani-cli/pkg-fun.nix} | 0 .../an/animbar/pkg-fun.nix} | 0 .../an/anime-downloader/pkg-fun.nix} | 0 .../an}/anime-downloader/update.sh | 0 .../an/ankacoder-condensed/pkg-fun.nix} | 0 .../an/ankacoder/pkg-fun.nix} | 0 .../an/annapurna-sil/pkg-fun.nix} | 0 .../an/anonymousPro/pkg-fun.nix} | 0 .../an/ansible-language-server/pkg-fun.nix} | 0 .../an/ansifilter/pkg-fun.nix} | 0 .../an/ant-bloody-theme/pkg-fun.nix} | 0 .../an/ant-nebula-theme/pkg-fun.nix} | 0 .../ant.nix => unit/an/ant-theme/pkg-fun.nix} | 0 .../default.nix => unit/an/ante/pkg-fun.nix} | 0 .../an/antfs-cli/pkg-fun.nix} | 0 .../default.nix => unit/an/anthy/pkg-fun.nix} | 0 .../an/antibody/pkg-fun.nix} | 0 .../default.nix => unit/an/antic/pkg-fun.nix} | 0 .../an/antigen/pkg-fun.nix} | 0 .../an/antiprism/pkg-fun.nix} | 0 ...fer_overflow_wordole_c_CVE-2014-8123.patch | 0 .../an/antiword/pkg-fun.nix} | 0 .../an/antlr2}/2.7.7-fixes.patch | 0 .../2.7.7.nix => unit/an/antlr2/pkg-fun.nix} | 0 .../3.4.nix => unit/an/antlr3_4/pkg-fun.nix} | 0 .../3.5.nix => unit/an/antlr3_5/pkg-fun.nix} | 0 .../an/antora/pkg-fun.nix} | 0 .../an/antsimulator/pkg-fun.nix} | 0 .../an/anttweakbar/pkg-fun.nix} | 0 .../an/any-nix-shell/pkg-fun.nix} | 0 .../an/anydesk/pkg-fun.nix} | 0 .../misc => unit/an}/anystyle-cli/gemset.nix | 0 .../an/anystyle-cli/pkg-fun.nix} | 0 .../an/anytype/pkg-fun.nix} | 0 .../ap/apache-directory-server/pkg-fun.nix} | 0 .../ap/apache-directory-studio/pkg-fun.nix} | 0 .../ap/apache-flex-sdk/pkg-fun.nix} | 0 .../ap/apacheAnt/pkg-fun.nix} | 0 .../ap/apacheAnt_1_9/pkg-fun.nix} | 0 .../ap/apacheHttpd_2_4/pkg-fun.nix} | 0 .../ap/apcupsd/pkg-fun.nix} | 0 .../default.nix => unit/ap/apfel/pkg-fun.nix} | 0 .../ap/apfelgrid/pkg-fun.nix} | 0 .../ap/apfs-fuse/pkg-fun.nix} | 0 .../ap/apfsprogs/pkg-fun.nix} | 0 .../default.nix => unit/ap/apg/pkg-fun.nix} | 0 .../ap/apgdiff/pkg-fun.nix} | 0 .../default.nix => unit/ap/apkg/pkg-fun.nix} | 0 .../default.nix => unit/ap/apkid/pkg-fun.nix} | 0 .../ap/apkleaks/pkg-fun.nix} | 0 .../default.nix => unit/ap/apko/pkg-fun.nix} | 0 .../ap/apksigcopier/pkg-fun.nix} | 0 .../ap/apksigner/pkg-fun.nix} | 0 .../ap/apngasm/pkg-fun.nix} | 0 .../2.nix => unit/ap/apngasm_2/pkg-fun.nix} | 0 .../ap/apparix/pkg-fun.nix} | 0 .../ap/appdaemon/pkg-fun.nix} | 0 .../ap/appeditor/pkg-fun.nix} | 0 .../ap/appflowy/pkg-fun.nix} | 0 .../ap/appgate-sdp/pkg-fun.nix} | 0 .../ap/appimage-run/pkg-fun.nix} | 0 .../ap}/appimagekit/nix.patch | 0 .../ap/appimagekit/pkg-fun.nix} | 0 .../ap/appindicator-sharp/pkg-fun.nix} | 0 .../ap/apple-cursor/pkg-fun.nix} | 0 .../ap}/appstream-glib/paths.patch | 0 .../ap/appstream-glib/pkg-fun.nix} | 0 .../ap}/appstream/fix-paths.patch | 0 .../ap}/appstream/installed-tests-path.patch | 0 .../ap/appstream/pkg-fun.nix} | 0 .../ap/appthreat-depscan/pkg-fun.nix} | 0 .../ap}/appvm/0001-Remove-menu-bar.patch | 0 .../0002-Do-not-grab-keyboard-mouse.patch | 0 ...ame-of-appvm-applications-as-a-title.patch | 0 ...e-title-application-name-as-subtitle.patch | 0 .../default.nix => unit/ap/appvm/pkg-fun.nix} | 0 .../ap/aprutil}/fix-libxcrypt-build.patch | 0 .../include-static-dependencies.patch | 0 .../ap/aprutil/pkg-fun.nix} | 0 .../ap/apt-cacher-ng/pkg-fun.nix} | 0 .../ap/apt-offline/pkg-fun.nix} | 0 .../default.nix => unit/ap/apt/pkg-fun.nix} | 0 .../ap/aptdec/pkg-fun.nix} | 0 .../default.nix => unit/ap/aptly/pkg-fun.nix} | 0 .../ap/apulse/pkg-fun.nix} | 0 .../apvlv/fix-build-with-poppler-0.73.0.patch | 0 .../default.nix => unit/ap/apvlv/pkg-fun.nix} | 0 .../aq/aquosctl/pkg-fun.nix} | 0 .../ar/arachne-pnr/pkg-fun.nix} | 0 .../ar/aragorn/pkg-fun.nix} | 0 .../ar/arandr/pkg-fun.nix} | 0 .../ar/arangodb/pkg-fun.nix} | 0 .../ar/aravis/pkg-fun.nix} | 0 .../default.nix => unit/ar/arb/pkg-fun.nix} | 0 .../ar/arc-icon-theme/pkg-fun.nix} | 0 .../ar/arc-kde-theme/pkg-fun.nix} | 0 .../ar/arc-theme/pkg-fun.nix} | 0 .../ar/arch-install-scripts/pkg-fun.nix} | 0 .../default.nix => unit/ar/archi/pkg-fun.nix} | 0 .../ar/archimedes/pkg-fun.nix} | 0 .../ar/archivebox/pkg-fun.nix} | 0 .../ar/archivemount/pkg-fun.nix} | 0 .../ar/archiver/pkg-fun.nix} | 0 .../ar/archivy/pkg-fun.nix} | 0 .../ar/arduino-ci/pkg-fun.nix} | 0 .../ar/arduino-cli/pkg-fun.nix} | 0 .../ar/arduino-core-unwrapped}/downloads.nix | 0 .../ar/arduino-core-unwrapped/pkg-fun.nix} | 0 .../ar/arduino-core/pkg-fun.nix} | 0 .../ar/arduino-language-server/pkg-fun.nix} | 0 .../ar/arduino-mk/pkg-fun.nix} | 0 .../default.nix => unit/ar/arena/pkg-fun.nix} | 0 .../ar}/argagg/0001-catch.diff | 0 .../ar/argagg/pkg-fun.nix} | 0 .../ar/argbash/pkg-fun.nix} | 0 .../default.nix => unit/ar/argc/pkg-fun.nix} | 0 .../ar/argo-rollouts/pkg-fun.nix} | 0 .../default.nix => unit/ar/argo/pkg-fun.nix} | 0 .../ar}/argo/staticfiles.go.mod | 0 .../ar/argocd-autopilot/pkg-fun.nix} | 0 .../ar/argocd/pkg-fun.nix} | 0 .../fix-hardcoded-reboot-poweroff-paths.patch | 0 .../ar/argononed/pkg-fun.nix} | 0 .../ar/argp-standalone/pkg-fun.nix} | 0 .../ar/argparse/pkg-fun.nix} | 0 .../ar/argtable/pkg-fun.nix} | 0 .../ar/arguments/pkg-fun.nix} | 0 .../ar/argus-clients/pkg-fun.nix} | 0 .../default.nix => unit/ar/argus/pkg-fun.nix} | 0 .../ar/argyllcms/pkg-fun.nix} | 0 .../default.nix => unit/ar/ario/pkg-fun.nix} | 0 .../default.nix => unit/ar/arion/pkg-fun.nix} | 0 .../ar/arkade/pkg-fun.nix} | 0 .../ar/arkpandora_ttf/pkg-fun.nix} | 0 .../ar/armadillo/pkg-fun.nix} | 0 .../armadillo/use-unix-config-on-OS-X.patch | 0 .../ar/armcord/pkg-fun.nix} | 0 .../ar/arp-scan/pkg-fun.nix} | 0 .../ar/arpa2cm/pkg-fun.nix} | 0 .../ar/arpa2common/pkg-fun.nix} | 0 .../ar/arpack/pkg-fun.nix} | 0 .../ar/arping/pkg-fun.nix} | 0 .../ar/arpoison/pkg-fun.nix} | 0 .../ar}/arrayfire/no-download.patch | 0 .../ar/arrayfire/pkg-fun.nix} | 0 .../ar}/arrow-cpp/darwin.patch | 0 .../ar/arrow-cpp/pkg-fun.nix} | 0 .../ar/arrow-glib/pkg-fun.nix} | 0 .../ar/arsenal/pkg-fun.nix} | 0 .../default.nix => unit/ar/artem/pkg-fun.nix} | 0 .../default.nix => unit/ar/artha/pkg-fun.nix} | 0 .../ar/artim-dark/pkg-fun.nix} | 0 .../ar/artyFX/pkg-fun.nix} | 0 .../ar/arubaotp-seed-extractor/pkg-fun.nix} | 0 .../misc => unit/as}/as-tree/cargo-lock.patch | 0 .../as/as-tree/pkg-fun.nix} | 0 .../as}/as31/0000-getline-break.patch | 0 .../default.nix => unit/as/as31/pkg-fun.nix} | 0 .../default.nix => unit/as/asap/pkg-fun.nix} | 0 .../as/asc-key-to-qr-code-gif/pkg-fun.nix} | 0 .../as/ascii-image-converter/pkg-fun.nix} | 0 .../default.nix => unit/as/ascii/pkg-fun.nix} | 0 .../as}/asciidoctor-with-extensions/Gemfile | 0 .../asciidoctor-with-extensions/Gemfile.lock | 0 .../asciidoctor-with-extensions/gemset.nix | 0 .../asciidoctor-with-extensions/pkg-fun.nix} | 0 .../as/asciidoctorj/pkg-fun.nix} | 0 .../as/asciigraph/pkg-fun.nix} | 0 .../as/asciinema-scenario/pkg-fun.nix} | 0 .../as/asciinema/pkg-fun.nix} | 0 .../as/asciiquarium/pkg-fun.nix} | 0 .../as/asdf-vm/pkg-fun.nix} | 0 .../as}/aseprite/allegro-glibc-2.30.patch | 0 .../as/aseprite/pkg-fun.nix} | 0 .../as}/aseprite/skia-deps.nix | 0 .../editors => unit/as}/aseprite/skia.nix | 0 .../as/aseq2json/pkg-fun.nix} | 0 .../as/ashpd-demo/pkg-fun.nix} | 0 .../as/ashuffle/pkg-fun.nix} | 0 .../as/askalono/pkg-fun.nix} | 0 .../as/asleap/pkg-fun.nix} | 0 .../default.nix => unit/as/asls/pkg-fun.nix} | 0 .../as/asmfmt/pkg-fun.nix} | 0 .../as/asmjit/pkg-fun.nix} | 0 .../interpreters => unit/as}/asmrepl/Gemfile | 0 .../as}/asmrepl/Gemfile.lock | 0 .../as}/asmrepl/gemset.nix | 0 .../as/asmrepl/pkg-fun.nix} | 0 .../default.nix => unit/as/asn/pkg-fun.nix} | 0 .../default.nix => unit/as/asn1c/pkg-fun.nix} | 0 .../as/asnmap/pkg-fun.nix} | 0 .../as/asouldocs/pkg-fun.nix} | 0 .../as/aspcud/pkg-fun.nix} | 0 .../compilers => unit/as}/aspectj/builder.sh | 0 .../as/aspectj/pkg-fun.nix} | 0 .../libraries => unit/as}/aspell/clang.patch | 0 .../aspell/data-dirs-from-nix-profiles.patch | 0 .../as/aspell/pkg-fun.nix} | 0 .../as/assaultcube/pkg-fun.nix} | 0 .../default.nix => unit/as/assh/pkg-fun.nix} | 0 .../as/assign-lb-ip/pkg-fun.nix} | 0 .../as/assimp/pkg-fun.nix} | 0 .../as/astc-encoder/pkg-fun.nix} | 0 .../as/asterisk-module-sccp/pkg-fun.nix} | 0 .../as/astral/pkg-fun.nix} | 0 .../as/astrolabe-generator/pkg-fun.nix} | 0 .../as/astrolog/pkg-fun.nix} | 0 .../as/astromenace/pkg-fun.nix} | 0 .../as/astyle/pkg-fun.nix} | 0 .../as/asunder/pkg-fun.nix} | 0 .../as/asusctl/pkg-fun.nix} | 0 .../as/async-profiler/pkg-fun.nix} | 0 .../default.nix => unit/as/async/pkg-fun.nix} | 0 .../at/at-spi2-core/pkg-fun.nix} | 0 .../system => unit/at}/at/install.patch | 0 .../at/default.nix => unit/at/at/pkg-fun.nix} | 0 .../at/atanks/pkg-fun.nix} | 0 .../at/atari800/pkg-fun.nix} | 0 .../at/ataripp/pkg-fun.nix} | 0 .../at}/atasm/0000-file-not-found.diff | 0 .../at}/atasm/0001-select-flags.diff | 0 .../default.nix => unit/at/atasm/pkg-fun.nix} | 0 .../default.nix => unit/at/atftp/pkg-fun.nix} | 0 .../at/atheme/pkg-fun.nix} | 0 .../at/atinout/pkg-fun.nix} | 0 .../at/atkinson-hyperlegible/pkg-fun.nix} | 0 .../default.nix => unit/at/atkmm/pkg-fun.nix} | 0 .../at/atkmm_2_36/pkg-fun.nix} | 0 .../at/atlantis/pkg-fun.nix} | 0 .../at/atlassian-bamboo/pkg-fun.nix} | 0 .../at/atlassian-cli/pkg-fun.nix} | 0 .../at}/atlassian-cli/wrapper.sh | 0 .../at/atlassian-confluence/pkg-fun.nix} | 0 .../at/atlassian-crowd/pkg-fun.nix} | 0 .../at/atlassian-jira/pkg-fun.nix} | 0 .../default.nix => unit/at/atmos/pkg-fun.nix} | 0 .../env.nix => unit/at/atomEnv/pkg-fun.nix} | 0 .../at/atomic-operator/pkg-fun.nix} | 0 .../default.nix => unit/at/atool/pkg-fun.nix} | 0 .../linux => unit/at}/atop/atop.service.patch | 0 .../at}/atop/atopacct.service.patch | 0 .../linux => unit/at}/atop/fix-paths.patch | 0 .../default.nix => unit/at/atop/pkg-fun.nix} | 0 .../at/ats-acc/pkg-fun.nix} | 0 .../at}/ats/install-atsdoc-hats-files.patch | 0 .../default.nix => unit/at/ats/pkg-fun.nix} | 0 .../default.nix => unit/at/ats2/pkg-fun.nix} | 0 .../at}/ats2/setup-contrib-hook.sh | 0 .../compilers => unit/at}/ats2/setup-hook.sh | 0 .../at/attemptoClex/pkg-fun.nix} | 0 .../default.nix => unit/at/attr/pkg-fun.nix} | 0 .../at/attract-mode/pkg-fun.nix} | 0 .../default.nix => unit/au/aubio/pkg-fun.nix} | 0 .../au/aucatctl/pkg-fun.nix} | 0 .../au/auctex/pkg-fun.nix} | 0 .../au/audiality2/pkg-fun.nix} | 0 .../au/audible-cli/pkg-fun.nix} | 0 .../au/audio-recorder/pkg-fun.nix} | 0 .../au/audiowaveform/pkg-fun.nix} | 0 .../au}/audit/patches/weak-symbols.patch | 0 .../default.nix => unit/au/audit/pkg-fun.nix} | 0 .../au/auditwheel/pkg-fun.nix} | 0 .../au/augeas/pkg-fun.nix} | 0 .../au/augustus/pkg-fun.nix} | 0 .../au/aurulent-sans/pkg-fun.nix} | 0 .../au/auth0-cli/pkg-fun.nix} | 0 .../au/authenticator/pkg-fun.nix} | 0 .../default.nix => unit/au/authy/pkg-fun.nix} | 0 .../au/authz0/pkg-fun.nix} | 0 .../au}/auto-cpufreq/fix-version-output.patch | 0 .../au/auto-cpufreq/pkg-fun.nix} | 0 .../prevent-install-and-copy.patch | 0 .../au/auto-multiple-choice/pkg-fun.nix} | 0 .../au/autoadb/pkg-fun.nix} | 0 .../au/autobuild/pkg-fun.nix} | 0 .../au/autoconf-archive/pkg-fun.nix} | 0 .../au/autoconf213/pkg-fun.nix} | 0 .../au/autoconf264/pkg-fun.nix} | 0 .../au/autoconf269/pkg-fun.nix} | 0 .../au/autoconf271}/2.71-fix-race.patch | 0 .../au/autoconf271/pkg-fun.nix} | 0 .../au/autocutsel/pkg-fun.nix} | 0 .../au/autofs5/pkg-fun.nix} | 0 .../au/autogen/pkg-fun.nix} | 0 .../au/autojump/pkg-fun.nix} | 0 .../au/autokey/pkg-fun.nix} | 0 .../au/automatic-timezoned/pkg-fun.nix} | 0 .../au/automaticcomponenttoolkit/pkg-fun.nix} | 0 .../au/automirror/pkg-fun.nix} | 0 .../au/automysqlbackup/pkg-fun.nix} | 0 .../au/autopanosiftc/pkg-fun.nix} | 0 .../0001-don-t-use-sys.executable.patch | 0 .../au/autorandr/pkg-fun.nix} | 0 .../au/autorestic/pkg-fun.nix} | 0 .../au/autorevision/pkg-fun.nix} | 0 .../au/autospotting/pkg-fun.nix} | 0 .../au/autossh/pkg-fun.nix} | 0 .../au/autosuspend/pkg-fun.nix} | 0 .../au/autotalent/pkg-fun.nix} | 0 .../au/autotiling-rs/pkg-fun.nix} | 0 .../au}/autotrace/autofig.nix | 0 .../au/autotrace/pkg-fun.nix} | 0 .../default.nix => unit/av/av-98/pkg-fun.nix} | 0 .../av/avalonia-ilspy/pkg-fun.nix} | 0 .../default.nix => unit/av/avfs/pkg-fun.nix} | 0 .../av}/aviator/bump-golang-x-sys.patch | 0 .../av/aviator/pkg-fun.nix} | 0 .../default.nix => unit/av/avizo/pkg-fun.nix} | 0 .../av/avocode/pkg-fun.nix} | 0 .../av/avr8burnomat/pkg-fun.nix} | 0 .../default.nix => unit/av/avra/pkg-fun.nix} | 0 .../av/avrdude/pkg-fun.nix} | 0 .../av/avrdudess/pkg-fun.nix} | 0 .../av/avro-c/pkg-fun.nix} | 0 .../av/avro-cpp/pkg-fun.nix} | 0 .../av/avro-tools/pkg-fun.nix} | 0 .../default.nix => unit/aw/awf/pkg-fun.nix} | 0 .../aw/aws-c-auth/pkg-fun.nix} | 0 .../aw/aws-c-common/pkg-fun.nix} | 0 .../aw}/aws-c-common/setup-hook.sh | 0 .../aw/aws-c-compression/pkg-fun.nix} | 0 .../aw/aws-c-event-stream/pkg-fun.nix} | 0 .../aw/aws-c-http/pkg-fun.nix} | 0 .../aw/aws-c-mqtt/pkg-fun.nix} | 0 .../aw/aws-c-s3/pkg-fun.nix} | 0 .../aw/aws-c-sdkutils/pkg-fun.nix} | 0 .../aw/aws-checksums/pkg-fun.nix} | 0 ...ake-includedir-properly-overrideable.patch | 0 .../aw/aws-crt-cpp/pkg-fun.nix} | 0 .../{tools/admin => unit/aw}/aws-env/deps.nix | 0 .../aw/aws-env/pkg-fun.nix} | 0 .../aw/aws-iam-authenticator/pkg-fun.nix} | 0 .../aw/aws-lambda-rie/pkg-fun.nix} | 0 .../aw/aws-nuke/pkg-fun.nix} | 0 .../aw/aws-rotate-key/pkg-fun.nix} | 0 .../aw/aws-sam-cli/pkg-fun.nix} | 0 .../aw}/aws-sam-cli/support-click-8-1.patch | 0 ...use_forward_compatible_log_silencing.patch | 0 .../aw/aws-sso-cli/pkg-fun.nix} | 0 .../aw/aws-sso-creds/pkg-fun.nix} | 0 .../aw/aws-vault/pkg-fun.nix} | 0 .../aw/aws-workspaces/pkg-fun.nix} | 0 .../aw/aws_mturk_clt/pkg-fun.nix} | 0 .../aw/awscli/pkg-fun.nix} | 0 .../aw/awscli2/pkg-fun.nix} | 0 .../aw/awsebcli/pkg-fun.nix} | 0 .../aw/awslimitchecker/pkg-fun.nix} | 0 .../aw}/awslimitchecker/version.patch | 0 .../aw/awslogs/pkg-fun.nix} | 0 .../default.nix => unit/aw/awsls/pkg-fun.nix} | 0 .../default.nix => unit/aw/awsrm/pkg-fun.nix} | 0 .../aw/awstats/pkg-fun.nix} | 0 .../aw/awsweeper/pkg-fun.nix} | 0 .../ax/ax25-apps/pkg-fun.nix} | 0 .../ax/ax25-tools/pkg-fun.nix} | 0 .../http/tomcat => unit/ax}/axis2/builder.sh | 0 .../default.nix => unit/ax/axis2/pkg-fun.nix} | 0 .../ay/ayatana-ido/pkg-fun.nix} | 0 .../ay/ayu-theme-gtk/pkg-fun.nix} | 0 .../az/azimuth/pkg-fun.nix} | 0 .../az/azpainter/pkg-fun.nix} | 0 .../az/azure-cli/pkg-fun.nix} | 0 .../az}/azure-cli/python-packages.nix | 0 .../azure-functions-core-tools/pkg-fun.nix} | 0 .../az/azure-static-sites-client/pkg-fun.nix} | 0 .../az}/azure-static-sites-client/update.sh | 0 .../azure-static-sites-client/versions.json | 0 .../az/azure-storage-azcopy/pkg-fun.nix} | 0 .../az/azuredatastudio/pkg-fun.nix} | 0 .../default.nix => unit/b3/b3sum/pkg-fun.nix} | 0 .../b4/default.nix => unit/b4/b4/pkg-fun.nix} | 0 .../b43FirmwareCutter}/no-root-install.patch | 0 .../b4/b43FirmwareCutter/pkg-fun.nix} | 0 .../b4/b43Firmware_5_1_138/pkg-fun.nix} | 0 .../b4/b43Firmware_6_30_163_46/pkg-fun.nix} | 0 .../default.nix => unit/b6/b612/pkg-fun.nix} | 0 .../ba/babashka/pkg-fun.nix} | 0 .../ba/babeld/pkg-fun.nix} | 0 .../ba/babelfish/pkg-fun.nix} | 0 .../ba/babelstone-han/pkg-fun.nix} | 0 .../ba/babeltrace/pkg-fun.nix} | 0 .../default.nix => unit/ba/babl/pkg-fun.nix} | 0 .../ba/backblaze-b2/pkg-fun.nix} | 0 .../ba/backintime-common/pkg-fun.nix} | 0 .../ba/backward-cpp/pkg-fun.nix} | 0 .../ba/bacnet-stack/pkg-fun.nix} | 0 .../ba/bada-bib/pkg-fun.nix} | 0 .../ba/badrobot/pkg-fun.nix} | 0 .../ba/badvpn/pkg-fun.nix} | 0 .../ba/baekmuk-ttf/pkg-fun.nix} | 0 .../web-apps => unit/ba}/baget/deps.nix | 0 .../default.nix => unit/ba/baget/pkg-fun.nix} | 0 .../web-apps => unit/ba}/baget/updater.sh | 0 .../ba/bakelite/pkg-fun.nix} | 0 .../ba/bakoma_ttf/pkg-fun.nix} | 0 .../ba/ballerburg/pkg-fun.nix} | 0 .../default.nix => unit/ba/balsa/pkg-fun.nix} | 0 .../default.nix => unit/ba/bam/pkg-fun.nix} | 0 .../default.nix => unit/ba/bamf/pkg-fun.nix} | 0 .../ba/banana-accounting/pkg-fun.nix} | 0 .../ba/bandwidth/pkg-fun.nix} | 0 .../ba/banking/pkg-fun.nix} | 0 .../ba/banner/pkg-fun.nix} | 0 .../default.nix => unit/ba/bao/pkg-fun.nix} | 0 .../default.nix => unit/ba/bar/pkg-fun.nix} | 0 .../ba/barcode/pkg-fun.nix} | 0 .../ba/baresip/pkg-fun.nix} | 0 .../ba/barlow/pkg-fun.nix} | 0 .../ba/barman/pkg-fun.nix} | 0 .../ba}/barman/unwrap-subprocess.patch | 0 .../ba/barrage/pkg-fun.nix} | 0 .../ba/bartib/pkg-fun.nix} | 0 .../ba/base16-shell-preview/pkg-fun.nix} | 0 .../ba/base16-universal-manager/pkg-fun.nix} | 0 .../ba/baserow/pkg-fun.nix} | 0 .../text/xml => unit/ba}/basex/basex.svg | 0 .../default.nix => unit/ba/basex/pkg-fun.nix} | 0 .../ba/bash-completion/pkg-fun.nix} | 0 .../ba/bash-my-aws/pkg-fun.nix} | 0 .../ba/bash-preexec/pkg-fun.nix} | 0 .../ba/bash-supergenpass/pkg-fun.nix} | 0 .../ba/bashSnippets/pkg-fun.nix} | 0 .../ba/bash_unit/pkg-fun.nix} | 0 .../bashblog/0001-Setting-markdown_bin.patch | 0 .../ba/bashblog/pkg-fun.nix} | 0 .../ba/bashcards/pkg-fun.nix} | 0 .../ba/bashdb/pkg-fun.nix} | 0 .../ba/bashmount/pkg-fun.nix} | 0 .../ba/bashplotlib/pkg-fun.nix} | 0 .../ba/basiliskii/pkg-fun.nix} | 0 ...ve-redhat-6-workaround-for-scsi-sg.h.patch | 0 .../ba/bastet/pkg-fun.nix} | 0 .../default.nix => unit/ba/batik/pkg-fun.nix} | 0 .../ba}/bats/libraries.nix | 0 .../default.nix => unit/ba/bats/pkg-fun.nix} | 0 .../ba/batsignal/pkg-fun.nix} | 0 .../ba/baudline/pkg-fun.nix} | 0 .../ba/bayescan/pkg-fun.nix} | 0 .../ba/bazarr/pkg-fun.nix} | 0 .../ba/bazel-buildtools/pkg-fun.nix} | 0 .../ba/bazel-gazelle/pkg-fun.nix} | 0 .../ba/bazel-kazel/pkg-fun.nix} | 0 .../disable_build_file_generation.patch | 0 .../ba/bazel-remote/pkg-fun.nix} | 0 .../ba/bazelisk/pkg-fun.nix} | 0 .../bb/default.nix => unit/bb/bb/pkg-fun.nix} | 0 .../default.nix => unit/bb/bbe/pkg-fun.nix} | 0 .../default.nix => unit/bb/bbin/pkg-fun.nix} | 0 .../bc/bc-decaf/pkg-fun.nix} | 0 .../bc/bc-soci/pkg-fun.nix} | 0 .../{tools/misc => unit/bc}/bc/cross-bc.patch | 0 .../bc/default.nix => unit/bc/bc/pkg-fun.nix} | 0 .../bc}/bcache-tools/bcache-udev-modern.patch | 0 .../bc}/bcache-tools/fix-static.patch | 0 .../bc/bcache-tools/pkg-fun.nix} | 0 .../bc/bcachefs-tools/pkg-fun.nix} | 0 .../default.nix => unit/bc/bcal/pkg-fun.nix} | 0 .../bc/bcftools/pkg-fun.nix} | 0 .../bc/bcg729/pkg-fun.nix} | 0 .../bc/bchoppr/pkg-fun.nix} | 0 .../bc/bchunk/pkg-fun.nix} | 0 .../bc/bctoolbox/pkg-fun.nix} | 0 .../bc/bcunit/pkg-fun.nix} | 0 .../bdep.nix => unit/bd/bdep/pkg-fun.nix} | 0 .../bd/bdf2psf/pkg-fun.nix} | 0 .../bd/bdf2sfd/pkg-fun.nix} | 0 .../bd/bdfresize/pkg-fun.nix} | 0 .../bdfresize/remove-malloc-declaration.patch | 0 .../bd/bdsync/pkg-fun.nix} | 0 .../add-runtime-identifier.patch | 0 .../be}/BeatSaberModManager/deps.nix | 0 .../be/BeatSaberModManager/pkg-fun.nix} | 0 .../be/bean-add/pkg-fun.nix} | 0 .../be/beancount-ing-diba/pkg-fun.nix} | 0 .../be/beancount-language-server/pkg-fun.nix} | 0 .../be/beanstalkd/pkg-fun.nix} | 0 .../be}/bear/no-double-relative.patch | 0 .../default.nix => unit/be/bear/pkg-fun.nix} | 0 .../be/bearssl/pkg-fun.nix} | 0 .../default.nix => unit/be/beats/pkg-fun.nix} | 0 .../be/beautysh/pkg-fun.nix} | 0 .../be/bedops/pkg-fun.nix} | 0 .../be/bedtools/pkg-fun.nix} | 0 ...ept-default-CONFIGDIR-from-the-envir.patch | 0 .../0002-nix-diff-for-substituteAll.patch | 0 .../be/bee-clef}/ensure-clef-account | 0 .../be/bee-clef/pkg-fun.nix} | 0 .../be/beecrypt/pkg-fun.nix} | 0 .../default.nix => unit/be/beefi/pkg-fun.nix} | 0 .../be/beekeeper-studio/pkg-fun.nix} | 0 .../default.nix => unit/be/beep/pkg-fun.nix} | 0 .../be}/bees/bees-service-wrapper | 0 .../default.nix => unit/be/bees/pkg-fun.nix} | 0 .../be/behdad-fonts/pkg-fun.nix} | 0 .../be/belcard/pkg-fun.nix} | 0 .../be/belle-sip/pkg-fun.nix} | 0 .../default.nix => unit/be/below/pkg-fun.nix} | 0 .../default.nix => unit/be/belr/pkg-fun.nix} | 0 .../be/beluga/pkg-fun.nix} | 0 .../be/bemenu/pkg-fun.nix} | 0 .../be/bencodetools/pkg-fun.nix} | 0 .../be/benthos/pkg-fun.nix} | 0 .../video => unit/be}/bento4/libap4.patch | 0 .../be/bento4/pkg-fun.nix} | 0 .../be/bepasty/pkg-fun.nix} | 0 .../be/ber_metaocaml/pkg-fun.nix} | 0 .../be/berglas/pkg-fun.nix} | 0 .../default.nix => unit/be/berry/pkg-fun.nix} | 0 .../default.nix => unit/be/besu/pkg-fun.nix} | 0 .../be/betaflight-configurator/pkg-fun.nix} | 0 .../be/bettercap/pkg-fun.nix} | 0 .../be/betterdiscord-installer/pkg-fun.nix} | 0 .../be/betterdiscordctl/pkg-fun.nix} | 0 .../be/betterlockscreen/pkg-fun.nix} | 0 .../be/bevelbar/pkg-fun.nix} | 0 .../be/beyond-identity/pkg-fun.nix} | 0 .../bf/bfetch/pkg-fun.nix} | 0 .../bf/bfg-repo-cleaner/pkg-fun.nix} | 0 .../default.nix => unit/bf/bfr/pkg-fun.nix} | 0 .../default.nix => unit/bf/bfs/pkg-fun.nix} | 0 .../bf/bftools/pkg-fun.nix} | 0 .../default.nix => unit/bf/bftpd/pkg-fun.nix} | 0 .../default.nix => unit/bg/bgnet/pkg-fun.nix} | 0 .../bg/bgpdump/pkg-fun.nix} | 0 .../default.nix => unit/bg/bgpq3/pkg-fun.nix} | 0 .../default.nix => unit/bg/bgpq4/pkg-fun.nix} | 0 .../default.nix => unit/bg/bgs/pkg-fun.nix} | 0 .../bibata-cursors-translucent/pkg-fun.nix} | 0 .../bi/bibata-extra-cursors/pkg-fun.nix} | 0 .../bi/bibclean/pkg-fun.nix} | 0 .../default.nix => unit/bi/biber/pkg-fun.nix} | 0 .../bi/biblatex-check/pkg-fun.nix} | 0 .../bi/biblesync/pkg-fun.nix} | 0 .../xmpp => unit/bi}/biboumi/catch.patch | 0 .../bi/biboumi/pkg-fun.nix} | 0 .../bi/bibtex2html/pkg-fun.nix} | 0 .../bi/bibtool/pkg-fun.nix} | 0 .../bi/bibutils/pkg-fun.nix} | 0 .../default.nix => unit/bi/bic/pkg-fun.nix} | 0 .../default.nix => unit/bi/bicon/pkg-fun.nix} | 0 .../default.nix => unit/bi/bicpl/pkg-fun.nix} | 0 .../bi/bigloo/pkg-fun.nix} | 0 .../bi/binbloom/pkg-fun.nix} | 0 .../bi}/bind/dont-keep-configure-flags.patch | 0 .../default.nix => unit/bi/bind/pkg-fun.nix} | 0 .../bi/bindfs/pkg-fun.nix} | 0 .../default.nix => unit/bi/bingo/pkg-fun.nix} | 0 .../bi/bingrep/pkg-fun.nix} | 0 .../bi/binlore/pkg-fun.nix} | 0 .../bi/biodiff/pkg-fun.nix} | 0 .../bi}/biosdevname/makefile.patch | 0 .../bi/biosdevname/pkg-fun.nix} | 0 .../bi/bird-lg/pkg-fun.nix} | 0 .../bi}/bird/dont-create-sysconfdir-2.patch | 0 .../default.nix => unit/bi/bird/pkg-fun.nix} | 0 .../bi/birdfont/pkg-fun.nix} | 0 .../default.nix => unit/bi/bison/pkg-fun.nix} | 0 .../bi/bisoncpp/pkg-fun.nix} | 0 .../bi/bisq-desktop/pkg-fun.nix} | 0 .../bi}/bisq-desktop/update.sh | 0 .../default.nix => unit/bi/bit/pkg-fun.nix} | 0 .../bi}/bitbucket-server-cli/Gemfile | 0 .../bi}/bitbucket-server-cli/Gemfile.lock | 0 .../bi}/bitbucket-server-cli/gemset.nix | 0 .../bi/bitbucket-server-cli/pkg-fun.nix} | 0 .../bi/bitlbee-discord/pkg-fun.nix} | 0 .../bi/bitlbee-facebook/pkg-fun.nix} | 0 .../bi/bitlbee-mastodon/pkg-fun.nix} | 0 .../bi/bitlbee-plugins/pkg-fun.nix} | 0 .../bi/bitlbee-steam/pkg-fun.nix} | 0 .../bi/bitlbee/pkg-fun.nix} | 0 .../bi/bitmeter/pkg-fun.nix} | 0 .../bi/bitwarden/pkg-fun.nix} | 0 .../bi/bitwig-studio3/pkg-fun.nix} | 0 .../bi/bitwise/pkg-fun.nix} | 0 .../bi/bitwuzla/pkg-fun.nix} | 0 .../bj/bjumblr/pkg-fun.nix} | 0 .../default.nix => unit/bk/bklk/pkg-fun.nix} | 0 .../default.nix => unit/bk/bkyml/pkg-fun.nix} | 0 .../bl/blackbird/pkg-fun.nix} | 0 .../bl}/blackbox-terminal/marble.nix | 0 .../bl/blackbox-terminal/pkg-fun.nix} | 0 .../bl/blackbox/pkg-fun.nix} | 0 .../bl/blackfire/pkg-fun.nix} | 0 .../embedded => unit/bl}/blackmagic/helper.sh | 0 .../bl/blackmagic/pkg-fun.nix} | 0 .../bl/blackshades/pkg-fun.nix} | 0 .../bl/blahtexml/pkg-fun.nix} | 0 .../bl/blanket/pkg-fun.nix} | 0 .../bl/blas-reference/pkg-fun.nix} | 0 .../default.nix => unit/bl/blas/pkg-fun.nix} | 0 .../default.nix => unit/bl/blaze/pkg-fun.nix} | 0 .../bl/bleachbit/pkg-fun.nix} | 0 .../bl/blender-with-packages/pkg-fun.nix} | 0 .../default.nix => unit/bl/blesh/pkg-fun.nix} | 0 .../default.nix => unit/bl/bless/pkg-fun.nix} | 0 .../bl/blflash/pkg-fun.nix} | 0 .../bl/blink1-tool/pkg-fun.nix} | 0 .../default.nix => unit/bl/blis/pkg-fun.nix} | 0 .../default.nix => unit/bl/bliss/pkg-fun.nix} | 0 .../default.nix => unit/bl/blitz/pkg-fun.nix} | 0 .../bl/blktrace/pkg-fun.nix} | 0 .../default.nix => unit/bl/bloat/pkg-fun.nix} | 0 .../bl/bloaty/pkg-fun.nix} | 0 pkgs/{games => unit/bl}/blobby/blobby.sh | 0 .../bl/blobby/pkg-fun.nix} | 0 .../bl}/blobfuse/install-adls.patch | 0 .../bl/blobfuse/pkg-fun.nix} | 0 .../bl/blobwars/pkg-fun.nix} | 0 .../bl/blockattack/pkg-fun.nix} | 0 .../bl/blockbench-electron/pkg-fun.nix} | 0 .../bl/blockbook/pkg-fun.nix} | 0 .../bl/blockhash/pkg-fun.nix} | 0 .../bl/blocky/pkg-fun.nix} | 0 .../default.nix => unit/bl/blogc/pkg-fun.nix} | 0 .../bl/bloodspilot-client/pkg-fun.nix} | 0 .../bl/bloodspilot-server/pkg-fun.nix} | 0 .../bl/bloodspilot-server}/server-gcc5.patch | 0 .../bl/bloomrpc/pkg-fun.nix} | 0 .../default.nix => unit/bl/bloop/pkg-fun.nix} | 0 .../bl/blueberry/pkg-fun.nix} | 0 .../bl/bluejeans-gui}/localtime64_stub.c | 0 .../bl/bluejeans-gui/pkg-fun.nix} | 0 .../bl/bluejeans-gui}/update.sh | 0 .../bl/bluemail/pkg-fun.nix} | 0 .../bl/blueman/pkg-fun.nix} | 0 .../bl/bluemix-cli/pkg-fun.nix} | 0 .../bl/blueprint-compiler/pkg-fun.nix} | 0 .../bl/bluetuith/pkg-fun.nix} | 0 .../bl/bluewalker/pkg-fun.nix} | 0 .../bl/bluez-alsa/pkg-fun.nix} | 0 .../bl/bluez-tools/pkg-fun.nix} | 0 .../bl/blugon/pkg-fun.nix} | 0 .../bl/blur-effect/pkg-fun.nix} | 0 .../bm}/bmake/bootstrap-fix.patch | 0 .../bm}/bmake/fix-localtime-test.patch | 0 .../bm}/bmake/fix-unexport-env-test.patch | 0 .../default.nix => unit/bm/bmake/pkg-fun.nix} | 0 .../bm}/bmake/setup-hook.sh | 0 .../bm}/bmake/unconditional-ksh-test.patch | 0 .../bm/bmap-tools/pkg-fun.nix} | 0 .../default.nix => unit/bm/bmon/pkg-fun.nix} | 0 .../11.nix => unit/bm/bmrsa/pkg-fun.nix} | 0 .../default.nix => unit/bo/bob/pkg-fun.nix} | 0 .../default.nix => unit/bo/boca/pkg-fun.nix} | 0 .../bo/boehmgc/pkg-fun.nix} | 0 .../bo/bogofilter/pkg-fun.nix} | 0 .../default.nix => unit/bo/boinc/pkg-fun.nix} | 0 .../bo}/bolt/0001-skip-mkdir.patch | 0 .../default.nix => unit/bo/bolt/pkg-fun.nix} | 0 .../bo/boltbrowser/pkg-fun.nix} | 0 .../bo/bombadillo/pkg-fun.nix} | 0 .../bo/bomber-go/pkg-fun.nix} | 0 .../bo/bombono/pkg-fun.nix} | 0 .../bo/bomutils/pkg-fun.nix} | 0 .../bo/bonmin/pkg-fun.nix} | 0 .../misc => unit/bo}/bonnmotion/install.patch | 0 .../bo/bonnmotion/pkg-fun.nix} | 0 .../bo/bonzomatic/pkg-fun.nix} | 0 .../bo/boofuzz/pkg-fun.nix} | 0 pkgs/{games => unit/bo}/boohu/deps.nix | 0 .../default.nix => unit/bo/boohu/pkg-fun.nix} | 0 .../bo/book-summary/pkg-fun.nix} | 0 .../bo}/bookletimposer/configdir.patch | 0 .../bo}/bookletimposer/i18n.patch | 0 .../bo/bookletimposer/pkg-fun.nix} | 0 .../bo}/bookstack/composer-env.nix | 0 .../bo}/bookstack/composition.nix | 0 .../bo}/bookstack/php-packages.nix | 0 .../bo/bookstack/pkg-fun.nix} | 0 .../bo/bookworm/pkg-fun.nix} | 0 .../bo}/boolector/cmake-gtest.patch | 0 .../bo/boolector/pkg-fun.nix} | 0 .../bo/boolstuff/pkg-fun.nix} | 0 .../default.nix => unit/bo/boops/pkg-fun.nix} | 0 .../bo/boost-build/pkg-fun.nix} | 0 .../bo/boost-sml/pkg-fun.nix} | 0 .../bo/boost_process/pkg-fun.nix} | 0 .../bo/booster/pkg-fun.nix} | 0 .../bo}/boot/builder.sh | 0 .../default.nix => unit/bo/boot/pkg-fun.nix} | 0 .../bo/bootil/pkg-fun.nix} | 0 .../bo/bootiso/pkg-fun.nix} | 0 .../bo/bootspec/pkg-fun.nix} | 0 .../bo/bootstrap-studio/pkg-fun.nix} | 0 .../bo/borg-sans-mono/pkg-fun.nix} | 0 .../bo/borgbackup/pkg-fun.nix} | 0 .../bo/borgmatic/pkg-fun.nix} | 0 .../bo/boringssl/pkg-fun.nix} | 0 .../bo/boringtun/pkg-fun.nix} | 0 .../default.nix => unit/bo/boron/pkg-fun.nix} | 0 .../bo/bosh-cli/pkg-fun.nix} | 0 .../bo/bossa-arduino/pkg-fun.nix} | 0 .../default.nix => unit/bo/bosun/pkg-fun.nix} | 0 .../bo/bottles-unwrapped/pkg-fun.nix} | 0 .../bo/bottles-unwrapped}/vulkan_icd.patch | 0 .../bo/bottles/pkg-fun.nix} | 0 .../bo/bottom-rs/pkg-fun.nix} | 0 .../bo/bottom/pkg-fun.nix} | 0 .../bo}/boulder/no-build-id-test.patch | 0 .../bo/boulder/pkg-fun.nix} | 0 .../bo/boundary/pkg-fun.nix} | 0 .../networking => unit/bo}/boundary/update.sh | 0 .../bo/bowtie/pkg-fun.nix} | 0 .../bo/bowtie2/pkg-fun.nix} | 0 .../default.nix => unit/bo/box2d/pkg-fun.nix} | 0 .../default.nix => unit/bo/box64/pkg-fun.nix} | 0 .../default.nix => unit/bo/boxes/pkg-fun.nix} | 0 .../bo/boxfort/pkg-fun.nix} | 0 .../default.nix => unit/bo/boxfs/pkg-fun.nix} | 0 .../bo}/boxfs/work-around-API-borkage.patch | 0 .../bp/bpf-linker/pkg-fun.nix} | 0 .../bp/bpfmon/pkg-fun.nix} | 0 .../include-asm-types-for-ppc64le.patch | 0 .../bp/bpftools/pkg-fun.nix} | 0 .../bp}/bpftools/strip-binary-name.patch | 0 .../bpkg.nix => unit/bp/bpkg/pkg-fun.nix} | 0 .../bp/bpm-tools/pkg-fun.nix} | 0 .../bp/bpytop/pkg-fun.nix} | 0 .../br/braincurses/pkg-fun.nix} | 0 .../analysis => unit/br}/brakeman/Gemfile | 0 .../br}/brakeman/Gemfile.lock | 0 .../analysis => unit/br}/brakeman/gemset.nix | 0 .../br/brakeman/pkg-fun.nix} | 0 .../br/brasero/pkg-fun.nix} | 0 .../default.nix => unit/br/brave/pkg-fun.nix} | 0 .../browsers => unit/br}/brave/update.sh | 0 .../br/breakpad/pkg-fun.nix} | 0 .../br/breitbandmessung/pkg-fun.nix} | 0 .../br/brgenml1cupswrapper/pkg-fun.nix} | 0 .../default.nix => unit/br/brial/pkg-fun.nix} | 0 .../br/briar-desktop/pkg-fun.nix} | 0 .../br/brickd/pkg-fun.nix} | 0 .../br}/bridge-utils/autoconf-ar.patch | 0 .../br/bridge-utils/pkg-fun.nix} | 0 .../default.nix => unit/br/brig/pkg-fun.nix} | 0 .../br/brigand/pkg-fun.nix} | 0 .../br/brightnessctl/pkg-fun.nix} | 0 .../br/brillo/pkg-fun.nix} | 0 .../linux => unit/br}/brillo/udev-rule.patch | 0 .../misc => unit/br}/brise/fetchPackages.nix | 0 .../default.nix => unit/br/brise/pkg-fun.nix} | 0 .../default.nix => unit/br/briss/pkg-fun.nix} | 0 .../br/bristol/pkg-fun.nix} | 0 .../br/brlaser/pkg-fun.nix} | 0 .../br/brltty/pkg-fun.nix} | 0 .../br/brmodelo/pkg-fun.nix} | 0 .../br/broadcom-bt-firmware/pkg-fun.nix} | 0 .../br/broadlink-cli/pkg-fun.nix} | 0 .../br/brogue/pkg-fun.nix} | 0 .../br/bront_fonts/pkg-fun.nix} | 0 .../default.nix => unit/br/brook/pkg-fun.nix} | 0 .../br/brotli/pkg-fun.nix} | 0 .../br/browserpass/pkg-fun.nix} | 0 .../br/browsh/pkg-fun.nix} | 0 .../br/brscan4/pkg-fun.nix} | 0 .../backends => unit/br}/brscan4/preload.c | 0 .../br}/brscan4/udev_rules_type1.nix | 0 .../br/brscan5/pkg-fun.nix} | 0 .../br/brunsli/pkg-fun.nix} | 0 .../br/brutalmaze/pkg-fun.nix} | 0 .../br/bruteforce-luks/pkg-fun.nix} | 0 .../br/brutespray/pkg-fun.nix} | 0 .../bs}/bs-platform/build-bs-platform.nix | 0 .../bs-platform/jscomp-release-ninja.patch | 0 .../bs}/bs-platform/ocaml.nix | 0 .../bs/bs-platform/pkg-fun.nix} | 0 .../bs/bschaffl/pkg-fun.nix} | 0 .../bs/bsd-finger/pkg-fun.nix} | 0 .../bs}/bsd-finger/ubuntu-0.17-9.patch | 0 .../bs/bsdbuild/pkg-fun.nix} | 0 .../bs/bsdgames/pkg-fun.nix} | 0 .../bs}/bsdiff/CVE-2020-14315.patch | 0 .../bs}/bsdiff/include-systypes.patch | 0 .../bs/bsdiff/pkg-fun.nix} | 0 .../bs/bsequencer/pkg-fun.nix} | 0 .../bs/bshapr/pkg-fun.nix} | 0 .../bs/bslizr/pkg-fun.nix} | 0 .../bs/bsp-layout/pkg-fun.nix} | 0 .../default.nix => unit/bs/bspwm/pkg-fun.nix} | 0 .../bt/bt-fw-converter/pkg-fun.nix} | 0 .../bt/btanks/pkg-fun.nix} | 0 .../default.nix => unit/bt/btar/pkg-fun.nix} | 0 .../default.nix => unit/bt/btcd/pkg-fun.nix} | 0 .../bt/btcdeb/pkg-fun.nix} | 0 .../default.nix => unit/bt/btdu/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/bt}/btdu/update.py | 0 .../default.nix => unit/bt/btfs/pkg-fun.nix} | 0 .../bt/btor2tools/pkg-fun.nix} | 0 .../default.nix => unit/bt/btrbk/pkg-fun.nix} | 0 .../bt/btrfs-heatmap/pkg-fun.nix} | 0 .../bt/btrfs-progs/pkg-fun.nix} | 0 .../bt/btrfs-snap/pkg-fun.nix} | 0 .../bu/bubblemail/pkg-fun.nix} | 0 .../bu/bubblewrap/pkg-fun.nix} | 0 .../bu}/buck/pex-mtime.patch | 0 .../default.nix => unit/bu/buck/pkg-fun.nix} | 0 .../bu}/buddy/gcc-4.3.3-fixes.patch | 0 .../default.nix => unit/bu/buddy/pkg-fun.nix} | 0 .../bu/buf-language-server/pkg-fun.nix} | 0 .../default.nix => unit/bu/buf/pkg-fun.nix} | 0 .../bu}/buf/skip_test_requiring_dotgit.patch | 0 .../bu}/buf/skip_test_requiring_network.patch | 0 .../bu/buildBowerComponents/pkg-fun.nix} | 0 .../bu/buildDotnetModule}/hooks/default.nix | 0 .../hooks/dotnet-build-hook.sh | 0 .../hooks/dotnet-check-hook.sh | 0 .../hooks/dotnet-configure-hook.sh | 0 .../hooks/dotnet-fixup-hook.sh | 0 .../hooks/dotnet-install-hook.sh | 0 .../bu/buildDotnetModule/pkg-fun.nix} | 0 .../bu/buildDotnetPackage/pkg-fun.nix} | 0 .../bu/buildEmscriptenPackage/pkg-fun.nix} | 0 .../buildenv => unit/bu/buildEnv}/builder.pl | 0 .../bu/buildEnv/pkg-fun.nix} | 0 .../bu/buildFHSUserEnvBubblewrap}/env.nix | 0 .../bu/buildFHSUserEnvBubblewrap/pkg-fun.nix} | 0 .../chrootenv/default.nix | 0 .../chrootenv/src/chrootenv.c | 0 .../chrootenv/src/meson.build | 0 .../bu/buildFHSUserEnvChroot}/env.nix | 0 .../bu/buildFHSUserEnvChroot/pkg-fun.nix} | 0 .../bu/buildMaven/pkg-fun.nix} | 0 .../bu/buildNpmPackage/pkg-fun.nix} | 0 .../bu/buildRustCrate}/build-crate.nix | 0 .../bu/buildRustCrate}/configure-crate.nix | 0 .../bu/buildRustCrate}/install-crate.nix | 0 .../bu/buildRustCrate}/lib.sh | 0 .../bu/buildRustCrate}/log.nix | 0 .../bu/buildRustCrate/pkg-fun.nix} | 0 .../bu/buildRustCrateHelpers/pkg-fun.nix} | 0 .../bu/buildah-unwrapped/pkg-fun.nix} | 0 .../bu/buildah/pkg-fun.nix} | 0 .../bu/buildkit-nix/pkg-fun.nix} | 0 .../bu/buildkit/pkg-fun.nix} | 0 .../bu/buildkite-agent-metrics/pkg-fun.nix} | 0 .../bu/buildkite-agent/pkg-fun.nix} | 0 .../bu/buildkite-cli/pkg-fun.nix} | 0 .../bu/buildpack/pkg-fun.nix} | 0 .../bu/buildtorrent/pkg-fun.nix} | 0 .../default.nix => unit/bu/buku/pkg-fun.nix} | 0 .../bu/bukubrow/pkg-fun.nix} | 0 .../default.nix => unit/bu/bukut/pkg-fun.nix} | 0 .../bu/bulletml/pkg-fun.nix} | 0 .../default.nix => unit/bu/bully/pkg-fun.nix} | 0 .../default.nix => unit/bu/bump/pkg-fun.nix} | 0 .../bu/bumpver/pkg-fun.nix} | 0 .../default.nix => unit/bu/bun/pkg-fun.nix} | 0 .../bu/bundix/pkg-fun.nix} | 0 .../bu}/bundler-audit/Gemfile | 0 .../bu}/bundler-audit/Gemfile.lock | 0 .../bu}/bundler-audit/gemset.nix | 0 .../bu/bundler-audit/pkg-fun.nix} | 0 .../bu/bundler/pkg-fun.nix} | 0 .../bu/bundlerUpdateScript/pkg-fun.nix} | 0 .../bu/bundletool/pkg-fun.nix} | 0 .../bu/bunnyfetch/pkg-fun.nix} | 0 .../bu/bunyan-rs/pkg-fun.nix} | 0 .../default.nix => unit/bu/bup/pkg-fun.nix} | 0 .../default.nix => unit/bu/bupc/pkg-fun.nix} | 0 .../bu/bupstash/pkg-fun.nix} | 0 .../default.nix => unit/bu/burp/pkg-fun.nix} | 0 .../bu/burpsuite/pkg-fun.nix} | 0 .../bu}/busybox/busybox-in-store.patch | 0 .../bu}/busybox/clang-cross.patch | 0 .../bu/busybox/pkg-fun.nix} | 0 .../bu/butane/pkg-fun.nix} | 0 .../bu/buttercup-desktop/pkg-fun.nix} | 0 .../default.nix => unit/bv/bvi/pkg-fun.nix} | 0 .../bv/bviplus/pkg-fun.nix} | 0 .../default.nix => unit/bw/bwa/pkg-fun.nix} | 0 .../bw/bwbasic/pkg-fun.nix} | 0 .../bw/bwidget/pkg-fun.nix} | 0 .../bw/bwm_ng/pkg-fun.nix} | 0 .../default.nix => unit/by/byacc/pkg-fun.nix} | 0 .../by}/byzanz/add-amflags.patch | 0 .../by/byzanz/pkg-fun.nix} | 0 .../default.nix => unit/bz/bzip2/pkg-fun.nix} | 0 .../1_1.nix => unit/bz/bzip2_1_1/pkg-fun.nix} | 0 .../default.nix => unit/bz/bzrtp/pkg-fun.nix} | 0 .../c-/c-blosc/pkg-fun.nix} | 0 .../default.nix => unit/c2/c2ffi/pkg-fun.nix} | 0 .../default.nix => unit/c3/c3c/pkg-fun.nix} | 0 .../ca/cabextract/pkg-fun.nix} | 0 .../default.nix => unit/ca/cabin/pkg-fun.nix} | 0 .../ca/cacert/pkg-fun.nix} | 0 .../misc => unit/ca}/cacert/setup-hook.sh | 0 .../ca}/cacert/test-cert-file.crt | 0 pkgs/{data/misc => unit/ca}/cacert/update.sh | 0 .../ca/cached-nix-shell/pkg-fun.nix} | 0 .../ca/cachefilesd/pkg-fun.nix} | 0 .../ca/cadaver/pkg-fun.nix} | 0 .../default.nix => unit/ca/caddy/pkg-fun.nix} | 0 .../ca/cadical/pkg-fun.nix} | 0 .../tools => unit/ca}/cadre/Gemfile | 0 .../tools => unit/ca}/cadre/Gemfile.lock | 0 .../tools => unit/ca}/cadre/gemset.nix | 0 .../default.nix => unit/ca/cadre/pkg-fun.nix} | 0 .../ca/cadvisor/pkg-fun.nix} | 0 .../ca/caerbannog/pkg-fun.nix} | 0 .../default.nix => unit/ca/caf/pkg-fun.nix} | 0 .../default.nix => unit/ca/cairo/pkg-fun.nix} | 0 .../cairo/skip-configure-stderr-check.patch | 0 .../ca/cairomm/pkg-fun.nix} | 0 .../ca/cakelisp/pkg-fun.nix} | 0 .../ca}/caladea/cambria-alias.conf | 0 .../ca/caladea/pkg-fun.nix} | 0 .../calamares-nixos-extensions/pkg-fun.nix} | 0 .../default.nix => unit/ca/calc/pkg-fun.nix} | 0 .../ca/calcium/pkg-fun.nix} | 0 .../ca}/calcoo/0001-javac-encoding.diff | 0 .../ca/calcoo/pkg-fun.nix} | 0 .../math => unit/ca}/calculix/calculix.patch | 0 .../ca/calculix/pkg-fun.nix} | 0 .../ca/calcurse/pkg-fun.nix} | 0 .../ca/calendar-cli/pkg-fun.nix} | 0 .../ca}/calibre-web/db-migrations.patch | 0 .../ca}/calibre-web/default-logger.patch | 0 .../ca/calibre-web/pkg-fun.nix} | 0 .../ca/callaudiod/pkg-fun.nix} | 0 .../default.nix => unit/ca/calls/pkg-fun.nix} | 0 .../ca/cambalache/pkg-fun.nix} | 0 .../ca/cameradar/pkg-fun.nix} | 0 .../ca/camingo-code/pkg-fun.nix} | 0 .../ca/can-utils/pkg-fun.nix} | 0 .../ca/canokey-qemu/pkg-fun.nix} | 0 .../ca/canon-cups-ufr2/pkg-fun.nix} | 0 .../ca/canonicalize-jar}/canonicalize-jar.sh | 0 .../ca/canonicalize-jar/pkg-fun.nix} | 0 .../ca/canta-theme/pkg-fun.nix} | 0 .../ca/cantarell-fonts/pkg-fun.nix} | 0 .../ca/canto-curses/pkg-fun.nix} | 0 .../ca/canto-daemon/pkg-fun.nix} | 0 .../ca/cantoolz/pkg-fun.nix} | 0 .../ca/capitaine-cursors-themed/pkg-fun.nix} | 0 .../ca/capitaine-cursors/pkg-fun.nix} | 0 .../ca/capnproto-java/pkg-fun.nix} | 0 .../ca/capnproto/pkg-fun.nix} | 0 .../ca/caprice32/pkg-fun.nix} | 0 .../ca}/caprice32/string.patch | 0 .../ca}/caprine-bin/build-from-appimage.nix | 0 .../ca}/caprine-bin/build-from-dmg.nix | 0 .../ca/caprine-bin/pkg-fun.nix} | 0 .../default.nix => unit/ca/caps/pkg-fun.nix} | 0 .../ca/capstone/pkg-fun.nix} | 0 .../ca/captive-browser/pkg-fun.nix} | 0 .../ca/capture/pkg-fun.nix} | 0 .../ca/carapace/pkg-fun.nix} | 0 .../ca/cardboard/pkg-fun.nix} | 0 .../ca/carddav-util/pkg-fun.nix} | 0 .../ca/cardinal/pkg-fun.nix} | 0 .../default.nix => unit/ca/cardo/pkg-fun.nix} | 0 .../ca/cargo-about/pkg-fun.nix} | 0 .../ca}/cargo-about/update-mimalloc.patch | 0 .../ca}/cargo-about/zstd-pkg-config.patch | 0 .../ca/cargo-all-features/pkg-fun.nix} | 0 .../ca/cargo-apk/pkg-fun.nix} | 0 .../ca/cargo-binutils/pkg-fun.nix} | 0 .../ca/cargo-bitbake/pkg-fun.nix} | 0 .../ca/cargo-bloat/pkg-fun.nix} | 0 .../ca/cargo-bolero/pkg-fun.nix} | 0 .../ca/cargo-bootimage/pkg-fun.nix} | 0 .../ca/cargo-careful/pkg-fun.nix} | 0 .../ca/cargo-chef/pkg-fun.nix} | 0 .../ca/cargo-criterion/pkg-fun.nix} | 0 .../ca/cargo-cross/pkg-fun.nix} | 0 .../ca/cargo-deb/pkg-fun.nix} | 0 .../ca/cargo-depgraph/pkg-fun.nix} | 0 .../ca/cargo-deps/pkg-fun.nix} | 0 .../ca/cargo-diet/pkg-fun.nix} | 0 .../ca/cargo-espmonitor/pkg-fun.nix} | 0 .../ca/cargo-expand/pkg-fun.nix} | 0 .../ca/cargo-feature/pkg-fun.nix} | 0 .../ca/cargo-fuzz/pkg-fun.nix} | 0 .../ca}/cargo-generate/no-vendor.patch | 0 .../ca/cargo-generate/pkg-fun.nix} | 0 .../ca/cargo-graph/pkg-fun.nix} | 0 .../ca/cargo-guppy/pkg-fun.nix} | 0 .../ca/cargo-hack/pkg-fun.nix} | 0 .../ca/cargo-hakari/pkg-fun.nix} | 0 .../ca/cargo-insta/pkg-fun.nix} | 0 .../ca/cargo-kcov/pkg-fun.nix} | 0 .../ca/cargo-license/pkg-fun.nix} | 0 .../ca/cargo-limit/pkg-fun.nix} | 0 .../ca/cargo-llvm-cov/pkg-fun.nix} | 0 .../ca/cargo-llvm-lines/pkg-fun.nix} | 0 .../ca/cargo-lock/pkg-fun.nix} | 0 .../ca/cargo-modules/pkg-fun.nix} | 0 .../ca/cargo-mommy/pkg-fun.nix} | 0 .../ca/cargo-play/pkg-fun.nix} | 0 .../ca/cargo-profiler/pkg-fun.nix} | 0 .../ca/cargo-public-api/pkg-fun.nix} | 0 .../ca/cargo-readme/pkg-fun.nix} | 0 .../ca/cargo-release/pkg-fun.nix} | 0 .../ca/cargo-rr/pkg-fun.nix} | 0 .../ca/cargo-semver-checks/pkg-fun.nix} | 0 .../ca/cargo-show-asm/pkg-fun.nix} | 0 .../ca}/cargo-show-asm/test-basic-x86_64.nix | 0 .../ca/cargo-sort/pkg-fun.nix} | 0 .../ca/cargo-sweep/pkg-fun.nix} | 0 .../ca/cargo-sync-readme/pkg-fun.nix} | 0 .../ca/cargo-tally/pkg-fun.nix} | 0 .../ca/cargo-tauri/pkg-fun.nix} | 0 .../ca/cargo-temp/pkg-fun.nix} | 0 .../ca/cargo-unused-features/pkg-fun.nix} | 0 .../ca/cargo-valgrind/pkg-fun.nix} | 0 .../ca/cargo-wipe/pkg-fun.nix} | 0 .../ca/cargo-xbuild/pkg-fun.nix} | 0 .../ca/cargo-zigbuild/pkg-fun.nix} | 0 .../ca/cargo2junit/pkg-fun.nix} | 0 .../ca/cariddi/pkg-fun.nix} | 0 .../ca}/carlito/calibri-alias.conf | 0 .../ca/carlito/pkg-fun.nix} | 0 .../ca/caroline/pkg-fun.nix} | 0 .../default.nix => unit/ca/carp/pkg-fun.nix} | 0 .../ca/carps-cups/pkg-fun.nix} | 0 .../ca/cascadia-code/pkg-fun.nix} | 0 .../ca/cassandra-cpp-driver/pkg-fun.nix} | 0 .../ca/cassowary/pkg-fun.nix} | 0 .../ca/castget/pkg-fun.nix} | 0 .../ca/castor/pkg-fun.nix} | 0 .../ca/castty/pkg-fun.nix} | 0 .../ca/castxml/pkg-fun.nix} | 0 .../ca/cataclysmDDA}/builder.nix | 0 .../ca/cataclysmDDA}/common.nix | 0 .../ca/cataclysmDDA}/git.nix | 0 .../ca/cataclysmDDA}/lib.nix | 0 .../ca/cataclysmDDA}/locale-path-git.patch | 0 .../ca/cataclysmDDA}/locale-path-stable.patch | 0 .../ca/cataclysmDDA/pkg-fun.nix} | 0 .../ca/cataclysmDDA}/pkgs/default.nix | 0 .../pkgs/tilesets/UndeadPeople/default.nix | 0 .../ca/cataclysmDDA}/stable.nix | 0 .../ca/cataclysmDDA}/wrapper.nix | 0 .../ca/catatonit/pkg-fun.nix} | 0 .../default.nix => unit/ca/catch/pkg-fun.nix} | 0 .../ca/catch2/pkg-fun.nix} | 0 .../3.nix => unit/ca/catch2_3/pkg-fun.nix} | 0 .../ca/catclock/pkg-fun.nix} | 0 .../ca/catdoc/pkg-fun.nix} | 0 .../ca/catdocx/pkg-fun.nix} | 0 .../ca}/catfs/fix-for-rust-1.65.diff | 0 .../default.nix => unit/ca/catfs/pkg-fun.nix} | 0 .../ca/catgirl/pkg-fun.nix} | 0 .../ca/catimg/pkg-fun.nix} | 0 .../ca/catppuccin-cursors/pkg-fun.nix} | 0 .../ca/catppuccin-gtk/pkg-fun.nix} | 0 .../ca/catppuccin-kde/pkg-fun.nix} | 0 .../default.nix => unit/ca/catt/pkg-fun.nix} | 0 .../ca/caudec/pkg-fun.nix} | 0 .../ca/cauwugo/pkg-fun.nix} | 0 .../default.nix => unit/ca/cava/pkg-fun.nix} | 0 .../ca/cawbird/pkg-fun.nix} | 0 .../ca/cayley/pkg-fun.nix} | 0 .../cb/cbatticon/pkg-fun.nix} | 0 .../default.nix => unit/cb/cbc/pkg-fun.nix} | 0 .../default.nix => unit/cb/cbfmt/pkg-fun.nix} | 0 .../default.nix => unit/cb/cbftp/pkg-fun.nix} | 0 ...001-Do-not-download-sources-in-cmake.patch | 0 .../default.nix => unit/cb/cbmc/pkg-fun.nix} | 0 .../cb/cbonsai/pkg-fun.nix} | 0 .../tools => unit/cb}/cbor-diag/Gemfile | 0 .../tools => unit/cb}/cbor-diag/Gemfile.lock | 0 .../tools => unit/cb}/cbor-diag/gemset.nix | 0 .../cb/cbor-diag/pkg-fun.nix} | 0 .../cb}/cbrowser/backslashes-quotes.diff | 0 .../cb/cbrowser/pkg-fun.nix} | 0 .../cc/cc-tool/pkg-fun.nix} | 0 .../default.nix => unit/cc/cc65/pkg-fun.nix} | 0 .../cc}/ccache/force-objdump-on-darwin.patch | 0 .../cc/ccache/pkg-fun.nix} | 0 .../analysis => unit/cc}/cccc/cccc.patch | 0 .../default.nix => unit/cc/cccc/pkg-fun.nix} | 0 .../cc/ccd2iso/pkg-fun.nix} | 0 .../cc/ccemux/pkg-fun.nix} | 0 .../cc/ccextractor/pkg-fun.nix} | 0 .../default.nix => unit/cc/ccid/pkg-fun.nix} | 0 .../cc/ccloud-cli/pkg-fun.nix} | 0 .../default.nix => unit/cc/cconv/pkg-fun.nix} | 0 .../default.nix => unit/cc/ccrtp/pkg-fun.nix} | 0 .../cc/ccrypt/pkg-fun.nix} | 0 .../cc/ccsymbols/pkg-fun.nix} | 0 .../default.nix => unit/cc/ccze/pkg-fun.nix} | 0 .../tools => unit/cd}/cddl/Gemfile | 0 .../tools => unit/cd}/cddl/Gemfile.lock | 0 .../tools => unit/cd}/cddl/gemset.nix | 0 .../default.nix => unit/cd/cddl/pkg-fun.nix} | 0 .../cd/cddlib/pkg-fun.nix} | 0 .../default.nix => unit/cd/cde/pkg-fun.nix} | 0 .../cd}/cdecl/cdecl-2.5-lex.patch | 0 .../default.nix => unit/cd/cdecl/pkg-fun.nix} | 0 ...cated-sys_errlist-and-replace-with-A.patch | 0 .../cd}/cdesktopenv/2.3.2.patch | 0 .../cd/cdesktopenv/pkg-fun.nix} | 0 .../cd/cdi2iso/pkg-fun.nix} | 0 .../cd}/cdimgtools/nrgtool_fix_my.patch | 0 .../cd/cdimgtools/pkg-fun.nix} | 0 .../removed_dvdcss_interface_2.patch | 0 .../cd/cdk-go/pkg-fun.nix} | 0 .../default.nix => unit/cd/cdk/pkg-fun.nix} | 0 .../default.nix => unit/cd/cdo/pkg-fun.nix} | 0 .../cd/cdogs-sdl/pkg-fun.nix} | 0 .../default.nix => unit/cd/cdpr/pkg-fun.nix} | 0 .../adjust-includes-for-glibc-212.patch | 0 .../cd/cdrdao/pkg-fun.nix} | 0 .../cd}/cdrkit/cdrkit-1.1.11-fno-common.patch | 0 .../cd}/cdrkit/cdrkit-1.1.9-efi-boot.patch | 0 .../cd}/cdrkit/include-path.patch | 0 .../cd/cdrkit/pkg-fun.nix} | 0 .../cd/cdxgen/pkg-fun.nix} | 0 .../default.nix => unit/ce/celf/pkg-fun.nix} | 0 .../ce/celluloid/pkg-fun.nix} | 0 .../ce}/cemu/cmakelists.patch | 0 .../default.nix => unit/ce/cemu/pkg-fun.nix} | 0 .../default.nix => unit/ce/cen64/pkg-fun.nix} | 0 .../ce/centerim/pkg-fun.nix} | 0 .../ce/ceph-csi/pkg-fun.nix} | 0 .../ce/ceptre/pkg-fun.nix} | 0 .../ce/cereal/pkg-fun.nix} | 0 ...her-than-sys_errlist-to-fix-compilat.patch | 0 .../physics => unit/ce}/cernlib/patch.patch | 0 .../ce/cernlib/pkg-fun.nix} | 0 .../physics => unit/ce}/cernlib/setup-hook.sh | 0 .../ce/certgraph/pkg-fun.nix} | 0 .../ce/certigo/pkg-fun.nix} | 0 .../ce/certipy/pkg-fun.nix} | 0 .../ce/certstrap/pkg-fun.nix} | 0 pkgs/{tools/security => unit/ce}/cewl/Gemfile | 0 .../security => unit/ce}/cewl/Gemfile.lock | 0 .../security => unit/ce}/cewl/gemset.nix | 0 .../default.nix => unit/ce/cewl/pkg-fun.nix} | 0 .../cf/cf-terraforming/pkg-fun.nix} | 0 .../cf/cf-vault/pkg-fun.nix} | 0 .../default.nix => unit/cf/cfdg/pkg-fun.nix} | 0 .../cf}/cfdg/src-info-for-default.nix | 0 .../cf}/cfitsio/darwin-rpath-universal.patch | 0 .../cf/cfitsio/pkg-fun.nix} | 0 .../default.nix => unit/cf/cflow/pkg-fun.nix} | 0 .../default.nix => unit/cf/cfm/pkg-fun.nix} | 0 .../tools => unit/cf}/cfn-nag/Gemfile | 0 .../tools => unit/cf}/cfn-nag/Gemfile.lock | 0 .../tools => unit/cf}/cfn-nag/gemset.nix | 0 .../cf/cfn-nag/pkg-fun.nix} | 0 .../cf/cfonts/pkg-fun.nix} | 0 .../default.nix => unit/cf/cfr/pkg-fun.nix} | 0 .../cf/cfripper/pkg-fun.nix} | 0 .../cf/cfs-zen-tweaks/pkg-fun.nix} | 0 .../default.nix => unit/cf/cfssl/pkg-fun.nix} | 0 .../default.nix => unit/cg/cg3/pkg-fun.nix} | 0 .../default.nix => unit/cg/cgdb/pkg-fun.nix} | 0 .../cg/cgiserver/pkg-fun.nix} | 0 .../default.nix => unit/cg/cglm/pkg-fun.nix} | 0 .../cg/cgminer/pkg-fun.nix} | 0 .../cg/cgoban/pkg-fun.nix} | 0 .../cg/cgreen/pkg-fun.nix} | 0 .../default.nix => unit/cg/cgui/pkg-fun.nix} | 0 .../ch/CHOWTapeModel/pkg-fun.nix} | 0 .../ch/ChowCentaur/pkg-fun.nix} | 0 .../ch/ChowKick/pkg-fun.nix} | 0 .../ch/ChowPhaser/pkg-fun.nix} | 0 .../ch/chain-bench/pkg-fun.nix} | 0 .../ch/chamber/pkg-fun.nix} | 0 .../ch/changedetection-io/pkg-fun.nix} | 0 .../ch/changelogger/pkg-fun.nix} | 0 .../ch/changetower/pkg-fun.nix} | 0 .../ch/changie/pkg-fun.nix} | 0 .../ch}/changie/skip-flaky-test.patch | 0 .../default.nix => unit/ch/chaos/pkg-fun.nix} | 0 .../ch/charge-lnd/pkg-fun.nix} | 0 .../ch/charis-sil/pkg-fun.nix} | 0 .../ch/charliecloud/pkg-fun.nix} | 0 .../ch/charls/pkg-fun.nix} | 0 .../default.nix => unit/ch/charm/pkg-fun.nix} | 0 .../ch/chart-testing/pkg-fun.nix} | 0 .../default.nix => unit/ch/chase/pkg-fun.nix} | 0 .../ch/chatty/pkg-fun.nix} | 0 .../default.nix => unit/ch/cheat/pkg-fun.nix} | 0 .../ch/check-esxi-hardware/pkg-fun.nix} | 0 .../ch/check-jsonschema/pkg-fun.nix} | 0 .../ch/check-openvpn/pkg-fun.nix} | 0 .../ch/check-uptime/pkg-fun.nix} | 0 .../ch/check-wmiplus/pkg-fun.nix} | 0 .../check-wmiplus}/wmiplus_fix_manpage.patch | 0 .../ch/checkSSLCert/pkg-fun.nix} | 0 .../ch/check_smartmon/pkg-fun.nix} | 0 .../ch/check_systemd/pkg-fun.nix} | 0 .../zfs.nix => unit/ch/check_zfs/pkg-fun.nix} | 0 .../ch/checkbashisms/pkg-fun.nix} | 0 .../ch}/checkinstall/empty-dirs.patch | 0 .../ch}/checkinstall/etc-dirs.patch | 0 .../ch}/checkinstall/glibc-check.patch | 0 .../ch}/checkinstall/missing-functions.patch | 0 .../ch/checkinstall/pkg-fun.nix} | 0 .../ch}/checkinstall/readlink-types.patch | 0 .../ch}/checkinstall/scandir.patch | 0 .../ch}/checkinstall/set-buildroot.patch | 0 .../ch}/checkinstall/use-old-memcpy.patch | 0 .../ch/checkip/pkg-fun.nix} | 0 .../ch/checkmake/pkg-fun.nix} | 0 .../ch/checkmate/pkg-fun.nix} | 0 .../ch}/checkov/flake8-compat-5.x.patch | 0 .../ch/checkov/pkg-fun.nix} | 0 .../ch/checkpolicy/pkg-fun.nix} | 0 .../ch/checkra1n/pkg-fun.nix} | 0 ...dprobe-config-before-checking-kernel.patch | 0 .../ch/checksec/pkg-fun.nix} | 0 .../ch/checkstyle/pkg-fun.nix} | 0 ...01-Drop-baked-in-build-date-for-r13y.patch | 0 ...end-libSDL.dylib-to-macOS-SDL-loader.patch | 0 .../ch/cheesecutter/pkg-fun.nix} | 0 .../tools => unit/ch}/chefdk/Gemfile | 0 .../tools => unit/ch}/chefdk/Gemfile.lock | 0 .../tools => unit/ch}/chefdk/gemset.nix | 0 .../ch/chefdk/pkg-fun.nix} | 0 .../default.nix => unit/ch/chelf/pkg-fun.nix} | 0 .../ch/chemtool/pkg-fun.nix} | 0 .../ch/cherry/pkg-fun.nix} | 0 .../ch/cherrytree/pkg-fun.nix} | 0 .../ch/chessdb/pkg-fun.nix} | 0 .../ch/chez-matchable/pkg-fun.nix} | 0 .../ch/chez-mit/pkg-fun.nix} | 0 .../ch/chez-racket/pkg-fun.nix} | 0 .../ch}/chez-racket/setup-hook.sh | 0 .../ch}/chez-racket/shared.nix | 0 .../ch/chez-scmutils/pkg-fun.nix} | 0 .../ch/chez-srfi/pkg-fun.nix} | 0 .../ch/chezmoi/pkg-fun.nix} | 0 .../ch}/chia-dev-tools/fix-paths.patch | 0 .../ch/chia-dev-tools/pkg-fun.nix} | 0 .../dont_fetch_dependencies.patch | 0 .../ch/chia-plotter/pkg-fun.nix} | 0 .../default.nix => unit/ch/chia/pkg-fun.nix} | 0 .../default.nix => unit/ch/chibi/pkg-fun.nix} | 0 ...1-Introduce-CHICKEN_REPOSITORY_EXTRA.patch | 0 .../ch/chickenPackages_4}/chicken.nix | 0 .../ch/chickenPackages_4}/egg2nix.nix | 0 .../ch/chickenPackages_4}/eggDerivation.nix | 0 .../4 => unit/ch/chickenPackages_4}/eggs.nix | 0 .../ch/chickenPackages_4}/fetchegg/builder.sh | 0 .../chickenPackages_4}/fetchegg/default.nix | 0 .../ch/chickenPackages_4}/overrides.nix | 0 .../ch/chickenPackages_4/pkg-fun.nix} | 0 .../ch/chickenPackages_4}/setup-hook.sh | 0 .../ch/chickenPackages_5}/chicken.nix | 0 .../ch/chickenPackages_5}/egg2nix.nix | 0 .../ch/chickenPackages_5}/eggDerivation.nix | 0 .../5 => unit/ch/chickenPackages_5}/eggs.nix | 0 .../ch/chickenPackages_5}/fetchegg/builder.sh | 0 .../chickenPackages_5}/fetchegg/default.nix | 0 .../ch/chickenPackages_5}/overrides.nix | 0 .../ch/chickenPackages_5/pkg-fun.nix} | 0 .../ch/chickenPackages_5}/setup-hook.sh | 0 .../ch/chipmunk/pkg-fun.nix} | 0 .../default.nix => unit/ch/chirp/pkg-fun.nix} | 0 .../ch/chisel/pkg-fun.nix} | 0 .../ch/chkcrontab/pkg-fun.nix} | 0 .../ch/chkrootkit/pkg-fun.nix} | 0 .../ch/chkservice/pkg-fun.nix} | 0 .../ch/chmlib/pkg-fun.nix} | 0 .../00-chntpw-build-arch-autodetect.patch | 0 .../ch}/chntpw/01-chntpw-install-target.patch | 0 .../ch/chntpw/pkg-fun.nix} | 0 .../ch/chocolateDoom/pkg-fun.nix} | 0 .../ch/cholmod-extra/pkg-fun.nix} | 0 .../ch/chonburi-font/pkg-fun.nix} | 0 .../ch/choose/pkg-fun.nix} | 0 .../ch/chopchop/pkg-fun.nix} | 0 .../ch/chroma/pkg-fun.nix} | 0 pkgs/{tools/text => unit/ch}/chroma/src.json | 0 .../ch/chromaprint/pkg-fun.nix} | 0 .../ch/chrome-export/pkg-fun.nix} | 0 .../ch/chromium-bsu/pkg-fun.nix} | 0 .../ch/chromium-xorg-conf/pkg-fun.nix} | 0 .../ch}/chrony/makefile.patch | 0 .../ch/chrony/pkg-fun.nix} | 0 .../ch/chrpath/pkg-fun.nix} | 0 .../ch/chruby-fish/pkg-fun.nix} | 0 .../ch/chrysalis/pkg-fun.nix} | 0 .../ch/cht-sh/pkg-fun.nix} | 0 .../ch/chunkfs/pkg-fun.nix} | 0 .../ch/chunksync/pkg-fun.nix} | 0 .../default.nix => unit/ci/ciao/pkg-fun.nix} | 0 .../ci/cicero-tui/pkg-fun.nix} | 0 .../default.nix => unit/ci/cider/pkg-fun.nix} | 0 .../ci/cidrgrep/pkg-fun.nix} | 0 .../ci/cie-middleware-linux/pkg-fun.nix} | 0 .../ci/cifs-utils/pkg-fun.nix} | 0 .../ci/cilium-cli/pkg-fun.nix} | 0 .../default.nix => unit/ci/cimg/pkg-fun.nix} | 0 .../ci/cinelerra/pkg-fun.nix} | 0 .../ci/ciopfs/pkg-fun.nix} | 0 .../ci/cipher/pkg-fun.nix} | 0 .../ci/circleci-cli/pkg-fun.nix} | 0 .../ci/circumflex/pkg-fun.nix} | 0 .../ci/circup/pkg-fun.nix} | 0 .../ci/circus/pkg-fun.nix} | 0 .../ci/cirrus-cli/pkg-fun.nix} | 0 .../ci/cirrusgo/pkg-fun.nix} | 0 .../ci/ciscoPacketTracer7/pkg-fun.nix} | 0 .../ci/ciscoPacketTracer8/pkg-fun.nix} | 0 .../ci/citations/pkg-fun.nix} | 0 .../ci/civetweb/pkg-fun.nix} | 0 .../default.nix => unit/ci/civo/pkg-fun.nix} | 0 .../cj/cjdns-tools/pkg-fun.nix} | 0 .../admin => unit/cj}/cjdns-tools/wrapper.sh | 0 .../default.nix => unit/cj/cjdns/pkg-fun.nix} | 0 .../default.nix => unit/cj/cjose/pkg-fun.nix} | 0 .../default.nix => unit/cj/cjson/pkg-fun.nix} | 0 .../default.nix => unit/ck/ckan/pkg-fun.nix} | 0 .../ck/ckbcomp/pkg-fun.nix} | 0 .../default.nix => unit/ck/cksfv/pkg-fun.nix} | 0 .../cl/cl-launch/pkg-fun.nix} | 0 .../cl/cl-wordle/pkg-fun.nix} | 0 .../default.nix => unit/cl/clac/pkg-fun.nix} | 0 .../default.nix => unit/cl/clair/pkg-fun.nix} | 0 .../cl/clairvoyance/pkg-fun.nix} | 0 .../cl}/clamsmtp/header-order.patch | 0 .../cl/clamsmtp/pkg-fun.nix} | 0 .../cl/clanlib/pkg-fun.nix} | 0 .../cl/clapper/pkg-fun.nix} | 0 .../cl/clash-geoip/pkg-fun.nix} | 0 .../default.nix => unit/cl/clash/pkg-fun.nix} | 0 .../cl/classads/pkg-fun.nix} | 0 .../cl}/classicube/fix-linking.patch | 0 .../cl}/classicube/font-location.patch | 0 .../cl/classicube/pkg-fun.nix} | 0 .../cl}/classicube/use-sdl.patch | 0 .../cl}/claws-mail/mime.patch | 0 .../cl/claws-mail/pkg-fun.nix} | 0 .../default.nix => unit/cl/claws/pkg-fun.nix} | 0 .../cl/clboss/pkg-fun.nix} | 0 .../cl/cldr-annotations/pkg-fun.nix} | 0 ...port-do-not-rebuild-equal-timestamps.patch | 0 .../default.nix => unit/cl/clean/pkg-fun.nix} | 0 .../cl/clearlooks-phenix/pkg-fun.nix} | 0 .../cl/clearlyU/pkg-fun.nix} | 0 .../cl/clematis/pkg-fun.nix} | 0 .../default.nix => unit/cl/clerk/pkg-fun.nix} | 0 .../default.nix => unit/cl/clex/pkg-fun.nix} | 0 .../default.nix => unit/cl/clfft/pkg-fun.nix} | 0 .../default.nix => unit/cl/clhep/pkg-fun.nix} | 0 .../cl/cli-visualizer/pkg-fun.nix} | 0 .../default.nix => unit/cl/cli11/pkg-fun.nix} | 0 .../default.nix => unit/cl/cli53/pkg-fun.nix} | 0 .../default.nix => unit/cl/cliam/pkg-fun.nix} | 0 .../default.nix => unit/cl/clib/pkg-fun.nix} | 0 .../default.nix => unit/cl/click/pkg-fun.nix} | 0 .../cl/clickclack/pkg-fun.nix} | 0 .../cl/clickhouse-backup/pkg-fun.nix} | 0 .../cl}/client-ip-echo/client-ip-echo.nix | 0 .../cl/client-ip-echo/pkg-fun.nix} | 0 .../default.nix => unit/cl/clifm/pkg-fun.nix} | 0 .../cl/clight/pkg-fun.nix} | 0 .../cl/clightd/pkg-fun.nix} | 0 .../cl/clightning/pkg-fun.nix} | 0 .../default.nix => unit/cl/cling/pkg-fun.nix} | 0 .../cl/clingcon/pkg-fun.nix} | 0 .../clingo.nix => unit/cl/clingo/pkg-fun.nix} | 0 .../default.nix => unit/cl/clini/pkg-fun.nix} | 0 .../cl/clipbuzz/pkg-fun.nix} | 0 .../cl/clipcat/pkg-fun.nix} | 0 .../cl/cliphist/pkg-fun.nix} | 0 .../cl/clipit/pkg-fun.nix} | 0 .../cl/clipman/pkg-fun.nix} | 0 .../cl/clipmenu/pkg-fun.nix} | 0 .../cl/clipnotify/pkg-fun.nix} | 0 .../libraries => unit/cl}/clipp/clipp.pc | 0 .../default.nix => unit/cl/clipp/pkg-fun.nix} | 0 .../cl/clipper/pkg-fun.nix} | 0 .../cl/clipqr/pkg-fun.nix} | 0 .../default.nix => unit/cl/clips/pkg-fun.nix} | 0 .../cl/clipster/pkg-fun.nix} | 0 .../cl/cliquer/pkg-fun.nix} | 0 .../hg.nix => unit/cl/clisp-tip/pkg-fun.nix} | 0 .../cl/clj-kondo/pkg-fun.nix} | 0 .../cl/clmagma/pkg-fun.nix} | 0 .../default.nix => unit/cl/cln/pkg-fun.nix} | 0 .../default.nix => unit/cl/cloc/pkg-fun.nix} | 0 .../cl/clog-cli/pkg-fun.nix} | 0 .../cl/clojure-lsp/pkg-fun.nix} | 0 .../cl/clonehero-unwrapped/pkg-fun.nix} | 0 .../cl/clonehero/pkg-fun.nix} | 0 .../cl}/clonehero/xdg-wrapper.nix | 0 .../cl/cloogppl}/fix-ppl-version.patch | 0 .../cl/cloogppl/pkg-fun.nix} | 0 .../clooj.nix => unit/cl/clooj/pkg-fun.nix} | 0 .../cl/closureInfo/pkg-fun.nix} | 0 .../cl/closurecompiler/pkg-fun.nix} | 0 .../cl/cloud-hypervisor/pkg-fun.nix} | 0 .../cl/cloud-nuke/pkg-fun.nix} | 0 .../cl/cloud-sql-proxy/pkg-fun.nix} | 0 .../cl/cloud-utils/pkg-fun.nix} | 0 .../cl/cloudbrute/pkg-fun.nix} | 0 .../cl/cloudflare-dyndns/pkg-fun.nix} | 0 .../cl/cloudflare-warp/pkg-fun.nix} | 0 .../cl/cloudflared/pkg-fun.nix} | 0 .../cl}/cloudflared/tests.nix | 0 .../cl/cloudfoundry-cli/pkg-fun.nix} | 0 .../cl/cloudfox/pkg-fun.nix} | 0 .../cl/cloudlist/pkg-fun.nix} | 0 .../cl/cloudmonkey/pkg-fun.nix} | 0 .../cl/cloudsmith-cli/pkg-fun.nix} | 0 .../default.nix => unit/cl/clp/pkg-fun.nix} | 0 .../cl}/clpeak/clpeak-clhpp2.diff | 0 .../cl/clpeak/pkg-fun.nix} | 0 .../default.nix => unit/cl/clpm/pkg-fun.nix} | 0 .../cl/clprover/pkg-fun.nix} | 0 .../cl/clustal-omega/pkg-fun.nix} | 0 .../cl/clusterctl/pkg-fun.nix} | 0 .../cl/clutter-gst/pkg-fun.nix} | 0 .../cl/clutter-gtk/pkg-fun.nix} | 0 .../cl/clutter/pkg-fun.nix} | 0 .../cm/cm256cc/pkg-fun.nix} | 0 .../cm/cm_unicode/pkg-fun.nix} | 0 .../cm/cmark-gfm/pkg-fun.nix} | 0 .../default.nix => unit/cm/cmark/pkg-fun.nix} | 0 .../cm/cmatrix/pkg-fun.nix} | 0 .../default.nix => unit/cm/cmctl/pkg-fun.nix} | 0 .../cluster => unit/cm}/cmctl/update.sh | 0 .../cm/cmdstan/pkg-fun.nix} | 0 .../cm}/cmigemo/no-http-tool-check.patch | 0 .../cm/cmigemo/pkg-fun.nix} | 0 .../cm/cminpack/pkg-fun.nix} | 0 .../cm/cmocka/pkg-fun.nix} | 0 .../default.nix => unit/cm/cmrt/pkg-fun.nix} | 0 .../default.nix => unit/cm/cmt/pkg-fun.nix} | 0 .../default.nix => unit/cm/cmtk/pkg-fun.nix} | 0 .../cm/cmusfm/pkg-fun.nix} | 0 .../cn/cni-plugin-flannel/pkg-fun.nix} | 0 .../cn/cni-plugins/pkg-fun.nix} | 0 .../default.nix => unit/cn/cni/pkg-fun.nix} | 0 .../cnijfilter2/patches/get_protocol.patch | 0 .../cn/cnijfilter2/pkg-fun.nix} | 0 .../patches/cnijfilter-3.80-1-cups-1.6.patch | 0 .../patches/cnijfilter-3.80-6-cups-1.6.patch | 0 .../patches/cnijfilter-4.00-4-ppd.patch | 0 .../cnijfilter-4.00-5-abi_x86_32.patch | 0 .../patches/cnijfilter-4.00-6-headers.patch | 0 .../patches/cnijfilter-4.00-7-sysctl.patch | 0 .../cn/cnijfilter_4_00/pkg-fun.nix} | 0 .../cn/cnping/pkg-fun.nix} | 0 .../cn/cnstrokeorder/pkg-fun.nix} | 0 .../default.nix => unit/cn/cntlm/pkg-fun.nix} | 0 .../default.nix => unit/cn/cntr/pkg-fun.nix} | 0 .../co/CoinMP/pkg-fun.nix} | 0 .../default.nix => unit/co/coan/pkg-fun.nix} | 0 .../co/cobra-cli/pkg-fun.nix} | 0 .../co/coccinelle/pkg-fun.nix} | 0 .../co/cockroachdb/pkg-fun.nix} | 0 .../default.nix => unit/co/cod/pkg-fun.nix} | 0 .../co/code-minimap/pkg-fun.nix} | 0 .../co}/codeblocks/fix-clipboard-flush.patch | 0 .../co/codeblocks/pkg-fun.nix} | 0 .../co}/codeblocks/writable-projects.patch | 0 .../co/codebraid/pkg-fun.nix} | 0 .../co/codec2/pkg-fun.nix} | 0 .../co/codecserver/pkg-fun.nix} | 0 .../co/codeowners/pkg-fun.nix} | 0 .../co/codeql/pkg-fun.nix} | 0 .../default.nix => unit/co/coder/pkg-fun.nix} | 0 .../co/codesearch/pkg-fun.nix} | 0 .../co/codespell/pkg-fun.nix} | 0 .../co/coercer/pkg-fun.nix} | 0 .../co/coeurl/pkg-fun.nix} | 0 .../default.nix => unit/co/cog/pkg-fun.nix} | 0 .../co/coin3d/pkg-fun.nix} | 0 .../co/cointop/pkg-fun.nix} | 0 .../co/colemak-dh/pkg-fun.nix} | 0 .../co/colima/pkg-fun.nix} | 0 .../co/collada-dom/pkg-fun.nix} | 0 .../co/collapseos-cvm/pkg-fun.nix} | 0 .../co/collectd-data/pkg-fun.nix} | 0 .../co/colloid-gtk-theme/pkg-fun.nix} | 0 .../co/colloid-icon-theme/pkg-fun.nix} | 0 .../co/colloid-kde/pkg-fun.nix} | 0 .../co}/colm/cross-compile.patch | 0 .../default.nix => unit/co/colm/pkg-fun.nix} | 0 .../co/colmena/pkg-fun.nix} | 0 pkgs/{games => unit/co}/colobot/data.nix | 0 .../co/colobot/pkg-fun.nix} | 0 .../co/colord-gtk/pkg-fun.nix} | 0 .../co}/colord/installed-tests-path.patch | 0 .../co/colord/pkg-fun.nix} | 0 .../co/colordiff/pkg-fun.nix} | 0 .../co/colorless/pkg-fun.nix} | 0 .../{tools/system => unit/co}/colorls/Gemfile | 0 .../system => unit/co}/colorls/Gemfile.lock | 0 .../system => unit/co}/colorls/gemset.nix | 0 .../co/colorls/pkg-fun.nix} | 0 .../co/colormake/pkg-fun.nix} | 0 .../co/colorpanes/pkg-fun.nix} | 0 .../co/colorpicker/pkg-fun.nix} | 0 .../co/colort/pkg-fun.nix} | 0 .../co/colorz/pkg-fun.nix} | 0 .../co/colpack/pkg-fun.nix} | 0 .../co/combinatorial_designs/pkg-fun.nix} | 0 .../tools => unit/co}/comby/comby.patch | 0 .../default.nix => unit/co/comby/pkg-fun.nix} | 0 .../co/comedilib/pkg-fun.nix} | 0 .../co/comfortaa/pkg-fun.nix} | 0 .../co}/comic-mono/comic-mono-weight.conf | 0 .../co/comic-mono/pkg-fun.nix} | 0 .../co/comic-neue/pkg-fun.nix} | 0 .../co}/comic-relief/comic-sans-ms-alias.conf | 0 .../co/comic-relief/pkg-fun.nix} | 0 .../co}/comixcursors/makefile-shell-var.patch | 0 .../co/comixcursors/pkg-fun.nix} | 0 .../default.nix => unit/co/comma/pkg-fun.nix} | 0 .../co/commandergenius/pkg-fun.nix} | 0 .../co/commit-formatter/pkg-fun.nix} | 0 .../co/commix/pkg-fun.nix} | 0 .../co/common-licenses/pkg-fun.nix} | 0 .../co/common-updater-scripts/pkg-fun.nix} | 0 .../co/commonsBcel/pkg-fun.nix} | 0 .../co/commonsBsf/pkg-fun.nix} | 0 .../co/commonsCompress/pkg-fun.nix} | 0 .../co/commonsDaemon/pkg-fun.nix} | 0 .../co/commonsFileUpload/pkg-fun.nix} | 0 .../co/commonsIo/pkg-fun.nix} | 0 .../co/commonsLang/pkg-fun.nix} | 0 .../co/commonsLogging/pkg-fun.nix} | 0 .../co/commonsMath/pkg-fun.nix} | 0 .../co/compactor/pkg-fun.nix} | 0 .../tools => unit/co}/compass/Gemfile | 0 .../tools => unit/co}/compass/Gemfile.lock | 0 .../tools => unit/co}/compass/gemset.nix | 0 .../co/compass/pkg-fun.nix} | 0 .../co/compile-daemon/pkg-fun.nix} | 0 .../co/complete-alias/pkg-fun.nix} | 0 .../co/complexity/pkg-fun.nix} | 0 .../co/compressFirmwareXz/pkg-fun.nix} | 0 .../co/compsize/pkg-fun.nix} | 0 .../co/computecpp-unwrapped/pkg-fun.nix} | 0 .../co/comrak/pkg-fun.nix} | 0 .../default.nix => unit/co/conan/pkg-fun.nix} | 0 .../default.nix => unit/co/conda/pkg-fun.nix} | 0 .../co/conduktor/pkg-fun.nix} | 0 .../default.nix => unit/co/confd/pkg-fun.nix} | 0 .../co/confluencepot/pkg-fun.nix} | 0 .../co/confluent-cli/pkg-fun.nix} | 0 .../co/confluent-platform/pkg-fun.nix} | 0 .../co/conform/pkg-fun.nix} | 0 .../co/conftest/pkg-fun.nix} | 0 .../co/conglomerate/pkg-fun.nix} | 0 .../co/conmon-rs/pkg-fun.nix} | 0 .../co/conmon/pkg-fun.nix} | 0 .../co/connect/pkg-fun.nix} | 0 .../co/conntrack-tools/pkg-fun.nix} | 0 .../co/conserver/pkg-fun.nix} | 0 .../co/console-bridge/pkg-fun.nix} | 0 .../co/conspy/pkg-fun.nix} | 0 .../co}/consul-alerts/deps.nix | 0 .../co/consul-alerts/pkg-fun.nix} | 0 .../co/consul-template/pkg-fun.nix} | 0 .../co/consul/pkg-fun.nix} | 0 .../co/containerd/pkg-fun.nix} | 0 .../co}/containerpilot/deps.nix | 0 .../co/containerpilot/pkg-fun.nix} | 0 .../co/contrast/pkg-fun.nix} | 0 .../co/convbin/pkg-fun.nix} | 0 .../co/convchain/pkg-fun.nix} | 0 .../co/convertlit/pkg-fun.nix} | 0 .../co/convfont/pkg-fun.nix} | 0 .../co/convimg/pkg-fun.nix} | 0 .../co/convmv/pkg-fun.nix} | 0 .../co/convos/pkg-fun.nix} | 0 .../co/convoy/pkg-fun.nix} | 0 .../co/conway_polynomials/pkg-fun.nix} | 0 .../co/cooper-hewitt/pkg-fun.nix} | 0 .../co/coordgenlibs/pkg-fun.nix} | 0 .../default.nix => unit/co/coost/pkg-fun.nix} | 0 .../default.nix => unit/co/cope/pkg-fun.nix} | 0 .../co/copilot-cli/pkg-fun.nix} | 0 .../co/copper/pkg-fun.nix} | 0 .../co/copyright-update/pkg-fun.nix} | 0 .../co/coq2html/pkg-fun.nix} | 0 .../co/cordless/pkg-fun.nix} | 0 .../co/coredns/pkg-fun.nix} | 0 .../fonts => unit/co}/corefonts/no-op.conf | 0 .../co/corefonts/pkg-fun.nix} | 0 .../co/corerad/pkg-fun.nix} | 0 .../co/coreth/pkg-fun.nix} | 0 .../co}/coreutils/disable-seek-hole.patch | 0 .../co/coreutils/pkg-fun.nix} | 0 .../co/corkscrew/pkg-fun.nix} | 0 .../co/corosync/pkg-fun.nix} | 0 .../corrosion/cmake-install-full-dir.patch | 0 .../co/corrosion/pkg-fun.nix} | 0 .../tools => unit/co}/corundum/Gemfile | 0 .../tools => unit/co}/corundum/Gemfile.lock | 0 .../tools => unit/co}/corundum/gemset.nix | 0 .../co/corundum/pkg-fun.nix} | 0 .../co/cosmoc/pkg-fun.nix} | 0 .../co}/cosmopolitan/fix-paths.patch | 0 .../co/cosmopolitan/pkg-fun.nix} | 0 .../co/coturn/pkg-fun.nix} | 0 .../co}/coturn/pure-configure.patch | 0 .../3.nix => unit/co/couchdb3/pkg-fun.nix} | 0 .../co/courier-prime/pkg-fun.nix} | 0 .../co/coursera-dl/pkg-fun.nix} | 0 .../co/coursier/pkg-fun.nix} | 0 .../co/cov-build/pkg-fun.nix} | 0 .../co/cowpatty/pkg-fun.nix} | 0 .../co/cowsay/pkg-fun.nix} | 0 .../default.nix => unit/co/coyim/pkg-fun.nix} | 0 .../default.nix => unit/co/coz/pkg-fun.nix} | 0 .../co/cozette/pkg-fun.nix} | 0 .../co/cozy-drive/pkg-fun.nix} | 0 .../default.nix => unit/co/cozy/pkg-fun.nix} | 0 .../default.nix => unit/cp/cp2k/pkg-fun.nix} | 0 .../default.nix => unit/cp/cp437/pkg-fun.nix} | 0 .../default.nix => unit/cp/cpcfs/pkg-fun.nix} | 0 .../default.nix => unit/cp/cpio/pkg-fun.nix} | 0 .../cp/cplay-ng/pkg-fun.nix} | 0 .../cp/cpm-cmake/pkg-fun.nix} | 0 .../cp/cpp-hocon/pkg-fun.nix} | 0 .../cp/cpp-ipfs-http-client/pkg-fun.nix} | 0 .../unvendor-nlohmann-json.patch | 0 .../cp/cpp-jwt/pkg-fun.nix} | 0 .../cp/cpp-utilities/pkg-fun.nix} | 0 .../cp/cppcheck/pkg-fun.nix} | 0 .../cp/cppclean/pkg-fun.nix} | 0 .../cp/cppcms/pkg-fun.nix} | 0 .../default.nix => unit/cp/cppdb/pkg-fun.nix} | 0 .../default.nix => unit/cp/cppe/pkg-fun.nix} | 0 .../default.nix => unit/cp/cppi/pkg-fun.nix} | 0 ...001-Remove-pytest-runner-version-pin.patch | 0 .../cp/cpplint/pkg-fun.nix} | 0 .../cp/cppreference-doc/pkg-fun.nix} | 0 .../cp/cpptest/pkg-fun.nix} | 0 .../cp/cpptoml/pkg-fun.nix} | 0 .../cp/cppunit/pkg-fun.nix} | 0 .../cp/cpputest/pkg-fun.nix} | 0 .../cp/cppzmq/pkg-fun.nix} | 0 .../misc => unit/cp}/cproto/cproto.patch | 0 .../cp/cproto/pkg-fun.nix} | 0 .../default.nix => unit/cp/cpu-x/pkg-fun.nix} | 0 .../cp/cpufetch/pkg-fun.nix} | 0 .../cp/cpufrequtils/pkg-fun.nix} | 0 .../remove-pot-creation-date.patch | 0 .../default.nix => unit/cp/cpuid/pkg-fun.nix} | 0 .../cp}/cpulimit/get-missing-basename.patch | 0 .../cp/cpulimit/pkg-fun.nix} | 0 .../cp}/cpulimit/remove-sys-sysctl.h.patch | 0 .../cp/cpuminer/pkg-fun.nix} | 0 .../cp/cpustat/pkg-fun.nix} | 0 .../crack-attack-1.1.14-gcc43.patch | 0 .../crack-attack-1.1.14-glut.patch | 0 .../cr/crack_attack/pkg-fun.nix} | 0 .../cr/crackle/pkg-fun.nix} | 0 .../cr/cracklib/pkg-fun.nix} | 0 .../cr/crackmapexec/pkg-fun.nix} | 0 .../cr/crackql/pkg-fun.nix} | 0 .../cr/crackxls/pkg-fun.nix} | 0 .../cr/craftos-pc/pkg-fun.nix} | 0 .../cr}/cramfsprogs/include-sysmacros.patch | 0 .../cr/cramfsprogs/pkg-fun.nix} | 0 .../cr}/cramfsswap/parallel-make.patch | 0 .../cr/cramfsswap/pkg-fun.nix} | 0 .../cr/crate2nix/pkg-fun.nix} | 0 .../default.nix => unit/cr/crc/pkg-fun.nix} | 0 .../cluster => unit/cr}/crc/update.sh | 0 .../cr/crc32c/pkg-fun.nix} | 0 .../default.nix => unit/cr/crcpp/pkg-fun.nix} | 0 .../cr/crd2pulumi/pkg-fun.nix} | 0 .../default.nix => unit/cr/crda/pkg-fun.nix} | 0 .../default.nix => unit/cr/cre2/pkg-fun.nix} | 0 .../fix-bash-completion-path.patch | 0 .../fix-python-install-path.patch | 0 .../cr/createrepo_c/pkg-fun.nix} | 0 .../cr/credential-detector/pkg-fun.nix} | 0 .../cr/credhub-cli/pkg-fun.nix} | 0 .../cr/credslayer/pkg-fun.nix} | 0 .../default.nix => unit/cr/creep/pkg-fun.nix} | 0 .../default.nix => unit/cr/crex/pkg-fun.nix} | 0 .../cr/cri-o-unwrapped/pkg-fun.nix} | 0 .../wrapper.nix => unit/cr/cri-o/pkg-fun.nix} | 0 .../cr/cri-tools/pkg-fun.nix} | 0 .../cr/crimson-pro/pkg-fun.nix} | 0 .../cr/crimson/pkg-fun.nix} | 0 .../default.nix => unit/cr/crip/pkg-fun.nix} | 0 .../cr/crispyDoom/pkg-fun.nix} | 0 .../cr/criterion/pkg-fun.nix} | 0 .../default.nix => unit/cr/criu/pkg-fun.nix} | 0 .../cr/crlfsuite/pkg-fun.nix} | 0 .../cr/crlfuzz/pkg-fun.nix} | 0 .../cr/croaring/pkg-fun.nix} | 0 .../default.nix => unit/cr/croc/pkg-fun.nix} | 0 .../cr}/croc/test-local-relay.nix | 0 .../default.nix => unit/cr/cron/pkg-fun.nix} | 0 .../cr/crossguid/pkg-fun.nix} | 0 .../cr/crosvm/pkg-fun.nix} | 0 .../cr}/crosvm/update.py | 0 .../cr/crowbar/pkg-fun.nix} | 0 .../cr/crowdin-cli/pkg-fun.nix} | 0 .../cr/crowdsec/pkg-fun.nix} | 0 pkgs/{games => unit/cr}/crrcsim/gcc6.patch | 0 .../cr/crrcsim/pkg-fun.nix} | 0 .../cr/crudini/pkg-fun.nix} | 0 .../cr/crumbs/pkg-fun.nix} | 0 .../default.nix => unit/cr/crun/pkg-fun.nix} | 0 .../cr/crunch/pkg-fun.nix} | 0 .../default.nix => unit/cr/cryfs/pkg-fun.nix} | 0 .../cr/crypto-org-wallet/pkg-fun.nix} | 0 .../cr/cryptomator/pkg-fun.nix} | 0 .../cr/cryptominisat/pkg-fun.nix} | 0 .../cr/cryptopp/pkg-fun.nix} | 0 .../cr/cryptoverif/pkg-fun.nix} | 0 .../cr/cryptowatch-desktop/pkg-fun.nix} | 0 .../cr/cryptsetup/pkg-fun.nix} | 0 .../cr}/cryptsetup/relative-token-path.patch | 0 .../cr/crystal2nix/pkg-fun.nix} | 0 .../cr}/crystal2nix/shards.nix | 0 .../default.nix => unit/cs/csa/pkg-fun.nix} | 0 .../cs/cscope/pkg-fun.nix} | 0 .../default.nix => unit/cs/csdp/pkg-fun.nix} | 0 .../default.nix => unit/cs/csdr/pkg-fun.nix} | 0 .../default.nix => unit/cs/csfml/pkg-fun.nix} | 0 .../cs/cshatag/pkg-fun.nix} | 0 .../cs/csmith/pkg-fun.nix} | 0 .../cs/csound-manual/pkg-fun.nix} | 0 .../cs/csslint/pkg-fun.nix} | 0 .../cs/csv2latex/pkg-fun.nix} | 0 .../cs/csv2odf/pkg-fun.nix} | 0 .../cs/csv2parquet/pkg-fun.nix} | 0 .../cs/csvdiff/pkg-fun.nix} | 0 .../cs/csview/pkg-fun.nix} | 0 .../cs/csvkit/pkg-fun.nix} | 0 .../cs/csvs-to-sqlite/pkg-fun.nix} | 0 .../cs/csvtool/pkg-fun.nix} | 0 .../cs/csxcad/pkg-fun.nix} | 0 .../cs}/csxcad/searchPath.patch | 0 .../default.nix => unit/ct/ctags/pkg-fun.nix} | 0 .../ct}/ctags/unused-collision.patch | 0 .../ct/ctagsWrapped/pkg-fun.nix} | 0 .../ct/ctlptl/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctmg/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctodo/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctop/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctpl/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctpp2/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctre/pkg-fun.nix} | 0 .../ct/ctrtool/pkg-fun.nix} | 0 .../default.nix => unit/ct/ctx/pkg-fun.nix} | 0 .../ct/ctypes_sh/pkg-fun.nix} | 0 .../cu/cubicle/pkg-fun.nix} | 0 .../tools => unit/cu}/cucumber/Gemfile | 0 .../tools => unit/cu}/cucumber/Gemfile.lock | 0 .../tools => unit/cu}/cucumber/gemset.nix | 0 .../cu/cucumber/pkg-fun.nix} | 0 .../libraries => unit/cu}/cudd/cudd.patch | 0 .../default.nix => unit/cu/cudd/pkg-fun.nix} | 0 .../cu/cue2pops/pkg-fun.nix} | 0 .../cu/cuelsp/pkg-fun.nix} | 0 .../cu/cuetools/pkg-fun.nix} | 0 .../cu/culmus/pkg-fun.nix} | 0 .../default.nix => unit/cu/cum/pkg-fun.nix} | 0 .../cu/cuneiform/pkg-fun.nix} | 0 .../default.nix => unit/cu/cunit/pkg-fun.nix} | 0 .../cu/cups-bjnp/pkg-fun.nix} | 0 .../cu/cups-brother-hll2350dw/pkg-fun.nix} | 0 .../cu/cups-brother-hll2375dw}/fix-perm.patch | 0 .../cu/cups-brother-hll2375dw/pkg-fun.nix} | 0 .../cu/cups-brother-mfcl2750dw/pkg-fun.nix} | 0 .../cu/cups-drv-rastertosag-gdi/pkg-fun.nix} | 0 .../cu/cups-dymo}/fix-includes.patch | 0 .../cu/cups-dymo/pkg-fun.nix} | 0 .../cu/cups-filters/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../cu/cups-kyocera/pkg-fun.nix} | 0 .../cu/cups-kyodialog/pkg-fun.nix} | 0 .../cu/cups-pdf-to-pdf/pkg-fun.nix} | 0 .../cu/cups-pk-helper/pkg-fun.nix} | 0 .../cu/cups-toshiba-estudio/pkg-fun.nix} | 0 .../cu/cups-zj-58/pkg-fun.nix} | 0 .../default.nix => unit/cu/cups/pkg-fun.nix} | 0 .../cu/curaPlugins/pkg-fun.nix} | 0 .../cu/curaengine_stable/pkg-fun.nix} | 0 .../default.nix => unit/cu/curie/pkg-fun.nix} | 0 .../cu/curl-impersonate-bin/pkg-fun.nix} | 0 ...7.79.1-darwin-no-systemconfiguration.patch | 0 .../cu/curlMinimal/pkg-fun.nix} | 0 .../cu}/curlftpfs/fix-rpl_malloc.patch | 0 .../cu/curlftpfs/pkg-fun.nix} | 0 .../cu}/curlie/bump-golang-x-sys.patch | 0 .../cu/curlie/pkg-fun.nix} | 0 .../cu/curlpp/pkg-fun.nix} | 0 .../audio => unit/cu}/curseradio/mpv.patch | 0 .../cu/curseradio/pkg-fun.nix} | 0 .../cu/curtail/pkg-fun.nix} | 0 .../default.nix => unit/cu/cutee/pkg-fun.nix} | 0 .../default.nix => unit/cu/cuyo/pkg-fun.nix} | 0 .../logic => unit/cv}/cvc4/minisat-fenv.patch | 0 .../default.nix => unit/cv/cvc4/pkg-fun.nix} | 0 .../default.nix => unit/cv/cvc5/pkg-fun.nix} | 0 .../cv/cvehound/pkg-fun.nix} | 0 .../cv/cvs-fast-export/pkg-fun.nix} | 0 .../cv}/cvs/CVE-2012-0804.patch | 0 .../cv}/cvs/CVE-2017-12836.patch | 0 .../cv}/cvs/getcwd-chroot.patch | 0 .../default.nix => unit/cv/cvs/pkg-fun.nix} | 0 .../cv/cvs2svn/pkg-fun.nix} | 0 .../default.nix => unit/cv/cvsps/pkg-fun.nix} | 0 .../default.nix => unit/cv/cvsq/pkg-fun.nix} | 0 .../cw/default.nix => unit/cw/cw/pkg-fun.nix} | 0 .../cw/cwebbin/pkg-fun.nix} | 0 .../default.nix => unit/cw/cwiid/pkg-fun.nix} | 0 .../cw/cwltool/pkg-fun.nix} | 0 .../default.nix => unit/cw/cwm/pkg-fun.nix} | 0 .../cx/cxx-prettyprint/pkg-fun.nix} | 0 .../libraries => unit/cx}/cxx-rs/Cargo.lock | 0 .../cx/cxx-rs/pkg-fun.nix} | 0 .../cx}/cxxopts/fix-install-path.patch | 0 .../cx/cxxopts/pkg-fun.nix} | 0 .../default.nix => unit/cy/cyan/pkg-fun.nix} | 0 .../cy/cyanrip/pkg-fun.nix} | 0 .../cy/cyberchef/pkg-fun.nix} | 0 .../cy/cyclone-scheme/pkg-fun.nix} | 0 .../cy/cyclone/pkg-fun.nix} | 0 .../cy/cyclonedx-gomod/pkg-fun.nix} | 0 .../cy/cyclonedx-python/pkg-fun.nix} | 0 .../cz}/cz-cli/node-composition.nix | 0 .../cz}/cz-cli/node-env.nix | 0 .../cz}/cz-cli/node-packages.nix | 0 .../cz/cz-cli/pkg-fun.nix} | 0 .../cz/czkawka/pkg-fun.nix} | 0 .../default.nix => unit/cz/czmq/pkg-fun.nix} | 0 .../d-/d-seams/pkg-fun.nix} | 0 .../default.nix => unit/d-/d-spy/pkg-fun.nix} | 0 .../d2/default.nix => unit/d2/d2/pkg-fun.nix} | 0 .../d2/d2coding/pkg-fun.nix} | 0 .../da/dab_lib/pkg-fun.nix} | 0 .../default.nix => unit/da/dabet/pkg-fun.nix} | 0 .../da/dablin/pkg-fun.nix} | 0 .../da/dabtools/pkg-fun.nix} | 0 .../da/dadadodo/pkg-fun.nix} | 0 .../da/daemon/pkg-fun.nix} | 0 .../da/daemonize/pkg-fun.nix} | 0 .../fix-nix-usernamespace-build.patch | 0 .../da/daemontools/pkg-fun.nix} | 0 .../da/dagger/pkg-fun.nix} | 0 .../default.nix => unit/da/dale/pkg-fun.nix} | 0 .../da/dalfox/pkg-fun.nix} | 0 .../default.nix => unit/da/damon/pkg-fun.nix} | 0 .../da/dancing-script/pkg-fun.nix} | 0 .../da}/danger-gitlab/Gemfile | 0 .../da}/danger-gitlab/Gemfile.lock | 0 .../da}/danger-gitlab/gemset.nix | 0 .../da/danger-gitlab/pkg-fun.nix} | 0 .../default.nix => unit/da/dante/pkg-fun.nix} | 0 .../default.nix => unit/da/dap/pkg-fun.nix} | 0 .../da/dapper/pkg-fun.nix} | 0 .../da/dapr-cli/pkg-fun.nix} | 0 .../default.nix => unit/da/daq/pkg-fun.nix} | 0 .../emulators => unit/da}/darcnes/label.patch | 0 .../da/darcnes/pkg-fun.nix} | 0 .../da/darcs-to-git/pkg-fun.nix} | 0 .../da/darkhttpd/pkg-fun.nix} | 0 .../da}/darkice/fix-undeclared-memmove.patch | 0 .../da/darkice/pkg-fun.nix} | 0 .../da/darkman/pkg-fun.nix} | 0 .../da/darkplaces/pkg-fun.nix} | 0 .../da/darkstat/pkg-fun.nix} | 0 .../da/darktile/pkg-fun.nix} | 0 .../da/darling-dmg/pkg-fun.nix} | 0 .../default.nix => unit/da/dart/pkg-fun.nix} | 0 .../da/das_watchdog/pkg-fun.nix} | 0 .../default.nix => unit/da/dasel/pkg-fun.nix} | 0 .../default.nix => unit/da/dash/pkg-fun.nix} | 0 .../da/dasher/pkg-fun.nix} | 0 .../da/dashing/pkg-fun.nix} | 0 .../default.nix => unit/da/dasht/pkg-fun.nix} | 0 .../default.nix => unit/da/dasm/pkg-fun.nix} | 0 .../da/datadog-process-agent/pkg-fun.nix} | 0 .../da/datafusion-cli/pkg-fun.nix} | 0 .../da/datalad/pkg-fun.nix} | 0 .../da/datamash/pkg-fun.nix} | 0 .../da/datefmt/pkg-fun.nix} | 0 .../da/datefudge/pkg-fun.nix} | 0 .../da/dateutils/pkg-fun.nix} | 0 .../da/datree/pkg-fun.nix} | 0 .../default.nix => unit/da/dav1d/pkg-fun.nix} | 0 .../default.nix => unit/da/dave/pkg-fun.nix} | 0 ...1-umount_davfs-substitute-ps-command.patch | 0 ...the-setuid-wrapped-umount-is-invoked.patch | 0 .../da}/davfs2/fix-sysconfdir.patch | 0 .../da}/davfs2/isdir.patch | 0 .../da/davfs2/pkg-fun.nix} | 0 .../da/davinci-resolve/pkg-fun.nix} | 0 .../da/davmail/pkg-fun.nix} | 0 .../da/davtest/pkg-fun.nix} | 0 .../default.nix => unit/da/dawn/pkg-fun.nix} | 0 .../da/dawncut/pkg-fun.nix} | 0 .../default.nix => unit/db/dbacl/pkg-fun.nix} | 0 .../db/dbeaver/pkg-fun.nix} | 0 .../db}/dbench/fix-missing-stdint.patch | 0 .../db/dbench/pkg-fun.nix} | 0 .../db/dblatex/pkg-fun.nix} | 0 .../db/dbmate/pkg-fun.nix} | 0 .../db/dbmonster/pkg-fun.nix} | 0 .../linux => unit/db}/dbus-broker/paths.patch | 0 .../db/dbus-broker/pkg-fun.nix} | 0 .../db/dbus-glib/pkg-fun.nix} | 0 .../db/dbus-map/pkg-fun.nix} | 0 .../db/dbus-sharp-1_0/pkg-fun.nix} | 0 .../db/dbus-sharp-2_0/pkg-fun.nix} | 0 .../db/dbus-sharp-glib-1_0/pkg-fun.nix} | 0 .../db/dbus-sharp-glib-2_0/pkg-fun.nix} | 0 .../db}/dbus/implement-getgrouplist.patch | 0 .../default.nix => unit/db/dbus/pkg-fun.nix} | 0 .../db/dbus_cplusplus/pkg-fun.nix} | 0 .../db/dbus_java/pkg-fun.nix} | 0 .../default.nix => unit/db/dbx/pkg-fun.nix} | 0 .../libraries => unit/db}/dbxml/cxx11.patch | 0 .../db}/dbxml/incorrect-optimization.patch | 0 .../default.nix => unit/db/dbxml/pkg-fun.nix} | 0 .../dc/dcadec/pkg-fun.nix} | 0 .../default.nix => unit/dc/dcap/pkg-fun.nix} | 0 .../dc/dcfldd/pkg-fun.nix} | 0 .../default.nix => unit/dc/dclib/pkg-fun.nix} | 0 .../dc/dclxvi/pkg-fun.nix} | 0 .../dcm2niix/dont-fetch-external-libs.patch | 0 .../dc/dcm2niix/pkg-fun.nix} | 0 .../dc}/dcmtk/0001-Fix-cmake.patch | 0 .../default.nix => unit/dc/dcmtk/pkg-fun.nix} | 0 .../default.nix => unit/dc/dconf/pkg-fun.nix} | 0 .../dc/dconf2nix/pkg-fun.nix} | 0 .../haskell => unit/dc}/dconf2nix/update.sh | 0 .../default.nix => unit/dc/dcraw/pkg-fun.nix} | 0 .../default.nix => unit/dc/dcrd/pkg-fun.nix} | 0 .../dc/dcrwallet/pkg-fun.nix} | 0 .../default.nix => unit/dc/dcs/pkg-fun.nix} | 0 .../dcw.nix => unit/dc/dcw-gmt/pkg-fun.nix} | 0 .../dd/dd_rescue/pkg-fun.nix} | 0 .../default.nix => unit/dd/ddate/pkg-fun.nix} | 0 .../dd/ddccontrol-db/pkg-fun.nix} | 0 .../dd/ddccontrol/pkg-fun.nix} | 0 .../dd/ddclient/pkg-fun.nix} | 0 .../dd/ddcutil/pkg-fun.nix} | 0 .../tools/misc => unit/dd}/ddd/gcc44.patch | 0 .../default.nix => unit/dd/ddd/pkg-fun.nix} | 0 .../default.nix => unit/dd/ddgr/pkg-fun.nix} | 0 .../default.nix => unit/dd/ddh/pkg-fun.nix} | 0 .../dd/ddosify/pkg-fun.nix} | 0 .../dd/ddrescue/pkg-fun.nix} | 0 .../dd/ddrescueview/pkg-fun.nix} | 0 .../dd/ddrutility/pkg-fun.nix} | 0 .../dd/dduper/pkg-fun.nix} | 0 .../de/deadbeef/pkg-fun.nix} | 0 .../de/deadcode/pkg-fun.nix} | 0 .../de/deadd-notification-center/pkg-fun.nix} | 0 .../de/deadnix/pkg-fun.nix} | 0 .../de/deadpixi-sam-unstable/pkg-fun.nix} | 0 .../de/debian-devscripts/pkg-fun.nix} | 0 .../de/debian-goodies/pkg-fun.nix} | 0 .../de/debianutils/pkg-fun.nix} | 0 .../de/debootstrap/pkg-fun.nix} | 0 .../de/debugedit/pkg-fun.nix} | 0 .../de/deckmaster/pkg-fun.nix} | 0 .../default.nix => unit/de/deco/pkg-fun.nix} | 0 .../de/decoder/pkg-fun.nix} | 0 .../default.nix => unit/de/dedup/pkg-fun.nix} | 0 .../de/deepgit/pkg-fun.nix} | 0 .../de/deepsea/pkg-fun.nix} | 0 .../default.nix => unit/de/deer/pkg-fun.nix} | 0 .../zsh-deer => unit/de/deer}/realpath.patch | 0 .../de/defaultCrateOverrides/pkg-fun.nix} | 0 .../de/deheader/pkg-fun.nix} | 0 .../de/dehydrated/pkg-fun.nix} | 0 .../de}/deja-dup/fix-paths.patch | 0 .../de/deja-dup/pkg-fun.nix} | 0 .../de/dejagnu/pkg-fun.nix} | 0 .../de/dejsonlz4/pkg-fun.nix} | 0 .../de/delayarchitect/pkg-fun.nix} | 0 .../de/dell-530cdn/pkg-fun.nix} | 0 .../default.nix => unit/de/delly/pkg-fun.nix} | 0 .../de/deltachat-cursed/pkg-fun.nix} | 0 .../default.nix => unit/de/delve/pkg-fun.nix} | 0 .../de/demoit/pkg-fun.nix} | 0 .../de/dendrite/pkg-fun.nix} | 0 .../de/denemo/pkg-fun.nix} | 0 .../default.nix => unit/de/dep/pkg-fun.nix} | 0 .../tools => unit/de}/dep2nix/deps.nix | 0 .../de/dep2nix/pkg-fun.nix} | 0 .../misc => unit/de}/depotdownloader/deps.nix | 0 .../de/depotdownloader/pkg-fun.nix} | 0 .../de}/depotdownloader/update.sh | 0 .../de/deskew/pkg-fun.nix} | 0 .../de/desktop-file-utils/pkg-fun.nix} | 0 .../de}/desktop-file-utils/setup-hook.sh | 0 .../de/desmume/pkg-fun.nix} | 0 .../de/desync/pkg-fun.nix} | 0 .../deterministic-uname.sh | 0 .../de/deterministic-uname/pkg-fun.nix} | 0 .../default.nix => unit/de/detox/pkg-fun.nix} | 0 .../default.nix => unit/de/dev86/pkg-fun.nix} | 0 .../de/devbox/pkg-fun.nix} | 0 .../default.nix => unit/de/devd/pkg-fun.nix} | 0 .../de/devdocs-desktop/pkg-fun.nix} | 0 .../de/devede/pkg-fun.nix} | 0 .../de/device-tree_rpi/pkg-fun.nix} | 0 .../de/deviceTree/pkg-fun.nix} | 0 .../de/devmem2/pkg-fun.nix} | 0 .../de/devour/pkg-fun.nix} | 0 .../de/devspace/pkg-fun.nix} | 0 .../de/devtodo/pkg-fun.nix} | 0 .../de/dex-oidc/pkg-fun.nix} | 0 .../default.nix => unit/de/dex/pkg-fun.nix} | 0 .../de/dex2jar/pkg-fun.nix} | 0 .../default.nix => unit/df/dfc/pkg-fun.nix} | 0 .../default.nix => unit/df/dfeet/pkg-fun.nix} | 0 .../default.nix => unit/df/dfmt/pkg-fun.nix} | 0 .../default.nix => unit/df/dfrs/pkg-fun.nix} | 0 .../df/dfu-programmer/pkg-fun.nix} | 0 .../df/dfu-util/pkg-fun.nix} | 0 .../dg/dgen-sdl/pkg-fun.nix} | 0 .../default.nix => unit/dg/dgoss/pkg-fun.nix} | 0 .../dg/dgraph/pkg-fun.nix} | 0 .../{shells => unit/dg}/dgsh/glibc-2.26.patch | 0 .../default.nix => unit/dg/dgsh/pkg-fun.nix} | 0 .../dh/dhallDirectoryToNix/pkg-fun.nix} | 0 .../dh/dhallPackageToNix/pkg-fun.nix} | 0 .../dh/dhallToNix/pkg-fun.nix} | 0 .../default.nix => unit/dh/dhcp/pkg-fun.nix} | 0 .../dh}/dhcp/set-hostname.patch | 0 .../dh/dhcpcd/pkg-fun.nix} | 0 .../dh/dhcpdump/pkg-fun.nix} | 0 .../dh/dhcping/pkg-fun.nix} | 0 .../dh/dhewm3/pkg-fun.nix} | 0 .../default.nix => unit/dh/dhex/pkg-fun.nix} | 0 .../default.nix => unit/dh/dht/pkg-fun.nix} | 0 .../di/default.nix => unit/di/di/pkg-fun.nix} | 0 .../default.nix => unit/di/dia/pkg-fun.nix} | 0 .../di}/dia/poppler-22_09-build-fix.patch | 0 .../di/dialect/pkg-fun.nix} | 0 .../di/dialog/pkg-fun.nix} | 0 .../di/diamond/pkg-fun.nix} | 0 .../di/dibbler/pkg-fun.nix} | 0 .../default.nix => unit/di/dico/pkg-fun.nix} | 0 .../di/dictDBCollector/pkg-fun.nix} | 0 .../di/diction/pkg-fun.nix} | 0 .../dictu/0001-force-sqlite-to-be-found.patch | 0 .../default.nix => unit/di/dictu/pkg-fun.nix} | 0 .../default.nix => unit/di/didu/pkg-fun.nix} | 0 .../di/dieharder/pkg-fun.nix} | 0 .../di}/dieharder/stdint.patch | 0 .../di/diff-so-fancy/pkg-fun.nix} | 0 .../di/diffsitter/pkg-fun.nix} | 0 .../di/diffstat/pkg-fun.nix} | 0 .../di/difftastic/pkg-fun.nix} | 0 .../di/diffuse/pkg-fun.nix} | 0 .../di/diffutils/pkg-fun.nix} | 0 .../di/digiham/pkg-fun.nix} | 0 .../di/digital/pkg-fun.nix} | 0 .../di}/digital/pom.xml.patch | 0 .../di/digitemp/pkg-fun.nix} | 0 .../di/dillong/pkg-fun.nix} | 0 .../di/dina-font/pkg-fun.nix} | 0 .../di/ding-libs/pkg-fun.nix} | 0 .../default.nix => unit/di/dippi/pkg-fun.nix} | 0 .../default.nix => unit/di/dirb/pkg-fun.nix} | 0 .../di/directfb/pkg-fun.nix} | 0 .../di/directoryListingUpdater/pkg-fun.nix} | 0 .../di/directvnc/pkg-fun.nix} | 0 .../di/directx-shader-compiler/pkg-fun.nix} | 0 .../di/direnv/pkg-fun.nix} | 0 .../di/direvent/pkg-fun.nix} | 0 .../di/dirstalk/pkg-fun.nix} | 0 .../default.nix => unit/di/dirt/pkg-fun.nix} | 0 .../di/dirvish/pkg-fun.nix} | 0 .../di/discocss/pkg-fun.nix} | 0 .../di/discord-sh/pkg-fun.nix} | 0 .../di}/discordchatexporter-cli/deps.nix | 0 .../di/discordchatexporter-cli/pkg-fun.nix} | 0 .../di}/discordchatexporter-cli/updater.sh | 0 .../di}/discount/fix-configure-path.patch | 0 .../di/discount/pkg-fun.nix} | 0 .../di/discourse-mail-receiver/pkg-fun.nix} | 0 .../di/disfetch/pkg-fun.nix} | 0 .../di/disk-filltest/pkg-fun.nix} | 0 .../di/disk_indicator/pkg-fun.nix} | 0 .../di/diskonaut/pkg-fun.nix} | 0 .../di/diskrsync/pkg-fun.nix} | 0 .../di/diskscan/pkg-fun.nix} | 0 .../di/dislocker/pkg-fun.nix} | 0 .../di/dismap/pkg-fun.nix} | 0 .../di/dismember/pkg-fun.nix} | 0 .../di/disnix/pkg-fun.nix} | 0 .../di/disnixos/pkg-fun.nix} | 0 .../di/dispad/pkg-fun.nix} | 0 .../di/distgen/pkg-fun.nix} | 0 .../di/distrho/pkg-fun.nix} | 0 .../di/distrobox/pkg-fun.nix} | 0 .../di/distrobuilder/pkg-fun.nix} | 0 .../di/diswall/pkg-fun.nix} | 0 .../default.nix => unit/di/dit/pkg-fun.nix} | 0 .../default.nix => unit/di/ditaa/pkg-fun.nix} | 0 .../default.nix => unit/di/dive/pkg-fun.nix} | 0 .../default.nix => unit/di/diylc/pkg-fun.nix} | 0 .../djbdns/fix-nix-usernamespace-build.patch | 0 .../networking => unit/dj}/djbdns/hier.patch | 0 .../dj/djbdns/pkg-fun.nix} | 0 .../dj}/djbdns/softlimit.patch | 0 .../dj/djmount/pkg-fun.nix} | 0 .../default.nix => unit/dj/djv/pkg-fun.nix} | 0 .../dj/djvu2pdf/pkg-fun.nix} | 0 .../dj/djvulibre/pkg-fun.nix} | 0 .../default.nix => unit/dk/dkh/pkg-fun.nix} | 0 .../dk/dkimproxy/pkg-fun.nix} | 0 .../dl/dleyna-connector-dbus/pkg-fun.nix} | 0 .../dl/dleyna-core/pkg-fun.nix} | 0 .../dl}/dleyna-core/setup-hook.sh | 0 .../dl/dleyna-renderer/pkg-fun.nix} | 0 .../dl/dleyna-server/pkg-fun.nix} | 0 .../default.nix => unit/dl/dlib/pkg-fun.nix} | 0 .../default.nix => unit/dl/dlx/pkg-fun.nix} | 0 .../dm/dm-sans/pkg-fun.nix} | 0 .../dm/dmarc-metrics-exporter/pkg-fun.nix} | 0 .../misc => unit/dm}/dmenu-rs/Cargo.lock | 0 .../dm/dmenu-rs/pkg-fun.nix} | 0 .../dm/dmenu-wayland/pkg-fun.nix} | 0 .../default.nix => unit/dm/dmenu/pkg-fun.nix} | 0 .../dm/dmg2img/pkg-fun.nix} | 0 .../dm/dmidecode/pkg-fun.nix} | 0 .../dm/dmrconfig/pkg-fun.nix} | 0 .../dm}/dmtcp/ld-linux-so-buffer-size.patch | 0 .../default.nix => unit/dm/dmtcp/pkg-fun.nix} | 0 .../default.nix => unit/dn/dnadd/pkg-fun.nix} | 0 .../dn/dnd-tools/pkg-fun.nix} | 0 .../dn/dns-root-data/pkg-fun.nix} | 0 .../misc => unit/dn}/dns-root-data/root.ds | 0 .../misc => unit/dn}/dns-root-data/root.key | 0 .../dn}/dns-root-data/update-root-key.sh | 0 .../dn/dnscontrol/pkg-fun.nix} | 0 .../dn/dnscrypt-proxy2/pkg-fun.nix} | 0 .../dn/dnscrypt-wrapper/pkg-fun.nix} | 0 .../dn}/dnsdist/disable-network-tests.patch | 0 .../dn/dnsdist/pkg-fun.nix} | 0 .../dn/dnsenum/pkg-fun.nix} | 0 .../dn/dnsmasq/pkg-fun.nix} | 0 .../dn/dnsmon-go/pkg-fun.nix} | 0 .../dn/dnsmonster/pkg-fun.nix} | 0 .../dn/dnsname-cni/pkg-fun.nix} | 0 .../dn/dnspeep/pkg-fun.nix} | 0 .../dn/dnsperf/pkg-fun.nix} | 0 .../dn/dnsproxy/pkg-fun.nix} | 0 .../dn/dnsrecon/pkg-fun.nix} | 0 .../dn/dnstake/pkg-fun.nix} | 0 .../dn/dnstop/pkg-fun.nix} | 0 .../dn/dnstwist/pkg-fun.nix} | 0 .../default.nix => unit/dn/dnsx/pkg-fun.nix} | 0 .../do/do-agent/pkg-fun.nix} | 0 ...add-NixOS-specific-dirs-to-safe-PATH.patch | 0 .../do}/doas/disable-shared.patch | 0 .../default.nix => unit/do/doas/pkg-fun.nix} | 0 .../do/docbook2mdoc/pkg-fun.nix} | 0 .../do/docbook2odf/pkg-fun.nix} | 0 .../docbook2x/db2x_texixml-to-stdout.patch | 0 .../do/docbook2x/pkg-fun.nix} | 0 .../do/docbook5/pkg-fun.nix} | 0 .../do/docbook_sgml_dtd_31/pkg-fun.nix} | 0 .../do/docbook_sgml_dtd_41/pkg-fun.nix} | 0 .../do/docbook_xml_ebnf_dtd}/docbook-ebnf.cat | 0 .../do/docbook_xml_ebnf_dtd/pkg-fun.nix} | 0 .../do/docear/pkg-fun.nix} | 0 .../do}/dockapps/AlsaMixer-app.nix | 0 .../do}/dockapps/libdockapp.nix | 0 .../do/dockapps/pkg-fun.nix} | 0 .../do}/dockapps/wmCalClock.nix | 0 .../do}/dockapps/wmsm-app.nix | 0 .../do}/dockapps/wmsystemtray.nix | 0 .../do/dockbarx/pkg-fun.nix} | 0 .../do/docker-buildx/pkg-fun.nix} | 0 .../do/docker-compose/pkg-fun.nix} | 0 .../do/docker-credential-gcr/pkg-fun.nix} | 0 .../do/docker-credential-helpers/pkg-fun.nix} | 0 .../do/docker-distribution/pkg-fun.nix} | 0 .../gc.nix => unit/do/docker-gc/pkg-fun.nix} | 0 .../do/docker-ls/pkg-fun.nix} | 0 .../do/docker-machine-hyperkit/pkg-fun.nix} | 0 .../do/docker-machine-kvm}/kvm-deps.nix | 0 .../do/docker-machine-kvm/pkg-fun.nix} | 0 .../do/docker-machine-kvm2/pkg-fun.nix} | 0 .../do/docker-machine/pkg-fun.nix} | 0 .../do/docker-proxy/pkg-fun.nix} | 0 .../do/docker-slim/pkg-fun.nix} | 0 .../misc => unit/do}/docker-sync/Gemfile | 0 .../misc => unit/do}/docker-sync/Gemfile.lock | 0 .../misc => unit/do}/docker-sync/gemset.nix | 0 .../do/docker-sync/pkg-fun.nix} | 0 .../do/dockfmt/pkg-fun.nix} | 0 .../do/dockle/pkg-fun.nix} | 0 .../do/dockstarter/pkg-fun.nix} | 0 .../do/dockutil/pkg-fun.nix} | 0 .../do/doclifter/pkg-fun.nix} | 0 .../do/docopt_cpp/pkg-fun.nix} | 0 .../tools/misc => unit/do}/docopts/deps.nix | 0 .../do/docopts/pkg-fun.nix} | 0 .../do/doctest/pkg-fun.nix} | 0 .../default.nix => unit/do/doctl/pkg-fun.nix} | 0 .../default.nix => unit/do/docui/pkg-fun.nix} | 0 .../do}/documentation-highlighter/LICENSE | 0 .../do}/documentation-highlighter/README.md | 0 .../highlight.pack.js | 0 .../do}/documentation-highlighter/loader.js | 0 .../documentation-highlighter/mono-blue.css | 0 .../do/documentation-highlighter/pkg-fun.nix} | 0 .../do}/documentation-highlighter/update.sh | 0 .../do/documize-community/pkg-fun.nix} | 0 .../default.nix => unit/do/dog/pkg-fun.nix} | 0 .../default.nix => unit/do/doge/pkg-fun.nix} | 0 .../misc => unit/do}/doing/Gemfile | 0 .../misc => unit/do}/doing/Gemfile.lock | 0 .../misc => unit/do}/doing/gemset.nix | 0 .../default.nix => unit/do/doing/pkg-fun.nix} | 0 .../do/doitlive/pkg-fun.nix} | 0 .../do/dokuwiki/pkg-fun.nix} | 0 .../do/dolbybcsoftwaredecode/pkg-fun.nix} | 0 .../do/dolibarr/pkg-fun.nix} | 0 .../do/dolphin-emu/pkg-fun.nix} | 0 .../default.nix => unit/do/dolt/pkg-fun.nix} | 0 .../do/domination/pkg-fun.nix} | 0 .../do/domoticz/pkg-fun.nix} | 0 .../do/dontgo403/pkg-fun.nix} | 0 .../do/doodle/pkg-fun.nix} | 0 .../do/doom-bcc}/bcc-warning-fix.patch | 0 .../do/doom-bcc/pkg-fun.nix} | 0 .../default.nix => unit/do/doona/pkg-fun.nix} | 0 .../do/doppler/pkg-fun.nix} | 0 .../do/dorkscout/pkg-fun.nix} | 0 .../do/dos2unix/pkg-fun.nix} | 0 .../do/dosage/pkg-fun.nix} | 0 .../do/dosbox-staging/pkg-fun.nix} | 0 .../do/dosemu_fonts/pkg-fun.nix} | 0 .../do/dosfstools/pkg-fun.nix} | 0 .../default.nix => unit/do/dosis/pkg-fun.nix} | 0 .../do/dotconf/pkg-fun.nix} | 0 .../do/dotfiles/pkg-fun.nix} | 0 .../create-pkg-config-for-dll.sh | 0 .../patch-fsharp-targets.sh | 0 .../do/dotnetbuildhelpers/pkg-fun.nix} | 0 .../do}/dotnetbuildhelpers/placate-nuget.sh | 0 .../do}/dotnetbuildhelpers/placate-paket.sh | 0 .../remove-duplicated-dlls.sh | 0 .../do/dotnetfx35/pkg-fun.nix} | 0 .../do/dotnetfx40/pkg-fun.nix} | 0 .../do/double-conversion/pkg-fun.nix} | 0 .../do/doulos-sil/pkg-fun.nix} | 0 .../do}/dovecot/2.3.x-module_dir.patch | 0 .../do/dovecot/pkg-fun.nix} | 0 .../do/dovecot_fts_xapian/pkg-fun.nix} | 0 .../do/dovecot_pigeonhole/pkg-fun.nix} | 0 .../do/downonspot/pkg-fun.nix} | 0 .../misc => unit/do}/dozenal/lua-header.patch | 0 .../do/dozenal/pkg-fun.nix} | 0 .../default.nix => unit/dp/dpic/pkg-fun.nix} | 0 .../default.nix => unit/dp/dpkg/pkg-fun.nix} | 0 .../dp/dpt-rp1-py/pkg-fun.nix} | 0 .../dq/dqlite/pkg-fun.nix} | 0 .../dr/dr14_tmeter/pkg-fun.nix} | 0 .../default.nix => unit/dr/draco/pkg-fun.nix} | 0 .../dr/dracula-theme/pkg-fun.nix} | 0 .../dr/dracut/pkg-fun.nix} | 0 .../dr/dragonfly-reverb/pkg-fun.nix} | 0 .../nosql => unit/dr}/dragonflydb/fixes.patch | 0 .../nosql => unit/dr}/dragonflydb/glog.patch | 0 .../dr/dragonflydb/pkg-fun.nix} | 0 .../build-managers => unit/dr}/drake/Gemfile | 0 .../dr}/drake/Gemfile.lock | 0 .../dr}/drake/gemset.nix | 0 .../default.nix => unit/dr/drake/pkg-fun.nix} | 0 .../dr/drat-trim/pkg-fun.nix} | 0 .../dr/drawing/pkg-fun.nix} | 0 .../dr/drawio-headless/pkg-fun.nix} | 0 .../dr/drawio/pkg-fun.nix} | 0 .../dr/drawterm/pkg-fun.nix} | 0 .../default.nix => unit/dr/drbd/pkg-fun.nix} | 0 .../dr/driftctl/pkg-fun.nix} | 0 .../dr}/driftnet/libwebsockets-4.3.0.patch | 0 .../dr/driftnet/pkg-fun.nix} | 0 .../default.nix => unit/dr/drip/pkg-fun.nix} | 0 .../networking => unit/dr}/drive/deps.nix | 0 .../default.nix => unit/dr/drive/pkg-fun.nix} | 0 .../dr/drm_info/pkg-fun.nix} | 0 .../dr}/drogon/fix_find_package.patch | 0 .../dr/drogon/pkg-fun.nix} | 0 .../dr/droidcam/pkg-fun.nix} | 0 .../dr/droidmote/pkg-fun.nix} | 0 ...001-use-different-upstream-for-gomod.patch | 0 .../dr/drone-cli/pkg-fun.nix} | 0 .../dr/drone-runner-docker/pkg-fun.nix} | 0 .../dr/drone-runner-exec/pkg-fun.nix} | 0 .../dr}/dropbear/pass-path.patch | 0 .../dr/dropbear/pkg-fun.nix} | 0 .../dr/dropbox-cli}/fix-cli-paths.patch | 0 .../dr/dropbox-cli}/nautilus-43.patch | 0 .../dr/dropbox-cli/pkg-fun.nix} | 0 .../dr/dropbox/pkg-fun.nix} | 0 .../dr/dropwatch/pkg-fun.nix} | 0 .../default.nix => unit/dr/drush/pkg-fun.nix} | 0 .../default.nix => unit/ds/dsd/pkg-fun.nix} | 0 .../default.nix => unit/ds/dsdcc/pkg-fun.nix} | 0 .../ds/dsf2flac/pkg-fun.nix} | 0 .../ds/dsniff/pkg-fun.nix} | 0 .../default.nix => unit/ds/dsp/pkg-fun.nix} | 0 .../mail => unit/ds}/dspam/mariadb.patch | 0 .../default.nix => unit/ds/dspam/pkg-fun.nix} | 0 .../default.nix => unit/ds/dsq/pkg-fun.nix} | 0 .../ds/dsseries/pkg-fun.nix} | 0 .../default.nix => unit/ds/dssi/pkg-fun.nix} | 0 .../default.nix => unit/ds/dssp/pkg-fun.nix} | 0 .../ds/dstask/pkg-fun.nix} | 0 .../ds}/dstat/fix_pluginpath.patch | 0 .../default.nix => unit/ds/dstat/pkg-fun.nix} | 0 .../default.nix => unit/ds/dstp/pkg-fun.nix} | 0 .../default.nix => unit/ds/dsvpn/pkg-fun.nix} | 0 .../dt/dt-shell-color-scripts/pkg-fun.nix} | 0 .../default.nix => unit/dt/dtach/pkg-fun.nix} | 0 ...-instead-of-.so-when-building-static.patch | 0 .../default.nix => unit/dt/dtc/pkg-fun.nix} | 0 .../dt}/dtc/python-3.10.patch | 0 .../default.nix => unit/dt/dterm/pkg-fun.nix} | 0 .../dt/dtools/pkg-fun.nix} | 0 .../default.nix => unit/dt/dtrx/pkg-fun.nix} | 0 .../dt/dtv-scan-tables_linuxtv/pkg-fun.nix} | 0 .../dt/dtv-scan-tables_tvheadend/pkg-fun.nix} | 0 .../default.nix => unit/du/dub/pkg-fun.nix} | 0 .../default.nix => unit/du/duc/pkg-fun.nix} | 0 .../du/duckdb/pkg-fun.nix} | 0 .../du}/duckdb/version.patch | 0 .../du/duckling-proxy/pkg-fun.nix} | 0 .../default.nix => unit/du/duf/pkg-fun.nix} | 0 .../du}/duktape/duktape.pc.in | 0 .../du/duktape/pkg-fun.nix} | 0 .../default.nix => unit/du/dum/pkg-fun.nix} | 0 .../du/dumb-init/pkg-fun.nix} | 0 .../default.nix => unit/du/dumb/pkg-fun.nix} | 0 .../default.nix => unit/du/dump/pkg-fun.nix} | 0 .../du/dump1090/pkg-fun.nix} | 0 .../du/dumptorrent/pkg-fun.nix} | 0 .../default.nix => unit/du/dunst/pkg-fun.nix} | 0 .../du/duo-unix/pkg-fun.nix} | 0 .../default.nix => unit/du/dupd/pkg-fun.nix} | 0 .../du}/dupe-krill/Cargo.lock | 0 .../du/dupe-krill/pkg-fun.nix} | 0 .../du/dupeguru/pkg-fun.nix} | 0 .../du/duperemove/pkg-fun.nix} | 0 .../du/duplicacy/pkg-fun.nix} | 0 .../du/duplicati/pkg-fun.nix} | 0 .../du}/duplicity/gnutar-in-test.patch | 0 .../linux-disable-timezone-test.patch | 0 .../du/duplicity/pkg-fun.nix} | 0 .../use-installed-scripts-in-test.patch | 0 .../default.nix => unit/du/duply/pkg-fun.nix} | 0 .../du/dutree/pkg-fun.nix} | 0 .../dv/dvd-slideshow/pkg-fun.nix} | 0 .../dv/dvd-vr/pkg-fun.nix} | 0 .../dvdauthor-0.7.1-automake-1.13.patch | 0 .../dvdauthor-0.7.1-mga-strndup.patch | 0 .../dvdauthor-imagemagick-0.7.0.patch | 0 .../dv/dvdauthor/pkg-fun.nix} | 0 .../dv/dvdbackup/pkg-fun.nix} | 0 .../dv}/dvdisaster/dvdrom.patch | 0 .../dv}/dvdisaster/encryption.patch | 0 .../dv/dvdisaster/pkg-fun.nix} | 0 .../dv/dvdplusrwtools/pkg-fun.nix} | 0 .../dv/dvgrab/pkg-fun.nix} | 0 .../dw/dwarf2json/pkg-fun.nix} | 0 .../dw/dwarfs/pkg-fun.nix} | 0 .../dw}/dwarfs/version_info.patch | 0 .../dw/dwdiff/pkg-fun.nix} | 0 .../default.nix => unit/dw/dwfv/pkg-fun.nix} | 0 .../default.nix => unit/dw/dwl/pkg-fun.nix} | 0 .../dw/dwm-status/pkg-fun.nix} | 0 .../dw/dwmbar/pkg-fun.nix} | 0 .../dw/dwmblocks/pkg-fun.nix} | 0 .../default.nix => unit/dw/dwz/pkg-fun.nix} | 0 .../xa/dxa.nix => unit/dx/dxa/pkg-fun.nix} | 0 .../dx}/dxvk/darwin-dxvk-compat.patch | 0 .../dx}/dxvk/darwin-thread-primitives.patch | 0 pkgs/{misc => unit/dx}/dxvk/dxvk.nix | 0 pkgs/{misc => unit/dx}/dxvk/mcfgthread.patch | 0 .../default.nix => unit/dx/dxvk/pkg-fun.nix} | 0 .../dx/dxx-rebirth/pkg-fun.nix} | 0 .../dy/dydisnix/pkg-fun.nix} | 0 .../default.nix => unit/dy/dyff/pkg-fun.nix} | 0 .../dy/dynamic-colors/pkg-fun.nix} | 0 .../dy/dynamic-wallpaper/pkg-fun.nix} | 0 .../dy/dynamips/pkg-fun.nix} | 0 .../dy/dyncall/pkg-fun.nix} | 0 .../dy/dyndnsc/pkg-fun.nix} | 0 .../default.nix => unit/dz/dzen2/pkg-fun.nix} | 0 .../default.nix => unit/e1/e16/pkg-fun.nix} | 0 .../e1/e17gtk/pkg-fun.nix} | 0 .../e2/e2fsprogs/pkg-fun.nix} | 0 .../e2/e2tools/pkg-fun.nix} | 0 .../ea/default.nix => unit/ea/ea/pkg-fun.nix} | 0 .../default.nix => unit/ea/each/pkg-fun.nix} | 0 .../ea/eaglemode/pkg-fun.nix} | 0 .../ea/earlybird/pkg-fun.nix} | 0 .../ea}/earlyoom/fix-dbus-path.patch | 0 .../ea/earlyoom/pkg-fun.nix} | 0 .../ea/eartag/pkg-fun.nix} | 0 .../ea/earthly/pkg-fun.nix} | 0 .../ea/easeprobe/pkg-fun.nix} | 0 .../ea/easycrypt-runtest/pkg-fun.nix} | 0 .../ea/easycrypt/pkg-fun.nix} | 0 .../ea/easyeffects/pkg-fun.nix} | 0 .../ea/easyjson/pkg-fun.nix} | 0 .../ea/easyloggingpp/pkg-fun.nix} | 0 .../ea/easypdkprog/pkg-fun.nix} | 0 .../ea/easyrpg-player/pkg-fun.nix} | 0 .../ea/easyrsa/pkg-fun.nix} | 0 .../ea/easysnap/pkg-fun.nix} | 0 .../ea/easytag/pkg-fun.nix} | 0 .../default.nix => unit/eb/EBTKS/pkg-fun.nix} | 0 .../eb/eb-garamond/pkg-fun.nix} | 0 pkgs/{games => unit/eb}/eboard/eboard.patch | 0 .../eb/eboard/pkg-fun.nix} | 0 .../eb/ebook2cw/pkg-fun.nix} | 0 .../eb/ebook_tools/pkg-fun.nix} | 0 .../eb/ebtables/pkg-fun.nix} | 0 .../eb/ebumeter/pkg-fun.nix} | 0 .../ec/ec2-ami-tools/pkg-fun.nix} | 0 .../ec}/ec2-ami-tools/writable.patch | 0 .../ec/ec2-api-tools/pkg-fun.nix} | 0 .../ec/ec2-metadata-mock/pkg-fun.nix} | 0 .../ec/ecasound/pkg-fun.nix} | 0 .../ec/ecdsatool/pkg-fun.nix} | 0 .../ec/ecdsautils/pkg-fun.nix} | 0 .../ec/echoip/pkg-fun.nix} | 0 .../default.nix => unit/ec/ecl/pkg-fun.nix} | 0 .../ecl-1.16.2-libffi-3.3-abi.patch | 0 .../ec/ecl_16_1_2/pkg-fun.nix} | 0 .../ec/eclair/pkg-fun.nix} | 0 .../default.nix => unit/ec/eclib/pkg-fun.nix} | 0 .../ec/eclint/pkg-fun.nix} | 0 .../ec/eclipse-mat/pkg-fun.nix} | 0 .../default.nix => unit/ec/ecm/pkg-fun.nix} | 0 .../ec/ecmtools/pkg-fun.nix} | 0 .../ec/ecopcr/pkg-fun.nix} | 0 .../default.nix => unit/ec/ecos/pkg-fun.nix} | 0 .../ec/ecryptfs-helper/pkg-fun.nix} | 0 .../ec/ecryptfs/pkg-fun.nix} | 0 .../ec/ecs-agent/pkg-fun.nix} | 0 .../ec/ecwolf/pkg-fun.nix} | 0 .../ed/default.nix => unit/ed/ed/pkg-fun.nix} | 0 .../ed/edac-utils/pkg-fun.nix} | 0 .../ed}/edbrowse/0001-small-fixes.patch | 0 .../ed/edbrowse/pkg-fun.nix} | 0 .../ed/edgetpu-compiler/pkg-fun.nix} | 0 .../ed/edid-decode/pkg-fun.nix} | 0 .../ed/edid-generator/pkg-fun.nix} | 0 .../default.nix => unit/ed/edir/pkg-fun.nix} | 0 .../default.nix => unit/ed/edit/pkg-fun.nix} | 0 .../ed/editline/pkg-fun.nix} | 0 .../ed/editorconfig-checker/pkg-fun.nix} | 0 .../ed/editorconfig-core-c/pkg-fun.nix} | 0 .../ed/editres/pkg-fun.nix} | 0 .../ed/edk2-uefi-shell/pkg-fun.nix} | 0 .../default.nix => unit/ed/edk2/pkg-fun.nix} | 0 .../default.nix => unit/ed/edlin/pkg-fun.nix} | 0 .../ed/edukai/pkg-fun.nix} | 0 .../default.nix => unit/ed/eduli/pkg-fun.nix} | 0 .../ed/edusong/pkg-fun.nix} | 0 .../default.nix => unit/ed/edwin/pkg-fun.nix} | 0 .../default.nix => unit/ef/eff/pkg-fun.nix} | 0 .../efficient-compression-tool/pkg-fun.nix} | 0 .../use-nixpkgs-libpng.patch | 0 .../ef/effitask/pkg-fun.nix} | 0 .../ef/efibootmgr/pkg-fun.nix} | 0 .../ef/efitools/pkg-fun.nix} | 0 .../ef/efivar/pkg-fun.nix} | 0 .../audio => unit/ef}/eflite/format.patch | 0 .../ef/eflite/pkg-fun.nix} | 0 .../ef/efm-langserver/pkg-fun.nix} | 0 .../ef/efont-unicode/pkg-fun.nix} | 0 .../default.nix => unit/eg/eget/pkg-fun.nix} | 0 .../eg/eggdbus/pkg-fun.nix} | 0 .../eg/eggdrop/pkg-fun.nix} | 0 .../eg/eggnog-mapper/pkg-fun.nix} | 0 .../eg/egl-wayland/pkg-fun.nix} | 0 .../eg/egoboo/pkg-fun.nix} | 0 .../default.nix => unit/eg/egypt/pkg-fun.nix} | 0 .../ei/eiciel/pkg-fun.nix} | 0 .../ei}/eidolon/cargo-lock.patch | 0 .../ei/eidolon/pkg-fun.nix} | 0 .../ei}/eigen/include-dir.patch | 0 .../default.nix => unit/ei/eigen/pkg-fun.nix} | 0 .../2.0.nix => unit/ei/eigen2/pkg-fun.nix} | 0 .../tools => unit/ej}/ejson/Gemfile | 0 .../tools => unit/ej}/ejson/Gemfile.lock | 0 .../tools => unit/ej}/ejson/gemset.nix | 0 .../default.nix => unit/ej/ejson/pkg-fun.nix} | 0 .../ej/ejson2env/pkg-fun.nix} | 0 .../default.nix => unit/ek/ekam/pkg-fun.nix} | 0 .../default.nix => unit/ek/ekho/pkg-fun.nix} | 0 .../ek/eksctl/pkg-fun.nix} | 0 .../0001-dynamically-patchelf-binaries.patch | 0 .../default.nix => unit/el/elan/pkg-fun.nix} | 0 .../el/elasticsearch-curator/pkg-fun.nix} | 0 .../el/electricsheep/pkg-fun.nix} | 0 .../el/electron-fiddle/pkg-fun.nix} | 0 .../el/electron-mail/pkg-fun.nix} | 0 .../el/electronplayer/pkg-fun.nix} | 0 .../el/element/pkg-fun.nix} | 0 .../el/elementary-cmake-modules/pkg-fun.nix} | 0 .../elementary-cmake-modules/setup-hook.sh | 0 .../el/elementary-planner/pkg-fun.nix} | 0 .../elementary-xfce-icon-theme/pkg-fun.nix} | 0 .../el/elf-header-real/pkg-fun.nix} | 0 .../el/elf2uf2-rs/pkg-fun.nix} | 0 .../el/elfcat/pkg-fun.nix} | 0 .../el/elfinfo/pkg-fun.nix} | 0 .../default.nix => unit/el/elfio/pkg-fun.nix} | 0 .../el/elfkickers/pkg-fun.nix} | 0 .../el}/elfutils/debug-info-from-env.patch | 0 .../el}/elfutils/musl-error_h.patch | 0 .../el/elfutils/pkg-fun.nix} | 0 .../el/elfx86exts/pkg-fun.nix} | 0 .../default.nix => unit/el/eli/pkg-fun.nix} | 0 .../el/eliot-tree/pkg-fun.nix} | 0 .../el/elkhound/pkg-fun.nix} | 0 .../default.nix => unit/el/ell/pkg-fun.nix} | 0 .../el/elliptic_curves/pkg-fun.nix} | 0 .../el}/elm-github-install/Gemfile | 0 .../el}/elm-github-install/Gemfile.lock | 0 .../el}/elm-github-install/gemset.nix | 0 .../el/elm-github-install/pkg-fun.nix} | 0 .../0001-fix-import-of-QPainterPath.patch | 0 ...ename-loopvars-to-avoid-redefinition.patch | 0 .../patches/0003-ignore-qwt_compat.patch | 0 .../el/elmerfem/pkg-fun.nix} | 0 .../el/elogind/pkg-fun.nix} | 0 .../el}/elpa/pkg-config.patch | 0 .../default.nix => unit/el/elpa/pkg-fun.nix} | 0 .../el/eltclsh/pkg-fun.nix} | 0 .../default.nix => unit/el/elvis/pkg-fun.nix} | 0 .../el/elvish/pkg-fun.nix} | 0 ...1-bundle-system-glm-in-seriousproton.patch | 0 .../em/EmptyEpsilon/pkg-fun.nix} | 0 .../em/default.nix => unit/em/em/pkg-fun.nix} | 0 .../em/emacs-all-the-icons-fonts/pkg-fun.nix} | 0 .../default.nix => unit/em/email/pkg-fun.nix} | 0 .../em/emboss/pkg-fun.nix} | 0 .../em/embree/pkg-fun.nix} | 0 .../2.x.nix => unit/em/embree2/pkg-fun.nix} | 0 .../default.nix => unit/em/emem/pkg-fun.nix} | 0 .../default.nix => unit/em/emma/pkg-fun.nix} | 0 .../em/emoji-picker/pkg-fun.nix} | 0 .../misc => unit/em}/emoji-picker/xsys.patch | 0 .../em/emojipick/pkg-fun.nix} | 0 .../default.nix => unit/em/emote/pkg-fun.nix} | 0 .../em/emplace/pkg-fun.nix} | 0 .../em/emptty/pkg-fun.nix} | 0 .../misc => unit/em}/empty/0.6-Makefile.patch | 0 .../default.nix => unit/em/empty/pkg-fun.nix} | 0 .../default.nix => unit/em/emu2/pkg-fun.nix} | 0 .../em/emuflight-configurator/pkg-fun.nix} | 0 .../em/emulationstation/pkg-fun.nix} | 0 .../em/emulsion-palette/pkg-fun.nix} | 0 .../default.nix => unit/em/emv/pkg-fun.nix} | 0 .../default.nix => unit/en/enca/pkg-fun.nix} | 0 .../2.x.nix => unit/en/enchant2/pkg-fun.nix} | 0 .../en/enchive/pkg-fun.nix} | 0 .../en/encode-sans/pkg-fun.nix} | 0 .../en/endeavour/pkg-fun.nix} | 0 .../en/endgame-singularity/pkg-fun.nix} | 0 .../en}/endless-sky/fixes.patch | 0 .../en/endless-sky/pkg-fun.nix} | 0 .../en/endlessh-go/pkg-fun.nix} | 0 .../en/endlessh/pkg-fun.nix} | 0 .../default.nix => unit/en/enet/pkg-fun.nix} | 0 .../en/enhanced-ctorrent/pkg-fun.nix} | 0 .../en/enigma/pkg-fun.nix} | 0 .../en/enjarify/pkg-fun.nix} | 0 .../security => unit/en}/enpass/data.json | 0 .../en/enpass/pkg-fun.nix} | 0 .../en}/enpass/update_script.py | 0 .../en/enscript/pkg-fun.nix} | 0 .../en/ent-go/pkg-fun.nix} | 0 .../default.nix => unit/en/ent/pkg-fun.nix} | 0 .../default.nix => unit/en/entr/pkg-fun.nix} | 0 .../default.nix => unit/en/entt/pkg-fun.nix} | 0 .../en/entwine/pkg-fun.nix} | 0 .../en/enum4linux/pkg-fun.nix} | 0 .../en/enumer/pkg-fun.nix} | 0 .../en/envconsul/pkg-fun.nix} | 0 .../default.nix => unit/en/envfs/pkg-fun.nix} | 0 .../en/envsubst/pkg-fun.nix} | 0 .../en/envypn-font/pkg-fun.nix} | 0 .../default.nix => unit/eo/eolie/pkg-fun.nix} | 0 .../eo/eos-installer/pkg-fun.nix} | 0 .../eo/eot_utilities/pkg-fun.nix} | 0 .../ep/epdfview/pkg-fun.nix} | 0 .../default.nix => unit/ep/epeg/pkg-fun.nix} | 0 .../ep/ephemeral/pkg-fun.nix} | 0 .../ep/ephemeralpg/pkg-fun.nix} | 0 .../default.nix => unit/ep/epic5/pkg-fun.nix} | 0 .../ep}/epkowa/firmware_location.patch | 0 .../ep/epkowa/pkg-fun.nix} | 0 .../drivers => unit/ep}/epkowa/sscanf.patch | 0 .../default.nix => unit/ep/eplot/pkg-fun.nix} | 0 .../default.nix => unit/ep/epm/pkg-fun.nix} | 0 .../default.nix => unit/ep/epr/pkg-fun.nix} | 0 .../ep/epson-201106w/pkg-fun.nix} | 0 .../ep}/epson-201401w/fixbuild.patch | 0 .../ep/epson-201401w/pkg-fun.nix} | 0 .../ep}/epson-alc1100/cups-data-dir.patch | 0 .../ep/epson-alc1100/pkg-fun.nix} | 0 .../ep}/epson-alc1100/ppd.patch | 0 .../epson-escpr/cups-filter-ppd-dirs.patch | 0 .../ep/epson-escpr/pkg-fun.nix} | 0 .../epson-escpr2/cups-filter-ppd-dirs.patch | 0 .../ep/epson-escpr2/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../ep/epson_201207w/pkg-fun.nix} | 0 .../graphics => unit/ep}/epstool/gcc43.patch | 0 .../ep/epstool/pkg-fun.nix} | 0 .../ep/epubcheck/pkg-fun.nix} | 0 .../default.nix => unit/eq/eq10q/pkg-fun.nix} | 0 .../default.nix => unit/eq/eql/pkg-fun.nix} | 0 .../eq/equilux-theme/pkg-fun.nix} | 0 .../er/er-patcher/pkg-fun.nix} | 0 .../default.nix => unit/er/eresi/pkg-fun.nix} | 0 .../default.nix => unit/er/ergo/pkg-fun.nix} | 0 .../er/ergochat/pkg-fun.nix} | 0 .../er}/ergoscf/math-constants.patch | 0 .../er/ergoscf/pkg-fun.nix} | 0 .../er/erigon/pkg-fun.nix} | 0 .../er/eris-go/pkg-fun.nix} | 0 .../er/erofs-utils/pkg-fun.nix} | 0 .../er/erosmb/pkg-fun.nix} | 0 .../er/errbot/pkg-fun.nix} | 0 .../er/errcheck/pkg-fun.nix} | 0 .../es/default.nix => unit/es/es/pkg-fun.nix} | 0 .../es/esbuild/pkg-fun.nix} | 0 .../es/esbuild_netlify/pkg-fun.nix} | 0 .../es/eschalot/pkg-fun.nix} | 0 .../es/escrotum/pkg-fun.nix} | 0 .../default.nix => unit/es/esh/pkg-fun.nix} | 0 .../audio => unit/es}/espeak-ng/mbrola.patch | 0 .../es/espeak-ng/pkg-fun.nix} | 0 .../es/espeakup/pkg-fun.nix} | 0 .../misc => unit/es}/esphome/dashboard.nix | 0 .../es/esphome/pkg-fun.nix} | 0 .../misc => unit/es}/esphome/update.nix | 0 .../es/esptool-ck/pkg-fun.nix} | 0 .../es/esptool/pkg-fun.nix} | 0 .../es}/esptool/test-call-bin-directly.patch | 0 .../3.nix => unit/es/esptool_3/pkg-fun.nix} | 0 .../es/essentia-extractor/pkg-fun.nix} | 0 .../es/esshader/pkg-fun.nix} | 0 .../es/est-sfs/pkg-fun.nix} | 0 .../et/default.nix => unit/et/et/pkg-fun.nix} | 0 .../et/etBook/pkg-fun.nix} | 0 .../3.3.nix => unit/et/etcd_3_3/pkg-fun.nix} | 0 .../3.4.nix => unit/et/etcd_3_4/pkg-fun.nix} | 0 .../3.5.nix => unit/et/etcd_3_5/pkg-fun.nix} | 0 .../default.nix => unit/et/eterm/pkg-fun.nix} | 0 .../et/eternal-terminal/pkg-fun.nix} | 0 .../et/eternity/pkg-fun.nix} | 0 .../et/etesync-dav/pkg-fun.nix} | 0 .../et}/ethabi/add-Cargo-lock.patch | 0 .../et/ethabi/pkg-fun.nix} | 0 .../et/ethash/pkg-fun.nix} | 0 .../et/etherape/pkg-fun.nix} | 0 .../et/ethtool/pkg-fun.nix} | 0 .../default.nix => unit/et/ets/pkg-fun.nix} | 0 .../et/ettercap/pkg-fun.nix} | 0 .../eukleides/gs-allowpstransparency.patch | 0 .../eu/eukleides/pkg-fun.nix} | 0 .../math => unit/eu}/eukleides/use-CC.patch | 0 .../eu/eunomia/pkg-fun.nix} | 0 .../eu/eureka-editor/pkg-fun.nix} | 0 .../default.nix => unit/ev/eva/pkg-fun.nix} | 0 .../default.nix => unit/ev/evans/pkg-fun.nix} | 0 .../default.nix => unit/ev/evcc/pkg-fun.nix} | 0 .../ev/evdevremapkeys/pkg-fun.nix} | 0 .../default.nix => unit/ev/evemu/pkg-fun.nix} | 0 .../ev/eventlog/pkg-fun.nix} | 0 .../ev/eventstat/pkg-fun.nix} | 0 .../nosql => unit/ev}/eventstore/deps.nix | 0 .../ev/eventstore/pkg-fun.nix} | 0 .../nosql => unit/ev}/eventstore/updater.sh | 0 .../ev/everspace/pkg-fun.nix} | 0 .../security => unit/ev}/evil-winrm/Gemfile | 0 .../ev}/evil-winrm/Gemfile.lock | 0 .../ev}/evil-winrm/gemset.nix | 0 .../ev/evil-winrm/pkg-fun.nix} | 0 .../tools/analysis => unit/ev}/evmdis/go.mod | 0 .../ev/evmdis/pkg-fun.nix} | 0 .../evolution-ews/hardcode-gsettings.patch | 0 .../ev/evolution-ews/pkg-fun.nix} | 0 .../ev/evolution/pkg-fun.nix} | 0 .../ev/evscript/pkg-fun.nix} | 0 .../ev/evtest/pkg-fun.nix} | 0 .../default.nix => unit/ev/evtx/pkg-fun.nix} | 0 .../default.nix => unit/ew/eweb/pkg-fun.nix} | 0 .../ex/exactaudiocopy/pkg-fun.nix} | 0 .../ex/exaile/pkg-fun.nix} | 0 .../ex/example-robot-data/pkg-fun.nix} | 0 .../ex/exempi/pkg-fun.nix} | 0 .../ex/exercism/pkg-fun.nix} | 0 .../default.nix => unit/ex/exfat/pkg-fun.nix} | 0 .../ex/exfatprogs/pkg-fun.nix} | 0 .../ex/exhibitor/pkg-fun.nix} | 0 .../default.nix => unit/ex/exif/pkg-fun.nix} | 0 .../ex/exifprobe/pkg-fun.nix} | 0 .../ex/exiftags/pkg-fun.nix} | 0 .../default.nix => unit/ex/exim/pkg-fun.nix} | 0 .../default.nix => unit/ex/exiv2/pkg-fun.nix} | 0 .../ex/exodus/pkg-fun.nix} | 0 .../ex/exonerate/pkg-fun.nix} | 0 .../ex/exoscale-cli/pkg-fun.nix} | 0 .../default.nix => unit/ex/expat/pkg-fun.nix} | 0 .../ex}/expect/fix-cross-compilation.patch | 0 .../ex/expect/pkg-fun.nix} | 0 .../ex/expected-lite/pkg-fun.nix} | 0 .../ex/expenses/pkg-fun.nix} | 0 .../ex/explain/pkg-fun.nix} | 0 .../ex/expliot/pkg-fun.nix} | 0 .../ex/exploitdb/pkg-fun.nix} | 0 .../ex/exportarr/pkg-fun.nix} | 0 .../ex/expressvpn/pkg-fun.nix} | 0 .../ex/exrtools/pkg-fun.nix} | 0 .../ex}/ext4magic/glibc-fix.patch | 0 .../ex/ext4magic/pkg-fun.nix} | 0 .../ex/extism-cli/pkg-fun.nix} | 0 .../ex/extra-container/pkg-fun.nix} | 0 .../ex/extrace/pkg-fun.nix} | 0 .../ex/extract_url/pkg-fun.nix} | 0 .../ex/extrude/pkg-fun.nix} | 0 .../ex/extundelete/pkg-fun.nix} | 0 .../default.nix => unit/ex/exult/pkg-fun.nix} | 0 .../ey/eyedropper/pkg-fun.nix} | 0 .../ez/ezminc/pkg-fun.nix} | 0 .../ez/ezquake/pkg-fun.nix} | 0 .../ez/ezra-sil/pkg-fun.nix} | 0 .../ez/ezstream/pkg-fun.nix} | 0 .../ez/eztrace/pkg-fun.nix} | 0 .../f1/f1viewer/pkg-fun.nix} | 0 .../f2/default.nix => unit/f2/f2/pkg-fun.nix} | 0 .../default.nix => unit/f2/f2c/pkg-fun.nix} | 0 .../f2}/f2fs-tools/f2fs-tools-cross-fix.patch | 0 .../f2/f2fs-tools/pkg-fun.nix} | 0 .../f3/default.nix => unit/f3/f3/pkg-fun.nix} | 0 .../default.nix => unit/f5/f5_6/pkg-fun.nix} | 0 .../default.nix => unit/fa/faac/pkg-fun.nix} | 0 .../default.nix => unit/fa/faad2/pkg-fun.nix} | 0 .../fa/faas-cli/pkg-fun.nix} | 0 .../fa/faba-icon-theme/pkg-fun.nix} | 0 .../fa/faba-mono-icons/pkg-fun.nix} | 0 .../fa/fabric-installer/pkg-fun.nix} | 0 .../tools => unit/fa}/fac/deps.nix | 0 .../default.nix => unit/fa/fac/pkg-fun.nix} | 0 .../fa/facedetect/pkg-fun.nix} | 0 .../fa/facetimehd-calibration/pkg-fun.nix} | 0 .../fa/facetimehd-firmware/pkg-fun.nix} | 0 .../fa/facter/pkg-fun.nix} | 0 .../adjust-paths-in-unit-tests.patch | 0 .../fa/factor-lang-scope}/factor98.nix | 0 .../fa/factor-lang-scope/pkg-fun.nix} | 0 .../staging-command-line-0.98-pre.patch | 0 .../factor-lang-scope}/workdir-0.98-pre.patch | 0 .../fa/factorio-mods/pkg-fun.nix} | 0 .../fa/factorio-utils/pkg-fun.nix} | 0 .../fa/fahclient/pkg-fun.nix} | 0 .../fa/fahcontrol/pkg-fun.nix} | 0 .../fa/fahviewer/pkg-fun.nix} | 0 .../fa/fail2ban/pkg-fun.nix} | 0 .../fa/faircamp/pkg-fun.nix} | 0 .../misc => unit/fa}/faircamp/test-wav.nix | 0 .../fa/fairymax/pkg-fun.nix} | 0 .../fa/fakeNss/pkg-fun.nix} | 0 .../fa/fakechroot/pkg-fun.nix} | 0 .../system => unit/fa}/fakeroot/einval.patch | 0 .../fa/fakeroot/pkg-fun.nix} | 0 .../fa/fakeroute/pkg-fun.nix} | 0 .../fa/faketty/pkg-fun.nix} | 0 .../fa/famistudio/pkg-fun.nix} | 0 .../fa/fan2go/pkg-fun.nix} | 0 .../fa/fancy-motd/pkg-fun.nix} | 0 .../fa/fancypp/pkg-fun.nix} | 0 .../fa/fanficfare/pkg-fun.nix} | 0 .../fa/fantasque-sans-mono/pkg-fun.nix} | 0 .../fa/faraday-agent-dispatcher/pkg-fun.nix} | 0 .../fa/faraday-cli/pkg-fun.nix} | 0 .../fa/faraday/pkg-fun.nix} | 0 .../fa/farbfeld/pkg-fun.nix} | 0 .../default.nix => unit/fa/fasd/pkg-fun.nix} | 0 .../bin.nix => unit/fa/fasm-bin/pkg-fun.nix} | 0 .../default.nix => unit/fa/fasmg/pkg-fun.nix} | 0 .../fast-cpp-csv-parser.pc.in | 0 .../fa/fast-cpp-csv-parser/pkg-fun.nix} | 0 .../fa/fast-downward/pkg-fun.nix} | 0 .../fa/fastJson/pkg-fun.nix} | 0 .../default.nix => unit/fa/fastd/pkg-fun.nix} | 0 .../fa/fastddsgen/pkg-fun.nix} | 0 .../fa/fastjar/pkg-fun.nix} | 0 .../fa/fastjet-contrib/pkg-fun.nix} | 0 .../fa/fastjet/pkg-fun.nix} | 0 .../{tools/admin => unit/fa}/fastlane/Gemfile | 0 .../admin => unit/fa}/fastlane/Gemfile.lock | 0 .../admin => unit/fa}/fastlane/gemset.nix | 0 .../fa/fastlane/pkg-fun.nix} | 0 .../fa/fastly/pkg-fun.nix} | 0 .../fa/fastnlo_toolkit/pkg-fun.nix} | 0 .../default.nix => unit/fa/fastp/pkg-fun.nix} | 0 .../fa/fastpbkdf2/pkg-fun.nix} | 0 .../fa/fasttext/pkg-fun.nix} | 0 .../fa/fatrace/pkg-fun.nix} | 0 .../fa/fatresize/pkg-fun.nix} | 0 .../fa/fatsort/pkg-fun.nix} | 0 .../fa/faudio/pkg-fun.nix} | 0 .../faust1.nix => unit/fa/faust1/pkg-fun.nix} | 0 .../faust2.nix => unit/fa/faust2/pkg-fun.nix} | 0 .../fa/faust2alqt/pkg-fun.nix} | 0 .../fa/faust2alsa/pkg-fun.nix} | 0 .../fa/faust2csound/pkg-fun.nix} | 0 .../fa/faust2firefox/pkg-fun.nix} | 0 .../fa/faust2jack/pkg-fun.nix} | 0 .../fa/faust2jackrust/pkg-fun.nix} | 0 .../fa/faust2jaqt/pkg-fun.nix} | 0 .../fa/faust2ladspa/pkg-fun.nix} | 0 .../fa/faust2lv2/pkg-fun.nix} | 0 .../fa/faustPhysicalModeling/pkg-fun.nix} | 0 .../fa/faustStk/pkg-fun.nix} | 0 .../fa/faustlive/pkg-fun.nix} | 0 .../default.nix => unit/fa/fava/pkg-fun.nix} | 0 .../default.nix => unit/fb/fbcat/pkg-fun.nix} | 0 .../default.nix => unit/fb/fbida/pkg-fun.nix} | 0 .../default.nix => unit/fb/fblog/pkg-fun.nix} | 0 .../fb/fbmark/pkg-fun.nix} | 0 .../fb}/fbmenugen/0001-Fix-paths.patch | 0 .../fb/fbmenugen/pkg-fun.nix} | 0 .../fb/fbpanel/pkg-fun.nix} | 0 .../fb/fbterm/pkg-fun.nix} | 0 .../linux => unit/fb}/fbterm/select.patch | 0 .../default.nix => unit/fb/fbv/pkg-fun.nix} | 0 .../default.nix => unit/fb/fbvnc/pkg-fun.nix} | 0 .../default.nix => unit/fc/fcft/pkg-fun.nix} | 0 .../libraries => unit/fc}/fcgi/gcc-4.4.diff | 0 .../default.nix => unit/fc/fcgi/pkg-fun.nix} | 0 .../fc/fcgiwrap/pkg-fun.nix} | 0 .../fc/fcitx-configtool/pkg-fun.nix} | 0 .../fc/fcitx5-anthy/pkg-fun.nix} | 0 .../fc/fcitx5-chewing/pkg-fun.nix} | 0 .../fc/fcitx5-gtk/pkg-fun.nix} | 0 .../fc/fcitx5-hangul/pkg-fun.nix} | 0 .../fc/fcitx5-m17n/pkg-fun.nix} | 0 .../fcitx5-rime-with-nix-env-variable.patch | 0 .../fc/fcitx5-rime/pkg-fun.nix} | 0 .../fc/fcitx5-table-extra/pkg-fun.nix} | 0 .../fc/fcitx5-table-other/pkg-fun.nix} | 0 .../default.nix => unit/fc/fcl/pkg-fun.nix} | 0 .../default.nix => unit/fc/fcp/pkg-fun.nix} | 0 .../default.nix => unit/fc/fcppt/pkg-fun.nix} | 0 .../fc}/fcrackzip/fcrackzip_forkexec.patch | 0 .../fc/fcrackzip/pkg-fun.nix} | 0 .../default.nix => unit/fc/fcron/pkg-fun.nix} | 0 .../fc}/fcron/relative-fcronsighup.patch | 0 .../fd/default.nix => unit/fd/fd/pkg-fun.nix} | 0 .../fd/fdk-aac-encoder/pkg-fun.nix} | 0 .../fd/fdk_aac/pkg-fun.nix} | 0 .../default.nix => unit/fd/fdm/pkg-fun.nix} | 0 .../fd}/fdtools/new-skalibs.patch | 0 .../fd/fdtools/pkg-fun.nix} | 0 .../fd/fdupes/pkg-fun.nix} | 0 .../fe}/febio/fix-cmake.patch | 0 .../default.nix => unit/fe/febio/pkg-fun.nix} | 0 .../f33-fix-xfce-path.patch | 0 .../f34-fix-xfce-path.patch | 0 .../fe}/fedora-backgrounds/generic.nix | 0 .../fe/fedora-backgrounds/pkg-fun.nix} | 0 .../fe/feedbackd/pkg-fun.nix} | 0 .../fe/feedgnuplot/pkg-fun.nix} | 0 .../fe/fehlstart/pkg-fun.nix} | 0 .../fe}/fehlstart/use-nix-profiles.patch | 0 .../fe/feishu/pkg-fun.nix} | 0 .../fe/felix-fm/pkg-fun.nix} | 0 .../default.nix => unit/fe/felix/pkg-fun.nix} | 0 .../fe/felix_remoteshell/pkg-fun.nix} | 0 .../default.nix => unit/fe/fend/pkg-fun.nix} | 0 .../default.nix => unit/fe/ferm/pkg-fun.nix} | 0 .../fe/ferretdb/pkg-fun.nix} | 0 .../fe/ferrum/pkg-fun.nix} | 0 .../fe/fet-sh/pkg-fun.nix} | 0 .../fe/fetchCrate/pkg-fun.nix} | 0 .../fe/fetchFromBitbucket/pkg-fun.nix} | 0 .../fe/fetchFromGitHub/pkg-fun.nix} | 0 .../fe/fetchFromGitLab/pkg-fun.nix} | 0 .../fe/fetchFromGitea/pkg-fun.nix} | 0 .../fe/fetchFromGitiles/pkg-fun.nix} | 0 .../fe/fetchFromRepoOrCz/pkg-fun.nix} | 0 .../fe/fetchFromSavannah/pkg-fun.nix} | 0 .../fe/fetchFromSourcehut/pkg-fun.nix} | 0 .../fe/fetchMavenArtifact/pkg-fun.nix} | 0 .../fe/fetchNextcloudApp/pkg-fun.nix} | 0 .../fe/fetchNuGet/pkg-fun.nix} | 0 .../fe/fetchPypi/pkg-fun.nix} | 0 .../fe/fetchRepoProject/pkg-fun.nix} | 0 .../fe}/fetchbzr/builder.sh | 0 .../fe/fetchbzr/pkg-fun.nix} | 0 .../fe}/fetchdarcs/builder.sh | 0 .../fe/fetchdarcs/pkg-fun.nix} | 0 .../fe}/fetchdocker/fetchdocker-builder.sh | 0 .../fe/fetchdocker/pkg-fun.nix} | 0 .../fe}/fetchfossil/builder.sh | 0 .../fe/fetchfossil/pkg-fun.nix} | 0 .../fe/fetchgitLocal/pkg-fun.nix} | 0 .../fe/fetchgx/pkg-fun.nix} | 0 .../fe}/fetchhg/builder.sh | 0 .../fe/fetchhg/pkg-fun.nix} | 0 .../fe/fetchit/pkg-fun.nix} | 0 .../fe/fetchmail/pkg-fun.nix} | 0 .../fe/fetchmail_7/pkg-fun.nix} | 0 .../fe/fetchs3/pkg-fun.nix} | 0 .../fe}/fetchsvnssh/builder.sh | 0 .../fe/fetchsvnssh/pkg-fun.nix} | 0 .../fe}/fetchsvnssh/sshsubversion.exp | 0 .../fe/fetchutils/pkg-fun.nix} | 0 .../ff/ff2mpv/pkg-fun.nix} | 0 .../ff/ffcast/pkg-fun.nix} | 0 .../default.nix => unit/ff/fff/pkg-fun.nix} | 0 .../ff/fflas-ffpack/pkg-fun.nix} | 0 .../ff/ffmpegthumbnailer/pkg-fun.nix} | 0 .../default.nix => unit/ff/ffms/pkg-fun.nix} | 0 .../default.nix => unit/ff/fftw/pkg-fun.nix} | 0 .../default.nix => unit/ff/ffuf/pkg-fun.nix} | 0 .../fg/fgallery/pkg-fun.nix} | 0 .../fh/fheroes2/pkg-fun.nix} | 0 .../fi/FIL-plugins/pkg-fun.nix} | 0 .../default.nix => unit/fi/fiche/pkg-fun.nix} | 0 .../fi/fido2luks/pkg-fun.nix} | 0 .../fi/fierce/pkg-fun.nix} | 0 .../fi/fig2dev/pkg-fun.nix} | 0 .../fi/figlet/pkg-fun.nix} | 0 .../fi/figma-linux/pkg-fun.nix} | 0 .../default.nix => unit/fi/fiji/pkg-fun.nix} | 0 .../fi/file-rename/pkg-fun.nix} | 0 .../fi/filebench/pkg-fun.nix} | 0 .../fi/filebot/pkg-fun.nix} | 0 .../fi/filegive/pkg-fun.nix} | 0 .../fi/fileschanged/pkg-fun.nix} | 0 .../unused-variables.debian.patch | 0 .../fi/fileshare/pkg-fun.nix} | 0 .../fi/fileshelter/pkg-fun.nix} | 0 .../default.nix => unit/fi/filet/pkg-fun.nix} | 0 .../fi/filezilla/pkg-fun.nix} | 0 .../fi/filter-audio/pkg-fun.nix} | 0 pkgs/{servers => unit/fi}/filtron/deps.nix | 0 .../fi/filtron/pkg-fun.nix} | 0 .../default.nix => unit/fi/fim/pkg-fun.nix} | 0 .../fi/find-cursor/pkg-fun.nix} | 0 .../fi/findbugs/pkg-fun.nix} | 0 .../fi/findimagedupes/pkg-fun.nix} | 0 .../fi/findnewest/pkg-fun.nix} | 0 .../fi/findup/pkg-fun.nix} | 0 .../fi}/findutils/no-install-statedir.patch | 0 .../fi/findutils/pkg-fun.nix} | 0 .../default.nix => unit/fi/fio/pkg-fun.nix} | 0 .../fi/fioctl/pkg-fun.nix} | 0 .../fi/fira-code-symbols/pkg-fun.nix} | 0 .../fi/fira-code/pkg-fun.nix} | 0 .../fi/fira-go/pkg-fun.nix} | 0 .../fi/fira-mono/pkg-fun.nix} | 0 .../default.nix => unit/fi/fira/pkg-fun.nix} | 0 .../fi/firecracker/pkg-fun.nix} | 0 .../fi/firectl/pkg-fun.nix} | 0 .../fi/firefly-desktop/pkg-fun.nix} | 0 .../fi}/firehol/firehol-ping6.patch | 0 .../fi}/firehol/firehol-sysconfdir.patch | 0 .../fi}/firehol/firehol-uname-command.patch | 0 .../fi/firehol/pkg-fun.nix} | 0 .../fbuilder-call-firejail-on-path.patch | 0 .../firejail/mount-nix-dir-on-overlay.patch | 0 .../fi/firejail/pkg-fun.nix} | 0 .../fi/firestarter/pkg-fun.nix} | 0 .../fi/firewalld/pkg-fun.nix} | 0 .../respect-xml-catalog-files-var.patch | 0 .../fi/firmware-updater/pkg-fun.nix} | 0 .../fi/firrtl/pkg-fun.nix} | 0 .../fi}/fish-fillets-ng/icon.xpm | 0 .../fi/fish-fillets-ng/pkg-fun.nix} | 0 .../fi/fish-irssi}/irssi-include-dir.patch | 0 .../fi/fish-irssi/pkg-fun.nix} | 0 .../default.nix => unit/fi/fish/pkg-fun.nix} | 0 .../fi}/fishnet/Cargo.lock.patch | 0 .../fi/fishnet/pkg-fun.nix} | 0 .../fi/fission/pkg-fun.nix} | 0 .../fi/fitnesstrax/pkg-fun.nix} | 0 .../fi/fits-cloudctl/pkg-fun.nix} | 0 .../default.nix => unit/fi/fityk/pkg-fun.nix} | 0 .../fi/fixedsys-excelsior/pkg-fun.nix} | 0 .../default.nix => unit/fl/flac/pkg-fun.nix} | 0 .../fl/flac123/pkg-fun.nix} | 0 .../default.nix => unit/fl/flam3/pkg-fun.nix} | 0 .../fl/flamegraph/pkg-fun.nix} | 0 .../fl/flamerobin/pkg-fun.nix} | 0 .../default.nix => unit/fl/flann/pkg-fun.nix} | 0 .../fl/flannel/pkg-fun.nix} | 0 .../fl/flare-floss/pkg-fun.nix} | 0 .../fl/flashbench/pkg-fun.nix} | 0 .../fl/flashfocus/pkg-fun.nix} | 0 .../fl/flashrom/pkg-fun.nix} | 0 .../default.nix => unit/fl/flasm/pkg-fun.nix} | 0 .../fl/flat-remix-gnome/pkg-fun.nix} | 0 .../fl/flat-remix-gtk/pkg-fun.nix} | 0 .../fl/flatbuffers/pkg-fun.nix} | 0 .../fl/flatcam/pkg-fun.nix} | 0 .../fl}/flatcam/release.patch | 0 .../fl/flatcc/pkg-fun.nix} | 0 .../fl/flavours/pkg-fun.nix} | 0 .../fl/flawfinder/pkg-fun.nix} | 0 .../fl/flex-ncat/pkg-fun.nix} | 0 .../fl/flex-ndax/pkg-fun.nix} | 0 .../default.nix => unit/fl/flex/pkg-fun.nix} | 0 .../fl/flex_2_5_35/pkg-fun.nix} | 0 .../fl/flexcpp/pkg-fun.nix} | 0 .../fl/flexget/pkg-fun.nix} | 0 .../fl/flexibee/pkg-fun.nix} | 0 .../fl/flexoptix-app/pkg-fun.nix} | 0 .../default.nix => unit/fl/flink/pkg-fun.nix} | 0 .../default.nix => unit/fl/flint/pkg-fun.nix} | 0 .../fl/flintlock/pkg-fun.nix} | 0 .../fl/flintqs/pkg-fun.nix} | 0 .../fl/flip-link/pkg-fun.nix} | 0 .../default.nix => unit/fl/flips/pkg-fun.nix} | 0 .../fl}/flips/use-system-libdivsufsort.patch | 0 .../default.nix => unit/fl/flite/pkg-fun.nix} | 0 .../misc => unit/fl}/flitter/flitter.patch | 0 .../fl/flitter/pkg-fun.nix} | 0 .../default.nix => unit/fl/fllog/pkg-fun.nix} | 0 .../default.nix => unit/fl/flmsg/pkg-fun.nix} | 0 .../default.nix => unit/fl/flock/pkg-fun.nix} | 0 .../fl/flockit/pkg-fun.nix} | 0 .../fl/flootty/pkg-fun.nix} | 0 .../fl/flopoco/pkg-fun.nix} | 0 .../fl/flowblade/pkg-fun.nix} | 0 .../fl/flpsed/pkg-fun.nix} | 0 .../default.nix => unit/fl/flrig/pkg-fun.nix} | 0 .../fl/fluent-bit/pkg-fun.nix} | 0 .../fl/fluent-gtk-theme/pkg-fun.nix} | 0 .../fl/fluent-icon-theme/pkg-fun.nix} | 0 .../fl/fluent-reader/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/fl}/fluentd/Gemfile | 0 .../misc => unit/fl}/fluentd/Gemfile.lock | 0 .../misc => unit/fl}/fluentd/gemset.nix | 0 .../fl/fluentd/pkg-fun.nix} | 0 .../fl/fluffychat/pkg-fun.nix} | 0 .../fl/fluidd/pkg-fun.nix} | 0 .../default.nix => unit/fl/flux/pkg-fun.nix} | 0 .../fl/fluxbox/pkg-fun.nix} | 0 .../fl/fluxboxlauncher/pkg-fun.nix} | 0 .../patches/disable-tests-ssh_key.patch | 0 .../fl/fluxcd/pkg-fun.nix} | 0 .../cluster => unit/fl}/fluxcd/update.sh | 0 .../fl/fluxctl/pkg-fun.nix} | 0 .../fl/flvstreamer/pkg-fun.nix} | 0 .../default.nix => unit/fl/fly/pkg-fun.nix} | 0 .../fl/flycast/pkg-fun.nix} | 0 .../fl/flyctl/pkg-fun.nix} | 0 .../fl/flyway/pkg-fun.nix} | 0 .../fl/flywheel-cli/pkg-fun.nix} | 0 .../fm/fmsynth/pkg-fun.nix} | 0 .../default.nix => unit/fm/fmtoy/pkg-fun.nix} | 0 .../fn/fn-cli/pkg-fun.nix} | 0 .../default.nix => unit/fn/fnc/pkg-fun.nix} | 0 .../fn/fnlfmt/pkg-fun.nix} | 0 .../fn/fnotifystat/pkg-fun.nix} | 0 .../default.nix => unit/fn/fnott/pkg-fun.nix} | 0 .../fn/fntsample/pkg-fun.nix} | 0 .../default.nix => unit/fo/focus/pkg-fun.nix} | 0 .../fo/foliate/pkg-fun.nix} | 0 .../default.nix => unit/fo/folks/pkg-fun.nix} | 0 .../default.nix => unit/fo/folly/pkg-fun.nix} | 0 .../default.nix => unit/fo/foma/pkg-fun.nix} | 0 .../default.nix => unit/fo/fomp/pkg-fun.nix} | 0 .../default.nix => unit/fo/fondo/pkg-fun.nix} | 0 .../fo/font-config-info/pkg-fun.nix} | 0 .../fo/font-manager/pkg-fun.nix} | 0 .../fo/fontfor/pkg-fun.nix} | 0 .../fo/fontforge-fonttools/pkg-fun.nix} | 0 .../fo/fontpreview/pkg-fun.nix} | 0 .../fo}/foo2zjs/dell1250c-color-fix.patch | 0 .../drivers => unit/fo}/foo2zjs/hbpl1.patch | 0 .../fo}/foo2zjs/no-hardcode-fw.diff | 0 .../fo}/foo2zjs/papercode-format-fix.patch | 0 .../fo/foo2zjs/pkg-fun.nix} | 0 .../fo/foomatic-db-engine/pkg-fun.nix} | 0 .../fo/foomatic-db-nonfree/pkg-fun.nix} | 0 .../fo/foomatic-db/pkg-fun.nix} | 0 .../fo/foomatic-filters/pkg-fun.nix} | 0 .../default.nix => unit/fo/foot/pkg-fun.nix} | 0 .../fo/footswitch/pkg-fun.nix} | 0 .../{tools/system => unit/fo}/foreman/Gemfile | 0 .../system => unit/fo}/foreman/Gemfile.lock | 0 .../system => unit/fo}/foreman/gemset.nix | 0 .../fo/foreman/pkg-fun.nix} | 0 .../fo}/foremost/makefile.patch | 0 .../fo/foremost/pkg-fun.nix} | 0 .../fo}/forge-mtg/no-launch4j.patch | 0 .../fo/forge-mtg/pkg-fun.nix} | 0 .../fo/forkstat/pkg-fun.nix} | 0 .../fo/forktty/pkg-fun.nix} | 0 .../default.nix => unit/fo/form/pkg-fun.nix} | 0 .../fo}/formatter/fix-paths.patch | 0 .../fo/formatter/pkg-fun.nix} | 0 .../logic => unit/fo}/formula/nuget.nix | 0 .../fo/formula/pkg-fun.nix} | 0 .../fo/fornalder/pkg-fun.nix} | 0 .../fo/fortune/pkg-fun.nix} | 0 .../fo/foxtrotgps/pkg-fun.nix} | 0 .../fp/fparser/pkg-fun.nix} | 0 .../default.nix => unit/fp/fpart/pkg-fun.nix} | 0 .../fp}/fpc/binary-builder-darwin.sh | 0 .../fp}/fpc/binary-builder.sh | 0 .../compilers => unit/fp}/fpc/binary.nix | 0 .../fp}/fpc/mark-paths.patch | 0 .../default.nix => unit/fp/fpc/pkg-fun.nix} | 0 .../fp}/fpc/remove-signature.sh | 0 .../default.nix => unit/fp/fped/pkg-fun.nix} | 0 .../default.nix => unit/fp/fping/pkg-fun.nix} | 0 .../default.nix => unit/fp/fplll/pkg-fun.nix} | 0 .../fp/fplll_20160331/pkg-fun.nix} | 0 .../fp}/fpm/Gemfile | 0 .../fp}/fpm/Gemfile.lock | 0 .../fp}/fpm/gemset.nix | 0 .../default.nix => unit/fp/fpm/pkg-fun.nix} | 0 .../default.nix => unit/fp/fpm2/pkg-fun.nix} | 0 .../default.nix => unit/fp/fpp/pkg-fun.nix} | 0 .../fp/fprettify/pkg-fun.nix} | 0 .../fp/fprintd-tod/pkg-fun.nix} | 0 .../fp/fprintd/pkg-fun.nix} | 0 .../fq/default.nix => unit/fq/fq/pkg-fun.nix} | 0 .../fr/fragments/pkg-fun.nix} | 0 .../fr/framac/pkg-fun.nix} | 0 .../default.nix => unit/fr/frame/pkg-fun.nix} | 0 .../fr/framesh/pkg-fun.nix} | 0 .../fr/frangipanni/pkg-fun.nix} | 0 .../fr/fraunces/pkg-fun.nix} | 0 .../default.nix => unit/fr/frawk/pkg-fun.nix} | 0 .../default.nix => unit/fr/freac/pkg-fun.nix} | 0 .../default.nix => unit/fr/frece/pkg-fun.nix} | 0 .../fr/free42/pkg-fun.nix} | 0 .../fr/freealut/pkg-fun.nix} | 0 .../fr/freebayes/pkg-fun.nix} | 0 .../fr/freebind/pkg-fun.nix} | 0 .../fr/freecell-solver/pkg-fun.nix} | 0 .../fr/freedink/pkg-fun.nix} | 0 .../fr/freedroid/pkg-fun.nix} | 0 .../fr}/freedroidrpg/drop-build-deps.patch | 0 .../fr/freedroidrpg/pkg-fun.nix} | 0 .../fr/freefilesync/pkg-fun.nix} | 0 .../fr/freefont_ttf/pkg-fun.nix} | 0 .../fr/freeglut/pkg-fun.nix} | 0 .../fr/freeipmi/pkg-fun.nix} | 0 .../p2p => unit/fr}/freenet/freenetWrapper | 0 .../fr/freenet/pkg-fun.nix} | 0 .../fr/freenukum/pkg-fun.nix} | 0 .../{games => unit/fr}/freeorion/fix-paths.sh | 0 .../fr}/freeorion/fix-paths.xslt | 0 .../fr/freeorion/pkg-fun.nix} | 0 .../fr/freepats/pkg-fun.nix} | 0 .../fr/freeplane/pkg-fun.nix} | 0 .../fr/freepv/pkg-fun.nix} | 0 .../fr/freesweep/pkg-fun.nix} | 0 .../fr/freetds/pkg-fun.nix} | 0 .../fr/freetube/pkg-fun.nix} | 0 .../freetype/enable-subpixel-rendering.patch | 0 .../freetype/enable-table-validation.patch | 0 .../fr/freetype/pkg-fun.nix} | 0 .../fr/freewheeling/pkg-fun.nix} | 0 .../fr/freexl/pkg-fun.nix} | 0 .../fr/freeze/pkg-fun.nix} | 0 .../default.nix => unit/fr/frei/pkg-fun.nix} | 0 .../fr/frei0r/pkg-fun.nix} | 0 .../fr/freshrss/pkg-fun.nix} | 0 .../fr/fribidi/pkg-fun.nix} | 0 .../fr/fricas/pkg-fun.nix} | 0 pkgs/{games => unit/fr}/frogatto/data.nix | 0 pkgs/{games => unit/fr}/frogatto/engine.nix | 0 .../fr/frogatto/pkg-fun.nix} | 0 .../fr/frostwire-bin/pkg-fun.nix} | 0 .../fr/frostwire/pkg-fun.nix} | 0 .../default.nix => unit/fr/frotz/pkg-fun.nix} | 0 .../fr}/frozen-bubble/fix-compilation.patch | 0 .../fr/frozen-bubble/pkg-fun.nix} | 0 .../default.nix => unit/fr/frp/pkg-fun.nix} | 0 .../default.nix => unit/fr/frr/pkg-fun.nix} | 0 .../fr/frugal/pkg-fun.nix} | 0 .../fs/fsarchiver/pkg-fun.nix} | 0 .../fs/fsatrace/pkg-fun.nix} | 0 .../fs/fscrypt-experimental/pkg-fun.nix} | 0 .../fs/fscryptctl/pkg-fun.nix} | 0 .../fs/fsearch/pkg-fun.nix} | 0 .../fs/fselect/pkg-fun.nix} | 0 .../default.nix => unit/fs/fsg/pkg-fun.nix} | 0 pkgs/{games => unit/fs}/fsg/wxgtk-3.2.patch | 0 .../fs/fsharp/pkg-fun.nix} | 0 .../fs/fsmark/pkg-fun.nix} | 0 .../default.nix => unit/fs/fsmon/pkg-fun.nix} | 0 .../default.nix => unit/fs/fspy/pkg-fun.nix} | 0 .../default.nix => unit/fs/fsql/pkg-fun.nix} | 0 .../default.nix => unit/fs/fsrx/pkg-fun.nix} | 0 .../default.nix => unit/fs/fst/pkg-fun.nix} | 0 .../libraries => unit/fs}/fstrcmp/cross.patch | 0 .../fs/fstrcmp/pkg-fun.nix} | 0 .../default.nix => unit/fs/fstrm/pkg-fun.nix} | 0 .../default.nix => unit/fs/fsuae/pkg-fun.nix} | 0 .../default.nix => unit/fs/fsv/pkg-fun.nix} | 0 .../fs/fsverity-utils/pkg-fun.nix} | 0 .../fsverity-utils/remove-dynamic-libs.patch | 0 .../fs/fswebcam/pkg-fun.nix} | 0 .../default.nix => unit/ft/fte/pkg-fun.nix} | 0 .../default.nix => unit/ft/ftgl/pkg-fun.nix} | 0 .../ft}/ftop/ftop-fix_buffer_overflow.patch | 0 .../ft}/ftop/ftop-fix_printf_format.patch | 0 .../default.nix => unit/ft/ftop/pkg-fun.nix} | 0 .../default.nix => unit/ft/ftxui/pkg-fun.nix} | 0 .../fu/fulcio/pkg-fun.nix} | 0 .../fu/funambol/pkg-fun.nix} | 0 .../default.nix => unit/fu/func/pkg-fun.nix} | 0 .../fu/fundoc/pkg-fun.nix} | 0 .../fu/funnelweb/pkg-fun.nix} | 0 .../fu/furtherance/pkg-fun.nix} | 0 .../fu}/fuse-7z-ng/no-pthread.patch | 0 .../fu/fuse-7z-ng/pkg-fun.nix} | 0 .../fu/fuse-emulator/pkg-fun.nix} | 0 .../fu/fuse-overlayfs/pkg-fun.nix} | 0 .../fu/fusee-interfacee-tk/pkg-fun.nix} | 0 .../fu/fusee-launcher/pkg-fun.nix} | 0 .../fu/fuseiso/pkg-fun.nix} | 0 .../fu/fusionInventory/pkg-fun.nix} | 0 .../inputmethods => unit/fu}/fusuma/Gemfile | 0 .../fu}/fusuma/Gemfile.lock | 0 .../fu}/fusuma/gemset.nix | 0 .../fu/fusuma/pkg-fun.nix} | 0 .../fu/fuzzel/pkg-fun.nix} | 0 .../default.nix => unit/fv/fverb/pkg-fun.nix} | 0 .../2.6.nix => unit/fv/fvwm2/pkg-fun.nix} | 0 .../fvwm/3.nix => unit/fv/fvwm3/pkg-fun.nix} | 0 .../fw/fwanalyzer/pkg-fun.nix} | 0 .../default.nix => unit/fw/fwts/pkg-fun.nix} | 0 .../fw/fwupd-efi/pkg-fun.nix} | 0 ...d-option-for-installation-sysconfdir.patch | 0 .../fw}/fwupd/efi-app-path.patch | 0 .../fwupd/install-fwupdplugin-to-out.patch | 0 .../fw}/fwupd/installed-tests-path.patch | 0 .../default.nix => unit/fw/fwupd/pkg-fun.nix} | 0 .../fx/default.nix => unit/fx/fx/pkg-fun.nix} | 0 .../fx/fx_cast_bridge}/node-env.nix | 0 .../fx/fx_cast_bridge}/node-packages.nix | 0 .../fx/fx_cast_bridge/pkg-fun.nix} | 0 .../fx/fxlinuxprint/pkg-fun.nix} | 0 .../fxlinuxprintutil/fxlocalechk.tcl.patch | 0 .../fx}/fxlinuxprintutil/fxlputil.patch | 0 .../fx}/fxlinuxprintutil/fxlputil.tcl.patch | 0 .../fx/fxlinuxprintutil/pkg-fun.nix} | 0 .../fx/fxload/pkg-fun.nix} | 0 .../fz/fzf-git-sh/pkg-fun.nix} | 0 .../fz/fzf-obc/pkg-fun.nix} | 0 .../fz/fzf-zsh/pkg-fun.nix} | 0 .../default.nix => unit/fz/fzf/pkg-fun.nix} | 0 .../default.nix => unit/fz/fzy/pkg-fun.nix} | 0 .../g1}/g15daemon/pid_location.patch | 0 .../g1/g15daemon/pkg-fun.nix} | 0 .../g2/g203-led/pkg-fun.nix} | 0 .../g9/g933-utils/pkg-fun.nix} | 0 .../ga/galario/pkg-fun.nix} | 0 .../ga/galatia-sil/pkg-fun.nix} | 0 .../ga/galaxis/pkg-fun.nix} | 0 .../ga}/galaxy-buds-client/deps.nix | 0 .../ga/galaxy-buds-client/pkg-fun.nix} | 0 .../default.nix => unit/ga/galen/pkg-fun.nix} | 0 .../ga/galene/pkg-fun.nix} | 0 .../default.nix => unit/ga/galer/pkg-fun.nix} | 0 .../ga/gallia/pkg-fun.nix} | 0 .../default.nix => unit/ga/gam/pkg-fun.nix} | 0 .../ga}/gam/signal_files_as_env_vars.patch | 0 .../default.nix => unit/ga/gama/pkg-fun.nix} | 0 .../ga}/gambatte/fix-scons-paths.patch | 0 .../ga/gambatte/pkg-fun.nix} | 0 .../ga/gambit-support}/bootstrap.nix | 0 .../ga/gambit-support/pkg-fun.nix} | 0 .../ga/game-music-emu/pkg-fun.nix} | 0 .../ga/gamecube-tools/pkg-fun.nix} | 0 .../ga/gamehub/pkg-fun.nix} | 0 .../ga/gamenetworkingsockets/pkg-fun.nix} | 0 .../ga/gamescope/pkg-fun.nix} | 0 .../ga}/gamescope/use-pkgconfig.patch | 0 .../ga}/gamin/abstract-socket-namespace.patch | 0 .../ga}/gamin/deadlock.patch | 0 .../ga}/gamin/debian-patches.nix | 0 .../ga}/gamin/debian-patches.txt | 0 .../default.nix => unit/ga/gamin/pkg-fun.nix} | 0 .../ga}/gamin/returnval.patch | 0 .../misc => unit/ga}/gammu/bashcomp-dir.patch | 0 .../ga}/gammu/gammu-config-dialog.patch | 0 .../default.nix => unit/ga/gammu/pkg-fun.nix} | 0 .../misc => unit/ga}/gammu/systemd.patch | 0 .../ga/gandom-fonts/pkg-fun.nix} | 0 .../ga/ganttproject-bin/pkg-fun.nix} | 0 .../default.nix => unit/ga/ganv/pkg-fun.nix} | 0 .../default.nix => unit/ga/gap/pkg-fun.nix} | 0 .../default.nix => unit/ga/gappa/pkg-fun.nix} | 0 .../ga/garamond-libre/pkg-fun.nix} | 0 .../ga/garble/pkg-fun.nix} | 0 .../ga/garmin-plugin/pkg-fun.nix} | 0 .../ga/garmindev/pkg-fun.nix} | 0 .../ga/garmintools/pkg-fun.nix} | 0 .../ga/gatekeeper/pkg-fun.nix} | 0 .../default.nix => unit/ga/gatk/pkg-fun.nix} | 0 .../ga/gatling/pkg-fun.nix} | 0 .../default.nix => unit/ga/gau/pkg-fun.nix} | 0 .../ga/gauche/pkg-fun.nix} | 0 .../ga/gaucheBootstrap/pkg-fun.nix} | 0 .../default.nix => unit/ga/gauge/pkg-fun.nix} | 0 pkgs/{games => unit/ga}/gav/gcc.patch | 0 .../default.nix => unit/ga/gav/pkg-fun.nix} | 0 .../ga/gavrasm/pkg-fun.nix} | 0 .../default.nix => unit/ga/gaw/pkg-fun.nix} | 0 .../ga/gawkextlib/pkg-fun.nix} | 0 .../gawk => unit/ga/gawkextlib}/setup-hook.sh | 0 .../default.nix => unit/ga/gay/pkg-fun.nix} | 0 .../gb/gb-backup/pkg-fun.nix} | 0 .../gb/gbenchmark/pkg-fun.nix} | 0 .../gb/gbsplay/pkg-fun.nix} | 0 .../gc}/gcab/installed-tests-path.patch | 0 .../default.nix => unit/gc/gcab/pkg-fun.nix} | 0 .../default.nix => unit/gc/gcal/pkg-fun.nix} | 0 .../gc/gcalcli/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-10/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-11/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-12/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-6/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-7/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-8/pkg-fun.nix} | 0 .../gc/gcc-arm-embedded-9/pkg-fun.nix} | 0 .../default.nix => unit/gc/gci/pkg-fun.nix} | 0 .../gc/gcl_2_6_13_pre/pkg-fun.nix} | 0 .../gc}/gcolor2/gcolor2-amd64.patch | 0 .../gc/gcolor2/pkg-fun.nix} | 0 .../gc/gcolor3/pkg-fun.nix} | 0 .../default.nix => unit/gc/gcr/pkg-fun.nix} | 0 .../gcr/4.nix => unit/gc/gcr_4/pkg-fun.nix} | 0 .../default.nix => unit/gc/gcs/pkg-fun.nix} | 0 .../gc/gcsfuse/pkg-fun.nix} | 0 .../gc/gcstar/pkg-fun.nix} | 0 .../default.nix => unit/gd/gdal/pkg-fun.nix} | 0 .../default.nix => unit/gd/gdbm/pkg-fun.nix} | 0 .../gd/gdk-pixbuf-xlib/pkg-fun.nix} | 0 .../gd}/gdk-pixbuf/installed-tests-path.patch | 0 .../gd/gdk-pixbuf/pkg-fun.nix} | 0 .../gd}/gdk-pixbuf/setup-hook.sh | 0 .../default.nix => unit/gd/gdl/pkg-fun.nix} | 0 .../gd}/gdmap/get_sensitive.patch | 0 .../default.nix => unit/gd/gdmap/pkg-fun.nix} | 0 .../system => unit/gd}/gdmap/set_flags.patch | 0 .../gd}/gdome2/fno-common.patch | 0 .../gd/gdome2/pkg-fun.nix} | 0 .../gd}/gdome2/xml-document.patch | 0 .../gd/gdrive/pkg-fun.nix} | 0 .../default.nix => unit/gd/gdu/pkg-fun.nix} | 0 .../ge/geany-with-vte/pkg-fun.nix} | 0 .../default.nix => unit/ge/geany/pkg-fun.nix} | 0 .../ge/geek-life/pkg-fun.nix} | 0 .../4.nix => unit/ge/geekbench4/pkg-fun.nix} | 0 .../ge/geekbench5/pkg-fun.nix} | 0 .../ge/geeqie/pkg-fun.nix} | 0 .../default.nix => unit/ge/gef/pkg-fun.nix} | 0 .../default.nix => unit/ge/geis/pkg-fun.nix} | 0 .../ge/gelasio/pkg-fun.nix} | 0 .../default.nix => unit/ge/gem/pkg-fun.nix} | 0 .../ge/gemget/pkg-fun.nix} | 0 .../default.nix => unit/ge/gemrb/pkg-fun.nix} | 0 .../tools => unit/ge}/gemstash/Gemfile | 0 .../tools => unit/ge}/gemstash/Gemfile.lock | 0 .../tools => unit/ge}/gemstash/gemset.nix | 0 .../ge/gemstash/pkg-fun.nix} | 0 .../ge/gen-oath-safe/pkg-fun.nix} | 0 .../ge/gen6dns/pkg-fun.nix} | 0 .../ge/genact/pkg-fun.nix} | 0 .../ge/genann/pkg-fun.nix} | 0 .../ge}/gencfsm/makefile-mkdir.patch | 0 .../ge/gencfsm/pkg-fun.nix} | 0 .../ge/genericUpdater/pkg-fun.nix} | 0 .../ge/genext2fs/pkg-fun.nix} | 0 .../ge/gengetopt/pkg-fun.nix} | 0 .../ge/genimage/pkg-fun.nix} | 0 .../biology => unit/ge}/genmap/gtest.patch | 0 .../ge/genmap/pkg-fun.nix} | 0 .../ge/genromfs/pkg-fun.nix} | 0 .../ge/gensio/pkg-fun.nix} | 0 .../ge/gentium-book-basic/pkg-fun.nix} | 0 .../ge/gentium/pkg-fun.nix} | 0 .../ge/genxword/pkg-fun.nix} | 0 .../ge/genymotion/pkg-fun.nix} | 0 ...d-option-for-installation-sysconfdir.patch | 0 .../ge/geoclue2/pkg-fun.nix} | 0 .../geocode-glib/installed-tests-path.patch | 0 .../ge/geocode-glib/pkg-fun.nix} | 0 .../ge/geogebra/pkg-fun.nix} | 0 .../ge/geographiclib/pkg-fun.nix} | 0 .../ge/geoipjava/pkg-fun.nix} | 0 .../ge/geoipupdate/pkg-fun.nix} | 0 .../ge/geolite-legacy/pkg-fun.nix} | 0 .../ge}/geomyidae/modification-time.patch | 0 .../ge/geomyidae/pkg-fun.nix} | 0 .../ge/geonkick/pkg-fun.nix} | 0 .../default.nix => unit/ge/geos/pkg-fun.nix} | 0 .../3.9.nix => unit/ge/geos39/pkg-fun.nix} | 0 .../ge/geoserver/pkg-fun.nix} | 0 .../default.nix => unit/ge/gephi/pkg-fun.nix} | 0 .../ge/gerbera/pkg-fun.nix} | 0 .../ge/gerbil-support}/gerbil-crypto.nix | 0 .../ge/gerbil-support}/gerbil-ethereum.nix | 0 .../ge/gerbil-support}/gerbil-libp2p.nix | 0 .../ge/gerbil-support}/gerbil-persist.nix | 0 .../ge/gerbil-support}/gerbil-poo.nix | 0 .../ge/gerbil-support}/gerbil-utils.nix | 0 .../ge/gerbil-support/pkg-fun.nix} | 0 .../ge/gerbil-support}/smug-gerbil.nix | 0 .../default.nix => unit/ge/gerbv/pkg-fun.nix} | 0 .../ge/germinal/pkg-fun.nix} | 0 .../ge/gerrit/pkg-fun.nix} | 0 .../ge/get_iplayer/pkg-fun.nix} | 0 .../ge/getdata/pkg-fun.nix} | 0 .../ge/geteltorito/pkg-fun.nix} | 0 .../ge/getmail6/pkg-fun.nix} | 0 .../ge/getopt/pkg-fun.nix} | 0 .../ge/getoptions/pkg-fun.nix} | 0 .../ge/getxbook/pkg-fun.nix} | 0 .../default.nix => unit/ge/gex/pkg-fun.nix} | 0 .../ge/gexiv2/pkg-fun.nix} | 0 ...se-optional-freetype-with-pkg-config.patch | 0 .../gf/default.nix => unit/gf/gf/pkg-fun.nix} | 0 .../default.nix => unit/gf/gf2x/pkg-fun.nix} | 0 .../gf}/gfan/gfan-0.6.2-cddlib-prefix.patch | 0 .../default.nix => unit/gf/gfan/pkg-fun.nix} | 0 .../gf/gfbgraph/pkg-fun.nix} | 0 .../gf/gflags/pkg-fun.nix} | 0 .../gf}/gforth/boot-forth.nix | 0 .../gf/gforth/pkg-fun.nix} | 0 .../compilers => unit/gf}/gforth/swig.nix | 0 .../gf/gfs2-utils/pkg-fun.nix} | 0 .../gf/gfshare/pkg-fun.nix} | 0 .../gf/gfxreconstruct/pkg-fun.nix} | 0 .../gf/gfxtablet/pkg-fun.nix} | 0 .../gg/gg-scm/pkg-fun.nix} | 0 .../default.nix => unit/gg/ggobi/pkg-fun.nix} | 0 .../gg/ggz_base_libs/pkg-fun.nix} | 0 .../gh/gh-dash/pkg-fun.nix} | 0 .../gh/gh-eco/pkg-fun.nix} | 0 .../gh/gh-markdown-preview/pkg-fun.nix} | 0 .../gh/gh-ost/pkg-fun.nix} | 0 .../gh/default.nix => unit/gh/gh/pkg-fun.nix} | 0 .../default.nix => unit/gh/gh2md/pkg-fun.nix} | 0 .../gh/ghc_filesystem/pkg-fun.nix} | 0 .../gh/ghdorker/pkg-fun.nix} | 0 .../gh/ghidra-bin/pkg-fun.nix} | 0 .../0001-Use-protobuf-gradle-plugin.patch | 0 .../build.nix => unit/gh/ghidra/pkg-fun.nix} | 0 .../default.nix => unit/gh/ghorg/pkg-fun.nix} | 0 .../default.nix => unit/gh/ghost/pkg-fun.nix} | 0 .../gh/ghostie/pkg-fun.nix} | 0 .../gh}/ghostscript/doc-no-ref.diff | 0 .../gh/ghostscript/pkg-fun.nix} | 0 .../gh}/ghostscript/test-corpus-render.nix | 0 .../gh}/ghostscript/urw-font-files.patch | 0 .../gh/ghostunnel/pkg-fun.nix} | 0 .../default.nix => unit/gh/ghq/pkg-fun.nix} | 0 .../default.nix => unit/gh/ghr/pkg-fun.nix} | 0 .../default.nix => unit/gh/ghz/pkg-fun.nix} | 0 .../gi/gImageReader/pkg-fun.nix} | 0 .../gi/gi-docgen/pkg-fun.nix} | 0 .../default.nix => unit/gi/giac/pkg-fun.nix} | 0 .../default.nix => unit/gi/giada/pkg-fun.nix} | 0 .../default.nix => unit/gi/giara/pkg-fun.nix} | 0 .../default.nix => unit/gi/gibo/pkg-fun.nix} | 0 .../gi/gif-for-cli/pkg-fun.nix} | 0 .../libraries => unit/gi}/giflib/4.1.nix | 0 .../gi/giflib/pkg-fun.nix} | 0 .../gi/gifsicle/pkg-fun.nix} | 0 .../gi/gifski/pkg-fun.nix} | 0 .../gi/gifticlib/pkg-fun.nix} | 0 .../gi/gigalixir/pkg-fun.nix} | 0 .../gi/gigedit/pkg-fun.nix} | 0 .../gi}/gildas/aarch64.patch | 0 .../astronomy => unit/gi}/gildas/clang.patch | 0 .../gi/gildas/pkg-fun.nix} | 0 .../gi}/gildas/python-ldflags.patch | 0 .../gi}/gildas/wrapper.patch | 0 pkgs/{games => unit/gi}/gimx/conf.patch | 0 .../gi}/gimx/custom/Dualshock4.xml | 0 .../default.nix => unit/gi/gimx/pkg-fun.nix} | 0 .../default.nix => unit/gi/ginac/pkg-fun.nix} | 0 .../gi/ginkgo/pkg-fun.nix} | 0 .../gi/gio-sharp/pkg-fun.nix} | 0 .../default.nix => unit/gi/giph/pkg-fun.nix} | 0 .../gi/gir-rs/pkg-fun.nix} | 0 .../default.nix => unit/gi/gist/pkg-fun.nix} | 0 .../gi/git-aggregator/pkg-fun.nix} | 0 .../gi/git-annex-remote-rclone/pkg-fun.nix} | 0 .../gi/git-annex-utils/pkg-fun.nix} | 0 .../gi/git-appraise/pkg-fun.nix} | 0 .../gi/git-big-picture/pkg-fun.nix} | 0 .../gi/git-bug-migration/pkg-fun.nix} | 0 .../gi/git-bug/pkg-fun.nix} | 0 .../gi/git-chglog/pkg-fun.nix} | 0 .../gi/git-codeowners/pkg-fun.nix} | 0 .../gi/git-codereview/pkg-fun.nix} | 0 .../gi/git-cola/pkg-fun.nix} | 0 .../gi/git-crecord/pkg-fun.nix} | 0 .../gi/git-credential-1password/pkg-fun.nix} | 0 .../gi/git-credential-gopass/pkg-fun.nix} | 0 .../gi/git-crypt/pkg-fun.nix} | 0 .../git-delete-merged-branches/pkg-fun.nix} | 0 .../gi/git-extras/pkg-fun.nix} | 0 .../gi}/git-fame/Gemfile | 0 .../gi}/git-fame/Gemfile.lock | 0 .../gi}/git-fame/gemset.nix | 0 .../gi/git-fame/pkg-fun.nix} | 0 .../gi/git-fast-export/pkg-fun.nix} | 0 .../gi/git-fire/pkg-fun.nix} | 0 .../gi/git-ftp/pkg-fun.nix} | 0 .../gi/git-hound/pkg-fun.nix} | 0 .../gi/git-hub/pkg-fun.nix} | 0 .../gi/git-ignore/pkg-fun.nix} | 0 .../gi/git-latexdiff/pkg-fun.nix} | 0 .../gi}/git-latexdiff/version-test.patch | 0 .../gi/git-my/pkg-fun.nix} | 0 .../gi/git-nomad/pkg-fun.nix} | 0 .../gi/git-octopus/pkg-fun.nix} | 0 .../gi/git-open/pkg-fun.nix} | 0 .../gi/git-privacy/pkg-fun.nix} | 0 .../gi/git-quick-stats/pkg-fun.nix} | 0 .../gi/git-radar/pkg-fun.nix} | 0 .../gi/git-remote-gcrypt/pkg-fun.nix} | 0 .../gi/git-remote-hg/pkg-fun.nix} | 0 .../gi/git-reparent/pkg-fun.nix} | 0 .../gi}/git-repo/import-ssl-module.patch | 0 .../gi/git-repo/pkg-fun.nix} | 0 .../gi/git-secret/pkg-fun.nix} | 0 .../gi/git-secrets/pkg-fun.nix} | 0 .../gi/git-sizer/pkg-fun.nix} | 0 .../gi/git-standup/pkg-fun.nix} | 0 .../gi/git-stree/pkg-fun.nix} | 0 .../gi/git-subrepo/pkg-fun.nix} | 0 .../gi/git-subtrac/pkg-fun.nix} | 0 .../gi/git-sync/pkg-fun.nix} | 0 .../gi/git-team/pkg-fun.nix} | 0 .../gi/git-test/pkg-fun.nix} | 0 .../gi/git-town/pkg-fun.nix} | 0 .../gi/git-vanity-hash/pkg-fun.nix} | 0 .../gi/git-vendor/pkg-fun.nix} | 0 .../gi/git-when-merged/pkg-fun.nix} | 0 .../gi/git2-cpp/pkg-fun.nix} | 0 .../gi/git2cl/pkg-fun.nix} | 0 .../gi/gitUpdater/pkg-fun.nix} | 0 .../gitlab => unit/gi}/gitaly/Gemfile | 0 .../gitlab => unit/gi}/gitaly/Gemfile.lock | 0 .../gitlab => unit/gi}/gitaly/gemset.nix | 0 .../gi/gitaly/pkg-fun.nix} | 0 .../gi/gitbatch/pkg-fun.nix} | 0 .../gi/gitflow/pkg-fun.nix} | 0 .../default.nix => unit/gi/gitfs/pkg-fun.nix} | 0 .../gi/github-backup/pkg-fun.nix} | 0 .../gi}/github-changelog-generator/Gemfile | 0 .../github-changelog-generator/Gemfile.lock | 0 .../gi}/github-changelog-generator/gemset.nix | 0 .../github-changelog-generator/pkg-fun.nix} | 0 .../gi/github-commenter/pkg-fun.nix} | 0 .../gi/github-release/pkg-fun.nix} | 0 .../default.nix => unit/gi/gitit/pkg-fun.nix} | 0 .../gi/gitjacker/pkg-fun.nix} | 0 .../gi/gitkraken/pkg-fun.nix} | 0 .../gi/gitlab-clippy/pkg-fun.nix} | 0 .../gi/gitlab-pages/pkg-fun.nix} | 0 .../gi}/gitlab-runner/fix-shell-path.patch | 0 .../gi/gitlab-runner/pkg-fun.nix} | 0 .../gi}/gitlab-runner/remove-bash-test.patch | 0 .../gi/gitlab-shell/pkg-fun.nix} | 0 .../remove-hardcoded-locations.patch | 0 .../gi}/gitlab-triage/Gemfile | 0 .../gi}/gitlab-triage/Gemfile.lock | 0 .../gi}/gitlab-triage/gemset.nix | 0 .../gi/gitlab-triage/pkg-fun.nix} | 0 .../gi/gitleaks/pkg-fun.nix} | 0 .../gi/gitless/pkg-fun.nix} | 0 .../default.nix => unit/gi/gitls/pkg-fun.nix} | 0 .../gi/gitmux/pkg-fun.nix} | 0 .../gi/gitnuro/pkg-fun.nix} | 0 .../gi/gitolite/pkg-fun.nix} | 0 .../gi/gitprompt-rs/pkg-fun.nix} | 0 .../gi/gitsign/pkg-fun.nix} | 0 .../gi/gitstats/pkg-fun.nix} | 0 .../gi/gitstatus/pkg-fun.nix} | 0 .../gi}/gitstatus/romkatv_libgit2.nix | 0 .../gi/gitter/pkg-fun.nix} | 0 .../default.nix => unit/gi/gitty/pkg-fun.nix} | 0 .../gi/gitweb/pkg-fun.nix} | 0 .../gi/givaro/pkg-fun.nix} | 0 .../3.nix => unit/gi/givaro_3/pkg-fun.nix} | 0 .../gi/givaro_3_7/pkg-fun.nix} | 0 .../default.nix => unit/gi/gixy/pkg-fun.nix} | 0 .../default.nix => unit/gj/gjay/pkg-fun.nix} | 0 .../default.nix => unit/gj/gjo/pkg-fun.nix} | 0 .../libraries => unit/gj}/gjs/fix-paths.patch | 0 .../gj}/gjs/installed-tests-path.patch | 0 .../default.nix => unit/gj/gjs/pkg-fun.nix} | 0 .../gk/gkraken/pkg-fun.nix} | 0 .../default.nix => unit/gl/gl117/pkg-fun.nix} | 0 .../default.nix => unit/gl/gl2ps/pkg-fun.nix} | 0 .../default.nix => unit/gl/gl3w/pkg-fun.nix} | 0 .../default.nix => unit/gl/glab/pkg-fun.nix} | 0 .../gl/glabels/pkg-fun.nix} | 0 .../default.nix => unit/gl/glade/pkg-fun.nix} | 0 .../gl/glasstty-ttf/pkg-fun.nix} | 0 .../default.nix => unit/gl/glava/pkg-fun.nix} | 0 .../gl/glbinding/pkg-fun.nix} | 0 .../default.nix => unit/gl/gle/pkg-fun.nix} | 0 .../default.nix => unit/gl/glee/pkg-fun.nix} | 0 .../2.x.nix => unit/gl/glfw2/pkg-fun.nix} | 0 .../glib-networking/hardcode-gsettings.patch | 0 .../installed-tests-path.patch | 0 .../gl/glib-networking/pkg-fun.nix} | 0 .../glib-testing/installed-tests-path.patch | 0 .../gl/glib-testing/pkg-fun.nix} | 0 .../gl/glibmm/pkg-fun.nix} | 0 .../default.nix => unit/gl/glide/pkg-fun.nix} | 0 .../gl/glitter/pkg-fun.nix} | 0 .../default.nix => unit/gl/gllvm/pkg-fun.nix} | 0 .../libraries => unit/gl}/glm/glm.pc.in | 0 .../default.nix => unit/gl/glm/pkg-fun.nix} | 0 .../gl/glmark2/pkg-fun.nix} | 0 .../gl/global-platform-pro/pkg-fun.nix} | 0 .../gl/global/pkg-fun.nix} | 0 .../gl/globalarrays/pkg-fun.nix} | 0 .../gl/globe-cli/pkg-fun.nix} | 0 .../gl/globulation2}/header-order.patch | 0 .../gl/globulation2/pkg-fun.nix} | 0 .../globulation2}/public-buildproject.patch | 0 .../tools => unit/gl}/glock/deps.nix | 0 .../default.nix => unit/gl/glock/pkg-fun.nix} | 0 .../default.nix => unit/gl/glog/pkg-fun.nix} | 0 .../default.nix => unit/gl/glom/pkg-fun.nix} | 0 .../gl/glooctl/pkg-fun.nix} | 0 .../default.nix => unit/gl/gloox/pkg-fun.nix} | 0 .../default.nix => unit/gl/glow/pkg-fun.nix} | 0 .../gl/glowing-bear/pkg-fun.nix} | 0 .../gl/glpaper/pkg-fun.nix} | 0 .../default.nix => unit/gl/glpk/pkg-fun.nix} | 0 .../default.nix => unit/gl/glpng/pkg-fun.nix} | 0 .../gl/glslang/pkg-fun.nix} | 0 .../gl}/gltron/gentoo-prototypes.patch | 0 .../gl/gltron/pkg-fun.nix} | 0 .../gl/glucose-syrup/pkg-fun.nix} | 0 .../gl/glucose/pkg-fun.nix} | 0 .../default.nix => unit/gl/glui/pkg-fun.nix} | 0 .../gl/glusterfs/pkg-fun.nix} | 0 .../gl}/glusterfs/ssl_cert_path.patch | 0 .../gl/glxinfo/pkg-fun.nix} | 0 .../default.nix => unit/gl/glyr/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmad/pkg-fun.nix} | 0 .../gm/gmailctl/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmic/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmid/pkg-fun.nix} | 0 .../2.nix => unit/gm/gmime2/pkg-fun.nix} | 0 .../3.nix => unit/gm/gmime3/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmm/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmni/pkg-fun.nix} | 0 .../gm/gmnitohtml/pkg-fun.nix} | 0 .../4.3.2.nix => unit/gm/gmp4/pkg-fun.nix} | 0 .../gm/gmp5}/5.1.3-CVE-2021-43618.patch | 0 .../gmp => unit/gm/gmp5}/need-size-t.patch | 0 .../5.1.x.nix => unit/gm/gmp5/pkg-fun.nix} | 0 .../gm/gmp6}/6.2.1-CVE-2021-43618.patch | 0 .../gmp/6.x.nix => unit/gm/gmp6/pkg-fun.nix} | 0 .../gmpc/libmpd-11.8.17-remove-strndup.patch | 0 .../default.nix => unit/gm/gmpc/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmqcc/pkg-fun.nix} | 0 .../find-config-file-in-system-etc-dir.patch | 0 .../misc => unit/gm}/gmrun/gcc43.patch | 0 .../gm}/gmrun/gmrun-0.9.2-xdg.patch | 0 .../default.nix => unit/gm/gmrun/pkg-fun.nix} | 0 .../gm}/gmtk/fix-paths.patch | 0 .../default.nix => unit/gm/gmtk/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmtp/pkg-fun.nix} | 0 .../default.nix => unit/gm/gmu/pkg-fun.nix} | 0 .../gn/gnatcoll-core/pkg-fun.nix} | 0 .../gn/gnaural/pkg-fun.nix} | 0 .../default.nix => unit/gn/gnet/pkg-fun.nix} | 0 .../gn/gnirehtet/pkg-fun.nix} | 0 .../gn/gnome-2048/pkg-fun.nix} | 0 .../gn/gnome-browser-connector/pkg-fun.nix} | 0 .../fix-finding-test-typelibs.patch | 0 .../gn/gnome-builder/pkg-fun.nix} | 0 .../gn/gnome-connections/pkg-fun.nix} | 0 .../gn/gnome-console/pkg-fun.nix} | 0 .../gn/gnome-desktop-testing/pkg-fun.nix} | 0 .../gn}/gnome-desktop/bubblewrap-paths.patch | 0 .../gn/gnome-desktop/pkg-fun.nix} | 0 .../gn/gnome-doc-utils/pkg-fun.nix} | 0 .../gn/gnome-epub-thumbnailer/pkg-fun.nix} | 0 .../gn/gnome-extension-manager/pkg-fun.nix} | 0 .../gn}/gnome-feeds/listparser.nix | 0 .../gn/gnome-feeds/pkg-fun.nix} | 0 .../gn/gnome-firmware/pkg-fun.nix} | 0 .../gn/gnome-frog/pkg-fun.nix} | 0 ...date-compatible-with-non-flatpak-env.patch | 0 .../gn/gnome-hexgl/pkg-fun.nix} | 0 .../gn/gnome-icon-theme/pkg-fun.nix} | 0 .../gn/gnome-inform7/pkg-fun.nix} | 0 .../gn/gnome-keysign/pkg-fun.nix} | 0 .../gn/gnome-latex/pkg-fun.nix} | 0 .../gn/gnome-menus/pkg-fun.nix} | 0 .../gn/gnome-multi-writer/pkg-fun.nix} | 0 .../gn/gnome-network-displays/pkg-fun.nix} | 0 .../gn/gnome-online-accounts/pkg-fun.nix} | 0 .../gnome-photos/installed-tests-path.patch | 0 .../gn/gnome-photos/pkg-fun.nix} | 0 .../gn/gnome-podcasts/pkg-fun.nix} | 0 .../gn/gnome-randr/pkg-fun.nix} | 0 .../gn/gnome-secrets/pkg-fun.nix} | 0 .../gn/gnome-solanum/pkg-fun.nix} | 0 .../gn/gnome-text-editor/pkg-fun.nix} | 0 .../gn/gnome-tour/pkg-fun.nix} | 0 .../gn/gnome-usage/pkg-fun.nix} | 0 .../gn/gnome-user-docs/pkg-fun.nix} | 0 .../gn}/gnome-video-effects/fix-pc-file.patch | 0 .../gn/gnome-video-effects/pkg-fun.nix} | 0 .../gn/gnome_mplayer}/fix-paths.patch | 0 .../gn/gnome_mplayer/pkg-fun.nix} | 0 .../gn/gnomecast/pkg-fun.nix} | 0 .../gn/gnonograms/pkg-fun.nix} | 0 .../gn/gnostic/pkg-fun.nix} | 0 .../fix_libcpu_features_install_path.patch | 0 .../gn/gnss-sdr/pkg-fun.nix} | 0 .../gn/gnu-cobol/pkg-fun.nix} | 0 .../gn/gnu-config/pkg-fun.nix} | 0 .../gn/gnu-pw-mgr/pkg-fun.nix} | 0 .../gn/gnu-shepherd/pkg-fun.nix} | 0 .../gn/gnu-smalltalk/pkg-fun.nix} | 0 .../gn/gnuapl/pkg-fun.nix} | 0 .../gn/gnuastro/pkg-fun.nix} | 0 .../default.nix => unit/gn/gnubg/pkg-fun.nix} | 0 .../gn/gnucap/pkg-fun.nix} | 0 .../0001-disable-date-and-time-tests.patch | 0 .../gnucash/0002-disable-gnc-fq-update.patch | 0 .../gn}/gnucash/0003-remove-valgrind.patch | 0 .../gn}/gnucash/0004-exec-fq-helpers.patch | 0 .../gn/gnucash/pkg-fun.nix} | 0 .../gn/gnuchess/pkg-fun.nix} | 0 .../gn/gnuclad/pkg-fun.nix} | 0 .../default.nix => unit/gn/gnugo/pkg-fun.nix} | 0 .../gn/gnugrep/pkg-fun.nix} | 0 pkgs/{games => unit/gn}/gnujump/gnujump.xpm | 0 .../gn/gnujump/pkg-fun.nix} | 0 .../gn/gnulib/pkg-fun.nix} | 0 .../default.nix => unit/gn/gnum4/pkg-fun.nix} | 0 .../gn}/gnumake/0001-No-impure-bin-sh.patch | 0 .../gn}/gnumake/0002-remove-impure-dirs.patch | 0 .../gn/gnumake/pkg-fun.nix} | 0 .../gn/gnumake42}/glibc-2.27-glob.patch | 0 .../gn/gnumake42}/glibc-2.33-glob.patch | 0 .../gn/gnumake42}/impure-dirs.patch | 0 .../gn/gnumake42/pkg-fun.nix} | 0 .../4.2 => unit/gn/gnumake42}/pselect.patch | 0 .../gn/gnumeric/pkg-fun.nix} | 0 .../gn/gnunet-gtk/pkg-fun.nix} | 0 .../gn/gnunet/pkg-fun.nix} | 0 ...s_to_be_missing_for_ed-style_patches.patch | 0 .../gn}/gnupatch/CVE-2018-1000156.patch | 0 .../gn}/gnupatch/CVE-2018-6951.patch | 0 .../gn}/gnupatch/CVE-2018-6952.patch | 0 .../gn}/gnupatch/CVE-2019-13636.patch | 0 .../CVE-2019-13638-and-CVE-2018-20969.patch | 0 .../gn/gnupatch/pkg-fun.nix} | 0 .../gn/gnupg-pkcs11-scd/pkg-fun.nix} | 0 .../gn/gnupg1compat/pkg-fun.nix} | 0 .../1.nix => unit/gn/gnupg1orig/pkg-fun.nix} | 0 .../gn/gnupth/pkg-fun.nix} | 0 .../gn/gnused/pkg-fun.nix} | 0 .../gn/gnushogi/pkg-fun.nix} | 0 .../gn/gnutar/pkg-fun.nix} | 0 .../wrapper.nix => unit/gn/gnvim/pkg-fun.nix} | 0 .../go/go-2fa/pkg-fun.nix} | 0 .../go/go-audit/pkg-fun.nix} | 0 .../go/go-autoconfig/pkg-fun.nix} | 0 .../go/go-bindata-assetfs/pkg-fun.nix} | 0 .../go/go-bindata/pkg-fun.nix} | 0 .../go/go-camo/pkg-fun.nix} | 0 .../go/go-check/pkg-fun.nix} | 0 .../go/go-chromecast/pkg-fun.nix} | 0 .../go/go-containerregistry/pkg-fun.nix} | 0 .../go/go-cqhttp/pkg-fun.nix} | 0 .../go/go-cve-search/pkg-fun.nix} | 0 .../go/go-dependency-manager}/deps.nix | 0 .../go/go-dependency-manager/pkg-fun.nix} | 0 .../go/go-font/pkg-fun.nix} | 0 .../go/go-graft/pkg-fun.nix} | 0 .../go/go-jira/pkg-fun.nix} | 0 .../go/go-jsonnet/pkg-fun.nix} | 0 .../go/go-junit-report/pkg-fun.nix} | 0 .../go/go-libp2p-daemon/pkg-fun.nix} | 0 .../go/go-license-detector/pkg-fun.nix} | 0 .../go/go-md2man/pkg-fun.nix} | 0 .../go/go-migrate/pkg-fun.nix} | 0 .../go/go-minimock/pkg-fun.nix} | 0 .../go/go-mockery/pkg-fun.nix} | 0 .../go/go-motion/pkg-fun.nix} | 0 .../go/go-mtpfs/pkg-fun.nix} | 0 .../go/go-neb/pkg-fun.nix} | 0 .../go/go-org/pkg-fun.nix} | 0 .../go/go-outline/pkg-fun.nix} | 0 .../go/go-protobuf/pkg-fun.nix} | 0 .../go/go-rice/pkg-fun.nix} | 0 .../go/go-sct/pkg-fun.nix} | 0 .../go/go-shadowsocks2/pkg-fun.nix} | 0 .../go/go-swag/pkg-fun.nix} | 0 .../go/go-swagger/pkg-fun.nix} | 0 .../tools => unit/go}/go-symbols/deps.nix | 0 .../go/go-symbols/pkg-fun.nix} | 0 .../go/go-task/pkg-fun.nix} | 0 .../go/go-toml/pkg-fun.nix} | 0 .../go/go-tools/pkg-fun.nix} | 0 .../go/go-upower-notify}/deps.nix | 0 .../go/go-upower-notify/pkg-fun.nix} | 0 .../tools => unit/go}/go2nix/deps.nix | 0 .../go/go2nix/pkg-fun.nix} | 0 .../default.nix => unit/go/go365/pkg-fun.nix} | 0 .../default.nix => unit/go/goa/pkg-fun.nix} | 0 .../go/goaccess/pkg-fun.nix} | 0 .../default.nix => unit/go/goawk/pkg-fun.nix} | 0 .../default.nix => unit/go/gob2/pkg-fun.nix} | 0 .../default.nix => unit/go/gobby/pkg-fun.nix} | 0 .../go}/gobetween/gomod.patch | 0 .../go/gobetween/pkg-fun.nix} | 0 .../default.nix => unit/go/gobgp/pkg-fun.nix} | 0 .../go/gobgpd/pkg-fun.nix} | 0 .../go/gobi_loader/pkg-fun.nix} | 0 .../go/gobuster/pkg-fun.nix} | 0 .../go/gocd-agent/pkg-fun.nix} | 0 .../go/gocd-server/pkg-fun.nix} | 0 .../go/gocode-gomod/pkg-fun.nix} | 0 .../tools => unit/go}/gocode/deps.nix | 0 .../go/gocode/pkg-fun.nix} | 0 .../go/goconst/pkg-fun.nix} | 0 .../go/goconvey/pkg-fun.nix} | 0 .../default.nix => unit/go/gocr/pkg-fun.nix} | 0 .../go/gocryptfs/pkg-fun.nix} | 0 .../go/gocyclo/pkg-fun.nix} | 0 .../default.nix => unit/go/goda/pkg-fun.nix} | 0 .../default.nix => unit/go/godef/pkg-fun.nix} | 0 .../default.nix => unit/go/godns/pkg-fun.nix} | 0 .../go/godot-export-templates/pkg-fun.nix} | 0 .../go/godot-headless/pkg-fun.nix} | 0 .../go/godot-server/pkg-fun.nix} | 0 .../go/godot}/dont_clobber_environment.patch | 0 .../default.nix => unit/go/godot/pkg-fun.nix} | 0 .../go/godot}/pkg_config_additions.patch | 0 .../go/godot_4/pkg-fun.nix} | 0 .../godot/4 => unit/go/godot_4}/xfixes.patch | 0 .../go/godspeed/pkg-fun.nix} | 0 .../default.nix => unit/go/godu/pkg-fun.nix} | 0 .../go/goeland/pkg-fun.nix} | 0 .../default.nix => unit/go/gof5/pkg-fun.nix} | 0 .../go/goffice/pkg-fun.nix} | 0 .../go/gofish/pkg-fun.nix} | 0 .../go/goflow/pkg-fun.nix} | 0 .../default.nix => unit/go/gofu/pkg-fun.nix} | 0 .../go/gofumpt/pkg-fun.nix} | 0 .../go/gogetdoc/pkg-fun.nix} | 0 .../default.nix => unit/go/gogs/pkg-fun.nix} | 0 .../default.nix => unit/go/gogui/pkg-fun.nix} | 0 .../default.nix => unit/go/gohai/pkg-fun.nix} | 0 .../go/gohufont/pkg-fun.nix} | 0 .../go/goimapnotify/pkg-fun.nix} | 0 .../default.nix => unit/go/gojq/pkg-fun.nix} | 0 .../go/gojsontoyaml/pkg-fun.nix} | 0 .../go/gokart/pkg-fun.nix} | 0 .../default.nix => unit/go/goku/pkg-fun.nix} | 0 .../go/golangci-lint-langserver/pkg-fun.nix} | 0 .../go/golangci-lint/pkg-fun.nix} | 0 .../dont-install-unsupported.patch | 0 .../go/goldberg-emu/pkg-fun.nix} | 0 .../go/golines/pkg-fun.nix} | 0 .../go/golint/pkg-fun.nix} | 0 .../misc => unit/go}/gollum/Gemfile | 0 .../misc => unit/go}/gollum/Gemfile.lock | 0 .../misc => unit/go}/gollum/gemset.nix | 0 .../go/gollum/pkg-fun.nix} | 0 .../go}/gom/longer-stress-timeout.patch | 0 .../default.nix => unit/go/gom/pkg-fun.nix} | 0 .../go/gomacro/pkg-fun.nix} | 0 .../go/gomapenum/pkg-fun.nix} | 0 .../go/gomatrix/pkg-fun.nix} | 0 .../go/gometer/pkg-fun.nix} | 0 .../default.nix => unit/go/gomi/pkg-fun.nix} | 0 .../go/gomobile/pkg-fun.nix} | 0 .../go/gomodifytags/pkg-fun.nix} | 0 .../default.nix => unit/go/gomp/pkg-fun.nix} | 0 .../go/gomplate/pkg-fun.nix} | 0 .../go/gomuks/pkg-fun.nix} | 0 .../default.nix => unit/go/gonic/pkg-fun.nix} | 0 .../go/goocanvas/pkg-fun.nix} | 0 .../go/goocanvas2/pkg-fun.nix} | 0 .../go/goocanvas3/pkg-fun.nix} | 0 .../go/goocanvasmm2/pkg-fun.nix} | 0 .../go/goodvibes/pkg-fun.nix} | 0 .../go/goofys/pkg-fun.nix} | 0 .../go/google-app-engine-go-sdk/pkg-fun.nix} | 0 .../go/google-authenticator/pkg-fun.nix} | 0 .../go/google-chrome/pkg-fun.nix} | 0 .../go/google-cloud-cpp/pkg-fun.nix} | 0 .../go}/google-cloud-cpp/skipped_tests.toml | 0 .../go/google-fonts/pkg-fun.nix} | 0 .../disable-etc-mutation.patch | 0 .../go}/google-guest-agent/fix-paths.patch | 0 .../go/google-guest-agent/pkg-fun.nix} | 0 .../go}/google-guest-configs/fix-paths.patch | 0 .../go/google-guest-configs/pkg-fun.nix} | 0 .../go/google-guest-oslogin/pkg-fun.nix} | 0 .../go/google-java-format/pkg-fun.nix} | 0 .../go/gopacked/pkg-fun.nix} | 0 .../go/gopass-hibp/pkg-fun.nix} | 0 .../go/gopass-jsonapi/pkg-fun.nix} | 0 .../go/gopass-summon-provider/pkg-fun.nix} | 0 .../go/gopass/pkg-fun.nix} | 0 .../go/gopher/pkg-fun.nix} | 0 .../go/gophernotes/pkg-fun.nix} | 0 .../go/gopkgs/pkg-fun.nix} | 0 .../default.nix => unit/go/gopls/pkg-fun.nix} | 0 .../default.nix => unit/go/gopro/pkg-fun.nix} | 0 .../default.nix => unit/go/gops/pkg-fun.nix} | 0 .../go}/gopsuinfo/no_bin_install.patch | 0 .../go/gopsuinfo/pkg-fun.nix} | 0 .../default.nix => unit/go/gore/pkg-fun.nix} | 0 .../go}/goredo/fix-tests.diff | 0 .../go/goredo/pkg-fun.nix} | 0 .../go/goreleaser/pkg-fun.nix} | 0 .../go/goreman/pkg-fun.nix} | 0 .../go/goreplay/pkg-fun.nix} | 0 .../go/goresym/pkg-fun.nix} | 0 .../go/gorilla-bin/pkg-fun.nix} | 0 .../default.nix => unit/go/gortr/pkg-fun.nix} | 0 .../default.nix => unit/go/gosec/pkg-fun.nix} | 0 .../default.nix => unit/go/gosh/pkg-fun.nix} | 0 .../go/gospider/pkg-fun.nix} | 0 .../default.nix => unit/go/goss/pkg-fun.nix} | 0 .../default.nix => unit/go/gost/pkg-fun.nix} | 0 .../go/gostatic/pkg-fun.nix} | 0 .../default.nix => unit/go/gosu/pkg-fun.nix} | 0 .../go/gotags/pkg-fun.nix} | 0 .../go/gotest/pkg-fun.nix} | 0 .../go/gotestfmt/pkg-fun.nix} | 0 .../go/gotests/pkg-fun.nix} | 0 .../go/gotestsum/pkg-fun.nix} | 0 .../go/gotestwaf/pkg-fun.nix} | 0 .../go/gotify-cli/pkg-fun.nix} | 0 .../go/gotify-desktop/pkg-fun.nix} | 0 .../go/gotify-server}/package.json | 0 .../go/gotify-server/pkg-fun.nix} | 0 .../go/gotify-server}/source-sha.nix | 0 .../gotify => unit/go/gotify-server}/ui.nix | 0 .../go/gotify-server}/update.sh | 0 .../go/gotify-server}/vendor-sha.nix | 0 .../go/gotify-server}/version.nix | 0 .../go/gotify-server}/yarndeps.nix | 0 .../go/gotktrix/pkg-fun.nix} | 0 .../go/gotools/pkg-fun.nix} | 0 .../tools => unit/go}/gotools/setup-hook.sh | 0 .../go/gotrue-supabase/pkg-fun.nix} | 0 .../go/gotrue/pkg-fun.nix} | 0 .../default.nix => unit/go/gotty/pkg-fun.nix} | 0 .../go/gotypist/pkg-fun.nix} | 0 .../go/gource/pkg-fun.nix} | 0 .../default.nix => unit/go/govc/pkg-fun.nix} | 0 .../go/govendor/pkg-fun.nix} | 0 .../go/govers/pkg-fun.nix} | 0 .../go/govulncheck/pkg-fun.nix} | 0 .../go/gowitness/pkg-fun.nix} | 0 .../default.nix => unit/go/gox/pkg-fun.nix} | 0 .../go}/goxel/disable-imgui_ini.patch | 0 .../default.nix => unit/go/goxel/pkg-fun.nix} | 0 .../gp2c.nix => unit/gp/gp2c/pkg-fun.nix} | 0 .../default.nix => unit/gp/gpa/pkg-fun.nix} | 0 .../default.nix => unit/gp/gpac/pkg-fun.nix} | 0 .../default.nix => unit/gp/gpart/pkg-fun.nix} | 0 .../gp/gparted/pkg-fun.nix} | 0 .../misc => unit/gp}/gparted/polkit.patch | 0 .../default.nix => unit/gp/gperf/pkg-fun.nix} | 0 .../gp/gperf_3_0}/gperf-ar-fix.patch | 0 .../gp/gperf_3_0/pkg-fun.nix} | 0 .../gp/gperftools/pkg-fun.nix} | 0 .../gp/gpg-mdp/pkg-fun.nix} | 0 .../gp/gphoto2/pkg-fun.nix} | 0 .../gp/gphoto2fs/pkg-fun.nix} | 0 .../gp/gphotos-sync/pkg-fun.nix} | 0 .../gp}/gphotos-sync/skip-network-tests.patch | 0 .../misc => unit/gp}/gpick/dot-version.patch | 0 .../default.nix => unit/gp/gpick/pkg-fun.nix} | 0 .../gp/gpio-utils/pkg-fun.nix} | 0 .../gp}/gpodder/disable-autoupdate.patch | 0 .../gp/gpodder/pkg-fun.nix} | 0 .../default.nix => unit/gp/gpp/pkg-fun.nix} | 0 .../gprbuild-boot}/gpr-project-path-hook.sh | 0 .../gp/gprbuild-boot}/nixpkgs-gnat.xml | 0 .../gp/gprbuild-boot/pkg-fun.nix} | 0 .../gp/gprbuild/pkg-fun.nix} | 0 .../gp/gprojector/pkg-fun.nix} | 0 .../gp/gprolog/pkg-fun.nix} | 0 .../gp/gpscorrelate/pkg-fun.nix} | 0 .../default.nix => unit/gp/gpsd/pkg-fun.nix} | 0 .../gp}/gpsd/sconstruct-env-fixes.patch | 0 .../gp/gpsprune/pkg-fun.nix} | 0 .../gp}/gpt2tc/0001-add-python-shebang.patch | 0 .../gp/gpt2tc/pkg-fun.nix} | 0 .../gp/gptfdisk/pkg-fun.nix} | 0 .../gp}/gptfdisk/popt-1-19.patch | 0 .../system => unit/gp}/gptfdisk/uuid.patch | 0 .../gp/gptman/pkg-fun.nix} | 0 .../fix-nvfbc-check.patch | 0 .../gp/gpu-screen-recorder-gtk/pkg-fun.nix} | 0 .../gp/gpu-switch/pkg-fun.nix} | 0 .../gp/gputils/pkg-fun.nix} | 0 .../gp/gpuvis/pkg-fun.nix} | 0 .../gp/gpx-viewer/pkg-fun.nix} | 0 .../default.nix => unit/gp/gpx/pkg-fun.nix} | 0 .../gq/gqview/pkg-fun.nix} | 0 .../gr/grab-site/pkg-fun.nix} | 0 .../gr/grabserial/pkg-fun.nix} | 0 .../gr/gradle-completion/pkg-fun.nix} | 0 .../default.nix => unit/gr/gradm/pkg-fun.nix} | 0 .../gr/grafana-agent/pkg-fun.nix} | 0 .../gr}/grafana-image-renderer/package.json | 0 .../gr/grafana-image-renderer/pkg-fun.nix} | 0 .../gr}/grafana-image-renderer/yarn.lock | 0 .../gr}/grafana-image-renderer/yarn.nix | 0 .../gr/grafana-loki/pkg-fun.nix} | 0 .../gr/grafana/pkg-fun.nix} | 0 .../monitoring => unit/gr}/grafana/update.sh | 0 .../gr/grafana_reporter/pkg-fun.nix} | 0 .../gr/grafterm/pkg-fun.nix} | 0 .../gr/grafx2/pkg-fun.nix} | 0 .../default.nix => unit/gr/grail/pkg-fun.nix} | 0 .../gr/grantlee/pkg-fun.nix} | 0 .../default.nix => unit/gr/grap/pkg-fun.nix} | 0 .../gr/graph-cli/pkg-fun.nix} | 0 .../gr/graph-easy/pkg-fun.nix} | 0 .../gr/graphene-hardened-malloc/pkg-fun.nix} | 0 ...-options-for-tests-installation-dirs.patch | 0 .../gr/graphene/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../gr}/graphicsmagick/disable-popen.patch | 0 .../gr/graphicsmagick/pkg-fun.nix} | 0 .../gr/graphinder/pkg-fun.nix} | 0 .../gr/graphite-gtk-theme/pkg-fun.nix} | 0 .../gr/graphite-kde-theme/pkg-fun.nix} | 0 .../gr/graphite2}/macosx.patch | 0 .../gr/graphite2/pkg-fun.nix} | 0 .../gr/graphqlmap/pkg-fun.nix} | 0 .../gr/graphs/pkg-fun.nix} | 0 .../gr/graphw00f/pkg-fun.nix} | 0 .../gr/graphwar/pkg-fun.nix} | 0 .../gr}/grass/no_symbolic_links.patch | 0 .../default.nix => unit/gr/grass/pkg-fun.nix} | 0 .../gr/gravit/pkg-fun.nix} | 0 .../gr/graylog/pkg-fun.nix} | 0 .../default.nix => unit/gr/grb/pkg-fun.nix} | 0 .../default.nix => unit/gr/grcov/pkg-fun.nix} | 0 .../gr/grepcidr/pkg-fun.nix} | 0 .../default.nix => unit/gr/grepm/pkg-fun.nix} | 0 .../default.nix => unit/gr/gretl/pkg-fun.nix} | 0 .../gr/greybird/pkg-fun.nix} | 0 .../gr/gridtracker/pkg-fun.nix} | 0 .../default.nix => unit/gr/grig/pkg-fun.nix} | 0 .../chromaprint-gst-plugins.patch | 0 .../gr/grilo-plugins/pkg-fun.nix} | 0 .../default.nix => unit/gr/grilo/pkg-fun.nix} | 0 .../libraries => unit/gr}/grilo/setup-hook.sh | 0 .../default.nix => unit/gr/grim/pkg-fun.nix} | 0 .../default.nix => unit/gr/grin/pkg-fun.nix} | 0 .../gr/grip-search/pkg-fun.nix} | 0 .../default.nix => unit/gr/grip/pkg-fun.nix} | 0 .../default.nix => unit/gr/grit/pkg-fun.nix} | 0 .../gr/grive2/pkg-fun.nix} | 0 .../gr/grml-zsh-config/pkg-fun.nix} | 0 .../default.nix => unit/gr/grobi/pkg-fun.nix} | 0 .../0001-Define-configs-with-env-vars.patch | 0 ...-config-file-as-it-s-stored-in-etc-g.patch | 0 .../default.nix => unit/gr/grocy/pkg-fun.nix} | 0 ...-cross-compilation-by-looking-for-ar.patch | 0 .../default.nix => unit/gr/groff/pkg-fun.nix} | 0 pkgs/{tools/text => unit/gr}/groff/site.tmac | 0 .../default.nix => unit/gr/gron/pkg-fun.nix} | 0 .../gr/groonga/pkg-fun.nix} | 0 .../gr/groove/pkg-fun.nix} | 0 .../gr/groovy/pkg-fun.nix} | 0 .../gr/grpc-client-cli/pkg-fun.nix} | 0 .../gr/grpc-gateway/pkg-fun.nix} | 0 .../gr/grpc-tools/pkg-fun.nix} | 0 .../gr/grpcui/pkg-fun.nix} | 0 .../gr/grpcurl/pkg-fun.nix} | 0 .../gr/grsync/pkg-fun.nix} | 0 .../configs/grub-bootstrap.cfg | 0 .../gr/grub2_pvgrub_image}/configs/grub.cfg | 0 .../gr/grub2_pvgrub_image/pkg-fun.nix} | 0 .../gr/gruvbox-dark-gtk/pkg-fun.nix} | 0 .../gr/gruvbox-gtk-theme/pkg-fun.nix} | 0 .../default.nix => unit/gr/grype/pkg-fun.nix} | 0 .../libraries => unit/gs}/gsasl/gsasl.patch | 0 .../default.nix => unit/gs/gsasl/pkg-fun.nix} | 0 .../gs}/gscan2pdf/ffmpeg5-compat.patch | 0 .../gs/gscan2pdf/pkg-fun.nix} | 0 .../default.nix => unit/gs/gsctl/pkg-fun.nix} | 0 .../gs/gsettings-desktop-schemas/pkg-fun.nix} | 0 .../gs/gshhg-gmt/pkg-fun.nix} | 0 .../gs/gsimplecal/pkg-fun.nix} | 0 .../gs/gsl-lite/pkg-fun.nix} | 0 .../default.nix => unit/gs/gsl/pkg-fun.nix} | 0 .../default.nix => unit/gs/gsm/pkg-fun.nix} | 0 .../gs}/gsmartcontrol/fix-paths.patch | 0 .../gs/gsmartcontrol/pkg-fun.nix} | 0 .../default.nix => unit/gs/gsoap/pkg-fun.nix} | 0 .../gs/gsound/pkg-fun.nix} | 0 .../gs/gspeech/pkg-fun.nix} | 0 .../gs}/gspell/0001-Darwin-build-fix.patch | 0 .../gs/gspell/pkg-fun.nix} | 0 .../default.nix => unit/gs/gss/pkg-fun.nix} | 0 .../gs/gssdp-tools/pkg-fun.nix} | 0 .../gs/gssdp-tools}/standalone-tools.patch | 0 .../default.nix => unit/gs/gssdp/pkg-fun.nix} | 0 .../1.6.nix => unit/gs/gssdp_1_6/pkg-fun.nix} | 0 .../default.nix => unit/gs/gst/pkg-fun.nix} | 0 .../gt/default.nix => unit/gt/gt/pkg-fun.nix} | 0 .../default.nix => unit/gt/gt5/pkg-fun.nix} | 0 .../gt/gtdialog/pkg-fun.nix} | 0 .../gtest/fix-cmake-config-includedir.patch | 0 .../default.nix => unit/gt/gtest/pkg-fun.nix} | 0 .../default.nix => unit/gt/gtg/pkg-fun.nix} | 0 .../gt/gthree/pkg-fun.nix} | 0 .../gt/gthumb/pkg-fun.nix} | 0 .../default.nix => unit/gt/gti/pkg-fun.nix} | 0 .../gt/gtk-doc/pkg-fun.nix} | 0 .../respect-xml-catalog-files-var.patch | 0 .../gt/gtk-engine-bluecurve/pkg-fun.nix} | 0 .../gt/gtk-engine-murrine/pkg-fun.nix} | 0 .../gt/gtk-frdp/pkg-fun.nix} | 0 .../gt/gtk-layer-shell/pkg-fun.nix} | 0 .../gt/gtk-mac-bundler/pkg-fun.nix} | 0 .../gt/gtk-server/pkg-fun.nix} | 0 .../gt/gtk-sharp-beans/pkg-fun.nix} | 0 .../gt/gtk-vnc/pkg-fun.nix} | 0 .../gt/gtk2fontsel/pkg-fun.nix} | 0 .../gt/gtk_engines/pkg-fun.nix} | 0 .../gt/gtkcord4/pkg-fun.nix} | 0 .../gt/gtkdatabox/pkg-fun.nix} | 0 .../gt/gtkdialog/pkg-fun.nix} | 0 .../gt/gtkextra/pkg-fun.nix} | 0 .../gt/gtkgnutella/pkg-fun.nix} | 0 .../gt/gtkimageview/pkg-fun.nix} | 0 .../gt/gtklock/pkg-fun.nix} | 0 .../gt}/gtklp/patches/autoconf.patch | 0 .../gt}/gtklp/patches/mdv-fix-str-fmt.patch | 0 .../default.nix => unit/gt/gtklp/pkg-fun.nix} | 0 .../2.x.nix => unit/gt/gtkmm2/pkg-fun.nix} | 0 .../3.x.nix => unit/gt/gtkmm3/pkg-fun.nix} | 0 .../4.x.nix => unit/gt/gtkmm4/pkg-fun.nix} | 0 .../misc => unit/gt}/gtkperf/bench.patch | 0 .../gt/gtkperf/pkg-fun.nix} | 0 .../gt/gtkpod/pkg-fun.nix} | 0 .../gt/gtkradiant/pkg-fun.nix} | 0 .../gtksourceview3}/3.x-nix_share_path.patch | 0 .../gt/gtksourceview3/pkg-fun.nix} | 0 .../gt/gtksourceviewmm/pkg-fun.nix} | 0 .../gt/gtksourceviewmm4/pkg-fun.nix} | 0 .../gt/gtkspell2/pkg-fun.nix} | 0 .../3.nix => unit/gt/gtkspell3/pkg-fun.nix} | 0 .../gt/gtkspellmm/pkg-fun.nix} | 0 .../gt/gtkterm/pkg-fun.nix} | 0 ...etection-of-quartz-in-gdk-3.0-target.patch | 0 ...NDOWING_X11-macro-when-using-GtkPlug.patch | 0 .../gt/gtkwave/pkg-fun.nix} | 0 .../gt/gtranslator/pkg-fun.nix} | 0 .../default.nix => unit/gt/gts/pkg-fun.nix} | 0 .../gt/gtypist/pkg-fun.nix} | 0 .../default.nix => unit/gu/guake/pkg-fun.nix} | 0 .../gu}/guardian-agent/deps.nix | 0 .../gu/guardian-agent/pkg-fun.nix} | 0 .../gu/gubbi-font/pkg-fun.nix} | 0 .../default.nix => unit/gu/gucci/pkg-fun.nix} | 0 .../gu/guestfs-tools/pkg-fun.nix} | 0 .../gu/guetzli/pkg-fun.nix} | 0 .../default.nix => unit/gu/guff/pkg-fun.nix} | 0 .../gu/guile-cairo/pkg-fun.nix} | 0 .../gu/guile-commonmark/pkg-fun.nix} | 0 .../gu/guile-config/pkg-fun.nix} | 0 .../gu/guile-fibers/pkg-fun.nix} | 0 .../gu/guile-gcrypt/pkg-fun.nix} | 0 .../gu/guile-git/pkg-fun.nix} | 0 .../gu/guile-hall/pkg-fun.nix} | 0 .../gu/guile-json/pkg-fun.nix} | 0 .../gu/guile-lib/pkg-fun.nix} | 0 .../gu/guile-ncurses/pkg-fun.nix} | 0 .../gu/guile-opengl/pkg-fun.nix} | 0 .../gu/guile-reader/pkg-fun.nix} | 0 .../gu/guile-sdl/pkg-fun.nix} | 0 .../gu/guile-sdl2/pkg-fun.nix} | 0 .../gu/guile-sqlite3/pkg-fun.nix} | 0 .../gu/guile-ssh/pkg-fun.nix} | 0 .../gu/guile_1_8}/CVE-2016-8605.patch | 0 .../guile => unit/gu/guile_1_8}/cpp-4.5.patch | 0 .../1.8.nix => unit/gu/guile_1_8/pkg-fun.nix} | 0 .../gu/guile_1_8}/setup-hook-1.8.sh | 0 .../default.nix => unit/gu/gum/pkg-fun.nix} | 0 .../default.nix => unit/gu/gumbo/pkg-fun.nix} | 0 .../default.nix => unit/gu/gummi/pkg-fun.nix} | 0 .../default.nix => unit/gu/gummy/pkg-fun.nix} | 0 .../default.nix => unit/gu/gup/pkg-fun.nix} | 0 .../gu/gupnp-av/pkg-fun.nix} | 0 .../gu/gupnp-dlna/pkg-fun.nix} | 0 .../gu/gupnp-igd/pkg-fun.nix} | 0 .../gu/gupnp-tools/pkg-fun.nix} | 0 ...eclare-header-dependencies-as-public.patch | 0 .../default.nix => unit/gu/gupnp/pkg-fun.nix} | 0 .../1.6.nix => unit/gu/gupnp_1_6/pkg-fun.nix} | 0 .../gu/gurobi/pkg-fun.nix} | 0 .../gu}/gusb/fix-python-path.patch | 0 .../default.nix => unit/gu/gusb/pkg-fun.nix} | 0 .../gu/gutenprint/pkg-fun.nix} | 0 .../gu/gutenprintBin/pkg-fun.nix} | 0 .../gv/default.nix => unit/gv/gv/pkg-fun.nix} | 0 .../default.nix => unit/gv/gvfs/pkg-fun.nix} | 0 .../gv/gvisor/pkg-fun.nix} | 0 .../gv/gvm-libs/pkg-fun.nix} | 0 .../gv/gvolicon/pkg-fun.nix} | 0 .../default.nix => unit/gv/gvpe/pkg-fun.nix} | 0 .../gv/gvproxy/pkg-fun.nix} | 0 .../default.nix => unit/gw/gwc/pkg-fun.nix} | 0 .../gw/gweled/pkg-fun.nix} | 0 .../2.4.0.nix => unit/gw/gwt240/pkg-fun.nix} | 0 .../gw}/gwyddion/codegen.patch | 0 .../gw/gwyddion/pkg-fun.nix} | 0 .../default.nix => unit/gx/gx-go/pkg-fun.nix} | 0 .../gx/default.nix => unit/gx/gx/pkg-fun.nix} | 0 .../gx}/gxemul/0001-fix-attributes.patch | 0 .../gx/gxemul/pkg-fun.nix} | 0 .../default.nix => unit/gx/gxkb/pkg-fun.nix} | 0 .../gx/gxmatcheq-lv2/pkg-fun.nix} | 0 .../gx/gxmessage/pkg-fun.nix} | 0 .../gx/gxplugins-lv2/pkg-fun.nix} | 0 .../default.nix => unit/gy/gyb/pkg-fun.nix} | 0 .../gy/gyre-fonts/pkg-fun.nix} | 0 .../gz/gzdoom/pkg-fun.nix} | 0 .../default.nix => unit/gz/gzip/pkg-fun.nix} | 0 .../default.nix => unit/gz/gzrt/pkg-fun.nix} | 0 .../h/default.nix => unit/h/h/pkg-fun.nix} | 0 .../h2/default.nix => unit/h2/h2/pkg-fun.nix} | 0 .../default.nix => unit/h2/h2o/pkg-fun.nix} | 0 .../h3/default.nix => unit/h3/h3/pkg-fun.nix} | 0 .../ha/hack-font/pkg-fun.nix} | 0 .../ha/hackedbox/pkg-fun.nix} | 0 .../ha/hackertyper/pkg-fun.nix} | 0 .../ha/hackgen-font/pkg-fun.nix} | 0 .../ha/hackgen-nf-font/pkg-fun.nix} | 0 .../ha/hackneyed/pkg-fun.nix} | 0 .../ha/hackrf/pkg-fun.nix} | 0 .../ha/hacksaw/pkg-fun.nix} | 0 .../ha/hacpack/pkg-fun.nix} | 0 .../ha}/hactool/musl-compat.patch | 0 .../ha/hactool/pkg-fun.nix} | 0 .../ha/haguichi/pkg-fun.nix} | 0 .../default.nix => unit/ha/haka/pkg-fun.nix} | 0 .../ha/hakrawler/pkg-fun.nix} | 0 .../ha/hakuneko/pkg-fun.nix} | 0 .../default.nix => unit/ha/half/pkg-fun.nix} | 0 .../ha/halfempty/pkg-fun.nix} | 0 .../ha/halibut/pkg-fun.nix} | 0 .../ha/hamlib_3/pkg-fun.nix} | 0 .../4.nix => unit/ha/hamlib_4/pkg-fun.nix} | 0 .../ha/hammer/pkg-fun.nix} | 0 .../ha/hamster/pkg-fun.nix} | 0 .../ha/hanazono/pkg-fun.nix} | 0 .../ha/handlr/pkg-fun.nix} | 0 .../ha/hannom/pkg-fun.nix} | 0 .../default.nix => unit/ha/hans/pkg-fun.nix} | 0 .../ha/haproxy/pkg-fun.nix} | 0 .../ha/hardinfo/pkg-fun.nix} | 0 .../ha/harmonia/pkg-fun.nix} | 0 .../ha/harmonist/pkg-fun.nix} | 0 .../ha/harvid/pkg-fun.nix} | 0 .../ha/hash-identifier/pkg-fun.nix} | 0 .../ha/hash-slinger/pkg-fun.nix} | 0 .../ha/hashcash/pkg-fun.nix} | 0 .../ha/hashcat-utils/pkg-fun.nix} | 0 .../ha/hashcat/pkg-fun.nix} | 0 .../ha/hashdeep/pkg-fun.nix} | 0 .../ha/hashi-ui/pkg-fun.nix} | 0 .../ha/hashi-up/pkg-fun.nix} | 0 .../ha/hashit/pkg-fun.nix} | 0 .../ha}/hashlink/hashlink.patch | 0 .../ha/hashlink/pkg-fun.nix} | 0 .../ha/hashrat/pkg-fun.nix} | 0 .../ha/haskell-language-server/pkg-fun.nix} | 0 .../ha/hasklig/pkg-fun.nix} | 0 .../ha/hasmail/pkg-fun.nix} | 0 .../misc => unit/ha}/haste-client/Gemfile | 0 .../ha}/haste-client/Gemfile.lock | 0 .../misc => unit/ha}/haste-client/gemset.nix | 0 .../ha/haste-client/pkg-fun.nix} | 0 .../ha}/haste-server/node-composition.nix | 0 .../ha}/haste-server/node-deps.nix | 0 .../ha/haste-server}/node-env.nix | 0 .../ha/haste-server/pkg-fun.nix} | 0 .../ha}/haste-server/update.sh | 0 .../ha/hasura-cli/pkg-fun.nix} | 0 .../ha/hatari/pkg-fun.nix} | 0 .../default.nix => unit/ha/haunt/pkg-fun.nix} | 0 .../ha/haveged/pkg-fun.nix} | 0 .../default.nix => unit/ha/havoc/pkg-fun.nix} | 0 .../ha/hawknl/pkg-fun.nix} | 0 .../ha/haxor-news/pkg-fun.nix} | 0 .../default.nix => unit/hc/hci/pkg-fun.nix} | 0 .../hc/hcl2json/pkg-fun.nix} | 0 .../hc/hclfmt/pkg-fun.nix} | 0 .../hc/hcloud/pkg-fun.nix} | 0 .../hc/hcxdumptool/pkg-fun.nix} | 0 .../hc/hcxtools/pkg-fun.nix} | 0 .../hd/hd-idle/pkg-fun.nix} | 0 .../hd/hdaps-gl/pkg-fun.nix} | 0 .../hd/hdapsd/pkg-fun.nix} | 0 .../linux => unit/hd}/hdapsd/postInstall.sh | 0 .../default.nix => unit/hd/hdate/pkg-fun.nix} | 0 .../misc => unit/hd}/hddtemp/byteswap.patch | 0 .../misc => unit/hd}/hddtemp/dontwake.patch | 0 .../misc => unit/hd}/hddtemp/execinfo.patch | 0 .../hd/hddtemp/pkg-fun.nix} | 0 .../misc => unit/hd}/hddtemp/satacmds.patch | 0 .../hd}/hdf4/darwin-aarch64.patch | 0 .../default.nix => unit/hd/hdf4/pkg-fun.nix} | 0 .../hd}/hdf5-blosc/blosc_filter.pc.in | 0 .../hd}/hdf5-blosc/no-external-blosc.patch | 0 .../hd/hdf5-blosc/pkg-fun.nix} | 0 .../hd/hdf5_1_10/pkg-fun.nix} | 0 ...u-false-to-avoid-hostname-dependency.patch | 0 .../hd/hdfview/pkg-fun.nix} | 0 .../hd/hdhomerun-config-gui/pkg-fun.nix} | 0 .../hd/hdl-dump/pkg-fun.nix} | 0 .../hd/hdparm/pkg-fun.nix} | 0 .../default.nix => unit/hd/hdt/pkg-fun.nix} | 0 .../he/HentaiAtHome/pkg-fun.nix} | 0 .../he/headlines/pkg-fun.nix} | 0 .../he/headphones/pkg-fun.nix} | 0 .../he/headscale/pkg-fun.nix} | 0 .../he/headset-charge-indicator/pkg-fun.nix} | 0 .../he/headset/pkg-fun.nix} | 0 .../he/headsetcontrol/pkg-fun.nix} | 0 .../he/health-check/pkg-fun.nix} | 0 .../he/healthchecks/pkg-fun.nix} | 0 .../he/heatseeker/pkg-fun.nix} | 0 .../he/heatshrink/pkg-fun.nix} | 0 .../he/hebcal/pkg-fun.nix} | 0 .../he/hecate/pkg-fun.nix} | 0 .../he/hedgedoc-cli/pkg-fun.nix} | 0 .../he/heisenbridge/pkg-fun.nix} | 0 .../he/helio-workstation/pkg-fun.nix} | 0 .../default.nix => unit/he/helix/pkg-fun.nix} | 0 .../he/hello-unfree/pkg-fun.nix} | 0 .../he/hello-wayland/pkg-fun.nix} | 0 .../default.nix => unit/he/hello/pkg-fun.nix} | 0 .../misc => unit/he}/hello/test.nix | 0 .../he/helm-docs/pkg-fun.nix} | 0 .../default.nix => unit/he/helm/pkg-fun.nix} | 0 .../he/helmfile/pkg-fun.nix} | 0 .../he/helmholtz/pkg-fun.nix} | 0 .../he/helmsman/pkg-fun.nix} | 0 .../he}/help2man/1.40.4-cygwin-nls.patch | 0 .../he/help2man/pkg-fun.nix} | 0 .../he/helvetica-neue-lt-std/pkg-fun.nix} | 0 .../he/helvum/pkg-fun.nix} | 0 .../he/hepmc2/pkg-fun.nix} | 0 .../he/heptagon/pkg-fun.nix} | 0 .../default.nix => unit/he/herbe/pkg-fun.nix} | 0 .../he/herbstluftwm/pkg-fun.nix} | 0 .../herbstluftwm/test-path-environment.patch | 0 .../he/hercules-ci-agent/pkg-fun.nix} | 0 .../he/hercules/pkg-fun.nix} | 0 .../he/hermit/pkg-fun.nix} | 0 .../he/heroic-unwrapped}/package.json | 0 .../he/heroic-unwrapped/pkg-fun.nix} | 0 .../he/heroic-unwrapped}/yarn.lock | 0 .../he/heroic-unwrapped}/yarn.nix | 0 .../he/heroku/pkg-fun.nix} | 0 .../he/herwig/pkg-fun.nix} | 0 .../he}/hetzner-kube/fix-home.patch | 0 .../he/hetzner-kube/pkg-fun.nix} | 0 .../default.nix => unit/he/hevea/pkg-fun.nix} | 0 .../default.nix => unit/he/hex/pkg-fun.nix} | 0 .../he/hexchat/pkg-fun.nix} | 0 .../he/hexcurse/pkg-fun.nix} | 0 .../default.nix => unit/he/hexd/pkg-fun.nix} | 0 .../he/hexdino/pkg-fun.nix} | 0 .../he/hexedit/pkg-fun.nix} | 0 .../he/hexgui/pkg-fun.nix} | 0 .../default.nix => unit/he/hexio/pkg-fun.nix} | 0 .../default.nix => unit/he/hexyl/pkg-fun.nix} | 0 .../default.nix => unit/he/hey/pkg-fun.nix} | 0 .../hf/hfinger/pkg-fun.nix} | 0 .../hf/hfsprogs/pkg-fun.nix} | 0 .../hh/hhexen/pkg-fun.nix} | 0 .../default.nix => unit/hh/hhpc/pkg-fun.nix} | 0 .../hi/hiawatha/pkg-fun.nix} | 0 .../hi}/hibernate/gen-manpages.patch | 0 .../hi}/hibernate/hibernate.patch | 0 .../linux => unit/hi}/hibernate/install.patch | 0 .../hi/hibernate/pkg-fun.nix} | 0 .../hi/hicolor-icon-theme/pkg-fun.nix} | 0 .../hi}/hicolor-icon-theme/setup-hook.sh | 0 .../hi/hid-listen/pkg-fun.nix} | 0 .../hi/hid-tools/pkg-fun.nix} | 0 .../default.nix => unit/hi/hidrd/pkg-fun.nix} | 0 .../system => unit/hi}/hiera-eyaml/Gemfile | 0 .../hi}/hiera-eyaml/Gemfile.lock | 0 .../system => unit/hi}/hiera-eyaml/gemset.nix | 0 .../hi/hiera-eyaml/pkg-fun.nix} | 0 .../hi}/higan/001-include-cmath.patch | 0 .../hi}/higan/002-sips-to-png2icns.patch | 0 .../default.nix => unit/hi/higan/pkg-fun.nix} | 0 .../hi/highfive/pkg-fun.nix} | 0 .../hi/highlight-assertions/pkg-fun.nix} | 0 .../hi/hikounomizu/pkg-fun.nix} | 0 .../hi/hilbish/pkg-fun.nix} | 0 .../default.nix => unit/hi/hime/pkg-fun.nix} | 0 .../hi/hipchat/pkg-fun.nix} | 0 .../hi/hiredis-vip/pkg-fun.nix} | 0 .../hi/hiredis/pkg-fun.nix} | 0 .../hi/hisat2/pkg-fun.nix} | 0 .../default.nix => unit/hi/hitch/pkg-fun.nix} | 0 .../hi/hivelytracker/pkg-fun.nix} | 0 .../hi/hivemind/pkg-fun.nix} | 0 .../hj/hjson-go/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../hl/hll2390dw-cups/pkg-fun.nix} | 0 .../hm/hmat-oss/pkg-fun.nix} | 0 .../default.nix => unit/hm/hmmer/pkg-fun.nix} | 0 .../default.nix => unit/ho/hol/pkg-fun.nix} | 0 .../ho/holo-build/pkg-fun.nix} | 0 .../ho/holochain-launcher/pkg-fun.nix} | 0 .../ho/hologram/pkg-fun.nix} | 0 .../ho/home-assistant-cli/pkg-fun.nix} | 0 .../ho}/home-assistant/component-packages.nix | 0 .../ho}/home-assistant/frontend.nix | 0 .../home-assistant/patches/ffmpeg-path.patch | 0 .../patches/tests-mock-source-ip.patch | 0 .../ho/home-assistant/pkg-fun.nix} | 0 .../ho}/home-assistant/tests.nix | 0 .../ho/home-manager/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/ho}/homesick/Gemfile | 0 .../misc => unit/ho}/homesick/Gemfile.lock | 0 .../misc => unit/ho}/homesick/gemset.nix | 0 .../ho/homesick/pkg-fun.nix} | 0 .../ho/honcho/pkg-fun.nix} | 0 ...T-env-var-that-disables-Redis-requir.patch | 0 .../ho/honeycomb-refinery/pkg-fun.nix} | 0 .../ho/honeymarker/pkg-fun.nix} | 0 .../ho}/honeymarker/versions.nix | 0 .../ho/honeytail/pkg-fun.nix} | 0 .../ho}/honeytail/versions.nix | 0 .../ho/honeytrap/pkg-fun.nix} | 0 .../ho/honeyvent/pkg-fun.nix} | 0 .../ho}/honeyvent/versions.nix | 0 .../default.nix => unit/ho/honk/pkg-fun.nix} | 0 .../default.nix => unit/ho/hop/pkg-fun.nix} | 0 .../ho/hoppet/pkg-fun.nix} | 0 .../ho/horizon-eda/pkg-fun.nix} | 0 .../default.nix => unit/ho/horst/pkg-fun.nix} | 0 .../ho/hostapd-mana/pkg-fun.nix} | 0 .../ho/hostapd/pkg-fun.nix} | 0 .../ho/hostctl/pkg-fun.nix} | 0 .../ho/hostess/pkg-fun.nix} | 0 .../ho/hostname-debian/pkg-fun.nix} | 0 .../ho/hostsblock/pkg-fun.nix} | 0 .../ho}/hotpatch/no-loader-test.patch | 0 .../ho/hotpatch/pkg-fun.nix} | 0 .../ho/hottext/pkg-fun.nix} | 0 .../ho/houdini/pkg-fun.nix} | 0 .../misc => unit/ho}/houdini/runtime.nix | 0 .../default.nix => unit/ho/hound/pkg-fun.nix} | 0 .../ho}/hover/fix-assets-path.patch | 0 .../default.nix => unit/ho/hover/pkg-fun.nix} | 0 .../make-zoneinfo-available.diff | 0 .../ho/howard-hinnant-date/pkg-fun.nix} | 0 .../default.nix => unit/ho/howl/pkg-fun.nix} | 0 .../default.nix => unit/hp/hp2p/pkg-fun.nix} | 0 .../networking => unit/hp}/hp2p/python3.patch | 0 .../default.nix => unit/hp/hpcg/pkg-fun.nix} | 0 .../hp/hpe-ltfs/pkg-fun.nix} | 0 .../hp}/hpe-ltfs/remove-sysctl.patch | 0 .../default.nix => unit/hp/hping/pkg-fun.nix} | 0 .../default.nix => unit/hp/hpl/pkg-fun.nix} | 0 ...p-3.20.11-nixos-cups-ppd-search-path.patch | 0 .../drivers => unit/hp}/hplip/hplip.state | 0 .../default.nix => unit/hp/hplip/pkg-fun.nix} | 0 .../hp}/hplip/revert-snprintf-change.patch | 0 ...d-option-for-installation-sysconfdir.patch | 0 .../hq/hqplayerd/pkg-fun.nix} | 0 pkgs/{servers => unit/hq}/hqplayerd/rygel.nix | 0 .../hr/default.nix => unit/hr/hr/pkg-fun.nix} | 0 .../default.nix => unit/hr/hred/pkg-fun.nix} | 0 .../hs/hsetroot/pkg-fun.nix} | 0 .../hs/hspell/pkg-fun.nix} | 0 .../hs/hspellDicts/pkg-fun.nix} | 0 .../hs/hsphfpd/pkg-fun.nix} | 0 .../hs/hsqldb/pkg-fun.nix} | 0 .../default.nix => unit/hs/hss/pkg-fun.nix} | 0 .../default.nix => unit/hs/hstr/pkg-fun.nix} | 0 .../editors => unit/ht}/ht/gcc7.patch | 0 .../ht/default.nix => unit/ht/ht/pkg-fun.nix} | 0 .../misc => unit/ht}/html-proofer/Gemfile | 0 .../ht}/html-proofer/Gemfile.lock | 0 .../misc => unit/ht}/html-proofer/gemset.nix | 0 .../ht/html-proofer/pkg-fun.nix} | 0 .../ht/html-tidy/pkg-fun.nix} | 0 .../ht/html-xml-utils/pkg-fun.nix} | 0 .../ht/html2text/pkg-fun.nix} | 0 .../libraries => unit/ht}/htmlcxx/c++17.patch | 0 .../ht/htmlcxx/pkg-fun.nix} | 0 .../ht}/htmlcxx/ptrdiff.patch | 0 .../ht/htmltest/pkg-fun.nix} | 0 .../ht/htmlunit-driver/pkg-fun.nix} | 0 .../ht/htop-vim/pkg-fun.nix} | 0 .../ht/htpdate/pkg-fun.nix} | 0 .../ht/htslib/pkg-fun.nix} | 0 .../default.nix => unit/ht/httm/pkg-fun.nix} | 0 .../ht/http-getter/pkg-fun.nix} | 0 .../ht}/http-parser/build-shared.patch | 0 .../ht/http-parser/pkg-fun.nix} | 0 .../ht/http2tcp/pkg-fun.nix} | 0 .../ht/httpTwoLevelsUpdater/pkg-fun.nix} | 0 .../ht/httpdirfs/pkg-fun.nix} | 0 .../ht/httpdump/pkg-fun.nix} | 0 .../ht/httperf/pkg-fun.nix} | 0 .../ht/httpfs2/pkg-fun.nix} | 0 .../ht/httping/pkg-fun.nix} | 0 .../ht/httplab/pkg-fun.nix} | 0 .../ht/httplib/pkg-fun.nix} | 0 .../ht/https-dns-proxy/pkg-fun.nix} | 0 .../ht/httpstat/pkg-fun.nix} | 0 .../ht/httptunnel/pkg-fun.nix} | 0 .../ht/httpunit/pkg-fun.nix} | 0 .../default.nix => unit/ht/httpx/pkg-fun.nix} | 0 .../ht/httrack/pkg-fun.nix} | 0 .../default.nix => unit/hu/hub/pkg-fun.nix} | 0 .../hu/hubble/pkg-fun.nix} | 0 .../hu/hubicfuse/pkg-fun.nix} | 0 .../hu/hubot-sans/pkg-fun.nix} | 0 .../hu/hubstaff/pkg-fun.nix} | 0 .../networking => unit/hu}/hue-cli/Gemfile | 0 .../hu}/hue-cli/Gemfile.lock | 0 .../networking => unit/hu}/hue-cli/gemset.nix | 0 .../hu/hue-cli/pkg-fun.nix} | 0 .../default.nix => unit/hu/hugo/pkg-fun.nix} | 0 .../default.nix => unit/hu/hugs/pkg-fun.nix} | 0 .../hu/humanity-icon-theme/pkg-fun.nix} | 0 .../hu/humioctl/pkg-fun.nix} | 0 .../default.nix => unit/hu/huniq/pkg-fun.nix} | 0 ...ok-in-XDG_DATA_DIRS-for-dictionaries.patch | 0 .../hu/hunspell/pkg-fun.nix} | 0 .../default.nix => unit/hu/hunt/pkg-fun.nix} | 0 .../default.nix => unit/hu/hurl/pkg-fun.nix} | 0 .../default.nix => unit/hu/hut/pkg-fun.nix} | 0 .../default.nix => unit/hv/hvm/pkg-fun.nix} | 0 .../hw/hwatch/pkg-fun.nix} | 0 .../hw/hwdata/pkg-fun.nix} | 0 .../hw/hwinfo/pkg-fun.nix} | 0 .../default.nix => unit/hw/hwloc/pkg-fun.nix} | 0 .../hy/hydraAntLogger/pkg-fun.nix} | 0 .../0.nix => unit/hy/hydrogen_0/pkg-fun.nix} | 0 .../hy/hydron/pkg-fun.nix} | 0 .../hy/hydroxide/pkg-fun.nix} | 0 .../default.nix => unit/hy/hyena/pkg-fun.nix} | 0 .../hy/hyenae/pkg-fun.nix} | 0 .../hy/hyfetch/pkg-fun.nix} | 0 .../hy}/hylafaxplus/config.site | 0 .../hy}/hylafaxplus/libtiff-4.patch | 0 .../hy/hylafaxplus/pkg-fun.nix} | 0 .../hy}/hylafaxplus/post-install-check.sh | 0 .../hy}/hylafaxplus/post-install.sh | 0 .../hy}/hylafaxplus/post-patch.sh | 0 .../default.nix => unit/hy/hyp/pkg-fun.nix} | 0 .../hy/hyp2mat/pkg-fun.nix} | 0 .../default.nix => unit/hy/hyper/pkg-fun.nix} | 0 .../hy/hyperledger-fabric/pkg-fun.nix} | 0 .../hy/hyperrogue/pkg-fun.nix} | 0 .../hy/hyperscan/pkg-fun.nix} | 0 .../hy/hyperscrypt-font/pkg-fun.nix} | 0 .../hy/hyphen/pkg-fun.nix} | 0 .../hy}/hypnotix/libmpv-path.patch | 0 .../hy/hypnotix/pkg-fun.nix} | 0 .../hy/hysteria/pkg-fun.nix} | 0 .../default.nix => unit/hy/hyx/pkg-fun.nix} | 0 .../i-/i-dot-ming/pkg-fun.nix} | 0 .../i2/i2c-tools/pkg-fun.nix} | 0 .../networking => unit/i2}/i2p/i2p.patch | 0 .../default.nix => unit/i2/i2p/pkg-fun.nix} | 0 .../default.nix => unit/i2/i2pd/pkg-fun.nix} | 0 .../i3/i3-auto-layout/pkg-fun.nix} | 0 .../i3/i3-easyfocus/pkg-fun.nix} | 0 .../i3/i3-layout-manager/pkg-fun.nix} | 0 .../i3/i3-ratiosplit/pkg-fun.nix} | 0 .../i3/i3-rounded/pkg-fun.nix} | 0 .../i3/i3-wk-switch/pkg-fun.nix} | 0 .../default.nix => unit/i3/i3a/pkg-fun.nix} | 0 .../i3/i3altlayout/pkg-fun.nix} | 0 .../i3/i3blocks-gaps/pkg-fun.nix} | 0 .../i3/i3blocks/pkg-fun.nix} | 0 .../i3/i3ipc-glib/pkg-fun.nix} | 0 .../i3/i3lock-blur/pkg-fun.nix} | 0 .../i3/i3lock-color/pkg-fun.nix} | 0 .../i3/i3lock-fancy-rapid/pkg-fun.nix} | 0 .../i3/i3lock-fancy/pkg-fun.nix} | 0 .../i3/i3lock-pixeled/pkg-fun.nix} | 0 .../i3/i3minator/pkg-fun.nix} | 0 .../i3/i3nator/pkg-fun.nix} | 0 .../i3/i3pystatus/pkg-fun.nix} | 0 .../i3/i3status-rust/pkg-fun.nix} | 0 .../i3/i3status/pkg-fun.nix} | 0 .../i3/wsr.nix => unit/i3/i3wsr/pkg-fun.nix} | 0 .../i8/i810switch/pkg-fun.nix} | 0 .../ia/ia-writer-duospace/pkg-fun.nix} | 0 .../2.1.nix => unit/ia/iaca_2_1/pkg-fun.nix} | 0 .../3.0.nix => unit/ia/iaca_3_0/pkg-fun.nix} | 0 .../iam-policy-json-to-terraform/pkg-fun.nix} | 0 .../default.nix => unit/ia/iamy/pkg-fun.nix} | 0 .../ia/iana-etc/pkg-fun.nix} | 0 .../ib/ibm-plex/pkg-fun.nix} | 0 .../ib/ibm-sw-tpm2/pkg-fun.nix} | 0 .../default.nix => unit/ib/ibniz/pkg-fun.nix} | 0 .../ib/ibus-qt/pkg-fun.nix} | 0 .../ib/ibus-theme-tools/pkg-fun.nix} | 0 .../ib/ibus-with-plugins/pkg-fun.nix} | 0 .../ib}/ibus/fix-paths.patch | 0 .../default.nix => unit/ib/ibus/pkg-fun.nix} | 0 .../ic/ic-keysmith/pkg-fun.nix} | 0 .../ic/icbm3d/pkg-fun.nix} | 0 .../ic/icdiff/pkg-fun.nix} | 0 .../ic/icecast/pkg-fun.nix} | 0 .../ic/icecream/pkg-fun.nix} | 0 .../ic/iceshelf/pkg-fun.nix} | 0 .../default.nix => unit/ic/icesl/pkg-fun.nix} | 0 .../ic/icestorm/pkg-fun.nix} | 0 .../default.nix => unit/ic/icewm/pkg-fun.nix} | 0 .../ic/icingaweb2-ipl/pkg-fun.nix} | 0 .../ic/icingaweb2-thirdparty/pkg-fun.nix} | 0 .../ic/icingaweb2/pkg-fun.nix} | 0 .../ic/icmake/pkg-fun.nix} | 0 .../ic/icon-lang/pkg-fun.nix} | 0 .../ic/icon-library/pkg-fun.nix} | 0 .../ic/icon-slicer/pkg-fun.nix} | 0 .../extractWinRscIconsToStdFreeDesktopDir.sh | 0 .../iconConvTools}/bin/icoFileToHiColorTheme | 0 .../ic/iconConvTools/pkg-fun.nix} | 0 .../ic/iconnamingutils/pkg-fun.nix} | 0 .../ic/iconpack-jade/pkg-fun.nix} | 0 .../ic/iconpack-obsidian/pkg-fun.nix} | 0 .../ic/icoutils/pkg-fun.nix} | 0 .../default.nix => unit/ic/icr/pkg-fun.nix} | 0 .../tools => unit/ic}/icr/shards.nix | 0 .../id}/id3lib/id3lib-3.8.3-gcc43-1.patch | 0 .../patch_id3lib_3.8.3_UTF16_writing_bug.diff | 0 .../id/id3lib/pkg-fun.nix} | 0 .../default.nix => unit/id/id3v2/pkg-fun.nix} | 0 .../id/ideogram/pkg-fun.nix} | 0 .../id/ideviceinstaller/pkg-fun.nix} | 0 .../id/idevicerestore/pkg-fun.nix} | 0 .../id/idle3tools/pkg-fun.nix} | 0 .../id/idnkit/pkg-fun.nix} | 0 .../id/idris2/pkg-fun.nix} | 0 .../compilers => unit/id}/idris2/tests.nix | 0 .../id}/idutils/nix-mapping.patch | 0 .../id/idutils/pkg-fun.nix} | 0 .../if/ifdnfc/pkg-fun.nix} | 0 .../if/ifenslave/pkg-fun.nix} | 0 .../default.nix => unit/if/iferr/pkg-fun.nix} | 0 .../default.nix => unit/if/ifm/pkg-fun.nix} | 0 .../if/ifmetric/pkg-fun.nix} | 0 .../if/ifstat-legacy/pkg-fun.nix} | 0 .../default.nix => unit/if/iftop/pkg-fun.nix} | 0 .../default.nix => unit/if/ifuse/pkg-fun.nix} | 0 .../ig/igmpproxy/pkg-fun.nix} | 0 .../ig/ignite/pkg-fun.nix} | 0 .../ig/igprof/pkg-fun.nix} | 0 .../ig/igraph/pkg-fun.nix} | 0 .../default.nix => unit/ig/igv/pkg-fun.nix} | 0 .../ih/ihp-new/pkg-fun.nix} | 0 .../default.nix => unit/ii/iina/pkg-fun.nix} | 0 .../ii/iio-sensor-proxy/pkg-fun.nix} | 0 .../default.nix => unit/ij/ijq/pkg-fun.nix} | 0 .../default.nix => unit/ij/ijs/pkg-fun.nix} | 0 .../ik/ike-scan/pkg-fun.nix} | 0 .../default.nix => unit/ik/ikill/pkg-fun.nix} | 0 .../libraries => unit/il}/ilbc/CMakeLists.txt | 0 .../il}/ilbc/extract-cfile.awk | 0 .../default.nix => unit/il/ilbc/pkg-fun.nix} | 0 .../default.nix => unit/il/ili2c/pkg-fun.nix} | 0 .../default.nix => unit/il/illum/pkg-fun.nix} | 0 .../il/ilmbase/pkg-fun.nix} | 0 .../im/ima-evm-utils/pkg-fun.nix} | 0 .../im/image-roll/pkg-fun.nix} | 0 .../im/imagej/pkg-fun.nix} | 0 .../im/imagelol/pkg-fun.nix} | 0 .../im/imageworsener/pkg-fun.nix} | 0 .../im/imaginary/pkg-fun.nix} | 0 .../im/imagination/pkg-fun.nix} | 0 .../im/imapsync/pkg-fun.nix} | 0 .../default.nix => unit/im/imath/pkg-fun.nix} | 0 .../im/img-cat/pkg-fun.nix} | 0 .../default.nix => unit/im/img/pkg-fun.nix} | 0 .../im/imgcat/pkg-fun.nix} | 0 .../im/imgcrypt/pkg-fun.nix} | 0 .../im/imgpatchtools/pkg-fun.nix} | 0 .../im/imgproxy/pkg-fun.nix} | 0 .../default.nix => unit/im/imgui/pkg-fun.nix} | 0 .../im/imgur-screenshot/pkg-fun.nix} | 0 .../im/imgurbash2/pkg-fun.nix} | 0 .../default.nix => unit/im/imhex/pkg-fun.nix} | 0 .../default.nix => unit/im/iml/pkg-fun.nix} | 0 .../im/imlib2/pkg-fun.nix} | 0 .../im/immudb/pkg-fun.nix} | 0 .../default.nix => unit/im/impl/pkg-fun.nix} | 0 .../default.nix => unit/im/impy/pkg-fun.nix} | 0 .../default.nix => unit/im/imtui/pkg-fun.nix} | 0 .../default.nix => unit/im/imv/pkg-fun.nix} | 0 .../im/imwheel/pkg-fun.nix} | 0 .../in/in-formant/pkg-fun.nix} | 0 .../in/inadyn/pkg-fun.nix} | 0 .../in/inav-blackbox-tools/pkg-fun.nix} | 0 .../in/inav-configurator/pkg-fun.nix} | 0 .../default.nix => unit/in/inchi/pkg-fun.nix} | 0 .../in/inconsolata-lgc/pkg-fun.nix} | 0 .../in/inconsolata/pkg-fun.nix} | 0 .../in}/incron/default_path.patch | 0 .../in/incron/pkg-fun.nix} | 0 .../in/incrtcl/pkg-fun.nix} | 0 .../misc => unit/in}/indent/darwin.patch | 0 .../in/indent/pkg-fun.nix} | 0 .../in/indi-full}/indi-3rdparty.nix | 0 .../in/indi-full}/indi-firmware.nix | 0 .../in/indi-full}/indi-with-drivers.nix | 0 .../in/indi-full/pkg-fun.nix} | 0 .../indicator-application-gtk2/pkg-fun.nix} | 0 .../indicator-application-gtk3/pkg-fun.nix} | 0 .../in/indicator-sound-switcher/pkg-fun.nix} | 0 .../in/indigenous-desktop/pkg-fun.nix} | 0 .../in/indilib/pkg-fun.nix} | 0 .../in/industrializer/pkg-fun.nix} | 0 .../in/ineffassign/pkg-fun.nix} | 0 .../inetutils-1_9-PATH_PROCNET_DEV.patch | 0 .../in/inetutils/pkg-fun.nix} | 0 .../in/infamousPlugins/pkg-fun.nix} | 0 .../in/inferno/pkg-fun.nix} | 0 .../in/influxdb/pkg-fun.nix} | 0 .../in/influxdb2-cli/pkg-fun.nix} | 0 .../in/influxdb2-server/pkg-fun.nix} | 0 .../in/influxdb2/pkg-fun.nix} | 0 .../in}/infnoise/makefile.patch | 0 .../in/infnoise/pkg-fun.nix} | 0 .../in/inform6/pkg-fun.nix} | 0 .../in/inform7/pkg-fun.nix} | 0 .../in/infra-arcana/pkg-fun.nix} | 0 .../default.nix => unit/in/infra/pkg-fun.nix} | 0 .../in/infracost/pkg-fun.nix} | 0 .../in/inframap/pkg-fun.nix} | 0 .../default.nix => unit/in/ingen/pkg-fun.nix} | 0 .../default.nix => unit/in/inih/pkg-fun.nix} | 0 .../in}/iniparser/iniparser.pc.in | 0 .../in}/iniparser/no-usr.patch | 0 .../in/iniparser/pkg-fun.nix} | 0 .../default.nix => unit/in/ink/pkg-fun.nix} | 0 .../compilers => unit/in}/inklecate/deps.nix | 0 .../in/inklecate/pkg-fun.nix} | 0 .../in/inklingreader/pkg-fun.nix} | 0 .../in/inkscape-with-extensions/pkg-fun.nix} | 0 .../in/innoextract/pkg-fun.nix} | 0 .../in}/inormalize/lgmask-interp.patch | 0 .../inormalize/nu_correct_norm-interp.patch | 0 .../in/inormalize/pkg-fun.nix} | 0 .../in/inotify-tools/pkg-fun.nix} | 0 .../in/input-fonts/pkg-fun.nix} | 0 .../in/input-utils/pkg-fun.nix} | 0 .../in/inputplug/pkg-fun.nix} | 0 .../default.nix => unit/in/inql/pkg-fun.nix} | 0 .../in/inriafonts/pkg-fun.nix} | 0 .../in/insomnia/pkg-fun.nix} | 0 .../in/inspectrum/pkg-fun.nix} | 0 .../in/inspircd/pkg-fun.nix} | 0 .../in}/instead-launcher/path.patch | 0 .../in/instead-launcher/pkg-fun.nix} | 0 .../in/instead/pkg-fun.nix} | 0 .../in/insync/pkg-fun.nix} | 0 .../in/intel-cmt-cat/pkg-fun.nix} | 0 .../in/intel-compute-runtime/pkg-fun.nix} | 0 .../in/intel-gmmlib/pkg-fun.nix} | 0 .../in/intel-gpu-tools/pkg-fun.nix} | 0 .../in/intel-graphics-compiler/pkg-fun.nix} | 0 .../in/intel-media-driver/pkg-fun.nix} | 0 .../in/intel-media-sdk/pkg-fun.nix} | 0 .../in/intel-ocl/pkg-fun.nix} | 0 .../in/intel2200BGFirmware/pkg-fun.nix} | 0 .../default.nix => unit/in/inter/pkg-fun.nix} | 0 .../in/interactsh/pkg-fun.nix} | 0 .../in/intercal/pkg-fun.nix} | 0 .../in/interception-tools/pkg-fun.nix} | 0 .../in/interlock/pkg-fun.nix} | 0 .../in/intermodal/pkg-fun.nix} | 0 .../in/intltool/pkg-fun.nix} | 0 .../in/invoice2data/pkg-fun.nix} | 0 .../in/invoiceplane/pkg-fun.nix} | 0 .../default.nix => unit/in/inxi/pkg-fun.nix} | 0 .../io/default.nix => unit/io/io/pkg-fun.nix} | 0 .../io/ioccheck/pkg-fun.nix} | 0 .../0001-Add-cmake-install-directives.patch | 0 .../io/iodash/pkg-fun.nix} | 0 .../io/iodine/pkg-fun.nix} | 0 .../io/iomelt/pkg-fun.nix} | 0 .../io}/ion/build-script.patch | 0 .../default.nix => unit/io/ion/pkg-fun.nix} | 0 .../io/ioping/pkg-fun.nix} | 0 .../io/ioport/pkg-fun.nix} | 0 .../io/ioquake3/pkg-fun.nix} | 0 .../default.nix => unit/io/ior/pkg-fun.nix} | 0 .../io}/ios-cross-compile/9.2_builder.sh | 0 .../io}/ios-cross-compile/alt_wrapper.c | 0 .../io/ios-cross-compile/pkg-fun.nix} | 0 .../io/iosevka-bin/pkg-fun.nix} | 0 .../io/iosevka-bin}/update-bin.sh | 0 .../io/iosevka-bin}/variants.nix | 0 .../io/iotools/pkg-fun.nix} | 0 .../io/iotop-c/pkg-fun.nix} | 0 .../default.nix => unit/io/iotop/pkg-fun.nix} | 0 .../io/iouyap/pkg-fun.nix} | 0 .../io/iozone/pkg-fun.nix} | 0 .../io/ioztat/pkg-fun.nix} | 0 .../ip/ip2location-c/pkg-fun.nix} | 0 .../ip/ip2location/pkg-fun.nix} | 0 .../ip/ip2unix/pkg-fun.nix} | 0 .../ip/ipad_charge/pkg-fun.nix} | 0 .../ip/ipaexfont/pkg-fun.nix} | 0 .../ip/ipafont/pkg-fun.nix} | 0 .../default.nix => unit/ip/ipbt/pkg-fun.nix} | 0 .../ip/ipcalc/pkg-fun.nix} | 0 .../ip}/ipcalc/sandbox_tests.patch | 0 .../2.nix => unit/ip/iperf2/pkg-fun.nix} | 0 .../3.nix => unit/ip/iperf3/pkg-fun.nix} | 0 .../ip/ipfetch/pkg-fun.nix} | 0 .../ip/ipfs-cluster/pkg-fun.nix} | 0 .../ip/ipfs-upload-client/pkg-fun.nix} | 0 .../ip/ipgrep/pkg-fun.nix} | 0 .../ip/ipinfo/pkg-fun.nix} | 0 .../ip/ipmicfg/pkg-fun.nix} | 0 .../ip/ipmitool/pkg-fun.nix} | 0 .../ip/ipmiutil/pkg-fun.nix} | 0 .../ip/ipmiview/pkg-fun.nix} | 0 .../default.nix => unit/ip/ipopt/pkg-fun.nix} | 0 .../ip/ipp-usb/pkg-fun.nix} | 0 .../ip/iprange/pkg-fun.nix} | 0 .../ip/iproute2/pkg-fun.nix} | 0 .../ip/iprover/pkg-fun.nix} | 0 .../ip/ipscan/pkg-fun.nix} | 0 .../default.nix => unit/ip/ipset/pkg-fun.nix} | 0 .../ip/iptraf-ng/pkg-fun.nix} | 0 .../default.nix => unit/ip/iptsd/pkg-fun.nix} | 0 .../ip/iptstate/pkg-fun.nix} | 0 .../ip/ipv6calc/pkg-fun.nix} | 0 .../ip/ipvsadm/pkg-fun.nix} | 0 .../default.nix => unit/ip/ipxe/pkg-fun.nix} | 0 .../iq/iqtree/pkg-fun.nix} | 0 .../ir/ir-standard-fonts/pkg-fun.nix} | 0 .../ir/irccat/pkg-fun.nix} | 0 .../ir/irccloud/pkg-fun.nix} | 0 .../ir/ircdHybrid/pkg-fun.nix} | 0 .../ir/ircdog/pkg-fun.nix} | 0 .../ir/iredis/pkg-fun.nix} | 0 .../default.nix => unit/ir/irker/pkg-fun.nix} | 0 .../default.nix => unit/ir/irpf/pkg-fun.nix} | 0 .../ir/irqbalance/pkg-fun.nix} | 0 .../default.nix => unit/ir/irssi/pkg-fun.nix} | 0 .../jupyter-kernels => unit/ir}/iruby/Gemfile | 0 .../ir}/iruby/Gemfile.lock | 0 .../ir}/iruby/gemset.nix | 0 .../default.nix => unit/ir/iruby/pkg-fun.nix} | 0 .../default.nix => unit/is/isa-l/pkg-fun.nix} | 0 .../default.nix => unit/is/ised/pkg-fun.nix} | 0 .../is/iso-flags/pkg-fun.nix} | 0 .../is/isocodes/pkg-fun.nix} | 0 .../is/isolyzer/pkg-fun.nix} | 0 .../is/isomd5sum/pkg-fun.nix} | 0 .../is/ispell/pkg-fun.nix} | 0 .../is/istioctl/pkg-fun.nix} | 0 .../default.nix => unit/it/itch/pkg-fun.nix} | 0 .../default.nix => unit/it/itd/pkg-fun.nix} | 0 .../it/ite-backlight/pkg-fun.nix} | 0 .../it/iterm2/pkg-fun.nix} | 0 .../it/itktcl/pkg-fun.nix} | 0 .../it}/itm-tools/cargo-lock.patch | 0 .../it/itm-tools/pkg-fun.nix} | 0 .../default.nix => unit/it/itpp/pkg-fun.nix} | 0 .../it/itstool/pkg-fun.nix} | 0 .../default.nix => unit/it/itsx/pkg-fun.nix} | 0 .../iu/iucode-tool/pkg-fun.nix} | 0 .../default.nix => unit/iv/ivan/pkg-fun.nix} | 0 .../iw/default.nix => unit/iw/iw/pkg-fun.nix} | 0 .../default.nix => unit/iw/iwd/pkg-fun.nix} | 0 .../default.nix => unit/iw/iwgtk/pkg-fun.nix} | 0 .../iw}/iwgtk/systemd-service.patch | 0 .../default.nix => unit/iw/iwona/pkg-fun.nix} | 0 .../ix/default.nix => unit/ix/ix/pkg-fun.nix} | 0 .../j4/j4-dmenu-desktop/pkg-fun.nix} | 0 .../default.nix => unit/ja/jaaa/pkg-fun.nix} | 0 .../jack1.nix => unit/ja/jack1/pkg-fun.nix} | 0 .../ja/jack_capture/pkg-fun.nix} | 0 .../ja/jack_oscrolloscope/pkg-fun.nix} | 0 .../ja/jack_rack/pkg-fun.nix} | 0 pkgs/{servers => unit/ja}/jackett/deps.nix | 0 .../ja/jackett/pkg-fun.nix} | 0 pkgs/{servers => unit/ja}/jackett/updater.sh | 0 .../ja/jackline/pkg-fun.nix} | 0 .../ja/jackmeter/pkg-fun.nix} | 0 .../ja/jacoco/pkg-fun.nix} | 0 .../default.nix => unit/ja/jade/pkg-fun.nix} | 0 .../default.nix => unit/ja/jadx/pkg-fun.nix} | 0 .../ja/jaeles/pkg-fun.nix} | 0 .../default.nix => unit/ja/jags/pkg-fun.nix} | 0 .../default.nix => unit/ja/jalv/pkg-fun.nix} | 0 .../default.nix => unit/ja/jama/pkg-fun.nix} | 0 .../default.nix => unit/ja/jamin/pkg-fun.nix} | 0 .../default.nix => unit/ja/janet/pkg-fun.nix} | 0 .../ja/jansson/pkg-fun.nix} | 0 .../ja/janus-gateway/pkg-fun.nix} | 0 .../ja/janusgraph/pkg-fun.nix} | 0 .../default.nix => unit/ja/japa/pkg-fun.nix} | 0 .../ja/jarowinkler-cpp/pkg-fun.nix} | 0 .../ja/jasmin-compiler/pkg-fun.nix} | 0 .../ja/jasmin/pkg-fun.nix} | 0 .../test-assemble-hello-world/HelloWorld.j | 0 .../test-assemble-hello-world/default.nix | 0 .../ja/jasper/pkg-fun.nix} | 0 .../ja/java-language-server/pkg-fun.nix} | 0 .../default.nix => unit/ja/jay/pkg-fun.nix} | 0 .../tools => unit/ja}/jazzy/Gemfile | 0 .../tools => unit/ja}/jazzy/Gemfile.lock | 0 .../tools => unit/ja}/jazzy/gemset.nix | 0 .../default.nix => unit/ja/jazzy/pkg-fun.nix} | 0 .../default.nix => unit/jb/jbake/pkg-fun.nix} | 0 .../default.nix => unit/jb/jbang/pkg-fun.nix} | 0 .../jb/jbig2dec/pkg-fun.nix} | 0 ...5fe7e73d7ed95c9e12b52dd4984723f865fa.patch | 0 .../jb/jbig2enc/pkg-fun.nix} | 0 .../jb/jbigkit/pkg-fun.nix} | 0 .../jb/jbofihe/pkg-fun.nix} | 0 .../default.nix => unit/jb/jboss/pkg-fun.nix} | 0 .../jb/jboss_mysql_jdbc/pkg-fun.nix} | 0 .../default.nix => unit/jc/jcal/pkg-fun.nix} | 0 .../jc/jconvolver/pkg-fun.nix} | 0 .../jd/jd-cli/pkg-fun.nix} | 0 .../jd/jd-diff-patch/pkg-fun.nix} | 0 .../jd/jd-gui/pkg-fun.nix} | 0 .../jd/jdiskreport/pkg-fun.nix} | 0 .../default.nix => unit/jd/jdom/pkg-fun.nix} | 0 .../jd/jdt-language-server/pkg-fun.nix} | 0 .../jd/jdupes/pkg-fun.nix} | 0 .../default.nix => unit/je/jed/pkg-fun.nix} | 0 .../editors => unit/je}/jedit/build.xml.patch | 0 .../default.nix => unit/je/jedit/pkg-fun.nix} | 0 .../misc => unit/je}/jekyll/basic/Gemfile | 0 .../je}/jekyll/basic/Gemfile.lock | 0 .../misc => unit/je}/jekyll/basic/gemset.nix | 0 .../misc => unit/je}/jekyll/full/Gemfile | 0 .../misc => unit/je}/jekyll/full/Gemfile.lock | 0 .../misc => unit/je}/jekyll/full/gemset.nix | 0 .../je/jekyll/pkg-fun.nix} | 0 .../misc => unit/je}/jekyll/update.sh | 0 .../default.nix => unit/je/jelly/pkg-fun.nix} | 0 .../je}/jellycli/fix-test-dir.patch | 0 .../je/jellycli/pkg-fun.nix} | 0 .../je/jellyfin-ffmpeg/pkg-fun.nix} | 0 .../je/jemalloc/pkg-fun.nix} | 0 .../je/jenkins/pkg-fun.nix} | 0 .../default.nix => unit/je/jet/pkg-fun.nix} | 0 .../je/jetbrains-mono/pkg-fun.nix} | 0 .../default.nix => unit/je/jetty/pkg-fun.nix} | 0 .../default.nix => unit/jf/jffi/pkg-fun.nix} | 0 .../default.nix => unit/jf/jflap/pkg-fun.nix} | 0 .../default.nix => unit/jf/jflex/pkg-fun.nix} | 0 .../default.nix => unit/jf/jfmt/pkg-fun.nix} | 0 .../jf/jfrog-cli/pkg-fun.nix} | 0 .../jf}/jfsutils/ar-fix.patch | 0 .../jf}/jfsutils/hardening-format.patch | 0 .../jf/jfsutils/pkg-fun.nix} | 0 .../jf}/jfsutils/types.patch | 0 .../default.nix => unit/jf/jftui/pkg-fun.nix} | 0 .../jg/jgmenu/pkg-fun.nix} | 0 .../default.nix => unit/jh/jhead/pkg-fun.nix} | 0 .../jh/jhiccup/pkg-fun.nix} | 0 .../default.nix => unit/ji/jibri/pkg-fun.nix} | 0 pkgs/{servers => unit/ji}/jibri/update.sh | 0 .../ji}/jicofo/logging.properties-journal | 0 .../ji/jicofo/pkg-fun.nix} | 0 pkgs/{servers => unit/ji}/jicofo/update.sh | 0 .../tools => unit/ji}/jid/deps.nix | 0 .../default.nix => unit/ji/jid/pkg-fun.nix} | 0 .../ji/jikespg/pkg-fun.nix} | 0 .../ji/jimtcl/pkg-fun.nix} | 0 .../default.nix => unit/ji/jiq/pkg-fun.nix} | 0 .../ji/jira-cli-go/pkg-fun.nix} | 0 .../ji/jira-cli/pkg-fun.nix} | 0 .../ji/jirafeau/pkg-fun.nix} | 0 .../default.nix => unit/ji/jiten/pkg-fun.nix} | 0 .../ji/jitsi-meet-electron/pkg-fun.nix} | 0 .../ji/jitsi-meet-prosody/pkg-fun.nix} | 0 .../ji}/jitsi-meet-prosody/update.sh | 0 .../ji/jitsi-meet/pkg-fun.nix} | 0 .../web-apps => unit/ji}/jitsi-meet/update.sh | 0 .../logging.properties-journal | 0 .../ji/jitsi-videobridge/pkg-fun.nix} | 0 .../ji}/jitsi-videobridge/update.sh | 0 .../ji}/jitsi/jitsi.patch | 0 .../default.nix => unit/ji/jitsi/pkg-fun.nix} | 0 .../ji/jitterentropy/pkg-fun.nix} | 0 .../jm/jmespath/pkg-fun.nix} | 0 .../jm/jmeter/pkg-fun.nix} | 0 .../jm/jmtpfs/pkg-fun.nix} | 0 .../jm/jmusicbot/pkg-fun.nix} | 0 .../default.nix => unit/jn/jna/pkg-fun.nix} | 0 .../jn/jnetmap/pkg-fun.nix} | 0 .../jn}/jnettop/no-dns-resolution.patch | 0 .../jn/jnettop/pkg-fun.nix} | 0 .../jo/default.nix => unit/jo/jo/pkg-fun.nix} | 0 .../jo/jobber/pkg-fun.nix} | 0 .../default.nix => unit/jo/joe/pkg-fun.nix} | 0 .../default.nix => unit/jo/john/pkg-fun.nix} | 0 .../jo/join-desktop/pkg-fun.nix} | 0 .../default.nix => unit/jo/joker/pkg-fun.nix} | 0 .../jo/joplin-desktop/pkg-fun.nix} | 0 .../default.nix => unit/jo/jose/pkg-fun.nix} | 0 .../default.nix => unit/jo/josh/pkg-fun.nix} | 0 .../default.nix => unit/jo/josm/pkg-fun.nix} | 0 .../default.nix => unit/jo/jost/pkg-fun.nix} | 0 .../default.nix => unit/jo/jot/pkg-fun.nix} | 0 .../jo/jotta-cli/pkg-fun.nix} | 0 .../jo/journaldriver/pkg-fun.nix} | 0 .../default.nix => unit/jo/jove/pkg-fun.nix} | 0 .../jo/joycond/pkg-fun.nix} | 0 .../jo/joypixels/pkg-fun.nix} | 0 .../jo/joystickwake/pkg-fun.nix} | 0 .../jp/default.nix => unit/jp/jp/pkg-fun.nix} | 0 .../default.nix => unit/jp/jp2a/pkg-fun.nix} | 0 .../jp/jpeg-archive/pkg-fun.nix} | 0 .../jp/jpegexiforient/pkg-fun.nix} | 0 .../jp/jpeginfo/pkg-fun.nix} | 0 .../jp/jpegoptim/pkg-fun.nix} | 0 .../jp/jpegrescan/pkg-fun.nix} | 0 .../default.nix => unit/jp/jpexs/pkg-fun.nix} | 0 .../janet/jpm.nix => unit/jp/jpm/pkg-fun.nix} | 0 ...when-building-without-regex-supports.patch | 0 .../jq/default.nix => unit/jq/jq/pkg-fun.nix} | 0 .../default.nix => unit/jq/jql/pkg-fun.nix} | 0 .../default.nix => unit/jq/jqp/pkg-fun.nix} | 0 .../jq/jquake/pkg-fun.nix} | 0 .../default.nix => unit/jr/jrnl/pkg-fun.nix} | 0 .../jr/jrsonnet/pkg-fun.nix} | 0 .../default.nix => unit/js/jsawk/pkg-fun.nix} | 0 .../js}/jscoverage/jsfalse_to_null.patch | 0 .../js/jscoverage/pkg-fun.nix} | 0 .../tools => unit/js}/jsduck/Gemfile | 0 .../tools => unit/js}/jsduck/Gemfile.lock | 0 .../tools => unit/js}/jsduck/gemset.nix | 0 .../js/jsduck/pkg-fun.nix} | 0 .../default.nix => unit/js/jshon/pkg-fun.nix} | 0 ...on-add-installed-tests-prefix-option.patch | 0 .../js/json-glib/pkg-fun.nix} | 0 .../js/json-plot/pkg-fun.nix} | 0 .../js/json2hcl/pkg-fun.nix} | 0 .../js/json2tsv/pkg-fun.nix} | 0 .../js/json_c/pkg-fun.nix} | 0 .../js/jsoncpp/pkg-fun.nix} | 0 .../js/jsonnet-bundler/pkg-fun.nix} | 0 .../js/jsonnet-language-server/pkg-fun.nix} | 0 .../js/jsonnet/pkg-fun.nix} | 0 .../js/jsonrpc-glib/pkg-fun.nix} | 0 .../js/jstest-gtk/pkg-fun.nix} | 0 .../js/jsubfinder/pkg-fun.nix} | 0 .../default.nix => unit/js/jsvc/pkg-fun.nix} | 0 .../jt/jtag-remote-server/pkg-fun.nix} | 0 .../default.nix => unit/jt/jtc/pkg-fun.nix} | 0 .../jt/jtds_jdbc/pkg-fun.nix} | 0 .../ju/jucipp/pkg-fun.nix} | 0 .../libraries => unit/ju}/judy/cross.patch | 0 .../default.nix => unit/ju/judy/pkg-fun.nix} | 0 .../ju/jugglinglab/pkg-fun.nix} | 0 .../ju/juicefs/pkg-fun.nix} | 0 .../default.nix => unit/ju/juju/pkg-fun.nix} | 0 .../ju/jujuutils/pkg-fun.nix} | 0 .../ju/julia-mono/pkg-fun.nix} | 0 ...able-parallel-unit-tests-for-sandbox.patch | 0 .../ju/julia_16-bin/pkg-fun.nix} | 0 ...low-skipping-internet-required-tests.patch | 0 .../ju/julia_18-bin/pkg-fun.nix} | 0 .../ju/julius/pkg-fun.nix} | 0 ...001-Exclude-all-tests-from-the-build.patch | 0 .../ju/jumanpp/pkg-fun.nix} | 0 .../default.nix => unit/ju/jump/pkg-fun.nix} | 0 .../ju/jumpapp/pkg-fun.nix} | 0 .../ju/jumpnbump/pkg-fun.nix} | 0 .../default.nix => unit/ju/jumpy/pkg-fun.nix} | 0 .../ju/junction/pkg-fun.nix} | 0 .../ju/junicode/pkg-fun.nix} | 0 .../ju/juniper/pkg-fun.nix} | 0 .../ju/junkie/pkg-fun.nix} | 0 .../ju/juno-theme/pkg-fun.nix} | 0 .../default.nix => unit/ju/jupp/pkg-fun.nix} | 0 .../ju/jupyter-kernel/pkg-fun.nix} | 0 .../ju/jupyter/pkg-fun.nix} | 0 .../default.nix => unit/ju/jush/pkg-fun.nix} | 0 .../default.nix => unit/ju/just/pkg-fun.nix} | 0 .../ju/justify/pkg-fun.nix} | 0 .../default.nix => unit/jw/jwasm/pkg-fun.nix} | 0 .../jw}/jwhois/connect.patch | 0 .../jw/jwhois/pkg-fun.nix} | 0 .../jw}/jwhois/service-name.patch | 0 .../jw/jwm-settings-manager/pkg-fun.nix} | 0 .../default.nix => unit/jw/jwm/pkg-fun.nix} | 0 .../jw/jwt-hack/pkg-fun.nix} | 0 .../default.nix => unit/jw/jwx/pkg-fun.nix} | 0 .../jx/default.nix => unit/jx/jx/pkg-fun.nix} | 0 .../jx/jxrlib/pkg-fun.nix} | 0 .../jy/jython/pkg-fun.nix} | 0 .../k0/k0sctl/pkg-fun.nix} | 0 .../k2}/k2pdfopt/0001-Fix-CMakeLists.patch | 0 .../k2/k2pdfopt/pkg-fun.nix} | 0 .../default.nix => unit/k2/k2tf/pkg-fun.nix} | 0 .../k3}/k3s/chart-versions.nix | 0 .../default.nix => unit/k3/k3s/pkg-fun.nix} | 0 .../cluster => unit/k3}/k3s/update.sh | 0 .../default.nix => unit/k3/k3sup/pkg-fun.nix} | 0 .../k4/k40-whisperer/pkg-fun.nix} | 0 .../k6/default.nix => unit/k6/k6/pkg-fun.nix} | 0 .../default.nix => unit/k9/k9s/pkg-fun.nix} | 0 .../ka/kabeljau/pkg-fun.nix} | 0 .../default.nix => unit/ka/kacst/pkg-fun.nix} | 0 .../default.nix => unit/ka/kaf/pkg-fun.nix} | 0 .../ka/kafka-delta-ingest/pkg-fun.nix} | 0 .../ka/kafkactl/pkg-fun.nix} | 0 .../default.nix => unit/ka/kail/pkg-fun.nix} | 0 .../ka/kaitai-struct-compiler/pkg-fun.nix} | 0 .../ka/kakasi/pkg-fun.nix} | 0 .../ka/kakouneUtils}/build-kakoune-plugin.nix | 0 .../ka/kakouneUtils/pkg-fun.nix} | 0 .../ka/kalibrate-hackrf/pkg-fun.nix} | 0 .../ka/kalibrate-rtl/pkg-fun.nix} | 0 .../ka/kalker/pkg-fun.nix} | 0 .../default.nix => unit/ka/kamid/pkg-fun.nix} | 0 .../ka/kanata/pkg-fun.nix} | 0 .../ka/kanboard/pkg-fun.nix} | 0 .../ka/kanidm/pkg-fun.nix} | 0 .../default.nix => unit/ka/kanif/pkg-fun.nix} | 0 .../ka/kanit-font/pkg-fun.nix} | 0 .../ka/kanji-stroke-order-font/pkg-fun.nix} | 0 .../ka/kanjidraw/pkg-fun.nix} | 0 .../ka/kanshi/pkg-fun.nix} | 0 .../ka/kapacitor/pkg-fun.nix} | 0 .../ka/kapitonov-plugins-pack/pkg-fun.nix} | 0 .../ka/kapowbang/pkg-fun.nix} | 0 .../default.nix => unit/ka/kapp/pkg-fun.nix} | 0 .../ka/kappanhang/pkg-fun.nix} | 0 .../ka/karabiner-elements/pkg-fun.nix} | 0 .../ka/karate/pkg-fun.nix} | 0 .../default.nix => unit/ka/kargo/pkg-fun.nix} | 0 .../ka/karlender/pkg-fun.nix} | 0 .../ka}/karma/node-composition.nix | 0 .../web/newman => unit/ka/karma}/node-env.nix | 0 .../ka}/karma/node-packages.nix | 0 .../default.nix => unit/ka/karma/pkg-fun.nix} | 0 .../ka/karmor/pkg-fun.nix} | 0 .../ka/kasmweb/pkg-fun.nix} | 0 .../ka/katago/pkg-fun.nix} | 0 .../ka/katana/pkg-fun.nix} | 0 .../default.nix => unit/ka/kati/pkg-fun.nix} | 0 .../ka}/kati/version.patch | 0 .../ka/katriawm/pkg-fun.nix} | 0 .../ka/kawkab-mono-font/pkg-fun.nix} | 0 .../video => unit/ka}/kazam/fix-paths.patch | 0 .../default.nix => unit/ka/kazam/pkg-fun.nix} | 0 .../default.nix => unit/kb/kbd/pkg-fun.nix} | 0 .../linux => unit/kb}/kbd/search-paths.patch | 0 .../default.nix => unit/kb/kbdd/pkg-fun.nix} | 0 .../kb/kbdlight/pkg-fun.nix} | 0 .../kbfs.nix => unit/kb/kbfs/pkg-fun.nix} | 0 .../default.nix => unit/kb/kbst/pkg-fun.nix} | 0 .../default.nix => unit/kc/kcat/pkg-fun.nix} | 0 .../default.nix => unit/kc/kcgi/pkg-fun.nix} | 0 .../default.nix => unit/kc/kcli/pkg-fun.nix} | 0 .../default.nix => unit/kc/kconf/pkg-fun.nix} | 0 .../default.nix => unit/kc/kcov/pkg-fun.nix} | 0 .../kd/kde-gruvbox/pkg-fun.nix} | 0 .../kd/kdigger/pkg-fun.nix} | 0 .../ke}/kea/dont-create-var.patch | 0 .../default.nix => unit/ke/kea/pkg-fun.nix} | 0 .../default.nix => unit/ke/keen4/pkg-fun.nix} | 0 .../ke/keepalived/pkg-fun.nix} | 0 .../ke/keepass-charactercopy/pkg-fun.nix} | 0 .../ke/keepass-diff/pkg-fun.nix} | 0 .../ke/keepass-keeagent/pkg-fun.nix} | 0 .../ke/keepass-keepasshttp/pkg-fun.nix} | 0 .../ke/keepass-keepassrpc/pkg-fun.nix} | 0 .../ke/keepass-keetraytotp/pkg-fun.nix} | 0 .../ke/keepass-otpkeyprov/pkg-fun.nix} | 0 .../ke/keepass-qrcodeview/pkg-fun.nix} | 0 .../extractWinRscIconsToStdFreeDesktopDir.sh | 0 .../misc => unit/ke}/keepass/fix-paths.patch | 0 .../ke}/keepass/keepass-plugins-load.patch | 0 .../ke}/keepass/keepass-plugins.patch | 0 .../ke/keepass/pkg-fun.nix} | 0 .../ke/keepassx/pkg-fun.nix} | 0 .../misc => unit/ke}/keepassx/random.patch | 0 .../2.0.nix => unit/ke/keepassx2/pkg-fun.nix} | 0 .../ke/keeperrl/pkg-fun.nix} | 0 .../ke/keepmenu/pkg-fun.nix} | 0 .../default.nix => unit/ke/keet/pkg-fun.nix} | 0 .../ke/keeweb/pkg-fun.nix} | 0 .../default.nix => unit/ke/kent/pkg-fun.nix} | 0 .../ke/kepubify/pkg-fun.nix} | 0 .../ke/kerbrute/pkg-fun.nix} | 0 .../ke/kermit-terminal/pkg-fun.nix} | 0 .../ke/kermit/pkg-fun.nix} | 0 .../ke/kestrel/pkg-fun.nix} | 0 .../ke/kexec-tools/pkg-fun.nix} | 0 .../default.nix => unit/ke/key/pkg-fun.nix} | 0 .../ke/keybase-gui/pkg-fun.nix} | 0 .../ke/keycard-cli/pkg-fun.nix} | 0 .../ke/keychain/pkg-fun.nix} | 0 .../ke}/keycloak/all-plugins.nix | 0 .../ke}/keycloak/config_vars.patch | 0 .../ke}/keycloak/keycloak-discord/default.nix | 0 .../keycloak/keycloak-metrics-spi/default.nix | 0 .../ke/keycloak/pkg-fun.nix} | 0 .../keycloak/scim-for-keycloak/default.nix | 0 .../default.nix | 0 .../default.nix => unit/ke/keyd/pkg-fun.nix} | 0 .../ke/keyfinder-cli/pkg-fun.nix} | 0 .../ke/keyfuzz/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../ke/keymapviz/pkg-fun.nix} | 0 .../ke/keynav/pkg-fun.nix} | 0 .../ke/keystone/pkg-fun.nix} | 0 ...0001-Remove-unused-function-after_eq.patch | 0 .../ke}/keyutils/conf-symlink.patch | 0 .../ke/keyutils/pkg-fun.nix} | 0 .../default.nix => unit/kf/kfctl/pkg-fun.nix} | 0 .../default.nix => unit/kh/khal/pkg-fun.nix} | 0 .../default.nix => unit/kh/khard/pkg-fun.nix} | 0 .../kh/khmeros/pkg-fun.nix} | 0 .../kh/khronos-ocl-icd-loader/pkg-fun.nix} | 0 .../kh}/khronos-ocl-icd-loader/tracing.patch | 0 .../kh/khronos/pkg-fun.nix} | 0 .../disable-nodejs-version-check-7.patch | 0 .../disable-nodejs-version-check.patch | 0 .../7.x.nix => unit/ki/kibana7/pkg-fun.nix} | 0 .../default.nix => unit/ki/kibi/pkg-fun.nix} | 0 .../electronics => unit/ki}/kicad/base.nix | 0 .../ki}/kicad/libraries.nix | 0 .../default.nix => unit/ki/kicad/pkg-fun.nix} | 0 .../electronics => unit/ki}/kicad/update.sh | 0 .../ki}/kicad/versions.nix | 0 .../ki}/kicad/writable.patch | 0 .../default.nix => unit/ki/kics/pkg-fun.nix} | 0 .../ki/kile-wl/pkg-fun.nix} | 0 .../default.nix => unit/ki/kiln/pkg-fun.nix} | 0 .../default.nix => unit/ki/kime/pkg-fun.nix} | 0 .../ki}/kind/kernel-module-path.patch | 0 .../default.nix => unit/ki/kind/pkg-fun.nix} | 0 .../libusb-1-import-path.patch | 0 .../ki/kinect-audio-setup/pkg-fun.nix} | 0 .../udev-rules-extra-devices.patch | 0 .../default.nix => unit/ki/kirc/pkg-fun.nix} | 0 .../ki/kismet/pkg-fun.nix} | 0 .../ki/kissat/pkg-fun.nix} | 0 .../ki}/kissat/writable-passwd-is-ok.patch | 0 .../ki}/kissfft/0001-pkgconfig-darwin.patch | 0 .../ki/kissfft/pkg-fun.nix} | 0 .../ki/kisslicer/pkg-fun.nix} | 0 .../ki/kiterunner/pkg-fun.nix} | 0 .../ki/kitty-themes/pkg-fun.nix} | 0 .../ki/kiwix-tools/pkg-fun.nix} | 0 .../default.nix => unit/kj/kjv/pkg-fun.nix} | 0 pkgs/{games => unit/kl}/klavaro/icons.patch | 0 .../kl/klavaro/pkg-fun.nix} | 0 .../kl}/klavaro/trans_lang_get_similar.patch | 0 .../klibc/no-reinstall-kernel-headers.patch | 0 .../default.nix => unit/kl/klibc/pkg-fun.nix} | 0 .../default.nix => unit/kl/klick/pkg-fun.nix} | 0 .../kl/klipper-genconf/pkg-fun.nix} | 0 .../kl/klipper/pkg-fun.nix} | 0 .../kl/kluctl/pkg-fun.nix} | 0 .../kl/klystrack/pkg-fun.nix} | 0 .../km/kmod-blacklist-ubuntu/pkg-fun.nix} | 0 .../km/kmod-debian-aliases/pkg-fun.nix} | 0 .../km}/kmod/enable-static.patch | 0 .../linux => unit/km}/kmod/module-dir.patch | 0 .../default.nix => unit/km/kmod/pkg-fun.nix} | 0 .../default.nix => unit/km/kmon/pkg-fun.nix} | 0 .../km/kmscon/pkg-fun.nix} | 0 .../km/kmscube/pkg-fun.nix} | 0 .../default.nix => unit/km/kmsxx/pkg-fun.nix} | 0 .../kn/default.nix => unit/kn/kn/pkg-fun.nix} | 0 .../kn/knightos-genkfs/pkg-fun.nix} | 0 .../kn/knightos-kcc/pkg-fun.nix} | 0 .../kn/knightos-kimg/pkg-fun.nix} | 0 .../kn/knightos-kpack/pkg-fun.nix} | 0 .../kn/knightos-mkrom/pkg-fun.nix} | 0 .../kn/knightos-mktiupgrade/pkg-fun.nix} | 0 .../kn/knightos-patchrom/pkg-fun.nix} | 0 .../kn/knightos-scas/pkg-fun.nix} | 0 .../kn/knightos-z80e/pkg-fun.nix} | 0 .../kn/knockpy/pkg-fun.nix} | 0 .../knot-dns/dont-create-run-time-dirs.patch | 0 .../kn/knot-dns/pkg-fun.nix} | 0 .../kn}/knot-dns/runtime-deps.patch | 0 .../ko/default.nix => unit/ko/ko/pkg-fun.nix} | 0 .../ko}/kobodeluxe/glibc29.patch | 0 .../ko/kobodeluxe/pkg-fun.nix} | 0 .../ko/kochi-substitute-naga10/pkg-fun.nix} | 0 .../ko/kochi-substitute/pkg-fun.nix} | 0 .../ko/kodi-cli/pkg-fun.nix} | 0 .../default.nix => unit/ko/komga/pkg-fun.nix} | 0 .../ko/kompose/pkg-fun.nix} | 0 .../default.nix => unit/ko/kona/pkg-fun.nix} | 0 .../default.nix => unit/ko/kondo/pkg-fun.nix} | 0 .../default.nix => unit/ko/konf/pkg-fun.nix} | 0 .../ko/konstraint/pkg-fun.nix} | 0 .../cluster => unit/ko}/kontemplate/deps.nix | 0 .../ko/kontemplate/pkg-fun.nix} | 0 .../default.nix => unit/ko/kooha/pkg-fun.nix} | 0 .../default.nix => unit/ko/kopia/pkg-fun.nix} | 0 .../ko/koreader/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../ko/kotlin-language-server/pkg-fun.nix} | 0 .../ko/kotlin-native/pkg-fun.nix} | 0 .../ko/kotlin/pkg-fun.nix} | 0 .../ko/koules/pkg-fun.nix} | 0 .../default.nix => unit/kp/kpcli/pkg-fun.nix} | 0 .../default.nix => unit/kp/kpt/pkg-fun.nix} | 0 .../kr/krakenx/pkg-fun.nix} | 0 .../kr}/kramdown-asciidoc/Gemfile | 0 .../kr}/kramdown-asciidoc/Gemfile.lock | 0 .../kr}/kramdown-asciidoc/gemset.nix | 0 .../kr/kramdown-asciidoc/pkg-fun.nix} | 0 .../cluster => unit/kr}/krane/Gemfile | 0 .../cluster => unit/kr}/krane/Gemfile.lock | 0 .../cluster => unit/kr}/krane/gemset.nix | 0 .../default.nix => unit/kr/krane/pkg-fun.nix} | 0 .../kr/krankerl/pkg-fun.nix} | 0 .../kr/krapslog/pkg-fun.nix} | 0 .../kr/kratos/pkg-fun.nix} | 0 .../kr/kreative-square-fonts/pkg-fun.nix} | 0 .../kr/krelay/pkg-fun.nix} | 0 .../default.nix => unit/kr/krew/pkg-fun.nix} | 0 .../kr/kronosnet/pkg-fun.nix} | 0 .../default.nix => unit/kr/krop/pkg-fun.nix} | 0 .../default.nix => unit/ks/ksh/pkg-fun.nix} | 0 .../ks/ksmbd-tools/pkg-fun.nix} | 0 .../default.nix => unit/ks/kssd/pkg-fun.nix} | 0 .../ks/ksuperkey/pkg-fun.nix} | 0 .../kt/default.nix => unit/kt/kt/pkg-fun.nix} | 0 .../kt/kthxbye/pkg-fun.nix} | 0 .../kt/ktlint/pkg-fun.nix} | 0 .../kt/ktunnel/pkg-fun.nix} | 0 .../ku/kube-bench/pkg-fun.nix} | 0 .../ku/kube-capacity/pkg-fun.nix} | 0 .../ku/kube-hunter/pkg-fun.nix} | 0 .../ku/kube-linter/pkg-fun.nix} | 0 .../ku/kube-prompt/pkg-fun.nix} | 0 .../ku/kube-router/pkg-fun.nix} | 0 .../ku/kube-score/pkg-fun.nix} | 0 .../ku/kubeaudit/pkg-fun.nix} | 0 .../ku/kubebuilder/pkg-fun.nix} | 0 .../ku/kubecfg/pkg-fun.nix} | 0 .../ku/kubecolor/pkg-fun.nix} | 0 .../ku/kubeconform/pkg-fun.nix} | 0 .../ku/kubectl-doctor/pkg-fun.nix} | 0 .../ku/kubectl-evict-pod/pkg-fun.nix} | 0 .../ku/kubectl-example/pkg-fun.nix} | 0 .../ku/kubectl-images/pkg-fun.nix} | 0 .../ku/kubectl-node-shell/pkg-fun.nix} | 0 .../ku/kubectl-tree/pkg-fun.nix} | 0 .../ku/kubectl/pkg-fun.nix} | 0 .../ku}/kubectx/bump-golang-x-sys.patch | 0 .../ku/kubectx/pkg-fun.nix} | 0 .../ku/kubedb-cli/pkg-fun.nix} | 0 .../ku/kubedog/pkg-fun.nix} | 0 .../default.nix => unit/ku/kubei/pkg-fun.nix} | 0 .../ku/kubelogin-oidc/pkg-fun.nix} | 0 .../ku/kubelogin/pkg-fun.nix} | 0 .../ku/kubemq-community/pkg-fun.nix} | 0 .../ku/kubemqctl/pkg-fun.nix} | 0 .../ku/kubent/pkg-fun.nix} | 0 .../ku/kubeone/pkg-fun.nix} | 0 .../ku/kubeprompt/pkg-fun.nix} | 0 .../ku/kubepug/pkg-fun.nix} | 0 .../kubepug/skip-external-network-tests.patch | 0 .../ku/kubergrunt/pkg-fun.nix} | 0 .../ku/kubernetes-code-generator/pkg-fun.nix} | 0 .../kubernetes-controller-tools/pkg-fun.nix} | 0 .../kubernetes-controller-tools/version.patch | 0 .../ku/kubernetes-helm/pkg-fun.nix} | 0 .../fixup-addonmanager-lib-path.patch | 0 .../ku/kubernetes/pkg-fun.nix} | 0 .../ku/kubernix/pkg-fun.nix} | 0 .../ku/kubescape/pkg-fun.nix} | 0 .../ku/kubeseal/pkg-fun.nix} | 0 .../ku/kubesec/pkg-fun.nix} | 0 .../ku/kubespy/pkg-fun.nix} | 0 .../ku/kubeswitch/pkg-fun.nix} | 0 .../ku/kubetail/pkg-fun.nix} | 0 .../ku/kubeval-schema/pkg-fun.nix} | 0 .../ku/kubeval/pkg-fun.nix} | 0 .../ku/kubevirt/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../ku/kubo-migrator-unwrapped/pkg-fun.nix} | 0 .../ku/kubo-migrator/pkg-fun.nix} | 0 .../default.nix => unit/ku/kubo/pkg-fun.nix} | 0 .../ku/kupfer/pkg-fun.nix} | 0 .../ku/kustomize-sops/pkg-fun.nix} | 0 .../ku/kustomize/pkg-fun.nix} | 0 .../3.nix => unit/ku/kustomize_3/pkg-fun.nix} | 0 .../default.nix => unit/ku/kuttl/pkg-fun.nix} | 0 .../kv/kvmtool/pkg-fun.nix} | 0 .../default.nix => unit/kw/kwakd/pkg-fun.nix} | 0 .../kw}/kwm/org.nixos.kwm.plist | 0 .../default.nix => unit/kw/kwm/pkg-fun.nix} | 0 .../ky/kyotocabinet/pkg-fun.nix} | 0 .../text => unit/ky}/kytea/gcc-O3.patch | 0 .../default.nix => unit/ky/kytea/pkg-fun.nix} | 0 .../default.nix => unit/ky/kythe/pkg-fun.nix} | 0 .../ky/kyverno/pkg-fun.nix} | 0 .../default.nix => unit/l2/l2md/pkg-fun.nix} | 0 .../l3/l3afpad/pkg-fun.nix} | 0 .../la}/LAStools/drop-64-suffix.patch | 0 .../la/LAStools/pkg-fun.nix} | 0 .../la/LASzip/pkg-fun.nix} | 0 .../la/LASzip2/pkg-fun.nix} | 0 .../default.nix => unit/la/lab/pkg-fun.nix} | 0 .../la/labelImg/pkg-fun.nix} | 0 .../default.nix => unit/la/labwc/pkg-fun.nix} | 0 .../la/ladspa-sdk/pkg-fun.nix} | 0 .../la/ladspaH/pkg-fun.nix} | 0 .../la/lalezar-fonts/pkg-fun.nix} | 0 .../la/lambda-delta/pkg-fun.nix} | 0 .../la/lambda-mod-zsh-theme/pkg-fun.nix} | 0 .../default.nix => unit/la/lame/pkg-fun.nix} | 0 .../la}/laminar/patches/no-network.patch | 0 .../la/laminar/pkg-fun.nix} | 0 .../la/languagetool/pkg-fun.nix} | 0 .../default.nix => unit/la/lao/pkg-fun.nix} | 0 .../la/lapack-reference/pkg-fun.nix} | 0 .../la/lapack/pkg-fun.nix} | 0 .../la/larswm/pkg-fun.nix} | 0 .../la/larynx/pkg-fun.nix} | 0 .../default.nix => unit/la/lasem/pkg-fun.nix} | 0 .../audio => unit/la}/lash/gcc-47.patch | 0 .../default.nix => unit/la/lash/pkg-fun.nix} | 0 .../audio => unit/la}/lash/socket.patch | 0 .../default.nix => unit/la/lasso/pkg-fun.nix} | 0 .../la/last-resort/pkg-fun.nix} | 0 .../default.nix => unit/la/last/pkg-fun.nix} | 0 .../la/lastpass-cli/pkg-fun.nix} | 0 .../la/latencytop/pkg-fun.nix} | 0 .../la/latex2html/pkg-fun.nix} | 0 .../la/latexrun/pkg-fun.nix} | 0 .../default.nix => unit/la/lato/pkg-fun.nix} | 0 .../la/latte-integrale/pkg-fun.nix} | 0 .../la/lattice-diamond/pkg-fun.nix} | 0 .../la/lavalauncher/pkg-fun.nix} | 0 .../la/layan-gtk-theme/pkg-fun.nix} | 0 .../la/layan-kde/pkg-fun.nix} | 0 .../la/lazpaint/pkg-fun.nix} | 0 .../la/lazycli/pkg-fun.nix} | 0 .../la/lazydocker/pkg-fun.nix} | 0 .../la/lazygit/pkg-fun.nix} | 0 .../lb}/lbdb/add-methods-to-rc.patch | 0 .../default.nix => unit/lb/lbdb/pkg-fun.nix} | 0 .../lb/lbreakout2/pkg-fun.nix} | 0 .../lb/lbreakouthd/pkg-fun.nix} | 0 .../default.nix => unit/lb/lbry/pkg-fun.nix} | 0 .../lb/lbzip2/pkg-fun.nix} | 0 .../lc}/lc3tools/0001-mangle-configure.patch | 0 .../lc}/lc3tools/0002-lc3os-path.patch | 0 .../lc}/lc3tools/0003-lc3sim-tk-path.patch | 0 .../lc}/lc3tools/0004-configure-use-cc.patch | 0 .../lc/lc3tools/pkg-fun.nix} | 0 .../default.nix => unit/lc/lcalc/pkg-fun.nix} | 0 .../lc/lcdf-typetools/pkg-fun.nix} | 0 .../lc}/lcdproc/hardcode_mtab.patch | 0 .../lc/lcdproc/pkg-fun.nix} | 0 .../default.nix => unit/lc/lci/pkg-fun.nix} | 0 .../default.nix => unit/lc/lcm/pkg-fun.nix} | 0 .../lc/lcms1}/cve-2013-4276.patch | 0 .../default.nix => unit/lc/lcms1/pkg-fun.nix} | 0 .../default.nix => unit/lc/lcms2/pkg-fun.nix} | 0 .../default.nix => unit/lc/lcov/pkg-fun.nix} | 0 .../ld/ldacbt/pkg-fun.nix} | 0 .../ld/ldapmonitor/pkg-fun.nix} | 0 .../ld/ldapnomnom/pkg-fun.nix} | 0 .../ld/ldapvi/pkg-fun.nix} | 0 .../default.nix => unit/ld/ldb/pkg-fun.nix} | 0 .../compilers => unit/ld}/ldc/binary.nix | 0 .../compilers => unit/ld}/ldc/bootstrap.nix | 0 .../compilers => unit/ld}/ldc/generic.nix | 0 .../default.nix => unit/ld/ldc/pkg-fun.nix} | 0 .../default.nix => unit/ld/ldm/pkg-fun.nix} | 0 .../ld/ldmtool/pkg-fun.nix} | 0 .../default.nix => unit/ld/ldns/pkg-fun.nix} | 0 .../default.nix => unit/ld/ldtk/pkg-fun.nix} | 0 .../le/leafnode/pkg-fun.nix} | 0 .../le/leafpad/pkg-fun.nix} | 0 .../le}/league-of-moveable-type/fonts.nix | 0 .../le/league-of-moveable-type/pkg-fun.nix} | 0 .../le}/league-of-moveable-type/update.sh | 0 .../default.nix => unit/le/lean/pkg-fun.nix} | 0 .../default.nix => unit/le/lean2/pkg-fun.nix} | 0 .../default.nix => unit/le/leaps/pkg-fun.nix} | 0 .../le/leatherman/pkg-fun.nix} | 0 .../le/ledger-autosync/pkg-fun.nix} | 0 .../le/ledger-live-desktop/pkg-fun.nix} | 0 .../le/ledger-udev-rules/pkg-fun.nix} | 0 .../office => unit/le}/ledger-web/Gemfile | 0 .../le}/ledger-web/Gemfile.lock | 0 .../office => unit/le}/ledger-web/gemset.nix | 0 .../le/ledger-web/pkg-fun.nix} | 0 .../le/ledger/pkg-fun.nix} | 0 .../le/ledger2beancount/pkg-fun.nix} | 0 .../le/ledmon/pkg-fun.nix} | 0 .../default.nix => unit/le/leela/pkg-fun.nix} | 0 .../le/leetcode-cli/pkg-fun.nix} | 0 .../le/left4gore-bin/pkg-fun.nix} | 0 .../le/lefthook/pkg-fun.nix} | 0 .../le/leftwm/pkg-fun.nix} | 0 .../default.nix => unit/le/legit/pkg-fun.nix} | 0 .../le/legitify/pkg-fun.nix} | 0 .../default.nix => unit/le/lego/pkg-fun.nix} | 0 .../le/leiningen/pkg-fun.nix} | 0 .../le/lemmeknow/pkg-fun.nix} | 0 .../le/lemmy-help/pkg-fun.nix} | 0 .../default.nix => unit/le/lemon/pkg-fun.nix} | 0 .../le/lemonade/pkg-fun.nix} | 0 .../le/lemonbar-xft/pkg-fun.nix} | 0 .../le/lemonbar/pkg-fun.nix} | 0 .../le/lenmus/pkg-fun.nix} | 0 .../default.nix => unit/le/lens/pkg-fun.nix} | 0 .../le/lensfun/pkg-fun.nix} | 0 .../le/leo3-bin/pkg-fun.nix} | 0 .../le/lepton-eda/pkg-fun.nix} | 0 .../le/lepton/pkg-fun.nix} | 0 .../le/leptonica/pkg-fun.nix} | 0 .../default.nix => unit/le/lerc/pkg-fun.nix} | 0 .../default.nix => unit/le/less/pkg-fun.nix} | 0 .../le/lesspass-cli/pkg-fun.nix} | 0 .../le/lesspipe/pkg-fun.nix} | 0 .../le}/lesstif/c-missing_xm_h.patch | 0 .../le}/lesstif/c-render_table_crash.patch | 0 .../le}/lesstif/c-xpmpipethrough.patch | 0 .../le/lesstif/pkg-fun.nix} | 0 .../le/levant/pkg-fun.nix} | 0 .../le/level-zero/pkg-fun.nix} | 0 .../le/leveldb/pkg-fun.nix} | 0 .../le/levmar/pkg-fun.nix} | 0 .../le/lexend/pkg-fun.nix} | 0 .../le/lexicon/pkg-fun.nix} | 0 .../lf/default.nix => unit/lf/lf/pkg-fun.nix} | 0 .../default.nix => unit/lf/lfs/pkg-fun.nix} | 0 .../default.nix => unit/lf/lftp/pkg-fun.nix} | 0 .../lg/lguf-brightness/pkg-fun.nix} | 0 .../default.nix => unit/lh/lha/pkg-fun.nix} | 0 .../default.nix => unit/lh/lhasa/pkg-fun.nix} | 0 .../li/LibreArp-lv2/pkg-fun.nix} | 0 .../li/LibreArp/pkg-fun.nix} | 0 .../li/Literate/pkg-fun.nix} | 0 .../li/lib2geom/pkg-fun.nix} | 0 .../li/lib3ds/pkg-fun.nix} | 0 .../li/lib3mf/pkg-fun.nix} | 0 .../li/libAfterImage/pkg-fun.nix} | 0 .../default.nix => unit/li/libHX/pkg-fun.nix} | 0 .../li/libaacs/pkg-fun.nix} | 0 .../li}/libaal/libaal-1.0.6-glibc-2.26.patch | 0 .../li/libaal/pkg-fun.nix} | 0 .../li/libabigail/pkg-fun.nix} | 0 .../li/libabw/pkg-fun.nix} | 0 .../li/libaccounts-glib/pkg-fun.nix} | 0 .../li}/libaccounts-glib/py-override.patch | 0 .../li/libad9361/pkg-fun.nix} | 0 .../li/libaec/pkg-fun.nix} | 0 .../li/libaio/pkg-fun.nix} | 0 .../li/libajantv2/pkg-fun.nix} | 0 .../libamplsolver-sharedlib.patch | 0 .../li/libamplsolver/pkg-fun.nix} | 0 .../li}/libamqpcpp/libamqpcpp-darwin.patch | 0 .../li/libamqpcpp/pkg-fun.nix} | 0 .../li/libantlr3c/pkg-fun.nix} | 0 .../li/libaosd/pkg-fun.nix} | 0 .../li/libappindicator/pkg-fun.nix} | 0 .../li/libarchive/pkg-fun.nix} | 0 .../li/libargon2/pkg-fun.nix} | 0 .../li/libargs/pkg-fun.nix} | 0 .../li/libasr/pkg-fun.nix} | 0 .../li/libass/pkg-fun.nix} | 0 .../li/libassuan/pkg-fun.nix} | 0 .../li/libast/pkg-fun.nix} | 0 .../li/libasyncns/pkg-fun.nix} | 0 .../li/libatasmart/pkg-fun.nix} | 0 .../li/libatomic_ops/pkg-fun.nix} | 0 .../li/libaudclient/pkg-fun.nix} | 0 .../li/libaudec/pkg-fun.nix} | 0 .../li/libavc1394/pkg-fun.nix} | 0 .../li/libavif/pkg-fun.nix} | 0 .../li/libax25/pkg-fun.nix} | 0 .../li/libayatana-appindicator/pkg-fun.nix} | 0 .../li/libayatana-indicator/pkg-fun.nix} | 0 .../default.nix => unit/li/libb2/pkg-fun.nix} | 0 .../li/libb64/pkg-fun.nix} | 0 .../li/libbacktrace/pkg-fun.nix} | 0 .../li/libbaseencode/pkg-fun.nix} | 0 .../li/libbde/pkg-fun.nix} | 0 .../li/libbdplus/pkg-fun.nix} | 0 .../li/libbladeRF/pkg-fun.nix} | 0 .../li}/libblockdev/fix-paths.patch | 0 .../li/libblockdev/pkg-fun.nix} | 0 .../li/libblocksruntime/pkg-fun.nix} | 0 .../li/libbpf/pkg-fun.nix} | 0 .../0.x.nix => unit/li/libbpf_0/pkg-fun.nix} | 0 .../li/libbpkg/pkg-fun.nix} | 0 .../li/libbraiding/pkg-fun.nix} | 0 .../li/libbs2b/pkg-fun.nix} | 0 .../libraries => unit/li}/libbsd/darwin.patch | 0 .../li/libbsd/pkg-fun.nix} | 0 .../li/libbson/pkg-fun.nix} | 0 .../li/libburn/pkg-fun.nix} | 0 .../li/libbytesize/pkg-fun.nix} | 0 .../li/libcaca/pkg-fun.nix} | 0 .../li/libcacard/pkg-fun.nix} | 0 .../li/libcamera/pkg-fun.nix} | 0 .../li/libcangjie/pkg-fun.nix} | 0 .../li/libcap/pkg-fun.nix} | 0 .../li/libcap_ng/pkg-fun.nix} | 0 .../li/libcardiacarrest/pkg-fun.nix} | 0 .../li/libcbor/pkg-fun.nix} | 0 .../li/libccd/pkg-fun.nix} | 0 .../li/libcdada/pkg-fun.nix} | 0 .../li/libcdaudio/pkg-fun.nix} | 0 .../li/libcddb/pkg-fun.nix} | 0 .../li/libcec/pkg-fun.nix} | 0 .../li/libcec_platform/pkg-fun.nix} | 0 .../li/libcef/pkg-fun.nix} | 0 .../libraries => unit/li}/libcef/update.sh | 0 .../li/libcello/pkg-fun.nix} | 0 .../li/libcerf/pkg-fun.nix} | 0 .../li/libcgroup/pkg-fun.nix} | 0 .../li/libchamplain/pkg-fun.nix} | 0 .../li/libchardet/pkg-fun.nix} | 0 .../li/libchewing/pkg-fun.nix} | 0 ...ion-when-using-libtirpc-rather-than-.patch | 0 .../li}/libchop/gets-undeclared.patch | 0 .../li/libchop/pkg-fun.nix} | 0 .../li}/libchop/size_t.patch | 0 .../li/libcifpp/pkg-fun.nix} | 0 .../li/libcint/pkg-fun.nix} | 0 .../default.nix => unit/li/libck/pkg-fun.nix} | 0 .../li/libcli/pkg-fun.nix} | 0 .../li/libcloudproviders/pkg-fun.nix} | 0 .../li/libclthreads/pkg-fun.nix} | 0 .../li/libclxclient/pkg-fun.nix} | 0 .../li/libcmis/pkg-fun.nix} | 0 .../li/libcollectdclient/pkg-fun.nix} | 0 .../li/libconfig/pkg-fun.nix} | 0 .../li/libconfuse/pkg-fun.nix} | 0 .../li/libcork/pkg-fun.nix} | 0 .../li/libcotp/pkg-fun.nix} | 0 .../li/libcouchbase/pkg-fun.nix} | 0 .../li/libcpuid/pkg-fun.nix} | 0 .../li/libcrafter/pkg-fun.nix} | 0 .../li/libcredis/pkg-fun.nix} | 0 .../li/libcrossguid/pkg-fun.nix} | 0 .../li/libcsptr/pkg-fun.nix} | 0 .../li}/libctb/include-kbhit.patch | 0 .../li/libctb/pkg-fun.nix} | 0 .../li/libctemplate/pkg-fun.nix} | 0 .../li/libctl/pkg-fun.nix} | 0 .../li/libcue/pkg-fun.nix} | 0 .../li/libcutl/pkg-fun.nix} | 0 .../li/libcyaml/pkg-fun.nix} | 0 .../li}/libdaemon/fix-includes.patch | 0 .../li/libdaemon/pkg-fun.nix} | 0 .../libdatovka-deprecated-fn-curl.patch | 0 .../li/libdatovka/pkg-fun.nix} | 0 .../li/libdatrie/pkg-fun.nix} | 0 .../li/libdazzle/pkg-fun.nix} | 0 .../li/libdbi/pkg-fun.nix} | 0 .../li/libdbiDrivers/pkg-fun.nix} | 0 .../li/libdbusmenu/pkg-fun.nix} | 0 .../li/libde265/pkg-fun.nix} | 0 .../li/libdecor/pkg-fun.nix} | 0 .../li/libdeflate/pkg-fun.nix} | 0 .../li/libdigidocpp/pkg-fun.nix} | 0 .../li/libdiscid/pkg-fun.nix} | 0 .../li/libdislocator/pkg-fun.nix} | 0 .../li/libdivecomputer/pkg-fun.nix} | 0 .../li/libdivsufsort/pkg-fun.nix} | 0 .../li/libdmapsharing/pkg-fun.nix} | 0 .../li/libdmtx/pkg-fun.nix} | 0 .../li/libdnet/pkg-fun.nix} | 0 .../li/libdnf/pkg-fun.nix} | 0 .../li/libdrm/pkg-fun.nix} | 0 .../li/libdsk/pkg-fun.nix} | 0 .../default.nix => unit/li/libdv/pkg-fun.nix} | 0 .../li/libdvbcsa/pkg-fun.nix} | 0 .../li/libdvbpsi/pkg-fun.nix} | 0 .../li/libdvdnav/pkg-fun.nix} | 0 .../li/libdvdread/pkg-fun.nix} | 0 .../li/libdvdread_4_9_9/pkg-fun.nix} | 0 .../li/libdwg/pkg-fun.nix} | 0 .../li/libe57format/pkg-fun.nix} | 0 .../default.nix => unit/li/libeb/pkg-fun.nix} | 0 .../li/libebml/pkg-fun.nix} | 0 .../li/libebur128/pkg-fun.nix} | 0 .../li}/libedit/01-cygwin.patch | 0 .../li/libedit/pkg-fun.nix} | 0 .../default.nix => unit/li/libee/pkg-fun.nix} | 0 ...on-t-detect-package-version-with-Git.patch | 0 .../li/libelfin/pkg-fun.nix} | 0 .../li/libemf2svg/pkg-fun.nix} | 0 .../li/libepc/pkg-fun.nix} | 0 .../li/liberal-crime-squad/pkg-fun.nix} | 0 .../li/liberastika/pkg-fun.nix} | 0 .../li/liberasurecode/pkg-fun.nix} | 0 .../li/liberation-circuit/pkg-fun.nix} | 0 .../li/liberation-sans-narrow/pkg-fun.nix} | 0 .../li/liberfa/pkg-fun.nix} | 0 .../li/liberio/pkg-fun.nix} | 0 .../li/libertine/pkg-fun.nix} | 0 .../li/libertinus/pkg-fun.nix} | 0 .../li/libesmtp/pkg-fun.nix} | 0 .../li/libestr/pkg-fun.nix} | 0 .../li/libetpan/pkg-fun.nix} | 0 .../default.nix => unit/li/libev/pkg-fun.nix} | 0 .../li/libevdev/pkg-fun.nix} | 0 .../li/libevdevc/pkg-fun.nix} | 0 .../0001-Add-cmake-install-directives.patch | 0 .../li/libevdevplus/pkg-fun.nix} | 0 .../li/libevent/pkg-fun.nix} | 0 .../li/libewf/pkg-fun.nix} | 0 .../li}/libexecinfo/30-linux-makefile.patch | 0 .../li/libexecinfo/pkg-fun.nix} | 0 .../li/libexif/pkg-fun.nix} | 0 .../li/libexosip/pkg-fun.nix} | 0 .../li/libexsid/pkg-fun.nix} | 0 .../li/libexttextcat/pkg-fun.nix} | 0 .../li/libf2c/pkg-fun.nix} | 0 .../li/libfabric/pkg-fun.nix} | 0 .../li/libfakeXinerama/pkg-fun.nix} | 0 .../li/libfakekey/pkg-fun.nix} | 0 .../0001-Remove-unsupported-clang-flags.patch | 0 .../li}/libfaketime/nix-store-date.patch | 0 .../no-date-in-gzip-man-page.patch | 0 .../li/libfaketime/pkg-fun.nix} | 0 .../li/libfann/pkg-fun.nix} | 0 .../default.nix => unit/li/libff/pkg-fun.nix} | 0 .../li/libffcall/pkg-fun.nix} | 0 .../li/libffi/pkg-fun.nix} | 0 .../li/libffi_3_3/pkg-fun.nix} | 0 .../li/libfishsound/pkg-fun.nix} | 0 .../li/libfixposix/pkg-fun.nix} | 0 .../default.nix => unit/li/libfm/pkg-fun.nix} | 0 .../li/libfprint-2-tod1-goodix/pkg-fun.nix} | 0 ...ing-explicit-dependencies-in-meson.b.patch | 0 ...0-add-missing-linux-limits.h-include.patch | 0 .../li/libfprint-2-tod1-vfs0090/pkg-fun.nix} | 0 .../li/libfprint-tod/pkg-fun.nix} | 0 .../li/libfprint/pkg-fun.nix} | 0 .../li/libfpx/pkg-fun.nix} | 0 .../li/libfreeaptx/pkg-fun.nix} | 0 .../li/libfsm/pkg-fun.nix} | 0 .../1.x.nix => unit/li/libftdi1/pkg-fun.nix} | 0 .../li/libfyaml/pkg-fun.nix} | 0 .../li/libgadu/pkg-fun.nix} | 0 .../li/libgaminggear/pkg-fun.nix} | 0 .../li/libgbinder/pkg-fun.nix} | 0 .../li/libgcrypt/pkg-fun.nix} | 0 .../li/libgcrypt_1_5/pkg-fun.nix} | 0 .../li/libgda/pkg-fun.nix} | 0 .../6.x.nix => unit/li/libgda6/pkg-fun.nix} | 0 .../li/libgdamm/pkg-fun.nix} | 0 .../li}/libgdata/installed-tests-path.patch | 0 .../li/libgdata/pkg-fun.nix} | 0 .../li/libgee/pkg-fun.nix} | 0 .../li/libgen-cli/pkg-fun.nix} | 0 .../li/libgeotiff/pkg-fun.nix} | 0 .../li/libgepub/pkg-fun.nix} | 0 .../li}/libgestures/include-fix.patch | 0 .../li/libgestures/pkg-fun.nix} | 0 .../li/libgflow/pkg-fun.nix} | 0 .../li/libgig/pkg-fun.nix} | 0 .../li/libgit2-glib/pkg-fun.nix} | 0 .../li/libglibutil/pkg-fun.nix} | 0 .../li/libglvnd/pkg-fun.nix} | 0 .../li/libgmpris/pkg-fun.nix} | 0 .../li/libgnome-games-support/pkg-fun.nix} | 0 .../libgnome-games-support_2_0/pkg-fun.nix} | 0 .../li/libgnome-keyring/pkg-fun.nix} | 0 .../li/libgnomekbd/pkg-fun.nix} | 0 .../li/libgnt/pkg-fun.nix} | 0 .../li/libgnurl/pkg-fun.nix} | 0 .../libgovirt/no-version-script-ld-flag.patch | 0 .../li/libgovirt/pkg-fun.nix} | 0 .../li/libgpg-error/pkg-fun.nix} | 0 .../li/libgphoto2/pkg-fun.nix} | 0 ...LOC-and-_REALLOC-and-check-for-them-.patch | 0 .../li/libgpiod/pkg-fun.nix} | 0 .../li/libgringotts/pkg-fun.nix} | 0 .../li/libgsf/pkg-fun.nix} | 0 .../li/libgssglue/pkg-fun.nix} | 0 .../li/libgtkflow3/pkg-fun.nix} | 0 .../li/libgtkflow4/pkg-fun.nix} | 0 .../li/libgtop/pkg-fun.nix} | 0 .../li/libgudev/pkg-fun.nix} | 0 .../li/libguestfs-appliance/pkg-fun.nix} | 0 .../li/libgumath/pkg-fun.nix} | 0 .../li}/libgweather/fix-pkgconfig.patch | 0 .../li/libgweather/pkg-fun.nix} | 0 .../li/libgxps/pkg-fun.nix} | 0 .../li/libhandy/pkg-fun.nix} | 0 .../li/libhandy_0/pkg-fun.nix} | 0 .../li/libhangul/pkg-fun.nix} | 0 .../li/libharu/pkg-fun.nix} | 0 .../li/libhdhomerun/pkg-fun.nix} | 0 .../li/libheif/pkg-fun.nix} | 0 .../li/libhomfly/pkg-fun.nix} | 0 .../li/libhsts/pkg-fun.nix} | 0 .../libraries => unit/li}/libhsts/update.sh | 0 .../li/libhttpseverywhere/pkg-fun.nix} | 0 .../li/libhugetlbfs/pkg-fun.nix} | 0 .../li/libhwy/pkg-fun.nix} | 0 .../li/libiberty/pkg-fun.nix} | 0 .../li/libibmad/pkg-fun.nix} | 0 .../li/libibumad/pkg-fun.nix} | 0 .../li/libical/pkg-fun.nix} | 0 .../li}/libical/respect-env-tzdir.patch | 0 .../li/libicns/pkg-fun.nix} | 0 .../CVE-2017-11550-and-CVE-2017-11551.patch | 0 .../li}/libid3tag/debian-patches.patch | 0 .../libraries => unit/li}/libid3tag/id3tag.pc | 0 .../li/libid3tag/pkg-fun.nix} | 0 .../li/libidn/pkg-fun.nix} | 0 .../li}/libidn2/fix-error-darwin.patch | 0 .../li/libidn2/pkg-fun.nix} | 0 .../li/libiec61883/pkg-fun.nix} | 0 .../li/libieee1284/pkg-fun.nix} | 0 .../li/libimagequant/pkg-fun.nix} | 0 .../li/libime/pkg-fun.nix} | 0 .../li/libimobiledevice-glue/pkg-fun.nix} | 0 .../li/libindicator/pkg-fun.nix} | 0 .../li/libinfinity/pkg-fun.nix} | 0 .../li/libinjection/pkg-fun.nix} | 0 .../li/libinklevel/pkg-fun.nix} | 0 .../li/libinotify-kqueue/pkg-fun.nix} | 0 .../0001-hardcode-name.patch | 0 .../li}/libinput-gestures/0002-paths.patch | 0 .../li/libinput-gestures/pkg-fun.nix} | 0 .../li/libinsane/pkg-fun.nix} | 0 .../li/libinstpatch/pkg-fun.nix} | 0 .../li/libipfix/pkg-fun.nix} | 0 .../li/libipt/pkg-fun.nix} | 0 .../li/libiptcdata/pkg-fun.nix} | 0 .../li/libircclient/pkg-fun.nix} | 0 .../li/libirecovery/pkg-fun.nix} | 0 .../li/libiscsi/pkg-fun.nix} | 0 .../li/libisds/pkg-fun.nix} | 0 .../li/libisoburn/pkg-fun.nix} | 0 .../li/libisofs/pkg-fun.nix} | 0 .../li/libite/pkg-fun.nix} | 0 .../li/libivykis/pkg-fun.nix} | 0 .../li/libixp/pkg-fun.nix} | 0 .../li/libjaylink/pkg-fun.nix} | 0 .../li}/libjcat/installed-tests-path.patch | 0 .../li/libjcat/pkg-fun.nix} | 0 .../li/libjpeg_original/pkg-fun.nix} | 0 ...le-transupp.c-as-part-of-the-library.patch | 0 .../li/libjpeg_turbo}/mingw-boolean.patch | 0 .../li/libjpeg_turbo/pkg-fun.nix} | 0 .../li/libjreen/pkg-fun.nix} | 0 .../li}/libjson/install-fix.patch | 0 .../li/libjson/pkg-fun.nix} | 0 .../li/libjwt/pkg-fun.nix} | 0 .../li/libjxl/pkg-fun.nix} | 0 .../li/libkate/pkg-fun.nix} | 0 .../li/libkeyfinder/pkg-fun.nix} | 0 .../lib.nix => unit/li/libkiwix/pkg-fun.nix} | 0 .../li/libkkc-data/pkg-fun.nix} | 0 .../li/libkkc/pkg-fun.nix} | 0 .../li/libkqueue/pkg-fun.nix} | 0 .../li/libkrunfw/pkg-fun.nix} | 0 .../default.nix => unit/li/libks/pkg-fun.nix} | 0 .../li/libksba/pkg-fun.nix} | 0 .../li/libksi/pkg-fun.nix} | 0 .../li/liblastfmSF/pkg-fun.nix} | 0 .../li/liblaxjson/pkg-fun.nix} | 0 .../li/liblbfgs/pkg-fun.nix} | 0 .../li/liblc3/pkg-fun.nix} | 0 .../li/liblcf/pkg-fun.nix} | 0 .../li/libliftoff/pkg-fun.nix} | 0 .../li/liblinear/pkg-fun.nix} | 0 .../li/liblinphone/pkg-fun.nix} | 0 .../li}/liblinphone/use-normal-jsoncpp.patch | 0 .../default.nix => unit/li/liblo/pkg-fun.nix} | 0 .../li/liblockfile/pkg-fun.nix} | 0 .../li/liblogging/pkg-fun.nix} | 0 .../li/liblognorm/pkg-fun.nix} | 0 .../li/liblouis/pkg-fun.nix} | 0 .../li/liblscp/pkg-fun.nix} | 0 .../li/libltc/pkg-fun.nix} | 0 .../li/liblxi/pkg-fun.nix} | 0 .../li/libmad/pkg-fun.nix} | 0 .../li/libmanette/pkg-fun.nix} | 0 .../li/libmatchbox/pkg-fun.nix} | 0 .../li/libmatroska/pkg-fun.nix} | 0 .../li/libmaxminddb/pkg-fun.nix} | 0 .../li/libmbim/pkg-fun.nix} | 0 .../li/libmcrypt/pkg-fun.nix} | 0 .../default.nix => unit/li/libmd/pkg-fun.nix} | 0 .../li/libmediaart/pkg-fun.nix} | 0 .../li/libmediainfo/pkg-fun.nix} | 0 ...emcached-fix-linking-with-libpthread.patch | 0 .../li}/libmemcached/musl-fixes.patch | 0 .../li/libmemcached/pkg-fun.nix} | 0 .../li/libmesode/pkg-fun.nix} | 0 ...autotools-define-conflict-debian-fix.patch | 0 .../li/libmhash/pkg-fun.nix} | 0 .../li/libmicrodns/pkg-fun.nix} | 0 .../li}/libmilter/darwin.patch | 0 .../li}/libmilter/install.patch | 0 .../li/libmilter/pkg-fun.nix} | 0 .../li}/libmilter/sharedlib.patch | 0 .../li/libminc/pkg-fun.nix} | 0 .../li/libmkv/pkg-fun.nix} | 0 .../li/libmms/pkg-fun.nix} | 0 .../li/libmng/pkg-fun.nix} | 0 .../li/libmnl/pkg-fun.nix} | 0 .../li/libmodbus/pkg-fun.nix} | 0 .../li/libmodplug/pkg-fun.nix} | 0 .../li/libmodule/pkg-fun.nix} | 0 .../li}/libmodulemd/glib-devdoc.patch | 0 .../li/libmodulemd/pkg-fun.nix} | 0 .../li/libmongo-client/pkg-fun.nix} | 0 .../li/libmowgli/pkg-fun.nix} | 0 .../li/libmp3splt/pkg-fun.nix} | 0 .../li/libmpack/pkg-fun.nix} | 0 .../li/libmpc/pkg-fun.nix} | 0 .../li/libmpcdec/pkg-fun.nix} | 0 .../li/libmpdclient/pkg-fun.nix} | 0 .../li/libmpeg2/pkg-fun.nix} | 0 .../li/libmrss/pkg-fun.nix} | 0 .../li/libmspack/pkg-fun.nix} | 0 .../li/libmsym/pkg-fun.nix} | 0 .../li/libmt32emu/pkg-fun.nix} | 0 .../li/libmtp/pkg-fun.nix} | 0 .../li/libmusicbrainz3/pkg-fun.nix} | 0 .../li/libmusicbrainz3}/v3-darwin.patch | 0 .../li/libmusicbrainz5/pkg-fun.nix} | 0 .../li/libmwaw/pkg-fun.nix} | 0 .../default.nix => unit/li/libmx/pkg-fun.nix} | 0 .../li/libmypaint/pkg-fun.nix} | 0 .../li/libmysofa/pkg-fun.nix} | 0 .../li/libmysqlconnectorcpp/pkg-fun.nix} | 0 .../li/libnabo/pkg-fun.nix} | 0 .../li/libnatpmp/pkg-fun.nix} | 0 .../li/libnats-c/pkg-fun.nix} | 0 .../li/libnatspec/pkg-fun.nix} | 0 .../li/libnbd/pkg-fun.nix} | 0 .../li/libndctl/pkg-fun.nix} | 0 .../li/libndp/pkg-fun.nix} | 0 .../li/libndtypes/pkg-fun.nix} | 0 .../li/libnet/pkg-fun.nix} | 0 .../li/libnetfilter_acct/pkg-fun.nix} | 0 .../li/libnetfilter_conntrack/pkg-fun.nix} | 0 .../li/libnetfilter_cthelper/pkg-fun.nix} | 0 .../li/libnetfilter_cttimeout/pkg-fun.nix} | 0 .../li/libnetfilter_log/pkg-fun.nix} | 0 .../li/libnetfilter_queue/pkg-fun.nix} | 0 .../li/libnfc/pkg-fun.nix} | 0 .../li/libnfnetlink/pkg-fun.nix} | 0 .../li/libnfs/pkg-fun.nix} | 0 .../li/libnftnl/pkg-fun.nix} | 0 .../li/libngspice/pkg-fun.nix} | 0 .../li/libnice/pkg-fun.nix} | 0 .../li/libnids/pkg-fun.nix} | 0 .../li/libnixxml/pkg-fun.nix} | 0 .../default.nix => unit/li/libnl/pkg-fun.nix} | 0 .../li}/libnma/hardcode-gsettings.patch | 0 .../li/libnma/pkg-fun.nix} | 0 .../li}/libnma/remove-path-from-eap.patch | 0 .../li/libnotify/pkg-fun.nix} | 0 .../li/libnova/pkg-fun.nix} | 0 .../li/libnsl/pkg-fun.nix} | 0 .../li/libnss-mysql/pkg-fun.nix} | 0 .../li/libnvme/pkg-fun.nix} | 0 .../li/libnxml/pkg-fun.nix} | 0 .../li/liboauth/pkg-fun.nix} | 0 .../li/libodb-sqlite/pkg-fun.nix} | 0 .../li/libodb/pkg-fun.nix} | 0 .../li/libodfgen/pkg-fun.nix} | 0 .../li/libofa/pkg-fun.nix} | 0 .../li/libofx/pkg-fun.nix} | 0 .../li/libogg/pkg-fun.nix} | 0 .../li/liboggz/pkg-fun.nix} | 0 .../li/liboil/pkg-fun.nix} | 0 .../li}/liboil/x86_64-cpuid.patch | 0 .../li}/libomxil-bellagio/fedora-fixes.patch | 0 .../li}/libomxil-bellagio/fno-common.patch | 0 .../li/libomxil-bellagio/pkg-fun.nix} | 0 .../li/liboop/pkg-fun.nix} | 0 .../li/libopenaptx/pkg-fun.nix} | 0 .../li/libopenglrecorder/pkg-fun.nix} | 0 .../li/libopenmpt-modplug/pkg-fun.nix} | 0 .../li/libopenmpt/pkg-fun.nix} | 0 .../audio => unit/li}/libopenmpt/update.sh | 0 .../no-chown-while-installing.patch | 0 .../li/libopensmtpd/pkg-fun.nix} | 0 .../li}/liboping/ncurses-6.3.patch | 0 .../li/liboping/pkg-fun.nix} | 0 .../li/libopus/pkg-fun.nix} | 0 .../li/libopusenc/pkg-fun.nix} | 0 .../li}/libosinfo/osinfo-db-data-dir.patch | 0 .../li/libosinfo/pkg-fun.nix} | 0 .../li/libosip/pkg-fun.nix} | 0 .../li/libosmium/pkg-fun.nix} | 0 .../li/libosmocore/pkg-fun.nix} | 0 .../li/libossp_uuid/pkg-fun.nix} | 0 .../li/libossp_uuid}/shtool.patch | 0 .../otf.nix => unit/li/libotf/pkg-fun.nix} | 0 .../li}/libotr/fix-regtest-client.patch | 0 .../li/libotr/pkg-fun.nix} | 0 .../default.nix => unit/li/libow/pkg-fun.nix} | 0 .../li/libowfat/pkg-fun.nix} | 0 .../li/libowlevelzs/pkg-fun.nix} | 0 .../li/libpam-wrapper/pkg-fun.nix} | 0 .../li/libpanel/pkg-fun.nix} | 0 .../li/libpaper/pkg-fun.nix} | 0 .../libpar2-0.4-external-verification.patch | 0 .../li/libpar2/pkg-fun.nix} | 0 .../li/libpcap/pkg-fun.nix} | 0 .../li/libpeas/pkg-fun.nix} | 0 .../li/libpfm/pkg-fun.nix} | 0 .../li/libpg_query/pkg-fun.nix} | 0 .../li/libpgf/pkg-fun.nix} | 0 .../li/libpinyin/pkg-fun.nix} | 0 .../li}/libpipeline/fix-on-osx.patch | 0 .../li/libpipeline/pkg-fun.nix} | 0 .../li/libplacebo/pkg-fun.nix} | 0 .../li/libplctag/pkg-fun.nix} | 0 .../li/libplist/pkg-fun.nix} | 0 .../li/libpng/pkg-fun.nix} | 0 .../12.nix => unit/li/libpng12/pkg-fun.nix} | 0 .../li/libpointmatcher/pkg-fun.nix} | 0 .../li/libpoly/pkg-fun.nix} | 0 .../li/libportal/pkg-fun.nix} | 0 .../li/libpostal/pkg-fun.nix} | 0 .../li/libpqxx/pkg-fun.nix} | 0 .../6.nix => unit/li/libpqxx_6/pkg-fun.nix} | 0 .../li/libpressureaudio/pkg-fun.nix} | 0 .../li/libpseudo/pkg-fun.nix} | 0 .../li/libpsl/pkg-fun.nix} | 0 .../li/libpsm2/pkg-fun.nix} | 0 .../li/libpst/pkg-fun.nix} | 0 .../li/libptytty/pkg-fun.nix} | 0 .../li/libpulsar/pkg-fun.nix} | 0 .../li/libqalculate/pkg-fun.nix} | 0 .../default.nix => unit/li/libqb/pkg-fun.nix} | 0 .../li/libqmi/pkg-fun.nix} | 0 .../li/libqrtr-glib/pkg-fun.nix} | 0 .../li/libquvi/pkg-fun.nix} | 0 .../default.nix => unit/li/libr3/pkg-fun.nix} | 0 .../li}/librarian-puppet-go/deps.nix | 0 .../li/librarian-puppet-go/pkg-fun.nix} | 0 .../li/libraspberrypi/pkg-fun.nix} | 0 .../li/libratbag/pkg-fun.nix} | 0 .../li/libraw/pkg-fun.nix} | 0 .../li/libraw1394/pkg-fun.nix} | 0 .../li/libraw_unstable/pkg-fun.nix} | 0 .../li/librdf_raptor/pkg-fun.nix} | 0 .../li/librdf_raptor2/pkg-fun.nix} | 0 .../li/librdf_rasqal/pkg-fun.nix} | 0 .../li/librdf_redland/pkg-fun.nix} | 0 .../li/libre-baskerville/pkg-fun.nix} | 0 .../li/libre-bodoni/pkg-fun.nix} | 0 .../li/libre-caslon/pkg-fun.nix} | 0 .../li/libre-franklin/pkg-fun.nix} | 0 .../default.nix => unit/li/libre/pkg-fun.nix} | 0 .../li}/libredirect/libredirect.c | 0 .../li/libredirect/pkg-fun.nix} | 0 .../li}/libredirect/test.c | 0 .../li/libredwg/pkg-fun.nix} | 0 .../li/libreelec-dvb-firmware/pkg-fun.nix} | 0 .../li/librelp/pkg-fun.nix} | 0 .../li/librem/pkg-fun.nix} | 0 .../li/librep/pkg-fun.nix} | 0 .../li}/librep/setup-hook.sh | 0 .../li/libresample/pkg-fun.nix} | 0 .../li/librespeed-cli/pkg-fun.nix} | 0 .../li/librest/pkg-fun.nix} | 0 .../li/librest_1_0/pkg-fun.nix} | 0 .../li/libreswan/pkg-fun.nix} | 0 .../li/libretro-core-info/pkg-fun.nix} | 0 .../li/librevenge/pkg-fun.nix} | 0 .../li/librewolf-unwrapped}/librewolf.nix | 0 .../li/librewolf-unwrapped/pkg-fun.nix} | 0 .../li/librewolf-unwrapped}/src.json | 0 .../li/librewolf-unwrapped}/src.nix | 0 .../li/librewolf-unwrapped}/update.nix | 0 .../li/librist/pkg-fun.nix} | 0 .../li/libroxml/pkg-fun.nix} | 0 .../li/librseq/pkg-fun.nix} | 0 .../li/librsync/pkg-fun.nix} | 0 .../li/librtlsdr/pkg-fun.nix} | 0 .../li/librtprocess/pkg-fun.nix} | 0 .../li/librttopo/pkg-fun.nix} | 0 .../default.nix => unit/li/libs3/pkg-fun.nix} | 0 .../li/libsass/pkg-fun.nix} | 0 .../li/libschrift/pkg-fun.nix} | 0 .../li/libsciter/pkg-fun.nix} | 0 .../li/libscrypt/pkg-fun.nix} | 0 .../li/libsearpc/pkg-fun.nix} | 0 .../li/libseccomp/pkg-fun.nix} | 0 .../li/libsecret/pkg-fun.nix} | 0 .../li/libselinux/pkg-fun.nix} | 0 .../li/libsepol/pkg-fun.nix} | 0 .../li/libserdes/pkg-fun.nix} | 0 .../li/libserialport/pkg-fun.nix} | 0 .../li/libshout/pkg-fun.nix} | 0 .../li/libshumate/pkg-fun.nix} | 0 .../li/libsidplayfp/pkg-fun.nix} | 0 .../li/libsieve/pkg-fun.nix} | 0 .../li/libsigcxx/pkg-fun.nix} | 0 .../li/libsigcxx12/pkg-fun.nix} | 0 .../li/libsigcxx30/pkg-fun.nix} | 0 .../li/libsignal-protocol-c/pkg-fun.nix} | 0 .../li/libsignon-glib/pkg-fun.nix} | 0 .../li/libsigrokdecode/pkg-fun.nix} | 0 .../li/libsigsegv/pkg-fun.nix} | 0 .../li}/libsigsegv/sigbus_fix.patch | 0 .../li/libsixel/pkg-fun.nix} | 0 .../li/libslirp/pkg-fun.nix} | 0 .../li/libsmartcols/pkg-fun.nix} | 0 .../li/libsmbios/pkg-fun.nix} | 0 .../li/libsmf/pkg-fun.nix} | 0 .../li/libsmi/pkg-fun.nix} | 0 .../li/libsnark/pkg-fun.nix} | 0 .../li}/libsodium/mingw-no-fortify.patch | 0 .../li/libsodium/pkg-fun.nix} | 0 .../li/libsolv/pkg-fun.nix} | 0 .../li/libsoup/pkg-fun.nix} | 0 .../3.x.nix => unit/li/libsoup_3/pkg-fun.nix} | 0 .../li/libspatialaudio/pkg-fun.nix} | 0 .../li/libspatialindex/pkg-fun.nix} | 0 .../li/libspatialite/pkg-fun.nix} | 0 .../li/libspecbleach/pkg-fun.nix} | 0 .../libspectre/libspectre-0.2.7-gs918.patch | 0 .../li/libspectre/pkg-fun.nix} | 0 .../li/libspectrum/pkg-fun.nix} | 0 .../li/libspf2/pkg-fun.nix} | 0 .../li/libspiro/pkg-fun.nix} | 0 .../li}/libspnav/configure-socket-path.patch | 0 .../li/libspnav/pkg-fun.nix} | 0 .../li/libspng/pkg-fun.nix} | 0 .../li/libsrs2/pkg-fun.nix} | 0 .../li/libssh/pkg-fun.nix} | 0 ...openssl_add_support_for_libressl_3_5.patch | 0 .../li/libssh2/pkg-fun.nix} | 0 .../li/libstartup_notification/pkg-fun.nix} | 0 .../li/libstdcxx5}/no-sys-dirs.patch | 0 .../5.nix => unit/li/libstdcxx5/pkg-fun.nix} | 0 .../li/libstdcxx5}/struct-ucontext.patch | 0 .../li/libstemmer/pkg-fun.nix} | 0 .../li/libstroke/pkg-fun.nix} | 0 .../li/libstrophe/pkg-fun.nix} | 0 .../li/libsurvive/pkg-fun.nix} | 0 .../li/libsvm/pkg-fun.nix} | 0 .../li/libsysprof-capture/pkg-fun.nix} | 0 .../li/libsystemtap/pkg-fun.nix} | 0 .../li/libtap/pkg-fun.nix} | 0 .../li/libtar/pkg-fun.nix} | 0 .../li/libtasn1/pkg-fun.nix} | 0 .../li/libtcod/pkg-fun.nix} | 0 .../li/libtelnet/pkg-fun.nix} | 0 .../li/libtermkey/pkg-fun.nix} | 0 .../li/libthai/pkg-fun.nix} | 0 .../li/libtheora/pkg-fun.nix} | 0 .../li/libthreadar/pkg-fun.nix} | 0 .../li/libticables2/pkg-fun.nix} | 0 .../li/libticonv/pkg-fun.nix} | 0 .../li}/libtiff/headers.patch | 0 .../li/libtiff/pkg-fun.nix} | 0 .../li}/libtiff/rename-version.patch | 0 .../li/libtifiles2/pkg-fun.nix} | 0 .../li/libtiger/pkg-fun.nix} | 0 .../li/libtins/pkg-fun.nix} | 0 .../li/libtirpc/pkg-fun.nix} | 0 .../li/libtomcrypt/pkg-fun.nix} | 0 .../li/libtommath/pkg-fun.nix} | 0 .../li/libtool_1_5/pkg-fun.nix} | 0 .../li/libtool_2/pkg-fun.nix} | 0 .../li/libtoxcore/pkg-fun.nix} | 0 .../li/libtpms/pkg-fun.nix} | 0 .../li/libtraceevent/pkg-fun.nix} | 0 .../li/libtracefs/pkg-fun.nix} | 0 .../li/libtree/pkg-fun.nix} | 0 .../li/libtsm/pkg-fun.nix} | 0 .../li/libu2f-host/pkg-fun.nix} | 0 .../li/libu2f-server/pkg-fun.nix} | 0 .../li/libubox/pkg-fun.nix} | 0 .../li/libuchardet/pkg-fun.nix} | 0 .../li/libucl/pkg-fun.nix} | 0 .../li/libucontext/pkg-fun.nix} | 0 .../li/libudev-zero/pkg-fun.nix} | 0 .../li/libudev0-shim/pkg-fun.nix} | 0 .../li/libudfread/pkg-fun.nix} | 0 .../li/libuecc/pkg-fun.nix} | 0 .../0001-Add-cmake-install-directives.patch | 0 .../li/libuinputplus/pkg-fun.nix} | 0 .../li}/libuldaq/0001-uldaq.patch | 0 .../li/libuldaq/pkg-fun.nix} | 0 .../li/libunarr/pkg-fun.nix} | 0 .../li/libunibreak/pkg-fun.nix} | 0 .../li/libuninameslist/pkg-fun.nix} | 0 .../li}/libunique/1.1.6-G_CONST_RETURN.patch | 0 .../libunique/1.1.6-compiler-warnings.patch | 0 .../li}/libunique/1.1.6-fix-test.patch | 0 .../libunique/1.1.6-include-terminator.patch | 0 .../li}/libunique/gcc7-bug.patch | 0 .../li/libunique/pkg-fun.nix} | 0 .../li/libunique3/pkg-fun.nix} | 0 .../li/libunistring/pkg-fun.nix} | 0 .../li}/libunity/fix-vala.patch | 0 .../li/libunity/pkg-fun.nix} | 0 .../li/libupnp/pkg-fun.nix} | 0 .../li/liburcu/pkg-fun.nix} | 0 .../li/liburing/pkg-fun.nix} | 0 .../li/libusb-compat-0_1}/fix-headers.patch | 0 .../li/libusb-compat-0_1/pkg-fun.nix} | 0 .../li/libusbgx/pkg-fun.nix} | 0 .../li/libusbmuxd/pkg-fun.nix} | 0 .../li/libusbsio/pkg-fun.nix} | 0 .../li}/libutempter/exec_path.patch | 0 .../li/libutempter/pkg-fun.nix} | 0 .../li/libutp/pkg-fun.nix} | 0 .../li/libuvc/pkg-fun.nix} | 0 .../li/libva-utils/pkg-fun.nix} | 0 .../1.nix => unit/li/libva1/pkg-fun.nix} | 0 .../li/libvarlink/pkg-fun.nix} | 0 .../li/libvdpau-va-gl/pkg-fun.nix} | 0 .../li}/libvdpau/installdir.patch | 0 .../li/libvdpau/pkg-fun.nix} | 0 .../li/libvdwxc/pkg-fun.nix} | 0 .../li/libversion/pkg-fun.nix} | 0 .../li/libverto/pkg-fun.nix} | 0 .../li/libviper/pkg-fun.nix} | 0 .../li/libviperfx/pkg-fun.nix} | 0 .../li/libvirt-glib/pkg-fun.nix} | 0 .../li/libvisio/pkg-fun.nix} | 0 .../li/libvisio2svg/pkg-fun.nix} | 0 .../li/libvisual/pkg-fun.nix} | 0 .../li/libvmaf/pkg-fun.nix} | 0 .../li/libvmi/pkg-fun.nix} | 0 .../li/libvolume_id/pkg-fun.nix} | 0 .../li/libvorbis/pkg-fun.nix} | 0 .../li/libvori/pkg-fun.nix} | 0 .../li/libvpx/pkg-fun.nix} | 0 .../li/libvpx_1_8/pkg-fun.nix} | 0 .../li/libvterm-neovim/pkg-fun.nix} | 0 .../li/libvterm/pkg-fun.nix} | 0 .../li/libwacom/pkg-fun.nix} | 0 .../li/libwbxml/pkg-fun.nix} | 0 .../li/libwebcam/pkg-fun.nix} | 0 ...k_support_and_take_data_dir_from_env.patch | 0 .../li/libwebp/pkg-fun.nix} | 0 .../li/libwebsockets/pkg-fun.nix} | 0 .../li/libwhereami/pkg-fun.nix} | 0 .../li/libwhich/pkg-fun.nix} | 0 .../li/libwmf/pkg-fun.nix} | 0 .../li/libwnck/pkg-fun.nix} | 0 .../2.nix => unit/li/libwnck2/pkg-fun.nix} | 0 .../li/libwpd/pkg-fun.nix} | 0 .../li/libwpd_08}/gcc-0.8.patch | 0 .../0.8.nix => unit/li/libwpd_08/pkg-fun.nix} | 0 .../li/libwpe-fdo/pkg-fun.nix} | 0 .../li/libwpe/pkg-fun.nix} | 0 .../li/libwpg/pkg-fun.nix} | 0 .../li/libwps/pkg-fun.nix} | 0 .../li}/libx86/constants.patch | 0 .../li}/libx86/non-x86.patch | 0 .../li/libx86/pkg-fun.nix} | 0 .../li}/libx86/src-for-default.nix | 0 .../li}/libx86/src-info-for-default.nix | 0 .../li/libx86emu/pkg-fun.nix} | 0 .../default.nix => unit/li/libxc/pkg-fun.nix} | 0 .../li/libxcomp/pkg-fun.nix} | 0 .../li/libxdg_basedir/pkg-fun.nix} | 0 .../li/libxkbcommon_7/pkg-fun.nix} | 0 .../li/libxkbcommon_8/pkg-fun.nix} | 0 .../libxklavier/honor-XKB_CONFIG_ROOT.patch | 0 .../li/libxklavier/pkg-fun.nix} | 0 .../default.nix => unit/li/libxl/pkg-fun.nix} | 0 .../li/libxls/pkg-fun.nix} | 0 .../li/libxlsxwriter/pkg-fun.nix} | 0 .../li/libxmi/pkg-fun.nix} | 0 .../li}/libxmlb/installed-tests-path.patch | 0 .../li/libxmlb/pkg-fun.nix} | 0 .../li/libxmlxx/pkg-fun.nix} | 0 .../v3.nix => unit/li/libxmlxx3/pkg-fun.nix} | 0 .../li/libxmp/pkg-fun.nix} | 0 .../li/libxnd/pkg-fun.nix} | 0 .../xpdf => unit/li/libxpdf}/libxpdf.patch | 0 .../li/libxpdf/pkg-fun.nix} | 0 .../li/libxpdf}/xpdf-3.02-protection.patch | 0 .../li/libxplayer-plparser/pkg-fun.nix} | 0 .../li/libxsmm/pkg-fun.nix} | 0 .../li/libyafaray/pkg-fun.nix} | 0 .../li/libyaml/pkg-fun.nix} | 0 .../li/libyamlcpp/pkg-fun.nix} | 0 .../li/libyamlcpp_0_3/pkg-fun.nix} | 0 .../li/libyang/pkg-fun.nix} | 0 .../li/libykclient/pkg-fun.nix} | 0 .../li/libykneomgr/pkg-fun.nix} | 0 .../li/libytnef/pkg-fun.nix} | 0 .../li/libyubikey/pkg-fun.nix} | 0 .../libyuv/link-library-against-libjpeg.patch | 0 .../li/libyuv/pkg-fun.nix} | 0 .../li/libzapojit/pkg-fun.nix} | 0 .../li/libzbc/pkg-fun.nix} | 0 .../li/libzbd/pkg-fun.nix} | 0 .../li/libzdb/pkg-fun.nix} | 0 .../li/libzen/pkg-fun.nix} | 0 .../li/libzim/pkg-fun.nix} | 0 .../li/libzip/pkg-fun.nix} | 0 .../li/libzmf/pkg-fun.nix} | 0 .../li}/libzra/fix-pkg-config.patch | 0 .../li/libzra/pkg-fun.nix} | 0 .../li/license-generator/pkg-fun.nix} | 0 .../tools => unit/li}/license_finder/Gemfile | 0 .../li}/license_finder/Gemfile.lock | 0 .../li}/license_finder/gemset.nix | 0 .../li/license_finder/pkg-fun.nix} | 0 .../li}/licensee/Gemfile | 0 .../li}/licensee/Gemfile.lock | 0 .../li}/licensee/gemset.nix | 0 .../li/licensee/pkg-fun.nix} | 0 .../li/licensor/pkg-fun.nix} | 0 .../li/lidarr/pkg-fun.nix} | 0 pkgs/{servers => unit/li}/lidarr/update.sh | 0 .../default.nix => unit/li/lie/pkg-fun.nix} | 0 .../default.nix => unit/li/lieer/pkg-fun.nix} | 0 .../li/lifecycled/pkg-fun.nix} | 0 .../li/lifelines/pkg-fun.nix} | 0 .../li/lifeograph/pkg-fun.nix} | 0 .../li/liferea/pkg-fun.nix} | 0 .../default.nix => unit/li/light/pkg-fun.nix} | 0 .../lightdm-enso-os-greeter/fix-paths.patch | 0 .../li/lightdm-enso-os-greeter/pkg-fun.nix} | 0 .../li/lightdm-mini-greeter/pkg-fun.nix} | 0 .../li/lightdm-mobile-greeter/pkg-fun.nix} | 0 .../li/lightdm-slick-greeter/pkg-fun.nix} | 0 .../li/lighthouse-steamvr/pkg-fun.nix} | 0 .../li/lightlocker/pkg-fun.nix} | 0 .../li/lightning-loop/pkg-fun.nix} | 0 .../li/lightning-pool/pkg-fun.nix} | 0 .../li/lightning/pkg-fun.nix} | 0 .../li/lightningcss/pkg-fun.nix} | 0 .../li/lightspark/pkg-fun.nix} | 0 .../li/lightstep-tracer-cpp/pkg-fun.nix} | 0 .../li/lighttpd/pkg-fun.nix} | 0 .../li/lightum/pkg-fun.nix} | 0 .../li/lightwalletd/pkg-fun.nix} | 0 .../li/lightworks/pkg-fun.nix} | 0 .../li/ligolo-ng/pkg-fun.nix} | 0 .../default.nix => unit/li/lilo/pkg-fun.nix} | 0 .../li}/lilv/lilv-pkgconfig.patch | 0 .../default.nix => unit/li/lilv/pkg-fun.nix} | 0 .../li/lilypond-unstable/pkg-fun.nix} | 0 .../default.nix => unit/li/lime/pkg-fun.nix} | 0 .../li/limesctl/pkg-fun.nix} | 0 .../li/limesurvey/pkg-fun.nix} | 0 .../li/limitcpu/pkg-fun.nix} | 0 .../li/linbox/pkg-fun.nix} | 0 .../li/lincity/pkg-fun.nix} | 0 .../li/line-awesome/pkg-fun.nix} | 0 .../li/linenoise-ng/pkg-fun.nix} | 0 .../li}/linenoise/create-pkg-config-file.sh | 0 .../li/linenoise/pkg-fun.nix} | 0 .../li/lingeling/pkg-fun.nix} | 0 .../li/lingot/pkg-fun.nix} | 0 .../li/lingua-franca/pkg-fun.nix} | 0 .../li/linja-pi-pu-lukin/pkg-fun.nix} | 0 .../li/link-grammar/pkg-fun.nix} | 0 .../li/linkchecker/pkg-fun.nix} | 0 .../li/links2/pkg-fun.nix} | 0 .../li/linthesia/pkg-fun.nix} | 0 .../li/linux-doc/pkg-fun.nix} | 0 .../li/linux-exploit-suggester/pkg-fun.nix} | 0 .../li/linux-firmware/pkg-fun.nix} | 0 .../li}/linux-firmware/source.nix | 0 .../li}/linux-firmware/update.sh | 0 .../li/linux-manual/pkg-fun.nix} | 0 .../li/linux-pam/pkg-fun.nix} | 0 .../li/linux-pam}/suid-wrapper-path.patch | 0 .../li/linux-router/pkg-fun.nix} | 0 .../li/linux-wifi-hotspot/pkg-fun.nix} | 0 .../li/linuxConsoleTools/pkg-fun.nix} | 0 .../li/linux_logo/pkg-fun.nix} | 0 .../li/linuxdoc-tools/pkg-fun.nix} | 0 .../li/linuxptp/pkg-fun.nix} | 0 .../li/linuxquota/pkg-fun.nix} | 0 .../li/linuxsampler/pkg-fun.nix} | 0 .../li/linx-server/pkg-fun.nix} | 0 .../li}/linx-server/test.patch | 0 .../li/liquibase/pkg-fun.nix} | 0 .../liquibase_redshift_extension/pkg-fun.nix} | 0 .../li/liquidfun/pkg-fun.nix} | 0 .../li/liquidprompt/pkg-fun.nix} | 0 .../5.nix => unit/li/liquidwar5/pkg-fun.nix} | 0 .../li}/lirc/linux-headers-5.18.patch | 0 .../default.nix => unit/li/lirc/pkg-fun.nix} | 0 .../default.nix => unit/li/lisgd/pkg-fun.nix} | 0 .../li/listadmin/pkg-fun.nix} | 0 .../mail => unit/li}/listmonk/frontend.nix | 0 .../mail => unit/li}/listmonk/package.json | 0 .../li/listmonk/pkg-fun.nix} | 0 .../mail => unit/li}/listmonk/yarn.lock | 0 .../mail => unit/li}/listmonk/yarn.nix | 0 .../default.nix => unit/li/lit/pkg-fun.nix} | 0 .../default.nix => unit/li/lite/pkg-fun.nix} | 0 .../li/litebrowser/pkg-fun.nix} | 0 .../li/litecli/pkg-fun.nix} | 0 .../li/litefs/pkg-fun.nix} | 0 .../li/litehtml/pkg-fun.nix} | 0 .../li/litemdview/pkg-fun.nix} | 0 .../li/litestream/pkg-fun.nix} | 0 .../li/littlefs-fuse/pkg-fun.nix} | 0 .../li/live555/pkg-fun.nix} | 0 .../li/livedl/pkg-fun.nix} | 0 .../li/livepeer/pkg-fun.nix} | 0 .../li/lizardfs/pkg-fun.nix} | 0 .../lk/lklug-sinhala/pkg-fun.nix} | 0 .../lk/lkproof/pkg-fun.nix} | 0 .../lk/lksctp-tools/pkg-fun.nix} | 0 .../default.nix => unit/ll/llama/pkg-fun.nix} | 0 .../default.nix => unit/ll/lldpd/pkg-fun.nix} | 0 .../default.nix => unit/ll/lls/pkg-fun.nix} | 0 .../lm/lm_sensors/pkg-fun.nix} | 0 .../libraries => unit/lm}/lmdb/bin-ext.patch | 0 .../lm}/lmdb/hardcoded-compiler.patch | 0 .../default.nix => unit/lm/lmdb/pkg-fun.nix} | 0 .../lm/lmdbxx/pkg-fun.nix} | 0 .../lm/lmmath/pkg-fun.nix} | 0 .../lm/lmodern/pkg-fun.nix} | 0 .../default.nix => unit/lm/lmp/pkg-fun.nix} | 0 .../0001-Forcefully-disable-docs-build.patch | 0 .../default.nix => unit/ln/lnav/pkg-fun.nix} | 0 .../default.nix => unit/ln/lnch/pkg-fun.nix} | 0 .../default.nix => unit/ln/lnd/pkg-fun.nix} | 0 .../ln/lndconnect/pkg-fun.nix} | 0 .../ln/lndhub-go/pkg-fun.nix} | 0 .../ln/lndmanage/pkg-fun.nix} | 0 .../lo/loadlibrary/pkg-fun.nix} | 0 .../lo/loadwatch/pkg-fun.nix} | 0 .../default.nix => unit/lo/loc/pkg-fun.nix} | 0 .../lo/localtime/pkg-fun.nix} | 0 .../lo/loccount/pkg-fun.nix} | 0 .../lo/lockdep/pkg-fun.nix} | 0 .../lo/lockfileProgs/pkg-fun.nix} | 0 .../lo/log4cplus/pkg-fun.nix} | 0 .../lo/log4cpp/pkg-fun.nix} | 0 .../lo}/log4cxx/narrowing-fixes.patch | 0 .../lo/log4cxx/pkg-fun.nix} | 0 .../lo/log4j-detect/pkg-fun.nix} | 0 .../lo/log4j-scan/pkg-fun.nix} | 0 .../lo/log4j-sniffer/pkg-fun.nix} | 0 .../lo/log4j-vuln-scanner/pkg-fun.nix} | 0 .../lo/log4jcheck/pkg-fun.nix} | 0 .../lo/log4shell-detector/pkg-fun.nix} | 0 .../lo/log4shib/pkg-fun.nix} | 0 .../lo/logcheck/pkg-fun.nix} | 0 .../lo/logiops/pkg-fun.nix} | 0 .../lo/logisim-evolution/pkg-fun.nix} | 0 .../lo/logisim/pkg-fun.nix} | 0 .../lo/logkeys/pkg-fun.nix} | 0 .../lo/logmap/pkg-fun.nix} | 0 .../lo/logmein-hamachi/pkg-fun.nix} | 0 .../lo/logrotate/pkg-fun.nix} | 0 .../lo/logstalgia/pkg-fun.nix} | 0 .../lo/logstash-contrib/pkg-fun.nix} | 0 .../lo/logtop/pkg-fun.nix} | 0 .../lo/lokalise2-cli/pkg-fun.nix} | 0 .../lo/lokinet/pkg-fun.nix} | 0 .../default.nix => unit/lo/loksh/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/lo}/lolcat/Gemfile | 0 .../misc => unit/lo}/lolcat/Gemfile.lock | 0 .../{tools/misc => unit/lo}/lolcat/gemset.nix | 0 .../lo/lolcat/pkg-fun.nix} | 0 .../lo/lolcode/pkg-fun.nix} | 0 .../lo/lollypop/pkg-fun.nix} | 0 .../lo/lombok/pkg-fun.nix} | 0 .../lo/long-shebang/pkg-fun.nix} | 0 .../lo}/longview/log-stdout.patch | 0 .../lo/longview/pkg-fun.nix} | 0 .../lo/looking-glass-client/pkg-fun.nix} | 0 .../default.nix => unit/lo/loop/pkg-fun.nix} | 0 .../lo/lorien/pkg-fun.nix} | 0 .../lo/losslessaudiochecker/pkg-fun.nix} | 0 .../losslesscut-bin/build-from-appimage.nix | 0 .../lo}/losslesscut-bin/build-from-dmg.nix | 0 .../losslesscut-bin/build-from-windows.nix | 0 .../lo/losslesscut-bin/pkg-fun.nix} | 0 .../lo/lottieconverter/pkg-fun.nix} | 0 .../lo/loudgain/pkg-fun.nix} | 0 .../lo}/loudmouth/glib-2.32.patch | 0 .../lo/loudmouth/pkg-fun.nix} | 0 .../lo/lounge-gtk-theme/pkg-fun.nix} | 0 .../CVE-2019-19917-and-CVE-2019-19918.patch | 0 .../typesetting => unit/lo}/lout/builder.sh | 0 .../default.nix => unit/lo/lout/pkg-fun.nix} | 0 .../lo/love_0_10/pkg-fun.nix} | 0 .../11.nix => unit/lo/love_11/pkg-fun.nix} | 0 .../lo/lowdown/pkg-fun.nix} | 0 .../lo/loxodo/pkg-fun.nix} | 0 .../lp/lpairs2/pkg-fun.nix} | 0 .../lp/lpcnetfreedv/pkg-fun.nix} | 0 .../lr/default.nix => unit/lr/lr/pkg-fun.nix} | 0 .../lr/lrcalc/pkg-fun.nix} | 0 .../default.nix => unit/lr/lrdf/pkg-fun.nix} | 0 .../default.nix => unit/lr/lrs/pkg-fun.nix} | 0 .../default.nix => unit/lr/lrzip/pkg-fun.nix} | 0 .../default.nix => unit/lr/lrzsz/pkg-fun.nix} | 0 .../ls}/lsb-release/lsb_release.sh | 0 .../ls/lsb-release/pkg-fun.nix} | 0 .../ls/lscolors/pkg-fun.nix} | 0 .../default.nix => unit/ls/lsd/pkg-fun.nix} | 0 .../default.nix => unit/ls/lsdvd/pkg-fun.nix} | 0 .../default.nix => unit/ls/lshw/pkg-fun.nix} | 0 .../ls/lsirec/pkg-fun.nix} | 0 .../ls/lsiutil/pkg-fun.nix} | 0 .../default.nix => unit/ls/lsix/pkg-fun.nix} | 0 .../misc => unit/ls}/lsof/no-build-info.patch | 0 .../default.nix => unit/ls/lsof/pkg-fun.nix} | 0 .../ls/lsscsi/pkg-fun.nix} | 0 .../default.nix => unit/ls/lswt/pkg-fun.nix} | 0 .../lt/ltc-tools/pkg-fun.nix} | 0 .../lt/ltex-ls/pkg-fun.nix} | 0 .../lt/ltl2ba/pkg-fun.nix} | 0 .../lt/ltrace/pkg-fun.nix} | 0 .../misc => unit/lt}/ltrace/sysdeps-x86.patch | 0 .../lt}/ltrace/testsuite-newfstatat.patch | 0 .../default.nix => unit/lt/ltris/pkg-fun.nix} | 0 .../lt/lttng-tools/pkg-fun.nix} | 0 .../default.nix => unit/lt/lttv/pkg-fun.nix} | 0 .../lt/ltunify/pkg-fun.nix} | 0 .../lt/ltwheelconf/pkg-fun.nix} | 0 .../lu/luabridge/pkg-fun.nix} | 0 .../default.nix => unit/lu/luau/pkg-fun.nix} | 0 .../lu/lucene/pkg-fun.nix} | 0 .../lu/lucenepp/pkg-fun.nix} | 0 .../lu/lucky-cli/pkg-fun.nix} | 0 .../web => unit/lu}/lucky-cli/shard.lock | 0 .../web => unit/lu}/lucky-cli/shards.nix | 0 .../lu/luculent/pkg-fun.nix} | 0 .../lu/ludusavi/pkg-fun.nix} | 0 .../lu/lugaru/pkg-fun.nix} | 0 .../default.nix => unit/lu/luigi/pkg-fun.nix} | 0 .../lu/lukesmithxyz-bible-kjv/pkg-fun.nix} | 0 .../0000-makefile-fix-install.diff | 0 .../lu/lukesmithxyz-st/pkg-fun.nix} | 0 .../lu/lunar-client/pkg-fun.nix} | 0 .../default.nix => unit/lu/luppp/pkg-fun.nix} | 0 .../default.nix => unit/lu/lurk/pkg-fun.nix} | 0 .../default.nix => unit/lu/lux/pkg-fun.nix} | 0 .../lv/default.nix => unit/lv/lv/pkg-fun.nix} | 0 .../lv/lv2-cpp-tools/pkg-fun.nix} | 0 .../default.nix => unit/lv/lv2/pkg-fun.nix} | 0 .../default.nix => unit/lv/lv2bm/pkg-fun.nix} | 0 .../lv/lv2lint/pkg-fun.nix} | 0 .../{tools/backup => unit/lv}/lvmsync/Gemfile | 0 .../backup => unit/lv}/lvmsync/Gemfile.lock | 0 .../backup => unit/lv}/lvmsync/gemset.nix | 0 .../lv/lvmsync/pkg-fun.nix} | 0 .../default.nix => unit/lv/lvtk/pkg-fun.nix} | 0 .../default.nix => unit/lw/lwan/pkg-fun.nix} | 0 .../default.nix => unit/lw/lwm/pkg-fun.nix} | 0 .../default.nix => unit/lx/lxcfs/pkg-fun.nix} | 0 .../lx/lxd-image-server/pkg-fun.nix} | 0 .../lx}/lxd-image-server/run.patch | 0 .../lx}/lxd-image-server/state.patch | 0 .../default.nix => unit/lx/lxd/pkg-fun.nix} | 0 .../lx/lxdvdrip/pkg-fun.nix} | 0 .../lx/lxgw-wenkai/pkg-fun.nix} | 0 .../lx/lxterminal/pkg-fun.nix} | 0 .../respect-xml-catalog-files-var.patch | 0 .../ly/default.nix => unit/ly/ly/pkg-fun.nix} | 0 .../default.nix => unit/ly/lynis/pkg-fun.nix} | 0 .../default.nix => unit/ly/lynx/pkg-fun.nix} | 0 .../default.nix => unit/ly/lyra/pkg-fun.nix} | 0 .../ly/lyrebird/pkg-fun.nix} | 0 .../default.nix => unit/lz/lz4/pkg-fun.nix} | 0 .../lz/lzbench/pkg-fun.nix} | 0 .../default.nix => unit/lz/lzfse/pkg-fun.nix} | 0 .../default.nix => unit/lz/lzham/pkg-fun.nix} | 0 .../lz}/lzip/lzip-setup-hook.sh | 0 .../default.nix => unit/lz/lzip/pkg-fun.nix} | 0 .../lz/lziprecover/pkg-fun.nix} | 0 .../default.nix => unit/lz/lzlib/pkg-fun.nix} | 0 .../default.nix => unit/lz/lzo/pkg-fun.nix} | 0 .../default.nix => unit/lz/lzop/pkg-fun.nix} | 0 .../lz/lzwolf/pkg-fun.nix} | 0 .../default.nix => unit/m-/m-cli/pkg-fun.nix} | 0 .../m1/m17-cxx-demod/pkg-fun.nix} | 0 .../m1/m17n_db/pkg-fun.nix} | 0 .../m1/m17n_lib/pkg-fun.nix} | 0 .../m3/m33-linux/pkg-fun.nix} | 0 .../m4/m4acut/pkg-fun.nix} | 0 .../default.nix => unit/m4/m4ri/pkg-fun.nix} | 0 .../default.nix => unit/m4/m4rie/pkg-fun.nix} | 0 .../default.nix => unit/ma/MACS2/pkg-fun.nix} | 0 .../default.nix => unit/ma/ma1sd/pkg-fun.nix} | 0 .../ma/mac-fdisk/pkg-fun.nix} | 0 .../default.nix => unit/ma/mac/pkg-fun.nix} | 0 .../ma/macchanger/pkg-fun.nix} | 0 .../ma/macchina/pkg-fun.nix} | 0 .../ma/mackerel-agent/pkg-fun.nix} | 0 .../default.nix => unit/ma/macse/pkg-fun.nix} | 0 .../default.nix => unit/ma/maddy/pkg-fun.nix} | 0 .../ma/madonctl/pkg-fun.nix} | 0 .../ma}/maelstrom/fix-compilation.patch | 0 .../ma/maelstrom/pkg-fun.nix} | 0 .../ma/maeparser/pkg-fun.nix} | 0 .../ma/maestro/pkg-fun.nix} | 0 .../default.nix => unit/ma/mafft/pkg-fun.nix} | 0 .../default.nix => unit/ma/mage/pkg-fun.nix} | 0 .../magic-vlsi/0001-strip-bin-prefix.patch | 0 .../ma/magic-vlsi/pkg-fun.nix} | 0 .../ma/magnetico/pkg-fun.nix} | 0 .../ma/maigret/pkg-fun.nix} | 0 .../default.nix => unit/ma/maiko/pkg-fun.nix} | 0 .../ma/mailcap/pkg-fun.nix} | 0 .../web => unit/ma}/mailcatcher/Gemfile | 0 .../web => unit/ma}/mailcatcher/Gemfile.lock | 0 .../web => unit/ma}/mailcatcher/gemset.nix | 0 .../ma/mailcatcher/pkg-fun.nix} | 0 .../ma}/mailcheck/mailcheck-Makefile.patch | 0 .../ma/mailcheck/pkg-fun.nix} | 0 .../maildrop/maildrop.configure.hack.patch | 0 .../ma/maildrop/pkg-fun.nix} | 0 .../ma/mailhog/pkg-fun.nix} | 0 .../ma/mailman-rss/pkg-fun.nix} | 0 .../ma/mailmanPackages}/hyperkitty.nix | 0 .../ma/mailmanPackages}/log-stderr.patch | 0 .../mailmanPackages}/mailman-hyperkitty.nix | 0 .../ma/mailmanPackages}/package.nix | 0 .../ma/mailmanPackages/pkg-fun.nix} | 0 .../ma/mailmanPackages}/postorius.nix | 0 .../ma/mailmanPackages}/python.nix | 0 .../ma/mailmanPackages}/web.nix | 0 .../ma/mailsend/pkg-fun.nix} | 0 .../ma/mailspring/pkg-fun.nix} | 0 .../default.nix => unit/ma/maim/pkg-fun.nix} | 0 .../{tools/text => unit/ma}/mairix/mmap.patch | 0 .../ma/mairix/pkg-fun.nix} | 0 .../ma/makeAutostartItem/pkg-fun.nix} | 0 .../makeBinaryWrapper}/make-binary-wrapper.sh | 0 .../ma/makeBinaryWrapper/pkg-fun.nix} | 0 .../ma/makeDarwinBundle/pkg-fun.nix} | 0 .../ma/makeDesktopItem/pkg-fun.nix} | 0 .../hardcode-gsettings.cocci | 0 .../makeHardcodeGsettingsPatch/pkg-fun.nix} | 0 .../make-initrd-ng/Cargo.lock | 0 .../make-initrd-ng/update.sh | 0 .../ma/makeInitrdNGTool/pkg-fun.nix} | 0 .../ma/makePkgconfigItem/pkg-fun.nix} | 0 .../ma/makebootfat/pkg-fun.nix} | 0 .../ma/makefile2graph/pkg-fun.nix} | 0 .../ma/maker-panel/pkg-fun.nix} | 0 .../ma/makerpm/pkg-fun.nix} | 0 .../ma/makeself/pkg-fun.nix} | 0 .../default.nix => unit/ma/mako/pkg-fun.nix} | 0 .../ma/maligned/pkg-fun.nix} | 0 .../default.nix => unit/ma/malt/pkg-fun.nix} | 0 .../default.nix => unit/ma/mamba/pkg-fun.nix} | 0 .../ma/man-db/pkg-fun.nix} | 0 .../ma}/man-db/systemwide-man-db-conf.patch | 0 .../ma/man-pages-posix/pkg-fun.nix} | 0 .../ma/man-pages/pkg-fun.nix} | 0 .../ma/manaplus/pkg-fun.nix} | 0 .../ma/mandoc/pkg-fun.nix} | 0 .../ma/mandown/pkg-fun.nix} | 0 .../ma/manga-cli/pkg-fun.nix} | 0 .../ma/mangal/pkg-fun.nix} | 0 .../default.nix => unit/ma/mani/pkg-fun.nix} | 0 .../video => unit/ma}/manim/failing_tests.nix | 0 .../default.nix => unit/ma/manim/pkg-fun.nix} | 0 .../ma/manrope/pkg-fun.nix} | 0 .../default.nix => unit/ma/manta/pkg-fun.nix} | 0 .../ma/manticore/pkg-fun.nix} | 0 .../ma/manticoresearch/pkg-fun.nix} | 0 .../ma/map-cmd/pkg-fun.nix} | 0 .../ma/mapcache/pkg-fun.nix} | 0 .../ma/mapcidr/pkg-fun.nix} | 0 .../networking => unit/ma}/maphosts/Gemfile | 0 .../ma}/maphosts/Gemfile.lock | 0 .../ma}/maphosts/gemset.nix | 0 .../ma/maphosts/pkg-fun.nix} | 0 .../ma/mapproxy/pkg-fun.nix} | 0 .../ma/mapserver/pkg-fun.nix} | 0 .../default.nix => unit/ma/mar1d/pkg-fun.nix} | 0 .../ma/marathi-cursive/pkg-fun.nix} | 0 .../ma/marathonctl/pkg-fun.nix} | 0 .../default.nix => unit/ma/mari0/pkg-fun.nix} | 0 .../ma/mariadb-galera/pkg-fun.nix} | 0 .../ma/marisa/pkg-fun.nix} | 0 .../default.nix => unit/ma/mark/pkg-fun.nix} | 0 .../ma/markdown-anki-decks/pkg-fun.nix} | 0 .../ma/markdown-pp/pkg-fun.nix} | 0 .../ma/marker/pkg-fun.nix} | 0 .../ma/markets/pkg-fun.nix} | 0 .../tools => unit/ma}/marksman/deps.nix | 0 .../ma/marksman/pkg-fun.nix} | 0 .../tools => unit/ma}/marksman/update.sh | 0 .../ma/marktext/pkg-fun.nix} | 0 .../default.nix => unit/ma/marl/pkg-fun.nix} | 0 .../ma/marlin-calc/pkg-fun.nix} | 0 .../ma/mars-mips/pkg-fun.nix} | 0 .../default.nix => unit/ma/mars/pkg-fun.nix} | 0 .../default.nix => unit/ma/marst/pkg-fun.nix} | 0 .../ma/martian-mono/pkg-fun.nix} | 0 .../ma/martyr/pkg-fun.nix} | 0 .../ma}/marvin/LicenseManager.desktop | 0 .../ma}/marvin/MarvinSketch.desktop | 0 .../ma}/marvin/MarvinView.desktop | 0 .../ma/marvin/pkg-fun.nix} | 0 .../ma/marwaita-manjaro/pkg-fun.nix} | 0 .../ma/marwaita-peppermint/pkg-fun.nix} | 0 .../ma/marwaita-pop_os/pkg-fun.nix} | 0 .../ma/marwaita-ubuntu/pkg-fun.nix} | 0 .../ma/marwaita/pkg-fun.nix} | 0 .../default.nix => unit/ma/mas/pkg-fun.nix} | 0 .../default.nix => unit/ma/mask/pkg-fun.nix} | 0 .../ma/masscan/pkg-fun.nix} | 0 .../ma/massren/pkg-fun.nix} | 0 .../ma/mastodon-archive/pkg-fun.nix} | 0 .../ma/mastodon/pkg-fun.nix} | 0 pkgs/{servers => unit/ma}/mastodon/source.nix | 0 pkgs/{servers => unit/ma}/mastodon/update.nix | 0 pkgs/{servers => unit/ma}/mastodon/update.sh | 0 .../{servers => unit/ma}/mastodon/version.nix | 0 .../ma/matcha-gtk-theme/pkg-fun.nix} | 0 .../ma/matchbox/pkg-fun.nix} | 0 .../ma/materia-kde-theme/pkg-fun.nix} | 0 .../ma/materia-theme/pkg-fun.nix} | 0 .../ma/material-design-icons/pkg-fun.nix} | 0 .../ma/material-icons/pkg-fun.nix} | 0 .../ma/mathpix-snipping-tool/pkg-fun.nix} | 0 .../default.nix => unit/ma/matio/pkg-fun.nix} | 0 .../ma}/matrix-alertmanager/package.json | 0 .../ma/matrix-alertmanager/pkg-fun.nix} | 0 .../ma}/matrix-alertmanager/update.nix | 0 .../ma}/matrix-alertmanager/yarn-hash | 0 .../ma}/matrix-alertmanager/yarn.lock | 0 .../matrix-appservice-discord/package.json | 0 .../ma}/matrix-appservice-discord/pin.json | 0 .../ma/matrix-appservice-discord/pkg-fun.nix} | 0 .../ma}/matrix-appservice-discord/update.sh | 0 .../ma/matrix-appservice-irc/pkg-fun.nix} | 0 .../ma}/matrix-appservice-slack/package.json | 0 .../ma}/matrix-appservice-slack/pin.json | 0 .../ma/matrix-appservice-slack/pkg-fun.nix} | 0 .../ma}/matrix-appservice-slack/update.sh | 0 .../cargo-11192-workaround.patch | 0 .../ma/matrix-conduit/pkg-fun.nix} | 0 .../ma/matrix-corporal/pkg-fun.nix} | 0 .../ma/matrix-dl/pkg-fun.nix} | 0 .../ma}/matrix-recorder/composition.nix | 0 .../ma}/matrix-recorder/node-env.nix | 0 .../ma}/matrix-recorder/node-packages.nix | 0 .../ma/matrix-recorder/pkg-fun.nix} | 0 .../ma/matrix-sdk-crypto-nodejs/pkg-fun.nix} | 0 .../remove-duplicate-dependency.patch | 0 .../ma/matrix-synapse/pkg-fun.nix} | 0 .../ma}/matrix-synapse/plugins/default.nix | 0 .../ma}/matrix-synapse/plugins/ldap3.nix | 0 .../plugins/mjolnir-antispam.nix | 0 .../ma}/matrix-synapse/plugins/pam.nix | 0 .../plugins/shared-secret-auth.nix | 0 .../ma}/matrix-synapse/tools/default.nix | 0 .../tools/rust-synapse-compress-state.nix | 0 .../ma}/matrix-synapse/tools/synadm.nix | 0 .../ma}/matter-compiler/Gemfile | 0 .../ma}/matter-compiler/Gemfile.lock | 0 .../ma}/matter-compiler/gemset.nix | 0 .../ma/matter-compiler/pkg-fun.nix} | 0 .../ma/matterbridge/pkg-fun.nix} | 0 .../ma/matterircd/pkg-fun.nix} | 0 .../ma/mattermost-desktop/pkg-fun.nix} | 0 .../ma/mattermost/pkg-fun.nix} | 0 .../ma/mautrix-facebook/pkg-fun.nix} | 0 .../ma/mautrix-googlechat/pkg-fun.nix} | 0 .../ma/mautrix-whatsapp/pkg-fun.nix} | 0 .../ma/maven3}/builder.sh | 0 .../ma/maven3/pkg-fun.nix} | 0 .../default.nix => unit/ma/mawk/pkg-fun.nix} | 0 .../ma/maxcso/pkg-fun.nix} | 0 .../ma/maxflow/pkg-fun.nix} | 0 .../ma/maxlib/pkg-fun.nix} | 0 .../default.nix => unit/mb/mb2md/pkg-fun.nix} | 0 .../mb/mbed-cli/pkg-fun.nix} | 0 .../mb/mbelib/pkg-fun.nix} | 0 .../mb/mbidled/pkg-fun.nix} | 0 .../mb/mblaze/pkg-fun.nix} | 0 .../mb/mblock-mlink/pkg-fun.nix} | 0 .../default.nix => unit/mb/mbox/pkg-fun.nix} | 0 .../mb/mbpfan/pkg-fun.nix} | 0 .../mb/mbqn}/001-libbqn-path.patch | 0 .../default.nix => unit/mb/mbqn/pkg-fun.nix} | 0 .../mb/mbrola/pkg-fun.nix} | 0 .../mb/mbtileserver/pkg-fun.nix} | 0 .../mb/mbuffer/pkg-fun.nix} | 0 .../mc/mcabber/pkg-fun.nix} | 0 .../mc/mcaimi-st/pkg-fun.nix} | 0 .../mc/mceinject/pkg-fun.nix} | 0 .../default.nix => unit/mc/mcfly/pkg-fun.nix} | 0 .../mc/mcomix/pkg-fun.nix} | 0 .../default.nix => unit/mc/mcpp/pkg-fun.nix} | 0 .../mc/mcrcon/pkg-fun.nix} | 0 .../default.nix => unit/mc/mcrl2/pkg-fun.nix} | 0 .../default.nix => unit/mc/mcron/pkg-fun.nix} | 0 .../mcrypt/format-string_CVE-2012-4426.patch | 0 .../mc}/mcrypt/malloc_to_stdlib.patch | 0 .../mc}/mcrypt/overflow_CVE-2012-4409.patch | 0 .../mc/mcrypt/pkg-fun.nix} | 0 .../{tools/misc => unit/mc}/mcrypt/segv.patch | 0 .../mc}/mcrypt/sprintf_CVE-2012-4527.patch | 0 .../default.nix => unit/mc/mcy/pkg-fun.nix} | 0 .../md/md-tangle/pkg-fun.nix} | 0 .../md}/md4c/fix-pkgconfig.patch | 0 .../default.nix => unit/md/md4c/pkg-fun.nix} | 0 .../md/mda_lv2/pkg-fun.nix} | 0 .../md/mdadm4}/no-self-references.patch | 0 .../md/mdadm4/pkg-fun.nix} | 0 .../md/mdbook-cmdrun/pkg-fun.nix} | 0 .../md/mdbook-man/pkg-fun.nix} | 0 .../md/mdbook-open-on-gh/pkg-fun.nix} | 0 .../md/mdbtools/pkg-fun.nix} | 0 .../md/mdctags/pkg-fun.nix} | 0 .../default.nix => unit/md/mdds/pkg-fun.nix} | 0 .../md/mdevctl/pkg-fun.nix} | 0 .../md/mdf2iso/pkg-fun.nix} | 0 .../default.nix => unit/md/mdk/pkg-fun.nix} | 0 .../default.nix => unit/md/mdk4/pkg-fun.nix} | 0 .../tools/misc => unit/md}/mdl/Gemfile | 0 .../tools/misc => unit/md}/mdl/Gemfile.lock | 0 .../tools/misc => unit/md}/mdl/gemset.nix | 0 .../default.nix => unit/md/mdl/pkg-fun.nix} | 0 .../default.nix => unit/md/mdp/pkg-fun.nix} | 0 .../default.nix => unit/md/mdr/pkg-fun.nix} | 0 .../default.nix => unit/md/mdsh/pkg-fun.nix} | 0 .../me/me_cleaner/pkg-fun.nix} | 0 .../me/media-downloader/pkg-fun.nix} | 0 .../me/media-player-info/pkg-fun.nix} | 0 .../me/mediainfo-gui/pkg-fun.nix} | 0 .../me/mediainfo/pkg-fun.nix} | 0 .../me/mediastreamer-openh264/pkg-fun.nix} | 0 .../me/mediawiki/pkg-fun.nix} | 0 .../default.nix => unit/me/medio/pkg-fun.nix} | 0 .../me/mednafen-server/pkg-fun.nix} | 0 .../me/mednafen/pkg-fun.nix} | 0 .../me/mednaffe/pkg-fun.nix} | 0 .../me/medusa/pkg-fun.nix} | 0 .../me/meerk40t-camera/pkg-fun.nix} | 0 .../me/meerk40t/pkg-fun.nix} | 0 .../me/megacli/pkg-fun.nix} | 0 .../me/megacmd/pkg-fun.nix} | 0 .../me/megaglest/pkg-fun.nix} | 0 .../me/megahit/pkg-fun.nix} | 0 .../misc => unit/me}/megam/ocaml-3.12.patch | 0 .../me}/megam/ocaml-includes.patch | 0 .../default.nix => unit/me/megam/pkg-fun.nix} | 0 .../me/megapixels/pkg-fun.nix} | 0 .../me/megatools/pkg-fun.nix} | 0 .../default.nix => unit/me/meh/pkg-fun.nix} | 0 .../default.nix => unit/me/mela/pkg-fun.nix} | 0 .../default.nix => unit/me/meld/pkg-fun.nix} | 0 .../me/melody/pkg-fun.nix} | 0 .../default.nix => unit/me/melt/pkg-fun.nix} | 0 .../me/memcached/pkg-fun.nix} | 0 .../me/meme-image-generator/pkg-fun.nix} | 0 .../me/meme-suite/pkg-fun.nix} | 0 .../default.nix => unit/me/memo/pkg-fun.nix} | 0 .../me/memorymapping/pkg-fun.nix} | 0 .../me/memray/pkg-fun.nix} | 0 .../me/memstream/pkg-fun.nix} | 0 .../me/memtest86-efi/pkg-fun.nix} | 0 .../me/memtest86plus/pkg-fun.nix} | 0 .../me/memtester/pkg-fun.nix} | 0 .../me/memtier-benchmark/pkg-fun.nix} | 0 .../me/mencal/pkg-fun.nix} | 0 .../me/menu-cache/pkg-fun.nix} | 0 .../me/menumaker/pkg-fun.nix} | 0 .../default.nix => unit/me/mepo/pkg-fun.nix} | 0 .../me/mercury/pkg-fun.nix} | 0 .../me/merecat/pkg-fun.nix} | 0 .../me/mergerfs-tools/pkg-fun.nix} | 0 .../me/mergerfs/pkg-fun.nix} | 0 .../me/meritous/pkg-fun.nix} | 0 .../me/merriweather-sans/pkg-fun.nix} | 0 .../me/merriweather/pkg-fun.nix} | 0 .../me}/mesa-demos/demos-data-dir.patch | 0 .../me/mesa-demos/pkg-fun.nix} | 0 .../meshcentral/fix-js-include-paths.patch | 0 .../me}/meshcentral/package.json | 0 .../me/meshcentral/pkg-fun.nix} | 0 .../admin => unit/me}/meshcentral/update.sh | 0 .../admin => unit/me}/meshcentral/yarn.lock | 0 .../admin => unit/me}/meshcentral/yarn.nix | 0 .../me/meslo-lg/pkg-fun.nix} | 0 .../me/meslo-lgs-nf/pkg-fun.nix} | 0 .../me/meson-tools/pkg-fun.nix} | 0 ...boost-Do-not-add-system-paths-on-nix.patch | 0 .../me}/meson/clear-old-rpath.patch | 0 .../me}/meson/fix-rpath.patch | 0 .../me}/meson/gir-fallback-path.patch | 0 .../me}/meson/more-env-vars.patch | 0 .../default.nix => unit/me/meson/pkg-fun.nix} | 0 .../me}/meson/setup-hook.sh | 0 pkgs/{servers => unit/me}/mesos-dns/deps.nix | 0 .../me/mesos-dns/pkg-fun.nix} | 0 .../me/messer-slim/pkg-fun.nix} | 0 .../me/metaBuildEnv/pkg-fun.nix} | 0 .../me/metabigor/pkg-fun.nix} | 0 .../me/metadata-cleaner/pkg-fun.nix} | 0 .../me/metal-cli/pkg-fun.nix} | 0 .../me/metals/pkg-fun.nix} | 0 .../me/metamath/pkg-fun.nix} | 0 .../me/metamorphose2/pkg-fun.nix} | 0 .../me/metapixel/pkg-fun.nix} | 0 .../default.nix => unit/me/metar/pkg-fun.nix} | 0 .../security => unit/me}/metasploit/Gemfile | 0 .../me}/metasploit/Gemfile.lock | 0 .../me}/metasploit/gemset.nix | 0 .../me/metasploit/pkg-fun.nix} | 0 .../security => unit/me}/metasploit/shell.nix | 0 .../security => unit/me}/metasploit/update.sh | 0 .../me/metastore/pkg-fun.nix} | 0 .../default.nix => unit/me/meteo/pkg-fun.nix} | 0 pkgs/{servers => unit/me}/meteor/main.patch | 0 .../me/meteor/pkg-fun.nix} | 0 .../me}/meterbridge/buf_rect.patch | 0 .../meterbridge/fix_build_with_gcc-5.patch | 0 .../me/meterbridge/pkg-fun.nix} | 0 .../me/metersLv2/pkg-fun.nix} | 0 .../me/methane/pkg-fun.nix} | 0 .../me/metis-prover/pkg-fun.nix} | 0 .../default.nix => unit/me/metis/pkg-fun.nix} | 0 .../mf/mfc9140cdncupswrapper/pkg-fun.nix} | 0 .../mf/mfc9140cdnlpr/pkg-fun.nix} | 0 .../mf/mfcj470dw-cupswrapper/pkg-fun.nix} | 0 .../mf/mfcj6510dw-cupswrapper/pkg-fun.nix} | 0 .../mf/mfcl2700dncupswrapper/pkg-fun.nix} | 0 .../mf/mfcl2720dwcupswrapper/pkg-fun.nix} | 0 .../mf/mfcl2720dwlpr/pkg-fun.nix} | 0 .../mf/mfcl2740dwcupswrapper/pkg-fun.nix} | 0 .../mf/mfcl2740dwlpr/pkg-fun.nix} | 0 .../mf/mfcl8690cdwcupswrapper/pkg-fun.nix} | 0 .../mf/mfcl8690cdwlpr/pkg-fun.nix} | 0 .../default.nix => unit/mf/mfcuk/pkg-fun.nix} | 0 .../default.nix => unit/mf/mfoc/pkg-fun.nix} | 0 .../mf/mftrace/pkg-fun.nix} | 0 .../mg/default.nix => unit/mg/mg/pkg-fun.nix} | 0 .../default.nix => unit/mg/mgba/pkg-fun.nix} | 0 .../default.nix => unit/mg/mgmt/pkg-fun.nix} | 0 .../mhddfs/fix-format-security-error.patch | 0 .../mh/mhddfs/pkg-fun.nix} | 0 .../default.nix => unit/mi/mi2ly/pkg-fun.nix} | 0 .../mi/micro-httpd/pkg-fun.nix} | 0 .../default.nix => unit/mi/micro/pkg-fun.nix} | 0 .../mi}/micro/test-with-expect.nix | 0 .../mi/microbin/pkg-fun.nix} | 0 .../mi/microcodeAmd/pkg-fun.nix} | 0 .../mi/microcodeIntel/pkg-fun.nix} | 0 .../mi/microcom/pkg-fun.nix} | 0 .../mi/microdnf/pkg-fun.nix} | 0 .../mi/micromamba/pkg-fun.nix} | 0 .../mi/micronaut/pkg-fun.nix} | 0 .../mi/micronucleus/pkg-fun.nix} | 0 .../mi/microplane/pkg-fun.nix} | 0 .../mi/micropython/pkg-fun.nix} | 0 .../mi/microscheme/pkg-fun.nix} | 0 .../mi/microserver/pkg-fun.nix} | 0 .../mi/microsoft_gsl/pkg-fun.nix} | 0 .../mi/mictray/pkg-fun.nix} | 0 .../mi/mid2key/pkg-fun.nix} | 0 .../mi/midi-trigger/pkg-fun.nix} | 0 .../mi/midicsv/pkg-fun.nix} | 0 .../mi/midimonster/pkg-fun.nix} | 0 .../mi/midisheetmusic/pkg-fun.nix} | 0 .../mi/midori-unwrapped/pkg-fun.nix} | 0 .../mi/migmix/pkg-fun.nix} | 0 .../mi/migrate/pkg-fun.nix} | 0 .../default.nix => unit/mi/migu/pkg-fun.nix} | 0 .../mi/mikmod/pkg-fun.nix} | 0 .../mi}/mikutter/deps/Gemfile | 0 .../mi}/mikutter/deps/Gemfile.lock | 0 .../mi}/mikutter/deps/gemset.nix | 0 .../mi}/mikutter/deps/plugin/gtk/Gemfile | 0 .../deps/plugin/image_file_cache/Gemfile | 0 .../deps/plugin/photo_support/Gemfile | 0 .../mikutter/deps/plugin/uitranslator/Gemfile | 0 .../mi/mikutter/pkg-fun.nix} | 0 .../mi}/mikutter/test_plugin.rb | 0 .../mi}/mikutter/update.sh | 0 .../mi/milkytracker/pkg-fun.nix} | 0 .../default.nix => unit/mi/mill/pkg-fun.nix} | 0 .../mi/miller/pkg-fun.nix} | 0 .../mi/millet/pkg-fun.nix} | 0 .../default.nix => unit/mi/milu/pkg-fun.nix} | 0 .../mi/mimalloc/pkg-fun.nix} | 0 .../default.nix => unit/mi/mimeo/pkg-fun.nix} | 0 .../mi}/mimetic/narrowing.patch | 0 .../mi/mimetic/pkg-fun.nix} | 0 .../default.nix => unit/mi/mimic/pkg-fun.nix} | 0 .../default.nix => unit/mi/mimir/pkg-fun.nix} | 0 .../mi/minc_widgets/pkg-fun.nix} | 0 .../mi/minder/pkg-fun.nix} | 0 .../minecraft-server-hibernation/pkg-fun.nix} | 0 .../mi/minecraft/pkg-fun.nix} | 0 pkgs/{games => unit/mi}/minecraft/update.sh | 0 .../mi/mingetty/pkg-fun.nix} | 0 .../mi/miniHttpd/pkg-fun.nix} | 0 .../biology => unit/mi}/minia/no-bundle.patch | 0 .../default.nix => unit/mi/minia/pkg-fun.nix} | 0 .../mi/miniaudio/pkg-fun.nix} | 0 .../mi/miniball/pkg-fun.nix} | 0 .../mi/minica/pkg-fun.nix} | 0 .../mi/minicom/pkg-fun.nix} | 0 .../mi}/minicom/xminicom_terminal_paths.patch | 0 .../mi/minidjvu/pkg-fun.nix} | 0 .../mi/minidlna/pkg-fun.nix} | 0 .../mi/miniflux/pkg-fun.nix} | 0 .../mi/minify/pkg-fun.nix} | 0 .../mi/minigalaxy/pkg-fun.nix} | 0 .../mi/minijail/pkg-fun.nix} | 0 .../mi/minilibx/pkg-fun.nix} | 0 .../mi/minimap2/pkg-fun.nix} | 0 .../mi/minimodem/pkg-fun.nix} | 0 .../mi/mininet/pkg-fun.nix} | 0 .../mi/minio-certgen/pkg-fun.nix} | 0 .../mi/minio-client/pkg-fun.nix} | 0 .../default.nix => unit/mi/minio/pkg-fun.nix} | 0 .../mi/minio_legacy_fs/pkg-fun.nix} | 0 .../mi/miniplayer/pkg-fun.nix} | 0 .../mi/minipro/pkg-fun.nix} | 0 .../mi/minisat/pkg-fun.nix} | 0 .../mi/miniscript/pkg-fun.nix} | 0 .../mi/minishift/pkg-fun.nix} | 0 .../mi/minisign/pkg-fun.nix} | 0 .../mi/minissdpd/pkg-fun.nix} | 0 .../mi/ministat/pkg-fun.nix} | 0 .../mi/miniupnpc/pkg-fun.nix} | 0 .../mi/miniupnpd/pkg-fun.nix} | 0 .../mi/minixml/pkg-fun.nix} | 0 .../default.nix => unit/mi/miniz/pkg-fun.nix} | 0 .../mi/minizinc/pkg-fun.nix} | 0 .../mi/minizip-ng/pkg-fun.nix} | 0 .../mi/minizip/pkg-fun.nix} | 0 .../default.nix => unit/mi/mir/pkg-fun.nix} | 0 .../mi/miraclecast/pkg-fun.nix} | 0 .../mi/miranda/pkg-fun.nix} | 0 .../mi/miredo/pkg-fun.nix} | 0 pkgs/{servers => unit/mi}/mirrorbits/deps.nix | 0 .../mi/mirrorbits/pkg-fun.nix} | 0 .../mi/miscfiles/pkg-fun.nix} | 0 .../mi/mission-planner/pkg-fun.nix} | 0 .../mi/mitama-cpp-result/pkg-fun.nix} | 0 .../mi/mitmproxy2swagger/pkg-fun.nix} | 0 .../mi/mix2nix/pkg-fun.nix} | 0 .../mj}/mjolnir/node-composition.nix | 0 .../mj}/mjolnir/node-deps.nix | 0 .../{servers => unit/mj}/mjolnir/node-env.nix | 0 .../mj/mjolnir/pkg-fun.nix} | 0 pkgs/{servers => unit/mj}/mjolnir/update.sh | 0 .../mj/mjpegtools/pkg-fun.nix} | 0 .../mj/mjpg-streamer/pkg-fun.nix} | 0 .../mk/mkNugetDeps/pkg-fun.nix} | 0 .../mk/mkNugetSource/pkg-fun.nix} | 0 .../mk/mkSaneConfig/pkg-fun.nix} | 0 .../mk/mkShell/pkg-fun.nix} | 0 .../mk/mkcert/pkg-fun.nix} | 0 .../default.nix => unit/mk/mkcl/pkg-fun.nix} | 0 .../mk/mkclean/pkg-fun.nix} | 0 .../mk/mkinitcpio-nfs-utils/pkg-fun.nix} | 0 .../default.nix => unit/mk/mkl/pkg-fun.nix} | 0 .../math => unit/mk}/mkl/test/default.nix | 0 .../science/math => unit/mk}/mkl/test/test.c | 0 .../mk/mkp224o/pkg-fun.nix} | 0 .../mk/mkrand/pkg-fun.nix} | 0 .../default.nix => unit/mk/mksh/pkg-fun.nix} | 0 .../mk/mkspiffs/pkg-fun.nix} | 0 .../mk/mktemp/pkg-fun.nix} | 0 .../mk/mktorrent/pkg-fun.nix} | 0 .../ml/mlarchive2maildir/pkg-fun.nix} | 0 .../default.nix => unit/ml/mlc/pkg-fun.nix} | 0 .../default.nix => unit/ml/mle/pkg-fun.nix} | 0 .../ml/mlflow-server/pkg-fun.nix} | 0 .../default.nix => unit/ml/mlib/pkg-fun.nix} | 0 .../default.nix => unit/ml/mlkit/pkg-fun.nix} | 0 .../default.nix => unit/ml/mlmmj/pkg-fun.nix} | 0 .../ml/mloader/pkg-fun.nix} | 0 .../ml/mlocate/pkg-fun.nix} | 0 .../default.nix => unit/ml/mlt/pkg-fun.nix} | 0 .../default.nix => unit/ml/mlvwm/pkg-fun.nix} | 0 .../default.nix => unit/mm/MMA/pkg-fun.nix} | 0 .../mm/mm-common/pkg-fun.nix} | 0 .../mm/default.nix => unit/mm/mm/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmake/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmark/pkg-fun.nix} | 0 .../mm/mmc-utils/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmctl/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmdoc/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmh/pkg-fun.nix} | 0 .../mm/mmixware/pkg-fun.nix} | 0 .../mm/mmsd-tng/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmsd/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmtc/pkg-fun.nix} | 0 .../mm/mmtf-cpp/pkg-fun.nix} | 0 .../mm/mmutils/pkg-fun.nix} | 0 .../mm/mmv-go/pkg-fun.nix} | 0 .../default.nix => unit/mm/mmv/pkg-fun.nix} | 0 .../mn/mnamer/pkg-fun.nix} | 0 .../mn}/mnamer/remove_requirements.patch | 0 .../misc => unit/mn}/mnamer/update_hack.patch | 0 .../default.nix => unit/mn/mnc/pkg-fun.nix} | 0 .../mn/mnemonicode/pkg-fun.nix} | 0 .../mn/mni_autoreg/pkg-fun.nix} | 0 .../default.nix => unit/mn/mnist/pkg-fun.nix} | 0 .../default.nix => unit/mn/mno16/pkg-fun.nix} | 0 .../default.nix => unit/mo/moar/pkg-fun.nix} | 0 .../default.nix => unit/mo/mob/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../mo/mobilecoin-wallet/pkg-fun.nix} | 0 .../mo/mockgen/pkg-fun.nix} | 0 .../mo/mockobjects/pkg-fun.nix} | 0 .../mo/mod-arpeggiator-lv2/pkg-fun.nix} | 0 .../mo/mod-distortion/pkg-fun.nix} | 0 .../default.nix => unit/mo/mod/pkg-fun.nix} | 0 .../default.nix => unit/mo/modd/pkg-fun.nix} | 0 .../mo/modem-manager-gui/pkg-fun.nix} | 0 .../mo/modemmanager/pkg-fun.nix} | 0 .../mo/modsecurity-crs/pkg-fun.nix} | 0 .../modsecurity_standalone}/Makefile.am.patch | 0 .../mo/modsecurity_standalone/pkg-fun.nix} | 0 .../default.nix => unit/mo/moe/pkg-fun.nix} | 0 .../mo/moka-icon-theme/pkg-fun.nix} | 0 .../mo/mokutil/pkg-fun.nix} | 0 .../mo}/molden/dont_register_file_types.patch | 0 .../mo/molden/pkg-fun.nix} | 0 .../default.nix => unit/mo/mole/pkg-fun.nix} | 0 .../gemini => unit/mo}/molly-brown/deps.nix | 0 .../mo/molly-brown/pkg-fun.nix} | 0 .../mo/molly-guard/pkg-fun.nix} | 0 .../mo/molot-lite/pkg-fun.nix} | 0 .../mo/molotov/pkg-fun.nix} | 0 .../mo/moltengamepad/pkg-fun.nix} | 0 .../mo/mona-sans/pkg-fun.nix} | 0 .../mo/monetdb/pkg-fun.nix} | 0 .../mo/moneyplex/pkg-fun.nix} | 0 .../mo/mongoaudit/pkg-fun.nix} | 0 .../mo/mongoc/pkg-fun.nix} | 0 .../mo/mongodb-compass/pkg-fun.nix} | 0 .../mo/mongodb-tools/pkg-fun.nix} | 0 .../mo/mongoose/pkg-fun.nix} | 0 .../default.nix => unit/mo/monit/pkg-fun.nix} | 0 .../mo/monitoring-plugins/pkg-fun.nix} | 0 .../mo/monkeysAudio}/buildfix.diff | 0 .../mo/monkeysAudio/pkg-fun.nix} | 0 .../mo}/monkeysphere/monkeysphere.patch | 0 .../monkeysphere/openssh-nixos-sandbox.patch | 0 .../mo/monkeysphere/pkg-fun.nix} | 0 .../mo/mono-addins/pkg-fun.nix} | 0 .../mo/monoDLLFixer}/dll-fixer.pl | 0 .../mo/monoDLLFixer/pkg-fun.nix} | 0 .../mo/monocraft/pkg-fun.nix} | 0 .../mo/monocypher/pkg-fun.nix} | 0 .../mo/monoid/pkg-fun.nix} | 0 .../mo/mononoki/pkg-fun.nix} | 0 .../mo/monosat/pkg-fun.nix} | 0 .../default.nix => unit/mo/mons/pkg-fun.nix} | 0 .../mo/monsoon/pkg-fun.nix} | 0 .../mo/montserrat/pkg-fun.nix} | 0 .../mo/mooSpace/pkg-fun.nix} | 0 .../mo/moodle-dl/pkg-fun.nix} | 0 .../mo/moodle-utils/pkg-fun.nix} | 0 .../mo/moodle/pkg-fun.nix} | 0 .../mo/moon-buggy/pkg-fun.nix} | 0 .../mo/moonlight-embedded/pkg-fun.nix} | 0 .../mo/moonraker/pkg-fun.nix} | 0 .../mo/moosefs/pkg-fun.nix} | 0 .../default.nix => unit/mo/mop/pkg-fun.nix} | 0 .../default.nix => unit/mo/moq/pkg-fun.nix} | 0 .../default.nix => unit/mo/morph/pkg-fun.nix} | 0 .../mo/morsel/pkg-fun.nix} | 0 .../default.nix => unit/mo/morty/pkg-fun.nix} | 0 .../mo/mosdepth/pkg-fun.nix} | 0 .../mo/moserial/pkg-fun.nix} | 0 .../mo}/mosh/bash_completion_datadir.patch | 0 .../mo}/mosh/mosh-client_path.patch | 0 .../default.nix => unit/mo/mosh/pkg-fun.nix} | 0 .../mo}/mosh/ssh_path.patch | 0 .../default.nix => unit/mo/mosml/pkg-fun.nix} | 0 .../mo/mosquitto/pkg-fun.nix} | 0 .../misc => unit/mo}/most/parallel-make.patch | 0 .../default.nix => unit/mo/most/pkg-fun.nix} | 0 .../motif/Add-X.Org-to-bindings-file.patch | 0 ...move-unsupported-weak-refs-on-darwin.patch | 0 .../default.nix => unit/mo/motif/pkg-fun.nix} | 0 .../mo/motion/pkg-fun.nix} | 0 .../mo/motrix/pkg-fun.nix} | 0 .../audio => unit/mo}/mousai/paths.patch | 0 .../mo/mousai/pkg-fun.nix} | 0 .../mo/mousetweaks/pkg-fun.nix} | 0 .../mo/mov-cli/pkg-fun.nix} | 0 .../default.nix => unit/mo/movit/pkg-fun.nix} | 0 .../mo/mozart2-binary/pkg-fun.nix} | 0 .../mo/mozjpeg/pkg-fun.nix} | 0 .../mo/mozlz4a/pkg-fun.nix} | 0 .../mo/mozphab/pkg-fun.nix} | 0 .../mp/mp3blaster/pkg-fun.nix} | 0 .../mp/mp3cat/pkg-fun.nix} | 0 .../default.nix => unit/mp/mp3fs/pkg-fun.nix} | 0 .../mp/mp3gain/pkg-fun.nix} | 0 .../mp/mp3info/pkg-fun.nix} | 0 .../mp/mp3splt/pkg-fun.nix} | 0 .../mp/mp3val/pkg-fun.nix} | 0 .../mp}/mp4v2/fix-build-clang.patch | 0 .../default.nix => unit/mp/mp4v2/pkg-fun.nix} | 0 .../mp}/mpack/build-fix.patch | 0 .../default.nix => unit/mp/mpack/pkg-fun.nix} | 0 .../mp}/mpack/sendmail-via-execvp.diff | 0 .../default.nix => unit/mp/mpage/pkg-fun.nix} | 0 .../mp/mpc123/pkg-fun.nix} | 0 .../audio => unit/mp}/mpc123/use-gcc.patch | 0 .../mp/mpd-mpris/pkg-fun.nix} | 0 .../default.nix => unit/mp/mpdas/pkg-fun.nix} | 0 pkgs/{tools/audio => unit/mp}/mpdcron/Gemfile | 0 .../audio => unit/mp}/mpdcron/Gemfile.lock | 0 .../audio => unit/mp}/mpdcron/gemset.nix | 0 .../mp/mpdcron/pkg-fun.nix} | 0 .../mp/mpdecimal/pkg-fun.nix} | 0 .../mp/mpdevil/pkg-fun.nix} | 0 .../mp/mpdris2/pkg-fun.nix} | 0 .../mp/mpdscribble/pkg-fun.nix} | 0 .../default.nix => unit/mp/mpfi/pkg-fun.nix} | 0 .../default.nix => unit/mp/mpfr/pkg-fun.nix} | 0 .../mp/mpfshell/pkg-fun.nix} | 0 .../mp/mpg321/pkg-fun.nix} | 0 .../mp/mph_2b_damase/pkg-fun.nix} | 0 .../default.nix => unit/mp/mpir/pkg-fun.nix} | 0 .../mp/mprime/pkg-fun.nix} | 0 .../mp/mpris-scrobbler/pkg-fun.nix} | 0 .../mp/mprocs/pkg-fun.nix} | 0 .../mp/mps-youtube/pkg-fun.nix} | 0 .../default.nix => unit/mp/mpvc/pkg-fun.nix} | 0 .../mp/mpvpaper/pkg-fun.nix} | 0 .../default.nix => unit/mp/mpw/pkg-fun.nix} | 0 .../mq/mq-cli/pkg-fun.nix} | 0 .../mr/default.nix => unit/mr/mr/pkg-fun.nix} | 0 .../mr/mrbayes/pkg-fun.nix} | 0 .../mr/mro-unicode/pkg-fun.nix} | 0 .../mr/mrpeach/pkg-fun.nix} | 0 .../mr/mrrescue/pkg-fun.nix} | 0 .../default.nix => unit/mr/mrsh/pkg-fun.nix} | 0 .../default.nix => unit/mr/mrtg/pkg-fun.nix} | 0 .../default.nix => unit/mr/mruby/pkg-fun.nix} | 0 .../mr/mrustc-minicargo/pkg-fun.nix} | 0 .../mr/mrustc/pkg-fun.nix} | 0 .../default.nix => unit/mr/mrxvt/pkg-fun.nix} | 0 .../manpages-without-build-timestamps.patch | 0 .../ms/ms-sys/pkg-fun.nix} | 0 .../ms}/msbuild/create-deps.sh | 0 .../ms}/msbuild/deps.nix | 0 .../ms/msbuild/pkg-fun.nix} | 0 .../ms/mscgen/pkg-fun.nix} | 0 .../default.nix => unit/ms/msfpc/pkg-fun.nix} | 0 .../ms/msgpack-tools/pkg-fun.nix} | 0 .../libraries => unit/ms}/msgpack/generic.nix | 0 .../ms/msgpack/pkg-fun.nix} | 0 .../ms/msgpuck/pkg-fun.nix} | 0 .../ms/msgviewer/pkg-fun.nix} | 0 .../ms/msieve/pkg-fun.nix} | 0 .../ms/msilbc/pkg-fun.nix} | 0 .../ms/msitools/pkg-fun.nix} | 0 .../ms/mslink/pkg-fun.nix} | 0 .../ms/msp430GccSupport/pkg-fun.nix} | 0 .../ms/mspdebug/pkg-fun.nix} | 0 .../ms/mspds-bin/pkg-fun.nix} | 0 .../msp430 => unit/ms}/mspds/bsl430.patch | 0 .../default.nix => unit/ms/mspds/pkg-fun.nix} | 0 .../ms/msr-tools/pkg-fun.nix} | 0 .../ms}/msr/000-include-sysmacros.patch | 0 .../default.nix => unit/ms/msr/pkg-fun.nix} | 0 .../ms/mssql_jdbc/pkg-fun.nix} | 0 .../ms/mstflint/pkg-fun.nix} | 0 .../default.nix => unit/ms/mstpd/pkg-fun.nix} | 0 .../default.nix => unit/mt/mt-st/pkg-fun.nix} | 0 .../mt/mt32emu-smf2wav/pkg-fun.nix} | 0 .../default.nix => unit/mt/mtail/pkg-fun.nix} | 0 .../default.nix => unit/mt/mtdev/pkg-fun.nix} | 0 .../mt/mtdutils/pkg-fun.nix} | 0 .../default.nix => unit/mt/mtm/pkg-fun.nix} | 0 .../mt}/mtools/UNUSED-darwin.patch | 0 .../mt/mtools/pkg-fun.nix} | 0 .../mt/mtpaint/pkg-fun.nix} | 0 .../default.nix => unit/mt/mtpfs/pkg-fun.nix} | 0 .../mt/mtr-exporter/pkg-fun.nix} | 0 .../mtrace.nix => unit/mt/mtrace/pkg-fun.nix} | 0 .../default.nix => unit/mt/mtx/pkg-fun.nix} | 0 .../mu/mubeng/pkg-fun.nix} | 0 .../mu/muchsync/pkg-fun.nix} | 0 .../mu/mucommander/pkg-fun.nix} | 0 .../mu/mueval/pkg-fun.nix} | 0 .../mu}/mujoco/dependencies.patch | 0 .../mu/mujoco/pkg-fun.nix} | 0 .../default.nix => unit/mu/mujs/pkg-fun.nix} | 0 .../mu/mullvad-vpn/pkg-fun.nix} | 0 .../mu/multilockscreen/pkg-fun.nix} | 0 .../mu/multimarkdown/pkg-fun.nix} | 0 .../mu/multimon-ng/pkg-fun.nix} | 0 .../mu/multipart-parser-c/pkg-fun.nix} | 0 .../mu/multipath-tools/pkg-fun.nix} | 0 .../mu/multitail/pkg-fun.nix} | 0 .../mu/multitime/pkg-fun.nix} | 0 .../mu/multus-cni/pkg-fun.nix} | 0 .../default.nix => unit/mu/munge/pkg-fun.nix} | 0 .../munin/adding_sconfdir_munin-node.patch | 0 .../munin/adding_servicedir_munin-node.patch | 0 ...dont_preserve_source_dir_permissions.patch | 0 .../default.nix => unit/mu/munin/pkg-fun.nix} | 0 .../mu}/munin/preserve_environment.patch | 0 .../default.nix => unit/mu/muon/pkg-fun.nix} | 0 .../mu/muonlang/pkg-fun.nix} | 0 .../mu/muparserx/pkg-fun.nix} | 0 ...0001-Use-command-v-in-favor-of-which.patch | 0 .../mu}/mupdf/0002-Add-Darwin-deps.patch | 0 .../default.nix => unit/mu/mupdf/pkg-fun.nix} | 0 .../mupdf => unit/mu/mupdf_1_17}/darwin.patch | 0 .../mupdf_1_17}/mupdf-1.14-shared_libs.patch | 0 .../mu/mupdf_1_17/pkg-fun.nix} | 0 .../mu/mupen64plus/pkg-fun.nix} | 0 .../default.nix => unit/mu/murex/pkg-fun.nix} | 0 .../mu/muscle/pkg-fun.nix} | 0 .../mu/museeks/pkg-fun.nix} | 0 .../mu/musl-fts/pkg-fun.nix} | 0 .../mu/musl-obstack/pkg-fun.nix} | 0 .../default.nix => unit/mu/musl/pkg-fun.nix} | 0 .../default.nix => unit/mu/musly/pkg-fun.nix} | 0 .../mu/mustache-go/pkg-fun.nix} | 0 .../mu/mustache-hpp/pkg-fun.nix} | 0 .../mu/mustache-spec/pkg-fun.nix} | 0 .../mu/mutagen-compose/pkg-fun.nix} | 0 .../mu/mutagen/pkg-fun.nix} | 0 .../mu/mutest/pkg-fun.nix} | 0 .../mu/mutmut/pkg-fun.nix} | 0 .../mu/mutt-ics/pkg-fun.nix} | 0 .../mu/mutt-wizard/pkg-fun.nix} | 0 .../default.nix => unit/mu/mutt/pkg-fun.nix} | 0 .../mv/mvapich/pkg-fun.nix} | 0 .../mx/mxt-app/pkg-fun.nix} | 0 .../default.nix => unit/my/mycli/pkg-fun.nix} | 0 .../my/mycorrhiza/pkg-fun.nix} | 0 .../my/mycrypto/pkg-fun.nix} | 0 .../my/mydumper/pkg-fun.nix} | 0 .../my/mylvmbackup/pkg-fun.nix} | 0 .../default.nix => unit/my/mympd/pkg-fun.nix} | 0 .../my/mynewt-newt/pkg-fun.nix} | 0 .../my/mynewt-newtmgr/pkg-fun.nix} | 0 .../my/mypaint-brushes/pkg-fun.nix} | 0 .../my/mypaint-brushes1/pkg-fun.nix} | 0 .../my/mypaint/pkg-fun.nix} | 0 .../my/myrddin/pkg-fun.nix} | 0 .../my/myrica/pkg-fun.nix} | 0 .../my/mysides/pkg-fun.nix} | 0 .../libraries => unit/my}/mysocketw/gcc.patch | 0 .../my/mysocketw/pkg-fun.nix} | 0 .../my/mysql2pgsql/pkg-fun.nix} | 0 .../my/mysql_jdbc/pkg-fun.nix} | 0 .../my/mysqltuner/pkg-fun.nix} | 0 .../my/mystem/pkg-fun.nix} | 0 .../my/mythes/pkg-fun.nix} | 0 .../default.nix => unit/n2/n2048/pkg-fun.nix} | 0 .../default.nix => unit/n2/n2n/pkg-fun.nix} | 0 .../N3/default.nix => unit/n3/n3/pkg-fun.nix} | 0 .../n8}/n8n/fix-permissions.diff | 0 .../n8}/n8n/generate-dependencies.sh | 0 .../n8}/n8n/node-composition.nix | 0 .../haste-server => unit/n8/n8n}/node-env.nix | 0 .../n8}/n8n/node-packages.nix | 0 .../default.nix => unit/n8/n8n/pkg-fun.nix} | 0 .../default.nix => unit/na/naabu/pkg-fun.nix} | 0 .../default.nix => unit/na/nabi/pkg-fun.nix} | 0 .../default.nix => unit/na/naev/pkg-fun.nix} | 0 .../na/nafees/pkg-fun.nix} | 0 .../na/nagelfar/pkg-fun.nix} | 0 .../na}/nagios/nagios.patch | 0 .../na/nagios/pkg-fun.nix} | 0 .../na/nahid-fonts/pkg-fun.nix} | 0 .../na/nailgun/pkg-fun.nix} | 0 .../default.nix => unit/na/nali/pkg-fun.nix} | 0 .../na/namazu/pkg-fun.nix} | 0 .../default.nix => unit/na/nano/pkg-fun.nix} | 0 .../na}/nano/test-with-expect.nix | 0 .../na/nanoblogger/pkg-fun.nix} | 0 .../na/nanodbc/pkg-fun.nix} | 0 .../na/nanoflann/pkg-fun.nix} | 0 .../na/nanomq/pkg-fun.nix} | 0 .../na/nanomsg/pkg-fun.nix} | 0 .../na/nanorc/pkg-fun.nix} | 0 .../na/nanosaur/pkg-fun.nix} | 0 .../na/nanosaur2/pkg-fun.nix} | 0 .../na/nanotts/pkg-fun.nix} | 0 .../na/nanum-gothic-coding/pkg-fun.nix} | 0 .../default.nix => unit/na/nanum/pkg-fun.nix} | 0 .../default.nix => unit/na/nap/pkg-fun.nix} | 0 .../na/napi-rs-cli/pkg-fun.nix} | 0 .../na/naproche/pkg-fun.nix} | 0 .../na/nar-serve/pkg-fun.nix} | 0 .../default.nix => unit/na/nas/pkg-fun.nix} | 0 .../default.nix => unit/na/nasc/pkg-fun.nix} | 0 .../default.nix => unit/na/nasm/pkg-fun.nix} | 0 .../tools => unit/na}/nasmfmt/go.mod | 0 .../na/nasmfmt/pkg-fun.nix} | 0 .../default.nix => unit/na/nasty/pkg-fun.nix} | 0 .../na/nat-traverse/pkg-fun.nix} | 0 .../na/national-park-typeface/pkg-fun.nix} | 0 .../default.nix => unit/na/natls/pkg-fun.nix} | 0 .../video => unit/na}/natron/config.pri | 0 .../na/natron/pkg-fun.nix} | 0 .../na/nats-server/pkg-fun.nix} | 0 .../na/nats-streaming-server/pkg-fun.nix} | 0 .../na/nats-top/pkg-fun.nix} | 0 .../na/natscli/pkg-fun.nix} | 0 .../na/natural-docs/pkg-fun.nix} | 0 .../hardcode-gsettings.patch | 0 .../nautilus-open-any-terminal/pkg-fun.nix} | 0 .../default.nix => unit/na/nauty/pkg-fun.nix} | 0 .../default.nix => unit/na/navi/pkg-fun.nix} | 0 .../na/navidrome/pkg-fun.nix} | 0 .../misc => unit/na}/navidrome/ui/default.nix | 0 .../na/navidrome/ui}/node-composition.nix | 0 .../na}/navidrome/ui/node-env.nix | 0 .../na}/navidrome/ui/node-packages.nix | 0 .../misc => unit/na}/navidrome/update.nix | 0 .../na/navipowm/pkg-fun.nix} | 0 .../default.nix => unit/na/nawk/pkg-fun.nix} | 0 .../nb/default.nix => unit/nb/nb/pkg-fun.nix} | 0 .../default.nix => unit/nb/nbd/pkg-fun.nix} | 0 .../nb/nbench/pkg-fun.nix} | 0 .../nb/nbstripout/pkg-fun.nix} | 0 .../nb}/nbxplorer/deps.nix | 0 .../nb/nbxplorer/pkg-fun.nix} | 0 .../nb}/nbxplorer/update.sh | 0 .../nb}/nbxplorer/util/update-common.sh | 0 .../nc/nc4nix/pkg-fun.nix} | 0 .../default.nix => unit/nc/ncdc/pkg-fun.nix} | 0 .../dns => unit/nc}/ncdns/fix-tpl-path.patch | 0 .../default.nix => unit/nc/ncdns/pkg-fun.nix} | 0 .../default.nix => unit/nc/ncdu/pkg-fun.nix} | 0 .../ncdu/1.nix => unit/nc/ncdu_1/pkg-fun.nix} | 0 .../default.nix => unit/nc/ncftp/pkg-fun.nix} | 0 .../nc/ncgopher/pkg-fun.nix} | 0 .../default.nix => unit/nc/ncmpc/pkg-fun.nix} | 0 .../nc/ncmpcpp/pkg-fun.nix} | 0 .../nc}/ncnn/cmakelists.patch | 0 .../default.nix => unit/nc/ncnn/pkg-fun.nix} | 0 .../default.nix => unit/nc/nco/pkg-fun.nix} | 0 .../nc/ncompress/pkg-fun.nix} | 0 .../nc/ncpamixer/pkg-fun.nix} | 0 .../nc/ncrack/pkg-fun.nix} | 0 .../nc/ncview/pkg-fun.nix} | 0 .../default.nix => unit/nd/ndi/pkg-fun.nix} | 0 .../libraries => unit/nd}/ndi/update.py | 0 .../libraries => unit/nd}/ndi/version.json | 0 .../nd/ndisc6/pkg-fun.nix} | 0 .../nd/ndjbdns/pkg-fun.nix} | 0 .../default.nix => unit/nd/ndpi/pkg-fun.nix} | 0 .../default.nix => unit/nd/ndppd/pkg-fun.nix} | 0 .../nd/ndstool/pkg-fun.nix} | 0 .../ne/default.nix => unit/ne/ne/pkg-fun.nix} | 0 ...01-make-near-test-contracts-optional.patch | 0 .../ne/nearcore/pkg-fun.nix} | 0 .../default.nix => unit/ne/neard/pkg-fun.nix} | 0 .../ne/neardal/pkg-fun.nix} | 0 .../ne/neatvnc/pkg-fun.nix} | 0 .../ne/nebula/pkg-fun.nix} | 0 .../default.nix => unit/ne/nedit/pkg-fun.nix} | 0 .../default.nix => unit/ne/neil/pkg-fun.nix} | 0 .../default.nix => unit/ne/neko/pkg-fun.nix} | 0 .../default.nix => unit/ne/nelua/pkg-fun.nix} | 0 .../ne/nemiver/pkg-fun.nix} | 0 .../ne/nengo-gui/pkg-fun.nix} | 0 .../ne/neo-cowsay/pkg-fun.nix} | 0 .../default.nix => unit/ne/neo/pkg-fun.nix} | 0 .../ne/neo4j-desktop/pkg-fun.nix} | 0 .../default.nix => unit/ne/neo4j/pkg-fun.nix} | 0 .../ne/neocomp/pkg-fun.nix} | 0 .../ne/neofetch/pkg-fun.nix} | 0 .../ne/neomutt/pkg-fun.nix} | 0 .../ne}/neon/darwin-fix-configure.patch | 0 .../default.nix => unit/ne/neon/pkg-fun.nix} | 0 .../ne/neovide/pkg-fun.nix} | 0 .../ne}/neovide/skia-externals.json | 0 .../ne/neovim-remote/pkg-fun.nix} | 0 .../ne/nerd-font-patcher/pkg-fun.nix} | 0 .../ne/nerdctl/pkg-fun.nix} | 0 .../ne/nerdfonts/pkg-fun.nix} | 0 .../fonts => unit/ne}/nerdfonts/shas.nix | 0 .../fonts => unit/ne}/nerdfonts/update.sh | 0 .../fonts => unit/ne}/nerdfonts/version.nix | 0 .../ne}/nestopia/build-fix.patch | 0 .../emulators => unit/ne}/nestopia/gcc6.patch | 0 .../ne/nestopia/pkg-fun.nix} | 0 .../ne/net-snmp/pkg-fun.nix} | 0 .../ne}/netatalk/000-no-suid.patch | 0 .../001-omit-localstatedir-creation.patch | 0 .../ne/netatalk/pkg-fun.nix} | 0 .../ne/netavark/pkg-fun.nix} | 0 .../ne/netboot/pkg-fun.nix} | 0 .../ne/netbootxyz-efi/pkg-fun.nix} | 0 .../web-apps => unit/ne}/netbox/config.patch | 0 .../ne}/netbox/graphql-3_2_0.patch | 0 .../ne/netbox/pkg-fun.nix} | 0 .../ne/netcat-gnu/pkg-fun.nix} | 0 .../ne/netcat-openbsd/pkg-fun.nix} | 0 .../ne/netcdfcxx4/pkg-fun.nix} | 0 .../misc => unit/ne}/netcoredbg/deps.nix | 0 .../misc => unit/ne}/netcoredbg/limits.patch | 0 .../ne/netcoredbg/pkg-fun.nix} | 0 .../ne/netdiscover/pkg-fun.nix} | 0 .../ne}/netease-music-tui/cargo-lock.patch | 0 .../ne/netease-music-tui/pkg-fun.nix} | 0 .../netease-music-tui/update-cargo-lock.sh | 0 .../ne/netevent/pkg-fun.nix} | 0 .../ne/netflix/pkg-fun.nix} | 0 .../ne/nethogs/pkg-fun.nix} | 0 .../ne/nethoscope/pkg-fun.nix} | 0 .../ne/netifd/pkg-fun.nix} | 0 .../ne/netkittftp/pkg-fun.nix} | 0 .../ne}/netlify-cli/composition.nix | 0 .../ne}/netlify-cli/netlify-cli.json | 0 .../ne/netlify-cli}/node-env.nix | 0 .../ne}/netlify-cli/node-packages.nix | 0 .../ne/netlify-cli/pkg-fun.nix} | 0 .../web => unit/ne}/netlify-cli/test.nix | 0 .../ne/netlogo/pkg-fun.nix} | 0 .../ne/netmask/pkg-fun.nix} | 0 .../ne/netpbm/pkg-fun.nix} | 0 .../graphics => unit/ne}/netpbm/update.sh | 0 .../ne/netperf/pkg-fun.nix} | 0 .../ne/netplan/pkg-fun.nix} | 0 .../ne/netproc/pkg-fun.nix} | 0 .../ne/netris/pkg-fun.nix} | 0 .../default.nix => unit/ne/netrw/pkg-fun.nix} | 0 .../ne/netselect/pkg-fun.nix} | 0 .../ne/netsniff-ng/pkg-fun.nix} | 0 .../ne/networkaudiod/pkg-fun.nix} | 0 .../ne}/networking-ts-cxx/networking_ts.pc.in | 0 .../ne/networking-ts-cxx/pkg-fun.nix} | 0 .../fix-paths.patch | 0 .../networkmanager-fortisslvpn/pkg-fun.nix} | 0 .../ne/networkmanager-iodine}/fix-paths.patch | 0 .../ne/networkmanager-iodine/pkg-fun.nix} | 0 .../ne/networkmanager-l2tp}/fix-paths.patch | 0 .../ne/networkmanager-l2tp/pkg-fun.nix} | 0 .../fix-paths.patch | 0 .../networkmanager-openconnect/pkg-fun.nix} | 0 .../networkmanager-openvpn}/fix-paths.patch | 0 .../ne/networkmanager-openvpn/pkg-fun.nix} | 0 .../ne/networkmanager-sstp/pkg-fun.nix} | 0 .../ne/networkmanager-vpnc}/fix-paths.patch | 0 .../ne/networkmanager-vpnc/pkg-fun.nix} | 0 .../networkmanager/fix-install-paths.patch | 0 .../ne}/networkmanager/fix-paths.patch | 0 .../ne/networkmanager/pkg-fun.nix} | 0 .../ne/networkmanager_dmenu/pkg-fun.nix} | 0 .../ne/networkmanager_strongswan/pkg-fun.nix} | 0 .../ne/networkmanagerapplet/pkg-fun.nix} | 0 .../ne/neverball/pkg-fun.nix} | 0 .../ne/new-session-manager/pkg-fun.nix} | 0 .../ne/newman}/node-composition.nix | 0 .../ne/newman}/node-env.nix | 0 .../web => unit/ne}/newman/node-packages.nix | 0 .../web => unit/ne}/newman/package.json | 0 .../ne/newman/pkg-fun.nix} | 0 .../ne/newrelic-sysmond/pkg-fun.nix} | 0 .../ne/newtonwars/pkg-fun.nix} | 0 .../default.nix => unit/ne/nex/pkg-fun.nix} | 0 .../ne/nextcloud-news-updater/pkg-fun.nix} | 0 .../ne/nextdns/pkg-fun.nix} | 0 .../ne/nextflow/pkg-fun.nix} | 0 .../ne/nexuiz/pkg-fun.nix} | 0 .../default.nix => unit/nf/nfd/pkg-fun.nix} | 0 .../nf/nfdump/pkg-fun.nix} | 0 .../default.nix => unit/nf/nfpm/pkg-fun.nix} | 0 .../nf/nfs-ganesha/pkg-fun.nix} | 0 .../nf/nfs-utils/pkg-fun.nix} | 0 .../nf/nfstrace/pkg-fun.nix} | 0 .../nf/nftables/pkg-fun.nix} | 0 .../ng/ngadmin/pkg-fun.nix} | 0 .../ng/nghttp2/pkg-fun.nix} | 0 .../ng/nghttp3/pkg-fun.nix} | 0 .../ng/nginx-config-formatter/pkg-fun.nix} | 0 .../nginx-doc/exclude-google-analytics.patch | 0 .../ng/nginx-doc/pkg-fun.nix} | 0 .../ng/nginx-sso/pkg-fun.nix} | 0 .../{servers => unit/ng}/nginx-sso/rune.patch | 0 .../ng/ngircd/pkg-fun.nix} | 0 .../default.nix => unit/ng/ngn-k/pkg-fun.nix} | 0 .../ng}/ngn-k/repl-license-path.patch | 0 .../default.nix => unit/ng/ngrep/pkg-fun.nix} | 0 .../default.nix => unit/ng/ngrok/pkg-fun.nix} | 0 .../networking => unit/ng}/ngrok/update.sh | 0 .../ng}/ngrok/versions.json | 0 .../ng/ngspice/pkg-fun.nix} | 0 .../default.nix => unit/ng/ngt/pkg-fun.nix} | 0 .../ng/ngtcp2-gnutls/pkg-fun.nix} | 0 .../ng/ngtcp2/pkg-fun.nix} | 0 .../nh/nhentai/pkg-fun.nix} | 0 .../ni/nice-dcv-client/pkg-fun.nix} | 0 .../ni/nickel/pkg-fun.nix} | 0 .../ni/nicotine-plus/pkg-fun.nix} | 0 .../default.nix => unit/ni/niff/pkg-fun.nix} | 0 .../default.nix => unit/ni/nifi/pkg-fun.nix} | 0 .../ni/nifticlib/pkg-fun.nix} | 0 .../ni/niftyreg/pkg-fun.nix} | 0 .../ni/niftyseg/pkg-fun.nix} | 0 .../ni/nika-fonts/pkg-fun.nix} | 0 .../ni}/nikto/NIKTODIR-nix-wrapper-fix.patch | 0 .../default.nix => unit/ni/nikto/pkg-fun.nix} | 0 .../default.nix => unit/ni/nil/pkg-fun.nix} | 0 .../ni/nilfs-utils/pkg-fun.nix} | 0 .../ni/nimlsp/pkg-fun.nix} | 0 .../default.nix => unit/ni/nimmm/pkg-fun.nix} | 0 .../default.nix => unit/ni/ninja/pkg-fun.nix} | 0 .../ni}/ninja/setup-hook.sh | 0 .../ni/ninjas2/pkg-fun.nix} | 0 .../default.nix => unit/ni/ninka/pkg-fun.nix} | 0 .../ni/ninvaders/pkg-fun.nix} | 0 .../default.nix => unit/ni/nip2/pkg-fun.nix} | 0 .../default.nix => unit/ni/nitch/pkg-fun.nix} | 0 .../ni/nitrogen/pkg-fun.nix} | 0 .../ni/nitrokey-udev-rules/pkg-fun.nix} | 0 .../ni}/nitter/nitter-version.patch | 0 .../ni/nitter/pkg-fun.nix} | 0 pkgs/{servers => unit/ni}/nitter/update.sh | 0 .../ni/nix-bash-completions/pkg-fun.nix} | 0 .../nix-binary-cache-start.in | 0 .../nix-binary-cache/nix-binary-cache.cgi.in | 0 .../ni/nix-binary-cache/pkg-fun.nix} | 0 .../ni/nix-bisect/pkg-fun.nix} | 0 .../ni/nix-build-uncached/pkg-fun.nix} | 0 .../ni/nix-bundle/pkg-fun.nix} | 0 .../ni/nix-direnv/pkg-fun.nix} | 0 .../ni/nix-doc/pkg-fun.nix} | 0 .../nix-generate-from-cpan.pl | 0 .../ni/nix-generate-from-cpan/pkg-fun.nix | 0 .../ni/nix-gitignore/pkg-fun.nix} | 0 .../ni/nix-index/pkg-fun.nix} | 0 .../nix/info => unit/ni/nix-info}/info.sh | 0 .../info => unit/ni/nix-info}/multiuser.nix | 0 .../ni/nix-info/pkg-fun.nix} | 0 .../ni/nix-info}/relaxedsandbox.nix | 0 .../nix/info => unit/ni/nix-info}/sandbox.nix | 0 .../ni/nix-ld/pkg-fun.nix} | 0 .../nix-output-monitor/generated-package.nix | 0 .../ni/nix-output-monitor/pkg-fun.nix} | 0 .../ni}/nix-output-monitor/update.sh | 0 .../ni/nix-pin/pkg-fun.nix} | 0 .../ni/nix-plugins/pkg-fun.nix} | 0 .../nix-prefetch-docker}/nix-prefetch-docker | 0 .../ni/nix-prefetch-docker/pkg-fun.nix} | 0 .../ni/nix-prefetch/pkg-fun.nix} | 0 .../ni/nix-query-tree-viewer/pkg-fun.nix} | 0 .../ni/nix-script/pkg-fun.nix} | 0 .../ni/nix-serve/pkg-fun.nix} | 0 .../ni/nix-simple-deploy/pkg-fun.nix} | 0 .../ni/nix-store-gcs-proxy/pkg-fun.nix} | 0 .../ni/nix-top/pkg-fun.nix} | 0 .../ni/nix-tour/pkg-fun.nix} | 0 .../ni/nix-universal-prefetch/pkg-fun.nix} | 0 .../ni/nix-update-script/pkg-fun.nix} | 0 .../ni/nix-update-source/pkg-fun.nix} | 0 .../ni/nix-zsh-completions/pkg-fun.nix} | 0 .../ni/nixdoc/pkg-fun.nix} | 0 .../default.nix => unit/ni/nixel/pkg-fun.nix} | 0 .../nixops => unit/ni/nixops-dns}/deps.nix | 0 .../ni/nixops-dns/pkg-fun.nix} | 0 .../ni/nixos-artwork/pkg-fun.nix} | 0 .../ni}/nixos-artwork/wallpapers.nix | 0 .../nixos-container-completion.sh | 0 .../ni}/nixos-container/nixos-container.pl | 0 .../ni/nixos-container/pkg-fun.nix} | 0 .../ni/nixos-generators/pkg-fun.nix} | 0 .../ni/nixos-grub2-theme/pkg-fun.nix} | 0 .../ni/nixos-icons/pkg-fun.nix} | 0 .../ni/nixos-install-tools/pkg-fun.nix} | 0 .../ni/nixos-shell/pkg-fun.nix} | 0 .../ni/nixpacks/pkg-fun.nix} | 0 .../ni/nixpkgs-fmt/pkg-fun.nix} | 0 .../ni/nixpkgs-hammering/pkg-fun.nix} | 0 .../unit/ni/nixpkgs-lint}/nixpkgs-lint.pl | 0 .../unit/ni/nixpkgs-lint/pkg-fun.nix | 0 .../ni/nixpkgs-review/pkg-fun.nix} | 0 pkgs/{games => unit/nj}/njam/logfile.patch | 0 .../default.nix => unit/nj/njam/pkg-fun.nix} | 0 .../default.nix => unit/nk/nkeys/pkg-fun.nix} | 0 .../default.nix => unit/nk/nkf/pkg-fun.nix} | 0 .../default.nix => unit/nl/nload/pkg-fun.nix} | 0 .../nl/nlohmann_json/pkg-fun.nix} | 0 .../nl}/nlojet/nlojet_clang_fix.patch | 0 .../nl/nlojet/pkg-fun.nix} | 0 .../nm/nmap-formatter/pkg-fun.nix} | 0 .../default.nix => unit/nm/nmap/pkg-fun.nix} | 0 .../security => unit/nm}/nmap/zenmap.patch | 0 .../default.nix => unit/nm/nmon/pkg-fun.nix} | 0 .../nm/nmrpflash/pkg-fun.nix} | 0 .../default.nix => unit/nm/nms/pkg-fun.nix} | 0 .../default.nix => unit/nn/nng/pkg-fun.nix} | 0 .../default.nix => unit/nn/nnn/pkg-fun.nix} | 0 .../default.nix => unit/nn/nnpdf/pkg-fun.nix} | 0 .../nn/nntp-proxy/pkg-fun.nix} | 0 .../no/noaa-apt/pkg-fun.nix} | 0 .../no/node-problem-detector/pkg-fun.nix} | 0 .../no/nodenv/pkg-fun.nix} | 0 .../default.nix => unit/no/noice/pkg-fun.nix} | 0 .../default.nix => unit/no/noip/pkg-fun.nix} | 0 .../no/noise-repellent/pkg-fun.nix} | 0 .../no/noisetorch/pkg-fun.nix} | 0 .../no/nomachine-client/pkg-fun.nix} | 0 .../no/nomad-autoscaler/pkg-fun.nix} | 0 .../no/nomad-driver-podman/pkg-fun.nix} | 0 .../no/nomad-pack/pkg-fun.nix} | 0 .../no/nominatim/pkg-fun.nix} | 0 .../no/nomino/pkg-fun.nix} | 0 .../no/nordic/pkg-fun.nix} | 0 .../no/nordzy-cursor-theme/pkg-fun.nix} | 0 .../no/nordzy-icon-theme/pkg-fun.nix} | 0 .../no/normalize/pkg-fun.nix} | 0 .../no/norminette/pkg-fun.nix} | 0 .../no/norwester-font/pkg-fun.nix} | 0 .../no/nosqli/pkg-fun.nix} | 0 .../no/notable/pkg-fun.nix} | 0 .../no}/notary/no-git-usage.patch | 0 .../no/notary/pkg-fun.nix} | 0 .../no/notcurses/pkg-fun.nix} | 0 .../no/notejot/pkg-fun.nix} | 0 .../no/notemap/pkg-fun.nix} | 0 .../no/notes-up/pkg-fun.nix} | 0 .../no/noteshrink/pkg-fun.nix} | 0 .../no/notify-desktop/pkg-fun.nix} | 0 .../no/notify-osd-customizable/pkg-fun.nix} | 0 .../no/notify-osd/pkg-fun.nix} | 0 .../no/notify-sharp/pkg-fun.nix} | 0 .../no/notify/pkg-fun.nix} | 0 .../no/notifymuch/pkg-fun.nix} | 0 .../no/notion-app-enhanced/pkg-fun.nix} | 0 .../no/notion/pkg-fun.nix} | 0 .../no/notmuch-addrlookup/pkg-fun.nix} | 0 .../no/notmuch-bower/pkg-fun.nix} | 0 .../no/notmuch-mailmover/pkg-fun.nix} | 0 .../no/notmuch-mutt/pkg-fun.nix} | 0 .../no}/novnc/fix-paths.patch | 0 .../default.nix => unit/no/novnc/pkg-fun.nix} | 0 .../no}/novnc/websockify.patch | 0 .../no}/noweb/no-FAQ.patch | 0 .../default.nix => unit/no/noweb/pkg-fun.nix} | 0 .../no}/nox/nox-review-wip.patch | 0 .../default.nix => unit/no/nox/pkg-fun.nix} | 0 .../np/np2kai/pkg-fun.nix} | 0 .../np/npapi_sdk/pkg-fun.nix} | 0 .../default.nix => unit/np/npiet/pkg-fun.nix} | 0 .../default.nix => unit/np/npins/pkg-fun.nix} | 0 pkgs/{tools/nix => unit/np}/npins/source.nix | 0 .../{tools/nix => unit/np}/npins/sources.json | 0 .../np/npmHooks}/npm-build-hook.sh | 0 .../np/npmHooks}/npm-config-hook.sh | 0 .../np/npmHooks}/npm-install-hook.sh | 0 .../np/npmHooks/pkg-fun.nix} | 0 .../default.nix => unit/np/npth/pkg-fun.nix} | 0 .../default.nix => unit/np/npush/pkg-fun.nix} | 0 .../nq/default.nix => unit/nq/nq/pkg-fun.nix} | 0 .../nq}/nqc/nqc-unistd.patch | 0 .../default.nix => unit/nq/nqc/pkg-fun.nix} | 0 .../nqp.nix => unit/nq/nqp/pkg-fun.nix} | 0 .../default.nix => unit/nq/nqptp/pkg-fun.nix} | 0 .../nr/nrf-command-line-tools/pkg-fun.nix} | 0 .../nr/nrf5-sdk/pkg-fun.nix} | 0 .../nr/nrfconnect/pkg-fun.nix} | 0 .../nr/nrfutil/pkg-fun.nix} | 0 .../nr/nrg2iso/pkg-fun.nix} | 0 .../default.nix => unit/nr/nrpl/pkg-fun.nix} | 0 .../default.nix => unit/nr/nrsc5/pkg-fun.nix} | 0 .../ns/NSPlist/pkg-fun.nix} | 0 .../default.nix => unit/ns/nsh/pkg-fun.nix} | 0 .../default.nix => unit/ns/nsis/pkg-fun.nix} | 0 .../ns/nsjail/pkg-fun.nix} | 0 .../default.nix => unit/ns/nsncd/pkg-fun.nix} | 0 .../default.nix => unit/ns/nsq/pkg-fun.nix} | 0 .../linux => unit/ns}/nss_ldap/crashes.patch | 0 .../nss_ldap/nss_ldap-265-glibc-2.16.patch | 0 .../ns/nss_ldap/pkg-fun.nix} | 0 .../ns/nss_pam_ldapd/pkg-fun.nix} | 0 .../ns/nss_wrapper/pkg-fun.nix} | 0 .../ns/nssmdns/pkg-fun.nix} | 0 .../default.nix => unit/ns/nsync/pkg-fun.nix} | 0 .../nt/ntbtls/pkg-fun.nix} | 0 .../nt/ntirpc/pkg-fun.nix} | 0 .../default.nix => unit/nt/ntk/pkg-fun.nix} | 0 .../default.nix => unit/nt/ntl/pkg-fun.nix} | 0 .../nt/ntlmrecon/pkg-fun.nix} | 0 .../nt/ntopng/pkg-fun.nix} | 0 .../nt}/ntp/glibc-2.34-fix.patch | 0 .../default.nix => unit/nt/ntp/pkg-fun.nix} | 0 .../nt}/ntrack/libnl-fix.patch | 0 .../nt/ntrack/pkg-fun.nix} | 0 .../nt}/nttcp/format-security.patch | 0 .../default.nix => unit/nt/nttcp/pkg-fun.nix} | 0 .../nt/ntttcp/pkg-fun.nix} | 0 .../default.nix => unit/nu/nuXmv/pkg-fun.nix} | 0 .../nu/nuclear/pkg-fun.nix} | 0 .../nu/nuclei/pkg-fun.nix} | 0 .../nu/nudoku/pkg-fun.nix} | 0 .../nu}/nuget-to-nix/nuget-to-nix.sh | 0 .../nu/nuget-to-nix/pkg-fun.nix} | 0 .../nu/nullidentdmod/pkg-fun.nix} | 0 .../nu/num-utils/pkg-fun.nix} | 0 .../nu/numactl/pkg-fun.nix} | 0 .../nu}/numad/numad-linker-flags.patch | 0 .../default.nix => unit/nu/numad/pkg-fun.nix} | 0 .../nu/numatop/pkg-fun.nix} | 0 .../nu/numberstation/pkg-fun.nix} | 0 .../nu/numdiff/pkg-fun.nix} | 0 .../nu/numix-cursor-theme/pkg-fun.nix} | 0 .../nu/numix-gtk-theme/pkg-fun.nix} | 0 .../nu/numix-icon-theme-circle/pkg-fun.nix} | 0 .../nu/numix-icon-theme-square/pkg-fun.nix} | 0 .../nu/numix-solarized-gtk-theme/pkg-fun.nix} | 0 .../nu/numix-sx-gtk-theme/pkg-fun.nix} | 0 .../nu/numlockx/pkg-fun.nix} | 0 .../0001-ion-linux-makerules.patch | 0 .../nu/numworks-epsilon/pkg-fun.nix} | 0 .../50-numworks-calculator.rules | 0 .../nu/numworks-udev-rules/pkg-fun.nix} | 0 .../nu}/numworks-udev-rules/update.sh | 0 .../nu/nuraft/pkg-fun.nix} | 0 .../default.nix => unit/nu/nurl/pkg-fun.nix} | 0 .../default.nix => unit/nu/nusmv/pkg-fun.nix} | 0 .../nu/nuspell/pkg-fun.nix} | 0 .../misc => unit/nu}/nut/hardcode-paths.patch | 0 .../default.nix => unit/nu/nut/pkg-fun.nix} | 0 .../nu/nuttcp/pkg-fun.nix} | 0 .../default.nix => unit/nu/nux/pkg-fun.nix} | 0 .../nv/nv-codec-headers-10/pkg-fun.nix} | 0 .../nv/nv-codec-headers-11/pkg-fun.nix} | 0 .../nv/nv-codec-headers/pkg-fun.nix} | 0 .../default.nix => unit/nv/nvc/pkg-fun.nix} | 0 .../default.nix => unit/nv/nvd/pkg-fun.nix} | 0 .../default.nix => unit/nv/nvi/pkg-fun.nix} | 0 .../nv/nvidia-optical-flow-sdk/pkg-fun.nix} | 0 .../nv/nvidia-texture-tools/pkg-fun.nix} | 0 .../nv/nvidia-video-sdk/pkg-fun.nix} | 0 .../nv/nvidia_cg_toolkit/pkg-fun.nix} | 0 .../nv/nvimpager/pkg-fun.nix} | 0 .../nv/nvitop/pkg-fun.nix} | 0 .../nv/nvme-cli/pkg-fun.nix} | 0 .../nv/nvmet-cli/pkg-fun.nix} | 0 .../default.nix => unit/nv/nvpy/pkg-fun.nix} | 0 .../misc => unit/nw}/nwg-bar/fix-paths.patch | 0 .../nw/nwg-bar/pkg-fun.nix} | 0 .../nw/nwg-dock/pkg-fun.nix} | 0 .../nw/nwg-drawer/pkg-fun.nix} | 0 .../nw/nwg-launchers/pkg-fun.nix} | 0 .../nw/nwg-menu/pkg-fun.nix} | 0 .../nw/nwg-panel/pkg-fun.nix} | 0 .../nw/nwg-wrapper/pkg-fun.nix} | 0 .../default.nix => unit/nw/nwipe/pkg-fun.nix} | 0 .../nx/nx-libs/pkg-fun.nix} | 0 .../nx/nx2elf/pkg-fun.nix} | 0 .../nx/nxengine-evo/pkg-fun.nix} | 0 .../nx/nxpmicro-mfgtools/pkg-fun.nix} | 0 .../ny/nyancat/pkg-fun.nix} | 0 .../ny}/nylon/configure-use-solib.patch | 0 .../default.nix => unit/ny/nylon/pkg-fun.nix} | 0 .../default.nix => unit/ny/nyx/pkg-fun.nix} | 0 .../default.nix => unit/ny/nyxt/pkg-fun.nix} | 0 .../o/default.nix => unit/o/o/pkg-fun.nix} | 0 .../default.nix => unit/oa/oak/pkg-fun.nix} | 0 .../oa/oapi-codegen/pkg-fun.nix} | 0 .../oa/oath-toolkit/pkg-fun.nix} | 0 .../default.nix => unit/oa/oatpp/pkg-fun.nix} | 0 .../oa/oauth2-proxy/pkg-fun.nix} | 0 .../obb.nix => unit/ob/obb/pkg-fun.nix} | 0 .../ob/obconf/pkg-fun.nix} | 0 .../ob/oberon-risc-emu/pkg-fun.nix} | 0 ...obex-data-server-0.4.6-build-fixes-1.patch | 0 .../ob/obex_data_server/pkg-fun.nix} | 0 .../default.nix => unit/ob/obexd/pkg-fun.nix} | 0 .../ob/obexfs/pkg-fun.nix} | 0 .../ob/obexftp/pkg-fun.nix} | 0 .../default.nix => unit/ob/obfs4/pkg-fun.nix} | 0 .../ob/obinskit/pkg-fun.nix} | 0 .../ob/obitools3/pkg-fun.nix} | 0 .../ob/objconv/pkg-fun.nix} | 0 .../ob/obsidian/pkg-fun.nix} | 0 .../ob/obuild/pkg-fun.nix} | 0 .../oc/ocaml-top/pkg-fun.nix} | 0 .../oc/ocaml_make/pkg-fun.nix} | 0 .../oc/ocaml_make}/setup-hook.sh | 0 .../oc/ocenaudio/pkg-fun.nix} | 0 .../oc/ocf-resource-agents/pkg-fun.nix} | 0 .../oc/oci-cli/pkg-fun.nix} | 0 .../oc/oci-seccomp-bpf-hook/pkg-fun.nix} | 0 .../oc/ociTools/pkg-fun.nix} | 0 .../oc/ocl-icd/pkg-fun.nix} | 0 .../oc/oclgrind/pkg-fun.nix} | 0 .../default.nix => unit/oc/ocm/pkg-fun.nix} | 0 .../oc/ocproxy/pkg-fun.nix} | 0 .../default.nix => unit/oc/ocr-a/pkg-fun.nix} | 0 .../default.nix => unit/oc/ocrad/pkg-fun.nix} | 0 .../oc}/ocrfeeder/fix-launch.diff | 0 .../oc/ocrfeeder/pkg-fun.nix} | 0 .../oc/ocserv/pkg-fun.nix} | 0 .../oc/ocsigen-i18n/pkg-fun.nix} | 0 .../oc/octant-desktop/pkg-fun.nix} | 0 .../oc/octant-desktop}/update-desktop.sh | 0 .../oc/octant/pkg-fun.nix} | 0 .../cluster => unit/oc}/octant/update.sh | 0 .../oc/octave-kernel}/kernel.nix | 0 .../oc/octave-kernel/pkg-fun.nix} | 0 .../oc/octomap/pkg-fun.nix} | 0 .../oc}/octoprint/ffmpeg-path.patch | 0 .../misc => unit/oc}/octoprint/pip-path.patch | 0 .../oc/octoprint/pkg-fun.nix} | 0 .../misc => unit/oc}/octoprint/plugins.nix | 0 .../oc/octopus-caller/pkg-fun.nix} | 0 .../oc/octopus/pkg-fun.nix} | 0 .../oc/octosql/pkg-fun.nix} | 0 .../oc/oculante/pkg-fun.nix} | 0 .../od/odamex/pkg-fun.nix} | 0 .../default.nix => unit/od/ode/pkg-fun.nix} | 0 .../default.nix => unit/od/odin/pkg-fun.nix} | 0 .../default.nix => unit/od/odin2/pkg-fun.nix} | 0 .../default.nix => unit/od/odo/pkg-fun.nix} | 0 .../default.nix => unit/od/odoo/pkg-fun.nix} | 0 .../finance => unit/od}/odoo/update.sh | 0 .../default.nix => unit/od/odpic/pkg-fun.nix} | 0 .../od/odroid-xu3-bootloader/pkg-fun.nix} | 0 .../od/odt2txt/pkg-fun.nix} | 0 .../od/odyssey/pkg-fun.nix} | 0 .../default.nix => unit/oe/oed/pkg-fun.nix} | 0 .../of/offensive-azure/pkg-fun.nix} | 0 .../of/office-code-pro/pkg-fun.nix} | 0 .../of/offlineimap/pkg-fun.nix} | 0 .../of/offpunk/pkg-fun.nix} | 0 .../of/offrss/pkg-fun.nix} | 0 ...arch-connectors-in-OFONO_PLUGIN_PATH.patch | 0 .../default.nix => unit/of/ofono/pkg-fun.nix} | 0 .../default.nix => unit/og/ogdf/pkg-fun.nix} | 0 .../og/oggvideotools/pkg-fun.nix} | 0 .../og/ogmtools/pkg-fun.nix} | 0 .../default.nix => unit/og/ograc/pkg-fun.nix} | 0 .../og/ogre1_10/pkg-fun.nix} | 0 .../1.9.x.nix => unit/og/ogre1_9/pkg-fun.nix} | 0 .../default.nix => unit/og/oguri/pkg-fun.nix} | 0 .../oh/oh-my-fish/pkg-fun.nix} | 0 .../oh/oh-my-git/pkg-fun.nix} | 0 .../oh/oh-my-posh/pkg-fun.nix} | 0 .../oh/oh-my-zsh/pkg-fun.nix} | 0 .../oh/default.nix => unit/oh/oh/pkg-fun.nix} | 0 .../oi/oidentd/pkg-fun.nix} | 0 .../oi/oil-buku/pkg-fun.nix} | 0 .../default.nix => unit/oi/oil/pkg-fun.nix} | 0 .../oi/oilrush/pkg-fun.nix} | 0 .../default.nix => unit/ok/oksh/pkg-fun.nix} | 0 .../ok/okteto/pkg-fun.nix} | 0 .../default.nix => unit/ol/ola/pkg-fun.nix} | 0 .../ol/olaris-server/pkg-fun.nix} | 0 .../ol/oldsindhi/pkg-fun.nix} | 0 .../ol/oldstandard/pkg-fun.nix} | 0 .../default.nix => unit/ol/olm/pkg-fun.nix} | 0 .../default.nix => unit/ol/olsrd/pkg-fun.nix} | 0 .../default.nix => unit/om/om4/pkg-fun.nix} | 0 .../default.nix => unit/om/omake/pkg-fun.nix} | 0 .../default.nix => unit/om/omapd/pkg-fun.nix} | 0 .../security => unit/om}/omapd/zlib.patch | 0 .../default.nix => unit/om/ombi/pkg-fun.nix} | 0 pkgs/{servers => unit/om}/ombi/update.sh | 0 .../omegat.nix => unit/om/omegat/pkg-fun.nix} | 0 .../om/omni-gtk-theme/pkg-fun.nix} | 0 .../om/omniorb/pkg-fun.nix} | 0 .../om}/omnisharp-roslyn/deps.nix | 0 .../om/omnisharp-roslyn/pkg-fun.nix} | 0 .../om}/omnisharp-roslyn/updater.sh | 0 .../om/omping/pkg-fun.nix} | 0 .../om/omxplayer/pkg-fun.nix} | 0 .../misc => unit/on}/onboard/fix-paths.patch | 0 .../onboard/hunspell-use-xdg-datadirs.patch | 0 .../on/onboard/pkg-fun.nix} | 0 .../on/oneDNN/pkg-fun.nix} | 0 .../tools/misc => unit/on}/one_gadget/Gemfile | 0 .../misc => unit/on}/one_gadget/Gemfile.lock | 0 .../misc => unit/on}/one_gadget/gemset.nix | 0 .../on/one_gadget/pkg-fun.nix} | 0 .../on/onedrive/pkg-fun.nix} | 0 .../default.nix => unit/on/oneko/pkg-fun.nix} | 0 .../on/oneshot/pkg-fun.nix} | 0 .../on/onesixtyone/pkg-fun.nix} | 0 .../on/onestepback/pkg-fun.nix} | 0 .../editors => unit/on}/oni2/common.nix | 0 .../on}/oni2/esy_skia_use_nixpkgs.patch | 0 .../editors => unit/on}/oni2/extensions.lock | 0 .../editors => unit/on}/oni2/extensions.nix | 0 .../editors => unit/on}/oni2/node.lock | 0 .../editors => unit/on}/oni2/node.nix | 0 .../default.nix => unit/on/oni2/pkg-fun.nix} | 0 .../on/oniguruma/pkg-fun.nix} | 0 .../on/onioncircuits/pkg-fun.nix} | 0 .../on/onlykey-agent/pkg-fun.nix} | 0 .../on/onlykey-cli/pkg-fun.nix} | 0 .../on/onlyoffice-bin/pkg-fun.nix} | 0 .../on}/onlyoffice-bin/update.sh | 0 .../on/onlyoffice-documentserver/pkg-fun.nix} | 0 .../on/onmetal-image/pkg-fun.nix} | 0 .../on/onscripter-en/pkg-fun.nix} | 0 .../oo/oobicpl/pkg-fun.nix} | 0 .../oo/ookla-speedtest/pkg-fun.nix} | 0 .../oo/oonf-olsrd2/pkg-fun.nix} | 0 .../oo/ooniprobe-cli/pkg-fun.nix} | 0 .../default.nix => unit/op/opae/pkg-fun.nix} | 0 .../op/opaline/pkg-fun.nix} | 0 .../op/opam-installer/pkg-fun.nix} | 0 .../op/opam2json/pkg-fun.nix} | 0 .../op/opcr-policy/pkg-fun.nix} | 0 .../op/open-dyslexic/pkg-fun.nix} | 0 .../op/open-ecard/pkg-fun.nix} | 0 .../op/open-fonts/pkg-fun.nix} | 0 .../op/open-isns/pkg-fun.nix} | 0 .../op/open-pdf-sign/pkg-fun.nix} | 0 .../op/open-policy-agent/pkg-fun.nix} | 0 .../op/open-sans/pkg-fun.nix} | 0 .../op/open-stage-control/pkg-fun.nix} | 0 .../op}/open-stage-control/update.sh | 0 .../op/open-vm-tools/pkg-fun.nix} | 0 .../op/open-watcom-bin-unwrapped/pkg-fun.nix} | 0 .../op/open-watcom-v2-unwrapped/pkg-fun.nix} | 0 .../op/open-wbo/pkg-fun.nix} | 0 .../op/openarena/pkg-fun.nix} | 0 .../2.nix => unit/op/openbabel2/pkg-fun.nix} | 0 .../op/openbgpd/pkg-fun.nix} | 0 .../op/openblas/pkg-fun.nix} | 0 .../op/openboardview/pkg-fun.nix} | 0 .../op/openbox/pkg-fun.nix} | 0 .../openbsm/bsm-add-audit_token_to_pid.patch | 0 .../op/openbsm/pkg-fun.nix} | 0 .../op/opencascade-occt/pkg-fun.nix} | 0 .../op/opencbm/pkg-fun.nix} | 0 .../op/opencc/pkg-fun.nix} | 0 .../op}/opencl-clang/opencl-headers-dir.patch | 0 .../op/opencl-clang/pkg-fun.nix} | 0 .../op/opencl-clhpp/pkg-fun.nix} | 0 .../op/opencl-headers/pkg-fun.nix} | 0 .../op}/opencl-info/opencl-info-clhpp2.diff | 0 .../op/opencl-info/pkg-fun.nix} | 0 .../op}/opencollada/pcre.patch | 0 .../op/opencollada/pkg-fun.nix} | 0 .../op/opencolorio_1/pkg-fun.nix} | 0 .../op/openconnectPackages}/common.nix | 0 .../op/openconnectPackages/pkg-fun.nix} | 0 .../op/opencore-amr/pkg-fun.nix} | 0 .../op/opencorsairlink/pkg-fun.nix} | 0 .../op/opencryptoki/pkg-fun.nix} | 0 .../op/openct/pkg-fun.nix} | 0 .../op/opendkim/pkg-fun.nix} | 0 .../op/opendmarc/pkg-fun.nix} | 0 .../op/opendune/pkg-fun.nix} | 0 .../op/opendylan_bin/pkg-fun.nix} | 0 .../op/openethereum/pkg-fun.nix} | 0 .../op/openexr_2/pkg-fun.nix} | 0 .../3.nix => unit/op/openexr_3/pkg-fun.nix} | 0 .../op}/openexrid-unstable/openexrid.patch | 0 .../op/openexrid-unstable/pkg-fun.nix} | 0 .../op/openfec/pkg-fun.nix} | 0 .../op/openfortivpn/pkg-fun.nix} | 0 .../op/openfpgaloader/pkg-fun.nix} | 0 .../op/openfst/pkg-fun.nix} | 0 .../op/openfx/pkg-fun.nix} | 0 .../op/opengrm-ngram/pkg-fun.nix} | 0 .../op/opengrok/pkg-fun.nix} | 0 .../op/openh264/pkg-fun.nix} | 0 .../op/openhmd/pkg-fun.nix} | 0 .../op/openimagedenoise/pkg-fun.nix} | 0 .../op/openimagedenoise_1_2_x/pkg-fun.nix} | 0 .../op/openipmi/pkg-fun.nix} | 0 .../op/openiscsi/pkg-fun.nix} | 0 .../sgml => unit/op}/openjade/msggen.patch | 0 .../op/openjade/pkg-fun.nix} | 0 .../op/openjk/pkg-fun.nix} | 0 .../op/openjpeg/pkg-fun.nix} | 0 .../op/openjump/pkg-fun.nix} | 0 .../op/openlibm/pkg-fun.nix} | 0 .../op/openlierox/pkg-fun.nix} | 0 .../op/openlilylib-fonts/pkg-fun.nix} | 0 .../op/openmm/pkg-fun.nix} | 0 .../op}/openmolcas/MKL-MPICH.patch | 0 .../op}/openmolcas/openblasPath.patch | 0 .../op/openmolcas/pkg-fun.nix} | 0 .../op/openmpi/pkg-fun.nix} | 0 .../op}/openmsx/custom-nix.mk | 0 .../op/openmsx/pkg-fun.nix} | 0 .../op/openmvg/pkg-fun.nix} | 0 .../op/openmvs/pkg-fun.nix} | 0 .../op/openntpd/pkg-fun.nix} | 0 .../op/openobex/pkg-fun.nix} | 0 .../op/openocd/pkg-fun.nix} | 0 .../op/openpa/pkg-fun.nix} | 0 .../op/openpam/pkg-fun.nix} | 0 .../op/openrct2/pkg-fun.nix} | 0 .../op/openresolv/pkg-fun.nix} | 0 .../op/openring/pkg-fun.nix} | 0 .../op/opensaml-cpp/pkg-fun.nix} | 0 .../op/opensbi/pkg-fun.nix} | 0 .../op/openseachest/pkg-fun.nix} | 0 .../op/openshift/pkg-fun.nix} | 0 .../op/openslide/pkg-fun.nix} | 0 .../op}/openslp/CVE-2016-4912.patch | 0 .../op}/openslp/CVE-2019-5544.patch | 0 .../op/openslp/pkg-fun.nix} | 0 .../op/opensm/pkg-fun.nix} | 0 .../op/opensmt/pkg-fun.nix} | 0 .../op/opensmtpd-extras/pkg-fun.nix} | 0 .../no-chown-while-installing.patch | 0 .../op/opensmtpd-filter-dkimsign/pkg-fun.nix} | 0 .../op/opensmtpd-filter-rspamd/pkg-fun.nix} | 0 .../mail => unit/op}/opensmtpd/cross_fix.diff | 0 .../op/opensmtpd/pkg-fun.nix} | 0 .../mail => unit/op}/opensmtpd/proc_path.diff | 0 .../networking => unit/op}/opensnitch/go.mod | 0 .../networking => unit/op}/opensnitch/go.sum | 0 .../op/opensnitch/pkg-fun.nix} | 0 .../op/opensoldat/pkg-fun.nix} | 0 .../op/opensp/pkg-fun.nix} | 0 .../sgml => unit/op}/opensp/setup-hook.sh | 0 .../op/openspecfun/pkg-fun.nix} | 0 .../op/openspin/pkg-fun.nix} | 0 .../op/opensubdiv/pkg-fun.nix} | 0 .../op/opensupaplex/pkg-fun.nix} | 0 .../X11 => unit/op}/opentabletdriver/deps.nix | 0 .../op/opentabletdriver/pkg-fun.nix} | 0 .../op}/opentabletdriver/update.sh | 0 .../pkg-fun.nix} | 0 .../op/opentelemetry-collector/pkg-fun.nix} | 0 .../op/opentracing-cpp/pkg-fun.nix} | 0 .../op/opentracker/pkg-fun.nix} | 0 .../op/opentsdb/pkg-fun.nix} | 0 .../op/openttd-grfcodec/pkg-fun.nix} | 0 .../op/openttd-nml/pkg-fun.nix} | 0 .../op/opentyrian/pkg-fun.nix} | 0 .../op/openvdb/pkg-fun.nix} | 0 .../op/openvpn3/pkg-fun.nix} | 0 .../op/openvpn_learnaddress/pkg-fun.nix} | 0 .../op/openwsman/pkg-fun.nix} | 0 .../op/openxr-loader/pkg-fun.nix} | 0 .../op/openxray/pkg-fun.nix} | 0 .../op/openzone-cursors/pkg-fun.nix} | 0 .../op/openzwave/pkg-fun.nix} | 0 .../default.nix => unit/op/opera/pkg-fun.nix} | 0 .../op/operator-sdk/pkg-fun.nix} | 0 .../op/opkg-utils/pkg-fun.nix} | 0 .../default.nix => unit/op/opkg/pkg-fun.nix} | 0 .../op/oppai-ng/pkg-fun.nix} | 0 .../default.nix => unit/op/ops/pkg-fun.nix} | 0 .../op/opsdroid/pkg-fun.nix} | 0 .../default.nix => unit/op/optar/pkg-fun.nix} | 0 .../op/optifinePackages}/generic.nix | 0 .../op/optifinePackages/pkg-fun.nix} | 0 .../op/optifinePackages}/update.py | 0 .../op/optifinePackages}/versions.json | 0 .../op/optparse-bash/pkg-fun.nix} | 0 .../op/opusTools/pkg-fun.nix} | 0 .../op}/opusfile/disable-cert-store.patch | 0 .../op}/opusfile/include-multistream.patch | 0 .../op/opusfile/pkg-fun.nix} | 0 .../op/opustags/pkg-fun.nix} | 0 .../oq/default.nix => unit/oq/oq/pkg-fun.nix} | 0 .../or/or1k-newlib/pkg-fun.nix} | 0 .../or/oracle-instantclient/pkg-fun.nix} | 0 .../or/oraclejdk11/pkg-fun.nix} | 0 .../or/oranchelo-icon-theme/pkg-fun.nix} | 0 .../default.nix => unit/or/oras/pkg-fun.nix} | 0 .../or/orbitron/pkg-fun.nix} | 0 .../or/orbuculum/pkg-fun.nix} | 0 .../default.nix => unit/or/orc/pkg-fun.nix} | 0 .../or/orca-c/pkg-fun.nix} | 0 .../or/orcania/pkg-fun.nix} | 0 .../or/orchis-theme/pkg-fun.nix} | 0 .../default.nix => unit/or/orion/pkg-fun.nix} | 0 .../or/orjail/pkg-fun.nix} | 0 .../or/oroborus/pkg-fun.nix} | 0 .../or/orocos-kdl/pkg-fun.nix} | 0 .../or/orthorobot/pkg-fun.nix} | 0 .../default.nix => unit/or/ortp/pkg-fun.nix} | 0 .../os/os-prober/pkg-fun.nix} | 0 .../os/oscclip/pkg-fun.nix} | 0 .../os/osdlyrics/pkg-fun.nix} | 0 .../default.nix => unit/os/oshka/pkg-fun.nix} | 0 .../default.nix => unit/os/osi/pkg-fun.nix} | 0 .../os/osinfo-db-tools/pkg-fun.nix} | 0 .../os/osinfo-db/pkg-fun.nix} | 0 .../os/osm-gps-map/pkg-fun.nix} | 0 .../os/osmctools/pkg-fun.nix} | 0 .../default.nix => unit/os/osmid/pkg-fun.nix} | 0 .../os/osmium-tool/pkg-fun.nix} | 0 .../default.nix => unit/os/osmo/pkg-fun.nix} | 0 .../default.nix => unit/os/osqp/pkg-fun.nix} | 0 .../os/osrm-backend/pkg-fun.nix} | 0 .../security => unit/os}/ossec/no-root.patch | 0 .../default.nix => unit/os/ossec/pkg-fun.nix} | 0 .../os/osslsigncode/pkg-fun.nix} | 0 .../os/ossutil/pkg-fun.nix} | 0 ...ial-httpd-CLI-move-to-tests-director.patch | 0 .../misc => unit/os}/ostree/fix-1592.patch | 0 .../os}/ostree/fix-test-paths.patch | 0 .../os/ostree/pkg-fun.nix} | 0 .../os/osu-lazer-bin/pkg-fun.nix} | 0 pkgs/{games => unit/os}/osu-lazer/deps.nix | 0 .../os}/osu-lazer/osu.runtimeconfig.json | 0 .../os/osu-lazer/pkg-fun.nix} | 0 pkgs/{games => unit/os}/osu-lazer/update.sh | 0 .../os/osv-detector/pkg-fun.nix} | 0 .../os/osv-scanner/pkg-fun.nix} | 0 .../os/osxsnarf/pkg-fun.nix} | 0 .../ot/otel-cli/pkg-fun.nix} | 0 .../misc => unit/ot}/otfcc/fix-aarch64.patch | 0 .../ot}/otfcc/move-makefiles.patch | 0 .../default.nix => unit/ot/otfcc/pkg-fun.nix} | 0 .../ot/otpauth/pkg-fun.nix} | 0 .../ot/otpclient/pkg-fun.nix} | 0 .../default.nix => unit/ot/otpw/pkg-fun.nix} | 0 .../default.nix => unit/ot/ott/pkg-fun.nix} | 0 .../ot/otto-matic/pkg-fun.nix} | 0 .../default.nix => unit/ou/ouch/pkg-fun.nix} | 0 .../ou/out-of-tree/pkg-fun.nix} | 0 .../ou/outils/pkg-fun.nix} | 0 .../ov/default.nix => unit/ov/ov/pkg-fun.nix} | 0 .../ov/oven-media-engine/pkg-fun.nix} | 0 .../tools => unit/ov}/overcommit/Gemfile | 0 .../tools => unit/ov}/overcommit/Gemfile.lock | 0 .../tools => unit/ov}/overcommit/gemset.nix | 0 .../ov/overcommit/pkg-fun.nix} | 0 .../ov/overmind/pkg-fun.nix} | 0 .../ov/overpass/pkg-fun.nix} | 0 .../ov}/oversteer/fix-install-dir.patch | 0 .../ov/oversteer/pkg-fun.nix} | 0 .../ov/ovh-ttyrec/pkg-fun.nix} | 0 .../default.nix => unit/ow/owamp/pkg-fun.nix} | 0 .../ow/owl-lisp/pkg-fun.nix} | 0 .../default.nix => unit/ow/owl/pkg-fun.nix} | 0 .../ow/owncast/pkg-fun.nix} | 0 .../ox/default.nix => unit/ox/ox/pkg-fun.nix} | 0 .../ox/oxefmsynth/pkg-fun.nix} | 0 .../{tools/admin => unit/ox}/oxidized/Gemfile | 0 .../admin => unit/ox}/oxidized/Gemfile.lock | 0 .../admin => unit/ox}/oxidized/gemset.nix | 0 .../ox/oxidized/pkg-fun.nix} | 0 .../ox/oxipng/pkg-fun.nix} | 0 .../default.nix => unit/ox/oxker/pkg-fun.nix} | 0 .../ox/oxtools/pkg-fun.nix} | 0 .../ox/oxygenfonts/pkg-fun.nix} | 0 .../oy/oysttyer/pkg-fun.nix} | 0 .../default.nix => unit/p0/p0f/pkg-fun.nix} | 0 .../p1/p11-kit/pkg-fun.nix} | 0 .../p2/p2pool/pkg-fun.nix} | 0 .../default.nix => unit/p2/p2pvc/pkg-fun.nix} | 0 .../p3/p3x-onenote/pkg-fun.nix} | 0 .../default.nix => unit/p4/p4c/pkg-fun.nix} | 0 .../default.nix => unit/p4/p4d/pkg-fun.nix} | 0 .../p4}/p4v/darwin.nix | 0 .../p4}/p4v/linux.nix | 0 .../default.nix => unit/p4/p4v/pkg-fun.nix} | 0 .../default.nix => unit/p7/p7zip/pkg-fun.nix} | 0 .../archivers => unit/p7}/p7zip/setup-hook.sh | 0 .../archivers => unit/p7}/p7zip/update.sh | 0 .../p9/p910nd/pkg-fun.nix} | 0 .../pa/pa_applet/pkg-fun.nix} | 0 .../pa/pacemaker/pkg-fun.nix} | 0 .../pa/pachyderm/pkg-fun.nix} | 0 .../pa/package-project-cmake/pkg-fun.nix} | 0 .../pa/packagekit/pkg-fun.nix} | 0 .../pa/packcc/pkg-fun.nix} | 0 .../pa/packer/pkg-fun.nix} | 0 .../pa/packet-sd/pkg-fun.nix} | 0 .../tools => unit/pa}/packet/deps.nix | 0 .../pa/packet/pkg-fun.nix} | 0 .../pa/packetdrill/pkg-fun.nix} | 0 .../default.nix => unit/pa/packr/pkg-fun.nix} | 0 .../pa/packwiz/pkg-fun.nix} | 0 .../pa}/pacman/dont-create-empty-dirs.patch | 0 .../pa/pacman/pkg-fun.nix} | 0 .../compilers => unit/pa}/paco/deps.nix | 0 .../default.nix => unit/pa/paco/pkg-fun.nix} | 0 .../pa/pacparser/pkg-fun.nix} | 0 .../pa/pacvim/pkg-fun.nix} | 0 .../pa/padbuster/pkg-fun.nix} | 0 .../default.nix => unit/pa/page/pkg-fun.nix} | 0 .../pa/pagemon/pkg-fun.nix} | 0 .../pa/pagmo2/pkg-fun.nix} | 0 .../pa/pagsuite/pkg-fun.nix} | 0 .../pa/paho-mqtt-c/pkg-fun.nix} | 0 .../pa/paho-mqtt-cpp/pkg-fun.nix} | 0 .../pa/pahole/pkg-fun.nix} | 0 .../default.nix => unit/pa/pal/pkg-fun.nix} | 0 .../browsers => unit/pa}/palemoon/mozconfig | 0 .../pa/palemoon/pkg-fun.nix} | 0 .../default.nix => unit/pa/palp/pkg-fun.nix} | 0 .../pa/pam-reattach/pkg-fun.nix} | 0 .../pa/pam_ccreds/pkg-fun.nix} | 0 .../pa/pam_gnupg/pkg-fun.nix} | 0 .../pa/pam_krb5/pkg-fun.nix} | 0 .../pa/pam_ldap/pkg-fun.nix} | 0 .../insert_utillinux_path_hooks.patch | 0 .../pa/pam_mount/pkg-fun.nix} | 0 .../pa/pam_mysql/pkg-fun.nix} | 0 .../pa/pam_p11/pkg-fun.nix} | 0 .../pa/pam_pgsql/pkg-fun.nix} | 0 .../pam_ssh_agent_auth/edcsa-crash-fix.patch | 0 .../multiple-key-files.patch | 0 .../pa/pam_ssh_agent_auth/pkg-fun.nix} | 0 .../pa/pam_tmpdir/pkg-fun.nix} | 0 .../pa/pam_u2f/pkg-fun.nix} | 0 .../pa/pam_usb/pkg-fun.nix} | 0 .../linux => unit/pa}/pam_ussh/go.mod | 0 .../linux => unit/pa}/pam_ussh/go.sum | 0 .../pa/pam_ussh/pkg-fun.nix} | 0 .../default.nix => unit/pa/pamix/pkg-fun.nix} | 0 .../pa/pamixer/pkg-fun.nix} | 0 .../default.nix => unit/pa/paml/pkg-fun.nix} | 0 .../pa/pamtester/pkg-fun.nix} | 0 .../pa}/pan/move-out-of-extern-c.diff | 0 .../default.nix => unit/pa/pan/pkg-fun.nix} | 0 .../pa/pandoc-katex/pkg-fun.nix} | 0 .../pa/pandoc-lua-filters/pkg-fun.nix} | 0 .../pa/pandoc/pkg-fun.nix} | 0 .../pa/panoply/pkg-fun.nix} | 0 .../pa/panopticon/pkg-fun.nix} | 0 .../pa/panotools/pkg-fun.nix} | 0 .../pa}/pantheon-tweaks/fix-paths.patch | 0 .../pa/pantheon-tweaks/pkg-fun.nix} | 0 .../pa/paper-gtk-theme/pkg-fun.nix} | 0 .../pa/paper-icon-theme/pkg-fun.nix} | 0 .../pa/paper-note/pkg-fun.nix} | 0 .../pa/paperkey/pkg-fun.nix} | 0 .../pa/paperless-ngx/pkg-fun.nix} | 0 .../pa/paperlike-go/pkg-fun.nix} | 0 .../pa/papermc/pkg-fun.nix} | 0 .../text => unit/pa}/papertrail/Gemfile | 0 .../text => unit/pa}/papertrail/Gemfile.lock | 0 .../text => unit/pa}/papertrail/gemset.nix | 0 .../pa/papertrail/pkg-fun.nix} | 0 .../default.nix => unit/pa/papi/pkg-fun.nix} | 0 .../pa/papirus-folders/pkg-fun.nix} | 0 .../default.nix => unit/pa/pappl/pkg-fun.nix} | 0 .../pa/paprefs/pkg-fun.nix} | 0 .../default.nix => unit/pa/paps/pkg-fun.nix} | 0 .../default.nix => unit/pa/par/pkg-fun.nix} | 0 .../pa/par2cmdline/pkg-fun.nix} | 0 .../pa/parallel-full/pkg-fun.nix} | 0 .../pa/parallel/pkg-fun.nix} | 0 .../pa/parastoo-fonts/pkg-fun.nix} | 0 .../pa/paratype-pt-mono/pkg-fun.nix} | 0 .../pa/paratype-pt-sans/pkg-fun.nix} | 0 .../pa/paratype-pt-serif/pkg-fun.nix} | 0 .../pa/pari-galdata/pkg-fun.nix} | 0 .../pa/pari-seadata-small/pkg-fun.nix} | 0 .../pa/parinfer-rust/pkg-fun.nix} | 0 .../pa/parlatype/pkg-fun.nix} | 0 .../pa/parmetis/pkg-fun.nix} | 0 .../pa/parquet-tools/pkg-fun.nix} | 0 .../pa/parse-cli-bin/pkg-fun.nix} | 0 .../pa/parsec-bin/pkg-fun.nix} | 0 .../pa/parsero/pkg-fun.nix} | 0 .../pa/partclone/pkg-fun.nix} | 0 .../pa/parted/pkg-fun.nix} | 0 .../pa/particl-core/pkg-fun.nix} | 0 .../pa}/partimage/gentoos-zlib.patch | 0 .../pa/partimage/pkg-fun.nix} | 0 .../pa/partio/pkg-fun.nix} | 0 .../default.nix => unit/pa/pash/pkg-fun.nix} | 0 .../pa/pass-secret-service/pkg-fun.nix} | 0 .../pa/passage/pkg-fun.nix} | 0 .../pa/passerine/pkg-fun.nix} | 0 .../pa/passff-host/pkg-fun.nix} | 0 .../default.nix => unit/pa/passh/pkg-fun.nix} | 0 .../pa/passky-desktop/pkg-fun.nix} | 0 .../pa/passphrase2pgp/pkg-fun.nix} | 0 .../pa/pastebinit/pkg-fun.nix} | 0 .../pa}/pasystray/fix-wayland.patch | 0 .../pa/pasystray/pkg-fun.nix} | 0 .../pa/patatt/pkg-fun.nix} | 0 .../pa/patchPpdFilesHook}/patch-ppd-hook.sh | 0 .../pa/patchPpdFilesHook}/patch-ppd-lines.awk | 0 .../pa/patchPpdFilesHook/pkg-fun.nix} | 0 .../pa/patchPpdFilesHook}/test.nix | 0 .../pa/patchPpdFilesHook}/test.ppd | 0 .../pa/patchage/pkg-fun.nix} | 0 .../pa/pathvector/pkg-fun.nix} | 0 .../pa/patray/pkg-fun.nix} | 0 .../default.nix => unit/pa/patsh/pkg-fun.nix} | 0 .../pa/pattypan/pkg-fun.nix} | 0 .../pa/paulstretch/pkg-fun.nix} | 0 .../pa/pavucontrol/pkg-fun.nix} | 0 .../pa/pax-rs/pkg-fun.nix} | 0 .../pa/pax-utils/pkg-fun.nix} | 0 .../pa/paxctl/pkg-fun.nix} | 0 .../linux => unit/pa}/paxctl/setup-hook.sh | 0 .../pa/paxtest/pkg-fun.nix} | 0 .../pa/payload_dumper/pkg-fun.nix} | 0 .../default.nix => unit/pa/pazi/pkg-fun.nix} | 0 .../pb/pb_cli/pkg-fun.nix} | 0 .../pb/pbgopy/pkg-fun.nix} | 0 .../pb}/pbrt/openexr-cmake-3.12.patch | 0 .../default.nix => unit/pb/pbrt/pkg-fun.nix} | 0 .../pb/pbzip2/pkg-fun.nix} | 0 .../default.nix => unit/pb/pbzx/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcalc/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcapc/pkg-fun.nix} | 0 .../pc/pcapfix/pkg-fun.nix} | 0 .../pc/pcaudiolib/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcb/pkg-fun.nix} | 0 .../pc/pcb2gcode/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcem/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcg_c/pkg-fun.nix} | 0 .../pc/pcg_c}/prefix-variable.patch | 0 .../pc/pcimem/pkg-fun.nix} | 0 .../pc/pcloud/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcm/pkg-fun.nix} | 0 .../pc/pcmanfm/pkg-fun.nix} | 0 .../pc/pcmanx-gtk2/pkg-fun.nix} | 0 .../pc/pcmciaUtils/pkg-fun.nix} | 0 .../pc/pcmsolver/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcp/pkg-fun.nix} | 0 .../default.nix => unit/pc/pcre/pkg-fun.nix} | 0 .../pc}/pcre/stacksize-detection.patch | 0 .../default.nix => unit/pc/pcre2/pkg-fun.nix} | 0 .../pc/pcsc-cyberjack/pkg-fun.nix} | 0 .../pc/pcsc-safenet/pkg-fun.nix} | 0 .../pc}/pcsc-scm-scl011/eid.patch | 0 .../pc/pcsc-scm-scl011/pkg-fun.nix} | 0 .../pc/pcsctools/pkg-fun.nix} | 0 .../pc/pcstat/pkg-fun.nix} | 0 ...-libpcsxcore-fix-build-with-ffmpeg-4.patch | 0 .../default.nix => unit/pc/pcsxr/pkg-fun.nix} | 0 .../pc}/pcsxr/uncompress2.patch | 0 .../default.nix => unit/pd/pdal/pkg-fun.nix} | 0 .../pd/pdepend/pkg-fun.nix} | 0 .../pd/pdf-parser/pkg-fun.nix} | 0 .../pd/pdf-quench/pkg-fun.nix} | 0 .../pd/pdf2djvu/pkg-fun.nix} | 0 .../pd/pdf2odt/pkg-fun.nix} | 0 .../pd}/pdf2odt/use_mktemp.patch | 0 .../pd/pdf2svg/pkg-fun.nix} | 0 .../pd}/pdf2xml/pdf2xml.patch | 0 .../pd/pdf2xml/pkg-fun.nix} | 0 .../pd/pdfarranger/pkg-fun.nix} | 0 .../pd/pdfchain/pkg-fun.nix} | 0 .../pd/pdfcpu/pkg-fun.nix} | 0 .../pd/pdfcrack/pkg-fun.nix} | 0 .../pd/pdfdiff/pkg-fun.nix} | 0 .../pd/pdfgrep/pkg-fun.nix} | 0 .../pd/pdfsam-basic/pkg-fun.nix} | 0 .../pd/pdfsandwich/pkg-fun.nix} | 0 .../pd/pdfslicer/pkg-fun.nix} | 0 .../pd/pdftag/pkg-fun.nix} | 0 .../default.nix => unit/pd/pdftk/pkg-fun.nix} | 0 .../pd/pdftoipe/pkg-fun.nix} | 0 .../default.nix => unit/pd/pdm/pkg-fun.nix} | 0 .../pd/pdns-recursor/pkg-fun.nix} | 0 .../default.nix => unit/pd/pdns/pkg-fun.nix} | 0 .../dns => unit/pd}/pdns/version.patch | 0 .../default.nix => unit/pd/pdnsd/pkg-fun.nix} | 0 .../pe/pe-parse/pkg-fun.nix} | 0 .../pe/pebble/pkg-fun.nix} | 0 .../pe/pecita/pkg-fun.nix} | 0 .../default.nix => unit/pe/peco/pkg-fun.nix} | 0 .../default.nix => unit/pe/peek/pkg-fun.nix} | 0 .../default.nix => unit/pe/peep/pkg-fun.nix} | 0 .../pe/peering-manager/pkg-fun.nix} | 0 .../pe}/peering-manager/redis-unix-sock.patch | 0 .../default.nix => unit/pe/peg/pkg-fun.nix} | 0 .../default.nix => unit/pe/pell/pkg-fun.nix} | 0 .../pe/pencil/pkg-fun.nix} | 0 .../default.nix => unit/pe/penna/pkg-fun.nix} | 0 .../pe/perccli/pkg-fun.nix} | 0 .../pe/perceptualdiff/pkg-fun.nix} | 0 .../pe/perf-tools/pkg-fun.nix} | 0 .../pe/perfect-hash/pkg-fun.nix} | 0 .../pe}/performous/performous-cmake.patch | 0 .../pe}/performous/performous-fftw.patch | 0 .../pe/performous/pkg-fun.nix} | 0 .../pe/perkeep/pkg-fun.nix} | 0 .../pe/perseus/pkg-fun.nix} | 0 .../default.nix => unit/pe/peru/pkg-fun.nix} | 0 .../default.nix => unit/pe/pet/pkg-fun.nix} | 0 .../pe/petidomo/pkg-fun.nix} | 0 .../default.nix => unit/pe/petsc/pkg-fun.nix} | 0 .../default.nix => unit/pe/pev/pkg-fun.nix} | 0 .../default.nix => unit/pe/pew/pkg-fun.nix} | 0 .../default.nix => unit/pf/pferd/pkg-fun.nix} | 0 .../pf/pfetch/pkg-fun.nix} | 0 .../default.nix => unit/pf/pffft/pkg-fun.nix} | 0 .../pf/pflask/pkg-fun.nix} | 0 .../pf/pflogsumm/pkg-fun.nix} | 0 .../pf/pforth/pkg-fun.nix} | 0 .../pf/pfsshell/pkg-fun.nix} | 0 .../pg/pg_activity/pkg-fun.nix} | 0 .../pg/pg_checksums/pkg-fun.nix} | 0 .../pg/pg_featureserv/pkg-fun.nix} | 0 .../pg/pg_flame/pkg-fun.nix} | 0 .../pg/pg_tileserv/pkg-fun.nix} | 0 .../pg/pg_top/pkg-fun.nix} | 0 .../pg/pgbackrest/pkg-fun.nix} | 0 .../pg/pgbouncer/pkg-fun.nix} | 0 .../pg/pgcenter/pkg-fun.nix} | 0 .../pg/pgf-pie/pkg-fun.nix} | 0 .../pg/pgf-umlcd/pkg-fun.nix} | 0 .../pg/pgf-umlsd/pkg-fun.nix} | 0 .../pgf-1.x.nix => unit/pg/pgf1/pkg-fun.nix} | 0 .../pgf-2.x.nix => unit/pg/pgf2/pkg-fun.nix} | 0 .../pgf-3.x.nix => unit/pg/pgf3/pkg-fun.nix} | 0 .../pg/pgf_graphics/pkg-fun.nix} | 0 .../pg/pgformatter/pkg-fun.nix} | 0 .../pg/pgfplots/pkg-fun.nix} | 0 .../pg/pgloader/pkg-fun.nix} | 0 .../pg/pgmanage/pkg-fun.nix} | 0 .../pg/pgmetrics/pkg-fun.nix} | 0 .../pg/pgo-client/pkg-fun.nix} | 0 .../pg/pgpdump/pkg-fun.nix} | 0 .../pg/pgpkeyserver-lite/pkg-fun.nix} | 0 .../pg/pgpool/pkg-fun.nix} | 0 .../tools/database => unit/pg}/pgsync/Gemfile | 0 .../database => unit/pg}/pgsync/Gemfile.lock | 0 .../database => unit/pg}/pgsync/gemset.nix | 0 .../pg/pgsync/pkg-fun.nix} | 0 .../default.nix => unit/pg/pgtop/pkg-fun.nix} | 0 .../default.nix => unit/pg/pgweb/pkg-fun.nix} | 0 .../ph/pharo-launcher/pkg-fun.nix} | 0 .../default.nix => unit/ph/phash/pkg-fun.nix} | 0 .../default.nix => unit/ph/phd2/pkg-fun.nix} | 0 .../ph/phinger-cursors/pkg-fun.nix} | 0 ...dle-outputs-that-arent-in-the-layout.patch | 0 .../default.nix => unit/ph/phoc/pkg-fun.nix} | 0 .../ph/phockup/pkg-fun.nix} | 0 .../ph/phodav/pkg-fun.nix} | 0 .../ph/phodav_2_0/pkg-fun.nix} | 0 .../ph/phoronix-test-suite/pkg-fun.nix} | 0 .../ph}/phoronix-test-suite/tests.nix | 0 .../ph/phosh-mobile-settings/pkg-fun.nix} | 0 .../default.nix => unit/ph/phosh/pkg-fun.nix} | 0 .../ph}/photoflow/CMakeLists.patch | 0 .../ph}/photoflow/fix-build.patch | 0 .../ph/photoflow/pkg-fun.nix} | 0 .../ph/photon-rss/pkg-fun.nix} | 0 .../ph}/photon/destdir.patch | 0 .../ph/photon/pkg-fun.nix} | 0 .../ph}/photoprism/backend.nix | 0 .../ph}/photoprism/frontend.nix | 0 .../ph}/photoprism/libtensorflow.nix | 0 .../ph/photoprism/pkg-fun.nix} | 0 .../ph/phrase-cli/pkg-fun.nix} | 0 .../ph/phrasendrescher/pkg-fun.nix} | 0 .../ph/phylactery/pkg-fun.nix} | 0 .../ph/physlock/pkg-fun.nix} | 0 .../pi/pianobar/pkg-fun.nix} | 0 .../pi/pianoteq/pkg-fun.nix} | 0 .../pi/picard-tools/pkg-fun.nix} | 0 .../pi/picard/pkg-fun.nix} | 0 .../default.nix => unit/pi/picat/pkg-fun.nix} | 0 .../default.nix => unit/pi/pick/pkg-fun.nix} | 0 .../pi/pico-sdk/pkg-fun.nix} | 0 .../default.nix => unit/pi/picoc/pkg-fun.nix} | 0 .../pi/picolisp/pkg-fun.nix} | 0 .../pi/picoloop/pkg-fun.nix} | 0 .../pi/picom-jonaburg/pkg-fun.nix} | 0 .../pi/picom-next/pkg-fun.nix} | 0 .../default.nix => unit/pi/picom/pkg-fun.nix} | 0 .../pi/picosat/pkg-fun.nix} | 0 .../pi/picoscope/pkg-fun.nix} | 0 .../pi}/picoscope/sources.json | 0 .../pi}/picoscope/update.py | 0 .../pi/picotool/pkg-fun.nix} | 0 .../pi/picotts/pkg-fun.nix} | 0 .../pi/pidgin-carbons/pkg-fun.nix} | 0 .../pi/pidgin-indicator/pkg-fun.nix} | 0 .../pi/pidgin-mra/pkg-fun.nix} | 0 .../pi/pidgin-msn-pecan/pkg-fun.nix} | 0 .../pi/pidgin-opensteamworks/pkg-fun.nix} | 0 .../pi/pidgin-osd/pkg-fun.nix} | 0 .../pi/pidgin-otr/pkg-fun.nix} | 0 .../pi/pidgin-sipe/pkg-fun.nix} | 0 .../pi/pidgin-skypeweb/pkg-fun.nix} | 0 .../pi/pidgin-window-merge/pkg-fun.nix} | 0 .../pi/pidgin-xmpp-receipts/pkg-fun.nix} | 0 .../default.nix => unit/pi/pies/pkg-fun.nix} | 0 .../default.nix => unit/pi/pig/pkg-fun.nix} | 0 .../pi/pigeon/pkg-fun.nix} | 0 .../pi/piglit/pkg-fun.nix} | 0 .../default.nix => unit/pi/pigz/pkg-fun.nix} | 0 .../default.nix => unit/pi/pijul/pkg-fun.nix} | 0 .../pi}/pika-backup/borg-path.patch | 0 .../pi/pika-backup/pkg-fun.nix} | 0 .../default.nix => unit/pi/pika/pkg-fun.nix} | 0 .../pi/pikchr/pkg-fun.nix} | 0 .../pi/pikopixel/pkg-fun.nix} | 0 .../pi/pim6sd/pkg-fun.nix} | 0 .../pi/pinball/pkg-fun.nix} | 0 .../pi/pinentry-bemenu/pkg-fun.nix} | 0 .../pi/pinentry-rofi/pkg-fun.nix} | 0 .../default.nix => unit/pi/pinfo/pkg-fun.nix} | 0 .../pi/pingtcp/pkg-fun.nix} | 0 .../default.nix => unit/pi/pingu/pkg-fun.nix} | 0 .../pi/pingus/pkg-fun.nix} | 0 .../pi/pinniped/pkg-fun.nix} | 0 .../pi/pinnwand/pkg-fun.nix} | 0 .../pi/pinocchio/pkg-fun.nix} | 0 .../pi/pinpoint/pkg-fun.nix} | 0 .../pi/pinsel/pkg-fun.nix} | 0 .../graphics => unit/pi}/pinta/deps.nix | 0 .../default.nix => unit/pi/pinta/pkg-fun.nix} | 0 .../pi/pioneer/pkg-fun.nix} | 0 .../pi/pioneers/pkg-fun.nix} | 0 .../pi/pip-audit/pkg-fun.nix} | 0 .../pi/pipe-rename/pkg-fun.nix} | 0 .../pi/pipectl/pkg-fun.nix} | 0 .../pi/pipenv/pkg-fun.nix} | 0 .../default.nix => unit/pi/piper/pkg-fun.nix} | 0 .../pi/pipes-rs/pkg-fun.nix} | 0 .../default.nix => unit/pi/pipes/pkg-fun.nix} | 0 .../pi/pipewire_0_2/pkg-fun.nix} | 0 .../pi/pipework/pkg-fun.nix} | 0 .../default.nix => unit/pi/pipr/pkg-fun.nix} | 0 .../pi/pipreqs/pkg-fun.nix} | 0 .../pi/pirate-get/pkg-fun.nix} | 0 .../pi/pistol/pkg-fun.nix} | 0 .../pi/pitch-black/pkg-fun.nix} | 0 .../pi/pitivi/pkg-fun.nix} | 0 .../prevent-closure-contamination.patch | 0 .../default.nix => unit/pi/pius/pkg-fun.nix} | 0 .../default.nix => unit/pi/pixd/pkg-fun.nix} | 0 .../pi/pixelnuke/pkg-fun.nix} | 0 .../pi/pixelorama/pkg-fun.nix} | 0 .../pi/pixeluvo/pkg-fun.nix} | 0 .../pi/pixiecore/pkg-fun.nix} | 0 .../pi/pixiewps/pkg-fun.nix} | 0 .../pi/pixman/pkg-fun.nix} | 0 .../default.nix => unit/pi/pixz/pkg-fun.nix} | 0 .../pi/pizarra/pkg-fun.nix} | 0 .../pk/pk2cmd/pkg-fun.nix} | 0 .../pk/pkcs11helper/pkg-fun.nix} | 0 .../2.36.3-not-win32.patch | 0 .../pk/pkg-config-unwrapped/pkg-fun.nix} | 0 .../requires-private.patch | 0 .../pk/pkgconf-unwrapped/pkg-fun.nix} | 0 .../pk/pkgdiff/pkg-fun.nix} | 0 .../default.nix => unit/pk/pkger/pkg-fun.nix} | 0 .../pl/planarity/pkg-fun.nix} | 0 .../pl/planetary_annihilation/pkg-fun.nix} | 0 .../pl}/plank/hide-in-pantheon.patch | 0 .../default.nix => unit/pl/plank/pkg-fun.nix} | 0 .../pl/plano-theme/pkg-fun.nix} | 0 .../pl/plantuml-c4/pkg-fun.nix} | 0 .../pl/plantuml-server/pkg-fun.nix} | 0 .../pl/plantuml/pkg-fun.nix} | 0 .../pl/plasma-hud/pkg-fun.nix} | 0 .../pl/plasma-overdose-kde-theme/pkg-fun.nix} | 0 .../pl/platform-folders/pkg-fun.nix} | 0 .../pl/platformsh/pkg-fun.nix} | 0 .../pl}/platinum-searcher/deps.nix | 0 .../pl/platinum-searcher/pkg-fun.nix} | 0 .../pl/platypus/pkg-fun.nix} | 0 .../pl}/plausible/package.json | 0 .../pl/plausible/pkg-fun.nix} | 0 .../web-apps => unit/pl}/plausible/update.sh | 0 .../web-apps => unit/pl}/plausible/yarn.lock | 0 .../web-apps => unit/pl}/plausible/yarn.nix | 0 .../pl/play-with-mpv/pkg-fun.nix} | 0 .../pl/playerctl/pkg-fun.nix} | 0 .../pl}/please/nixos-specific.patch | 0 .../pl/please/pkg-fun.nix} | 0 .../pl/plecost/pkg-fun.nix} | 0 pkgs/{servers => unit/pl}/pleroma/mix.nix | 0 .../pl/pleroma/pkg-fun.nix} | 0 .../default.nix => unit/pl/plex/pkg-fun.nix} | 0 .../raw.nix => unit/pl/plexRaw/pkg-fun.nix} | 0 .../pl/plexamp/pkg-fun.nix} | 0 .../pl}/plexamp/update-plexamp.sh | 0 .../default.nix => unit/pl/plib/pkg-fun.nix} | 0 .../pl/plink-ng/pkg-fun.nix} | 0 .../pl}/plistwatch/go-modules.patch | 0 .../pl/plistwatch/pkg-fun.nix} | 0 .../default.nix => unit/pl/plm/pkg-fun.nix} | 0 .../pl/plocate/pkg-fun.nix} | 0 .../pl/plotinus/pkg-fun.nix} | 0 .../pl}/plotutils/debian-patches.nix | 0 .../pl}/plotutils/debian-patches.txt | 0 .../pl/plotutils/pkg-fun.nix} | 0 .../pl/plowshare/pkg-fun.nix} | 0 .../default.nix => unit/pl/pls/pkg-fun.nix} | 0 .../pl/plugin-torture/pkg-fun.nix} | 0 .../pl/plujain-ramp/pkg-fun.nix} | 0 .../default.nix => unit/pl/pluto/pkg-fun.nix} | 0 .../pl/plymouth/pkg-fun.nix} | 0 .../default.nix => unit/pl/plzip/pkg-fun.nix} | 0 .../pm/pmacct/pkg-fun.nix} | 0 .../pm}/pmccabe/getopt_on_darwin.patch | 0 .../pm/pmccabe/pkg-fun.nix} | 0 .../default.nix => unit/pm/pmdk/pkg-fun.nix} | 0 .../default.nix => unit/pm/pmenu/pkg-fun.nix} | 0 .../default.nix => unit/pm/pmidi/pkg-fun.nix} | 0 .../default.nix => unit/pm/pmix/pkg-fun.nix} | 0 .../pm/pmount/pkg-fun.nix} | 0 .../default.nix => unit/pm/pms/pkg-fun.nix} | 0 .../pm/pmutils/pkg-fun.nix} | 0 .../pn/default.nix => unit/pn/pn/pkg-fun.nix} | 0 .../pn/pngcheck/pkg-fun.nix} | 0 .../pn/pngcrush/pkg-fun.nix} | 0 .../pn/pngloss/pkg-fun.nix} | 0 .../default.nix => unit/pn/pngnq/pkg-fun.nix} | 0 .../pn/pngoptimizer/pkg-fun.nix} | 0 .../pn/pngout/pkg-fun.nix} | 0 .../default.nix => unit/pn/pngpp/pkg-fun.nix} | 0 .../pn/pngquant/pkg-fun.nix} | 0 .../pn/pngtools/pkg-fun.nix} | 0 .../pn/pnmixer/pkg-fun.nix} | 0 .../po/pocket-casts/pkg-fun.nix} | 0 .../po/pocketbase/pkg-fun.nix} | 0 .../default.nix => unit/po/poco/pkg-fun.nix} | 0 .../po/pod2mdoc/pkg-fun.nix} | 0 .../po/podgrab/pkg-fun.nix} | 0 .../po/podiff/pkg-fun.nix} | 0 .../po/podman-tui/pkg-fun.nix} | 0 .../po/podman-unwrapped/pkg-fun.nix} | 0 .../rm-podman-mac-helper-msg.patch | 0 .../po/podman/pkg-fun.nix} | 0 .../po/podofo/pkg-fun.nix} | 0 .../default.nix => unit/po/pods/pkg-fun.nix} | 0 .../po/poetry/pkg-fun.nix} | 0 .../po/poetry2conda/pkg-fun.nix} | 0 .../default.nix => unit/po/poke/pkg-fun.nix} | 0 .../po/pokemon-colorscripts-mac/pkg-fun.nix} | 0 .../po/pokemonsay/pkg-fun.nix} | 0 .../po/pokete/pkg-fun.nix} | 0 .../po/polar-bookshelf/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/po}/polar/Gemfile | 0 .../misc => unit/po}/polar/Gemfile.lock | 0 pkgs/{tools/misc => unit/po}/polar/gemset.nix | 0 .../default.nix => unit/po/polar/pkg-fun.nix} | 0 .../po/polaris/pkg-fun.nix} | 0 pkgs/{servers => unit/po}/polaris/update.sh | 0 .../po/policycoreutils/pkg-fun.nix} | 0 .../po/polipo/pkg-fun.nix} | 0 .../po/polkit/pkg-fun.nix} | 0 .../po}/polkit/system_bus.conf | 0 .../po/polkit_gnome/pkg-fun.nix} | 0 ...olkit-gnome-authentication-agent-1.desktop | 0 .../default.nix => unit/po/poly/pkg-fun.nix} | 0 .../po/poly2tri-c/pkg-fun.nix} | 0 .../po/polygraph/pkg-fun.nix} | 0 .../po/polylith/pkg-fun.nix} | 0 .../po/polymake/pkg-fun.nix} | 0 .../po/polyml/pkg-fun.nix} | 0 .../5.6.nix => unit/po/polyml56/pkg-fun.nix} | 0 .../polyml57}/5.7-new-libffi-FFI_SYSV.patch | 0 .../5.7.nix => unit/po/polyml57/pkg-fun.nix} | 0 .../po/polypane/pkg-fun.nix} | 0 .../po/polytopes_db/pkg-fun.nix} | 0 .../po/pomerium-cli/pkg-fun.nix} | 0 .../po}/pomerium/external-envoy.diff | 0 .../po/pomerium/pkg-fun.nix} | 0 .../po}/pomerium/pomerium-ui-package.json | 0 .../po/pommed_light/pkg-fun.nix} | 0 .../po/pomsky/pkg-fun.nix} | 0 .../po/pong3d/pkg-fun.nix} | 0 .../po/pony-corral/pkg-fun.nix} | 0 .../po/ponymix/pkg-fun.nix} | 0 .../po/ponysay/pkg-fun.nix} | 0 .../po/pop-gtk-theme/pkg-fun.nix} | 0 .../po}/popa3d/enable-standalone-mode.patch | 0 .../po}/popa3d/fix-mail-spool-path.patch | 0 .../po/popa3d/pkg-fun.nix} | 0 .../po}/popa3d/use-glibc-crypt.patch | 0 .../mail => unit/po}/popa3d/use-openssl.patch | 0 .../po/popcorntime/pkg-fun.nix} | 0 .../po/popeye/pkg-fun.nix} | 0 .../po/popfile/pkg-fun.nix} | 0 .../default.nix => unit/po/popl/pkg-fun.nix} | 0 .../po/poppler_data/pkg-fun.nix} | 0 .../po/popsicle/pkg-fun.nix} | 0 .../po}/popt/1.16-cygwin.patch | 0 .../po}/popt/1.16-vpath.patch | 0 .../default.nix => unit/po/popt/pkg-fun.nix} | 0 .../po/popura/pkg-fun.nix} | 0 .../po/poretools/pkg-fun.nix} | 0 .../po/portableService/pkg-fun.nix} | 0 .../po/portfolio-filemanager/pkg-fun.nix} | 0 .../po/portmod/pkg-fun.nix} | 0 .../po/portunus/pkg-fun.nix} | 0 .../po/posterazor/pkg-fun.nix} | 0 .../po/postfix/pkg-fun.nix} | 0 .../po}/postfix/post-install-script.patch | 0 .../po}/postfix/postfix-3.0-no-warnings.patch | 0 .../po}/postfix/postfix-script-shell.patch | 0 .../po}/postfix/relative-symlinks.patch | 0 .../mail => unit/po}/postfix/update.sh | 0 .../po/postfixadmin/pkg-fun.nix} | 0 .../po/postgresqlTestHook/pkg-fun.nix} | 0 .../postgresql-test-hook.sh | 0 .../po/postgresqlTestHook}/test.nix | 0 .../po/postgresql_jdbc/pkg-fun.nix} | 0 .../po/postgrey/pkg-fun.nix} | 0 .../po/postiats-utilities/pkg-fun.nix} | 0 .../web => unit/po}/postman/darwin.nix | 0 .../web => unit/po}/postman/linux.nix | 0 .../po/postman/pkg-fun.nix} | 0 .../po/postscript-lexmark/pkg-fun.nix} | 0 .../po/postsrsd/pkg-fun.nix} | 0 .../po/potrace/pkg-fun.nix} | 0 .../default.nix => unit/po/pouf/pkg-fun.nix} | 0 .../po/pounce/pkg-fun.nix} | 0 .../po/power-calibrate/pkg-fun.nix} | 0 .../po/power-profiles-daemon/pkg-fun.nix} | 0 .../po/poweralertd/pkg-fun.nix} | 0 .../po/powercap/pkg-fun.nix} | 0 .../po}/powerdns-admin/package.json | 0 .../po/powerdns-admin/pkg-fun.nix} | 0 .../po}/powerdns-admin/update-asset-deps.sh | 0 .../po}/powerdns-admin/yarndeps.nix | 0 .../po/powerline-fonts/pkg-fun.nix} | 0 .../po/powerline-go/pkg-fun.nix} | 0 .../po/powerline-symbols/pkg-fun.nix} | 0 .../po/powermanga/pkg-fun.nix} | 0 .../po}/powershell/getHashes.sh | 0 .../po/powershell/pkg-fun.nix} | 0 .../po/powerstat/pkg-fun.nix} | 0 .../po/powertop/pkg-fun.nix} | 0 .../default.nix => unit/pp/ppl/pkg-fun.nix} | 0 .../pp/pplatex/pkg-fun.nix} | 0 .../pp}/ppp/nix-purity.patch | 0 .../networking => unit/pp}/ppp/nonpriv.patch | 0 .../default.nix => unit/pp/ppp/pkg-fun.nix} | 0 .../default.nix => unit/pp/pprof/pkg-fun.nix} | 0 .../pp/pps-tools/pkg-fun.nix} | 0 .../pp/ppsspp/pkg-fun.nix} | 0 .../default.nix => unit/pp/pptp/pkg-fun.nix} | 0 .../default.nix => unit/pp/pptpd/pkg-fun.nix} | 0 .../default.nix => unit/pq/pqiv/pkg-fun.nix} | 0 .../default.nix => unit/pq/pqrs/pkg-fun.nix} | 0 .../pr/pr-tracker/pkg-fun.nix} | 0 .../default.nix => unit/pr/praat/pkg-fun.nix} | 0 .../{servers => unit/pr}/prayer/install.patch | 0 .../pr/prayer/pkg-fun.nix} | 0 .../pr/prboom-plus/pkg-fun.nix} | 0 .../pr}/pre-commit/hook-tmpl.patch | 0 ...he-hardcoded-path-to-python-binaries.patch | 0 .../pr/pre-commit/pkg-fun.nix} | 0 .../pr/precice-config-visualizer/pkg-fun.nix} | 0 .../pr/precice/pkg-fun.nix} | 0 .../pr/prelink/pkg-fun.nix} | 0 .../pr/premid/pkg-fun.nix} | 0 .../pr}/presage/fixed-cppunit-detection.patch | 0 .../pr/presage/pkg-fun.nix} | 0 .../pr/present/pkg-fun.nix} | 0 .../pr/pretender/pkg-fun.nix} | 0 .../pr/pretty-simple/pkg-fun.nix} | 0 .../pr/prettyping/pkg-fun.nix} | 0 .../pr/prevo-data/pkg-fun.nix} | 0 .../pr/prevo-tools/pkg-fun.nix} | 0 .../default.nix => unit/pr/prevo/pkg-fun.nix} | 0 .../pr}/pridecat/fix_install.patch | 0 .../pr/pridecat/pkg-fun.nix} | 0 .../pr/pridefetch/pkg-fun.nix} | 0 .../pr/prime-server/pkg-fun.nix} | 0 .../pr/primecount/pkg-fun.nix} | 0 .../pr/primesieve/pkg-fun.nix} | 0 .../pr/printrun/pkg-fun.nix} | 0 .../default.nix => unit/pr/prism/pkg-fun.nix} | 0 .../pr/prison/pkg-fun.nix} | 0 .../pr/pritunl-client/pkg-fun.nix} | 0 .../pr/pritunl-ssh/pkg-fun.nix} | 0 .../pr/privacyidea/pkg-fun.nix} | 0 .../pr/procdump/pkg-fun.nix} | 0 .../pr/process-compose/pkg-fun.nix} | 0 .../pr/process-cpp/pkg-fun.nix} | 0 .../pr/process-viewer/pkg-fun.nix} | 0 .../pr/procmail/pkg-fun.nix} | 0 .../system => unit/pr}/procodile/Gemfile | 0 .../system => unit/pr}/procodile/Gemfile.lock | 0 .../system => unit/pr}/procodile/gemset.nix | 0 .../pr/procodile/pkg-fun.nix} | 0 .../pr/procyon/pkg-fun.nix} | 0 .../pr/prodigal/pkg-fun.nix} | 0 .../pr/professor/pkg-fun.nix} | 0 .../pr/profetch/pkg-fun.nix} | 0 .../pr/profile-cleaner/pkg-fun.nix} | 0 .../pr/profile-sync-daemon/pkg-fun.nix} | 0 .../pr/profont/pkg-fun.nix} | 0 .../pr/proggyfonts/pkg-fun.nix} | 0 .../pr/programmer-calculator/pkg-fun.nix} | 0 .../pr/progress/pkg-fun.nix} | 0 .../pr/proj-datumgrid/pkg-fun.nix} | 0 .../default.nix => unit/pr/proj/pkg-fun.nix} | 0 .../libraries => unit/pr}/proj/tests.nix | 0 .../proj/7.nix => unit/pr/proj_7/pkg-fun.nix} | 0 .../pr/proj_7}/tests-sqlite-3.39.patch | 0 .../pr/prom2json/pkg-fun.nix} | 0 .../pr/prometheus-alertmanager/pkg-fun.nix} | 0 .../prometheus-apcupsd-exporter/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../prometheus-aws-s3-exporter/pkg-fun.nix} | 0 .../pr/prometheus-bind-exporter/pkg-fun.nix} | 0 .../pr/prometheus-bird-exporter/pkg-fun.nix} | 0 .../prometheus-bitcoin-exporter/pkg-fun.nix} | 0 .../prometheus-blackbox-exporter/pkg-fun.nix} | 0 .../prometheus-collectd-exporter/pkg-fun.nix} | 0 .../prometheus-consul-exporter/pkg-fun.nix} | 0 .../pr/prometheus-cpp/pkg-fun.nix} | 0 .../pr}/prometheus-cpp/prometheus-cpp.pc.in | 0 .../prometheus-dnsmasq-exporter/pkg-fun.nix} | 0 .../prometheus-domain-exporter/pkg-fun.nix} | 0 .../dovecot-exporter-deps.nix | 0 .../prometheus-dovecot-exporter/pkg-fun.nix} | 0 .../prometheus-fastly-exporter/pkg-fun.nix} | 0 .../pr/prometheus-flow-exporter/pkg-fun.nix} | 0 .../prometheus-fritzbox-exporter/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../prometheus-haproxy-exporter/pkg-fun.nix} | 0 .../prometheus-influxdb-exporter/pkg-fun.nix} | 0 .../pr/prometheus-ipmi-exporter/pkg-fun.nix} | 0 .../pr/prometheus-jitsi-exporter/pkg-fun.nix} | 0 .../pr/prometheus-jmx-httpserver/pkg-fun.nix} | 0 .../pr/prometheus-json-exporter/pkg-fun.nix} | 0 .../pr/prometheus-kea-exporter/pkg-fun.nix} | 0 .../prometheus-keylight-exporter/pkg-fun.nix} | 0 .../pr/prometheus-knot-exporter/pkg-fun.nix} | 0 .../pr/prometheus-lnd-exporter/pkg-fun.nix} | 0 .../pr/prometheus-mail-exporter/pkg-fun.nix} | 0 .../prometheus-mikrotik-exporter/pkg-fun.nix} | 0 .../pr/prometheus-minio-exporter}/deps.nix | 0 .../pr/prometheus-minio-exporter/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../prometheus-mysqld-exporter/pkg-fun.nix} | 0 .../pr/prometheus-nats-exporter/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../pr/prometheus-nginx-exporter/pkg-fun.nix} | 0 .../prometheus-nginxlog-exporter/pkg-fun.nix} | 0 .../pr/prometheus-nut-exporter/pkg-fun.nix} | 0 .../prometheus-openvpn-exporter/pkg-fun.nix} | 0 .../prometheus-pihole-exporter/pkg-fun.nix} | 0 .../prometheus-postfix-exporter/pkg-fun.nix} | 0 .../prometheus-postgres-exporter/pkg-fun.nix} | 0 .../prometheus-process-exporter/pkg-fun.nix} | 0 .../pr/prometheus-pushgateway/pkg-fun.nix} | 0 .../pr/prometheus-pve-exporter/pkg-fun.nix} | 0 .../prometheus-rabbitmq-exporter/pkg-fun.nix} | 0 .../pr/prometheus-redis-exporter/pkg-fun.nix} | 0 .../prometheus-rtl_433-exporter/pkg-fun.nix} | 0 .../pr/prometheus-sachet/pkg-fun.nix} | 0 .../prometheus-script-exporter/pkg-fun.nix} | 0 ...d-value-if-it-s-not-time-to-scan-aga.patch | 0 .../prometheus-smartctl-exporter/pkg-fun.nix} | 0 .../prometheus-smokeping-prober/pkg-fun.nix} | 0 .../pr/prometheus-snmp-exporter/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../pr/prometheus-sql-exporter/pkg-fun.nix} | 0 .../prometheus-statsd-exporter/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../prometheus-systemd-exporter/pkg-fun.nix} | 0 .../pr/prometheus-tor-exporter/pkg-fun.nix} | 0 .../pr/prometheus-v2ray-exporter/pkg-fun.nix} | 0 .../prometheus-varnish-exporter/pkg-fun.nix} | 0 .../pr/prometheus-xmpp-alerts/pkg-fun.nix} | 0 .../pr/prometheus-zfs-exporter/pkg-fun.nix} | 0 .../pr/prometheus/pkg-fun.nix} | 0 .../pr/promql-cli/pkg-fun.nix} | 0 .../0001-remove-jaeger-test-dep.patch | 0 .../pr/promscale/pkg-fun.nix} | 0 .../pr/promtail/pkg-fun.nix} | 0 .../default.nix => unit/pr/proot/pkg-fun.nix} | 0 .../pr/properties-cpp/pkg-fun.nix} | 0 .../pr/prosody-filer/pkg-fun.nix} | 0 .../pr/prospector/pkg-fun.nix} | 0 .../pr}/prospector/setoptconf.nix | 0 .../disable-console-log.patch | 0 .../pr/protege-distribution/pkg-fun.nix} | 0 .../protege-distribution/static-path.patch | 0 .../pr/proto-contrib/pkg-fun.nix} | 0 .../pr/protobuf3_21}/generic-v3-cmake.nix | 0 .../pr/protobuf3_21/pkg-fun.nix} | 0 .../static-executables-have-no-rpath.patch | 0 .../pr/protobufc/pkg-fun.nix} | 0 .../pr/protoc-gen-connect-go/pkg-fun.nix} | 0 .../pr/protoc-gen-doc/pkg-fun.nix} | 0 .../pr/protoc-gen-entgrpc/pkg-fun.nix} | 0 .../pr/protoc-gen-go-grpc/pkg-fun.nix} | 0 .../pr/protoc-gen-go-vtproto/pkg-fun.nix} | 0 .../pr/protoc-gen-go/pkg-fun.nix} | 0 .../protoc-gen-grpc-web/optional-static.patch | 0 .../pr/protoc-gen-grpc-web/pkg-fun.nix} | 0 .../pr/protoc-gen-rust/pkg-fun.nix} | 0 .../pr/protoc-gen-twirp/pkg-fun.nix} | 0 .../pr/protoc-gen-twirp_php/pkg-fun.nix} | 0 .../pr/protoc-gen-twirp_swagger/pkg-fun.nix} | 0 .../protoc-gen-twirp_typescript/pkg-fun.nix} | 0 .../pr/protoc-gen-validate/pkg-fun.nix} | 0 .../pr/protocol/pkg-fun.nix} | 0 .../pr/protolint/pkg-fun.nix} | 0 .../pr/protolock/pkg-fun.nix} | 0 .../pr/proton-caller/pkg-fun.nix} | 0 .../pr/protonmail-bridge/pkg-fun.nix} | 0 .../pr/protoscope/pkg-fun.nix} | 0 .../pr/prototool/pkg-fun.nix} | 0 .../pr/prototypejs/pkg-fun.nix} | 0 .../pr/protozero/pkg-fun.nix} | 0 .../pr/prover9/pkg-fun.nix} | 0 .../pr/proverif/pkg-fun.nix} | 0 .../default.nix => unit/pr/prow/pkg-fun.nix} | 0 .../pr/prowlarr/pkg-fun.nix} | 0 pkgs/{servers => unit/pr}/prowlarr/update.sh | 0 .../pr/proxify/pkg-fun.nix} | 0 .../pr/proximity-sort/pkg-fun.nix} | 0 .../pr}/proxmox-backup-client/Cargo.lock | 0 .../pr/proxmox-backup-client/pkg-fun.nix} | 0 .../re-route-dependencies.patch | 0 .../pr/proxychains-ng/pkg-fun.nix} | 0 ...-priority-4-and-5-in-get_config_path.patch | 0 .../pr/proxychains/pkg-fun.nix} | 0 ...-priority-4-and-5-in-get_config_path.patch | 0 .../pr}/proxysql/dont-phone-home.patch | 0 .../sql => unit/pr}/proxysql/makefiles.patch | 0 .../pr/proxysql/pkg-fun.nix} | 0 .../pr/proycon-wayout/pkg-fun.nix} | 0 .../default.nix => unit/pr/prs/pkg-fun.nix} | 0 pkgs/{tools/text => unit/pr}/pru/Gemfile | 0 pkgs/{tools/text => unit/pr}/pru/Gemfile.lock | 0 pkgs/{tools/text => unit/pr}/pru/gemset.nix | 0 .../default.nix => unit/pr/pru/pkg-fun.nix} | 0 .../tools => unit/pr}/pry/Gemfile | 0 .../tools => unit/pr}/pry/Gemfile.lock | 0 .../tools => unit/pr}/pry/gemset.nix | 0 .../default.nix => unit/pr/pry/pkg-fun.nix} | 0 .../ps/ps2client/pkg-fun.nix} | 0 .../ps}/ps3-disc-dumper/deps.nix | 0 .../ps/ps3-disc-dumper/pkg-fun.nix} | 0 .../ps/ps3netsrv/pkg-fun.nix} | 0 .../ps/ps_mem/pkg-fun.nix} | 0 .../ps/psc-package/pkg-fun.nix} | 0 .../ps/pscale/pkg-fun.nix} | 0 .../ps/pscircle/pkg-fun.nix} | 0 .../ps/psftools/pkg-fun.nix} | 0 .../default.nix => unit/ps/pshs/pkg-fun.nix} | 0 .../ps/psi-notify/pkg-fun.nix} | 0 .../default.nix => unit/ps/pslib/pkg-fun.nix} | 0 .../ps/psmisc/pkg-fun.nix} | 0 .../default.nix => unit/ps/psol/pkg-fun.nix} | 0 .../default.nix => unit/ps/pspg/pkg-fun.nix} | 0 .../default.nix => unit/ps/pspp/pkg-fun.nix} | 0 .../ps/psqlodbc/pkg-fun.nix} | 0 .../default.nix => unit/ps/pssh/pkg-fun.nix} | 0 .../default.nix => unit/ps/psst/pkg-fun.nix} | 0 .../ps/psstop/pkg-fun.nix} | 0 .../ps/pstoedit/pkg-fun.nix} | 0 .../pstoedit/pstoedit-gs-9.22-compat.patch | 0 .../ps/pstreams/pkg-fun.nix} | 0 .../ps/pstree/pkg-fun.nix} | 0 .../ps/psutils/pkg-fun.nix} | 0 .../default.nix => unit/ps/psw/pkg-fun.nix} | 0 .../{applications/misc => unit/pt}/pt/Gemfile | 0 .../misc => unit/pt}/pt/Gemfile.lock | 0 .../misc => unit/pt}/pt/gemset.nix | 0 .../pt/default.nix => unit/pt/pt/pkg-fun.nix} | 0 .../pt/pt2-clone/pkg-fun.nix} | 0 .../default.nix => unit/pt/ptags/pkg-fun.nix} | 0 .../pt}/ptask/json_c_is_error.patch | 0 .../default.nix => unit/pt/ptask/pkg-fun.nix} | 0 .../misc => unit/pt}/ptask/tw-version.patch | 0 .../default.nix => unit/pt/ptex/pkg-fun.nix} | 0 .../pt/ptouch-print/pkg-fun.nix} | 0 .../pu/public-sans/pkg-fun.nix} | 0 .../pu/publicsuffix-list/pkg-fun.nix} | 0 .../default.nix => unit/pu/pubs/pkg-fun.nix} | 0 .../pu/pufferpanel/pkg-fun.nix} | 0 .../pu/pugixml/pkg-fun.nix} | 0 .../pu/pulseaudio-ctl/pkg-fun.nix} | 0 ...etup.py-remove-dbus-python-from-list.patch | 0 .../pu/pulseaudio-dlna/pkg-fun.nix} | 0 .../pu}/pulseaudio-dlna/zeroconf.nix | 0 .../pu/pulsemixer/pkg-fun.nix} | 0 .../admin => unit/pu}/pulumi-bin/data.nix | 0 .../pu/pulumi-bin/pkg-fun.nix} | 0 .../pu/pulumi/pkg-fun.nix} | 0 .../pu/pulumictl/pkg-fun.nix} | 0 .../default.nix => unit/pu/pup/pkg-fun.nix} | 0 .../puppet => unit/pu}/puppet-bolt/Gemfile | 0 .../pu}/puppet-bolt/Gemfile.lock | 0 .../puppet => unit/pu}/puppet-bolt/gemset.nix | 0 .../pu/puppet-bolt/pkg-fun.nix} | 0 .../puppet => unit/pu}/puppet-lint/Gemfile | 0 .../pu}/puppet-lint/Gemfile.lock | 0 .../puppet => unit/pu}/puppet-lint/gemset.nix | 0 .../pu/puppet-lint/pkg-fun.nix} | 0 .../pu}/puppeteer-cli/package.json | 0 .../pu/puppeteer-cli/pkg-fun.nix} | 0 .../pu}/puppeteer-cli/yarn.lock | 0 .../pu}/puppeteer-cli/yarn.nix | 0 .../default.nix => unit/pu/pur/pkg-fun.nix} | 0 .../pu/pure-ftpd/pkg-fun.nix} | 0 .../pu/pure-prompt/pkg-fun.nix} | 0 .../pu/puredata/pkg-fun.nix} | 0 .../pu/puremapping/pkg-fun.nix} | 0 .../pu/pureref/pkg-fun.nix} | 0 .../pu/purescript/pkg-fun.nix} | 0 .../purescript/test-minimal-module/Main.js | 0 .../purescript/test-minimal-module/Main.purs | 0 .../test-minimal-module/default.nix | 0 .../pu}/purescript/update.sh | 0 .../pu/purple-discord/pkg-fun.nix} | 0 .../pu/purple-facebook/pkg-fun.nix} | 0 .../pu/purple-googlechat/pkg-fun.nix} | 0 .../pu/purple-hangouts/pkg-fun.nix} | 0 .../pu/purple-lurch/pkg-fun.nix} | 0 .../pu/purple-matrix/pkg-fun.nix} | 0 .../pu/purple-mm-sms/pkg-fun.nix} | 0 .../pu/purple-plugin-pack/pkg-fun.nix} | 0 .../pu/purple-signald/pkg-fun.nix} | 0 .../pu/purple-slack/pkg-fun.nix} | 0 .../pu/purple-vk-plugin/pkg-fun.nix} | 0 .../pu/purple-xmpp-http-upload/pkg-fun.nix} | 0 .../pu/purpur/pkg-fun.nix} | 0 .../pv/default.nix => unit/pv/pv/pkg-fun.nix} | 0 .../pw/pw-viz/pkg-fun.nix} | 0 .../pw/pwdsafety/pkg-fun.nix} | 0 .../pw/pwgen-secure/pkg-fun.nix} | 0 .../default.nix => unit/pw/pwgen/pkg-fun.nix} | 0 .../default.nix => unit/pw/pwnat/pkg-fun.nix} | 0 .../pw/pwndbg/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/pw}/pws/Gemfile | 0 pkgs/{tools/misc => unit/pw}/pws/Gemfile.lock | 0 pkgs/{tools/misc => unit/pw}/pws/gemset.nix | 0 .../default.nix => unit/pw/pws/pkg-fun.nix} | 0 .../pw/pwsafe/pkg-fun.nix} | 0 .../px/pxattr/pkg-fun.nix} | 0 .../default.nix => unit/px/pxlib/pkg-fun.nix} | 0 .../px/pxview/pkg-fun.nix} | 0 .../px}/pxz/flush-stdout-help-version.patch | 0 .../default.nix => unit/px/pxz/pkg-fun.nix} | 0 .../py/py-spy/pkg-fun.nix} | 0 .../default.nix => unit/py/py3c/pkg-fun.nix} | 0 .../default.nix => unit/py/pydf/pkg-fun.nix} | 0 .../default.nix => unit/py/pykms/pkg-fun.nix} | 0 .../py/pylint-exit/pkg-fun.nix} | 0 .../py/pylode/pkg-fun.nix} | 0 .../default.nix => unit/py/pymol/pkg-fun.nix} | 0 .../py/pympress/pkg-fun.nix} | 0 .../default.nix => unit/py/pynac/pkg-fun.nix} | 0 .../py/pynitrokey/pkg-fun.nix} | 0 .../py/pypi-mirror/pkg-fun.nix} | 0 .../py/pypi2nix/pkg-fun.nix} | 0 .../py/pyradio/pkg-fun.nix} | 0 .../py/pyrseas/pkg-fun.nix} | 0 .../py/pysideApiextractor/pkg-fun.nix} | 0 .../py/pysideGeneratorrunner/pkg-fun.nix} | 0 .../py/pystring/pkg-fun.nix} | 0 .../py/python-cosmopolitan/pkg-fun.nix} | 0 .../py}/python-language-server/deps.nix | 0 .../py/python-language-server/pkg-fun.nix} | 0 .../py}/python-language-server/updater.sh | 0 .../py/python-launcher/pkg-fun.nix} | 0 .../py/pythonCondaPackages/pkg-fun.nix} | 0 .../py/pythonManylinuxPackages/pkg-fun.nix} | 0 .../py/pytrainer/pkg-fun.nix} | 0 .../q-/q-text-as-data/pkg-fun.nix} | 0 .../q/default.nix => unit/q/q/pkg-fun.nix} | 0 .../qa/qalculate-gtk/pkg-fun.nix} | 0 .../default.nix => unit/qb/qbe/pkg-fun.nix} | 0 .../qb}/qbe/test-can-run-hello-world.nix | 0 .../default.nix => unit/qb/qbec/pkg-fun.nix} | 0 .../qc/qcdnum/pkg-fun.nix} | 0 .../default.nix => unit/qd/qdl/pkg-fun.nix} | 0 .../qe/qemacs/pkg-fun.nix} | 0 .../qe/qemu-utils/pkg-fun.nix} | 0 .../qf}/qfsm/drop-hardcoded-prefix.patch | 0 .../qf}/qfsm/gcc6-fixes.patch | 0 .../default.nix => unit/qf/qfsm/pkg-fun.nix} | 0 .../default.nix => unit/qh/qhull/pkg-fun.nix} | 0 .../qi/qimageblitz/pkg-fun.nix} | 0 .../qimageblitz-9999-exec-stack.patch | 0 .../qm/qm-dsp/pkg-fun.nix} | 0 .../qm/qmetro/pkg-fun.nix} | 0 .../qm/qmidiarp/pkg-fun.nix} | 0 .../qm/qmidiroute/pkg-fun.nix} | 0 .../qm/qmk-udev-rules/pkg-fun.nix} | 0 .../default.nix => unit/qm/qmk/pkg-fun.nix} | 0 .../default.nix => unit/qn/qnial/pkg-fun.nix} | 0 .../default.nix => unit/qo/qodem/pkg-fun.nix} | 0 .../qo/qogir-icon-theme/pkg-fun.nix} | 0 .../qo/qogir-kde/pkg-fun.nix} | 0 .../qo/qogir-theme/pkg-fun.nix} | 0 .../qo/qovery-cli/pkg-fun.nix} | 0 .../default.nix => unit/qp/qpdf/pkg-fun.nix} | 0 .../default.nix => unit/qp/qperf/pkg-fun.nix} | 0 .../qp/qpid-cpp/pkg-fun.nix} | 0 .../qp/qprint/pkg-fun.nix} | 0 .../qq/default.nix => unit/qq/qq/pkg-fun.nix} | 0 .../qq/qqwing/pkg-fun.nix} | 0 .../qr/qradiolink/pkg-fun.nix} | 0 .../qr/qrcode/pkg-fun.nix} | 0 .../qr/qrcodegen/pkg-fun.nix} | 0 .../default.nix => unit/qr/qrcp/pkg-fun.nix} | 0 .../qr/qrupdate/pkg-fun.nix} | 0 .../qs}/qscintilla-qt4/fix-qt4-build.patch | 0 .../qs/qscintilla-qt4/pkg-fun.nix} | 0 .../qt/qt-mobility/pkg-fun.nix} | 0 .../qt}/qtile/fix-restart.patch | 0 .../default.nix => unit/qt/qtile/pkg-fun.nix} | 0 .../qt/qtscrobbler/pkg-fun.nix} | 0 .../qt/qtstyleplugin-kvantum-qt4/pkg-fun.nix} | 0 .../qu/QuadProgpp/pkg-fun.nix} | 0 .../qu/quadrafuzz/pkg-fun.nix} | 0 .../qu/quake3demodata/pkg-fun.nix} | 0 .../qu/quake3e/pkg-fun.nix} | 0 .../qu/quake3hires/pkg-fun.nix} | 0 .../qu/quake3pointrelease/pkg-fun.nix} | 0 .../qu/quake3wrapper/pkg-fun.nix} | 0 .../qu/quantomatic/pkg-fun.nix} | 0 .../qu/quantumminigolf/pkg-fun.nix} | 0 .../qu/quark-engine/pkg-fun.nix} | 0 .../default.nix => unit/qu/quark/pkg-fun.nix} | 0 .../qu}/quarto/fix-deno-path.patch | 0 .../qu/quarto/pkg-fun.nix} | 0 .../qu/quartus-prime-lite/pkg-fun.nix} | 0 .../qu/quartus-prime-lite}/quartus.nix | 0 .../default.nix => unit/qu/quast/pkg-fun.nix} | 0 .../qu/quattrocento-sans/pkg-fun.nix} | 0 .../qu/quattrocento/pkg-fun.nix} | 0 .../qu/qubes-core-vchan-xen/pkg-fun.nix} | 0 .../qu/qucs-s/pkg-fun.nix} | 0 .../qu}/qucs/cmakelists.patch | 0 .../default.nix => unit/qu/qucs/pkg-fun.nix} | 0 .../qu/quesoglc/pkg-fun.nix} | 0 .../default.nix => unit/qu/quich/pkg-fun.nix} | 0 .../qu/quick-lint-js/pkg-fun.nix} | 0 .../qu/quickder/pkg-fun.nix} | 0 .../qu/quickemu/pkg-fun.nix} | 0 .../qu}/quickfix/disableUnitTests.patch | 0 .../qu/quickfix/pkg-fun.nix} | 0 .../qu/quickjs/pkg-fun.nix} | 0 .../qu/quickmem/pkg-fun.nix} | 0 .../qu/quickserve/pkg-fun.nix} | 0 .../qu/quicksynergy/pkg-fun.nix} | 0 .../qu/quicktemplate/pkg-fun.nix} | 0 .../qu/quicktun/pkg-fun.nix} | 0 .../qu}/quicktun/tar-1.30.diff | 0 .../qu/quill-qr/pkg-fun.nix} | 0 .../default.nix => unit/qu/quilt/pkg-fun.nix} | 0 .../qu/quintom-cursor-theme/pkg-fun.nix} | 0 .../qu}/quirc/0001-dont-build-demos.patch | 0 .../default.nix => unit/qu/quirc/pkg-fun.nix} | 0 .../qu/quorum/pkg-fun.nix} | 0 .../qu/quvi_scripts/pkg-fun.nix} | 0 .../default.nix => unit/qx/qxw/pkg-fun.nix} | 0 pkgs/{tools/system => unit/r1}/r10k/Gemfile | 0 .../system => unit/r1}/r10k/Gemfile.lock | 0 .../{tools/system => unit/r1}/r10k/gemset.nix | 0 .../default.nix => unit/r1/r10k/pkg-fun.nix} | 0 .../r1}/r128gain/ffmpeg-location.patch | 0 .../r1/r128gain/pkg-fun.nix} | 0 .../r2/r2mod_cli/pkg-fun.nix} | 0 .../r5/r53-ddns/pkg-fun.nix} | 0 .../ra/rabbitmq-c/pkg-fun.nix} | 0 .../ra/rabbitvcs/pkg-fun.nix} | 0 pkgs/{games => unit/ra}/racer/mkdir.patch | 0 .../default.nix => unit/ra/racer/pkg-fun.nix} | 0 .../ra/racket-minimal/pkg-fun.nix} | 0 .../ra/radamsa/pkg-fun.nix} | 0 .../ra/radarr/pkg-fun.nix} | 0 pkgs/{servers => unit/ra}/radarr/update.sh | 0 .../ra/radeontools/pkg-fun.nix} | 0 .../ra/radeontop/pkg-fun.nix} | 0 .../2.x.nix => unit/ra/radicale2/pkg-fun.nix} | 0 .../3.x.nix => unit/ra/radicale3/pkg-fun.nix} | 0 .../ra/radicle-upstream/pkg-fun.nix} | 0 .../ra/radioboat/pkg-fun.nix} | 0 .../ra/radsecproxy/pkg-fun.nix} | 0 .../default.nix => unit/ra/radvd/pkg-fun.nix} | 0 .../ra/raft-canonical/pkg-fun.nix} | 0 .../ra/raider/pkg-fun.nix} | 0 .../ra/railway/pkg-fun.nix} | 0 .../default.nix => unit/ra/rain/pkg-fun.nix} | 0 .../ra/raiseorlaunch/pkg-fun.nix} | 0 .../build-managers => unit/ra}/rake/Gemfile | 0 .../ra}/rake/Gemfile.lock | 0 .../ra}/rake/gemset.nix | 0 .../default.nix => unit/ra/rake/pkg-fun.nix} | 0 .../ra/rakkess/pkg-fun.nix} | 0 .../ra/rakudo/pkg-fun.nix} | 0 .../ra/raleway/pkg-fun.nix} | 0 .../ra/rambox/pkg-fun.nix} | 0 .../default.nix => unit/ra/ran/pkg-fun.nix} | 0 .../ra/rancher/pkg-fun.nix} | 0 .../ra/randoop/pkg-fun.nix} | 0 .../ra/randtype/pkg-fun.nix} | 0 .../default.nix => unit/ra/rang/pkg-fun.nix} | 0 .../ra/range-v3/pkg-fun.nix} | 0 .../ra/ranger/pkg-fun.nix} | 0 .../ra/rankwidth/pkg-fun.nix} | 0 .../ra/rapidcheck/pkg-fun.nix} | 0 .../ra/rapidfuzz-cpp/pkg-fun.nix} | 0 .../ra/rapidjson/pkg-fun.nix} | 0 .../ra}/rapidsvn/fix-build.patch | 0 .../ra/rapidsvn/pkg-fun.nix} | 0 .../ra/rapidxml/pkg-fun.nix} | 0 .../ra/rappel/pkg-fun.nix} | 0 .../default.nix => unit/ra/rar/pkg-fun.nix} | 0 .../ra/rar2fs/pkg-fun.nix} | 0 .../ra/rarcrack/pkg-fun.nix} | 0 .../default.nix => unit/ra/rargs/pkg-fun.nix} | 0 .../ra/rarian/pkg-fun.nix} | 0 .../default.nix => unit/ra/rars/pkg-fun.nix} | 0 .../ra/rascal/pkg-fun.nix} | 0 .../ra/rasdaemon/pkg-fun.nix} | 0 .../default.nix => unit/ra/rasm/pkg-fun.nix} | 0 .../ra/raspberrypi-armstubs/pkg-fun.nix} | 0 .../ra/raspberrypi-eeprom/pkg-fun.nix} | 0 .../raspberrypiWirelessFirmware/pkg-fun.nix} | 0 .../ra/raspberrypifw/pkg-fun.nix} | 0 .../ra/ratman/pkg-fun.nix} | 0 .../ra/ratmen/pkg-fun.nix} | 0 .../ra/ratools/pkg-fun.nix} | 0 .../default.nix => unit/ra/ratox/pkg-fun.nix} | 0 .../ra/ratpoints/pkg-fun.nix} | 0 .../ra/ratpoison/pkg-fun.nix} | 0 .../default.nix => unit/ra/ratt/pkg-fun.nix} | 0 .../default.nix => unit/ra/rauc/pkg-fun.nix} | 0 .../default.nix => unit/ra/raul/pkg-fun.nix} | 0 .../ra/raven-reader/pkg-fun.nix} | 0 .../default.nix => unit/ra/raxml/pkg-fun.nix} | 0 .../ra/raylib-games/pkg-fun.nix} | 0 .../ra/raylib/pkg-fun.nix} | 0 .../default.nix => unit/rb/rbenv/pkg-fun.nix} | 0 .../default.nix => unit/rb/rbspy/pkg-fun.nix} | 0 .../rc/default.nix => unit/rc/rc/pkg-fun.nix} | 0 .../rc/rclone/pkg-fun.nix} | 0 .../rc}/rcm/fix-rcmlib-path.patch | 0 .../default.nix => unit/rc/rcm/pkg-fun.nix} | 0 .../default.nix => unit/rc/rcon/pkg-fun.nix} | 0 .../default.nix => unit/rc/rconc/pkg-fun.nix} | 0 .../default.nix => unit/rc/rcs/pkg-fun.nix} | 0 .../rc/rcshist/pkg-fun.nix} | 0 .../default.nix => unit/rd/rdap/pkg-fun.nix} | 0 .../default.nix => unit/rd/rdc/pkg-fun.nix} | 0 .../rd/rdesktop/pkg-fun.nix} | 0 .../rd/rdfind/pkg-fun.nix} | 0 .../rd/rdiff-backup/pkg-fun.nix} | 0 .../rd/rdkafka/pkg-fun.nix} | 0 .../rd/rdma-core/pkg-fun.nix} | 0 .../rd/rdocker/pkg-fun.nix} | 0 .../rd/rdrview/pkg-fun.nix} | 0 .../default.nix => unit/rd/rdup/pkg-fun.nix} | 0 .../re/re-isearch/pkg-fun.nix} | 0 .../default.nix => unit/re/re2/pkg-fun.nix} | 0 .../default.nix => unit/re/re2c/pkg-fun.nix} | 0 .../re/react-native-debugger/pkg-fun.nix} | 0 .../re}/read-edid/fno-common.patch | 0 .../re/read-edid/pkg-fun.nix} | 0 .../re/readosm/pkg-fun.nix} | 0 .../re/readstat/pkg-fun.nix} | 0 .../real_time_config_quick_scan/pkg-fun.nix} | 0 .../realesrgan-ncnn-vulkan/cmakelists.patch | 0 .../realesrgan-ncnn-vulkan/models_path.patch | 0 .../re/realesrgan-ncnn-vulkan/pkg-fun.nix} | 0 .../re/realvnc-vnc-viewer/pkg-fun.nix} | 0 .../default.nix => unit/re/reap/pkg-fun.nix} | 0 .../reattach-to-user-namespace/pkg-fun.nix} | 0 .../re/reaverwps-t6x/pkg-fun.nix} | 0 .../re/reaverwps}/parallel-build.patch | 0 .../re/reaverwps/pkg-fun.nix} | 0 .../re/recapp/pkg-fun.nix} | 0 .../re/recastnavigation/pkg-fun.nix} | 0 pkgs/{tools/text => unit/re}/reckon/Gemfile | 0 .../text => unit/re}/reckon/Gemfile.lock | 0 .../{tools/text => unit/re}/reckon/gemset.nix | 0 .../re/reckon/pkg-fun.nix} | 0 .../re/recode/pkg-fun.nix} | 0 .../re/recoverjpeg/pkg-fun.nix} | 0 .../re/rectangle/pkg-fun.nix} | 0 .../re/recursive/pkg-fun.nix} | 0 .../re/recutils/pkg-fun.nix} | 0 .../default.nix => unit/re/red/pkg-fun.nix} | 0 .../re/redeclipse/pkg-fun.nix} | 0 .../re/redfang/pkg-fun.nix} | 0 .../re/redhat-official-fonts/pkg-fun.nix} | 0 .../default.nix => unit/re/redir/pkg-fun.nix} | 0 .../tools => unit/re}/redis-dump/Gemfile | 0 .../tools => unit/re}/redis-dump/Gemfile.lock | 0 .../tools => unit/re}/redis-dump/gemset.nix | 0 .../re/redis-dump/pkg-fun.nix} | 0 .../re/redis-plus-plus/pkg-fun.nix} | 0 .../default.nix => unit/re/redis/pkg-fun.nix} | 0 .../default.nix => unit/re/redli/pkg-fun.nix} | 0 .../re}/redmine/0001-python3.patch | 0 .../re}/redmine/Gemfile | 0 .../re}/redmine/Gemfile.lock | 0 .../re}/redmine/gemset.nix | 0 .../re/redmine/pkg-fun.nix} | 0 .../re}/redmine/update.sh | 0 .../re/redo-apenwarr/pkg-fun.nix} | 0 .../re}/redo-c/Makefile | 0 .../re/redo-c/pkg-fun.nix} | 0 .../re/redo-sh/pkg-fun.nix} | 0 .../default.nix => unit/re/redo/pkg-fun.nix} | 0 .../re/redoflacs/pkg-fun.nix} | 0 .../re/redpanda/pkg-fun.nix} | 0 .../re/redprl/pkg-fun.nix} | 0 .../re/redshift_jdbc/pkg-fun.nix} | 0 .../re/redsocks/pkg-fun.nix} | 0 .../re/redstore/pkg-fun.nix} | 0 .../default.nix => unit/re/redux/pkg-fun.nix} | 0 .../re/redwax-tool/pkg-fun.nix} | 0 .../referencesByPopularity}/closure-graph.py | 0 .../re/referencesByPopularity/pkg-fun.nix} | 0 .../re}/refind/0001-toolchain.patch | 0 .../re/refind/pkg-fun.nix} | 0 .../re/refinery-cli/pkg-fun.nix} | 0 .../re/reflex/pkg-fun.nix} | 0 .../re/reftools/pkg-fun.nix} | 0 .../re/refurb/pkg-fun.nix} | 0 .../default.nix => unit/re/reg/pkg-fun.nix} | 0 .../re/regclient/pkg-fun.nix} | 0 .../re/regenkfs/pkg-fun.nix} | 0 .../re/regexploit/pkg-fun.nix} | 0 .../re/regextester/pkg-fun.nix} | 0 .../re/regina/pkg-fun.nix} | 0 .../re/regionset/pkg-fun.nix} | 0 .../default.nix => unit/re/regpg/pkg-fun.nix} | 0 .../re/reiser4progs/pkg-fun.nix} | 0 .../re/reiserfsprogs/pkg-fun.nix} | 0 .../reiserfsprogs/reiserfsprogs-ar-fix.patch | 0 .../re/releaseTools}/binary-tarball.nix | 0 .../re/releaseTools}/debian-build.nix | 0 .../re/releaseTools}/functions.sh | 0 .../re/releaseTools}/maven-build.nix | 0 .../re/releaseTools}/nix-build.nix | 0 .../re/releaseTools/pkg-fun.nix} | 0 .../re/releaseTools}/rpm-build.nix | 0 .../re/releaseTools}/source-tarball.nix | 0 .../re/relibc/pkg-fun.nix} | 0 .../default.nix => unit/re/relic/pkg-fun.nix} | 0 .../re}/remake/glibc-2.27-glob.patch | 0 .../re/remake/pkg-fun.nix} | 0 .../re/remarkable-toolchain/pkg-fun.nix} | 0 .../re/remarkable2-toolchain/pkg-fun.nix} | 0 .../re/remind/pkg-fun.nix} | 0 .../re/remkrom/pkg-fun.nix} | 0 .../re/remmina/pkg-fun.nix} | 0 .../re/remnote/pkg-fun.nix} | 0 .../re/remote-touchpad/pkg-fun.nix} | 0 .../re/remotebox/pkg-fun.nix} | 0 .../re/rename/pkg-fun.nix} | 0 .../re}/renameutils/install-exec.patch | 0 .../re/renameutils/pkg-fun.nix} | 0 .../re/renderizer/pkg-fun.nix} | 0 .../default.nix => unit/re/reno/pkg-fun.nix} | 0 .../re/renoise/pkg-fun.nix} | 0 .../default.nix => unit/re/renpy/pkg-fun.nix} | 0 .../re}/renpy/renpy-system-fribidi.diff | 0 .../re}/renpy/shutup-erofs-errors.patch | 0 .../re/rep-gtk/pkg-fun.nix} | 0 .../re}/rep-gtk/setup-hook.sh | 0 .../default.nix => unit/re/rep/pkg-fun.nix} | 0 .../re/replace-secret/pkg-fun.nix} | 0 .../re}/replace-secret/replace-secret.py | 0 .../replace-secret/test/expected_long_output | 0 .../replace-secret/test/expected_short_output | 0 .../re}/replace-secret/test/input_file | 0 .../re}/replace-secret/test/passwd | 0 .../re}/replace-secret/test/rsa | 0 .../text => unit/re}/replace/malloc.patch | 0 .../re/replace/pkg-fun.nix} | 0 .../re/replaceDependency/pkg-fun.nix} | 0 .../re/replacement/pkg-fun.nix} | 0 .../replay-sorcery/fix-global-config.patch | 0 .../replay-sorcery/hardcode-libnotify.patch | 0 .../re/replay-sorcery/pkg-fun.nix} | 0 .../re}/reposurgeon/fix-makefile.patch | 0 .../re/reposurgeon/pkg-fun.nix} | 0 .../re/reproc/pkg-fun.nix} | 0 .../re/reproxy/pkg-fun.nix} | 0 .../re/repseek/pkg-fun.nix} | 0 .../re/reptyr/pkg-fun.nix} | 0 .../re/reredirect/pkg-fun.nix} | 0 .../re/resgate/pkg-fun.nix} | 0 .../re/resilio-sync/pkg-fun.nix} | 0 .../default.nix => unit/re/resim/pkg-fun.nix} | 0 .../re/resolv_wrapper/pkg-fun.nix} | 0 .../re/resolve-march-native/pkg-fun.nix} | 0 .../re/restic-rest-server/pkg-fun.nix} | 0 ...ting-restore-with-permission-failure.patch | 0 .../re/restic/pkg-fun.nix} | 0 .../re/restinio/pkg-fun.nix} | 0 .../re/restool/pkg-fun.nix} | 0 .../re/restream/pkg-fun.nix} | 0 .../re}/restya-board/fix_request-uri.patch | 0 .../re/restya-board/pkg-fun.nix} | 0 .../default.nix => unit/re/resvg/pkg-fun.nix} | 0 .../re}/retro-gtk/gio-unix.patch | 0 .../re/retro-gtk/pkg-fun.nix} | 0 .../re/retroarch-assets/pkg-fun.nix} | 0 .../re/retrofe/pkg-fun.nix} | 0 .../default.nix => unit/re/retry/pkg-fun.nix} | 0 .../default.nix => unit/re/reuse/pkg-fun.nix} | 0 .../re/reviewdog/pkg-fun.nix} | 0 .../re/revive/pkg-fun.nix} | 0 .../re/rewritefs/pkg-fun.nix} | 0 .../networking => unit/re}/rewrk/Cargo.lock | 0 .../default.nix => unit/re/rewrk/pkg-fun.nix} | 0 .../default.nix => unit/re/rex/pkg-fun.nix} | 0 .../rf/rfc-bibtex/pkg-fun.nix} | 0 .../default.nix => unit/rf/rfc/pkg-fun.nix} | 0 .../rf/rfkill_udev/pkg-fun.nix} | 0 .../rf/rfkill_udev}/rfkill-hook.sh | 0 .../default.nix => unit/rf/rftg/pkg-fun.nix} | 0 .../default.nix => unit/rg/rgbds/pkg-fun.nix} | 0 .../default.nix => unit/rg/rgxg/pkg-fun.nix} | 0 .../default.nix => unit/rh/rhack/pkg-fun.nix} | 0 .../default.nix => unit/rh/rhash/pkg-fun.nix} | 0 .../default.nix => unit/rh/rhoas/pkg-fun.nix} | 0 .../rh/rhodium-libre/pkg-fun.nix} | 0 .../rh}/rhvoice/honor_nix_environment.patch | 0 .../rh/rhvoice/pkg-fun.nix} | 0 .../rh/rhythmbox/pkg-fun.nix} | 0 .../ri/rich-cli/pkg-fun.nix} | 0 .../ri/richgo/pkg-fun.nix} | 0 .../default.nix => unit/ri/ricty/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../ri}/riemann-dash/Gemfile | 0 .../ri}/riemann-dash/Gemfile.lock | 0 .../ri}/riemann-dash/gemset.nix | 0 .../ri/riemann-dash/pkg-fun.nix} | 0 .../misc => unit/ri}/riemann-tools/Gemfile | 0 .../ri}/riemann-tools/Gemfile.lock | 0 .../misc => unit/ri}/riemann-tools/gemset.nix | 0 .../ri/riemann-tools/pkg-fun.nix} | 0 .../ri/riemann/pkg-fun.nix} | 0 .../ri/riemann_c_client/pkg-fun.nix} | 0 .../default.nix => unit/ri/ries/pkg-fun.nix} | 0 .../default.nix => unit/ri/riff/pkg-fun.nix} | 0 .../default.nix => unit/ri/rig/pkg-fun.nix} | 0 .../misc => unit/ri}/rig/rig_1.11-1.diff | 0 .../default.nix => unit/ri/riko4/pkg-fun.nix} | 0 .../ri}/rili/moderinze_cpp.patch | 0 .../default.nix => unit/ri/rili/pkg-fun.nix} | 0 .../ri}/rime-data/fetchSchema.nix | 0 .../ri}/rime-data/generateFetchSchema.sh | 0 .../ri/rime-data/pkg-fun.nix} | 0 .../ri/rinutils/pkg-fun.nix} | 0 .../ri/riot-redis/pkg-fun.nix} | 0 .../ri/ripdrag/pkg-fun.nix} | 0 .../ri/ripe-atlas-tools/pkg-fun.nix} | 0 .../ri/ripmime/pkg-fun.nix} | 0 .../rippled-validator-keys-tool/pkg-fun.nix} | 0 .../ri/ripser/pkg-fun.nix} | 0 .../ri/riscv-pk/pkg-fun.nix} | 0 .../ri/ristate/pkg-fun.nix} | 0 .../default.nix => unit/ri/river/pkg-fun.nix} | 0 .../ri/rivercarro/pkg-fun.nix} | 0 .../rk/rkdeveloptool-pine64/pkg-fun.nix} | 0 .../rk/rkdeveloptool/pkg-fun.nix} | 0 .../default.nix => unit/rk/rke/pkg-fun.nix} | 0 .../rk/rkflashtool/pkg-fun.nix} | 0 .../rk/rkrlv2/pkg-fun.nix} | 0 .../rl/rlaunch/pkg-fun.nix} | 0 .../default.nix => unit/rl/rlog/pkg-fun.nix} | 0 .../rl/rlottie/pkg-fun.nix} | 0 .../rl/rlwrap/pkg-fun.nix} | 0 .../rm/rm-improved/pkg-fun.nix} | 0 .../default.nix => unit/rm/rman/pkg-fun.nix} | 0 .../default.nix => unit/rm/rmapi/pkg-fun.nix} | 0 .../rm/rmfakecloud/pkg-fun.nix} | 0 .../rm}/rmfakecloud/webui.nix | 0 .../rm/rmfuse/pkg-fun.nix} | 0 .../rm}/rmfuse/poetry-git-overlay.nix | 0 .../rm}/rmfuse/poetry.lock | 0 .../rm}/rmfuse/pyproject.toml | 0 .../filesystems => unit/rm}/rmfuse/update | 0 .../default.nix => unit/rm/rml/pkg-fun.nix} | 0 .../rm/rmount/pkg-fun.nix} | 0 .../rm/rmtrash/pkg-fun.nix} | 0 .../rn/rng-tools/pkg-fun.nix} | 0 .../rn/rnix-hashes/pkg-fun.nix} | 0 .../rn/rnix-lsp/pkg-fun.nix} | 0 .../rn/rnnoise/pkg-fun.nix} | 0 .../default.nix => unit/rn/rnp/pkg-fun.nix} | 0 .../default.nix => unit/rn/rnr/pkg-fun.nix} | 0 .../default.nix => unit/rn/rnv/pkg-fun.nix} | 0 .../ro/roapi-http/pkg-fun.nix} | 0 .../ro/robin-map/pkg-fun.nix} | 0 .../ro/robo3t/pkg-fun.nix} | 0 .../ro/robodoc/pkg-fun.nix} | 0 .../ro/robotfindskitten/pkg-fun.nix} | 0 .../ro/roboto-mono/pkg-fun.nix} | 0 .../ro/roboto-slab/pkg-fun.nix} | 0 .../ro/roboto/pkg-fun.nix} | 0 .../ro/robustirc-bridge/pkg-fun.nix} | 0 .../fix-pkgconfig-installation.patch | 0 .../ro/roc-toolkit/pkg-fun.nix} | 0 .../ro/roccat-tools/pkg-fun.nix} | 0 .../ro/rocketchat-desktop/pkg-fun.nix} | 0 .../ro/rocksdb/pkg-fun.nix} | 0 .../ro/rocksndiamonds/pkg-fun.nix} | 0 .../ro/rocmUpdateScript/pkg-fun.nix} | 0 .../ro/rofi-bluetooth/pkg-fun.nix} | 0 .../0001-Patch-plugindir-to-output.patch | 0 .../ro/rofi-calc/pkg-fun.nix} | 0 .../0001-Patch-plugindir-to-output.patch | 0 .../ro/rofi-emoji/pkg-fun.nix} | 0 .../ro/rofi-file-browser/pkg-fun.nix} | 0 .../ro/rofi-menugen/pkg-fun.nix} | 0 .../ro/rofi-mpd/pkg-fun.nix} | 0 .../ro/rofi-pass/pkg-fun.nix} | 0 .../ro/rofi-power-menu/pkg-fun.nix} | 0 .../ro/rofi-pulse-select/pkg-fun.nix} | 0 .../ro/rofi-systemd/pkg-fun.nix} | 0 .../0001-Patch-plugindir-to-output.patch | 0 .../ro}/rofi-top/0002-Patch-add-cairo.patch | 0 .../ro/rofi-top/pkg-fun.nix} | 0 .../ro/rofi-unwrapped/pkg-fun.nix} | 0 .../ro/rofi-vpn/pkg-fun.nix} | 0 .../ro/rofi-wayland-unwrapped/pkg-fun.nix} | 0 .../default.nix => unit/ro/rojo/pkg-fun.nix} | 0 .../ro/rolespec/pkg-fun.nix} | 0 .../tools => unit/ro}/ronn/Gemfile | 0 .../tools => unit/ro}/ronn/Gemfile.lock | 0 .../tools => unit/ro}/ronn/gemset.nix | 0 .../default.nix => unit/ro/ronn/pkg-fun.nix} | 0 .../ro}/ronn/test-reproducible-html.nix | 0 .../ro/roogle/pkg-fun.nix} | 0 .../ro/roomeqwizard/pkg-fun.nix} | 0 .../ro/roon-bridge/pkg-fun.nix} | 0 .../ro/roon-server/pkg-fun.nix} | 0 .../ro/rootbar/pkg-fun.nix} | 0 .../ro/rootlesskit/pkg-fun.nix} | 0 .../ro/rose-pine-gtk-theme/pkg-fun.nix} | 0 .../ro/rose-pine-icon-theme/pkg-fun.nix} | 0 .../default.nix => unit/ro/rosie/pkg-fun.nix} | 0 .../compilers => unit/ro}/roslyn/deps.nix | 0 .../ro}/roslyn/extended-deps.nix | 0 .../ro/roslyn/pkg-fun.nix} | 0 .../0001-get-image-from-environment.patch | 0 .../ro/roswell/pkg-fun.nix} | 0 .../ro/rotate-backups/pkg-fun.nix} | 0 .../default.nix => unit/ro/rote/pkg-fun.nix} | 0 .../default.nix => unit/ro/round/pkg-fun.nix} | 0 ...mlinks-when-trying-to-find-INSTALL_P.patch | 0 .../ro/roundcube/pkg-fun.nix} | 0 .../ro/rounded-mgenplus/pkg-fun.nix} | 0 .../ro/roundup/pkg-fun.nix} | 0 .../ro/route159/pkg-fun.nix} | 0 .../ro/routersploit/pkg-fun.nix} | 0 .../ro/routino/pkg-fun.nix} | 0 .../default.nix => unit/ro/rover/pkg-fun.nix} | 0 .../tools => unit/ro}/rover/schema/etag.id | 0 .../ro}/rover/schema/schema.graphql | 0 .../tools => unit/ro}/rover/update.sh | 0 .../ro/rowhammer-test/pkg-fun.nix} | 0 .../ro/roxctl/pkg-fun.nix} | 0 .../ro/roxterm/pkg-fun.nix} | 0 .../rp/rpPPPoE/pkg-fun.nix} | 0 .../rp/rpcbind/pkg-fun.nix} | 0 .../{servers => unit/rp}/rpcbind/sunrpc.patch | 0 .../rp/rpcsvc-proto/pkg-fun.nix} | 0 .../rp/rpg-cli/pkg-fun.nix} | 0 .../rp/rpiboot/pkg-fun.nix} | 0 .../rp/rpiplay/pkg-fun.nix} | 0 .../default.nix => unit/rp/rpl/pkg-fun.nix} | 0 .../rp}/rpl/remove-argparse-manpage.diff | 0 .../rp/rpm2targz/pkg-fun.nix} | 0 .../rp/rpmextract/pkg-fun.nix} | 0 .../rp}/rpmextract/rpmextract.sh | 0 .../rq/default.nix => unit/rq/rq/pkg-fun.nix} | 0 .../rr/default.nix => unit/rr/rr/pkg-fun.nix} | 0 .../rr/rrdtool/pkg-fun.nix} | 0 .../rr/rrootage/pkg-fun.nix} | 0 .../rrsync.nix => unit/rr/rrsync/pkg-fun.nix} | 0 .../rs/rs-git-fsmonitor/pkg-fun.nix} | 0 .../rs/default.nix => unit/rs/rs/pkg-fun.nix} | 0 .../default.nix => unit/rs/rsass/pkg-fun.nix} | 0 .../default.nix => unit/rs/rsbep/pkg-fun.nix} | 0 .../default.nix => unit/rs/rsbkb/pkg-fun.nix} | 0 .../rs/rsclock/pkg-fun.nix} | 0 .../default.nix => unit/rs/rscw/pkg-fun.nix} | 0 .../{tools/admin => unit/rs}/rset/paths.patch | 0 .../default.nix => unit/rs/rset/pkg-fun.nix} | 0 .../rs/rshijack/pkg-fun.nix} | 0 .../rs/rslint/pkg-fun.nix} | 0 .../rs/rsnapshot/pkg-fun.nix} | 0 .../rs/rspamd/pkg-fun.nix} | 0 .../rs/rss-bridge-cli/pkg-fun.nix} | 0 .../rs/rss-bridge/pkg-fun.nix} | 0 .../rs}/rss-glx/cstddef.patch | 0 .../rs/rss-glx/pkg-fun.nix} | 0 .../rs/rsstail/pkg-fun.nix} | 0 .../rs/rst2html5/pkg-fun.nix} | 0 .../rt/rt-tests/pkg-fun.nix} | 0 .../rt}/rt/dont-check-users_groups.patch | 0 .../rt}/rt/override-generated.patch | 0 .../rt/default.nix => unit/rt/rt/pkg-fun.nix} | 0 .../rt/rt5677-firmware/pkg-fun.nix} | 0 .../default.nix => unit/rt/rtkit/pkg-fun.nix} | 0 .../rt/rtl-ais/pkg-fun.nix} | 0 .../rt/rtl-sdr/pkg-fun.nix} | 0 .../rt/rtl8192su-firmware/pkg-fun.nix} | 0 .../rt/rtl8723bs-firmware/pkg-fun.nix} | 0 .../rt/rtl8761b-firmware/pkg-fun.nix} | 0 .../rt/rtl_433/pkg-fun.nix} | 0 .../rt/rtmpdump/pkg-fun.nix} | 0 .../rt/rtptools/pkg-fun.nix} | 0 .../rt/rtrlib/pkg-fun.nix} | 0 .../rt/rtsp-simple-server/pkg-fun.nix} | 0 .../default.nix => unit/rt/rtss/pkg-fun.nix} | 0 .../default.nix => unit/rt/rttr/pkg-fun.nix} | 0 .../rt/rtw88-firmware/pkg-fun.nix} | 0 .../rt/rtw89-firmware/pkg-fun.nix} | 0 .../ru/rubber/pkg-fun.nix} | 0 .../ru/rubberband/pkg-fun.nix} | 0 .../default.nix => unit/ru/rubik/pkg-fun.nix} | 0 .../ru/rubiks/pkg-fun.nix} | 0 .../{tools/text => unit/ru}/ruby-zoom/Gemfile | 0 .../text => unit/ru}/ruby-zoom/Gemfile.lock | 0 .../text => unit/ru}/ruby-zoom/gemset.nix | 0 .../ru/ruby-zoom/pkg-fun.nix} | 0 .../ru/rubyripper/pkg-fun.nix} | 0 .../ru/rucksack/pkg-fun.nix} | 0 .../default.nix => unit/ru/ruff/pkg-fun.nix} | 0 .../ru/ruffle/pkg-fun.nix} | 0 .../tools => unit/ru}/rufo/Gemfile | 0 .../tools => unit/ru}/rufo/Gemfile.lock | 0 .../tools => unit/ru}/rufo/gemset.nix | 0 .../default.nix => unit/ru/rufo/pkg-fun.nix} | 0 .../default.nix => unit/ru/ruler/pkg-fun.nix} | 0 .../run.nix => unit/ru/run-npush/pkg-fun.nix} | 0 .../ru/run-scaled/pkg-fun.nix} | 0 .../default.nix => unit/ru/run/pkg-fun.nix} | 0 .../default.nix => unit/ru/runc/pkg-fun.nix} | 0 .../default.nix => unit/ru/rund/pkg-fun.nix} | 0 .../ru/runelite/pkg-fun.nix} | 0 .../ru/runescape/pkg-fun.nix} | 0 .../default.nix => unit/ru/runiq/pkg-fun.nix} | 0 .../ru}/runit/fix-ar-ranlib.patch | 0 .../default.nix => unit/ru/runit/pkg-fun.nix} | 0 .../ru/runitor/pkg-fun.nix} | 0 .../ru/runningx/pkg-fun.nix} | 0 .../ru/runzip/pkg-fun.nix} | 0 .../libraries => unit/ru}/rure/Cargo.lock | 0 .../libraries => unit/ru}/rure/pin.json | 0 .../default.nix => unit/ru/rure/pkg-fun.nix} | 0 .../libraries => unit/ru}/rure/update.sh | 0 .../default.nix => unit/ru/rush/pkg-fun.nix} | 0 .../ru/rust-analyzer/pkg-fun.nix} | 0 .../ru/rust-audit-info/pkg-fun.nix} | 0 .../ru/rust-bindgen-unwrapped/pkg-fun.nix} | 0 .../ru/rust-bindgen/pkg-fun.nix} | 0 .../ru/rust-bindgen}/wrapper.sh | 0 .../ru/rust-code-analysis/pkg-fun.nix} | 0 .../ru/rust-petname/pkg-fun.nix} | 0 .../ru/rust-script/pkg-fun.nix} | 0 .../ru}/rustc-demangle/add-Cargo.lock.patch | 0 .../ru/rustc-demangle/pkg-fun.nix} | 0 .../remote => unit/ru}/rustdesk/cargo.patch | 0 .../ru}/rustdesk/fix-for-rust-1.65.diff | 0 .../ru/rustdesk/pkg-fun.nix} | 0 .../ru/rusty-man/pkg-fun.nix} | 0 .../ru/rusty-psn/pkg-fun.nix} | 0 .../ru/rustypaste/pkg-fun.nix} | 0 .../ru/ruwudu/pkg-fun.nix} | 0 .../rw/default.nix => unit/rw/rw/pkg-fun.nix} | 0 .../default.nix => unit/rw/rwc/pkg-fun.nix} | 0 .../rx/default.nix => unit/rx/rx/pkg-fun.nix} | 0 .../default.nix => unit/rx/rxp/pkg-fun.nix} | 0 .../patches/256-color-resources.patch | 0 .../patches/9.06-font-width.patch | 0 .../patches/makefile-phony.patch | 0 .../rx/rxvt-unicode-unwrapped/pkg-fun.nix} | 0 .../rx/rxvt-unicode/pkg-fun.nix} | 0 .../default.nix => unit/rx/rxvt/pkg-fun.nix} | 0 .../ry}/ryujinx/appdir.patch | 0 .../emulators => unit/ry}/ryujinx/deps.nix | 0 .../ry/ryujinx/pkg-fun.nix} | 0 .../emulators => unit/ry}/ryujinx/updater.sh | 0 .../ry/ryzenadj/pkg-fun.nix} | 0 .../default.nix => unit/rz/rzip/pkg-fun.nix} | 0 .../default.nix => unit/s-/s-tar/pkg-fun.nix} | 0 .../default.nix => unit/s-/s-tui/pkg-fun.nix} | 0 .../s2/s2geometry/pkg-fun.nix} | 0 .../s2/s2n-tls/pkg-fun.nix} | 0 .../default.nix => unit/s2/s2png/pkg-fun.nix} | 0 .../s3/s3backer/pkg-fun.nix} | 0 .../default.nix => unit/s3/s3bro/pkg-fun.nix} | 0 .../default.nix => unit/s3/s3fs/pkg-fun.nix} | 0 .../default.nix => unit/s3/s3ql/pkg-fun.nix} | 0 .../default.nix => unit/s4/s4cmd/pkg-fun.nix} | 0 .../default.nix => unit/s5/s5cmd/pkg-fun.nix} | 0 .../default.nix => unit/s9/s9fes/pkg-fun.nix} | 0 .../sa/sabnzbd/pkg-fun.nix} | 0 .../default.nix => unit/sa/sacad/pkg-fun.nix} | 0 .../default.nix => unit/sa/sacc/pkg-fun.nix} | 0 .../default.nix => unit/sa/sacd/pkg-fun.nix} | 0 .../sa}/sacrifice/compat.patch | 0 .../sa/sacrifice/pkg-fun.nix} | 0 .../sa}/sacrifice/pythia83xx.patch | 0 .../default.nix => unit/sa/sad/pkg-fun.nix} | 0 .../sa/safe-rm/pkg-fun.nix} | 0 .../default.nix => unit/sa/safe/pkg-fun.nix} | 0 .../sa/safecopy/pkg-fun.nix} | 0 .../sa/safeeyes/pkg-fun.nix} | 0 .../sa/safefile/pkg-fun.nix} | 0 .../math => unit/sa}/sage/env-locations.nix | 0 .../configurationpy-error-verbose.patch | 0 .../sage/patches/disable-slow-glpk-test.patch | 0 .../patches/do-not-test-find-library.patch | 0 .../sa}/sage/patches/fix-ecl-race.patch | 0 ...widgets-on_submit-deprecationwarning.patch | 0 .../sa}/sage/patches/linbox-1.7-upgrade.patch | 0 .../patches/pari-2.15.1-upgrade-rebased.patch | 0 .../sphinx-docbuild-subprocesses.patch | 0 .../sa}/sage/patches/sympow-cache.patch | 0 .../patches/tachyon-renamed-focallength.patch | 0 .../default.nix => unit/sa/sage/pkg-fun.nix} | 0 .../sa}/sage/python-modules/sage-docbuild.nix | 0 .../sa}/sage/python-modules/sage-setup.nix | 0 .../math => unit/sa}/sage/sage-env.nix | 0 .../math => unit/sa}/sage/sage-src.nix | 0 .../math => unit/sa}/sage/sage-tests.nix | 0 .../math => unit/sa}/sage/sage-with-env.nix | 0 .../science/math => unit/sa}/sage/sage.nix | 0 .../science/math => unit/sa}/sage/sagedoc.nix | 0 .../science/math => unit/sa}/sage/sagelib.nix | 0 .../math => unit/sa}/sage/threejs-sage.nix | 0 .../sa/sagetex/pkg-fun.nix} | 0 .../sa/sagittarius-scheme/pkg-fun.nix} | 0 .../sa/sagoin/pkg-fun.nix} | 0 .../sa/sahel-fonts/pkg-fun.nix} | 0 .../sa/sailsd/pkg-fun.nix} | 0 .../sa/sakura/pkg-fun.nix} | 0 .../default.nix => unit/sa/saldl/pkg-fun.nix} | 0 .../sa/saleae-logic-2/pkg-fun.nix} | 0 .../sa/saleae-logic/pkg-fun.nix} | 0 .../misc => unit/sa}/saleae-logic/preload.c | 0 .../sa}/salt/fix-libcrypto-loading.patch | 0 .../default.nix => unit/sa/salt/pkg-fun.nix} | 0 .../sa/sam-ba/pkg-fun.nix} | 0 .../sa/sambamba/pkg-fun.nix} | 0 .../sa/samblaster/pkg-fun.nix} | 0 .../sa/sameboy/pkg-fun.nix} | 0 .../sa/samim-fonts/pkg-fun.nix} | 0 .../sa/sammler/pkg-fun.nix} | 0 .../sa/sampler/pkg-fun.nix} | 0 .../sa/samplicator/pkg-fun.nix} | 0 .../sa/sampradaya/pkg-fun.nix} | 0 .../module.nix | 0 .../pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../sa/samtools/pkg-fun.nix} | 0 .../sa/samurai/pkg-fun.nix} | 0 .../sa/sanctity/pkg-fun.nix} | 0 .../sa/sandboxfs/pkg-fun.nix} | 0 .../sa/sane-airscan/pkg-fun.nix} | 0 .../sa/sane-drivers/pkg-fun.nix} | 0 .../sa/sane-frontends/pkg-fun.nix} | 0 .../sa/sanjuuni/pkg-fun.nix} | 0 .../sa/sanoid/pkg-fun.nix} | 0 .../sa/sarasa-gothic/pkg-fun.nix} | 0 .../sa/sasquatch/pkg-fun.nix} | 0 .../tools => unit/sa}/sass/Gemfile | 0 .../tools => unit/sa}/sass/Gemfile.lock | 0 .../tools => unit/sa}/sass/gemset.nix | 0 .../default.nix => unit/sa/sass/pkg-fun.nix} | 0 .../default.nix => unit/sa/sassc/pkg-fun.nix} | 0 .../sa/sasutils/pkg-fun.nix} | 0 .../sa/satysfi/pkg-fun.nix} | 0 .../sa/sauce-connect/pkg-fun.nix} | 0 .../sa/sauerbraten/pkg-fun.nix} | 0 .../sa/savepagenow/pkg-fun.nix} | 0 .../sa/saw-tools/pkg-fun.nix} | 0 .../sa/sawfish/pkg-fun.nix} | 0 .../sa/sawjap/pkg-fun.nix} | 0 .../sb/sbagen/pkg-fun.nix} | 0 .../default.nix => unit/sb/sbc/pkg-fun.nix} | 0 .../sb/sbclBootstrap/pkg-fun.nix} | 0 .../default.nix => unit/sb/sbctl/pkg-fun.nix} | 0 .../sb/sblim-sfcc/pkg-fun.nix} | 0 .../sb/sbt-extras/pkg-fun.nix} | 0 .../sb/sbt-with-scala-native/pkg-fun.nix} | 0 .../default.nix => unit/sb/sbt/pkg-fun.nix} | 0 .../default.nix => unit/sc/sc-im/pkg-fun.nix} | 0 .../sc}/sc2-headless/maps.nix | 0 .../sc/sc2-headless/pkg-fun.nix} | 0 .../default.nix => unit/sc/sc68/pkg-fun.nix} | 0 .../sc/scala-cli/pkg-fun.nix} | 0 .../sc}/scala-cli/sources.json | 0 .../sc}/scala-cli/update.nix | 0 .../scala => unit/sc/scala_3}/bare.nix | 0 .../sc/scala_3/pkg-fun.nix} | 0 .../sc/scalafmt/pkg-fun.nix} | 0 .../sc/scalapack/pkg-fun.nix} | 0 .../sc/scaleft/pkg-fun.nix} | 0 .../sc/scaleway-cli/pkg-fun.nix} | 0 .../default.nix => unit/sc/scalp/pkg-fun.nix} | 0 .../sc/scanbd/pkg-fun.nix} | 0 .../sc/scanmem/pkg-fun.nix} | 0 .../sc/scantailor/pkg-fun.nix} | 0 pkgs/{tools/games => unit/sc}/scarab/deps.nix | 0 .../sc/scarab/pkg-fun.nix} | 0 .../default.nix => unit/sc/scc/pkg-fun.nix} | 0 .../default.nix => unit/sc/scdl/pkg-fun.nix} | 0 .../default.nix => unit/sc/scdoc/pkg-fun.nix} | 0 .../sc/scenebuilder/pkg-fun.nix} | 0 .../sc/schedtool/pkg-fun.nix} | 0 .../sc/schema2ldif/pkg-fun.nix} | 0 .../sc/schemaspy/pkg-fun.nix} | 0 .../sc/scheme-bytestructures/pkg-fun.nix} | 0 .../sc/scheme-manpages/pkg-fun.nix} | 0 .../sc/scheme48/pkg-fun.nix} | 0 .../sc/schismtracker/pkg-fun.nix} | 0 .../cli => unit/sc/schleuder-cli}/Gemfile | 0 .../sc/schleuder-cli}/Gemfile.lock | 0 .../cli => unit/sc/schleuder-cli}/gemset.nix | 0 .../sc/schleuder-cli/pkg-fun.nix} | 0 .../sc/schleuder/pkg-fun.nix} | 0 .../sc/scientifica/pkg-fun.nix} | 0 .../sc/scilab-bin/pkg-fun.nix} | 0 .../sc/scilla/pkg-fun.nix} | 0 .../sc/scimark/pkg-fun.nix} | 0 .../default.nix => unit/sc/scite/pkg-fun.nix} | 0 .../default.nix => unit/sc/scli/pkg-fun.nix} | 0 .../sc/scmccid/pkg-fun.nix} | 0 .../sc/scmpuff/pkg-fun.nix} | 0 .../sc/scope-lite/pkg-fun.nix} | 0 .../sc}/scorched3d/file-existence.patch | 0 .../sc/scorched3d/pkg-fun.nix} | 0 .../sc/scorecard/pkg-fun.nix} | 0 .../sc/scotch/pkg-fun.nix} | 0 .../default.nix => unit/sc/scowl/pkg-fun.nix} | 0 .../sc/scponly/pkg-fun.nix} | 0 .../sc}/scponly/scponly-fix-make.patch | 0 .../sc/scraper/pkg-fun.nix} | 0 .../sc/scream/pkg-fun.nix} | 0 .../sc/screen-message/pkg-fun.nix} | 0 .../sc/screenfetch/pkg-fun.nix} | 0 .../sc/screenkey/pkg-fun.nix} | 0 .../sc/scriptaculous/pkg-fun.nix} | 0 .../sc/scrolls/pkg-fun.nix} | 0 .../default.nix => unit/sc/scrot/pkg-fun.nix} | 0 .../default.nix => unit/sc/scrub/pkg-fun.nix} | 0 .../sc}/scryer-prolog/cargo.patch | 0 .../sc/scryer-prolog/pkg-fun.nix} | 0 .../sc/scrypt/pkg-fun.nix} | 0 .../default.nix => unit/sc/scs/pkg-fun.nix} | 0 .../default.nix => unit/sc/scsh/pkg-fun.nix} | 0 .../tools => unit/sc}/scss-lint/Gemfile | 0 .../tools => unit/sc}/scss-lint/Gemfile.lock | 0 .../tools => unit/sc}/scss-lint/gemset.nix | 0 .../sc/scss-lint/pkg-fun.nix} | 0 .../default.nix => unit/sc/sct/pkg-fun.nix} | 0 .../sc/scudcloud/pkg-fun.nix} | 0 .../sd/SDL2_gfx/pkg-fun.nix} | 0 .../sd/SDL2_net/pkg-fun.nix} | 0 .../sd/SDL2_ttf/pkg-fun.nix} | 0 .../sd/SDL2_ttf_2_0_15/pkg-fun.nix} | 0 .../sd}/SDL_Pango/fixes.patch | 0 .../sd/SDL_Pango/pkg-fun.nix} | 0 .../sd/SDL_audiolib/pkg-fun.nix} | 0 .../sd/SDL_gfx/pkg-fun.nix} | 0 .../sd/SDL_gpu/pkg-fun.nix} | 0 .../sd/SDL_image/pkg-fun.nix} | 0 .../sd/SDL_mixer/pkg-fun.nix} | 0 .../sd/SDL_net/pkg-fun.nix} | 0 .../sd/SDL_sixel/pkg-fun.nix} | 0 .../sd/SDL_sound/pkg-fun.nix} | 0 .../sd/SDL_stretch/pkg-fun.nix} | 0 .../sd/SDL_ttf/pkg-fun.nix} | 0 .../sd/sd-local/pkg-fun.nix} | 0 .../sd/sd-mux-ctrl/pkg-fun.nix} | 0 .../sd/sd-switch/pkg-fun.nix} | 0 .../sd/sdat2img/pkg-fun.nix} | 0 .../default.nix => unit/sd/sdate/pkg-fun.nix} | 0 .../sd/sdbus-cpp/pkg-fun.nix} | 0 .../default.nix => unit/sd/sdcv/pkg-fun.nix} | 0 .../sd/sdl-jstest/pkg-fun.nix} | 0 .../sd/sdlookup/pkg-fun.nix} | 0 .../sd/sdlpop/pkg-fun.nix} | 0 pkgs/{games => unit/sd}/sdlpop/prince.sh | 0 .../sd/sdparm/pkg-fun.nix} | 0 .../sd/sdrplay/pkg-fun.nix} | 0 .../se/seabios/pkg-fun.nix} | 0 .../se}/seafile-server/libevhtp.nix | 0 .../se/seafile-server/pkg-fun.nix} | 0 .../se/seafile-shared/pkg-fun.nix} | 0 .../se/seahub/pkg-fun.nix} | 0 .../se/sealcurses/pkg-fun.nix} | 0 .../default.nix => unit/se/searx/pkg-fun.nix} | 0 .../se/seashells/pkg-fun.nix} | 0 .../se/seasocks/pkg-fun.nix} | 0 .../default.nix => unit/se/seatd/pkg-fun.nix} | 0 .../se/seaview/pkg-fun.nix} | 0 .../se/seaweedfs/pkg-fun.nix} | 0 .../default.nix => unit/se/sec/pkg-fun.nix} | 0 .../se/seccure/pkg-fun.nix} | 0 .../se/secp256k1/pkg-fun.nix} | 0 .../se/secrets-extractor/pkg-fun.nix} | 0 .../se/secretscanner/pkg-fun.nix} | 0 .../se/sedutil/pkg-fun.nix} | 0 .../se/seehecht/pkg-fun.nix} | 0 .../se/seexpr/pkg-fun.nix} | 0 .../se/segger-jlink/pkg-fun.nix} | 0 .../se/segger-ozone/pkg-fun.nix} | 0 .../se/selendroid/pkg-fun.nix} | 0 .../se/selene/pkg-fun.nix} | 0 .../selenium-server-standalone/pkg-fun.nix} | 0 .../se/selfoss/pkg-fun.nix} | 0 .../se/selinux-python/pkg-fun.nix} | 0 .../se/selinux-sandbox/pkg-fun.nix} | 0 .../se/semiphemeral/pkg-fun.nix} | 0 .../se/semodule-utils/pkg-fun.nix} | 0 .../se/semver-cpp/pkg-fun.nix} | 0 .../se/semver-tool/pkg-fun.nix} | 0 .../se/semver/pkg-fun.nix} | 0 .../se/senpai/pkg-fun.nix} | 0 .../monitoring => unit/se}/sensu/Gemfile | 0 .../monitoring => unit/se}/sensu/Gemfile.lock | 0 .../monitoring => unit/se}/sensu/gemset.nix | 0 .../default.nix => unit/se/sensu/pkg-fun.nix} | 0 .../default.nix => unit/se/sent/pkg-fun.nix} | 0 .../se/sentencepiece/pkg-fun.nix} | 0 .../se/sentry-native/pkg-fun.nix} | 0 .../default.nix => unit/se/senv/pkg-fun.nix} | 0 .../se}/seq24/mutex_no_nameclash.patch | 0 .../default.nix => unit/se/seq24/pkg-fun.nix} | 0 .../se/seqkit/pkg-fun.nix} | 0 .../default.nix => unit/se/seqtk/pkg-fun.nix} | 0 .../se/sequeler/pkg-fun.nix} | 0 .../se/sequelpro/pkg-fun.nix} | 0 .../se/sequoia-chameleon-gnupg/pkg-fun.nix} | 0 .../se/ser2net/pkg-fun.nix} | 0 .../default.nix => unit/se/serd/pkg-fun.nix} | 0 .../default.nix => unit/se/seren/pkg-fun.nix} | 0 .../se/serfdom/pkg-fun.nix} | 0 .../se/serialdv/pkg-fun.nix} | 0 .../se/serpent/pkg-fun.nix} | 0 .../se/service-wrapper/pkg-fun.nix} | 0 .../se}/service-wrapper/service-wrapper.sh | 0 .../se/serviio/pkg-fun.nix} | 0 .../se/seshat/pkg-fun.nix} | 0 .../se/session-desktop/pkg-fun.nix} | 0 .../se/setbfree/pkg-fun.nix} | 0 .../se/setools/pkg-fun.nix} | 0 .../se/setroot/pkg-fun.nix} | 0 .../se/setserial/pkg-fun.nix} | 0 .../se/setupSystemdUnits/pkg-fun.nix} | 0 .../se/seturgent/pkg-fun.nix} | 0 .../se/setzer/pkg-fun.nix} | 0 .../default.nix => unit/se/sewer/pkg-fun.nix} | 0 .../se/seyren/pkg-fun.nix} | 0 .../default.nix => unit/sf/sfeed/pkg-fun.nix} | 0 .../default.nix => unit/sf/sfizz/pkg-fun.nix} | 0 .../default.nix => unit/sf/sfm/pkg-fun.nix} | 0 .../sf/sfrotz/pkg-fun.nix} | 0 .../sf/sfsexp/pkg-fun.nix} | 0 .../sf/sftpman/pkg-fun.nix} | 0 .../default.nix => unit/sf/sfxr/pkg-fun.nix} | 0 .../default.nix => unit/sf/sfz/pkg-fun.nix} | 0 .../sg/sg3_utils/pkg-fun.nix} | 0 .../default.nix => unit/sg/sget/pkg-fun.nix} | 0 .../default.nix => unit/sg/sgp4/pkg-fun.nix} | 0 .../default.nix => unit/sg/sgrep/pkg-fun.nix} | 0 .../sg/sgx-azure-dcap-client/pkg-fun.nix} | 0 .../sg/sgx-azure-dcap-client}/test-suite.nix | 0 .../sg/sgx-psw/pkg-fun.nix} | 0 .../sg/sgx-ssl}/intel-sgx-ssl-pr-111.patch | 0 .../sg/sgx-ssl/pkg-fun.nix} | 0 .../sh/sha1collisiondetection/pkg-fun.nix} | 0 .../sh/shaarli/pkg-fun.nix} | 0 .../default.nix => unit/sh/shab/pkg-fun.nix} | 0 .../sh/shabnam-fonts/pkg-fun.nix} | 0 .../sh}/shadered/install_path_fix.patch | 0 .../sh/shadered/pkg-fun.nix} | 0 .../sh/shades-of-gray-theme/pkg-fun.nix} | 0 .../sh}/shadow/fix-install-with-tcb.patch | 0 .../linux => unit/sh}/shadow/keep-path.patch | 0 .../sh/shadow/pkg-fun.nix} | 0 .../respect-xml-catalog-files-var.patch | 0 .../sh}/shadow/runtime-shell.patch | 0 .../sh/shadowfox/pkg-fun.nix} | 0 .../sh/shadowsocks-libev/pkg-fun.nix} | 0 .../sh/shadowsocks-v2ray-plugin/pkg-fun.nix} | 0 .../sh/shairport-sync/pkg-fun.nix} | 0 .../sh/shallot/pkg-fun.nix} | 0 .../sh/shapelib/pkg-fun.nix} | 0 .../sh/shared-mime-info/pkg-fun.nix} | 0 .../sh/shared_desktop_ontologies/pkg-fun.nix} | 0 .../sh/sharedown/pkg-fun.nix} | 0 .../misc => unit/sh}/sharedown/update.sh | 0 .../misc => unit/sh}/sharedown/yarn.lock | 0 .../misc => unit/sh}/sharedown/yarndeps.nix | 0 .../sh/sharness/pkg-fun.nix} | 0 .../sh/sharutils/pkg-fun.nix} | 0 .../sh/shattered-pixel-dungeon/pkg-fun.nix} | 0 .../default.nix => unit/sh/shc/pkg-fun.nix} | 0 .../sh/shell-hist/pkg-fun.nix} | 0 .../sh/shelldap/pkg-fun.nix} | 0 .../sh/shellharden/pkg-fun.nix} | 0 .../sh/shellhub-agent/pkg-fun.nix} | 0 .../sh/shellnoob/pkg-fun.nix} | 0 .../sh/shellspec/pkg-fun.nix} | 0 .../sh/shellz/pkg-fun.nix} | 0 .../sh/shen-sbcl/pkg-fun.nix} | 0 .../sh/shen-sources/pkg-fun.nix} | 0 .../sh/sherlock/pkg-fun.nix} | 0 .../sh/sherpa/pkg-fun.nix} | 0 .../default.nix => unit/sh/shfm/pkg-fun.nix} | 0 .../default.nix => unit/sh/shfmt/pkg-fun.nix} | 0 .../sh/shhgit/pkg-fun.nix} | 0 .../sh/shhmsg/pkg-fun.nix} | 0 .../sh/shhopt/pkg-fun.nix} | 0 .../sh/shibboleth-sp/pkg-fun.nix} | 0 .../sh/shim-unsigned/pkg-fun.nix} | 0 .../default.nix => unit/sh/shine/pkg-fun.nix} | 0 .../sh/shiori/pkg-fun.nix} | 0 .../sh/shipyard/pkg-fun.nix} | 0 .../sh/shisho/pkg-fun.nix} | 0 .../default.nix => unit/sh/shmig/pkg-fun.nix} | 0 .../sh/shncpd/pkg-fun.nix} | 0 .../sh/shntool/pkg-fun.nix} | 0 .../sh/shocco/pkg-fun.nix} | 0 .../default.nix => unit/sh/shod/pkg-fun.nix} | 0 .../web => unit/sh}/shopify-cli/Gemfile | 0 .../web => unit/sh}/shopify-cli/Gemfile.lock | 0 .../web => unit/sh}/shopify-cli/gemset.nix | 0 .../sh/shopify-cli/pkg-fun.nix} | 0 .../sh/shopify-themekit/pkg-fun.nix} | 0 .../sh/shorewall/pkg-fun.nix} | 0 .../sh/shortcat/pkg-fun.nix} | 0 .../sh/shortwave/pkg-fun.nix} | 0 .../sh/shotgun/pkg-fun.nix} | 0 .../sh/shotman/pkg-fun.nix} | 0 .../sh/shotwell/pkg-fun.nix} | 0 .../sh/showmethekey/pkg-fun.nix} | 0 .../{servers/http => unit/sh}/showoff/Gemfile | 0 .../http => unit/sh}/showoff/Gemfile.lock | 0 .../http => unit/sh}/showoff/gemset.nix | 0 .../sh/showoff/pkg-fun.nix} | 0 .../sh/shrikhand/pkg-fun.nix} | 0 .../sh/shticker-book-unwritten/pkg-fun.nix} | 0 .../sh}/shticker-book-unwritten/unwrapped.nix | 0 .../default.nix => unit/sh/shtns/pkg-fun.nix} | 0 .../sh/shunit2/pkg-fun.nix} | 0 .../sh/shutter/pkg-fun.nix} | 0 .../si/sic-image-cli/pkg-fun.nix} | 0 .../default.nix => unit/si/sic/pkg-fun.nix} | 0 .../override-python-version-check.patch | 0 .../si/sickgear/pkg-fun.nix} | 0 .../si/sidequest/pkg-fun.nix} | 0 .../si/sidplayfp/pkg-fun.nix} | 0 .../si/siduck76-st/pkg-fun.nix} | 0 .../default.nix => unit/si/siege/pkg-fun.nix} | 0 .../si/sienna/pkg-fun.nix} | 0 .../si/sierra-gtk-theme/pkg-fun.nix} | 0 .../si/sieve-connect/pkg-fun.nix} | 0 pkgs/{tools/text => unit/si}/sift/deps.nix | 0 .../default.nix => unit/si/sift/pkg-fun.nix} | 0 .../si}/sigal/copytree-permissions.patch | 0 .../default.nix => unit/si/sigal/pkg-fun.nix} | 0 .../default.nix => unit/si/sigi/pkg-fun.nix} | 0 .../default.nix => unit/si/siglo/pkg-fun.nix} | 0 .../si}/siglo/siglo-no-user-install.patch | 0 .../si/sigma-cli/pkg-fun.nix} | 0 .../si/signal-cli/pkg-fun.nix} | 0 ...g-during-gradle-build-inside-Nix-FOD.patch | 0 .../0002-buildconfig-local-deps-fixes.patch | 0 .../si/signald/pkg-fun.nix} | 0 .../si/signaldctl/pkg-fun.nix} | 0 .../si/signify/pkg-fun.nix} | 0 .../si}/signing-party/gpgwrap_makefile.patch | 0 .../si/signing-party/pkg-fun.nix} | 0 .../si/signumone-ks/pkg-fun.nix} | 0 .../si/signwriting/pkg-fun.nix} | 0 .../si/sigrok-cli/pkg-fun.nix} | 0 .../si/sigrok-firmware-fx2lafw/pkg-fun.nix} | 0 .../si/sigslot/pkg-fun.nix} | 0 .../si/sigutils/pkg-fun.nix} | 0 .../default.nix => unit/si/siji/pkg-fun.nix} | 0 .../si/sil-abyssinica/pkg-fun.nix} | 0 .../si/sil-padauk/pkg-fun.nix} | 0 .../default.nix => unit/si/sil-q/pkg-fun.nix} | 0 .../default.nix => unit/si/sil/pkg-fun.nix} | 0 .../si/silc_client/pkg-fun.nix} | 0 .../si/silc_server/pkg-fun.nix} | 0 .../si/silenthound/pkg-fun.nix} | 0 .../si/silice/pkg-fun.nix} | 0 .../si}/silver-searcher/bash-completion.patch | 0 .../si/silver-searcher/pkg-fun.nix} | 0 .../si/simdjson/pkg-fun.nix} | 0 .../si/simg2img/pkg-fun.nix} | 0 .../si/simgear/pkg-fun.nix} | 0 .../si/simgrid/pkg-fun.nix} | 0 .../default.nix => unit/si/simh/pkg-fun.nix} | 0 .../si/simp1e-cursors/pkg-fun.nix} | 0 .../si/simp_le/pkg-fun.nix} | 0 .../si/simple-dlna-browser/pkg-fun.nix} | 0 .../si/simpleTpmPk11/pkg-fun.nix} | 0 .../si}/simplehttp2server/deps.nix | 0 .../si/simplehttp2server/pkg-fun.nix} | 0 .../si/simplenes/pkg-fun.nix} | 0 .../si/simplenote/pkg-fun.nix} | 0 .../si/simpleproxy/pkg-fun.nix} | 0 .../si/simutrans/pkg-fun.nix} | 0 .../si/sing-box/pkg-fun.nix} | 0 .../si/singular/pkg-fun.nix} | 0 .../si/singularity-tools/pkg-fun.nix} | 0 .../si/singularity/pkg-fun.nix} | 0 .../si/sipcalc/pkg-fun.nix} | 0 .../si/sipexer/pkg-fun.nix} | 0 .../default.nix => unit/si/sipp/pkg-fun.nix} | 0 .../si}/siproxd/cheaders.patch | 0 .../si/siproxd/pkg-fun.nix} | 0 .../si/sipsak/pkg-fun.nix} | 0 .../si/sipwitch/pkg-fun.nix} | 0 .../default.nix => unit/si/siril/pkg-fun.nix} | 0 .../si/sirula/pkg-fun.nix} | 0 .../default.nix => unit/si/sish/pkg-fun.nix} | 0 .../si/sitelen-seli-kiwen/pkg-fun.nix} | 0 .../misc => unit/si}/sixpair/hcitool.patch | 0 .../si/sixpair/pkg-fun.nix} | 0 .../sj/sjasmplus/pkg-fun.nix} | 0 .../sk/SkypeExport/pkg-fun.nix} | 0 .../sk/skaffold/pkg-fun.nix} | 0 .../default.nix => unit/sk/skate/pkg-fun.nix} | 0 .../sk/skeema/pkg-fun.nix} | 0 .../default.nix => unit/sk/skeu/pkg-fun.nix} | 0 .../default.nix => unit/sk/skim/pkg-fun.nix} | 0 .../sk/skippy-xd/pkg-fun.nix} | 0 .../sk/skjold/pkg-fun.nix} | 0 .../sk/skk-dicts/pkg-fun.nix} | 0 .../sk/skktools/pkg-fun.nix} | 0 .../sk/skopeo/pkg-fun.nix} | 0 pkgs/{servers => unit/sk}/skydns/deps.nix | 0 .../sk/skydns/pkg-fun.nix} | 0 .../sk/skypeforlinux/pkg-fun.nix} | 0 .../sk/skytemple/pkg-fun.nix} | 0 .../sl/default.nix => unit/sl/sl/pkg-fun.nix} | 0 .../sl/slack-cli/pkg-fun.nix} | 0 .../sl/slack-term/pkg-fun.nix} | 0 .../default.nix => unit/sl/slack/pkg-fun.nix} | 0 .../sl}/slack/update.sh | 0 .../default.nix => unit/sl/slang/pkg-fun.nix} | 0 .../sl/sleuthkit/pkg-fun.nix} | 0 .../sl/slides/pkg-fun.nix} | 0 .../sl/slimerjs/pkg-fun.nix} | 0 .../sl/slimserver/pkg-fun.nix} | 0 .../sl/slirp4netns/pkg-fun.nix} | 0 .../sl/slmenu/pkg-fun.nix} | 0 .../sl/sloccount/pkg-fun.nix} | 0 .../default.nix => unit/sl/slop/pkg-fun.nix} | 0 .../sl/slowhttptest/pkg-fun.nix} | 0 .../sl/slowlorust/pkg-fun.nix} | 0 .../default.nix => unit/sl/slrn/pkg-fun.nix} | 0 .../sl/slsnif/pkg-fun.nix} | 0 .../sl/slurm-spank-stunnel/pkg-fun.nix} | 0 .../sl/slurm-spank-x11/pkg-fun.nix} | 0 .../sl}/slurm/common-env-echo.patch | 0 .../default.nix => unit/sl/slurm/pkg-fun.nix} | 0 .../sl}/slurm/pmix-configure.patch | 0 .../default.nix => unit/sl/slurp/pkg-fun.nix} | 0 .../default.nix => unit/sl/slweb/pkg-fun.nix} | 0 .../default.nix => unit/sm/smack/pkg-fun.nix} | 0 .../sm/smallwm/pkg-fun.nix} | 0 .../sm/smart-wallpaper/pkg-fun.nix} | 0 .../sm/smartdns/pkg-fun.nix} | 0 .../sm/smarty3-i18n/pkg-fun.nix} | 0 .../sm/smarty3/pkg-fun.nix} | 0 .../sm/smatch/pkg-fun.nix} | 0 .../sm/smbnetfs/pkg-fun.nix} | 0 .../sm/smbscan/pkg-fun.nix} | 0 .../default.nix => unit/sm/smc/pkg-fun.nix} | 0 .../sm/smcroute/pkg-fun.nix} | 0 .../default.nix => unit/sm/smem/pkg-fun.nix} | 0 .../sm/smemstat/pkg-fun.nix} | 0 .../default.nix => unit/sm/smenu/pkg-fun.nix} | 0 .../sm/smiley-sans/pkg-fun.nix} | 0 .../sm/smimesign/pkg-fun.nix} | 0 .../sm/smlfmt/pkg-fun.nix} | 0 .../sm/smlnjBootstrap/pkg-fun.nix} | 0 .../sm/smlpkg/pkg-fun.nix} | 0 .../sm/smokegen/pkg-fun.nix} | 0 .../sm/smokeping/pkg-fun.nix} | 0 .../sm/smokeqt/pkg-fun.nix} | 0 .../sm/smooth/pkg-fun.nix} | 0 .../libraries => unit/sm}/smpeg/format.patch | 0 .../libraries => unit/sm}/smpeg/gcc6.patch | 0 .../libraries => unit/sm}/smpeg/gtk.patch | 0 .../libraries => unit/sm}/smpeg/libx11.patch | 0 .../default.nix => unit/sm/smpeg/pkg-fun.nix} | 0 .../sm/smpeg2/pkg-fun.nix} | 0 .../default.nix => unit/sm/smpq/pkg-fun.nix} | 0 .../default.nix => unit/sm/smu/pkg-fun.nix} | 0 .../default.nix => unit/sm/smug/pkg-fun.nix} | 0 .../sn/sn0int/pkg-fun.nix} | 0 .../default.nix => unit/sn/snabb/pkg-fun.nix} | 0 .../default.nix => unit/sn/snac2/pkg-fun.nix} | 0 .../sn/snake4/pkg-fun.nix} | 0 .../sn/snakemake/pkg-fun.nix} | 0 .../sn/snallygaster/pkg-fun.nix} | 0 .../default.nix => unit/sn/snap7/pkg-fun.nix} | 0 .../snap => unit/sn/snapTools}/make-snap.nix | 0 .../sn/snapTools/pkg-fun.nix} | 0 .../sn/snapdragon-profiler/pkg-fun.nix} | 0 .../sn/snapmaker-luban/pkg-fun.nix} | 0 .../sn/snapper-gui/pkg-fun.nix} | 0 .../sn/snapper/pkg-fun.nix} | 0 .../sn/snappy/pkg-fun.nix} | 0 .../sn/snappymail/pkg-fun.nix} | 0 .../sn/snapraid/pkg-fun.nix} | 0 .../default.nix => unit/sn/snazy/pkg-fun.nix} | 0 .../default.nix => unit/sn/sndio/pkg-fun.nix} | 0 .../sn/sndpeek/pkg-fun.nix} | 0 .../audio => unit/sn}/sndpeek/pthread.patch | 0 .../default.nix => unit/sn/snet/pkg-fun.nix} | 0 .../sn/sngrep/pkg-fun.nix} | 0 .../sn/sniffglue/pkg-fun.nix} | 0 .../sn/sniffnet/pkg-fun.nix} | 0 .../sn}/snipe-it/composer-env.nix | 0 .../sn}/snipe-it/composition.nix | 0 .../sn}/snipe-it/php-packages.nix | 0 .../sn/snipe-it/pkg-fun.nix} | 0 .../sn/snipes/pkg-fun.nix} | 0 .../sn/snippetpixie/pkg-fun.nix} | 0 .../sn/sniproxy/pkg-fun.nix} | 0 .../default.nix => unit/sn/snis/pkg-fun.nix} | 0 .../sn/snixembed/pkg-fun.nix} | 0 .../sn/snmpcheck/pkg-fun.nix} | 0 .../sn/snooze/pkg-fun.nix} | 0 .../default.nix => unit/sn/snore/pkg-fun.nix} | 0 .../default.nix => unit/sn/snort/pkg-fun.nix} | 0 .../default.nix => unit/sn/snow/pkg-fun.nix} | 0 .../sn/snowblind/pkg-fun.nix} | 0 .../sn/snowcat/pkg-fun.nix} | 0 .../sn/snowcrash/pkg-fun.nix} | 0 .../sn/snowflake/pkg-fun.nix} | 0 .../sn/snowsql/pkg-fun.nix} | 0 .../sn/snpeff/pkg-fun.nix} | 0 .../default.nix => unit/sn/snzip/pkg-fun.nix} | 0 .../so/soapyremote/pkg-fun.nix} | 0 .../so/soapysdrplay/pkg-fun.nix} | 0 .../default.nix => unit/so/socat/pkg-fun.nix} | 0 .../default.nix => unit/so/soci/pkg-fun.nix} | 0 .../so/social-engineer-toolkit/pkg-fun.nix} | 0 .../so/sockdump/pkg-fun.nix} | 0 .../so/socket_wrapper/pkg-fun.nix} | 0 .../so/socklog/pkg-fun.nix} | 0 .../so/sockperf/pkg-fun.nix} | 0 .../so/soco-cli/pkg-fun.nix} | 0 .../so/sof-firmware/pkg-fun.nix} | 0 .../so/soft-serve/pkg-fun.nix} | 0 .../so/softether/pkg-fun.nix} | 0 .../so}/sogo/enable-activesync.patch | 0 .../default.nix => unit/so/sogo/pkg-fun.nix} | 0 .../default.nix => unit/so/soju/pkg-fun.nix} | 0 .../default.nix => unit/so/sokol/pkg-fun.nix} | 0 .../so/solaar/pkg-fun.nix} | 0 .../so/solarc-gtk-theme/pkg-fun.nix} | 0 .../so/solicurses/pkg-fun.nix} | 0 .../so/sollya/pkg-fun.nix} | 0 .../default.nix => unit/so/solo5/pkg-fun.nix} | 0 .../default.nix => unit/so/solr/pkg-fun.nix} | 0 .../so/solvespace/pkg-fun.nix} | 0 .../so/somafm-cli/pkg-fun.nix} | 0 .../so/somatic-sniper/pkg-fun.nix} | 0 .../so}/somatic-sniper/somatic-sniper.patch | 0 .../so/somebar/pkg-fun.nix} | 0 .../so/sommelier/pkg-fun.nix} | 0 .../so}/sommelier/update.py | 0 .../so/sonar-scanner-cli/pkg-fun.nix} | 0 .../so/sonarr/pkg-fun.nix} | 0 pkgs/{servers => unit/so}/sonarr/update.sh | 0 .../so/sonata/pkg-fun.nix} | 0 .../so/songrec/pkg-fun.nix} | 0 .../so/sonic-server/pkg-fun.nix} | 0 .../default.nix => unit/so/sonic/pkg-fun.nix} | 0 .../so/sonixd/pkg-fun.nix} | 0 .../so/sonobuoy/pkg-fun.nix} | 0 .../so/sonota/pkg-fun.nix} | 0 .../so}/sonota/set_resource_path.patch | 0 .../so/sony-headphones-client/pkg-fun.nix} | 0 .../so/sooperlooper/pkg-fun.nix} | 0 .../default.nix => unit/so/sope/pkg-fun.nix} | 0 .../default.nix => unit/so/sops/pkg-fun.nix} | 0 .../so/sorcer/pkg-fun.nix} | 0 .../default.nix => unit/so/sord/pkg-fun.nix} | 0 .../so/sorted-grep/pkg-fun.nix} | 0 .../so/sortmerna/pkg-fun.nix} | 0 .../so/souffle/pkg-fun.nix} | 0 .../so}/souffle/threads.patch | 0 .../so/sound-juicer/pkg-fun.nix} | 0 .../so/sound-theme-freedesktop/pkg-fun.nix} | 0 .../so/soundOfSorting/pkg-fun.nix} | 0 .../so/soundconverter/pkg-fun.nix} | 0 .../so/soundfont-fluid/pkg-fun.nix} | 0 .../so/soundfont-generaluser/pkg-fun.nix} | 0 .../so/soundfont-ydp-grand/pkg-fun.nix} | 0 .../radio => unit/so}/soundmodem/matFix.patch | 0 .../so/soundmodem/pkg-fun.nix} | 0 .../so/soundtouch/pkg-fun.nix} | 0 .../so/soundtracker/pkg-fun.nix} | 0 .../so/soundwireserver/pkg-fun.nix} | 0 .../so/soupault/pkg-fun.nix} | 0 .../so/source-code-pro/pkg-fun.nix} | 0 .../so/source-han-code-jp/pkg-fun.nix} | 0 .../so/source-sans-pro/pkg-fun.nix} | 0 .../so/source-sans/pkg-fun.nix} | 0 .../so/source-serif-pro/pkg-fun.nix} | 0 .../so/source-serif/pkg-fun.nix} | 0 .../so/sourceFromHead/pkg-fun.nix} | 0 .../so/sourceHighlight/pkg-fun.nix} | 0 .../so}/sourcehut/builds.nix | 0 .../so}/sourcehut/core.nix | 0 .../so}/sourcehut/disable-npm-install.patch | 0 .../so}/sourcehut/fetchNodeModules.nix | 0 .../so}/sourcehut/fix-gqlgen-trimpath.nix | 0 .../so}/sourcehut/git.nix | 0 .../so}/sourcehut/hg.nix | 0 .../so}/sourcehut/hub.nix | 0 .../so}/sourcehut/lists.nix | 0 .../so}/sourcehut/man.nix | 0 .../so}/sourcehut/meta.nix | 0 .../so}/sourcehut/pages.nix | 0 .../so}/sourcehut/paste.nix | 0 ...ocket-support-in-RedisQueueCollector.patch | 0 .../so/sourcehut/pkg-fun.nix} | 0 .../so}/sourcehut/scm.nix | 0 .../so}/sourcehut/todo.nix | 0 .../default.nix => unit/so/sov/pkg-fun.nix} | 0 .../audio => unit/so}/soxr/arm64-check.patch | 0 .../default.nix => unit/so/soxr/pkg-fun.nix} | 0 .../default.nix => unit/so/soxt/pkg-fun.nix} | 0 .../default.nix => unit/so/sozu/pkg-fun.nix} | 0 .../sp/SPAdes/pkg-fun.nix} | 0 .../sp/space-orbit/pkg-fun.nix} | 0 .../sp/spaceFM}/glibc-fix.patch | 0 .../sp/spaceFM/pkg-fun.nix} | 0 .../sp/spaceFM}/x11-only.patch | 0 .../sp/spacenav-cube-example/pkg-fun.nix} | 0 .../sp/spaceship-prompt/pkg-fun.nix} | 0 .../sp}/spacevim/helptags.patch | 0 .../editors => unit/sp}/spacevim/init.nix | 0 .../sp/spacevim/pkg-fun.nix} | 0 .../default.nix => unit/sp/spago/pkg-fun.nix} | 0 .../purescript => unit/sp}/spago/update.sh | 0 .../sp/spamassassin/pkg-fun.nix} | 0 .../sa-update_add--siteconfigpath.patch | 0 .../sp/spandsp/pkg-fun.nix} | 0 .../3.nix => unit/sp/spandsp3/pkg-fun.nix} | 0 .../sp/spark2014/pkg-fun.nix} | 0 .../sp/sparkleshare/pkg-fun.nix} | 0 .../sp/sparse/pkg-fun.nix} | 0 .../analysis => unit/sp}/sparse/tests.nix | 0 .../sp/sparsehash/pkg-fun.nix} | 0 .../sp/spasm-ng/pkg-fun.nix} | 0 .../sp/spatialite_tools/pkg-fun.nix} | 0 .../sp/spawn_fcgi/pkg-fun.nix} | 0 .../sp}/spdk/ncurses-6.3.patch | 0 .../default.nix => unit/sp/spdk/pkg-fun.nix} | 0 .../sp/spdx-license-list-data/pkg-fun.nix} | 0 .../sp/spectmorph/pkg-fun.nix} | 0 .../sp/spectra/pkg-fun.nix} | 0 .../sp/spectre-cli/pkg-fun.nix} | 0 .../sp/spectre-meltdown-checker/pkg-fun.nix} | 0 .../sp/spectrojack/pkg-fun.nix} | 0 .../sp/spectrwm/pkg-fun.nix} | 0 .../sp/speech-denoiser/pkg-fun.nix} | 0 .../sp/speech-tools/pkg-fun.nix} | 0 .../sp}/speechd/fix-mbrola-paths.patch | 0 .../sp}/speechd/fix-paths.patch | 0 .../sp/speechd/pkg-fun.nix} | 0 .../sp/speedread/pkg-fun.nix} | 0 .../sp/speedtest-exporter/pkg-fun.nix} | 0 .../sp/sphinxsearch/pkg-fun.nix} | 0 .../sp/spice-gtk/pkg-fun.nix} | 0 .../sp/spice-protocol/pkg-fun.nix} | 0 .../sp/spice-up/pkg-fun.nix} | 0 .../sp/spice-vdagent/pkg-fun.nix} | 0 .../default.nix => unit/sp/spice/pkg-fun.nix} | 0 .../sp}/spice/remove-rt-on-darwin.patch | 0 .../sp/spicedb-zed/pkg-fun.nix} | 0 .../sp/spicedb/pkg-fun.nix} | 0 .../sp/spicetify-cli/pkg-fun.nix} | 0 .../default.nix => unit/sp/spicy/pkg-fun.nix} | 0 .../sp/spideroak/pkg-fun.nix} | 0 .../sp/spigot/pkg-fun.nix} | 0 .../default.nix => unit/sp/spike/pkg-fun.nix} | 0 .../default.nix => unit/sp/spin/pkg-fun.nix} | 0 .../sp/spiped/pkg-fun.nix} | 0 .../default.nix => unit/sp/spire/pkg-fun.nix} | 0 .../sp/spirv-cross/pkg-fun.nix} | 0 .../sp/spirv-headers/pkg-fun.nix} | 0 .../sp/spirv-tools/pkg-fun.nix} | 0 .../default.nix => unit/sp/splat/pkg-fun.nix} | 0 .../sp/spleen/pkg-fun.nix} | 0 .../default.nix => unit/sp/splix/pkg-fun.nix} | 0 .../sp}/spnavcfg/configure-cfgfile-path.patch | 0 .../sp}/spnavcfg/configure-pidfile-path.patch | 0 .../sp/spnavcfg/pkg-fun.nix} | 0 .../sp/spooles/pkg-fun.nix} | 0 .../math => unit/sp}/spooles/spooles.patch | 0 .../default.nix => unit/sp/spot/pkg-fun.nix} | 0 .../sp/spotdl/pkg-fun.nix} | 0 .../sp/spotify-cli-linux/pkg-fun.nix} | 0 .../sp/spotify-tray/pkg-fun.nix} | 0 .../sp/spotify/pkg-fun.nix} | 0 .../audio => unit/sp}/spotify/update.sh | 0 .../sp/spotifywm/pkg-fun.nix} | 0 .../sp/spring-boot-cli/pkg-fun.nix} | 0 .../sp/springLobby}/fix-certs.patch | 0 .../sp/springLobby/pkg-fun.nix} | 0 .../sp/springLobby}/revert_58b423e.patch | 0 .../sp/spruce/pkg-fun.nix} | 0 .../default.nix => unit/sp/sptk/pkg-fun.nix} | 0 .../sp/sptlrx/pkg-fun.nix} | 0 .../default.nix => unit/sp/spyre/pkg-fun.nix} | 0 .../sq/default.nix => unit/sq/sq/pkg-fun.nix} | 0 .../sqlar.nix => unit/sq/sqlar/pkg-fun.nix} | 0 .../default.nix => unit/sq/sqlc/pkg-fun.nix} | 0 .../sq/sqlcheck/pkg-fun.nix} | 0 .../sq/sqlcipher/pkg-fun.nix} | 0 .../default.nix => unit/sq/sqlcl/pkg-fun.nix} | 0 .../sq/sqlfluff/pkg-fun.nix} | 0 .../tools => unit/sq}/sqlint/Gemfile | 0 .../tools => unit/sq}/sqlint/Gemfile.lock | 0 .../tools => unit/sq}/sqlint/gemset.nix | 0 .../sq/sqlint/pkg-fun.nix} | 0 .../sq/sqlite-jdbc/pkg-fun.nix} | 0 .../sq/sqlite-web/pkg-fun.nix} | 0 .../sq/sqlite3-to-mysql/pkg-fun.nix} | 0 .../sq/sqlitecpp/pkg-fun.nix} | 0 .../sq/sqliteman/pkg-fun.nix} | 0 .../default.nix => unit/sq/sqls/pkg-fun.nix} | 0 .../default.nix => unit/sq/sqsh/pkg-fun.nix} | 0 .../sq/squashfsTools}/4k-align.patch | 0 .../sq/squashfsTools}/darwin.patch | 0 .../sq/squashfsTools/pkg-fun.nix} | 0 .../sq/squashfuse/pkg-fun.nix} | 0 .../sq/squeak/pkg-fun.nix} | 0 .../sq}/squeak/squeak-configure-version.patch | 0 .../sq}/squeak/squeak-plugins-discovery.patch | 0 .../sq}/squeak/squeak-squeaksh-nixpkgs.patch | 0 .../sq/squeekboard/pkg-fun.nix} | 0 .../default.nix => unit/sq/squid/pkg-fun.nix} | 0 .../default.nix => unit/sr/srain/pkg-fun.nix} | 0 .../sr/srandrd/pkg-fun.nix} | 0 .../sr/sratom/pkg-fun.nix} | 0 .../sr/sratoolkit/pkg-fun.nix} | 0 .../default.nix => unit/sr/srb2/pkg-fun.nix} | 0 .../{games => unit/sr}/srb2/wadlocation.patch | 0 .../sr/srb2kart/pkg-fun.nix} | 0 .../sr}/srb2kart/wadlocation.patch | 0 .../sr/srcOnly/pkg-fun.nix} | 0 .../sr/srecord/pkg-fun.nix} | 0 .../networking => unit/sr}/srelay/arm.patch | 0 .../sr/srelay/pkg-fun.nix} | 0 .../default.nix => unit/sr/srm/pkg-fun.nix} | 0 .../sr/srsran/pkg-fun.nix} | 0 .../fix-insecure-printfs.patch | 0 .../sr/srt-live-server/pkg-fun.nix} | 0 .../sr}/srt-to-vtt-cl/fix-validation.patch | 0 .../sr/srt-to-vtt-cl/pkg-fun.nix} | 0 .../default.nix => unit/sr/srt/pkg-fun.nix} | 0 .../default.nix => unit/sr/srtp/pkg-fun.nix} | 0 .../sr/srtrelay/pkg-fun.nix} | 0 .../ss/ssb-patchwork/pkg-fun.nix} | 0 .../default.nix => unit/ss/ssb/pkg-fun.nix} | 0 .../ss/ssdeep/pkg-fun.nix} | 0 .../default.nix => unit/ss/sselp/pkg-fun.nix} | 0 .../ss/ssh-agents/pkg-fun.nix} | 0 .../ss/ssh-askpass-fullscreen/pkg-fun.nix} | 0 .../ss/ssh-audit/pkg-fun.nix} | 0 .../ss/ssh-chat/pkg-fun.nix} | 0 .../ss/ssh-copy-id/pkg-fun.nix} | 0 .../ss/ssh-ident/pkg-fun.nix} | 0 .../ss/ssh-key-confirmer/pkg-fun.nix} | 0 .../ss/ssh-to-age/pkg-fun.nix} | 0 .../ss/ssh-to-pgp/pkg-fun.nix} | 0 .../ss/ssh-tools/pkg-fun.nix} | 0 .../ss/sshchecker/pkg-fun.nix} | 0 .../ss}/sshfs-fuse/common.nix | 0 .../ss}/sshfs-fuse/fix-fuse-darwin-h.patch | 0 .../ss/sshfs-fuse/pkg-fun.nix} | 0 .../ss/sshguard/pkg-fun.nix} | 0 .../ss/sshlatex/pkg-fun.nix} | 0 .../ss/sshoogr/pkg-fun.nix} | 0 .../ss/sshpass/pkg-fun.nix} | 0 .../ss/sshping/pkg-fun.nix} | 0 .../ss/sshportal/pkg-fun.nix} | 0 .../default.nix => unit/ss/sshs/pkg-fun.nix} | 0 .../ss/sshuttle/pkg-fun.nix} | 0 .../security => unit/ss}/sshuttle/sudo.patch | 0 .../ss/ssl-cert-check/pkg-fun.nix} | 0 .../ss/ssldump/pkg-fun.nix} | 0 .../default.nix => unit/ss/sslh/pkg-fun.nix} | 0 .../ss/sslmate-agent/pkg-fun.nix} | 0 .../ss/sslmate/pkg-fun.nix} | 0 .../ss/sslscan/pkg-fun.nix} | 0 ...C-tests-that-fail-in-the-Nix-sandbox.patch | 0 ...-gen-don-t-use-unnecessary-constants.patch | 0 .../ss/ssm-agent/pkg-fun.nix} | 0 .../ssm-session-manager-plugin/pkg-fun.nix} | 0 .../default.nix => unit/ss/ssmsh/pkg-fun.nix} | 0 .../default.nix => unit/ss/ssocr/pkg-fun.nix} | 0 .../default.nix => unit/ss/ssrc/pkg-fun.nix} | 0 .../default.nix => unit/ss/ssss/pkg-fun.nix} | 0 .../default.nix => unit/ss/sstp/pkg-fun.nix} | 0 .../default.nix => unit/ss/ssw/pkg-fun.nix} | 0 .../st/StormLib/pkg-fun.nix} | 0 .../default.nix => unit/st/sta/pkg-fun.nix} | 0 .../st/stabber/pkg-fun.nix} | 0 .../st/stacks/pkg-fun.nix} | 0 .../default.nix => unit/st/stacs/pkg-fun.nix} | 0 .../st/stagit/pkg-fun.nix} | 0 .../st/stalin/pkg-fun.nix} | 0 .../st/stalonetray/pkg-fun.nix} | 0 .../default.nix => unit/st/stanc/pkg-fun.nix} | 0 .../st/standardnotes/pkg-fun.nix} | 0 .../st}/standardnotes/src.json | 0 .../st}/standardnotes/update.nix | 0 .../default.nix => unit/st/star/pkg-fun.nix} | 0 .../st/starboard-octant-plugin/pkg-fun.nix} | 0 .../st/starboard/pkg-fun.nix} | 0 .../st/stardust/pkg-fun.nix} | 0 .../st/starfetch/pkg-fun.nix} | 0 .../st}/stargate-libcds/Makefile.patch | 0 .../st/stargate-libcds/pkg-fun.nix} | 0 .../st/starlark/pkg-fun.nix} | 0 .../st/starspace/pkg-fun.nix} | 0 .../st/staruml/pkg-fun.nix} | 0 .../st/static-web-server/pkg-fun.nix} | 0 .../st/statifier/pkg-fun.nix} | 0 .../st/statik/pkg-fun.nix} | 0 .../st/station/pkg-fun.nix} | 0 .../st/statix/pkg-fun.nix} | 0 .../st/statserial/pkg-fun.nix} | 0 .../st/stayrtr/pkg-fun.nix} | 0 .../default.nix => unit/st/stb/pkg-fun.nix} | 0 .../st/stderred/pkg-fun.nix} | 0 .../st/stdman/pkg-fun.nix} | 0 .../st/stdmanpages/pkg-fun.nix} | 0 .../st/stduuid/pkg-fun.nix} | 0 .../st/steam-acf/pkg-fun.nix} | 0 .../st/steam-rom-manager/pkg-fun.nix} | 0 .../st/steam-tui/pkg-fun.nix} | 0 .../st/steamcontroller/pkg-fun.nix} | 0 .../st/steamos-devkit/pkg-fun.nix} | 0 .../st/steampipe/pkg-fun.nix} | 0 .../st/steamtinkerlaunch/pkg-fun.nix} | 0 .../steck.nix => unit/st/steck/pkg-fun.nix} | 0 .../st/steghide/pkg-fun.nix} | 0 .../st/stegseek/pkg-fun.nix} | 0 .../st/stegsolve/pkg-fun.nix} | 0 .../st/stella/pkg-fun.nix} | 0 .../st/stellar-core/pkg-fun.nix} | 0 .../default.nix => unit/st/stenc/pkg-fun.nix} | 0 .../st/step-cli/pkg-fun.nix} | 0 .../0001-fix-build-with-ffmpeg-4.patch | 0 .../st/stepmania/pkg-fun.nix} | 0 .../default.nix => unit/st/stern/pkg-fun.nix} | 0 .../st/stevenblack-blocklist/pkg-fun.nix} | 0 .../default.nix => unit/st/stfl/pkg-fun.nix} | 0 .../default.nix => unit/st/stgit/pkg-fun.nix} | 0 .../st/sticky/pkg-fun.nix} | 0 .../default.nix => unit/st/stig/pkg-fun.nix} | 0 .../st/stilo-themes/pkg-fun.nix} | 0 .../st/stix-otf/pkg-fun.nix} | 0 .../st/stix-two/pkg-fun.nix} | 0 .../st/stm32cubemx/pkg-fun.nix} | 0 .../st/stm32flash/pkg-fun.nix} | 0 .../st/stm8flash/pkg-fun.nix} | 0 .../st/stochas/pkg-fun.nix} | 0 .../st/stockfish/pkg-fun.nix} | 0 .../st/stone-phaser/pkg-fun.nix} | 0 .../st/storcli/pkg-fun.nix} | 0 .../st/storeBackup/pkg-fun.nix} | 0 .../default.nix => unit/st/storm/pkg-fun.nix} | 0 .../st/storrent/pkg-fun.nix} | 0 .../default.nix => unit/st/stow/pkg-fun.nix} | 0 .../default.nix => unit/st/stp/pkg-fun.nix} | 0 .../st/strace-analyzer/pkg-fun.nix} | 0 .../st/strace/pkg-fun.nix} | 0 .../st/stratis-cli/pkg-fun.nix} | 0 .../st/stratisd/pkg-fun.nix} | 0 .../st/streamlink-twitch-gui-bin/pkg-fun.nix} | 0 .../st/streamlink/pkg-fun.nix} | 0 .../st/streamripper/pkg-fun.nix} | 0 .../st/stress-ng/pkg-fun.nix} | 0 .../st/stress/pkg-fun.nix} | 0 .../st/stressapptest/pkg-fun.nix} | 0 .../st/stretchly/pkg-fun.nix} | 0 .../st/stricat/pkg-fun.nix} | 0 .../st/string-machine/pkg-fun.nix} | 0 .../st}/strongswan/ext_auth-path.patch | 0 .../st}/strongswan/firewall_defaults.patch | 0 .../st/strongswan/pkg-fun.nix} | 0 .../st}/strongswan/updown-path.patch | 0 .../st}/structure-synth/gcc47.patch | 0 .../st/structure-synth/pkg-fun.nix} | 0 .../default.nix => unit/st/stt/pkg-fun.nix} | 0 .../st/stuffbin/pkg-fun.nix} | 0 .../st}/stumpish/paths.patch | 0 .../st/stumpish/pkg-fun.nix} | 0 .../default.nix => unit/st/stun/pkg-fun.nix} | 0 .../st/stunnel/pkg-fun.nix} | 0 .../st/stuntman/pkg-fun.nix} | 0 .../default.nix => unit/st/stw/pkg-fun.nix} | 0 .../default.nix => unit/st/stxxl/pkg-fun.nix} | 0 .../st/stylish/pkg-fun.nix} | 0 .../st/stylua/pkg-fun.nix} | 0 .../default.nix => unit/st/styx/pkg-fun.nix} | 0 .../su/su-exec/pkg-fun.nix} | 0 .../su/sub-batch/pkg-fun.nix} | 0 .../su/subberthehut/pkg-fun.nix} | 0 .../default.nix => unit/su/subdl/pkg-fun.nix} | 0 .../su/subedit/pkg-fun.nix} | 0 .../su/subfinder/pkg-fun.nix} | 0 .../su/subgit/pkg-fun.nix} | 0 .../default.nix => unit/su/subjs/pkg-fun.nix} | 0 .../su/sublime-music/pkg-fun.nix} | 0 .../su/sublime/pkg-fun.nix} | 0 .../su/subnetcalc/pkg-fun.nix} | 0 .../su/subread/pkg-fun.nix} | 0 .../su/subsonic/pkg-fun.nix} | 0 .../su/substitute/pkg-fun.nix} | 0 .../su}/substitute/substitute.sh | 0 .../su/substituteAll/pkg-fun.nix} | 0 .../su/substituteAll}/substitute-all.sh | 0 .../su/substituteAllFiles/pkg-fun.nix} | 0 .../su/subtitleeditor/pkg-fun.nix} | 0 .../su/subunit/pkg-fun.nix} | 0 .../su/sudo-font/pkg-fun.nix} | 0 .../default.nix => unit/su/sudo/pkg-fun.nix} | 0 .../su/suidChroot/pkg-fun.nix} | 0 .../default.nix => unit/su/suil/pkg-fun.nix} | 0 .../su/suitesparse-graphblas/pkg-fun.nix} | 0 .../su/suitesparse_4_2/pkg-fun.nix} | 0 .../su/suitesparse_4_4/pkg-fun.nix} | 0 .../su/suitesparse_5_3/pkg-fun.nix} | 0 .../su/summon/pkg-fun.nix} | 0 .../su}/summon/resolve-paths.patch | 0 .../default.nix => unit/su/sumo/pkg-fun.nix} | 0 .../su/sundtek/pkg-fun.nix} | 0 .../su/sunpaper/pkg-fun.nix} | 0 .../{servers => unit/su}/sunshine/ffmpeg.diff | 0 .../su}/sunshine/package-lock.json | 0 .../su/sunshine/pkg-fun.nix} | 0 .../su/sunvox/pkg-fun.nix} | 0 .../su/sunwait/pkg-fun.nix} | 0 .../su/sunxi-tools/pkg-fun.nix} | 0 .../su/supabase-cli/pkg-fun.nix} | 0 .../su/super-productivity/pkg-fun.nix} | 0 .../su/super-tiny-icons/pkg-fun.nix} | 0 ...s-to-dropped-sys_nerr-sys_errlist-fo.patch | 0 .../default.nix => unit/su/super/pkg-fun.nix} | 0 .../su/superTux/pkg-fun.nix} | 0 .../su/superd/pkg-fun.nix} | 0 .../su/supergfxctl/pkg-fun.nix} | 0 ...lib-as-dependency-for-the-unit-tests.patch | 0 .../su/superlu/pkg-fun.nix} | 0 .../su/supermin/pkg-fun.nix} | 0 .../cargo-lock-update-lexical-core.patch | 0 .../su/supertag/pkg-fun.nix} | 0 .../su/supertux-editor/pkg-fun.nix} | 0 .../su/supervise/pkg-fun.nix} | 0 .../su/surelog/pkg-fun.nix} | 0 .../su}/surf-display/pdf-makefile.patch | 0 .../su/surf-display/pkg-fun.nix} | 0 .../su/surface-control/pkg-fun.nix} | 0 .../su/surfraw/pkg-fun.nix} | 0 .../su/surge-XT/pkg-fun.nix} | 0 .../su/suscan/pkg-fun.nix} | 0 .../su/sutils/pkg-fun.nix} | 0 .../default.nix => unit/sv/svaba/pkg-fun.nix} | 0 .../sv/svd2rust/pkg-fun.nix} | 0 .../sv/svdtools/pkg-fun.nix} | 0 .../sv/svg2pdf/pkg-fun.nix} | 0 .../sv/svgbob/pkg-fun.nix} | 0 .../sv/svgcleaner/pkg-fun.nix} | 0 .../default.nix => unit/sv/svkbd/pkg-fun.nix} | 0 .../sv/svlint/pkg-fun.nix} | 0 .../default.nix => unit/sv/svls/pkg-fun.nix} | 0 .../default.nix => unit/sv/svnfs/pkg-fun.nix} | 0 .../default.nix => unit/sv/svox/pkg-fun.nix} | 0 .../sv/svrcore/pkg-fun.nix} | 0 .../sv/svt-av1/pkg-fun.nix} | 0 .../sv/svtplay-dl/pkg-fun.nix} | 0 .../sw/swagger-codegen/pkg-fun.nix} | 0 .../sw/swagger-codegen3/pkg-fun.nix} | 0 .../sw/swaggerhole/pkg-fun.nix} | 0 .../sw/swaglyrics/pkg-fun.nix} | 0 .../default.nix => unit/sw/swaks/pkg-fun.nix} | 0 .../sw/swapspace/pkg-fun.nix} | 0 .../sw/swapview/pkg-fun.nix} | 0 .../default.nix => unit/sw/swarm/pkg-fun.nix} | 0 .../sw/sway-launcher-desktop/pkg-fun.nix} | 0 .../sw/sway-unwrapped}/fix-paths.patch | 0 .../load-configuration-from-etc.patch | 0 .../sw/sway-unwrapped/pkg-fun.nix} | 0 .../sway-config-nixos-paths.patch | 0 .../sway-config-no-nix-store-references.patch | 0 .../wrapper.nix => unit/sw/sway/pkg-fun.nix} | 0 .../bg.nix => unit/sw/swaybg/pkg-fun.nix} | 0 .../sw/swaycons/pkg-fun.nix} | 0 .../sw/swaycwd/pkg-fun.nix} | 0 .../sw/swayest-workstyle/pkg-fun.nix} | 0 .../idle.nix => unit/sw/swayidle/pkg-fun.nix} | 0 .../sw/swayimg/pkg-fun.nix} | 0 .../sw/swaykbdd/pkg-fun.nix} | 0 .../sw/swaylock-effects/pkg-fun.nix} | 0 .../sw/swaylock-fancy/pkg-fun.nix} | 0 .../lock.nix => unit/sw/swaylock/pkg-fun.nix} | 0 .../sw/swaynag-battery/pkg-fun.nix} | 0 .../sw/swaynotificationcenter/pkg-fun.nix} | 0 .../sw}/swayr/icon-paths.patch | 0 .../default.nix => unit/sw/swayr/pkg-fun.nix} | 0 .../sw/swaysettings/pkg-fun.nix} | 0 .../sw/swaysome/pkg-fun.nix} | 0 .../ws.nix => unit/sw/swayws/pkg-fun.nix} | 0 .../wsr.nix => unit/sw/swaywsr/pkg-fun.nix} | 0 .../default.nix => unit/sw/sweet/pkg-fun.nix} | 0 .../default.nix => unit/sw/swego/pkg-fun.nix} | 0 .../sw/swh_lv2/pkg-fun.nix} | 0 .../swift-corelibs-libdispatch/pkg-fun.nix} | 0 ...sets-linux-don-t-require-using-Ninja.patch | 0 ...ts-linux-allow-custom-install-prefix.patch | 0 ...presets-linux-don-t-build-extra-libs.patch | 0 ...sets-linux-plumb-extra-cmake-options.patch | 0 .../patches/0005-clang-toolchain-dir.patch | 0 .../sw}/swift/patches/0006-clang-purity.patch | 0 .../0007-build-presets-linux-os-stdlib.patch | 0 .../default.nix => unit/sw/swift/pkg-fun.nix} | 0 .../sw/swiftbar/pkg-fun.nix} | 0 .../sw/swiftdefaultapps/pkg-fun.nix} | 0 .../sw}/swiften/build-fix.patch | 0 .../sw/swiften/pkg-fun.nix} | 0 .../libraries => unit/sw}/swiften/scons.patch | 0 .../sw/swiftformat/pkg-fun.nix} | 0 .../default.nix => unit/sw/swig1/pkg-fun.nix} | 0 .../2.x.nix => unit/sw/swig2/pkg-fun.nix} | 0 .../3.x.nix => unit/sw/swig3/pkg-fun.nix} | 0 .../swig/4.nix => unit/sw/swig4/pkg-fun.nix} | 0 .../sw/swingsane/pkg-fun.nix} | 0 .../sw/switcheroo-control/pkg-fun.nix} | 0 .../default.nix => unit/sw/sword/pkg-fun.nix} | 0 .../default.nix => unit/sw/swtpm/pkg-fun.nix} | 0 .../default.nix => unit/sx/sx-go/pkg-fun.nix} | 0 .../sx/default.nix => unit/sx/sx/pkg-fun.nix} | 0 .../default.nix => unit/sx/sxhkd/pkg-fun.nix} | 0 .../default.nix => unit/sy/Sylk/pkg-fun.nix} | 0 .../sy/sycl-info/pkg-fun.nix} | 0 .../sy/sydbox/pkg-fun.nix} | 0 .../default.nix => unit/sy/syft/pkg-fun.nix} | 0 .../sy/symbiyosys/pkg-fun.nix} | 0 .../sy/symbolic-preview/pkg-fun.nix} | 0 .../sy/symengine/pkg-fun.nix} | 0 .../sy/symfony-cli/pkg-fun.nix} | 0 .../sy/symfpu/pkg-fun.nix} | 0 .../sy/symlinks/pkg-fun.nix} | 0 .../sy/symmetrica/pkg-fun.nix} | 0 .../mail => unit/sy}/sympa/make-docs.patch | 0 .../default.nix => unit/sy/sympa/pkg-fun.nix} | 0 ...clean-extra-logfile-output-from-pari.patch | 0 .../sy/sympow/pkg-fun.nix} | 0 .../sy/synaesthesia/pkg-fun.nix} | 0 .../sy}/synapse-admin/package.json | 0 .../sy/synapse-admin/pkg-fun.nix} | 0 .../admin => unit/sy}/synapse-admin/yarn.lock | 0 .../admin => unit/sy}/synapse-admin/yarn.nix | 0 .../sy/synapse/pkg-fun.nix} | 0 .../sy/syncstorage-rs/pkg-fun.nix} | 0 .../sy/syncterm/pkg-fun.nix} | 0 .../misc => unit/sy}/syncthing-tray/deps.nix | 0 .../sy/syncthing-tray/pkg-fun.nix} | 0 .../sy/synfigstudio/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../sy/synology-drive-client/pkg-fun.nix} | 0 .../sy/syntex/pkg-fun.nix} | 0 .../sy/sysbench/pkg-fun.nix} | 0 .../sy/syscall_limiter/pkg-fun.nix} | 0 .../sy/sysfsutils/pkg-fun.nix} | 0 .../sy}/sysklogd/fix-includes-for-musl.patch | 0 .../sy/sysklogd/pkg-fun.nix} | 0 .../linux => unit/sy}/sysklogd/systemd.patch | 0 .../sy}/sysklogd/union-wait.patch | 0 .../linux => unit/sy}/syslinux/gcc10.patch | 0 .../sy/syslinux/pkg-fun.nix} | 0 .../sy/syslogng/pkg-fun.nix} | 0 .../sy/sysprof/pkg-fun.nix} | 0 .../linux => unit/sy}/sysstat/install.patch | 0 .../sy/sysstat/pkg-fun.nix} | 0 .../sy/system-syzygy/pkg-fun.nix} | 0 .../sy/system76-firmware/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../sy/systembus-notify/pkg-fun.nix} | 0 .../sy/systemc/pkg-fun.nix} | 0 .../sy/systemd-journal2gelf/pkg-fun.nix} | 0 .../sy/systemd-wait/pkg-fun.nix} | 0 .../sy/systemfd/pkg-fun.nix} | 0 .../sy/systeroid/pkg-fun.nix} | 0 .../sy/systrayhelper/pkg-fun.nix} | 0 .../sy/sysvinit/pkg-fun.nix} | 0 .../default.nix => unit/sy/sysz/pkg-fun.nix} | 0 .../default.nix => unit/sz/szip/pkg-fun.nix} | 0 .../sz/szyszka/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/t}/t/Gemfile | 0 pkgs/{tools/misc => unit/t}/t/Gemfile.lock | 0 pkgs/{tools/misc => unit/t}/t/gemset.nix | 0 .../t/default.nix => unit/t/t/pkg-fun.nix} | 0 .../default.nix => unit/t1/t1lib/pkg-fun.nix} | 0 .../t1/t1utils/pkg-fun.nix} | 0 .../t4/t4kcommon/pkg-fun.nix} | 0 .../ta/ta-lib/pkg-fun.nix} | 0 .../default.nix => unit/ta/tab/pkg-fun.nix} | 0 .../ta/tabbed/pkg-fun.nix} | 0 .../ta/tabnine/pkg-fun.nix} | 0 .../tools => unit/ta}/tabnine/sources.json | 0 .../tools => unit/ta}/tabnine/update.sh | 0 .../ta/tabula-java/pkg-fun.nix} | 0 .../ta/tabula/pkg-fun.nix} | 0 .../ta/tacacsplus/pkg-fun.nix} | 0 .../ta/tagger/pkg-fun.nix} | 0 .../ta/taglib-sharp/pkg-fun.nix} | 0 .../ta/taglib/pkg-fun.nix} | 0 .../ta/taglib_extras/pkg-fun.nix} | 0 .../ta/tagparser/pkg-fun.nix} | 0 .../ta/tagref/pkg-fun.nix} | 0 .../ta/tagtime/pkg-fun.nix} | 0 .../ta/tagutil/pkg-fun.nix} | 0 .../ta/tahoe-lafs/pkg-fun.nix} | 0 .../ta/tailor/pkg-fun.nix} | 0 .../ta/tailscale/pkg-fun.nix} | 0 .../ta/tailspin/pkg-fun.nix} | 0 .../ta}/taisei/0001-lto-fix.patch | 0 .../ta/taisei/pkg-fun.nix} | 0 .../default.nix => unit/ta/takao/pkg-fun.nix} | 0 .../ta/taktuk/pkg-fun.nix} | 0 .../ta/talentedhack/pkg-fun.nix} | 0 .../ta/talkfilters/pkg-fun.nix} | 0 .../ta/talloc/pkg-fun.nix} | 0 .../ta/talosctl/pkg-fun.nix} | 0 .../ta/tambura/pkg-fun.nix} | 0 .../ta/tamsyn/pkg-fun.nix} | 0 .../ta/tamzen/pkg-fun.nix} | 0 .../ta/tandem-aligner/pkg-fun.nix} | 0 .../ta}/tandoor-recipes/common.nix | 0 .../ta}/tandoor-recipes/frontend.nix | 0 .../ta}/tandoor-recipes/media-root.patch | 0 .../ta/tandoor-recipes/pkg-fun.nix} | 0 .../ta}/tandoor-recipes/update.sh | 0 .../ta/tangram/pkg-fun.nix} | 0 .../default.nix => unit/ta/tanka/pkg-fun.nix} | 0 .../misc => unit/ta}/taoup/cachefile.patch | 0 pkgs/{tools/misc => unit/ta}/taoup/help.patch | 0 .../default.nix => unit/ta/taoup/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/ta}/taoup/tput.patch | 0 .../ta/tap-plugins/pkg-fun.nix} | 0 .../ta}/tapview/dont_check_echo.patch | 0 .../ta/tapview/pkg-fun.nix} | 0 .../ta/tar2ext4/pkg-fun.nix} | 0 .../ta/tarantool/pkg-fun.nix} | 0 .../ta}/target-isns/install_prefix_path.patch | 0 .../ta/target-isns/pkg-fun.nix} | 0 .../ta/targetcli/pkg-fun.nix} | 0 .../default.nix => unit/ta/tarlz/pkg-fun.nix} | 0 .../default.nix => unit/ta/taro/pkg-fun.nix} | 0 .../ta/tarsnap/pkg-fun.nix} | 0 .../ta/tarsnapper/pkg-fun.nix} | 0 .../ta}/tarsnapper/remove-argparse.patch | 0 .../ta/tarssh/pkg-fun.nix} | 0 .../tarsum.nix => unit/ta/tarsum/pkg-fun.nix} | 0 .../docker => unit/ta/tarsum}/tarsum.go | 0 .../ta/tartan/pkg-fun.nix} | 0 .../ta/taskflow/pkg-fun.nix} | 0 .../ta}/taskflow/unvendor-doctest.patch | 0 .../misc => unit/ta}/taskjuggler/3.x/Gemfile | 0 .../ta}/taskjuggler/3.x/Gemfile.lock | 0 .../ta}/taskjuggler/3.x/gemset.nix | 0 .../misc => unit/ta}/taskjuggler/Gemfile | 0 .../misc => unit/ta}/taskjuggler/Gemfile.lock | 0 .../misc => unit/ta}/taskjuggler/gemset.nix | 0 .../ta/taskjuggler/pkg-fun.nix} | 0 .../ta/tasknc/pkg-fun.nix} | 0 .../ta/taskopen/pkg-fun.nix} | 0 .../ta/taskserver/pkg-fun.nix} | 0 .../ta/tasksh/pkg-fun.nix} | 0 .../ta/taskspooler/pkg-fun.nix} | 0 .../ta/tasktimer/pkg-fun.nix} | 0 .../ta/taskwarrior-tui/pkg-fun.nix} | 0 .../ta/taskwarrior/pkg-fun.nix} | 0 .../default.nix => unit/ta/tauon/pkg-fun.nix} | 0 .../default.nix => unit/ta/taxi/pkg-fun.nix} | 0 .../default.nix => unit/ta/tayga/pkg-fun.nix} | 0 .../default.nix => unit/tb/tbb/pkg-fun.nix} | 0 .../default.nix => unit/tb/tbls/pkg-fun.nix} | 0 .../default.nix => unit/tb/tboot/pkg-fun.nix} | 0 .../default.nix => unit/tc/tcat/pkg-fun.nix} | 0 .../tc}/tcb/fix-makefiles.patch | 0 .../default.nix => unit/tc/tcb/pkg-fun.nix} | 0 .../tc/tcl2048/pkg-fun.nix} | 0 .../default.nix => unit/tc/tclap/pkg-fun.nix} | 0 .../tc/tcllib/pkg-fun.nix} | 0 .../tc/tclreadline/pkg-fun.nix} | 0 .../tc/tcltls/pkg-fun.nix} | 0 .../default.nix => unit/tc/tclx/pkg-fun.nix} | 0 .../tc/tcp-cutter/pkg-fun.nix} | 0 .../tc/tcp_wrappers}/cdecls.patch | 0 .../tc/tcp_wrappers/pkg-fun.nix} | 0 .../tcp-wrappers-7.6-headers.patch | 0 .../tc/tcpcrypt/pkg-fun.nix} | 0 .../tc/tcpdump/pkg-fun.nix} | 0 .../tc/tcpflow/pkg-fun.nix} | 0 .../tc/tcping-go/pkg-fun.nix} | 0 .../tc/tcpkali/pkg-fun.nix} | 0 .../tc/tcptraceroute/pkg-fun.nix} | 0 .../tc/tcptrack/pkg-fun.nix} | 0 .../default.nix => unit/tc/tcsh/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/td}/td/Gemfile | 0 pkgs/{tools/misc => unit/td}/td/Gemfile.lock | 0 pkgs/{tools/misc => unit/td}/td/gemset.nix | 0 .../td/default.nix => unit/td/td/pkg-fun.nix} | 0 .../default.nix => unit/td/tdb/pkg-fun.nix} | 0 .../default.nix => unit/td/tdfgo/pkg-fun.nix} | 0 .../td/tdlib-purple/pkg-fun.nix} | 0 .../default.nix => unit/td/tdlib/pkg-fun.nix} | 0 .../td/tdns-cli/pkg-fun.nix} | 0 .../default.nix => unit/td/tdrop/pkg-fun.nix} | 0 .../default.nix => unit/te/tea/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/te}/teamocil/Gemfile | 0 .../misc => unit/te}/teamocil/Gemfile.lock | 0 .../misc => unit/te}/teamocil/gemset.nix | 0 .../te/teamocil/pkg-fun.nix} | 0 .../default.nix => unit/te/teams/pkg-fun.nix} | 0 .../te/teamspeak5_client/pkg-fun.nix} | 0 .../te/teamspeak_server/pkg-fun.nix} | 0 .../te}/teapot/001-fix-warning.patch | 0 .../te}/teapot/002-remove-help.patch | 0 .../te/teapot/pkg-fun.nix} | 0 .../te/tebreak/pkg-fun.nix} | 0 .../te/teck-udev-rules/pkg-fun.nix} | 0 .../default.nix => unit/te/tecla/pkg-fun.nix} | 0 .../te/tecnoballz/pkg-fun.nix} | 0 .../default.nix => unit/te/tecoc/pkg-fun.nix} | 0 .../default.nix => unit/te/ted/pkg-fun.nix} | 0 .../te/teensy-loader-cli/pkg-fun.nix} | 0 .../te/teensy-udev-rules/pkg-fun.nix} | 0 .../te}/teensy-udev-rules/teensy.rules | 0 .../te/teetertorture/pkg-fun.nix} | 0 .../te/teeworlds/pkg-fun.nix} | 0 .../te/tegaki-zinnia-japanese/pkg-fun.nix} | 0 .../te/tegola/pkg-fun.nix} | 0 .../default.nix => unit/te/teip/pkg-fun.nix} | 0 .../te/tektoncd-cli/pkg-fun.nix} | 0 .../te/tela-icon-theme/pkg-fun.nix} | 0 .../te/telegraf/pkg-fun.nix} | 0 .../te/telegram-bot-api/pkg-fun.nix} | 0 .../te/telegram-cli/pkg-fun.nix} | 0 .../te/telepathy-farstream/pkg-fun.nix} | 0 .../te/telepathy-gabble/pkg-fun.nix} | 0 .../te/telepathy-glib/pkg-fun.nix} | 0 .../te/telepathy-haze/pkg-fun.nix} | 0 .../te/telepathy-idle/pkg-fun.nix} | 0 .../te/telepathy-logger/pkg-fun.nix} | 0 .../te/telepathy-mission-control/pkg-fun.nix} | 0 .../te/telepresence2/pkg-fun.nix} | 0 .../te/teleprompter/pkg-fun.nix} | 0 .../default.nix => unit/te/teler/pkg-fun.nix} | 0 .../te/telescope/pkg-fun.nix} | 0 .../te/template-glib/pkg-fun.nix} | 0 .../default.nix => unit/te/tempo/pkg-fun.nix} | 0 .../te/tempora_lgc/pkg-fun.nix} | 0 .../te/temporal-cli/pkg-fun.nix} | 0 .../te/temporal/pkg-fun.nix} | 0 .../te/temporalite/pkg-fun.nix} | 0 .../te/tenacity/pkg-fun.nix} | 0 .../te/tendermint/pkg-fun.nix} | 0 .../te/tenderness/pkg-fun.nix} | 0 .../{games => unit/te}/tennix/fix_FTBFS.patch | 0 .../te/tennix/pkg-fun.nix} | 0 .../tensorflow-lite/eigen_include_dir.patch | 0 .../te/tensorflow-lite/pkg-fun.nix} | 0 .../default.nix => unit/te/tepl/pkg-fun.nix} | 0 .../default.nix => unit/te/tere/pkg-fun.nix} | 0 .../te/termbox/pkg-fun.nix} | 0 .../te/termcolor/pkg-fun.nix} | 0 .../te/termdbms/pkg-fun.nix} | 0 .../te}/termdbms/viewer.patch | 0 .../te/terminal-colors/pkg-fun.nix} | 0 .../te/terminal-notifier/pkg-fun.nix} | 0 .../te/terminal-parrot/pkg-fun.nix} | 0 .../te/terminal-stocks/pkg-fun.nix} | 0 .../te/terminator/pkg-fun.nix} | 0 .../SOURCE_DATE_EPOCH-for-otb.patch | 0 .../te/terminus_font/pkg-fun.nix} | 0 .../te/terminus_font_ttf/pkg-fun.nix} | 0 .../termite-unwrapped}/add_errno_header.patch | 0 .../te/termite-unwrapped/pkg-fun.nix} | 0 .../remove_ldflags_macos.patch | 0 .../url_regexp_trailing.patch | 0 ...function-for-setting-cursor-position.patch | 0 ...tion-for-setting-the-text-selections.patch | 0 ...nction-for-getting-the-selected-text.patch | 0 .../te/termius/pkg-fun.nix} | 0 .../te/termonad/pkg-fun.nix} | 0 .../te/termplay/pkg-fun.nix} | 0 .../te/termshark/pkg-fun.nix} | 0 .../te/termsyn/pkg-fun.nix} | 0 .../te/termtekst/pkg-fun.nix} | 0 .../te/termtosvg/pkg-fun.nix} | 0 .../te/termusic/pkg-fun.nix} | 0 .../te/terra-station/pkg-fun.nix} | 0 .../te/terracognita/pkg-fun.nix} | 0 .../te/terraform-docs/pkg-fun.nix} | 0 .../te/terraform-inventory/pkg-fun.nix} | 0 .../te}/terraform-landscape/Gemfile | 0 .../te}/terraform-landscape/Gemfile.lock | 0 .../te}/terraform-landscape/gemset.nix | 0 .../te/terraform-landscape/pkg-fun.nix} | 0 .../te/terraform-ls/pkg-fun.nix} | 0 .../te/terraform-lsp/pkg-fun.nix} | 0 .../te/terraformer/pkg-fun.nix} | 0 .../cluster => unit/te}/terraforming/Gemfile | 0 .../te}/terraforming/Gemfile.lock | 0 .../te}/terraforming/gemset.nix | 0 .../te/terraforming/pkg-fun.nix} | 0 .../te/terragrunt/pkg-fun.nix} | 0 .../te/terranix/pkg-fun.nix} | 0 .../te/terraria-server/pkg-fun.nix} | 0 .../te/terrascan/pkg-fun.nix} | 0 .../cluster => unit/te}/terraspace/Gemfile | 0 .../te}/terraspace/Gemfile.lock | 0 .../cluster => unit/te}/terraspace/gemset.nix | 0 .../te/terraspace/pkg-fun.nix} | 0 .../te/tes3cmd/pkg-fun.nix} | 0 .../default.nix => unit/te/teseq/pkg-fun.nix} | 0 .../te/tessen/pkg-fun.nix} | 0 .../te/tessera/pkg-fun.nix} | 0 .../te/testssl/pkg-fun.nix} | 0 .../default.nix => unit/te/tet/pkg-fun.nix} | 0 .../te/tetgen/pkg-fun.nix} | 0 .../te/tetgen_1_4/pkg-fun.nix} | 0 .../te/tetraproc/pkg-fun.nix} | 0 .../default.nix => unit/te/tetrd/pkg-fun.nix} | 0 .../te/tetrio-desktop/pkg-fun.nix} | 0 .../te}/tetrio-desktop/tetrio-plus.nix | 0 .../default.nix => unit/te/tev/pkg-fun.nix} | 0 .../te/tevent/pkg-fun.nix} | 0 .../te/tewi-font/pkg-fun.nix} | 0 .../te/tewisay/pkg-fun.nix} | 0 .../te/tex-match/pkg-fun.nix} | 0 .../te/texi2html/pkg-fun.nix} | 0 .../te/texi2mdoc/pkg-fun.nix} | 0 .../te/texinfo413/pkg-fun.nix} | 0 .../te/text-engine/pkg-fun.nix} | 0 .../editors => unit/te}/textadept/deps.nix | 0 .../te/textadept/pkg-fun.nix} | 0 .../te/textpieces/pkg-fun.nix} | 0 .../te/textplots/pkg-fun.nix} | 0 .../te/textql/pkg-fun.nix} | 0 .../te/texture-synthesis/pkg-fun.nix} | 0 .../te}/teyjus/fix-lex-to-flex.patch | 0 .../te/teyjus/pkg-fun.nix} | 0 .../te/tezos-rust-libs/pkg-fun.nix} | 0 .../tf/tf2pulumi/pkg-fun.nix} | 0 .../default.nix => unit/tf/tfk8s/pkg-fun.nix} | 0 .../tf}/tfk8s/tests/sample1/default.nix | 0 .../tf}/tfk8s/tests/sample1/input.yaml | 0 .../tf}/tfk8s/tests/sample1/output.tf | 0 .../tf/tflint/pkg-fun.nix} | 0 .../tf/tfplugindocs/pkg-fun.nix} | 0 .../default.nix => unit/tf/tfsec/pkg-fun.nix} | 0 .../tf/tfswitch/pkg-fun.nix} | 0 .../tf/tftp-hpa/pkg-fun.nix} | 0 .../tg/tgswitch/pkg-fun.nix} | 0 .../default.nix => unit/tg/tgt/pkg-fun.nix} | 0 .../th/thanos/pkg-fun.nix} | 0 .../th/thc-hydra/pkg-fun.nix} | 0 .../th/thc-ipv6/pkg-fun.nix} | 0 .../th/the-foundation/pkg-fun.nix} | 0 .../th/the-legend-of-edgar/pkg-fun.nix} | 0 .../th/the-way/pkg-fun.nix} | 0 .../th/theano/pkg-fun.nix} | 0 .../th/thedesk/pkg-fun.nix} | 0 .../default.nix => unit/th/theft/pkg-fun.nix} | 0 .../th/theharvester/pkg-fun.nix} | 0 .../th/theme-jade1/pkg-fun.nix} | 0 .../th/theme-obsidian2/pkg-fun.nix} | 0 .../th/theme-sh/pkg-fun.nix} | 0 .../th/theme-vertex/pkg-fun.nix} | 0 .../th/themechanger/pkg-fun.nix} | 0 .../th/thepeg/pkg-fun.nix} | 0 .../th/thermald/pkg-fun.nix} | 0 .../th/thicket/pkg-fun.nix} | 0 .../th/thiefmd/pkg-fun.nix} | 0 .../th/thin-provisioning-tools/pkg-fun.nix} | 0 .../th/thinkfan/pkg-fun.nix} | 0 .../th/thinkingRock/pkg-fun.nix} | 0 .../default.nix => unit/th/thokr/pkg-fun.nix} | 0 .../th/thonny/pkg-fun.nix} | 0 .../th/threatest/pkg-fun.nix} | 0 .../th/threema-desktop/pkg-fun.nix} | 0 .../th/thrift-0_10/pkg-fun.nix} | 0 .../th/throttled/pkg-fun.nix} | 0 .../th/thttpd/pkg-fun.nix} | 0 .../th/thumbdrives/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/th}/thumbs/fix.patch | 0 .../th/thumbs/pkg-fun.nix} | 0 .../th/thunderbolt/pkg-fun.nix} | 0 .../ti/tibetan-machine/pkg-fun.nix} | 0 .../ti/ticker/pkg-fun.nix} | 0 .../default.nix => unit/ti/ticpp/pkg-fun.nix} | 0 .../ti/tidal-hifi/pkg-fun.nix} | 0 .../default.nix => unit/ti/tidb/pkg-fun.nix} | 0 .../ti/tidy-viewer/pkg-fun.nix} | 0 .../default.nix => unit/ti/tidyp/pkg-fun.nix} | 0 .../default.nix => unit/ti/tie/pkg-fun.nix} | 0 .../default.nix => unit/ti/tig/pkg-fun.nix} | 0 .../ti/tigervnc/pkg-fun.nix} | 0 .../ti/tile38/pkg-fun.nix} | 0 .../ti/tiledb/pkg-fun.nix} | 0 .../default.nix => unit/ti/tilem/pkg-fun.nix} | 0 .../ti/tilemaker/pkg-fun.nix} | 0 .../default.nix => unit/ti/tilix/pkg-fun.nix} | 0 .../default.nix => unit/ti/tilt/pkg-fun.nix} | 0 .../ti/time-decode/pkg-fun.nix} | 0 .../ti/time-ghc-modules/pkg-fun.nix} | 0 .../default.nix => unit/ti/time/pkg-fun.nix} | 0 .../ti/timelapse-deflicker/pkg-fun.nix} | 0 .../ti/timelimit/pkg-fun.nix} | 0 .../ti/timeline/pkg-fun.nix} | 0 .../ti/timemachine/pkg-fun.nix} | 0 .../ti/times-newer-roman/pkg-fun.nix} | 0 .../ti/timescaledb-parallel-copy/pkg-fun.nix} | 0 .../ti/timescaledb-tune/pkg-fun.nix} | 0 .../ti/timetagger/pkg-fun.nix} | 0 .../office => unit/ti}/timetrap/Gemfile | 0 .../office => unit/ti}/timetrap/Gemfile.lock | 0 .../office => unit/ti}/timetrap/gemset.nix | 0 .../ti/timetrap/pkg-fun.nix} | 0 .../ti/timeular/pkg-fun.nix} | 0 .../ti/timew-sync-server/pkg-fun.nix} | 0 .../ti/timewarrior/pkg-fun.nix} | 0 .../ti/timezonemap/pkg-fun.nix} | 0 .../default.nix => unit/ti/timg/pkg-fun.nix} | 0 .../default.nix => unit/ti/tinc/pkg-fun.nix} | 0 .../pre.nix => unit/ti/tinc_pre/pkg-fun.nix} | 0 .../default.nix => unit/ti/tini/pkg-fun.nix} | 0 .../default.nix => unit/ti/tint2/pkg-fun.nix} | 0 .../ti/tintin/pkg-fun.nix} | 0 .../ti/tiny8086/pkg-fun.nix} | 0 .../ti/tinyalsa/pkg-fun.nix} | 0 .../ti/tinycbor/pkg-fun.nix} | 0 .../ti/tinycdb/pkg-fun.nix} | 0 .../ti/tinyemu/pkg-fun.nix} | 0 .../ti/tinyfecvpn/pkg-fun.nix} | 0 .../ti/tinyfugue/pkg-fun.nix} | 0 .../ti/tinygltf/pkg-fun.nix} | 0 .../ti/tinyobjloader/pkg-fun.nix} | 0 .../ti/tinyprog/pkg-fun.nix} | 0 .../ti/tinyproxy/pkg-fun.nix} | 0 .../ti}/tinyscheme/01-remove-macOS-main.patch | 0 .../02-use-toolchain-env-vars.patch | 0 .../ti}/tinyscheme/03-macOS-SOsuf.patch | 0 .../ti/tinyscheme/pkg-fun.nix} | 0 .../ti/tinyssh/pkg-fun.nix} | 0 .../ti/tinystatus/pkg-fun.nix} | 0 .../ti/tinywl/pkg-fun.nix} | 0 .../ti/tinywm/pkg-fun.nix} | 0 .../ti/tinyxml-2/pkg-fun.nix} | 0 .../ti/tinyxml2}/2.6.2-add-pkgconfig.patch | 0 .../ti/tinyxml2}/2.6.2-cxx.patch | 0 .../ti/tinyxml2}/2.6.2-entity.patch | 0 .../ti/tinyxml2/pkg-fun.nix} | 0 .../default.nix => unit/ti/tio/pkg-fun.nix} | 0 .../default.nix => unit/ti/tipa/pkg-fun.nix} | 0 .../ti/tippecanoe/pkg-fun.nix} | 0 .../ti/tiptop/pkg-fun.nix} | 0 .../ti/tiramisu/pkg-fun.nix} | 0 ...find-aravis-fix-pkg-cfg-include-dirs.patch | 0 ...tcamsrc-add-missing-include-lib-dirs.patch | 0 ...0001-udev-rules-fix-install-location.patch | 0 .../ti/tiscamera/pkg-fun.nix} | 0 .../ti/titanion/pkg-fun.nix} | 0 .../default.nix => unit/ti/tiv/pkg-fun.nix} | 0 .../ti/tivodecode/pkg-fun.nix} | 0 .../ti}/tix/duplicated-xlowerwindow.patch | 0 .../default.nix => unit/ti/tix/pkg-fun.nix} | 0 .../ti/tixati/pkg-fun.nix} | 0 .../1.x.nix => unit/tk/tkgate/pkg-fun.nix} | 0 .../default.nix => unit/tk/tkrev/pkg-fun.nix} | 0 .../default.nix => unit/tk/tkrzw/pkg-fun.nix} | 0 .../tl/tl-expected/pkg-fun.nix} | 0 .../tl/tla}/configure-tmpdir.patch | 0 .../default.nix => unit/tl/tla/pkg-fun.nix} | 0 .../tl/tlaplusToolbox/pkg-fun.nix} | 0 .../default.nix => unit/tl/tldr/pkg-fun.nix} | 0 .../default.nix => unit/tl/tlf/pkg-fun.nix} | 0 .../tl/tllist/pkg-fun.nix} | 0 .../default.nix => unit/tl/tlsx/pkg-fun.nix} | 0 .../default.nix => unit/tl/tlwg/pkg-fun.nix} | 0 .../tm/default.nix => unit/tm/tm/pkg-fun.nix} | 0 .../tm/tmate-ssh-server/pkg-fun.nix} | 0 .../default.nix => unit/tm/tmate/pkg-fun.nix} | 0 .../tm/tmatrix/pkg-fun.nix} | 0 .../tm/tmpmail/pkg-fun.nix} | 0 .../tm/tmpwatch/pkg-fun.nix} | 0 .../filesystems => unit/tm}/tmsu/deps.nix | 0 .../default.nix => unit/tm/tmsu/pkg-fun.nix} | 0 .../tm/tmux-cssh/pkg-fun.nix} | 0 .../tm/tmux-mem-cpu-load/pkg-fun.nix} | 0 .../tm/tmux-xpanes/pkg-fun.nix} | 0 .../default.nix => unit/tm/tmux/pkg-fun.nix} | 0 .../tm/tmuxinator/pkg-fun.nix} | 0 .../default.nix => unit/tm/tmuxp/pkg-fun.nix} | 0 .../tn/tnat64/pkg-fun.nix} | 0 .../tn/tncattach/pkg-fun.nix} | 0 .../default.nix => unit/tn/tnef/pkg-fun.nix} | 0 .../default.nix => unit/tn/tnt/pkg-fun.nix} | 0 .../default.nix => unit/tn/tntdb/pkg-fun.nix} | 0 .../tn/tntnet/pkg-fun.nix} | 0 .../default.nix => unit/to/toast/pkg-fun.nix} | 0 .../to/tockloader/pkg-fun.nix} | 0 .../to/todiff/pkg-fun.nix} | 0 .../to/todo-txt-cli/pkg-fun.nix} | 0 .../default.nix => unit/to/todo/pkg-fun.nix} | 0 .../to/todofi-sh/pkg-fun.nix} | 0 .../to/todoist-electron/pkg-fun.nix} | 0 .../to/todoist/pkg-fun.nix} | 0 .../to/todoman/pkg-fun.nix} | 0 .../default.nix => unit/to/tofi/pkg-fun.nix} | 0 .../default.nix => unit/to/toil/pkg-fun.nix} | 0 .../to/toilet/pkg-fun.nix} | 0 .../default.nix => unit/to/toipe/pkg-fun.nix} | 0 .../to/tokio-console/pkg-fun.nix} | 0 .../to/tokyocabinet/pkg-fun.nix} | 0 .../to/tokyotyrant/pkg-fun.nix} | 0 .../default.nix => unit/to/tomb/pkg-fun.nix} | 0 .../to/tomcat-native/pkg-fun.nix} | 0 .../to/tomcat_connectors/pkg-fun.nix} | 0 .../to/tomcat_mysql_jdbc/pkg-fun.nix} | 0 .../default.nix => unit/to/tome2/pkg-fun.nix} | 0 .../default.nix => unit/to/tome4/pkg-fun.nix} | 0 .../to/toml11/pkg-fun.nix} | 0 .../to/toml2json/pkg-fun.nix} | 0 .../tools => unit/to}/toml2nix/Cargo.lock | 0 .../to/toml2nix/pkg-fun.nix} | 0 .../to/tomlc99/pkg-fun.nix} | 0 .../to/tomlcpp/pkg-fun.nix} | 0 .../to/tomlplusplus/pkg-fun.nix} | 0 .../to/tonelib-gfx/pkg-fun.nix} | 0 .../to/tonelib-jam/pkg-fun.nix} | 0 .../to/tonelib-metal/pkg-fun.nix} | 0 .../to/tonelib-zoom/pkg-fun.nix} | 0 .../to}/toolbox/glibc.patch | 0 .../to/toolbox/pkg-fun.nix} | 0 .../default.nix => unit/to/toot/pkg-fun.nix} | 0 .../to/tootle/pkg-fun.nix} | 0 .../to/top-git/pkg-fun.nix} | 0 .../to/topiary/pkg-fun.nix} | 0 .../to/topicctl/pkg-fun.nix} | 0 .../to/toppler/pkg-fun.nix} | 0 .../to/topydo/pkg-fun.nix} | 0 .../to/tor-browser-bundle-bin/pkg-fun.nix} | 0 .../tor/disable-monotonic-timer-tests.patch | 0 .../default.nix => unit/to/tor/pkg-fun.nix} | 0 .../security => unit/to}/tor/update.nix | 0 .../default.nix => unit/to/torcs/pkg-fun.nix} | 0 .../default.nix => unit/to/torq/pkg-fun.nix} | 0 .../to/torrent7z/pkg-fun.nix} | 0 .../to/torrential/pkg-fun.nix} | 0 .../to/torsocks/pkg-fun.nix} | 0 .../to/tortoisehg/pkg-fun.nix} | 0 .../to/torus-trooper/pkg-fun.nix} | 0 .../default.nix => unit/to/toss/pkg-fun.nix} | 0 .../to/totem-pl-parser/pkg-fun.nix} | 0 .../to/touchegg/pkg-fun.nix} | 0 .../to/touchosc/pkg-fun.nix} | 0 .../audio => unit/to}/touchosc/update.sh | 0 .../to/tox-node/pkg-fun.nix} | 0 .../default.nix => unit/to/toxic/pkg-fun.nix} | 0 .../to/toxiproxy/pkg-fun.nix} | 0 .../to/toxvpn/pkg-fun.nix} | 0 .../tp/tp-auto-kbbl/pkg-fun.nix} | 0 .../tp/tpacpi-bat/pkg-fun.nix} | 0 .../tp}/tpm-luks/openssl-1.1.patch | 0 .../tp/tpm-luks/pkg-fun.nix} | 0 .../tp}/tpm-luks/signed-ptr.patch | 0 .../tp/tpm-quote-tools/pkg-fun.nix} | 0 .../tp/tpm-tools/pkg-fun.nix} | 0 .../tp/tpm2-abrmd/pkg-fun.nix} | 0 .../0001-configure-ac-version.patch | 0 .../tp/tpm2-pkcs11/pkg-fun.nix} | 0 .../tp/tpm2-tools/pkg-fun.nix} | 0 .../default.nix => unit/tp/tptp/pkg-fun.nix} | 0 .../tr/tr-patcher/pkg-fun.nix} | 0 .../tr/trace-cmd/pkg-fun.nix} | 0 .../tr/tracee/pkg-fun.nix} | 0 .../tr}/tracee/use-our-libbpf.patch | 0 .../tr}/tracefilegen/gcc7.patch | 0 .../tr/tracefilegen/pkg-fun.nix} | 0 .../tr/tracefilesim/pkg-fun.nix} | 0 .../tr/traceroute/pkg-fun.nix} | 0 .../tr/trackballs/pkg-fun.nix} | 0 .../tr/tracker-miners/pkg-fun.nix} | 0 .../tr/tracker/pkg-fun.nix} | 0 .../tr/trackma/pkg-fun.nix} | 0 .../{tools/misc => unit/tr}/trackma/update.sh | 0 .../tools => unit/tr}/tradcpp/aarch64.patch | 0 .../tr/tradcpp/pkg-fun.nix} | 0 .../tr}/tradcpp/tradcpp-configure.patch | 0 .../tr/traefik-certs-dumper/pkg-fun.nix} | 0 .../tr/traefik/pkg-fun.nix} | 0 .../tr/trafficserver/pkg-fun.nix} | 0 .../tr/traitor/pkg-fun.nix} | 0 .../default.nix => unit/tr/tran/pkg-fun.nix} | 0 .../tr/transcode/pkg-fun.nix} | 0 .../tr/transcribe/pkg-fun.nix} | 0 .../helper-scripts_depspathprefix.patch | 0 .../tr/transcrypt/pkg-fun.nix} | 0 .../tr/transgui/pkg-fun.nix} | 0 .../tr/translate-shell/pkg-fun.nix} | 0 .../tr/transmission-remote-gtk/pkg-fun.nix} | 0 .../tr/trash-cli/pkg-fun.nix} | 0 .../tr/trashy/pkg-fun.nix} | 0 .../tools/misc => unit/tr}/travis/Gemfile | 0 .../misc => unit/tr}/travis/Gemfile.lock | 0 .../tools/misc => unit/tr}/travis/gemset.nix | 0 .../tr/travis/pkg-fun.nix} | 0 .../tools/misc => unit/tr}/travis/shell.nix | 0 .../tr/trayer/pkg-fun.nix} | 0 .../tr/trdl-client/pkg-fun.nix} | 0 .../tr/tre-command/pkg-fun.nix} | 0 .../default.nix => unit/tr/tre/pkg-fun.nix} | 0 .../tr/trealla/pkg-fun.nix} | 0 .../audio => unit/tr}/tree-from-tags/Gemfile | 0 .../tr}/tree-from-tags/Gemfile.lock | 0 .../tr}/tree-from-tags/gemset.nix | 0 .../tr/tree-from-tags/pkg-fun.nix} | 0 .../default.nix => unit/tr/tree/pkg-fun.nix} | 0 .../tr/treefmt/pkg-fun.nix} | 0 .../tr/treemix/pkg-fun.nix} | 0 .../tr/trellis/pkg-fun.nix} | 0 .../default.nix => unit/tr/tremc/pkg-fun.nix} | 0 .../tr/tremor-language-server/pkg-fun.nix} | 0 .../tr/tremor/pkg-fun.nix} | 0 .../tr/trezor-suite/pkg-fun.nix} | 0 .../tr/trezor-udev-rules/pkg-fun.nix} | 0 .../tr/tribler/pkg-fun.nix} | 0 .../tr/trickle/pkg-fun.nix} | 0 .../tr/trickster/pkg-fun.nix} | 0 .../tr/tridactyl-native/pkg-fun.nix} | 0 .../tr/triehash/pkg-fun.nix} | 0 .../tr/trigger/pkg-fun.nix} | 0 .../tr/triggerhappy/pkg-fun.nix} | 0 .../tr/trillian-im/pkg-fun.nix} | 0 .../tr/trillian/pkg-fun.nix} | 0 .../tr/trimal/pkg-fun.nix} | 0 .../tr/trinity/pkg-fun.nix} | 0 .../tr/trino-cli/pkg-fun.nix} | 0 .../default.nix => unit/tr/trivy/pkg-fun.nix} | 0 .../tr/trompeloeil/pkg-fun.nix} | 0 .../allow-non-tss-config-file-owner.patch | 0 .../tr/trousers/pkg-fun.nix} | 0 .../tr/truecrack/pkg-fun.nix} | 0 .../tr/trueseeing/pkg-fun.nix} | 0 .../tr/trufflehog/pkg-fun.nix} | 0 .../tr/trunk-io/pkg-fun.nix} | 0 .../tools => unit/tr}/trunk-io/update.sh | 0 .../tr/truvari/pkg-fun.nix} | 0 .../tr}/trx/add_bctoolbox_ldlib.patch | 0 .../default.nix => unit/tr/trx/pkg-fun.nix} | 0 .../tr/tryton/pkg-fun.nix} | 0 .../ts/default.nix => unit/ts/ts/pkg-fun.nix} | 0 .../ts/tsduck/pkg-fun.nix} | 0 .../ts/tsocks/pkg-fun.nix} | 0 .../libraries => unit/ts}/tsocks/poll.patch | 0 .../ts/tsukae/pkg-fun.nix} | 0 .../default.nix => unit/ts/tsung/pkg-fun.nix} | 0 .../tt/tt-rss-plugin-auth-ldap/pkg-fun.nix} | 0 .../tt/tt-rss-plugin-feediron/pkg-fun.nix} | 0 .../tt-rss-plugin-ff-instagram/pkg-fun.nix} | 0 .../tt/tt-rss-theme-feedly/pkg-fun.nix} | 0 .../tt/tt-rss/pkg-fun.nix} | 0 .../tt/tt2020/pkg-fun.nix} | 0 .../tt/ttchat/pkg-fun.nix} | 0 .../tt/ttf-envy-code-r/pkg-fun.nix} | 0 .../tt/ttf-tw-moe/pkg-fun.nix} | 0 .../tt}/ttf2pt1/gentoo-makefile.patch | 0 .../tt/ttf2pt1/pkg-fun.nix} | 0 .../tt/ttf_bitstream_vera/pkg-fun.nix} | 0 .../tt/tthsum/pkg-fun.nix} | 0 .../misc => unit/tt}/ttmkfdir/cstring.patch | 0 .../tt/ttmkfdir/pkg-fun.nix} | 0 .../default.nix => unit/tt/tts/pkg-fun.nix} | 0 .../tt/ttwatch/pkg-fun.nix} | 0 .../tt/tty-clock/pkg-fun.nix} | 0 .../tt/tty-share/pkg-fun.nix} | 0 .../tt/tty-solitaire/pkg-fun.nix} | 0 .../default.nix => unit/tt/ttyd/pkg-fun.nix} | 0 .../tt/ttygif/pkg-fun.nix} | 0 .../tt/ttylog/pkg-fun.nix} | 0 .../tt/ttyper/pkg-fun.nix} | 0 .../tt/ttyplot/pkg-fun.nix} | 0 .../tu/tubekit-unwrapped/pkg-fun.nix} | 0 .../tu/tubekit/pkg-fun.nix} | 0 .../default.nix => unit/tu/tuc/pkg-fun.nix} | 0 .../default.nix => unit/tu/tudu/pkg-fun.nix} | 0 .../default.nix => unit/tu/tuhi/pkg-fun.nix} | 0 .../default.nix => unit/tu/tuir/pkg-fun.nix} | 0 .../tu/tumiki-fighters/pkg-fun.nix} | 0 .../tu/tun2socks/pkg-fun.nix} | 0 .../tu/tunctl/pkg-fun.nix} | 0 .../default.nix => unit/tu/tuner/pkg-fun.nix} | 0 .../tu/tuntox/pkg-fun.nix} | 0 .../tu}/tup/fusermount-setuid.patch | 0 .../default.nix => unit/tu/tup/pkg-fun.nix} | 0 .../tu}/tup/setup-hook.sh | 0 .../tu/tuptime/pkg-fun.nix} | 0 .../tu/turses/pkg-fun.nix} | 0 .../default.nix => unit/tu/tusk/pkg-fun.nix} | 0 .../default.nix => unit/tu/tut/pkg-fun.nix} | 0 .../tu/tutanota-desktop/pkg-fun.nix} | 0 .../tu/tuxpaint/pkg-fun.nix} | 0 .../tu}/tuxpaint/tuxpaint-completion.diff | 0 .../tu/tuxtype/pkg-fun.nix} | 0 .../tv/default.nix => unit/tv/tv/pkg-fun.nix} | 0 .../tv/tvbrowser-bin/pkg-fun.nix} | 0 .../default.nix => unit/tv/tvm/pkg-fun.nix} | 0 .../tv/tvnamer/pkg-fun.nix} | 0 .../default.nix => unit/tw/twa/pkg-fun.nix} | 0 .../default.nix => unit/tw/tweak/pkg-fun.nix} | 0 .../tw/tweeny/pkg-fun.nix} | 0 .../default.nix => unit/tw/twelf/pkg-fun.nix} | 0 .../tw/twemoji-color-font/pkg-fun.nix} | 0 .../tw/twiggy/pkg-fun.nix} | 0 .../tw/twilio-cli/pkg-fun.nix} | 0 .../tw/twingate/pkg-fun.nix} | 0 .../tw/twitter-color-emoji/pkg-fun.nix} | 0 .../tw/twitterBootstrap/pkg-fun.nix} | 0 .../tw/twolame/pkg-fun.nix} | 0 .../tw/tworld2/pkg-fun.nix} | 0 .../tw/twspace-dl/pkg-fun.nix} | 0 pkgs/{tools/misc => unit/tw}/twurl/Gemfile | 0 .../misc => unit/tw}/twurl/Gemfile.lock | 0 pkgs/{tools/misc => unit/tw}/twurl/gemset.nix | 0 .../default.nix => unit/tw/twurl/pkg-fun.nix} | 0 .../default.nix => unit/tx/txr/pkg-fun.nix} | 0 .../tx/txt2man/pkg-fun.nix} | 0 .../tx/txt2tags/pkg-fun.nix} | 0 .../tx/txtpbfmt/pkg-fun.nix} | 0 .../default.nix => unit/tx/txtw/pkg-fun.nix} | 0 .../default.nix => unit/ty/tydra/pkg-fun.nix} | 0 .../default.nix => unit/ty/tym/pkg-fun.nix} | 0 .../ty/typeshare/pkg-fun.nix} | 0 .../ty/typespeed/pkg-fun.nix} | 0 .../typespeed/typespeed-config-in-home.patch | 0 .../default.nix => unit/ty/typos/pkg-fun.nix} | 0 .../tz/default.nix => unit/tz/tz/pkg-fun.nix} | 0 ...xe-extension-for-MS-Windows-binaries.patch | 0 .../tz/tzdata/pkg-fun.nix} | 0 .../tz}/tzdata/tzdata-setup-hook.sh | 0 .../tz/tzupdate/pkg-fun.nix} | 0 .../u0/u001-font/pkg-fun.nix} | 0 .../u3/u3-tool/pkg-fun.nix} | 0 .../default.nix => unit/u9/u9fs/pkg-fun.nix} | 0 .../ua/default.nix => unit/ua/ua/pkg-fun.nix} | 0 .../default.nix => unit/ua/uacme/pkg-fun.nix} | 0 .../default.nix => unit/ua/uade/pkg-fun.nix} | 0 .../default.nix => unit/ua/uae/pkg-fun.nix} | 0 .../ua/uarmsolver/pkg-fun.nix} | 0 .../default.nix => unit/ua/uasm/pkg-fun.nix} | 0 .../ub/ubertooth/pkg-fun.nix} | 0 .../ub/ubridge/pkg-fun.nix} | 0 .../ub/ubuntu-themes/pkg-fun.nix} | 0 .../ub/ubuntu_font_family/pkg-fun.nix} | 0 .../default.nix => unit/ub/ubus/pkg-fun.nix} | 0 .../default.nix => unit/uc/ucarp/pkg-fun.nix} | 0 .../default.nix => unit/uc/ucc/pkg-fun.nix} | 0 .../uc/uchess/pkg-fun.nix} | 0 .../default.nix => unit/uc/uci/pkg-fun.nix} | 0 .../default.nix => unit/uc/ucl/pkg-fun.nix} | 0 .../uc/ucommon/pkg-fun.nix} | 0 .../uc/ucs-fonts/pkg-fun.nix} | 0 .../uc/ucspi-tcp/pkg-fun.nix} | 0 .../uc}/ucspi-tcp/remove-setuid.patch | 0 .../default.nix => unit/uc/ucx/pkg-fun.nix} | 0 .../default.nix => unit/ud/uddup/pkg-fun.nix} | 0 .../ud}/udevil/device-info-sys-stat.patch | 0 .../ud/udevil/pkg-fun.nix} | 0 .../ud/udftools/pkg-fun.nix} | 0 .../default.nix => unit/ud/udig/pkg-fun.nix} | 0 .../ud/udis86/pkg-fun.nix} | 0 .../ud}/udiskie/locale-path.patch | 0 .../ud/udiskie/pkg-fun.nix} | 0 .../ud/udisks2}/fix-paths.patch | 0 .../ud/udisks2}/force-path.patch | 0 .../ud/udisks2/pkg-fun.nix} | 0 .../default.nix => unit/ud/udns/pkg-fun.nix} | 0 .../ud/udocker/pkg-fun.nix} | 0 .../ud/udp2raw/pkg-fun.nix} | 0 .../ud/udpreplay/pkg-fun.nix} | 0 .../default.nix => unit/ud/udpt/pkg-fun.nix} | 0 .../ud/udptunnel/pkg-fun.nix} | 0 .../ud/udunits/pkg-fun.nix} | 0 pkgs/{games => unit/ue}/ue4/cdn-deps.nix | 0 .../ue}/ue4/generate-expr-from-cdn.sh | 0 .../default.nix => unit/ue/ue4/pkg-fun.nix} | 0 .../ue/uefi-firmware-parser/pkg-fun.nix} | 0 .../ue/uefi-run/pkg-fun.nix} | 0 .../uf/ufiformat/pkg-fun.nix} | 0 .../default.nix => unit/uf/ufoai/pkg-fun.nix} | 0 .../default.nix => unit/uf/uftp/pkg-fun.nix} | 0 .../uf/uftrace/pkg-fun.nix} | 0 .../ug/uget-integrator/pkg-fun.nix} | 0 .../default.nix => unit/ug/uget/pkg-fun.nix} | 0 .../default.nix => unit/ug/ugrep/pkg-fun.nix} | 0 .../ug/ugtrain/pkg-fun.nix} | 0 .../default.nix => unit/uh/uhdm/pkg-fun.nix} | 0 .../uh/uhexen2/pkg-fun.nix} | 0 .../uh/uhk-agent/pkg-fun.nix} | 0 .../uh/uhk-udev-rules/pkg-fun.nix} | 0 .../uh/uhttpmock/pkg-fun.nix} | 0 .../default.nix => unit/uh/uhub/pkg-fun.nix} | 0 .../uh/uhubctl/pkg-fun.nix} | 0 .../ui/uid_wrapper/pkg-fun.nix} | 0 .../ui/uif2iso/pkg-fun.nix} | 0 .../default.nix => unit/ui/uisp/pkg-fun.nix} | 0 .../editors => unit/ui}/uivonim/package.json | 0 .../ui/uivonim/pkg-fun.nix} | 0 .../editors => unit/ui}/uivonim/yarn.lock | 0 .../editors => unit/ui}/uivonim/yarn.nix | 0 .../0001-Adjust-get_data_path-for-NixOS.patch | 0 .../ul}/ulauncher/fix-extensions.patch | 0 .../misc => unit/ul}/ulauncher/fix-path.patch | 0 .../ul/ulauncher/pkg-fun.nix} | 0 .../default.nix => unit/ul/ulogd/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../ul/ultimatestunts/pkg-fun.nix} | 0 .../ul/ultralist/pkg-fun.nix} | 0 .../ul/ultrastardx/pkg-fun.nix} | 0 .../default.nix => unit/um/umlet/pkg-fun.nix} | 0 .../default.nix => unit/um/umoci/pkg-fun.nix} | 0 .../um}/umockdev/hardcode-paths.patch | 0 .../um/umockdev/pkg-fun.nix} | 0 .../um/umoria/pkg-fun.nix} | 0 .../default.nix => unit/um/ums/pkg-fun.nix} | 0 .../um/umurmur/pkg-fun.nix} | 0 .../un/unbound/pkg-fun.nix} | 0 .../default.nix => unit/un/unciv/pkg-fun.nix} | 0 .../un/unclutter-xfixes/pkg-fun.nix} | 0 .../un/unclutter/pkg-fun.nix} | 0 .../un/unconvert/pkg-fun.nix} | 0 .../un/uncover/pkg-fun.nix} | 0 .../un/uncrustify/pkg-fun.nix} | 0 .../un/undaemonize/pkg-fun.nix} | 0 .../un/undefined-medium/pkg-fun.nix} | 0 .../un/undervolt/pkg-fun.nix} | 0 .../un/undistract-me/pkg-fun.nix} | 0 .../default.nix => unit/un/undmg/pkg-fun.nix} | 0 .../archivers => unit/un}/undmg/setup-hook.sh | 0 .../un/undocker/pkg-fun.nix} | 0 .../un/unflac/pkg-fun.nix} | 0 .../un/unfonts-core/pkg-fun.nix} | 0 .../default.nix => unit/un/unfs3/pkg-fun.nix} | 0 .../un/uni-vga/pkg-fun.nix} | 0 .../default.nix => unit/un/uni/pkg-fun.nix} | 0 .../un/uni2ascii/pkg-fun.nix} | 0 .../un/unibilium/pkg-fun.nix} | 0 .../un/unicap/pkg-fun.nix} | 0 .../unicode-character-database/pkg-fun.nix} | 0 .../un/unicode-emoji/pkg-fun.nix} | 0 .../un/unicode-paracode/pkg-fun.nix} | 0 .../un/unicon-lang/pkg-fun.nix} | 0 .../un/unifdef/pkg-fun.nix} | 0 .../un/uniffi-bindgen/pkg-fun.nix} | 0 .../un/unifi-protect-backup/pkg-fun.nix} | 0 .../un/unifi-video/pkg-fun.nix} | 0 .../unifiedpush-common-proxies/pkg-fun.nix} | 0 .../un/unifont/pkg-fun.nix} | 0 .../un/unifont_upper/pkg-fun.nix} | 0 .../un/unigine-heaven/pkg-fun.nix} | 0 .../un/unigine-valley/pkg-fun.nix} | 0 .../un/unihan-database/pkg-fun.nix} | 0 .../un/unionfs-fuse/pkg-fun.nix} | 0 .../prevent-kill-on-shutdown.patch | 0 .../un/unipicker/pkg-fun.nix} | 0 .../{tools/text => unit/un}/uniscribe/Gemfile | 0 .../text => unit/un}/uniscribe/Gemfile.lock | 0 .../text => unit/un}/uniscribe/gemset.nix | 0 .../un/uniscribe/pkg-fun.nix} | 0 .../un/unison-ucm/pkg-fun.nix} | 0 .../default.nix => unit/un/unit/pkg-fun.nix} | 0 .../un/unittest-cpp/pkg-fun.nix} | 0 .../un/unityhub/pkg-fun.nix} | 0 .../universal-ctags/000-nixos-specific.patch | 0 .../un/universal-ctags/pkg-fun.nix} | 0 .../un/unixODBC/pkg-fun.nix} | 0 .../un/unnethack/pkg-fun.nix} | 0 .../un/unoconv/pkg-fun.nix} | 0 .../default.nix => unit/un/unp/pkg-fun.nix} | 0 .../un/unpaper/pkg-fun.nix} | 0 .../un/unparam/pkg-fun.nix} | 0 .../default.nix => unit/un/unpfs/pkg-fun.nix} | 0 .../un/unpoller/pkg-fun.nix} | 0 .../default.nix => unit/un/unrar/pkg-fun.nix} | 0 .../archivers => unit/un}/unrar/setup-hook.sh | 0 .../default.nix => unit/un/unrtf/pkg-fun.nix} | 0 .../0001-adjust-socket-paths-for-nixos.patch | 0 .../default.nix => unit/un/unscd/pkg-fun.nix} | 0 .../un/unscii/pkg-fun.nix} | 0 .../un/unshield/pkg-fun.nix} | 0 .../un/unstableGitUpdater/pkg-fun.nix} | 0 .../un/unstick/pkg-fun.nix} | 0 .../default.nix => unit/un/untex/pkg-fun.nix} | 0 .../default.nix => unit/un/untie/pkg-fun.nix} | 0 .../un/untrunc-anthwlock/pkg-fun.nix} | 0 .../un/unused/pkg-fun.nix} | 0 .../un/unvanquished/pkg-fun.nix} | 0 .../un}/unzip/CVE-2014-8139.diff | 0 .../un}/unzip/CVE-2014-8140.diff | 0 .../un}/unzip/CVE-2014-8141.diff | 0 .../un}/unzip/CVE-2014-9636.diff | 0 .../un}/unzip/CVE-2014-9913.patch | 0 .../un}/unzip/CVE-2015-7696.diff | 0 .../un}/unzip/CVE-2015-7697.diff | 0 .../un}/unzip/CVE-2016-9844.patch | 0 .../un}/unzip/CVE-2018-18384.patch | 0 .../un}/unzip/dont-hardcode-cc.patch | 0 .../default.nix => unit/un/unzip/pkg-fun.nix} | 0 .../archivers => unit/un}/unzip/setup-hook.sh | 0 .../default.nix => unit/un/unzoo/pkg-fun.nix} | 0 .../up/default.nix => unit/up/up/pkg-fun.nix} | 0 .../up/upbound/pkg-fun.nix} | 0 .../up/update-python-libraries/pkg-fun.nix} | 0 .../update-python-libraries.py | 0 .../up/update-resolv-conf/pkg-fun.nix} | 0 .../up/update-systemd-resolved/pkg-fun.nix} | 0 .../update-systemd-resolved.patch | 0 .../default.nix => unit/up/updog/pkg-fun.nix} | 0 .../up/upnp-router-control/pkg-fun.nix} | 0 .../i686-test-remove-battery-check.patch | 0 .../up/upower/pkg-fun.nix} | 0 .../up/upterm/pkg-fun.nix} | 0 .../up}/uptime-kuma/composition.nix | 0 .../fix-database-permissions.patch | 0 .../up/uptime-kuma}/node-env.nix | 0 .../up}/uptime-kuma/node-packages.nix | 0 .../up/uptime-kuma/pkg-fun.nix} | 0 .../up}/uptime-kuma/update.sh | 0 .../up}/uptimed/no-var-spool-install.patch | 0 .../up/uptimed/pkg-fun.nix} | 0 .../up/upwork/pkg-fun.nix} | 0 .../default.nix => unit/up/upx/pkg-fun.nix} | 0 .../uq/default.nix => unit/uq/uq/pkg-fun.nix} | 0 pkgs/{games => unit/uq}/uqm/3dovideo.nix | 0 .../default.nix => unit/uq/uqm/pkg-fun.nix} | 0 .../default.nix => unit/uq/uqmi/pkg-fun.nix} | 0 .../ur/urbackup-client/pkg-fun.nix} | 0 .../ur/urbanterror/pkg-fun.nix} | 0 .../default.nix => unit/ur/urbit/pkg-fun.nix} | 0 .../ur/urdfdom-headers/pkg-fun.nix} | 0 .../ur/urdfdom/pkg-fun.nix} | 0 .../default.nix => unit/ur/urh/pkg-fun.nix} | 0 .../ur/uriparser/pkg-fun.nix} | 0 .../ur/urjtag/pkg-fun.nix} | 0 .../ur/urlhunter/pkg-fun.nix} | 0 .../ur/urlscan/pkg-fun.nix} | 0 .../ur/urlview/pkg-fun.nix} | 0 .../ur/urlwatch/pkg-fun.nix} | 0 .../ur/urn-timer/pkg-fun.nix} | 0 .../default.nix => unit/ur/urn/pkg-fun.nix} | 0 .../ur/uroboros/pkg-fun.nix} | 0 .../ur/ursadb/pkg-fun.nix} | 0 .../ur/urserver/pkg-fun.nix} | 0 .../us/usb-blaster-udev-rules/pkg-fun.nix} | 0 .../usb-blaster-udev-rules/usb-blaster.rules | 0 .../us/usb-modeswitch-data/pkg-fun.nix} | 0 .../configurable-usb-modeswitch.patch | 0 .../us/usb-modeswitch/pkg-fun.nix} | 0 .../us/usb-reset/pkg-fun.nix} | 0 .../us/usbguard/pkg-fun.nix} | 0 .../us/usbimager/pkg-fun.nix} | 0 .../us/usbmuxd/pkg-fun.nix} | 0 .../us/usbmuxd2/pkg-fun.nix} | 0 .../us/usbredir/pkg-fun.nix} | 0 .../us/usbrelay/pkg-fun.nix} | 0 .../us/usbrelayd/pkg-fun.nix} | 0 .../us/usbrip/pkg-fun.nix} | 0 .../us/usbsdmux/pkg-fun.nix} | 0 .../us/usbtop/pkg-fun.nix} | 0 .../us}/usbutils/fix-paths.patch | 0 .../us/usbutils/pkg-fun.nix} | 0 .../us/usbview/pkg-fun.nix} | 0 .../us/userhosts/pkg-fun.nix} | 0 .../us/usermount/pkg-fun.nix} | 0 .../default.nix => unit/us/usql/pkg-fun.nix} | 0 .../us/usrsctp/pkg-fun.nix} | 0 .../default.nix => unit/us/ustr/pkg-fun.nix} | 0 .../libraries => unit/us}/ustr/va_args.patch | 0 .../us/ustreamer/pkg-fun.nix} | 0 .../default.nix => unit/us/usync/pkg-fun.nix} | 0 .../ut/utahfs/pkg-fun.nix} | 0 .../ut/utf8cpp/pkg-fun.nix} | 0 .../ut/utf8proc/pkg-fun.nix} | 0 .../ut/uthash/pkg-fun.nix} | 0 .../ut/uthenticode/pkg-fun.nix} | 0 .../default.nix => unit/ut/utm/pkg-fun.nix} | 0 .../default.nix => unit/ut/utox/pkg-fun.nix} | 0 .../ut/utsushi-networkscan/pkg-fun.nix} | 0 .../ut/utsushi/pkg-fun.nix} | 0 .../default.nix => unit/uu/uucp/pkg-fun.nix} | 0 .../misc => unit/uu}/uudeview/matherr.patch | 0 .../uu/uudeview/pkg-fun.nix} | 0 .../uv/uvccapture/pkg-fun.nix} | 0 .../uv/uvcdynctrl/pkg-fun.nix} | 0 .../uw}/uw-ttyp0/determinism.patch | 0 .../uw/uw-ttyp0/pkg-fun.nix} | 0 .../default.nix => unit/uw/uwc/pkg-fun.nix} | 0 .../uw/uwimap/pkg-fun.nix} | 0 .../uw}/uwsgi/additional-php-ldflags.patch | 0 pkgs/{servers => unit/uw}/uwsgi/nixos.ini | 0 ...o-ext-session-php_session.h-on-NixOS.patch | 0 .../default.nix => unit/uw/uwsgi/pkg-fun.nix} | 0 .../misc => unit/uw}/uwufetch/fix-paths.patch | 0 .../uw/uwufetch/pkg-fun.nix} | 0 .../uw/uwuify/pkg-fun.nix} | 0 .../default.nix => unit/ux/uxn/pkg-fun.nix} | 0 .../ux/uxplay/pkg-fun.nix} | 0 .../v2ray-domain-list-community/pkg-fun.nix} | 0 .../v2/v2ray-geoip/pkg-fun.nix} | 0 .../misc => unit/v2}/v2ray-geoip/update.sh | 0 .../default.nix => unit/v2/v2ray/pkg-fun.nix} | 0 .../v2}/v2raya/package.json | 0 .../v2/v2raya/pkg-fun.nix} | 0 .../networking => unit/v2}/v2raya/yarn.lock | 0 .../networking => unit/v2}/v2raya/yarn.nix | 0 .../va/vaapi-intel-hybrid/pkg-fun.nix} | 0 .../va/vaapiIntel/pkg-fun.nix} | 0 .../va/vaapiVdpau/pkg-fun.nix} | 0 .../va/vacuum/pkg-fun.nix} | 0 ...l-request-12225-from-chrisroberts-re.patch | 0 ...004-Support-system-installed-plugins.patch | 0 .../tools => unit/va}/vagrant/gemset.nix | 0 .../va}/vagrant/gemset_libvirt.nix | 0 .../va/vagrant/pkg-fun.nix} | 0 .../unofficial-installation-nowarn.patch | 0 .../vagrant/use-system-bundler-version.patch | 0 .../va}/vagrant/vagrant-libvirt.json.in | 0 .../va/vala-language-server/pkg-fun.nix} | 0 .../va/vala-lint/pkg-fun.nix} | 0 .../default.nix => unit/va/vale/pkg-fun.nix} | 0 .../va/validator-nu/pkg-fun.nix} | 0 .../va/valkyrie/pkg-fun.nix} | 0 .../default.nix => unit/va/vals/pkg-fun.nix} | 0 .../default.nix => unit/va/valum/pkg-fun.nix} | 0 .../va/vamp-plugin-sdk/pkg-fun.nix} | 0 .../va/vampire/pkg-fun.nix} | 0 .../va/vanilla-dmz/pkg-fun.nix} | 0 .../va/vapoursynth-mvtools/pkg-fun.nix} | 0 .../va/variety/pkg-fun.nix} | 0 .../va/varscan/pkg-fun.nix} | 0 .../va/vassal/pkg-fun.nix} | 0 .../va/vault-bin/pkg-fun.nix} | 0 .../vault => unit/va/vault-bin}/update-bin.sh | 0 .../va/vault-medusa/pkg-fun.nix} | 0 .../default.nix => unit/va/vault/pkg-fun.nix} | 0 .../va/vazir-code-font/pkg-fun.nix} | 0 .../va/vazir-fonts/pkg-fun.nix} | 0 .../default.nix => unit/vb/vbam/pkg-fun.nix} | 0 .../vb/vbetool/pkg-fun.nix} | 0 .../vb/vbindiff/pkg-fun.nix} | 0 .../vboot_reference/dont_static_link.patch | 0 .../vb/vboot_reference/pkg-fun.nix} | 0 .../vc/default.nix => unit/vc/vc/pkg-fun.nix} | 0 .../vc/vc4-newlib/pkg-fun.nix} | 0 .../vc/0.7.nix => unit/vc/vc_0_7/pkg-fun.nix} | 0 .../vc/vc_0_7}/vc_0_7_clang_fix.patch | 0 .../default.nix => unit/vc/vcal/pkg-fun.nix} | 0 .../vc/vcdimager/pkg-fun.nix} | 0 .../vc/vcftools/pkg-fun.nix} | 0 .../default.nix => unit/vc/vcg/pkg-fun.nix} | 0 .../vc/vcluster/pkg-fun.nix} | 0 .../video => unit/vc}/vcs/fonts.patch | 0 .../default.nix => unit/vc/vcs/pkg-fun.nix} | 0 .../vc/vcs_query/pkg-fun.nix} | 0 .../default.nix => unit/vc/vcsh/pkg-fun.nix} | 0 .../default.nix => unit/vc/vcsi/pkg-fun.nix} | 0 .../vc/vcstool/pkg-fun.nix} | 0 .../vc/vcv-rack/pkg-fun.nix} | 0 .../vcv-rack/rack-minimize-vendoring.patch | 0 .../default.nix => unit/vd/vde2/pkg-fun.nix} | 0 .../vd/vdmfec/pkg-fun.nix} | 0 .../default.nix => unit/vd/vdo/pkg-fun.nix} | 0 .../vd/vdpauinfo/pkg-fun.nix} | 0 .../default.nix => unit/vd/vdr/pkg-fun.nix} | 0 ...Ignore-missing-data-for-installation.patch | 0 .../vd/vdrift/pkg-fun.nix} | 0 .../vd/vdrsymbols/pkg-fun.nix} | 0 .../ve/vectoroids/pkg-fun.nix} | 0 .../ve/vegeta/pkg-fun.nix} | 0 .../default.nix => unit/ve/vegur/pkg-fun.nix} | 0 .../ve/velero/pkg-fun.nix} | 0 .../ve/vendir/pkg-fun.nix} | 0 .../default.nix => unit/ve/venta/pkg-fun.nix} | 0 .../ventoy-bin/000-nixos-sanitization.patch | 0 .../ve/ventoy-bin/pkg-fun.nix} | 0 .../default.nix => unit/ve/verco/pkg-fun.nix} | 0 .../ve/verible/pkg-fun.nix} | 0 .../ve}/verible/remove-unused-deps.patch | 0 .../ve/verifast/pkg-fun.nix} | 0 .../ve/verifpal/pkg-fun.nix} | 0 .../ve/verilator/pkg-fun.nix} | 0 .../ve/versus/pkg-fun.nix} | 0 .../ve/veryfasttree/pkg-fun.nix} | 0 .../ve/vexctl/pkg-fun.nix} | 0 .../vg/vgmplay-libvgm/pkg-fun.nix} | 0 .../vg/vgmstream/pkg-fun.nix} | 0 .../audio => unit/vg}/vgmstream/update.sh | 0 .../vg/vgmtools/pkg-fun.nix} | 0 .../default.nix => unit/vg/vgrep/pkg-fun.nix} | 0 .../vh/vhd2vl/pkg-fun.nix} | 0 .../default.nix => unit/vh/vhs/pkg-fun.nix} | 0 .../vi/ViennaRNA/pkg-fun.nix} | 0 .../default.nix => unit/vi/via/pkg-fun.nix} | 0 .../default.nix => unit/vi/vial/pkg-fun.nix} | 0 .../default.nix => unit/vi/viber/pkg-fun.nix} | 0 .../default.nix => unit/vi/vice/pkg-fun.nix} | 0 .../vi/victor-mono/pkg-fun.nix} | 0 .../vi/victoriametrics/pkg-fun.nix} | 0 .../default.nix => unit/vi/viddy/pkg-fun.nix} | 0 .../vi/video-trimmer/pkg-fun.nix} | 0 .../browsers => unit/vi}/vieb/package.json | 0 .../default.nix => unit/vi/vieb/pkg-fun.nix} | 0 .../browsers => unit/vi}/vieb/yarn.lock | 0 .../browsers => unit/vi}/vieb/yarn.nix | 0 .../vi/viewnior/pkg-fun.nix} | 0 .../default.nix => unit/vi/vifm/pkg-fun.nix} | 0 .../vi/viking/pkg-fun.nix} | 0 .../vi/vikunja-api/pkg-fun.nix} | 0 .../vi/vikunja-frontend/pkg-fun.nix} | 0 .../vi/vim-vint/pkg-fun.nix} | 0 .../vi/vimUtils}/build-vim-plugin.nix | 0 .../vi/vimUtils}/neovim-require-check-hook.sh | 0 .../vi/vimUtils/pkg-fun.nix} | 0 .../vi/vimUtils}/vim-command-check-hook.sh | 0 .../vi/vimUtils}/vim-gen-doc-hook.sh | 0 .../vimacs.nix => unit/vi/vimacs/pkg-fun.nix} | 0 .../vi/vimb-unwrapped/pkg-fun.nix} | 0 .../default.nix => unit/vi/vimer/pkg-fun.nix} | 0 pkgs/{games => unit/vi}/vimgolf/Gemfile | 0 pkgs/{games => unit/vi}/vimgolf/Gemfile.lock | 0 pkgs/{games => unit/vi}/vimgolf/gemset.nix | 0 .../vi/vimgolf/pkg-fun.nix} | 0 .../vi/vimiv-qt/pkg-fun.nix} | 0 .../vi/vimix-icon-theme/pkg-fun.nix} | 0 .../default.nix => unit/vi/vimpc/pkg-fun.nix} | 0 .../default.nix => unit/vi/vimv/pkg-fun.nix} | 0 .../vi/vintagestory/pkg-fun.nix} | 0 .../vi/viper4linux/pkg-fun.nix} | 0 .../vi/vipsdisp/pkg-fun.nix} | 0 .../vi/virglrenderer/pkg-fun.nix} | 0 .../vi/virt-top/pkg-fun.nix} | 0 .../vi/virt-viewer/pkg-fun.nix} | 0 .../vi/virt-what/pkg-fun.nix} | 0 .../vi/virtiofsd/pkg-fun.nix} | 0 .../vi/virtscreen/pkg-fun.nix} | 0 .../vi/virtual-ans/pkg-fun.nix} | 0 .../vi/virtualboxExtpack/pkg-fun.nix} | 0 .../vi/virtualpg/pkg-fun.nix} | 0 .../default.nix => unit/vi/vis/pkg-fun.nix} | 0 .../vi/vistafonts-chs}/no-op.conf | 0 .../vi/vistafonts-chs/pkg-fun.nix} | 0 .../vi/vistafonts-cht}/no-op.conf | 0 .../vi/vistafonts-cht/pkg-fun.nix} | 0 .../vi/vistafonts}/no-op.conf | 0 .../vi/vistafonts/pkg-fun.nix} | 0 .../vi/visualvm/pkg-fun.nix} | 0 .../default.nix => unit/vi/vit/pkg-fun.nix} | 0 .../default.nix => unit/vi/vite/pkg-fun.nix} | 0 .../vi/vitess/pkg-fun.nix} | 0 .../vi/vitetris/pkg-fun.nix} | 0 .../default.nix => unit/vi/viu/pkg-fun.nix} | 0 .../vi/vivaldi-ffmpeg-codecs/pkg-fun.nix} | 0 .../vi/vivaldi-widevine/pkg-fun.nix} | 0 .../vi/vivaldi/pkg-fun.nix} | 0 .../default.nix => unit/vi/vivid/pkg-fun.nix} | 0 .../default.nix => unit/vi/viw/pkg-fun.nix} | 0 .../default.nix => unit/vi/vix/pkg-fun.nix} | 0 .../vk/vk-bootstrap/pkg-fun.nix} | 0 .../vk/vk-cli/pkg-fun.nix} | 0 .../vk/vk-messenger/pkg-fun.nix} | 0 .../vk/vkbasalt-cli/pkg-fun.nix} | 0 .../vk/vkdisplayinfo/pkg-fun.nix} | 0 .../default.nix => unit/vk/vkdt/pkg-fun.nix} | 0 .../vk/vkeybd/pkg-fun.nix} | 0 .../vk/vkmark/pkg-fun.nix} | 0 .../default.nix => unit/vl/vlan/pkg-fun.nix} | 0 .../default.nix => unit/vl/vlang/pkg-fun.nix} | 0 .../vl}/vlock/eintr.patch | 0 .../default.nix => unit/vl/vlock/pkg-fun.nix} | 0 .../vm/vmagent/pkg-fun.nix} | 0 .../vm/vmfs-tools/pkg-fun.nix} | 0 .../default.nix => unit/vm/vmime/pkg-fun.nix} | 0 .../vm/vms-empire/pkg-fun.nix} | 0 .../vm/vmtouch/pkg-fun.nix} | 0 .../vm/vmware-horizon-client/pkg-fun.nix} | 0 .../vm}/vmware-horizon-client/update.sh | 0 .../vm/vmware-workstation/pkg-fun.nix} | 0 .../vm}/vmware-workstation/vmware-bootstrap | 0 .../vm}/vmware-workstation/vmware-config | 0 .../vmware-installer-bootstrap | 0 .../vm}/vmware-workstation/vmware-modconfig | 0 .../vn/vncrec/pkg-fun.nix} | 0 .../default.nix => unit/vn/vndr/pkg-fun.nix} | 0 .../vn/vnstat/pkg-fun.nix} | 0 .../vo/vo-aacenc/pkg-fun.nix} | 0 .../vo/vo-amrwbenc/pkg-fun.nix} | 0 .../vo/vobcopy/pkg-fun.nix} | 0 .../vo/vobsub2srt/pkg-fun.nix} | 0 .../default.nix => unit/vo/vocal/pkg-fun.nix} | 0 .../vo/vocproc/pkg-fun.nix} | 0 .../default.nix => unit/vo/void/pkg-fun.nix} | 0 .../vo/volatility/pkg-fun.nix} | 0 .../vo/volatility3/pkg-fun.nix} | 0 .../vo/volctl/pkg-fun.nix} | 0 .../default.nix => unit/vo/volk/pkg-fun.nix} | 0 .../vo/vollkorn/pkg-fun.nix} | 0 .../vo/volnoti/pkg-fun.nix} | 0 .../vo/volume_key/pkg-fun.nix} | 0 .../vo/volumeicon/pkg-fun.nix} | 0 .../default.nix => unit/vo/voms/pkg-fun.nix} | 0 .../vo/vopono/pkg-fun.nix} | 0 .../vo/vorbisgain/pkg-fun.nix} | 0 .../vo/vouch-proxy/pkg-fun.nix} | 0 .../vo/vowpal-wabbit/pkg-fun.nix} | 0 .../default.nix => unit/vp/vpcs/pkg-fun.nix} | 0 .../vp/vpnc-scripts/pkg-fun.nix} | 0 .../default.nix => unit/vp/vpnc/pkg-fun.nix} | 0 .../vp}/vpsfree-client/Gemfile | 0 .../vp}/vpsfree-client/Gemfile.lock | 0 .../vp}/vpsfree-client/gemset.nix | 0 .../vp/vpsfree-client/pkg-fun.nix} | 0 .../default.nix => unit/vr/vrb/pkg-fun.nix} | 0 .../vr}/vrb/removed_options.patch | 0 .../vr}/vrb/unused-but-set-variable.patch | 0 .../default.nix => unit/vr/vrpn/pkg-fun.nix} | 0 .../default.nix => unit/vs/vsce/pkg-fun.nix} | 0 .../vs/vscode-with-extensions/pkg-fun.nix} | 0 .../vs}/vsftpd/CVE-2015-1419.patch | 0 .../vs/vsftpd/pkg-fun.nix} | 0 .../default.nix => unit/vs/vsh/pkg-fun.nix} | 0 .../default.nix => unit/vs/vsmtp/pkg-fun.nix} | 0 .../vs/vsqlite/pkg-fun.nix} | 0 .../vt/vt-cli/pkg-fun.nix} | 0 .../vt/vtable-dumper/pkg-fun.nix} | 0 .../default.nix => unit/vt/vtm/pkg-fun.nix} | 0 .../vt/vttest/pkg-fun.nix} | 0 .../default.nix => unit/vu/vue/pkg-fun.nix} | 0 .../default.nix => unit/vu/vul/pkg-fun.nix} | 0 .../vu/vulkan-cts/pkg-fun.nix} | 0 .../vu/vulkan-extension-layer/pkg-fun.nix} | 0 .../vu/vulkan-headers/pkg-fun.nix} | 0 .../vu}/vulkan-tools-lunarg/gtest.patch | 0 .../vu/vulkan-tools-lunarg/pkg-fun.nix} | 0 .../vu/vulkan-validation-layers/pkg-fun.nix} | 0 .../robin-hood-hashing.nix | 0 .../vu/vulnix/pkg-fun.nix} | 0 .../vu/vultr-cli/pkg-fun.nix} | 0 .../default.nix => unit/vu/vultr/pkg-fun.nix} | 0 .../default.nix => unit/vw/vwm/pkg-fun.nix} | 0 .../default.nix => unit/vx/vxl/pkg-fun.nix} | 0 .../w3}/w3m/RAND_egd.libressl.patch | 0 .../default.nix => unit/w3/w3m/pkg-fun.nix} | 0 .../w_/w_scan/pkg-fun.nix} | 0 .../wa/waagent/pkg-fun.nix} | 0 .../default.nix => unit/wa/wabt/pkg-fun.nix} | 0 .../default.nix => unit/wa/wad/pkg-fun.nix} | 0 .../wa/waf-tester/pkg-fun.nix} | 0 .../default.nix => unit/wa/waf/pkg-fun.nix} | 0 .../wa/wafHook/pkg-fun.nix} | 0 .../wa}/wafHook/setup-hook.sh | 0 .../wa/waffle/pkg-fun.nix} | 0 .../wa/wafw00f/pkg-fun.nix} | 0 .../default.nix => unit/wa/wails/pkg-fun.nix} | 0 .../wa/waitron/pkg-fun.nix} | 0 .../wa}/waitron/staticfiles-directory.patch | 0 .../wa/wakelan/pkg-fun.nix} | 0 .../wa/wakeonlan/pkg-fun.nix} | 0 .../default.nix => unit/wa/wal-g/pkg-fun.nix} | 0 .../default.nix => unit/wa/wal_e/pkg-fun.nix} | 0 .../wa/wallabag/pkg-fun.nix} | 0 .../wa}/wallabag/wallabag-data.patch | 0 ...paths-to-DefaultWallpaperDirectories.patch | 0 .../wa/wallutils/pkg-fun.nix} | 0 .../wa/wally-cli/pkg-fun.nix} | 0 .../wa/wander/pkg-fun.nix} | 0 .../default.nix => unit/wa/waon/pkg-fun.nix} | 0 .../wa/wapiti/pkg-fun.nix} | 0 .../wa/wargus/pkg-fun.nix} | 0 pkgs/{games => unit/wa}/wargus/stratagus.nix | 0 .../wa/warmux/pkg-fun.nix} | 0 .../default.nix => unit/wa/warp/pkg-fun.nix} | 0 .../default.nix => unit/wa/warpd/pkg-fun.nix} | 0 .../wa/warsow-engine}/libpath.patch | 0 .../wa/warsow-engine/pkg-fun.nix} | 0 .../wa/warsow/pkg-fun.nix} | 0 .../wa/warzone2100/pkg-fun.nix} | 0 .../wa}/wasabibackend/deps.nix | 0 .../wa/wasabibackend/pkg-fun.nix} | 0 .../wa/wasabiwallet/pkg-fun.nix} | 0 .../default.nix => unit/wa/wasm3/pkg-fun.nix} | 0 .../wa/wasmtime/pkg-fun.nix} | 0 .../tools => unit/wa}/wasynth/Cargo.lock | 0 .../wa/wasynth/pkg-fun.nix} | 0 .../wa/watchlog/pkg-fun.nix} | 0 .../wa/watchmate/pkg-fun.nix} | 0 .../misc => unit/wa}/watson-ruby/Gemfile | 0 .../misc => unit/wa}/watson-ruby/Gemfile.lock | 0 .../misc => unit/wa}/watson-ruby/gemset.nix | 0 .../wa/watson-ruby/pkg-fun.nix} | 0 .../wa/watson/pkg-fun.nix} | 0 .../wa/wavebox/pkg-fun.nix} | 0 .../wa/wavefunctioncollapse/pkg-fun.nix} | 0 .../wa/wavegain/pkg-fun.nix} | 0 .../wa/wavemon/pkg-fun.nix} | 0 .../wa/wavpack/pkg-fun.nix} | 0 .../wa/wavrsocvt/pkg-fun.nix} | 0 .../wa/way-displays/pkg-fun.nix} | 0 .../wa/wayback-machine-archiver/pkg-fun.nix} | 0 .../wa}/wayback_machine_downloader/Gemfile | 0 .../wayback_machine_downloader/Gemfile.lock | 0 .../wa}/wayback_machine_downloader/gemset.nix | 0 .../wayback_machine_downloader/pkg-fun.nix} | 0 .../wa/waybar/pkg-fun.nix} | 0 .../wa/waydroid/pkg-fun.nix} | 0 .../wa/wayland-protocols/pkg-fun.nix} | 0 .../wa/wayland-proxy-virtwl/pkg-fun.nix} | 0 .../wa/wayland-utils/pkg-fun.nix} | 0 .../wa/wayland/pkg-fun.nix} | 0 .../wa/waylevel/pkg-fun.nix} | 0 .../wa/waylock/pkg-fun.nix} | 0 .../wa/waynergy/pkg-fun.nix} | 0 .../wa/wayout/pkg-fun.nix} | 0 .../wa/waypipe/pkg-fun.nix} | 0 .../wa/waypoint/pkg-fun.nix} | 0 .../wa/wayshot/pkg-fun.nix} | 0 .../default.nix => unit/wa/wayst/pkg-fun.nix} | 0 .../wa}/wayst/utf8proc.patch | 0 .../default.nix => unit/wa/wayv/pkg-fun.nix} | 0 .../wa/wayvnc/pkg-fun.nix} | 0 .../default.nix => unit/wb/wbg/pkg-fun.nix} | 0 .../default.nix => unit/wb/wbox/pkg-fun.nix} | 0 .../default.nix => unit/wc/wcalc/pkg-fun.nix} | 0 .../default.nix => unit/wc/wcc/pkg-fun.nix} | 0 .../default.nix => unit/wc/wcpg/pkg-fun.nix} | 0 .../wc/wcslib/pkg-fun.nix} | 0 .../default.nix => unit/wd/wdfs/pkg-fun.nix} | 0 .../default.nix => unit/wd/wdiff/pkg-fun.nix} | 0 .../wd/wdisplays/pkg-fun.nix} | 0 .../wd/wdomirror/pkg-fun.nix} | 0 .../default.nix => unit/wd/wdt/pkg-fun.nix} | 0 .../we/weather-icons/pkg-fun.nix} | 0 .../we/weather/pkg-fun.nix} | 0 .../we/webalizer/pkg-fun.nix} | 0 .../we/webanalyze/pkg-fun.nix} | 0 .../we/webcat/pkg-fun.nix} | 0 .../we/webdav-server-rs/pkg-fun.nix} | 0 .../we/webdav/pkg-fun.nix} | 0 .../we/webdis/pkg-fun.nix} | 0 .../default.nix => unit/we/webex/pkg-fun.nix} | 0 .../http => unit/we}/webfs/ls.c.patch | 0 .../default.nix => unit/we/webfs/pkg-fun.nix} | 0 .../we/webhook/pkg-fun.nix} | 0 .../we/webkit2-sharp/pkg-fun.nix} | 0 .../we/webmetro/pkg-fun.nix} | 0 .../we/webp-pixbuf-loader/pkg-fun.nix} | 0 .../enable-powerpc.patch | 0 .../enable-riscv.patch | 0 .../webrtc-audio-processing_0_3/pkg-fun.nix} | 0 .../we/websocketd/pkg-fun.nix} | 0 .../we/websocketpp/pkg-fun.nix} | 0 .../we/webtorrent_desktop/pkg-fun.nix} | 0 .../we/webwormhole/pkg-fun.nix} | 0 .../default.nix => unit/we/wego/pkg-fun.nix} | 0 .../default.nix => unit/we/weidu/pkg-fun.nix} | 0 .../we/welkin/pkg-fun.nix} | 0 .../default.nix => unit/we/wemux/pkg-fun.nix} | 0 .../default.nix => unit/we/werf/pkg-fun.nix} | 0 .../we/wesher/pkg-fun.nix} | 0 .../we/weston/pkg-fun.nix} | 0 .../default.nix => unit/we/wev/pkg-fun.nix} | 0 .../wf/wf-config/pkg-fun.nix} | 0 .../wf/wf-recorder/pkg-fun.nix} | 0 .../wg/wg-bond/pkg-fun.nix} | 0 .../wg/wg-friendly-peer-names/pkg-fun.nix} | 0 .../default.nix => unit/wg/wgcf/pkg-fun.nix} | 0 .../default.nix => unit/wg/wget/pkg-fun.nix} | 0 ...emove-runtime-dep-on-openssl-headers.patch | 0 .../wg/wgetpaste/pkg-fun.nix} | 0 .../wh/whatip/pkg-fun.nix} | 0 .../wh/whatsapp-for-linux/pkg-fun.nix} | 0 .../security => unit/wh}/whatweb/Gemfile | 0 .../security => unit/wh}/whatweb/Gemfile.lock | 0 .../security => unit/wh}/whatweb/gemset.nix | 0 .../wh/whatweb/pkg-fun.nix} | 0 .../default.nix => unit/wh/which/pkg-fun.nix} | 0 .../wh/whipper/pkg-fun.nix} | 0 .../wh/whisper/pkg-fun.nix} | 0 .../wh/whitesur-icon-theme/pkg-fun.nix} | 0 .../default.nix => unit/wh/whois/pkg-fun.nix} | 0 .../wh/whsniff/pkg-fun.nix} | 0 .../default.nix => unit/wh/why3/pkg-fun.nix} | 0 .../logic => unit/wh}/why3/with-provers.nix | 0 .../wi/widelands/pkg-fun.nix} | 0 .../wi/widevine-cdm/pkg-fun.nix} | 0 .../wi/wifi-password/pkg-fun.nix} | 0 .../wi/wifish/pkg-fun.nix} | 0 .../wi/wifite2/pkg-fun.nix} | 0 .../wi/wiggle/pkg-fun.nix} | 0 .../wi/wiiload/pkg-fun.nix} | 0 .../wi}/wiimms-iso-tools/fix-paths.diff | 0 .../wi/wiimms-iso-tools/pkg-fun.nix} | 0 .../default.nix => unit/wi/wike/pkg-fun.nix} | 0 .../wi/wiki-js/pkg-fun.nix} | 0 .../web-apps => unit/wi}/wiki-js/update.sh | 0 .../wi/wildmidi/pkg-fun.nix} | 0 .../default.nix => unit/wi/wily/pkg-fun.nix} | 0 .../wi/wimboot/pkg-fun.nix} | 0 .../wi/wimlib/pkg-fun.nix} | 0 .../wi/win-pvdrivers/pkg-fun.nix} | 0 .../wi/win-qemu/pkg-fun.nix} | 0 .../wi/win-signed-gplpv-drivers/pkg-fun.nix} | 0 .../wi/win-spice/pkg-fun.nix} | 0 .../wi/win-virtio/pkg-fun.nix} | 0 .../wi/windowchef/pkg-fun.nix} | 0 .../wi/windowlab/pkg-fun.nix} | 0 .../wi/windowmaker/pkg-fun.nix} | 0 .../wi/wineasio/pkg-fun.nix} | 0 .../fix-libapplication-dir.patch | 0 .../wingpanel-indicator-ayatana/pkg-fun.nix} | 0 .../wi}/wipe/fix-install.patch | 0 .../default.nix => unit/wi/wipe/pkg-fun.nix} | 0 .../wi/wipefreespace/pkg-fun.nix} | 0 .../wi/wire-desktop/pkg-fun.nix} | 0 .../default.nix => unit/wi/wire/pkg-fun.nix} | 0 .../wi/wiredtiger/pkg-fun.nix} | 0 .../wi/wireguard-go/pkg-fun.nix} | 0 .../wi/wireguard-tools/pkg-fun.nix} | 0 .../wi}/wireguard-tools/update.sh | 0 .../wi/wireless-regdb/pkg-fun.nix} | 0 .../wi/wirelesstools/pkg-fun.nix} | 0 .../wi/wiremock/pkg-fun.nix} | 0 .../wi/wireplumber/pkg-fun.nix} | 0 .../wi/wireproxy/pkg-fun.nix} | 0 .../wi/wiringpi/pkg-fun.nix} | 0 .../wi/wishbone-tool/pkg-fun.nix} | 0 .../wi/wishlist/pkg-fun.nix} | 0 .../wi/with-shell/pkg-fun.nix} | 0 .../wi/witness/pkg-fun.nix} | 0 .../wl/wl-clipboard-x11/pkg-fun.nix} | 0 .../wl/wl-clipboard/pkg-fun.nix} | 0 .../wl/wl-color-picker/pkg-fun.nix} | 0 .../wl/wl-gammactl/pkg-fun.nix} | 0 .../wl/wl-mirror/pkg-fun.nix} | 0 .../wl/wla-dx/pkg-fun.nix} | 0 .../default.nix => unit/wl/wlc/pkg-fun.nix} | 0 .../wl/wlclock/pkg-fun.nix} | 0 .../default.nix => unit/wl/wlcs/pkg-fun.nix} | 0 .../default.nix => unit/wl/wllvm/pkg-fun.nix} | 0 .../wl/wlogout/pkg-fun.nix} | 0 .../default.nix => unit/wl/wlopm/pkg-fun.nix} | 0 .../wl/wlprop/pkg-fun.nix} | 0 .../wl/wlr-protocols/pkg-fun.nix} | 0 .../wl/wlr-randr/pkg-fun.nix} | 0 .../wl/wlrctl/pkg-fun.nix} | 0 .../wl/wlsunset/pkg-fun.nix} | 0 .../default.nix => unit/wl/wluma/pkg-fun.nix} | 0 .../X11 => unit/wm}/wmctrl/64-bit-data.patch | 0 .../wm/wmctrl/pkg-fun.nix} | 0 .../wm}/wmderland/0001-remove-flto.patch | 0 .../wm/wmderland/pkg-fun.nix} | 0 .../wm/wmderlandc/pkg-fun.nix} | 0 .../wm/wmfocus/pkg-fun.nix} | 0 .../default.nix => unit/wm/wmfs/pkg-fun.nix} | 0 .../wm/wmic-bin/pkg-fun.nix} | 0 .../default.nix => unit/wm/wmii/pkg-fun.nix} | 0 .../web => unit/wm}/wml/dynaloader.patch | 0 .../web => unit/wm}/wml/no_bitvector.patch | 0 .../default.nix => unit/wm/wml/pkg-fun.nix} | 0 .../web => unit/wm}/wml/redhat-with-thr.patch | 0 .../wm/wmname/pkg-fun.nix} | 0 .../wm/wmutils-core/pkg-fun.nix} | 0 .../wm/wmutils-libwm/pkg-fun.nix} | 0 .../wm/wmutils-opt/pkg-fun.nix} | 0 .../default.nix => unit/wo/wob/pkg-fun.nix} | 0 .../wo/woeusb-ng/pkg-fun.nix} | 0 .../wo/woeusb/pkg-fun.nix} | 0 .../web => unit/wo}/woff2/brotli-static.patch | 0 .../default.nix => unit/wo/woff2/pkg-fun.nix} | 0 .../wo/wofi-emoji/pkg-fun.nix} | 0 .../wo}/wofi/do_not_follow_symlinks.patch | 0 .../default.nix => unit/wo/wofi/pkg-fun.nix} | 0 .../default.nix => unit/wo/wol/pkg-fun.nix} | 0 .../wo/wolf-shaper/pkg-fun.nix} | 0 .../wo/wolfebin/pkg-fun.nix} | 0 .../wo/wolfram-for-jupyter-kernel}/kernel.nix | 0 .../wolfram-for-jupyter-kernel/pkg-fun.nix} | 0 .../wo/wolfram-notebook/pkg-fun.nix} | 0 .../default.nix => unit/wo/woof/pkg-fun.nix} | 0 .../wo/wootility/pkg-fun.nix} | 0 .../wo/wooting-udev-rules/pkg-fun.nix} | 0 .../wo}/wooting-udev-rules/wooting.rules | 0 .../wo/wordbook/pkg-fun.nix} | 0 .../wo/wordgrinder/pkg-fun.nix} | 0 .../wo/work-sans/pkg-fun.nix} | 0 .../wo/workcraft/pkg-fun.nix} | 0 .../wo/worker/pkg-fun.nix} | 0 .../wo/workstyle/pkg-fun.nix} | 0 .../wo/worldofgoo/pkg-fun.nix} | 0 .../wo/wormhole-william/pkg-fun.nix} | 0 .../wp/wp-cli/pkg-fun.nix} | 0 .../wp/wp4nix/pkg-fun.nix} | 0 ...1-Implement-read-only-mode-for-ssids.patch | 0 ...que-IDs-for-networks-and-credentials.patch | 0 .../wp/wpa_supplicant/pkg-fun.nix} | 0 .../wp/wpaperd/pkg-fun.nix} | 0 .../default.nix => unit/wp/wpgtk/pkg-fun.nix} | 0 .../wp/wprecon/pkg-fun.nix} | 0 .../security => unit/wp}/wpscan/Gemfile | 0 .../security => unit/wp}/wpscan/Gemfile.lock | 0 .../security => unit/wp}/wpscan/gemset.nix | 0 .../wp/wpscan/pkg-fun.nix} | 0 .../security => unit/wp}/wpscan/update.sh | 0 .../wq/wqy_microhei/pkg-fun.nix} | 0 .../wq/wqy_zenhei/pkg-fun.nix} | 0 .../default.nix => unit/wr/wrap/pkg-fun.nix} | 0 .../wr/wrapFirefox/pkg-fun.nix} | 0 .../wr/wrapFish/pkg-fun.nix} | 0 .../wr/wrapHelm/pkg-fun.nix} | 0 .../wr/wrapMpv/pkg-fun.nix} | 0 .../wr/wrapNeovimUnstable/pkg-fun.nix} | 0 .../wr/wrapNeovimUnstable}/tests/default.nix | 0 .../tests/init-override.vim | 0 .../tests/init-single-lines.vim | 0 .../wr/wrapOBS/pkg-fun.nix} | 0 .../wr/wrapQemuBinfmtP}/binfmt-p-wrapper.c | 0 .../wr/wrapQemuBinfmtP/pkg-fun.nix} | 0 .../wr/wrapThunderbird/pkg-fun.nix} | 0 .../wr/wrapVdr/pkg-fun.nix} | 0 .../wr/wrapWatcom/pkg-fun.nix} | 0 .../wr/wrapWeechat/pkg-fun.nix} | 0 .../wr/writeCueValidator/pkg-fun.nix} | 0 .../wr/writeDarwinBundle/pkg-fun.nix} | 0 .../wr/writedisk/pkg-fun.nix} | 0 .../wr/writefreely/pkg-fun.nix} | 0 .../wr}/writers/aliases.nix | 0 .../wr/writers/pkg-fun.nix} | 0 .../default.nix => unit/wr/wrk/pkg-fun.nix} | 0 .../default.nix => unit/wr/wrk2/pkg-fun.nix} | 0 .../ws}/wsdd/increase_timeout.patch | 0 .../default.nix => unit/ws/wsdd/pkg-fun.nix} | 0 .../ws/wshowkeys/pkg-fun.nix} | 0 .../ws/wsl-open/pkg-fun.nix} | 0 .../default.nix => unit/ws/wslu/pkg-fun.nix} | 0 .../ws/wsmancli/pkg-fun.nix} | 0 .../ws}/wsysmon/dependencies.patch | 0 .../system => unit/ws}/wsysmon/install.patch | 0 .../ws/wsysmon/pkg-fun.nix} | 0 .../default.nix => unit/wt/wtf/pkg-fun.nix} | 0 .../libraries => unit/wt}/wtk/builder.sh | 0 .../default.nix => unit/wt/wtk/pkg-fun.nix} | 0 .../wt/wtwitch/pkg-fun.nix} | 0 .../default.nix => unit/wt/wtype/pkg-fun.nix} | 0 .../default.nix => unit/wu/wuzz/pkg-fun.nix} | 0 .../wv/default.nix => unit/wv/wv/pkg-fun.nix} | 0 .../misc => unit/wv}/wv2/fix-include.patch | 0 .../default.nix => unit/wv/wv2/pkg-fun.nix} | 0 .../default.nix => unit/wv/wvkbd/pkg-fun.nix} | 0 .../default.nix => unit/ww/wwcd/pkg-fun.nix} | 0 .../wy/wyvern/pkg-fun.nix} | 0 .../x-/x-create-mouse-void/pkg-fun.nix} | 0 .../x1/x11_ssh_askpass/pkg-fun.nix} | 0 .../x1/x11docker/pkg-fun.nix} | 0 .../x1/x11idle/pkg-fun.nix} | 0 .../x1/x11spice/pkg-fun.nix} | 0 .../x1/x11vnc/pkg-fun.nix} | 0 .../x1/x16-emulator/pkg-fun.nix} | 0 .../rom.nix => unit/x1/x16-rom/pkg-fun.nix} | 0 .../x2}/x264/disable-arm-neon-default.patch | 0 .../default.nix => unit/x2/x264/pkg-fun.nix} | 0 .../x2}/x265/fix-neon-detection.patch | 0 .../default.nix => unit/x2/x265/pkg-fun.nix} | 0 .../x2/x2goserver/pkg-fun.nix} | 0 .../default.nix => unit/x2/x2vnc/pkg-fun.nix} | 0 .../default.nix => unit/x2/x2x/pkg-fun.nix} | 0 .../default.nix => unit/x3/x3270/pkg-fun.nix} | 0 .../x4/x42-avldrums/pkg-fun.nix} | 0 .../x4/x42-gmsynth/pkg-fun.nix} | 0 .../x4/x42-plugins/pkg-fun.nix} | 0 .../x8/x86info/pkg-fun.nix} | 0 .../default.nix => unit/xa/Xaw3d/pkg-fun.nix} | 0 .../xa/xa.nix => unit/xa/xa/pkg-fun.nix} | 0 .../xa/xalanc/pkg-fun.nix} | 0 .../xa/xandikos/pkg-fun.nix} | 0 .../xa/xannotate/pkg-fun.nix} | 0 ...dd-useless-descriptions-to-AC_DEFINE.patch | 0 .../xar/0002-Use-pkg-config-for-libxml2.patch | 0 .../default.nix => unit/xa/xar/pkg-fun.nix} | 0 .../xa/xarchive/pkg-fun.nix} | 0 .../xa/xarchiver/pkg-fun.nix} | 0 .../xa/xautoclick/pkg-fun.nix} | 0 .../xa/xautolock/pkg-fun.nix} | 0 .../xa/xautomation/pkg-fun.nix} | 0 .../default.nix => unit/xa/xavs/pkg-fun.nix} | 0 .../xawtv/0001-Fix-build-for-glibc-2.32.patch | 0 .../default.nix => unit/xa/xawtv/pkg-fun.nix} | 0 .../xb/xbanish/pkg-fun.nix} | 0 .../default.nix => unit/xb/xbase/pkg-fun.nix} | 0 .../xb}/xbase/xbase-fixes.patch | 0 .../xb/xbattbar/pkg-fun.nix} | 0 .../xb}/xbattbar/sys-by-default.patch | 0 .../default.nix => unit/xb/xbill/pkg-fun.nix} | 0 .../xb/xbindkeys/pkg-fun.nix} | 0 .../xb/xboard/pkg-fun.nix} | 0 .../default.nix => unit/xb/xbomb/pkg-fun.nix} | 0 .../xb}/xboxdrv/fix-60-sec-delay.patch | 0 .../xb/xboxdrv/pkg-fun.nix} | 0 .../xb}/xboxdrv/scons-py3.patch | 0 .../xb}/xboxdrv/scons-v4.2.0.patch | 0 .../xb}/xboxdrv/xboxdrvctl-py3.patch | 0 .../xb/xbrightness/pkg-fun.nix} | 0 .../xc/xcaddy/pkg-fun.nix} | 0 .../xc}/xcaddy/use_tmpdir_on_darwin.diff | 0 .../xc/xcalib/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcape/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcat/pkg-fun.nix} | 0 .../xc/xcb-imdkit/pkg-fun.nix} | 0 .../m4/ax_compare_version.m4 | 0 .../m4/xcb_util_common.m4 | 0 .../m4/xcb_util_m4_with_include_path.m4 | 0 .../xc/xcb-util-cursor-HEAD/pkg-fun.nix} | 0 .../xc/xcbutilxrm/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcd/pkg-fun.nix} | 0 .../xc/xcftools/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcfun/pkg-fun.nix} | 0 .../xc/xchainkeys/pkg-fun.nix} | 0 .../default.nix => unit/xc/xchm/pkg-fun.nix} | 0 .../xc/xcircuit/pkg-fun.nix} | 0 .../default.nix => unit/xc/xclip/pkg-fun.nix} | 0 .../tools => unit/xc}/xcode-install/Gemfile | 0 .../xc}/xcode-install/Gemfile.lock | 0 .../xc}/xcode-install/gemset.nix | 0 .../xc/xcode-install/pkg-fun.nix} | 0 .../xc/xcolor/pkg-fun.nix} | 0 .../xc/xcowsay/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcp/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcpc/pkg-fun.nix} | 0 .../tools => unit/xc}/xcpretty/Gemfile | 0 .../tools => unit/xc}/xcpretty/Gemfile.lock | 0 .../tools => unit/xc}/xcpretty/gemset.nix | 0 .../xc/xcpretty/pkg-fun.nix} | 0 .../xc/xcruiser/pkg-fun.nix} | 0 .../xc/xcur2png/pkg-fun.nix} | 0 .../default.nix => unit/xc/xcwd/pkg-fun.nix} | 0 .../xd/default.nix => unit/xd/xd/pkg-fun.nix} | 0 .../xd/xdaliclock/pkg-fun.nix} | 0 .../xd/xdelta/pkg-fun.nix} | 0 .../xd/xdeltaUnstable/pkg-fun.nix} | 0 .../xd/xdg-dbus-proxy/pkg-fun.nix} | 0 .../xd/xdg-desktop-portal-gnome/pkg-fun.nix} | 0 .../xd/xdg-desktop-portal-gtk/pkg-fun.nix} | 0 .../xd/xdg-desktop-portal-wlr/pkg-fun.nix} | 0 .../xd/xdg-launch/pkg-fun.nix} | 0 .../xd/xdg-ninja/pkg-fun.nix} | 0 .../xd/xdg-user-dirs/pkg-fun.nix} | 0 .../xd/xdgmenumaker/pkg-fun.nix} | 0 .../default.nix => unit/xd/xdo/pkg-fun.nix} | 0 .../xd/xdotool/pkg-fun.nix} | 0 .../xd/xdummy/pkg-fun.nix} | 0 .../xd/xdxf2slob/pkg-fun.nix} | 0 .../xe/xe-guest-utilities/pkg-fun.nix} | 0 .../xe/default.nix => unit/xe/xe/pkg-fun.nix} | 0 .../xe/xearth/pkg-fun.nix} | 0 .../default.nix => unit/xe/xed/pkg-fun.nix} | 0 .../default.nix => unit/xe/xedit/pkg-fun.nix} | 0 .../xe/xenomapper/pkg-fun.nix} | 0 .../xe/xercesc/pkg-fun.nix} | 0 .../xf/xf86_input_cmt/pkg-fun.nix} | 0 .../xf/xf86_input_wacom/pkg-fun.nix} | 0 .../xf/xf86_video_nested/pkg-fun.nix} | 0 .../default.nix => unit/xf/xfig/pkg-fun.nix} | 0 ....f-use-correct-types-in-calls-to-DSY.patch | 0 .../xf/xfitter/pkg-fun.nix} | 0 .../default.nix => unit/xf/xflux/pkg-fun.nix} | 0 .../xf/xfontsel/pkg-fun.nix} | 0 .../xf/xfractint/pkg-fun.nix} | 0 .../xf/xfsdump/pkg-fun.nix} | 0 .../xf/xfsprogs/pkg-fun.nix} | 0 .../xf/xfstests/pkg-fun.nix} | 0 .../xg/xgboost/pkg-fun.nix} | 0 .../xg/xgeometry-select/pkg-fun.nix} | 0 .../xh/xhtml1/pkg-fun.nix} | 0 .../xi/xib2nib/pkg-fun.nix} | 0 .../default.nix => unit/xi/xiccd/pkg-fun.nix} | 0 .../xi/xilinx-bootgen/pkg-fun.nix} | 0 .../xi/xine-lib/pkg-fun.nix} | 0 .../xi/xine-ui/pkg-fun.nix} | 0 .../xi/xinetd/pkg-fun.nix} | 0 .../xi/xinput_calibrator/pkg-fun.nix} | 0 .../xi/xits-math/pkg-fun.nix} | 0 pkgs/{games => unit/xi}/xivlauncher/deps.nix | 0 .../xi/xivlauncher/pkg-fun.nix} | 0 .../xj/xjadeo/pkg-fun.nix} | 0 .../default.nix => unit/xj/xjobs/pkg-fun.nix} | 0 pkgs/{games => unit/xj}/xjump/darwin.patch | 0 .../default.nix => unit/xj/xjump/pkg-fun.nix} | 0 .../xk/xkb-switch-i3/pkg-fun.nix} | 0 .../xk/xkb-switch/pkg-fun.nix} | 0 .../default.nix => unit/xk/xkbd/pkg-fun.nix} | 0 .../xk/xkblayout-state/pkg-fun.nix} | 0 .../xk/xkbmon/pkg-fun.nix} | 0 .../xk/xkbset/pkg-fun.nix} | 0 .../xk/xkbvalidate/pkg-fun.nix} | 0 .../X11 => unit/xk}/xkbvalidate/xkbvalidate.c | 0 .../xk/xkcd-font/pkg-fun.nix} | 0 .../xk}/xkeysnail/browser-emacs-bindings.py | 0 .../xk/xkeysnail/pkg-fun.nix} | 0 .../xl/xl2tpd/pkg-fun.nix} | 0 .../xl/xlayoutdisplay/pkg-fun.nix} | 0 .../default.nix => unit/xl/xlife/pkg-fun.nix} | 0 .../xl/xloadimage/pkg-fun.nix} | 0 .../xl/xlockmore/pkg-fun.nix} | 0 .../default.nix => unit/xl/xlog/pkg-fun.nix} | 0 .../default.nix => unit/xl/xlogo/pkg-fun.nix} | 0 .../xl/xlslib/pkg-fun.nix} | 0 .../xl/xlsxgrep/pkg-fun.nix} | 0 .../xm/xmacro/pkg-fun.nix} | 0 .../default.nix => unit/xm/xmage/pkg-fun.nix} | 0 .../xm/xmagnify/pkg-fun.nix} | 0 .../default.nix => unit/xm/xmcp/pkg-fun.nix} | 0 .../xm/xmedcon/pkg-fun.nix} | 0 .../default.nix => unit/xm/xmenu/pkg-fun.nix} | 0 .../xm}/xmind/java-env-config-fixes.patch | 0 .../default.nix => unit/xm/xmind/pkg-fun.nix} | 0 .../xm/xml-security-c/pkg-fun.nix} | 0 .../xm/xml-tooling-c/pkg-fun.nix} | 0 .../default.nix => unit/xm/xml2/pkg-fun.nix} | 0 .../xm/xmlada/pkg-fun.nix} | 0 .../xm/xmlbeans/pkg-fun.nix} | 0 .../xm/xmlformat/pkg-fun.nix} | 0 .../xm/xmlindent/pkg-fun.nix} | 0 .../xm/xmloscopy/pkg-fun.nix} | 0 .../xm/xmlroff/pkg-fun.nix} | 0 .../xm/xmlrpc_c/pkg-fun.nix} | 0 .../xm}/xmlsec/lt_dladdsearchdir.patch | 0 .../xm/xmlsec/pkg-fun.nix} | 0 .../remove_bsd_base64_decode_flag.patch | 0 .../xm/xmlstarlet/pkg-fun.nix} | 0 .../misc => unit/xm}/xmonad-log/deps.nix | 0 .../xm/xmonad-log/pkg-fun.nix} | 0 .../default.nix => unit/xm/xmoto/pkg-fun.nix} | 0 .../xm/xmountains/pkg-fun.nix} | 0 .../xm/xmousepasteblock/pkg-fun.nix} | 0 .../default.nix => unit/xm/xmp/pkg-fun.nix} | 0 .../default.nix => unit/xm/xmppc/pkg-fun.nix} | 0 .../xm/xmr-stak/pkg-fun.nix} | 0 .../xm/xmrig-mo/pkg-fun.nix} | 0 .../xm/xmrig-proxy/pkg-fun.nix} | 0 .../misc => unit/xm}/xmrig/donate-level.patch | 0 .../default.nix => unit/xm/xmrig/pkg-fun.nix} | 0 .../xnbd/0001-Fix-build-for-glibc-2.28.patch | 0 .../default.nix => unit/xn/xnbd/pkg-fun.nix} | 0 .../xn/xnec2c/pkg-fun.nix} | 0 .../default.nix => unit/xn/xnee/pkg-fun.nix} | 0 .../default.nix => unit/xn/xneur/pkg-fun.nix} | 0 .../xn/xnotify/pkg-fun.nix} | 0 .../default.nix => unit/xo/xob/pkg-fun.nix} | 0 .../default.nix => unit/xo/xonsh/pkg-fun.nix} | 0 .../default.nix => unit/xo/xorex/pkg-fun.nix} | 0 .../xo/xorg-autoconf/pkg-fun.nix} | 0 .../xo/xorg-rgb/pkg-fun.nix} | 0 .../xo/xorg_sys_opengl}/builder.sh | 0 .../xo/xorg_sys_opengl/pkg-fun.nix} | 0 .../xo/xorriso/pkg-fun.nix} | 0 .../xo/xoscope/pkg-fun.nix} | 0 .../default.nix => unit/xo/xosd/pkg-fun.nix} | 0 .../xo/xosview/pkg-fun.nix} | 0 .../xo/xosview2/pkg-fun.nix} | 0 .../xo/xow_dongle-firmware/pkg-fun.nix} | 0 .../default.nix => unit/xp/xpad/pkg-fun.nix} | 0 .../xp/xpaste/pkg-fun.nix} | 0 .../xp/xpilot-ng/pkg-fun.nix} | 0 .../xp/xplanet/pkg-fun.nix} | 0 .../default.nix => unit/xp/xplr/pkg-fun.nix} | 0 .../xp/xplugd/pkg-fun.nix} | 0 .../xp/xpointerbarrier/pkg-fun.nix} | 0 .../xp/xprintidle-ng/pkg-fun.nix} | 0 .../xp/xprintidle/pkg-fun.nix} | 0 .../xp/xprompt/pkg-fun.nix} | 0 .../default.nix => unit/xp/xpwn/pkg-fun.nix} | 0 .../xq/default.nix => unit/xq/xq/pkg-fun.nix} | 0 pkgs/{servers/x11 => unit/xq}/xquartz/X11 | 0 .../x11 => unit/xq}/xquartz/font_cache | 0 .../org.nixos.xquartz.privileged_startx.plist | 0 .../xquartz/org.nixos.xquartz.startx.plist | 0 .../x11 => unit/xq}/xquartz/patch_plist.rb | 0 .../xq/xquartz/pkg-fun.nix} | 0 .../x11 => unit/xq}/xquartz/privileged | 0 pkgs/{servers/x11 => unit/xq}/xquartz/startx | 0 .../x11 => unit/xq}/xquartz/system-fonts.nix | 0 pkgs/{servers/x11 => unit/xq}/xquartz/xinitrc | 0 .../xr/xrandr-invert-colors/pkg-fun.nix} | 0 .../default.nix => unit/xr/xray/pkg-fun.nix} | 0 .../xr}/xrdp/dynamic_config.patch | 0 .../default.nix => unit/xr/xrdp/pkg-fun.nix} | 0 .../xr/xrectsel/pkg-fun.nix} | 0 .../xr/xrestop/pkg-fun.nix} | 0 .../xr/xrgears/pkg-fun.nix} | 0 .../xr/xrootd/pkg-fun.nix} | 0 .../xr}/xrootd/test-runner.nix | 0 .../default.nix => unit/xr/xrq/pkg-fun.nix} | 0 .../xs/xscast/pkg-fun.nix} | 0 .../xs/xschem/pkg-fun.nix} | 0 .../xs/xscope/pkg-fun.nix} | 0 .../xs/xscreensaver/pkg-fun.nix} | 0 .../xs/xsecurelock/pkg-fun.nix} | 0 .../default.nix => unit/xs/xsel/pkg-fun.nix} | 0 .../xs/xsensors/pkg-fun.nix} | 0 .../xsensors/remove-unused-variables.patch | 0 .../xs}/xsensors/replace-deprecated-gtk.patch | 0 .../xs/xsettingsd/pkg-fun.nix} | 0 .../default.nix => unit/xs/xsimd/pkg-fun.nix} | 0 .../default.nix => unit/xs/xskat/pkg-fun.nix} | 0 .../default.nix => unit/xs/xsnow/pkg-fun.nix} | 0 .../default.nix => unit/xs/xsok/pkg-fun.nix} | 0 .../xs/xsokoban/pkg-fun.nix} | 0 .../default.nix => unit/xs/xsos/pkg-fun.nix} | 0 .../default.nix => unit/xs/xspim/pkg-fun.nix} | 0 .../xs/xss-lock/pkg-fun.nix} | 0 .../xs/xssproxy/pkg-fun.nix} | 0 .../st/xst.nix => unit/xs/xst/pkg-fun.nix} | 0 .../default.nix => unit/xs/xstow/pkg-fun.nix} | 0 .../xs/xsuspender/pkg-fun.nix} | 0 .../xs/xsynth_dssi/pkg-fun.nix} | 0 .../xt/xteddy/pkg-fun.nix} | 0 .../xt/xtensor/pkg-fun.nix} | 0 .../default.nix => unit/xt/xterm/pkg-fun.nix} | 0 .../xt}/xterm/sixel-256.support.patch | 0 .../xt/xtermcontrol/pkg-fun.nix} | 0 .../xt/xtitle/pkg-fun.nix} | 0 .../default.nix => unit/xt/xtl/pkg-fun.nix} | 0 .../xt/xtrace/pkg-fun.nix} | 0 .../default.nix => unit/xt/xtris/pkg-fun.nix} | 0 .../xt/xtrlock-pam/pkg-fun.nix} | 0 .../default.nix => unit/xt/xtrt/pkg-fun.nix} | 0 .../xt/xtruss/pkg-fun.nix} | 0 .../xt/xtuner/pkg-fun.nix} | 0 .../default.nix => unit/xu/xurls/pkg-fun.nix} | 0 .../xv/xva-img/pkg-fun.nix} | 0 .../xv/xvidcore/pkg-fun.nix} | 0 .../default.nix => unit/xv/xvkbd/pkg-fun.nix} | 0 .../xw/xwallpaper/pkg-fun.nix} | 0 .../xw/xwayland/pkg-fun.nix} | 0 .../xw/xwiimote/pkg-fun.nix} | 0 .../xw/xwinmosaic/pkg-fun.nix} | 0 .../xw/xwinwrap/pkg-fun.nix} | 0 .../xx/xxHash/pkg-fun.nix} | 0 .../xx/xxe-pe/pkg-fun.nix} | 0 .../default.nix => unit/xx/xxgdb/pkg-fun.nix} | 0 .../misc => unit/xx}/xxgdb/xxgdb-pty.patch | 0 .../default.nix => unit/xx/xxh/pkg-fun.nix} | 0 .../default.nix => unit/xx/xxkb/pkg-fun.nix} | 0 .../default.nix => unit/xx/xxv/pkg-fun.nix} | 0 .../default.nix => unit/xy/xylib/pkg-fun.nix} | 0 .../xz/default.nix => unit/xz/xz/pkg-fun.nix} | 0 .../default.nix => unit/xz/xzgv/pkg-fun.nix} | 0 .../default.nix => unit/xz/xzoom/pkg-fun.nix} | 0 .../ya/yabasic/pkg-fun.nix} | 0 .../default.nix => unit/ya/yad/pkg-fun.nix} | 0 .../default.nix => unit/ya/yadm/pkg-fun.nix} | 0 .../default.nix => unit/ya/yaft/pkg-fun.nix} | 0 .../default.nix => unit/ya/yajl/pkg-fun.nix} | 0 .../default.nix => unit/ya/yajsv/pkg-fun.nix} | 0 .../ya/yallback/pkg-fun.nix} | 0 .../ya/yambar/pkg-fun.nix} | 0 .../default.nix => unit/ya/yamdi/pkg-fun.nix} | 0 .../ya/yaml-merge/pkg-fun.nix} | 0 .../ya/yaml2json/pkg-fun.nix} | 0 .../ya/yamlpath/pkg-fun.nix} | 0 .../default.nix => unit/ya/yams/pkg-fun.nix} | 0 .../ya/yandex-browser/pkg-fun.nix} | 0 .../ya/yandex-disk/pkg-fun.nix} | 0 .../default.nix => unit/ya/yank/pkg-fun.nix} | 0 .../ya/yanone-kaffeesatz/pkg-fun.nix} | 0 .../default.nix => unit/ya/yap/pkg-fun.nix} | 0 .../ya/yapesdl/pkg-fun.nix} | 0 .../ya/yarGen/pkg-fun.nix} | 0 .../default.nix => unit/ya/yara/pkg-fun.nix} | 0 .../ya/yarn-bash-completion/pkg-fun.nix} | 0 .../default.nix => unit/ya/yarn/pkg-fun.nix} | 0 .../default.nix => unit/ya/yarp/pkg-fun.nix} | 0 .../default.nix => unit/ya/yarr/pkg-fun.nix} | 0 .../ya/yaru-remix-theme/pkg-fun.nix} | 0 .../ya/yaru-theme/pkg-fun.nix} | 0 .../ya/yascreen/pkg-fun.nix} | 0 .../default.nix => unit/ya/yash/pkg-fun.nix} | 0 .../default.nix => unit/ya/yasm/pkg-fun.nix} | 0 .../10_fix_openpty_forkpty_declarations.patch | 0 .../ya}/yasr/20_maxpathlen.patch | 0 .../audio => unit/ya}/yasr/30_conf.patch | 0 .../ya}/yasr/40_dectalk_extended_chars.patch | 0 .../default.nix => unit/ya/yasr/pkg-fun.nix} | 0 .../default.nix => unit/ya/yate/pkg-fun.nix} | 0 .../default.nix => unit/ya/yaup/pkg-fun.nix} | 0 .../default.nix => unit/ya/yaws/pkg-fun.nix} | 0 .../default.nix => unit/ya/yaxg/pkg-fun.nix} | 0 .../yd}/yder/fix-pkgconfig.patch | 0 .../default.nix => unit/yd/yder/pkg-fun.nix} | 0 .../default.nix => unit/yd/ydict/pkg-fun.nix} | 0 .../yd/ydotool/pkg-fun.nix} | 0 .../ye/yeahwm/pkg-fun.nix} | 0 .../default.nix => unit/ye/yed/pkg-fun.nix} | 0 .../ye/yeetgif/pkg-fun.nix} | 0 .../ye/yelp-tools/pkg-fun.nix} | 0 .../ye/yersinia/pkg-fun.nix} | 0 .../ye/yeshup/pkg-fun.nix} | 0 .../ye/yex-lang/pkg-fun.nix} | 0 .../yg}/yggdrasil/change-runtime-dir.patch | 0 .../yg/yggdrasil/pkg-fun.nix} | 0 .../yj/default.nix => unit/yj/yj/pkg-fun.nix} | 0 .../yl/yle-dl/pkg-fun.nix} | 0 .../default.nix => unit/ym/ympd/pkg-fun.nix} | 0 .../default.nix => unit/ym/ymuse/pkg-fun.nix} | 0 .../default.nix => unit/yo/yodl/pkg-fun.nix} | 0 .../yo/yojimbo/pkg-fun.nix} | 0 .../yo/yoshimi/pkg-fun.nix} | 0 .../yo/yosys-bluespec/pkg-fun.nix} | 0 .../yo/yosys-ghdl/pkg-fun.nix} | 0 .../yo/yosys-symbiflow/pkg-fun.nix} | 0 .../yo/yosys-symbiflow}/symbiflow-pmgen.patch | 0 .../yo}/yosys/fix-clang-build.patch | 0 .../default.nix => unit/yo/yosys/pkg-fun.nix} | 0 .../yo}/yosys/plugin-search-dirs.patch | 0 .../compilers => unit/yo}/yosys/setup-hook.sh | 0 .../yo}/you-get/ffmpeg-path.patch | 0 .../yo/you-get/pkg-fun.nix} | 0 .../default.nix => unit/yo/youki/pkg-fun.nix} | 0 .../yo/youtrack/pkg-fun.nix} | 0 .../yo/youtube-music/pkg-fun.nix} | 0 .../default.nix => unit/yq/yq-go/pkg-fun.nix} | 0 .../default.nix => unit/yr/yrd/pkg-fun.nix} | 0 .../default.nix => unit/yt/ytalk/pkg-fun.nix} | 0 .../yt/ytarchive/pkg-fun.nix} | 0 .../yt/ytcast/pkg-fun.nix} | 0 .../default.nix => unit/yt/ytcc/pkg-fun.nix} | 0 .../default.nix => unit/yt/ytfzf/pkg-fun.nix} | 0 .../yt/ytmdesktop/pkg-fun.nix} | 0 .../default.nix => unit/yt/ytmdl/pkg-fun.nix} | 0 .../default.nix => unit/yt/ytree/pkg-fun.nix} | 0 .../default.nix => unit/yt/ytt/pkg-fun.nix} | 0 .../yu/yubico-pam/pkg-fun.nix} | 0 .../yu}/yubihsm-connector/lockfile-fix.patch | 0 .../yu/yubihsm-connector/pkg-fun.nix} | 0 .../yu/yubihsm-shell/pkg-fun.nix} | 0 .../yu/yubikey-agent/pkg-fun.nix} | 0 .../yu/yubikey-manager/pkg-fun.nix} | 0 .../yu/yubikey-manager4/pkg-fun.nix} | 0 .../remove-pyopenssl-tests.patch | 0 .../yu/yubikey-personalization/pkg-fun.nix} | 0 .../yu/yubikey-touch-detector/pkg-fun.nix} | 0 .../yu}/yubioath-flutter/helper.nix | 0 .../yu/yubioath-flutter/pkg-fun.nix} | 0 .../yu/yuicompressor/pkg-fun.nix} | 0 .../default.nix => unit/yu/yutto/pkg-fun.nix} | 0 .../default.nix => unit/z-/z-lua/pkg-fun.nix} | 0 .../tptp.nix => unit/z3/z3-tptp/pkg-fun.nix} | 0 .../default.nix => unit/z8/z88dk/pkg-fun.nix} | 0 .../za/zabbix-cli/pkg-fun.nix} | 0 .../za/zabbixctl/pkg-fun.nix} | 0 .../default.nix => unit/za/zalgo/pkg-fun.nix} | 0 .../za/zam-plugins/pkg-fun.nix} | 0 .../misc => unit/za}/zammad/0001-nulldb.patch | 0 .../misc => unit/za}/zammad/gemset.nix | 0 .../misc => unit/za}/zammad/package.json | 0 .../za/zammad/pkg-fun.nix} | 0 .../misc => unit/za}/zammad/source.json | 0 .../misc => unit/za}/zammad/update.nix | 0 .../misc => unit/za}/zammad/update.sh | 0 .../misc => unit/za}/zammad/yarn.lock | 0 .../misc => unit/za}/zammad/yarn.nix | 0 .../default.nix => unit/za/zap/pkg-fun.nix} | 0 .../za/zarchive/pkg-fun.nix} | 0 .../default.nix => unit/za/zasm/pkg-fun.nix} | 0 .../za/zathuraPkgs}/cb/default.nix | 0 .../za/zathuraPkgs}/core/default.nix | 0 .../za/zathuraPkgs}/djvu/default.nix | 0 .../za/zathuraPkgs}/pdf-mupdf/default.nix | 0 .../za/zathuraPkgs}/pdf-poppler/default.nix | 0 .../za/zathuraPkgs/pkg-fun.nix} | 0 .../za/zathuraPkgs}/ps/default.nix | 0 .../za/zathuraPkgs}/wrapper.nix | 0 .../default.nix => unit/za/zaz/pkg-fun.nix} | 0 .../zb/zbackup/pkg-fun.nix} | 0 .../zb}/zbackup/protobuf-api-change.patch | 0 .../default.nix => unit/zb/zbctl/pkg-fun.nix} | 0 .../zc/zchaff/pkg-fun.nix} | 0 .../logic => unit/zc}/zchaff/sat_solver.patch | 0 .../0001-meson-fix-argp-standalone.patch | 0 .../zc/zchunk/pkg-fun.nix} | 0 .../zd/zd1211fw/pkg-fun.nix} | 0 .../zdbsp.nix => unit/zd/zdbsp/pkg-fun.nix} | 0 .../zd/zdelta/pkg-fun.nix} | 0 .../default.nix => unit/zd/zdns/pkg-fun.nix} | 0 .../default.nix => unit/zd/zdoom/pkg-fun.nix} | 0 .../ze/zecwallet-lite/pkg-fun.nix} | 0 .../default.nix => unit/ze/zed/pkg-fun.nix} | 0 .../default.nix => unit/ze/zeek/pkg-fun.nix} | 0 .../zef.nix => unit/ze/zef/pkg-fun.nix} | 0 .../ze/zeitgeist/pkg-fun.nix} | 0 .../ze/zenmonitor/pkg-fun.nix} | 0 .../ze/zenstates/pkg-fun.nix} | 0 .../ze/zerobin/pkg-fun.nix} | 0 .../ze/zeroc-ice/pkg-fun.nix} | 0 .../ze/zerofree/pkg-fun.nix} | 0 .../4.x.nix => unit/ze/zeromq4/pkg-fun.nix} | 0 .../ze/zeronet-conservancy/pkg-fun.nix} | 0 .../ze/zeronet/pkg-fun.nix} | 0 .../ze/zerotierone/pkg-fun.nix} | 0 .../ze/zesarux/pkg-fun.nix} | 0 .../default.nix => unit/zf/zfp/pkg-fun.nix} | 0 .../zf/zfs-autobackup/pkg-fun.nix} | 0 .../zf/zfs-prune-snapshots/pkg-fun.nix} | 0 .../zf/zfsbackup/pkg-fun.nix} | 0 .../zf/zfsnap/pkg-fun.nix} | 0 .../zf/zfstools/pkg-fun.nix} | 0 .../zg/zgrab2/pkg-fun.nix} | 0 .../zg/zgrviewer/pkg-fun.nix} | 0 .../zi/default.nix => unit/zi/zi/pkg-fun.nix} | 0 .../zi/zigbee2mqtt/pkg-fun.nix} | 0 .../default.nix => unit/zi/zile/pkg-fun.nix} | 0 .../zi/zilla-slab/pkg-fun.nix} | 0 .../zi/zim-tools/pkg-fun.nix} | 0 .../default.nix => unit/zi/zim/pkg-fun.nix} | 0 .../default.nix => unit/zi/zimfw/pkg-fun.nix} | 0 .../default.nix => unit/zi/zimg/pkg-fun.nix} | 0 .../zi/zimlib/pkg-fun.nix} | 0 .../default.nix => unit/zi/zinc/pkg-fun.nix} | 0 .../default.nix => unit/zi/zinit/pkg-fun.nix} | 0 .../zi/zinnia/pkg-fun.nix} | 0 .../zi}/zip/natspec-gentoo.patch.bz2 | Bin .../default.nix => unit/zi/zip/pkg-fun.nix} | 0 .../zi/zipkin/pkg-fun.nix} | 0 .../zi/zita-ajbridge/pkg-fun.nix} | 0 .../zi/zita-alsa-pcmi/pkg-fun.nix} | 0 .../zi/zita-at1/pkg-fun.nix} | 0 .../zi/zita-convolver/pkg-fun.nix} | 0 .../zi/zita-njbridge/pkg-fun.nix} | 0 .../zi/zita-resampler/pkg-fun.nix} | 0 .../zk/zk-shell/pkg-fun.nix} | 0 .../zk/default.nix => unit/zk/zk/pkg-fun.nix} | 0 .../default.nix => unit/zk/zkar/pkg-fun.nix} | 0 .../zk/zkfuse/pkg-fun.nix} | 0 .../zk/zktree/pkg-fun.nix} | 0 .../default.nix => unit/zl/zld/pkg-fun.nix} | 0 .../zl/zlib-ng/pkg-fun.nix} | 0 .../default.nix => unit/zl/zlib/pkg-fun.nix} | 0 .../default.nix => unit/zl/zlint/pkg-fun.nix} | 0 .../default.nix => unit/zl/zlog/pkg-fun.nix} | 0 .../default.nix => unit/zl/zls/pkg-fun.nix} | 0 .../zm}/zmap/cmake-json-0.14-fix.patch | 0 .../default.nix => unit/zm/zmap/pkg-fun.nix} | 0 .../default.nix => unit/zm/zmqpp/pkg-fun.nix} | 0 .../zm/zmusic/pkg-fun.nix} | 0 .../zn/zn_poly/pkg-fun.nix} | 0 .../zn/znapzend/pkg-fun.nix} | 0 .../default.nix => unit/zn/znc/pkg-fun.nix} | 0 .../0002-add-scaling-factor-to-source.patch | 0 .../default.nix => unit/zo/zod/pkg-fun.nix} | 0 .../default.nix => unit/zo/zoekt/pkg-fun.nix} | 0 ...use-file-timestamp-in-cache-filename.patch | 0 .../zoneminder/default-to-http-1dot1.patch | 0 .../zo/zoneminder/pkg-fun.nix} | 0 .../zo/zookeeper/pkg-fun.nix} | 0 .../zo/zoom-us/pkg-fun.nix} | 0 .../zo}/zoom-us/update.sh | 0 .../default.nix => unit/zo/zoom/pkg-fun.nix} | 0 .../zo/zopfli/pkg-fun.nix} | 0 .../zo/zotero/pkg-fun.nix} | 0 .../office => unit/zo}/zotero/zotero.sh | 0 .../zo/zoxide/pkg-fun.nix} | 0 .../default.nix => unit/zp/zpaq/pkg-fun.nix} | 0 .../zpaqd.nix => unit/zp/zpaqd/pkg-fun.nix} | 0 .../default.nix => unit/zp/zplug/pkg-fun.nix} | 0 .../zpool-auto-expand-partitions/pkg-fun.nix} | 0 .../zp/zpool-iostat-viz/pkg-fun.nix} | 0 .../zp/zprint/pkg-fun.nix} | 0 .../zq/default.nix => unit/zq/zq/pkg-fun.nix} | 0 .../default.nix => unit/zr/zrepl/pkg-fun.nix} | 0 .../zs/zs-apc-spdu-ctl/pkg-fun.nix} | 0 .../zs/zs-wait4host/pkg-fun.nix} | 0 .../zs/zsa-udev-rules/pkg-fun.nix} | 0 .../zs/zscroll/pkg-fun.nix} | 0 .../zs/zsh-autocomplete/pkg-fun.nix} | 0 .../zs/zsh-autoenv/pkg-fun.nix} | 0 .../zs/zsh-autopair/pkg-fun.nix} | 0 .../zs/zsh-autosuggestions/pkg-fun.nix} | 0 .../zs/zsh-bd/pkg-fun.nix} | 0 .../zs/zsh-better-npm-completion/pkg-fun.nix} | 0 .../zs}/zsh-clipboard/clipboard.plugin.zsh | 0 .../zs/zsh-clipboard/pkg-fun.nix} | 0 .../zs/zsh-command-time/pkg-fun.nix} | 0 .../zs/zsh-completions/pkg-fun.nix} | 0 .../zs/zsh-edit/pkg-fun.nix} | 0 .../zsh-fast-syntax-highlighting/pkg-fun.nix} | 0 .../zs/zsh-forgit/pkg-fun.nix} | 0 .../zs/zsh-fzf-tab/pkg-fun.nix} | 0 .../zs/zsh-git-prompt/pkg-fun.nix} | 0 .../pkg-fun.nix} | 0 .../zsh-history-substring-search/pkg-fun.nix} | 0 .../zs/zsh-history/pkg-fun.nix} | 0 .../zs/zsh-navigation-tools/pkg-fun.nix} | 0 .../zs/zsh-nix-shell/pkg-fun.nix} | 0 .../zs}/zsh-powerlevel10k/gitstatusd.patch | 0 .../zs/zsh-powerlevel10k/pkg-fun.nix} | 0 .../zs/zsh-powerlevel9k/pkg-fun.nix} | 0 .../zs/zsh-prezto/pkg-fun.nix} | 0 .../zs/zsh-syntax-highlighting/pkg-fun.nix} | 0 .../zs/zsh-system-clipboard/pkg-fun.nix} | 0 .../zs/zsh-vi-mode/pkg-fun.nix} | 0 .../zs/zsh-you-should-use/pkg-fun.nix} | 0 .../default.nix => unit/zs/zsh-z/pkg-fun.nix} | 0 .../default.nix => unit/zs/zsh/pkg-fun.nix} | 0 .../zs}/zsh/tz_completion.patch | 0 .../default.nix => unit/zs/zssh/pkg-fun.nix} | 0 .../{tools/security => unit/zs}/zsteg/Gemfile | 0 .../security => unit/zs}/zsteg/Gemfile.lock | 0 .../security => unit/zs}/zsteg/gemset.nix | 0 .../default.nix => unit/zs/zsteg/pkg-fun.nix} | 0 .../zs/zstxtns-utils/pkg-fun.nix} | 0 .../default.nix => unit/zs/zsv/pkg-fun.nix} | 0 .../default.nix => unit/zs/zsync/pkg-fun.nix} | 0 .../zt/zthrottle/pkg-fun.nix} | 0 .../zu/zuki-themes/pkg-fun.nix} | 0 .../zu/zulip-term/pkg-fun.nix} | 0 .../zulip-term/pytest-executable-name.patch | 0 .../default.nix => unit/zu/zulu/pkg-fun.nix} | 0 .../zulu/8.nix => unit/zu/zulu8/pkg-fun.nix} | 0 .../default.nix => unit/zu/zuo/pkg-fun.nix} | 0 .../zx/zxcvbn-c/pkg-fun.nix} | 0 .../zx/zxing-cpp/pkg-fun.nix} | 0 .../graphics => unit/zx}/zxing/java-zxing.sh | 0 .../default.nix => unit/zx/zxing/pkg-fun.nix} | 0 .../zx}/zxing/zxing-cmdline-encoder.sh | 0 .../zx}/zxing/zxing-cmdline-runner.sh | 0 .../graphics => unit/zx}/zxing/zxing.sh | 0 .../default.nix => unit/zy/zydis/pkg-fun.nix} | 0 .../libraries => unit/zy}/zydis/zycore.nix | 0 .../zz/default.nix => unit/zz/zz/pkg-fun.nix} | 0 .../zz/zziplib/pkg-fun.nix} | 0 .../default.nix => unit/zz/zzuf/pkg-fun.nix} | 0 13298 files changed, 238 insertions(+), 21429 deletions(-) rename pkgs/{games/0verkill/default.nix => unit/_0/_0verkill/pkg-fun.nix} (100%) rename pkgs/{tools/misc/0x => unit/_0/_0x}/add-Cargo-lock.diff (100%) rename pkgs/{tools/misc/0x/default.nix => unit/_0/_0x/pkg-fun.nix} (100%) rename pkgs/{games/1oom/default.nix => unit/_1/_1oom/pkg-fun.nix} (100%) rename pkgs/{applications/misc/1password/default.nix => unit/_1/_1password/pkg-fun.nix} (100%) rename pkgs/{games/2048-in-terminal/default.nix => unit/_2/_2048-in-terminal/pkg-fun.nix} (100%) rename pkgs/{games/20kly/default.nix => unit/_2/_20kly/pkg-fun.nix} (100%) rename pkgs/{data/fonts/3270font/default.nix => unit/_3/_3270font/pkg-fun.nix} (100%) rename pkgs/{servers/ldap/389/default.nix => unit/_3/_389-ds-base/pkg-fun.nix} (100%) rename pkgs/{tools/misc/3llo => unit/_3/_3llo}/Gemfile (100%) rename pkgs/{tools/misc/3llo => unit/_3/_3llo}/Gemfile.lock (100%) rename pkgs/{tools/misc/3llo => unit/_3/_3llo}/gemset.nix (100%) rename pkgs/{tools/misc/3llo/default.nix => unit/_3/_3llo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/3mux/default.nix => unit/_3/_3mux/pkg-fun.nix} (100%) rename pkgs/{applications/networking/3proxy/default.nix => unit/_3/_3proxy/pkg-fun.nix} (100%) rename pkgs/{development/compilers/4th => unit/_4/_4th}/001-install-manual-fixup.diff (100%) rename pkgs/{development/compilers/4th/default.nix => unit/_4/_4th/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/4ti2/default.nix => unit/_4/_4ti2/pkg-fun.nix} (100%) rename pkgs/{tools/networking/6tunnel/default.nix => unit/_6/_6tunnel/pkg-fun.nix} (100%) rename pkgs/{games/7kaa/default.nix => unit/_7/_7kaa/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/915resolution/default.nix => unit/_9/_915resolution/pkg-fun.nix} (100%) rename pkgs/{applications/misc/9menu/default.nix => unit/_9/_9menu/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/9pfs => unit/_9/_9pfs}/fix-darwin-build.patch (100%) rename pkgs/{tools/filesystems/9pfs/default.nix => unit/_9/_9pfs/pkg-fun.nix} (100%) rename pkgs/{common-updater/combinators.nix => unit/_e/_experimental-update-script-combinators/pkg-fun.nix} (100%) rename pkgs/{applications/audio/a2jmidid/default.nix => unit/a2/a2jmidid/pkg-fun.nix} (100%) rename pkgs/{tools/text/a2ps/default.nix => unit/a2/a2ps/pkg-fun.nix} (100%) rename pkgs/{development/libraries/a52dec/default.nix => unit/a5/a52dec/pkg-fun.nix} (100%) rename pkgs/{tools/misc/aaa/default.nix => unit/aa/aaa/pkg-fun.nix} (100%) rename pkgs/{applications/audio/aacgain/default.nix => unit/aa/aacgain/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/aa}/aalib/darwin.patch (100%) rename pkgs/{development/libraries/aalib/default.nix => unit/aa/aalib/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/aaphoto/default.nix => unit/aa/aaphoto/pkg-fun.nix} (100%) rename pkgs/{tools/networking/aardvark-dns/default.nix => unit/aa/aardvark-dns/pkg-fun.nix} (100%) rename pkgs/{applications/audio/aaxtomp3/default.nix => unit/aa/aaxtomp3/pkg-fun.nix} (100%) rename pkgs/{games/abbaye-des-morts/default.nix => unit/ab/abbaye-des-morts/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/abc/default.nix => unit/ab/abc-verifier/pkg-fun.nix} (100%) rename pkgs/{development/compilers/abcl/default.nix => unit/ab/abcl/pkg-fun.nix} (100%) rename pkgs/{tools/audio/abcm2ps/default.nix => unit/ab/abcm2ps/pkg-fun.nix} (100%) rename pkgs/{tools/audio/abcmidi/default.nix => unit/ab/abcmidi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/abduco/default.nix => unit/ab/abduco/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/abi-compliance-checker/default.nix => unit/ab/abi-compliance-checker/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/abi-dumper/default.nix => unit/ab/abi-dumper/pkg-fun.nix} (100%) rename pkgs/{applications/office/abiword/default.nix => unit/ab/abiword/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ablog/default.nix => unit/ab/ablog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/abook/default.nix => unit/ab/abook/pkg-fun.nix} (100%) rename pkgs/{development/mobile/abootimg/default.nix => unit/ab/abootimg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/abseil-cpp/202103.nix => unit/ab/abseil-cpp_202103/pkg-fun.nix} (100%) rename pkgs/{development/libraries/abseil-cpp/202111.nix => unit/ab/abseil-cpp_202111/pkg-fun.nix} (100%) rename pkgs/{development/libraries/abseil-cpp/202206.nix => unit/ab/abseil-cpp_202206/pkg-fun.nix} (100%) rename pkgs/{development/tools/abuild/default.nix => unit/ab/abuild/pkg-fun.nix} (100%) rename pkgs/{games => unit/ab}/abuse/abuse.sh (100%) rename pkgs/{games/abuse/default.nix => unit/ab/abuse/pkg-fun.nix} (100%) rename pkgs/{applications/science/computer-architecture/accelergy/default.nix => unit/ac/accelergy/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ac}/accountsservice/Disable-methods-that-change-files-in-etc.patch (100%) rename pkgs/{development/libraries => unit/ac}/accountsservice/drop-prefix-check-extensions.patch (100%) rename pkgs/{development/libraries => unit/ac}/accountsservice/fix-paths.patch (100%) rename pkgs/{development/libraries => unit/ac}/accountsservice/no-create-dirs.patch (100%) rename pkgs/{development/libraries/accountsservice/default.nix => unit/ac/accountsservice/pkg-fun.nix} (100%) rename pkgs/{tools/system/acct/default.nix => unit/ac/acct/pkg-fun.nix} (100%) rename pkgs/{tools/audio/accuraterip-checksum/default.nix => unit/ac/accuraterip-checksum/pkg-fun.nix} (100%) rename pkgs/{games => unit/ac}/ace-of-penguins/fixup-miscompilations.patch (100%) rename pkgs/{games/ace-of-penguins/default.nix => unit/ac/ace-of-penguins/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ace/default.nix => unit/ac/ace/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/acgtk/default.nix => unit/ac/acgtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/acl/default.nix => unit/ac/acl/pkg-fun.nix} (100%) rename pkgs/{tools/admin/acme-sh/default.nix => unit/ac/acme-sh/pkg-fun.nix} (100%) rename pkgs/{development/compilers/acme/default.nix => unit/ac/acme/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/acorn/default.nix => unit/ac/acorn/pkg-fun.nix} (100%) rename pkgs/{tools/audio/acousticbrainz-client/default.nix => unit/ac/acousticbrainz-client/pkg-fun.nix} (100%) rename pkgs/{tools/audio/acoustid-fingerprinter/default.nix => unit/ac/acoustidFingerprinter/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/acpi/default.nix => unit/ac/acpi/pkg-fun.nix} (100%) rename pkgs/{tools/system/acpica-tools/default.nix => unit/ac/acpica-tools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/acpid/default.nix => unit/ac/acpid/pkg-fun.nix} (100%) rename pkgs/{misc/acpilight/default.nix => unit/ac/acpilight/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/acpitool/default.nix => unit/ac/acpitool/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/acr/default.nix => unit/ac/acr/pkg-fun.nix} (100%) rename pkgs/{tools/security/acsccid/default.nix => unit/ac/acsccid/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/act/default.nix => unit/ac/act/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/actionlint/default.nix => unit/ac/actionlint/pkg-fun.nix} (100%) rename pkgs/{applications/misc/activate-linux/default.nix => unit/ac/activate-linux/pkg-fun.nix} (100%) rename pkgs/{development/libraries/apache-activemq/default.nix => unit/ac/activemq/pkg-fun.nix} (100%) rename pkgs/{tools/system/actkbd/default.nix => unit/ac/actkbd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/adafruit-ampy/default.nix => unit/ad/adafruit-ampy/pkg-fun.nix} (100%) rename pkgs/{data/misc/adapta-backgrounds/default.nix => unit/ad/adapta-backgrounds/pkg-fun.nix} (100%) rename pkgs/{data/themes/adapta/default.nix => unit/ad/adapta-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/adapta-kde/default.nix => unit/ad/adapta-kde-theme/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/adcli/default.nix => unit/ad/adcli/pkg-fun.nix} (100%) rename pkgs/{build-support/add-opengl-runpath/default.nix => unit/ad/addOpenGLRunpath/pkg-fun.nix} (100%) rename pkgs/{build-support/add-opengl-runpath => unit/ad/addOpenGLRunpath}/setup-hook.sh (100%) rename pkgs/{tools/misc/addic7ed-cli/default.nix => unit/ad/addic7ed-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/addlicense/default.nix => unit/ad/addlicense/pkg-fun.nix} (100%) rename pkgs/{data/themes/adementary/default.nix => unit/ad/adementary-theme/pkg-fun.nix} (100%) rename pkgs/{tools/security/adenum/default.nix => unit/ad/adenum/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ad}/adguardhome/bins.nix (100%) rename pkgs/{servers/adguardhome/default.nix => unit/ad/adguardhome/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ad}/adguardhome/update.sh (100%) rename pkgs/{applications/video/adl/default.nix => unit/ad/adl/pkg-fun.nix} (100%) rename pkgs/{servers/adminer/default.nix => unit/ad/adminer/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/adms/default.nix => unit/ad/adms/pkg-fun.nix} (100%) rename pkgs/{development/libraries/adns/default.nix => unit/ad/adns/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/adolc/default.nix => unit/ad/adolc/pkg-fun.nix} (100%) rename pkgs/{games/adom/default.nix => unit/ad/adom/pkg-fun.nix} (100%) rename pkgs/{tools/security/adreaper/default.nix => unit/ad/adreaper/pkg-fun.nix} (100%) rename pkgs/{tools/misc/adrgen/default.nix => unit/ad/adrgen/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/adriconf/default.nix => unit/ad/adriconf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/adslib/default.nix => unit/ad/adslib/pkg-fun.nix} (100%) rename pkgs/{tools/admin/adtool/default.nix => unit/ad/adtool/pkg-fun.nix} (100%) rename pkgs/{tools/compression/advancecomp/default.nix => unit/ad/advancecomp/pkg-fun.nix} (100%) rename pkgs/{data/themes/adw-gtk3/default.nix => unit/ad/adw-gtk3/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/aefs/default.nix => unit/ae/aefs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/aeolus/default.nix => unit/ae/aeolus/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/aerc/default.nix => unit/ae/aerc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders => unit/ae}/aerc/runtime-sharedir.patch (100%) rename pkgs/{servers/nosql/aerospike/default.nix => unit/ae/aerospike/pkg-fun.nix} (100%) rename pkgs/{tools/misc/aescrypt/default.nix => unit/ae/aescrypt/pkg-fun.nix} (100%) rename pkgs/{tools/security/aesfix/default.nix => unit/ae/aesfix/pkg-fun.nix} (100%) rename pkgs/{tools/security/aeskeyfind/default.nix => unit/ae/aeskeyfind/pkg-fun.nix} (100%) rename pkgs/{tools/security/aespipe/default.nix => unit/ae/aespipe/pkg-fun.nix} (100%) rename pkgs/{applications/audio/aether-lv2/default.nix => unit/ae/aether-lv2/pkg-fun.nix} (100%) rename pkgs/{applications/networking/aether/default.nix => unit/ae/aether/pkg-fun.nix} (100%) rename pkgs/{applications/editors/aewan/default.nix => unit/ae/aewan/pkg-fun.nix} (100%) rename pkgs/{tools/misc/afetch/default.nix => unit/af/afetch/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/afew/default.nix => unit/af/afew/pkg-fun.nix} (100%) rename pkgs/{development/libraries/afflib/default.nix => unit/af/afflib/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/af}/afio/0001-makefile-fix-installation.patch (100%) rename pkgs/{tools/archivers/afio/default.nix => unit/af/afio/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/afpfs-ng/default.nix => unit/af/afpfs-ng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aften/default.nix => unit/af/aften/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/af}/aften/simd-fallback.patch (100%) rename pkgs/{tools/admin/afterburn/default.nix => unit/af/afterburn/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/afuse/default.nix => unit/af/afuse/pkg-fun.nix} (100%) rename pkgs/{data/fonts/agave/default.nix => unit/ag/agave/pkg-fun.nix} (100%) rename pkgs/{development/tools/agda-pkg/default.nix => unit/ag/agda-pkg/pkg-fun.nix} (100%) rename pkgs/{tools/security/age/default.nix => unit/ag/age/pkg-fun.nix} (100%) rename pkgs/{tools/security/agebox/default.nix => unit/ag/agebox/pkg-fun.nix} (100%) rename pkgs/{tools/misc/agedu/default.nix => unit/ag/agedu/pkg-fun.nix} (100%) rename pkgs/{applications/office/agenda/default.nix => unit/ag/agenda/pkg-fun.nix} (100%) rename pkgs/{development/libraries/agg/default.nix => unit/ag/agg/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/agi/default.nix => unit/ag/agi/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/agkozak-zsh-prompt/default.nix => unit/ag/agkozak-zsh-prompt/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/agola/default.nix => unit/ag/agola/pkg-fun.nix} (100%) rename pkgs/{tools/text/agrep/default.nix => unit/ag/agrep/pkg-fun.nix} (100%) rename pkgs/{tools/text/aha/default.nix => unit/ah/aha/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ahcpd/default.nix => unit/ah/ahcpd/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/ahoviewer/default.nix => unit/ah/ahoviewer/pkg-fun.nix} (100%) rename pkgs/{tools/security/aide/default.nix => unit/ai/aide/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/aiger/default.nix => unit/ai/aiger/pkg-fun.nix} (100%) rename pkgs/{data/fonts/aileron/default.nix => unit/ai/aileron/pkg-fun.nix} (100%) rename pkgs/{development/tools/air/default.nix => unit/ai/air/pkg-fun.nix} (100%) rename pkgs/{tools/networking/aircrack-ng/default.nix => unit/ai/aircrack-ng/pkg-fun.nix} (100%) rename pkgs/{tools/networking/airgeddon/default.nix => unit/ai/airgeddon/pkg-fun.nix} (100%) rename pkgs/{games/airshipper/default.nix => unit/ai/airshipper/pkg-fun.nix} (100%) rename pkgs/{servers/misc/airsonic/default.nix => unit/ai/airsonic/pkg-fun.nix} (100%) rename pkgs/{applications/radio/airspy/default.nix => unit/ai/airspy/pkg-fun.nix} (100%) rename pkgs/{applications/radio/airspyhf/default.nix => unit/ai/airspyhf/pkg-fun.nix} (100%) rename pkgs/{games/airstrike/default.nix => unit/ai/airstrike/pkg-fun.nix} (100%) rename pkgs/{applications/audio/airwave/default.nix => unit/ai/airwave/pkg-fun.nix} (100%) rename pkgs/{applications/audio/airwindows-lv2/default.nix => unit/ai/airwindows-lv2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aixlog/default.nix => unit/ai/aixlog/pkg-fun.nix} (100%) rename pkgs/{applications/audio/aj-snapshot/default.nix => unit/aj/aj-snapshot/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/akira/default.nix => unit/ak/akira-unstable/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ak}/akkoma/mix.nix (100%) rename pkgs/{servers/akkoma/default.nix => unit/ak/akkoma/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/ak}/akku/hardcode-libcurl.patch (100%) rename pkgs/{tools/package-management/akku/default.nix => unit/ak/akku/pkg-fun.nix} (100%) rename pkgs/{development/compilers/alan/default.nix => unit/al/alan/pkg-fun.nix} (100%) rename pkgs/{development/compilers/alan/2.nix => unit/al/alan_2/pkg-fun.nix} (100%) rename pkgs/{applications/video/alass/default.nix => unit/al/alass/pkg-fun.nix} (100%) rename pkgs/{data/themes/albatross/default.nix => unit/al/albatross/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/alchemy/default.nix => unit/al/alchemy/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/alda/default.nix => unit/al/alda/pkg-fun.nix} (100%) rename pkgs/{applications/radio/aldo/default.nix => unit/al/aldo/pkg-fun.nix} (100%) rename pkgs/{data/fonts/alegreya-sans/default.nix => unit/al/alegreya-sans/pkg-fun.nix} (100%) rename pkgs/{data/fonts/alegreya/default.nix => unit/al/alegreya/pkg-fun.nix} (100%) rename pkgs/{tools/nix/alejandra/default.nix => unit/al/alejandra/pkg-fun.nix} (100%) rename pkgs/{development/libraries/alembic/default.nix => unit/al/alembic/pkg-fun.nix} (100%) rename pkgs/{games/alephone/durandal/default.nix => unit/al/alephone-durandal/pkg-fun.nix} (100%) rename pkgs/{games/alephone/eternal/default.nix => unit/al/alephone-eternal/pkg-fun.nix} (100%) rename pkgs/{games/alephone/evil/default.nix => unit/al/alephone-evil/pkg-fun.nix} (100%) rename pkgs/{games/alephone/infinity/default.nix => unit/al/alephone-infinity/pkg-fun.nix} (100%) rename pkgs/{games/alephone/marathon/default.nix => unit/al/alephone-marathon/pkg-fun.nix} (100%) rename pkgs/{games/alephone/pheonix/default.nix => unit/al/alephone-pheonix/pkg-fun.nix} (100%) rename pkgs/{games/alephone/red/default.nix => unit/al/alephone-red/pkg-fun.nix} (100%) rename pkgs/{games/alephone/rubicon-x/default.nix => unit/al/alephone-rubicon-x/pkg-fun.nix} (100%) rename pkgs/{games/alephone/default.nix => unit/al/alephone/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/alerta/default.nix => unit/al/alerta-server/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/alerta/client.nix => unit/al/alerta/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/alertmanager-bot/default.nix => unit/al/alertmanager-bot/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/alertmanager-irc-relay/default.nix => unit/al/alertmanager-irc-relay/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/alfaview/default.nix => unit/al/alfaview/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/al}/alglib/patch-alglib-CMakeLists.patch (100%) rename pkgs/{development/libraries/alglib/default.nix => unit/al/alglib/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/al}/algol68g/0001-plotutils-png-support.diff (100%) rename pkgs/{development/compilers/algol68g/default.nix => unit/al/algol68g/pkg-fun.nix} (100%) rename pkgs/{data/fonts/alice/default.nix => unit/al/alice/pkg-fun.nix} (100%) rename pkgs/{games/alienarena/default.nix => unit/al/alienarena/pkg-fun.nix} (100%) rename pkgs/{tools/text/align/default.nix => unit/al/align/pkg-fun.nix} (100%) rename pkgs/{tools/admin/aliyun-cli/default.nix => unit/al/aliyun-cli/pkg-fun.nix} (100%) rename pkgs/{applications/science/medicine/aliza/default.nix => unit/al/aliza/pkg-fun.nix} (100%) rename pkgs/{data/fonts/alkalami/default.nix => unit/al/alkalami/pkg-fun.nix} (100%) rename pkgs/{development/libraries/allegro => unit/al/allegro4}/encoding.patch (100%) rename pkgs/{development/libraries/allegro => unit/al/allegro4}/nix-unstable-sandbox-fix.patch (100%) rename pkgs/{development/libraries/allegro/default.nix => unit/al/allegro4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/allegro/5.nix => unit/al/allegro5/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/alliance/default.nix => unit/al/alliance/pkg-fun.nix} (100%) rename pkgs/{servers/allmark/default.nix => unit/al/allmark/pkg-fun.nix} (100%) rename pkgs/{development/tools/allure/default.nix => unit/al/allure/pkg-fun.nix} (100%) rename pkgs/{applications/misc/almanah/default.nix => unit/al/almanah/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/almonds/default.nix => unit/al/almonds/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/alock/default.nix => unit/al/alock/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/alot/default.nix => unit/al/alot/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/alpine-make-vm-image/default.nix => unit/al/alpine-make-vm-image/pkg-fun.nix} (100%) rename pkgs/{applications/networking/alpnpass/default.nix => unit/al/alpnpass/pkg-fun.nix} (100%) rename pkgs/{servers/alps/default.nix => unit/al/alps/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-firmware/default.nix => unit/al/alsa-firmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project => unit/al}/alsa-lib/alsa-plugin-conf-multilib.patch (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-lib/default.nix => unit/al/alsa-lib/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-oss/default.nix => unit/al/alsa-oss/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-plugins/wrapper.nix => unit/al/alsa-plugins-wrapper/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-plugins/default.nix => unit/al/alsa-plugins/pkg-fun.nix} (100%) rename pkgs/{applications/audio/alsa-scarlett-gui/default.nix => unit/al/alsa-scarlett-gui/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-tools/default.nix => unit/al/alsa-tools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-topology-conf/default.nix => unit/al/alsa-topology-conf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-ucm-conf/default.nix => unit/al/alsa-ucm-conf/pkg-fun.nix} (100%) rename pkgs/{tools/audio => unit/al}/alsaequal/caps_9.x.patch (100%) rename pkgs/{tools/audio => unit/al}/alsaequal/false_error.patch (100%) rename pkgs/{tools/audio => unit/al}/alsaequal/makefile.patch (100%) rename pkgs/{tools/audio/alsaequal/default.nix => unit/al/alsaequal/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/alt-ergo/default.nix => unit/al/alt-ergo/pkg-fun.nix} (100%) rename pkgs/{development/tools/altair-graphql-client/default.nix => unit/al/altair/pkg-fun.nix} (100%) rename pkgs/{tools/networking/altermime/default.nix => unit/al/altermime/pkg-fun.nix} (100%) rename pkgs/{servers/althttpd/default.nix => unit/al/althttpd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/alttab/default.nix => unit/al/alttab/pkg-fun.nix} (100%) rename pkgs/{tools/games/opentracker => unit/al/alttpr-opentracker}/deps.nix (100%) rename pkgs/{tools/games/opentracker/default.nix => unit/al/alttpr-opentracker/pkg-fun.nix} (100%) rename pkgs/{development/libraries/alure/default.nix => unit/al/alure/pkg-fun.nix} (100%) rename pkgs/{development/libraries/alure2/default.nix => unit/al/alure2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/AMB-plugins/default.nix => unit/am/AMB-plugins/pkg-fun.nix} (100%) rename pkgs/{tools/networking/amass/default.nix => unit/am/amass/pkg-fun.nix} (100%) rename pkgs/{tools/admin/amazon-ec2-utils/default.nix => unit/am/amazon-ec2-utils/pkg-fun.nix} (100%) rename pkgs/{tools/admin/amazon-ecr-credential-helper/default.nix => unit/am/amazon-ecr-credential-helper/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/amazon-ecs-cli/default.nix => unit/am/amazon-ecs-cli/pkg-fun.nix} (100%) rename pkgs/{data/themes/amber/default.nix => unit/am/amber-theme/pkg-fun.nix} (100%) rename pkgs/{applications/audio/amberol/default.nix => unit/am/amberol/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/amd-blis/default.nix => unit/am/amd-blis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/am}/amd-libflame/add-lapacke.diff (100%) rename pkgs/{development/libraries/science/math/amd-libflame/default.nix => unit/am/amd-libflame/pkg-fun.nix} (100%) rename pkgs/{development/libraries/amdvlk/default.nix => unit/am/amdvlk/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/am}/amdvlk/test.nix (100%) rename pkgs/{development/tools/ameba/default.nix => unit/am/ameba/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/amfora/default.nix => unit/am/amfora/pkg-fun.nix} (100%) rename pkgs/{tools/games/minecraft/amidst/default.nix => unit/am/amidst/pkg-fun.nix} (100%) rename pkgs/{data/fonts/amiri/default.nix => unit/am/amiri/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aml/default.nix => unit/am/aml/pkg-fun.nix} (100%) rename pkgs/{tools/security/amoco/default.nix => unit/am/amoco/pkg-fun.nix} (100%) rename pkgs/{games/amoeba/data.nix => unit/am/amoeba-data/pkg-fun.nix} (100%) rename pkgs/{games => unit/am}/amoeba/include-string-h.patch (100%) rename pkgs/{games/amoeba/default.nix => unit/am/amoeba/pkg-fun.nix} (100%) rename pkgs/{games/among-sus/default.nix => unit/am/among-sus/pkg-fun.nix} (100%) rename pkgs/{applications/editors/amp/default.nix => unit/am/amp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/amrnb/default.nix => unit/am/amrnb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/amrwb/default.nix => unit/am/amrwb/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ams-lv2/default.nix => unit/am/ams-lv2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ams/default.nix => unit/am/ams/pkg-fun.nix} (100%) rename pkgs/{development/libraries/amtk/default.nix => unit/am/amtk/pkg-fun.nix} (100%) rename pkgs/{tools/system/amtterm/default.nix => unit/am/amtterm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/p2p/amule/default.nix => unit/am/amule/pkg-fun.nix} (100%) rename pkgs/{tools/admin/analog/default.nix => unit/an/analog/pkg-fun.nix} (100%) rename pkgs/{misc/ananicy-cpp/default.nix => unit/an/ananicy-cpp/pkg-fun.nix} (100%) rename pkgs/{misc/ananicy/default.nix => unit/an/ananicy/pkg-fun.nix} (100%) rename pkgs/{data/documentation/anarchism/default.nix => unit/an/anarchism/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/anbox/default.nix => unit/an/anbox/pkg-fun.nix} (100%) rename pkgs/{data/fonts/andagii/default.nix => unit/an/andagii/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/anders/default.nix => unit/an/anders/pkg-fun.nix} (100%) rename pkgs/{data/fonts/andika/default.nix => unit/an/andika/pkg-fun.nix} (100%) rename pkgs/{tools/backup/android-backup-extractor/default.nix => unit/an/android-backup-extractor/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/android-udev-rules/default.nix => unit/an/android-udev-rules/pkg-fun.nix} (100%) rename pkgs/{games/andyetitmoves/default.nix => unit/an/andyetitmoves/pkg-fun.nix} (100%) rename pkgs/{tools/text/anewer/default.nix => unit/an/anewer/pkg-fun.nix} (100%) rename pkgs/{games/angband/default.nix => unit/an/angband/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/angelscript/default.nix => unit/an/angelscript/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/angelscript/2.22.nix => unit/an/angelscript_2_22/pkg-fun.nix} (100%) rename pkgs/{tools/text/angle-grinder/default.nix => unit/an/angle-grinder/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/angsd/default.nix => unit/an/angsd/pkg-fun.nix} (100%) rename pkgs/{applications/video/ani-cli/default.nix => unit/an/ani-cli/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/animbar/default.nix => unit/an/animbar/pkg-fun.nix} (100%) rename pkgs/{applications/video/anime-downloader/default.nix => unit/an/anime-downloader/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/an}/anime-downloader/update.sh (100%) rename pkgs/{data/fonts/ankacoder/condensed.nix => unit/an/ankacoder-condensed/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ankacoder/default.nix => unit/an/ankacoder/pkg-fun.nix} (100%) rename pkgs/{data/fonts/annapurna-sil/default.nix => unit/an/annapurna-sil/pkg-fun.nix} (100%) rename pkgs/{data/fonts/anonymous-pro/default.nix => unit/an/anonymousPro/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/ansible-language-server/default.nix => unit/an/ansible-language-server/pkg-fun.nix} (100%) rename pkgs/{tools/text/ansifilter/default.nix => unit/an/ansifilter/pkg-fun.nix} (100%) rename pkgs/{data/themes/ant-theme/ant-bloody.nix => unit/an/ant-bloody-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/ant-theme/ant-nebula.nix => unit/an/ant-nebula-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/ant-theme/ant.nix => unit/an/ant-theme/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ante/default.nix => unit/an/ante/pkg-fun.nix} (100%) rename pkgs/{applications/misc/antfs-cli/default.nix => unit/an/antfs-cli/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/anthy/default.nix => unit/an/anthy/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/antibody/default.nix => unit/an/antibody/pkg-fun.nix} (100%) rename pkgs/{development/libraries/antic/default.nix => unit/an/antic/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/antigen/default.nix => unit/an/antigen/pkg-fun.nix} (100%) rename pkgs/{applications/science/geometry/antiprism/default.nix => unit/an/antiprism/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/an}/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch (100%) rename pkgs/{applications/office/antiword/default.nix => unit/an/antiword/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/antlr => unit/an/antlr2}/2.7.7-fixes.patch (100%) rename pkgs/{development/tools/parsing/antlr/2.7.7.nix => unit/an/antlr2/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/antlr/3.4.nix => unit/an/antlr3_4/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/antlr/3.5.nix => unit/an/antlr3_5/pkg-fun.nix} (100%) rename pkgs/{development/tools/documentation/antora/default.nix => unit/an/antora/pkg-fun.nix} (100%) rename pkgs/{games/antsimulator/default.nix => unit/an/antsimulator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/AntTweakBar/default.nix => unit/an/anttweakbar/pkg-fun.nix} (100%) rename pkgs/{shells/any-nix-shell/default.nix => unit/an/any-nix-shell/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/anydesk/default.nix => unit/an/anydesk/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/an}/anystyle-cli/gemset.nix (100%) rename pkgs/{tools/misc/anystyle-cli/default.nix => unit/an/anystyle-cli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/anytype/default.nix => unit/an/anytype/pkg-fun.nix} (100%) rename pkgs/{servers/ldap/apache-directory-server/default.nix => unit/ap/apache-directory-server/pkg-fun.nix} (100%) rename pkgs/{applications/networking/apache-directory-studio/default.nix => unit/ap/apache-directory-studio/pkg-fun.nix} (100%) rename pkgs/{development/compilers/apache-flex-sdk/default.nix => unit/ap/apache-flex-sdk/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/apache-ant/default.nix => unit/ap/apacheAnt/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/apache-ant/1.9.nix => unit/ap/apacheAnt_1_9/pkg-fun.nix} (100%) rename pkgs/{servers/http/apache-httpd/2.4.nix => unit/ap/apacheHttpd_2_4/pkg-fun.nix} (100%) rename pkgs/{servers/apcupsd/default.nix => unit/ap/apcupsd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/apfel/default.nix => unit/ap/apfel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/apfelgrid/default.nix => unit/ap/apfelgrid/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/apfs-fuse/default.nix => unit/ap/apfs-fuse/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/apfsprogs/default.nix => unit/ap/apfsprogs/pkg-fun.nix} (100%) rename pkgs/{tools/security/apg/default.nix => unit/ap/apg/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/apgdiff/default.nix => unit/ap/apgdiff/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/apkg/default.nix => unit/ap/apkg/pkg-fun.nix} (100%) rename pkgs/{development/tools/apkid/default.nix => unit/ap/apkid/pkg-fun.nix} (100%) rename pkgs/{tools/security/apkleaks/default.nix => unit/ap/apkleaks/pkg-fun.nix} (100%) rename pkgs/{development/tools/apko/default.nix => unit/ap/apko/pkg-fun.nix} (100%) rename pkgs/{development/tools/apksigcopier/default.nix => unit/ap/apksigcopier/pkg-fun.nix} (100%) rename pkgs/{development/tools/apksigner/default.nix => unit/ap/apksigner/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/apngasm/default.nix => unit/ap/apngasm/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/apngasm/2.nix => unit/ap/apngasm_2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/apparix/default.nix => unit/ap/apparix/pkg-fun.nix} (100%) rename pkgs/{servers/home-assistant/appdaemon.nix => unit/ap/appdaemon/pkg-fun.nix} (100%) rename pkgs/{applications/misc/appeditor/default.nix => unit/ap/appeditor/pkg-fun.nix} (100%) rename pkgs/{applications/office/appflowy/default.nix => unit/ap/appflowy/pkg-fun.nix} (100%) rename pkgs/{applications/networking/appgate-sdp/default.nix => unit/ap/appgate-sdp/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/appimage-run/default.nix => unit/ap/appimage-run/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/ap}/appimagekit/nix.patch (100%) rename pkgs/{tools/package-management/appimagekit/default.nix => unit/ap/appimagekit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/appindicator-sharp/default.nix => unit/ap/appindicator-sharp/pkg-fun.nix} (100%) rename pkgs/{data/icons/apple-cursor/default.nix => unit/ap/apple-cursor/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ap}/appstream-glib/paths.patch (100%) rename pkgs/{development/libraries/appstream-glib/default.nix => unit/ap/appstream-glib/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ap}/appstream/fix-paths.patch (100%) rename pkgs/{development/libraries => unit/ap}/appstream/installed-tests-path.patch (100%) rename pkgs/{development/libraries/appstream/default.nix => unit/ap/appstream/pkg-fun.nix} (100%) rename pkgs/{development/tools/appthreat-depscan/default.nix => unit/ap/appthreat-depscan/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization => unit/ap}/appvm/0001-Remove-menu-bar.patch (100%) rename pkgs/{applications/virtualization => unit/ap}/appvm/0002-Do-not-grab-keyboard-mouse.patch (100%) rename pkgs/{applications/virtualization => unit/ap}/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch (100%) rename pkgs/{applications/virtualization => unit/ap}/appvm/0004-Use-title-application-name-as-subtitle.patch (100%) rename pkgs/{applications/virtualization/appvm/default.nix => unit/ap/appvm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/apr-util => unit/ap/aprutil}/fix-libxcrypt-build.patch (100%) rename pkgs/{development/libraries/apr-util => unit/ap/aprutil}/include-static-dependencies.patch (100%) rename pkgs/{development/libraries/apr-util/default.nix => unit/ap/aprutil/pkg-fun.nix} (100%) rename pkgs/{servers/http/apt-cacher-ng/default.nix => unit/ap/apt-cacher-ng/pkg-fun.nix} (100%) rename pkgs/{tools/misc/apt-offline/default.nix => unit/ap/apt-offline/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/apt/default.nix => unit/ap/apt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aptdec/default.nix => unit/ap/aptdec/pkg-fun.nix} (100%) rename pkgs/{tools/misc/aptly/default.nix => unit/ap/aptly/pkg-fun.nix} (100%) rename pkgs/{misc/apulse/default.nix => unit/ap/apulse/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ap}/apvlv/fix-build-with-poppler-0.73.0.patch (100%) rename pkgs/{applications/misc/apvlv/default.nix => unit/ap/apvlv/pkg-fun.nix} (100%) rename pkgs/{tools/misc/aquosctl/default.nix => unit/aq/aquosctl/pkg-fun.nix} (100%) rename pkgs/{development/compilers/arachne-pnr/default.nix => unit/ar/arachne-pnr/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/aragorn/default.nix => unit/ar/aragorn/pkg-fun.nix} (100%) rename pkgs/{tools/X11/arandr/default.nix => unit/ar/arandr/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/arangodb/default.nix => unit/ar/arangodb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aravis/default.nix => unit/ar/aravis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/arb/default.nix => unit/ar/arb/pkg-fun.nix} (100%) rename pkgs/{data/icons/arc-icon-theme/default.nix => unit/ar/arc-icon-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/arc-kde/default.nix => unit/ar/arc-kde-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/arc/default.nix => unit/ar/arc-theme/pkg-fun.nix} (100%) rename pkgs/{tools/misc/arch-install-scripts/default.nix => unit/ar/arch-install-scripts/pkg-fun.nix} (100%) rename pkgs/{tools/misc/archi/default.nix => unit/ar/archi/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/archimedes/default.nix => unit/ar/archimedes/pkg-fun.nix} (100%) rename pkgs/{applications/misc/archivebox/default.nix => unit/ar/archivebox/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/archivemount/default.nix => unit/ar/archivemount/pkg-fun.nix} (100%) rename pkgs/{applications/misc/archiver/default.nix => unit/ar/archiver/pkg-fun.nix} (100%) rename pkgs/{applications/misc/archivy/default.nix => unit/ar/archivy/pkg-fun.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-ci/default.nix => unit/ar/arduino-ci/pkg-fun.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-cli/default.nix => unit/ar/arduino-cli/pkg-fun.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-core => unit/ar/arduino-core-unwrapped}/downloads.nix (100%) rename pkgs/{development/embedded/arduino/arduino-core/default.nix => unit/ar/arduino-core-unwrapped/pkg-fun.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-core/chrootenv.nix => unit/ar/arduino-core/pkg-fun.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-language-server/default.nix => unit/ar/arduino-language-server/pkg-fun.nix} (100%) rename pkgs/{development/embedded/arduino/arduino-mk/default.nix => unit/ar/arduino-mk/pkg-fun.nix} (100%) rename pkgs/{games/arena/default.nix => unit/ar/arena/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ar}/argagg/0001-catch.diff (100%) rename pkgs/{development/libraries/argagg/default.nix => unit/ar/argagg/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/argbash/default.nix => unit/ar/argbash/pkg-fun.nix} (100%) rename pkgs/{development/tools/argc/default.nix => unit/ar/argc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/argo-rollouts/default.nix => unit/ar/argo-rollouts/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/argo/default.nix => unit/ar/argo/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/ar}/argo/staticfiles.go.mod (100%) rename pkgs/{applications/networking/cluster/argocd-autopilot/default.nix => unit/ar/argocd-autopilot/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/argocd/default.nix => unit/ar/argocd/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ar}/argononed/fix-hardcoded-reboot-poweroff-paths.patch (100%) rename pkgs/{misc/drivers/argononed/default.nix => unit/ar/argononed/pkg-fun.nix} (100%) rename pkgs/{development/libraries/argp-standalone/default.nix => unit/ar/argp-standalone/pkg-fun.nix} (100%) rename pkgs/{development/libraries/argparse/default.nix => unit/ar/argparse/pkg-fun.nix} (100%) rename pkgs/{development/libraries/argtable/default.nix => unit/ar/argtable/pkg-fun.nix} (100%) rename pkgs/{development/libraries/arguments/default.nix => unit/ar/arguments/pkg-fun.nix} (100%) rename pkgs/{tools/networking/argus-clients/default.nix => unit/ar/argus-clients/pkg-fun.nix} (100%) rename pkgs/{tools/networking/argus/default.nix => unit/ar/argus/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/argyllcms/default.nix => unit/ar/argyllcms/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ario/default.nix => unit/ar/ario/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/arion/default.nix => unit/ar/arion/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/arkade/default.nix => unit/ar/arkade/pkg-fun.nix} (100%) rename pkgs/{data/fonts/arkpandora/default.nix => unit/ar/arkpandora_ttf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/armadillo/default.nix => unit/ar/armadillo/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ar}/armadillo/use-unix-config-on-OS-X.patch (100%) rename pkgs/{applications/networking/instant-messengers/armcord/default.nix => unit/ar/armcord/pkg-fun.nix} (100%) rename pkgs/{tools/misc/arp-scan/default.nix => unit/ar/arp-scan/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/arpa2cm/default.nix => unit/ar/arpa2cm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/arpa2common/default.nix => unit/ar/arpa2common/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/arpack/default.nix => unit/ar/arpack/pkg-fun.nix} (100%) rename pkgs/{tools/networking/arping/default.nix => unit/ar/arping/pkg-fun.nix} (100%) rename pkgs/{tools/networking/arpoison/default.nix => unit/ar/arpoison/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ar}/arrayfire/no-download.patch (100%) rename pkgs/{development/libraries/arrayfire/default.nix => unit/ar/arrayfire/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ar}/arrow-cpp/darwin.patch (100%) rename pkgs/{development/libraries/arrow-cpp/default.nix => unit/ar/arrow-cpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/arrow-glib/default.nix => unit/ar/arrow-glib/pkg-fun.nix} (100%) rename pkgs/{tools/security/arsenal/default.nix => unit/ar/arsenal/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/artem/default.nix => unit/ar/artem/pkg-fun.nix} (100%) rename pkgs/{applications/misc/artha/default.nix => unit/ar/artha/pkg-fun.nix} (100%) rename pkgs/{data/themes/artim-dark/default.nix => unit/ar/artim-dark/pkg-fun.nix} (100%) rename pkgs/{applications/audio/artyFX/default.nix => unit/ar/artyFX/pkg-fun.nix} (100%) rename pkgs/{tools/security/arubaotp-seed-extractor/default.nix => unit/ar/arubaotp-seed-extractor/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/as}/as-tree/cargo-lock.patch (100%) rename pkgs/{tools/misc/as-tree/default.nix => unit/as/as-tree/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/as}/as31/0000-getline-break.patch (100%) rename pkgs/{development/compilers/as31/default.nix => unit/as/as31/pkg-fun.nix} (100%) rename pkgs/{tools/audio/asap/default.nix => unit/as/asap/pkg-fun.nix} (100%) rename pkgs/{tools/security/asc-key-to-qr-code-gif/default.nix => unit/as/asc-key-to-qr-code-gif/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/ascii-image-converter/default.nix => unit/as/ascii-image-converter/pkg-fun.nix} (100%) rename pkgs/{tools/text/ascii/default.nix => unit/as/ascii/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting => unit/as}/asciidoctor-with-extensions/Gemfile (100%) rename pkgs/{tools/typesetting => unit/as}/asciidoctor-with-extensions/Gemfile.lock (100%) rename pkgs/{tools/typesetting => unit/as}/asciidoctor-with-extensions/gemset.nix (100%) rename pkgs/{tools/typesetting/asciidoctor-with-extensions/default.nix => unit/as/asciidoctor-with-extensions/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/asciidoctorj/default.nix => unit/as/asciidoctorj/pkg-fun.nix} (100%) rename pkgs/{tools/text/asciigraph/default.nix => unit/as/asciigraph/pkg-fun.nix} (100%) rename pkgs/{tools/misc/asciinema-scenario/default.nix => unit/as/asciinema-scenario/pkg-fun.nix} (100%) rename pkgs/{tools/misc/asciinema/default.nix => unit/as/asciinema/pkg-fun.nix} (100%) rename pkgs/{applications/misc/asciiquarium/default.nix => unit/as/asciiquarium/pkg-fun.nix} (100%) rename pkgs/{tools/misc/asdf-vm/default.nix => unit/as/asdf-vm/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/as}/aseprite/allegro-glibc-2.30.patch (100%) rename pkgs/{applications/editors/aseprite/default.nix => unit/as/aseprite/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/as}/aseprite/skia-deps.nix (100%) rename pkgs/{applications/editors => unit/as}/aseprite/skia.nix (100%) rename pkgs/{os-specific/linux/aseq2json/default.nix => unit/as/aseq2json/pkg-fun.nix} (100%) rename pkgs/{development/tools/ashpd-demo/default.nix => unit/as/ashpd-demo/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ashuffle/default.nix => unit/as/ashuffle/pkg-fun.nix} (100%) rename pkgs/{tools/misc/askalono/default.nix => unit/as/askalono/pkg-fun.nix} (100%) rename pkgs/{tools/networking/asleap/default.nix => unit/as/asleap/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/asls/default.nix => unit/as/asls/pkg-fun.nix} (100%) rename pkgs/{development/tools/asmfmt/default.nix => unit/as/asmfmt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/asmjit/default.nix => unit/as/asmjit/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/as}/asmrepl/Gemfile (100%) rename pkgs/{development/interpreters => unit/as}/asmrepl/Gemfile.lock (100%) rename pkgs/{development/interpreters => unit/as}/asmrepl/gemset.nix (100%) rename pkgs/{development/interpreters/asmrepl/default.nix => unit/as/asmrepl/pkg-fun.nix} (100%) rename pkgs/{applications/networking/asn/default.nix => unit/as/asn/pkg-fun.nix} (100%) rename pkgs/{development/compilers/asn1c/default.nix => unit/as/asn1c/pkg-fun.nix} (100%) rename pkgs/{tools/security/asnmap/default.nix => unit/as/asnmap/pkg-fun.nix} (100%) rename pkgs/{servers/asouldocs/default.nix => unit/as/asouldocs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/aspcud/default.nix => unit/as/aspcud/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/as}/aspectj/builder.sh (100%) rename pkgs/{development/compilers/aspectj/default.nix => unit/as/aspectj/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/as}/aspell/clang.patch (100%) rename pkgs/{development/libraries => unit/as}/aspell/data-dirs-from-nix-profiles.patch (100%) rename pkgs/{development/libraries/aspell/default.nix => unit/as/aspell/pkg-fun.nix} (100%) rename pkgs/{games/assaultcube/default.nix => unit/as/assaultcube/pkg-fun.nix} (100%) rename pkgs/{tools/networking/assh/default.nix => unit/as/assh/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/assign-lb-ip/default.nix => unit/as/assign-lb-ip/pkg-fun.nix} (100%) rename pkgs/{development/libraries/assimp/default.nix => unit/as/assimp/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/astc-encoder/default.nix => unit/as/astc-encoder/pkg-fun.nix} (100%) rename pkgs/{servers/asterisk/sccp/default.nix => unit/as/asterisk-module-sccp/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/astral/default.nix => unit/as/astral/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/astrolabe-generator/default.nix => unit/as/astrolabe-generator/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/astrolog/default.nix => unit/as/astrolog/pkg-fun.nix} (100%) rename pkgs/{games/astromenace/default.nix => unit/as/astromenace/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/astyle/default.nix => unit/as/astyle/pkg-fun.nix} (100%) rename pkgs/{applications/audio/asunder/default.nix => unit/as/asunder/pkg-fun.nix} (100%) rename pkgs/{applications/system/asusctl/default.nix => unit/as/asusctl/pkg-fun.nix} (100%) rename pkgs/{development/tools/async-profiler/default.nix => unit/as/async-profiler/pkg-fun.nix} (100%) rename pkgs/{development/tools/async/default.nix => unit/as/async/pkg-fun.nix} (100%) rename pkgs/{development/libraries/at-spi2-core/default.nix => unit/at/at-spi2-core/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/at}/at/install.patch (100%) rename pkgs/{tools/system/at/default.nix => unit/at/at/pkg-fun.nix} (100%) rename pkgs/{games/atanks/default.nix => unit/at/atanks/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/atari800/default.nix => unit/at/atari800/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/atari++/default.nix => unit/at/ataripp/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/at}/atasm/0000-file-not-found.diff (100%) rename pkgs/{development/compilers => unit/at}/atasm/0001-select-flags.diff (100%) rename pkgs/{development/compilers/atasm/default.nix => unit/at/atasm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/atftp/default.nix => unit/at/atftp/pkg-fun.nix} (100%) rename pkgs/{servers/irc/atheme/default.nix => unit/at/atheme/pkg-fun.nix} (100%) rename pkgs/{tools/networking/atinout/default.nix => unit/at/atinout/pkg-fun.nix} (100%) rename pkgs/{data/fonts/atkinson-hyperlegible/default.nix => unit/at/atkinson-hyperlegible/pkg-fun.nix} (100%) rename pkgs/{development/libraries/atkmm/default.nix => unit/at/atkmm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/atkmm/2.36.nix => unit/at/atkmm_2_36/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/atlantis/default.nix => unit/at/atlantis/pkg-fun.nix} (100%) rename pkgs/{servers/atlassian/bamboo.nix => unit/at/atlassian-bamboo/pkg-fun.nix} (100%) rename pkgs/{applications/office/atlassian-cli/default.nix => unit/at/atlassian-cli/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/at}/atlassian-cli/wrapper.sh (100%) rename pkgs/{servers/atlassian/confluence.nix => unit/at/atlassian-confluence/pkg-fun.nix} (100%) rename pkgs/{servers/atlassian/crowd.nix => unit/at/atlassian-crowd/pkg-fun.nix} (100%) rename pkgs/{servers/atlassian/jira.nix => unit/at/atlassian-jira/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/atmos/default.nix => unit/at/atmos/pkg-fun.nix} (100%) rename pkgs/{applications/editors/atom/env.nix => unit/at/atomEnv/pkg-fun.nix} (100%) rename pkgs/{tools/security/atomic-operator/default.nix => unit/at/atomic-operator/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/atool/default.nix => unit/at/atool/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/at}/atop/atop.service.patch (100%) rename pkgs/{os-specific/linux => unit/at}/atop/atopacct.service.patch (100%) rename pkgs/{os-specific/linux => unit/at}/atop/fix-paths.patch (100%) rename pkgs/{os-specific/linux/atop/default.nix => unit/at/atop/pkg-fun.nix} (100%) rename pkgs/{development/tools/ats-acc/default.nix => unit/at/ats-acc/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/at}/ats/install-atsdoc-hats-files.patch (100%) rename pkgs/{development/compilers/ats/default.nix => unit/at/ats/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ats2/default.nix => unit/at/ats2/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/at}/ats2/setup-contrib-hook.sh (100%) rename pkgs/{development/compilers => unit/at}/ats2/setup-hook.sh (100%) rename pkgs/{applications/misc/ape/clex.nix => unit/at/attemptoClex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/attr/default.nix => unit/at/attr/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/attract-mode/default.nix => unit/at/attract-mode/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aubio/default.nix => unit/au/aubio/pkg-fun.nix} (100%) rename pkgs/{applications/audio/aucatctl/default.nix => unit/au/aucatctl/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/auctex/default.nix => unit/au/auctex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audiality2/default.nix => unit/au/audiality2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/audible-cli/default.nix => unit/au/audible-cli/pkg-fun.nix} (100%) rename pkgs/{applications/audio/audio-recorder/default.nix => unit/au/audio-recorder/pkg-fun.nix} (100%) rename pkgs/{tools/audio/audiowaveform/default.nix => unit/au/audiowaveform/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/au}/audit/patches/weak-symbols.patch (100%) rename pkgs/{os-specific/linux/audit/default.nix => unit/au/audit/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/auditwheel/default.nix => unit/au/auditwheel/pkg-fun.nix} (100%) rename pkgs/{tools/system/augeas/default.nix => unit/au/augeas/pkg-fun.nix} (100%) rename pkgs/{games/augustus/default.nix => unit/au/augustus/pkg-fun.nix} (100%) rename pkgs/{data/fonts/aurulent-sans/default.nix => unit/au/aurulent-sans/pkg-fun.nix} (100%) rename pkgs/{tools/admin/auth0-cli/default.nix => unit/au/auth0-cli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/authenticator/default.nix => unit/au/authenticator/pkg-fun.nix} (100%) rename pkgs/{applications/misc/authy/default.nix => unit/au/authy/pkg-fun.nix} (100%) rename pkgs/{tools/security/authz0/default.nix => unit/au/authz0/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/au}/auto-cpufreq/fix-version-output.patch (100%) rename pkgs/{tools/system/auto-cpufreq/default.nix => unit/au/auto-cpufreq/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/au}/auto-cpufreq/prevent-install-and-copy.patch (100%) rename pkgs/{applications/misc/auto-multiple-choice/default.nix => unit/au/auto-multiple-choice/pkg-fun.nix} (100%) rename pkgs/{misc/autoadb/default.nix => unit/au/autoadb/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autobuild/default.nix => unit/au/autobuild/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autoconf-archive/default.nix => unit/au/autoconf-archive/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autoconf/2.13.nix => unit/au/autoconf213/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autoconf/2.64.nix => unit/au/autoconf264/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autoconf/2.69.nix => unit/au/autoconf269/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autoconf => unit/au/autoconf271}/2.71-fix-race.patch (100%) rename pkgs/{development/tools/misc/autoconf/default.nix => unit/au/autoconf271/pkg-fun.nix} (100%) rename pkgs/{tools/X11/autocutsel/default.nix => unit/au/autocutsel/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/autofs/default.nix => unit/au/autofs5/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/autogen/default.nix => unit/au/autogen/pkg-fun.nix} (100%) rename pkgs/{tools/misc/autojump/default.nix => unit/au/autojump/pkg-fun.nix} (100%) rename pkgs/{applications/office/autokey/default.nix => unit/au/autokey/pkg-fun.nix} (100%) rename pkgs/{tools/system/automatic-timezoned/default.nix => unit/au/automatic-timezoned/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/automaticcomponenttoolkit/default.nix => unit/au/automaticcomponenttoolkit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/automirror/default.nix => unit/au/automirror/pkg-fun.nix} (100%) rename pkgs/{tools/backup/automysqlbackup/default.nix => unit/au/automysqlbackup/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/autopanosiftc/default.nix => unit/au/autopanosiftc/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/au}/autorandr/0001-don-t-use-sys.executable.patch (100%) rename pkgs/{tools/misc/autorandr/default.nix => unit/au/autorandr/pkg-fun.nix} (100%) rename pkgs/{tools/backup/autorestic/default.nix => unit/au/autorestic/pkg-fun.nix} (100%) rename pkgs/{tools/misc/autorevision/default.nix => unit/au/autorevision/pkg-fun.nix} (100%) rename pkgs/{applications/misc/autospotting/default.nix => unit/au/autospotting/pkg-fun.nix} (100%) rename pkgs/{tools/networking/autossh/default.nix => unit/au/autossh/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/autosuspend/default.nix => unit/au/autosuspend/pkg-fun.nix} (100%) rename pkgs/{applications/audio/autotalent/default.nix => unit/au/autotalent/pkg-fun.nix} (100%) rename pkgs/{misc/autotiling-rs/default.nix => unit/au/autotiling-rs/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/au}/autotrace/autofig.nix (100%) rename pkgs/{applications/graphics/autotrace/default.nix => unit/au/autotrace/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/av-98/default.nix => unit/av/av-98/pkg-fun.nix} (100%) rename pkgs/{applications/misc/avalonia-ilspy/default.nix => unit/av/avalonia-ilspy/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/avfs/default.nix => unit/av/avfs/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/av}/aviator/bump-golang-x-sys.patch (100%) rename pkgs/{development/tools/misc/aviator/default.nix => unit/av/aviator/pkg-fun.nix} (100%) rename pkgs/{applications/misc/avizo/default.nix => unit/av/avizo/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/avocode/default.nix => unit/av/avocode/pkg-fun.nix} (100%) rename pkgs/{development/misc/avr8-burn-omat/default.nix => unit/av/avr8burnomat/pkg-fun.nix} (100%) rename pkgs/{development/compilers/avra/default.nix => unit/av/avra/pkg-fun.nix} (100%) rename pkgs/{development/embedded/avrdude/default.nix => unit/av/avrdude/pkg-fun.nix} (100%) rename pkgs/{applications/misc/avrdudess/default.nix => unit/av/avrdudess/pkg-fun.nix} (100%) rename pkgs/{development/libraries/avro-c/default.nix => unit/av/avro-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/avro-c++/default.nix => unit/av/avro-cpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/avro-tools/default.nix => unit/av/avro-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/awf/default.nix => unit/aw/awf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-auth/default.nix => unit/aw/aws-c-auth/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-common/default.nix => unit/aw/aws-c-common/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/aw}/aws-c-common/setup-hook.sh (100%) rename pkgs/{development/libraries/aws-c-compression/default.nix => unit/aw/aws-c-compression/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-event-stream/default.nix => unit/aw/aws-c-event-stream/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-http/default.nix => unit/aw/aws-c-http/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-mqtt/default.nix => unit/aw/aws-c-mqtt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-s3/default.nix => unit/aw/aws-c-s3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-c-sdkutils/default.nix => unit/aw/aws-c-sdkutils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/aws-checksums/default.nix => unit/aw/aws-checksums/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/aw}/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch (100%) rename pkgs/{development/libraries/aws-crt-cpp/default.nix => unit/aw/aws-crt-cpp/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/aw}/aws-env/deps.nix (100%) rename pkgs/{tools/admin/aws-env/default.nix => unit/aw/aws-env/pkg-fun.nix} (100%) rename pkgs/{tools/security/aws-iam-authenticator/default.nix => unit/aw/aws-iam-authenticator/pkg-fun.nix} (100%) rename pkgs/{tools/admin/aws-lambda-runtime-interface-emulator/default.nix => unit/aw/aws-lambda-rie/pkg-fun.nix} (100%) rename pkgs/{tools/admin/aws-nuke/default.nix => unit/aw/aws-nuke/pkg-fun.nix} (100%) rename pkgs/{tools/admin/aws-rotate-key/default.nix => unit/aw/aws-rotate-key/pkg-fun.nix} (100%) rename pkgs/{development/tools/aws-sam-cli/default.nix => unit/aw/aws-sam-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/aw}/aws-sam-cli/support-click-8-1.patch (100%) rename pkgs/{development/tools => unit/aw}/aws-sam-cli/use_forward_compatible_log_silencing.patch (100%) rename pkgs/{tools/admin/aws-sso-cli/default.nix => unit/aw/aws-sso-cli/pkg-fun.nix} (100%) rename pkgs/{tools/admin/aws-sso-creds/default.nix => unit/aw/aws-sso-creds/pkg-fun.nix} (100%) rename pkgs/{tools/admin/aws-vault/default.nix => unit/aw/aws-vault/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/aws-workspaces/default.nix => unit/aw/aws-workspaces/pkg-fun.nix} (100%) rename pkgs/{tools/misc/aws-mturk-clt/default.nix => unit/aw/aws_mturk_clt/pkg-fun.nix} (100%) rename pkgs/{tools/admin/awscli/default.nix => unit/aw/awscli/pkg-fun.nix} (100%) rename pkgs/{tools/admin/awscli2/default.nix => unit/aw/awscli2/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/awsebcli/default.nix => unit/aw/awsebcli/pkg-fun.nix} (100%) rename pkgs/{tools/admin/awslimitchecker/default.nix => unit/aw/awslimitchecker/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/aw}/awslimitchecker/version.patch (100%) rename pkgs/{tools/admin/awslogs/default.nix => unit/aw/awslogs/pkg-fun.nix} (100%) rename pkgs/{tools/admin/awsls/default.nix => unit/aw/awsls/pkg-fun.nix} (100%) rename pkgs/{tools/admin/awsrm/default.nix => unit/aw/awsrm/pkg-fun.nix} (100%) rename pkgs/{tools/system/awstats/default.nix => unit/aw/awstats/pkg-fun.nix} (100%) rename pkgs/{tools/admin/awsweeper/default.nix => unit/aw/awsweeper/pkg-fun.nix} (100%) rename pkgs/{applications/radio/ax25-apps/default.nix => unit/ax/ax25-apps/pkg-fun.nix} (100%) rename pkgs/{applications/radio/ax25-tools/default.nix => unit/ax/ax25-tools/pkg-fun.nix} (100%) rename pkgs/{servers/http/tomcat => unit/ax}/axis2/builder.sh (100%) rename pkgs/{servers/http/tomcat/axis2/default.nix => unit/ax/axis2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ayatana-ido/default.nix => unit/ay/ayatana-ido/pkg-fun.nix} (100%) rename pkgs/{data/themes/ayu-theme-gtk/default.nix => unit/ay/ayu-theme-gtk/pkg-fun.nix} (100%) rename pkgs/{games/azimuth/default.nix => unit/az/azimuth/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/azpainter/default.nix => unit/az/azpainter/pkg-fun.nix} (100%) rename pkgs/{tools/admin/azure-cli/default.nix => unit/az/azure-cli/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/az}/azure-cli/python-packages.nix (100%) rename pkgs/{development/tools/azure-functions-core-tools/default.nix => unit/az/azure-functions-core-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/azure-static-sites-client/default.nix => unit/az/azure-static-sites-client/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/az}/azure-static-sites-client/update.sh (100%) rename pkgs/{development/tools => unit/az}/azure-static-sites-client/versions.json (100%) rename pkgs/{development/tools/azcopy/default.nix => unit/az/azure-storage-azcopy/pkg-fun.nix} (100%) rename pkgs/{applications/misc/azuredatastudio/default.nix => unit/az/azuredatastudio/pkg-fun.nix} (100%) rename pkgs/{tools/security/b3sum/default.nix => unit/b3/b3sum/pkg-fun.nix} (100%) rename pkgs/{development/tools/b4/default.nix => unit/b4/b4/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/b43-firmware-cutter => unit/b4/b43FirmwareCutter}/no-root-install.patch (100%) rename pkgs/{os-specific/linux/firmware/b43-firmware-cutter/default.nix => unit/b4/b43FirmwareCutter/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/b43-firmware/5.1.138.nix => unit/b4/b43Firmware_5_1_138/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/b43-firmware/6.30.163.46.nix => unit/b4/b43Firmware_6_30_163_46/pkg-fun.nix} (100%) rename pkgs/{data/fonts/b612/default.nix => unit/b6/b612/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/clojure/babashka.nix => unit/ba/babashka/pkg-fun.nix} (100%) rename pkgs/{tools/networking/babeld/default.nix => unit/ba/babeld/pkg-fun.nix} (100%) rename pkgs/{shells/fish/babelfish.nix => unit/ba/babelfish/pkg-fun.nix} (100%) rename pkgs/{data/fonts/babelstone-han/default.nix => unit/ba/babelstone-han/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/babeltrace/default.nix => unit/ba/babeltrace/pkg-fun.nix} (100%) rename pkgs/{development/libraries/babl/default.nix => unit/ba/babl/pkg-fun.nix} (100%) rename pkgs/{development/tools/backblaze-b2/default.nix => unit/ba/backblaze-b2/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sync/backintime/common.nix => unit/ba/backintime-common/pkg-fun.nix} (100%) rename pkgs/{development/libraries/backward-cpp/default.nix => unit/ba/backward-cpp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bacnet-stack/default.nix => unit/ba/bacnet-stack/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/bada-bib/default.nix => unit/ba/bada-bib/pkg-fun.nix} (100%) rename pkgs/{tools/security/badrobot/default.nix => unit/ba/badrobot/pkg-fun.nix} (100%) rename pkgs/{tools/networking/badvpn/default.nix => unit/ba/badvpn/pkg-fun.nix} (100%) rename pkgs/{data/fonts/baekmuk-ttf/default.nix => unit/ba/baekmuk-ttf/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/ba}/baget/deps.nix (100%) rename pkgs/{servers/web-apps/baget/default.nix => unit/ba/baget/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/ba}/baget/updater.sh (100%) rename pkgs/{tools/backup/bakelite/default.nix => unit/ba/bakelite/pkg-fun.nix} (100%) rename pkgs/{data/fonts/bakoma-ttf/default.nix => unit/ba/bakoma_ttf/pkg-fun.nix} (100%) rename pkgs/{games/ballerburg/default.nix => unit/ba/ballerburg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/balsa/default.nix => unit/ba/balsa/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/bam/default.nix => unit/ba/bam/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bamf/default.nix => unit/ba/bamf/pkg-fun.nix} (100%) rename pkgs/{applications/office/banana-accounting/default.nix => unit/ba/banana-accounting/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bandwidth/default.nix => unit/ba/bandwidth/pkg-fun.nix} (100%) rename pkgs/{applications/office/banking/default.nix => unit/ba/banking/pkg-fun.nix} (100%) rename pkgs/{games/banner/default.nix => unit/ba/banner/pkg-fun.nix} (100%) rename pkgs/{tools/security/bao/default.nix => unit/ba/bao/pkg-fun.nix} (100%) rename pkgs/{tools/system/bar/default.nix => unit/ba/bar/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/barcode/default.nix => unit/ba/barcode/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/baresip/default.nix => unit/ba/baresip/pkg-fun.nix} (100%) rename pkgs/{data/fonts/barlow/default.nix => unit/ba/barlow/pkg-fun.nix} (100%) rename pkgs/{tools/misc/barman/default.nix => unit/ba/barman/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ba}/barman/unwrap-subprocess.patch (100%) rename pkgs/{games/lgames/barrage/default.nix => unit/ba/barrage/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bartib/default.nix => unit/ba/bartib/pkg-fun.nix} (100%) rename pkgs/{misc/base16-shell-preview/default.nix => unit/ba/base16-shell-preview/pkg-fun.nix} (100%) rename pkgs/{applications/misc/base16-universal-manager/default.nix => unit/ba/base16-universal-manager/pkg-fun.nix} (100%) rename pkgs/{servers/baserow/default.nix => unit/ba/baserow/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml => unit/ba}/basex/basex.svg (100%) rename pkgs/{tools/text/xml/basex/default.nix => unit/ba/basex/pkg-fun.nix} (100%) rename pkgs/{shells/bash/bash-completion/default.nix => unit/ba/bash-completion/pkg-fun.nix} (100%) rename pkgs/{tools/admin/bash-my-aws/default.nix => unit/ba/bash-my-aws/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bash/bash-preexec/default.nix => unit/ba/bash-preexec/pkg-fun.nix} (100%) rename pkgs/{tools/security/bash-supergenpass/default.nix => unit/ba/bash-supergenpass/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bashSnippets/default.nix => unit/ba/bashSnippets/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bash_unit/default.nix => unit/ba/bash_unit/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/ba}/bashblog/0001-Setting-markdown_bin.patch (100%) rename pkgs/{tools/text/bashblog/default.nix => unit/ba/bashblog/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bashcards/default.nix => unit/ba/bashcards/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/bashdb/default.nix => unit/ba/bashdb/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/bashmount/default.nix => unit/ba/bashmount/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bashplotlib/default.nix => unit/ba/bashplotlib/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/basiliskii/default.nix => unit/ba/basiliskii/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/ba}/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch (100%) rename pkgs/{games/bastet/default.nix => unit/ba/bastet/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/batik/default.nix => unit/ba/batik/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/ba}/bats/libraries.nix (100%) rename pkgs/{development/interpreters/bats/default.nix => unit/ba/bats/pkg-fun.nix} (100%) rename pkgs/{applications/misc/batsignal/default.nix => unit/ba/batsignal/pkg-fun.nix} (100%) rename pkgs/{applications/audio/baudline/default.nix => unit/ba/baudline/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bayescan/default.nix => unit/ba/bayescan/pkg-fun.nix} (100%) rename pkgs/{servers/bazarr/default.nix => unit/ba/bazarr/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/bazel/buildtools/default.nix => unit/ba/bazel-buildtools/pkg-fun.nix} (100%) rename pkgs/{development/tools/bazel-gazelle/default.nix => unit/ba/bazel-gazelle/pkg-fun.nix} (100%) rename pkgs/{development/tools/bazel-kazel/default.nix => unit/ba/bazel-kazel/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/bazel => unit/ba}/bazel-remote/disable_build_file_generation.patch (100%) rename pkgs/{development/tools/build-managers/bazel/bazel-remote/default.nix => unit/ba/bazel-remote/pkg-fun.nix} (100%) rename pkgs/{development/tools/bazelisk/default.nix => unit/ba/bazelisk/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bb/default.nix => unit/bb/bb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bbe/default.nix => unit/bb/bbe/pkg-fun.nix} (100%) rename pkgs/{development/tools/bbin/default.nix => unit/bb/bbin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bc-decaf/default.nix => unit/bc/bc-decaf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/soci/bc-soci.nix => unit/bc/bc-soci/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/bc}/bc/cross-bc.patch (100%) rename pkgs/{tools/misc/bc/default.nix => unit/bc/bc/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/bc}/bcache-tools/bcache-udev-modern.patch (100%) rename pkgs/{tools/filesystems => unit/bc}/bcache-tools/fix-static.patch (100%) rename pkgs/{tools/filesystems/bcache-tools/default.nix => unit/bc/bcache-tools/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/bcachefs-tools/default.nix => unit/bc/bcachefs-tools/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/bcal/default.nix => unit/bc/bcal/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bcftools/default.nix => unit/bc/bcftools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bcg729/default.nix => unit/bc/bcg729/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bchoppr/default.nix => unit/bc/bchoppr/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/bchunk/default.nix => unit/bc/bchunk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bctoolbox/default.nix => unit/bc/bctoolbox/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bcunit/default.nix => unit/bc/bcunit/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/build2/bdep.nix => unit/bd/bdep/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bdf2psf/default.nix => unit/bd/bdf2psf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bdf2sfd/default.nix => unit/bd/bdf2sfd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bdfresize/default.nix => unit/bd/bdfresize/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/bd}/bdfresize/remove-malloc-declaration.patch (100%) rename pkgs/{tools/backup/bdsync/default.nix => unit/bd/bdsync/pkg-fun.nix} (100%) rename pkgs/{games => unit/be}/BeatSaberModManager/add-runtime-identifier.patch (100%) rename pkgs/{games => unit/be}/BeatSaberModManager/deps.nix (100%) rename pkgs/{games/BeatSaberModManager/default.nix => unit/be/BeatSaberModManager/pkg-fun.nix} (100%) rename pkgs/{applications/office/beancount/bean-add.nix => unit/be/bean-add/pkg-fun.nix} (100%) rename pkgs/{applications/office/beancount/beancount-ing-diba.nix => unit/be/beancount-ing-diba/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/beancount-language-server/default.nix => unit/be/beancount-language-server/pkg-fun.nix} (100%) rename pkgs/{servers/beanstalkd/default.nix => unit/be/beanstalkd/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/be}/bear/no-double-relative.patch (100%) rename pkgs/{development/tools/build-managers/bear/default.nix => unit/be/bear/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bearssl/default.nix => unit/be/bearssl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/beats/default.nix => unit/be/beats/pkg-fun.nix} (100%) rename pkgs/{development/tools/beautysh/default.nix => unit/be/beautysh/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bedops/default.nix => unit/be/bedops/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bedtools/default.nix => unit/be/bedtools/pkg-fun.nix} (100%) rename pkgs/{applications/networking/bee => unit/be/bee-clef}/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch (100%) rename pkgs/{applications/networking/bee => unit/be/bee-clef}/0002-nix-diff-for-substituteAll.patch (100%) rename pkgs/{applications/networking/bee => unit/be/bee-clef}/ensure-clef-account (100%) rename pkgs/{applications/networking/bee/bee-clef.nix => unit/be/bee-clef/pkg-fun.nix} (100%) rename pkgs/{development/libraries/beecrypt/default.nix => unit/be/beecrypt/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/beefi/default.nix => unit/be/beefi/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/beekeeper-studio/default.nix => unit/be/beekeeper-studio/pkg-fun.nix} (100%) rename pkgs/{misc/beep/default.nix => unit/be/beep/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/be}/bees/bees-service-wrapper (100%) rename pkgs/{tools/filesystems/bees/default.nix => unit/be/bees/pkg-fun.nix} (100%) rename pkgs/{data/fonts/behdad-fonts/default.nix => unit/be/behdad-fonts/pkg-fun.nix} (100%) rename pkgs/{development/libraries/belcard/default.nix => unit/be/belcard/pkg-fun.nix} (100%) rename pkgs/{development/libraries/belle-sip/default.nix => unit/be/belle-sip/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/below/default.nix => unit/be/below/pkg-fun.nix} (100%) rename pkgs/{development/libraries/belr/default.nix => unit/be/belr/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/beluga/default.nix => unit/be/beluga/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bemenu/default.nix => unit/be/bemenu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bencodetools/default.nix => unit/be/bencodetools/pkg-fun.nix} (100%) rename pkgs/{development/tools/benthos/default.nix => unit/be/benthos/pkg-fun.nix} (100%) rename pkgs/{tools/video => unit/be}/bento4/libap4.patch (100%) rename pkgs/{tools/video/bento4/default.nix => unit/be/bento4/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bepasty/default.nix => unit/be/bepasty/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ocaml/ber-metaocaml.nix => unit/be/ber_metaocaml/pkg-fun.nix} (100%) rename pkgs/{tools/admin/berglas/default.nix => unit/be/berglas/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/berry/default.nix => unit/be/berry/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/besu/default.nix => unit/be/besu/pkg-fun.nix} (100%) rename pkgs/{applications/science/robotics/betaflight-configurator/default.nix => unit/be/betaflight-configurator/pkg-fun.nix} (100%) rename pkgs/{tools/security/bettercap/default.nix => unit/be/bettercap/pkg-fun.nix} (100%) rename pkgs/{tools/misc/betterdiscord-installer/default.nix => unit/be/betterdiscord-installer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/betterdiscordctl/default.nix => unit/be/betterdiscordctl/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/betterlockscreen/default.nix => unit/be/betterlockscreen/pkg-fun.nix} (100%) rename pkgs/{tools/X11/bevelbar/default.nix => unit/be/bevelbar/pkg-fun.nix} (100%) rename pkgs/{tools/security/beyond-identity/default.nix => unit/be/beyond-identity/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bfetch/default.nix => unit/bf/bfetch/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/bfg-repo-cleaner/default.nix => unit/bf/bfg-repo-cleaner/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bfr/default.nix => unit/bf/bfr/pkg-fun.nix} (100%) rename pkgs/{tools/system/bfs/default.nix => unit/bf/bfs/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bftools/default.nix => unit/bf/bftools/pkg-fun.nix} (100%) rename pkgs/{servers/ftp/bftpd/default.nix => unit/bf/bftpd/pkg-fun.nix} (100%) rename pkgs/{data/documentation/bgnet/default.nix => unit/bg/bgnet/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bgpdump/default.nix => unit/bg/bgpdump/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bgpq3/default.nix => unit/bg/bgpq3/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bgpq4/default.nix => unit/bg/bgpq4/pkg-fun.nix} (100%) rename pkgs/{tools/X11/bgs/default.nix => unit/bg/bgs/pkg-fun.nix} (100%) rename pkgs/{data/icons/bibata-cursors/translucent.nix => unit/bi/bibata-cursors-translucent/pkg-fun.nix} (100%) rename pkgs/{data/icons/bibata-cursors/extra.nix => unit/bi/bibata-extra-cursors/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/bibclean/default.nix => unit/bi/bibclean/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/biber/default.nix => unit/bi/biber/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/biblatex-check/default.nix => unit/bi/biblatex-check/pkg-fun.nix} (100%) rename pkgs/{development/libraries/biblesync/default.nix => unit/bi/biblesync/pkg-fun.nix} (100%) rename pkgs/{servers/xmpp => unit/bi}/biboumi/catch.patch (100%) rename pkgs/{servers/xmpp/biboumi/default.nix => unit/bi/biboumi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bibtex2html/default.nix => unit/bi/bibtex2html/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bibtool/default.nix => unit/bi/bibtool/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bibutils/default.nix => unit/bi/bibutils/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/bic/default.nix => unit/bi/bic/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bicon/default.nix => unit/bi/bicon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/biology/bicpl/default.nix => unit/bi/bicpl/pkg-fun.nix} (100%) rename pkgs/{development/compilers/bigloo/default.nix => unit/bi/bigloo/pkg-fun.nix} (100%) rename pkgs/{tools/security/binbloom/default.nix => unit/bi/binbloom/pkg-fun.nix} (100%) rename pkgs/{servers/dns => unit/bi}/bind/dont-keep-configure-flags.patch (100%) rename pkgs/{servers/dns/bind/default.nix => unit/bi/bind/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/bindfs/default.nix => unit/bi/bindfs/pkg-fun.nix} (100%) rename pkgs/{development/tools/bingo/default.nix => unit/bi/bingo/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/bingrep/default.nix => unit/bi/bingrep/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/binlore/default.nix => unit/bi/binlore/pkg-fun.nix} (100%) rename pkgs/{development/tools/biodiff/default.nix => unit/bi/biodiff/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/bi}/biosdevname/makefile.patch (100%) rename pkgs/{tools/networking/biosdevname/default.nix => unit/bi/biosdevname/pkg-fun.nix} (100%) rename pkgs/{servers/bird-lg/default.nix => unit/bi/bird-lg/pkg-fun.nix} (100%) rename pkgs/{servers => unit/bi}/bird/dont-create-sysconfdir-2.patch (100%) rename pkgs/{servers/bird/default.nix => unit/bi/bird/pkg-fun.nix} (100%) rename pkgs/{tools/misc/birdfont/default.nix => unit/bi/birdfont/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/bison/default.nix => unit/bi/bison/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/bisonc++/default.nix => unit/bi/bisoncpp/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/bisq-desktop/default.nix => unit/bi/bisq-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/bi}/bisq-desktop/update.sh (100%) rename pkgs/{applications/version-management/bit/default.nix => unit/bi/bit/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/bi}/bitbucket-server-cli/Gemfile (100%) rename pkgs/{applications/version-management => unit/bi}/bitbucket-server-cli/Gemfile.lock (100%) rename pkgs/{applications/version-management => unit/bi}/bitbucket-server-cli/gemset.nix (100%) rename pkgs/{applications/version-management/bitbucket-server-cli/default.nix => unit/bi/bitbucket-server-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bitlbee-discord/default.nix => unit/bi/bitlbee-discord/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bitlbee-facebook/default.nix => unit/bi/bitlbee-facebook/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bitlbee-mastodon/default.nix => unit/bi/bitlbee-mastodon/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bitlbee/plugins.nix => unit/bi/bitlbee-plugins/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bitlbee-steam/default.nix => unit/bi/bitlbee-steam/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bitlbee/default.nix => unit/bi/bitlbee/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bitmeter/default.nix => unit/bi/bitmeter/pkg-fun.nix} (100%) rename pkgs/{tools/security/bitwarden/default.nix => unit/bi/bitwarden/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bitwig-studio/bitwig-studio3.nix => unit/bi/bitwig-studio3/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bitwise/default.nix => unit/bi/bitwise/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/bitwuzla/default.nix => unit/bi/bitwuzla/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bjumblr/default.nix => unit/bj/bjumblr/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bklk/default.nix => unit/bk/bklk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bkyml/default.nix => unit/bk/bkyml/pkg-fun.nix} (100%) rename pkgs/{data/themes/blackbird/default.nix => unit/bl/blackbird/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators => unit/bl}/blackbox-terminal/marble.nix (100%) rename pkgs/{applications/terminal-emulators/blackbox-terminal/default.nix => unit/bl/blackbox-terminal/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/blackbox/default.nix => unit/bl/blackbox/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/blackfire/default.nix => unit/bl/blackfire/pkg-fun.nix} (100%) rename pkgs/{development/embedded => unit/bl}/blackmagic/helper.sh (100%) rename pkgs/{development/embedded/blackmagic/default.nix => unit/bl/blackmagic/pkg-fun.nix} (100%) rename pkgs/{games/blackshades/default.nix => unit/bl/blackshades/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/blahtexml/default.nix => unit/bl/blahtexml/pkg-fun.nix} (100%) rename pkgs/{applications/audio/blanket/default.nix => unit/bl/blanket/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/blas/default.nix => unit/bl/blas-reference/pkg-fun.nix} (100%) rename pkgs/{build-support/alternatives/blas/default.nix => unit/bl/blas/pkg-fun.nix} (100%) rename pkgs/{development/libraries/blaze/default.nix => unit/bl/blaze/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bleachbit/default.nix => unit/bl/bleachbit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/blender/wrapper.nix => unit/bl/blender-with-packages/pkg-fun.nix} (100%) rename pkgs/{shells/bash/blesh/default.nix => unit/bl/blesh/pkg-fun.nix} (100%) rename pkgs/{applications/editors/bless/default.nix => unit/bl/bless/pkg-fun.nix} (100%) rename pkgs/{tools/misc/blflash/default.nix => unit/bl/blflash/pkg-fun.nix} (100%) rename pkgs/{tools/misc/blink1-tool/default.nix => unit/bl/blink1-tool/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/blis/default.nix => unit/bl/blis/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/bliss/default.nix => unit/bl/bliss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/blitz/default.nix => unit/bl/blitz/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/blktrace/default.nix => unit/bl/blktrace/pkg-fun.nix} (100%) rename pkgs/{servers/bloat/default.nix => unit/bl/bloat/pkg-fun.nix} (100%) rename pkgs/{development/tools/bloaty/default.nix => unit/bl/bloaty/pkg-fun.nix} (100%) rename pkgs/{games => unit/bl}/blobby/blobby.sh (100%) rename pkgs/{games/blobby/default.nix => unit/bl/blobby/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/bl}/blobfuse/install-adls.patch (100%) rename pkgs/{tools/filesystems/blobfuse/default.nix => unit/bl/blobfuse/pkg-fun.nix} (100%) rename pkgs/{games/blobwars/default.nix => unit/bl/blobwars/pkg-fun.nix} (100%) rename pkgs/{games/blockattack/default.nix => unit/bl/blockattack/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/blockbench-electron/default.nix => unit/bl/blockbench-electron/pkg-fun.nix} (100%) rename pkgs/{servers/blockbook/default.nix => unit/bl/blockbook/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/blockhash/default.nix => unit/bl/blockhash/pkg-fun.nix} (100%) rename pkgs/{applications/networking/blocky/default.nix => unit/bl/blocky/pkg-fun.nix} (100%) rename pkgs/{applications/misc/blogc/default.nix => unit/bl/blogc/pkg-fun.nix} (100%) rename pkgs/{games/xpilot/bloodspilot-client.nix => unit/bl/bloodspilot-client/pkg-fun.nix} (100%) rename pkgs/{games/xpilot/bloodspilot-server.nix => unit/bl/bloodspilot-server/pkg-fun.nix} (100%) rename pkgs/{games/xpilot => unit/bl/bloodspilot-server}/server-gcc5.patch (100%) rename pkgs/{development/web/bloomrpc/default.nix => unit/bl/bloomrpc/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/bloop/default.nix => unit/bl/bloop/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/blueberry/default.nix => unit/bl/blueberry/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bluejeans => unit/bl/bluejeans-gui}/localtime64_stub.c (100%) rename pkgs/{applications/networking/instant-messengers/bluejeans/default.nix => unit/bl/bluejeans-gui/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/bluejeans => unit/bl/bluejeans-gui}/update.sh (100%) rename pkgs/{applications/networking/mailreaders/bluemail/default.nix => unit/bl/bluemail/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/blueman/default.nix => unit/bl/blueman/pkg-fun.nix} (100%) rename pkgs/{tools/admin/bluemix-cli/default.nix => unit/bl/bluemix-cli/pkg-fun.nix} (100%) rename pkgs/{development/compilers/blueprint/default.nix => unit/bl/blueprint-compiler/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/bluetuith/default.nix => unit/bl/bluetuith/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/bluewalker/default.nix => unit/bl/bluewalker/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/bluez-alsa/default.nix => unit/bl/bluez-alsa/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/bluez-tools/default.nix => unit/bl/bluez-tools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/blugon/default.nix => unit/bl/blugon/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/blur-effect/default.nix => unit/bl/blur-effect/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/bm}/bmake/bootstrap-fix.patch (100%) rename pkgs/{development/tools/build-managers => unit/bm}/bmake/fix-localtime-test.patch (100%) rename pkgs/{development/tools/build-managers => unit/bm}/bmake/fix-unexport-env-test.patch (100%) rename pkgs/{development/tools/build-managers/bmake/default.nix => unit/bm/bmake/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/bm}/bmake/setup-hook.sh (100%) rename pkgs/{development/tools/build-managers => unit/bm}/bmake/unconditional-ksh-test.patch (100%) rename pkgs/{tools/misc/bmap-tools/default.nix => unit/bm/bmap-tools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bmon/default.nix => unit/bm/bmon/pkg-fun.nix} (100%) rename pkgs/{tools/security/bmrsa/11.nix => unit/bm/bmrsa/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/bob/default.nix => unit/bo/bob/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boca/default.nix => unit/bo/boca/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boehm-gc/default.nix => unit/bo/boehmgc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bogofilter/default.nix => unit/bo/bogofilter/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/boinc/default.nix => unit/bo/boinc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/bo}/bolt/0001-skip-mkdir.patch (100%) rename pkgs/{os-specific/linux/bolt/default.nix => unit/bo/bolt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/boltbrowser/default.nix => unit/bo/boltbrowser/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/bombadillo/default.nix => unit/bo/bombadillo/pkg-fun.nix} (100%) rename pkgs/{development/tools/bomber-go/default.nix => unit/bo/bomber-go/pkg-fun.nix} (100%) rename pkgs/{applications/video/bombono/default.nix => unit/bo/bombono/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/bomutils/default.nix => unit/bo/bomutils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/bonmin/default.nix => unit/bo/bonmin/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/bo}/bonnmotion/install.patch (100%) rename pkgs/{development/tools/misc/bonnmotion/default.nix => unit/bo/bonnmotion/pkg-fun.nix} (100%) rename pkgs/{applications/editors/bonzomatic/default.nix => unit/bo/bonzomatic/pkg-fun.nix} (100%) rename pkgs/{tools/security/boofuzz/default.nix => unit/bo/boofuzz/pkg-fun.nix} (100%) rename pkgs/{games => unit/bo}/boohu/deps.nix (100%) rename pkgs/{games/boohu/default.nix => unit/bo/boohu/pkg-fun.nix} (100%) rename pkgs/{tools/text/book-summary/default.nix => unit/bo/book-summary/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/bo}/bookletimposer/configdir.patch (100%) rename pkgs/{applications/office => unit/bo}/bookletimposer/i18n.patch (100%) rename pkgs/{applications/office/bookletimposer/default.nix => unit/bo/bookletimposer/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/bo}/bookstack/composer-env.nix (100%) rename pkgs/{servers/web-apps => unit/bo}/bookstack/composition.nix (100%) rename pkgs/{servers/web-apps => unit/bo}/bookstack/php-packages.nix (100%) rename pkgs/{servers/web-apps/bookstack/default.nix => unit/bo/bookstack/pkg-fun.nix} (100%) rename pkgs/{applications/office/bookworm/default.nix => unit/bo/bookworm/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/bo}/boolector/cmake-gtest.patch (100%) rename pkgs/{applications/science/logic/boolector/default.nix => unit/bo/boolector/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boolstuff/default.nix => unit/bo/boolstuff/pkg-fun.nix} (100%) rename pkgs/{applications/audio/boops/default.nix => unit/bo/boops/pkg-fun.nix} (100%) rename pkgs/{development/tools/boost-build/default.nix => unit/bo/boost-build/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boost-ext/boost-sml/default.nix => unit/bo/boost-sml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boost-process/default.nix => unit/bo/boost_process/pkg-fun.nix} (100%) rename pkgs/{applications/system/booster/default.nix => unit/bo/booster/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/bo}/boot/builder.sh (100%) rename pkgs/{development/tools/build-managers/boot/default.nix => unit/bo/boot/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bootil/default.nix => unit/bo/bootil/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/bootiso/default.nix => unit/bo/bootiso/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bootspec/default.nix => unit/bo/bootspec/pkg-fun.nix} (100%) rename pkgs/{development/web/bootstrap-studio/default.nix => unit/bo/bootstrap-studio/pkg-fun.nix} (100%) rename pkgs/{data/fonts/borg-sans-mono/default.nix => unit/bo/borg-sans-mono/pkg-fun.nix} (100%) rename pkgs/{tools/backup/borgbackup/default.nix => unit/bo/borgbackup/pkg-fun.nix} (100%) rename pkgs/{tools/backup/borgmatic/default.nix => unit/bo/borgmatic/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boringssl/default.nix => unit/bo/boringssl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/boringtun/default.nix => unit/bo/boringtun/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/boron/default.nix => unit/bo/boron/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/bosh-cli/default.nix => unit/bo/bosh-cli/pkg-fun.nix} (100%) rename pkgs/{development/embedded/bossa/arduino.nix => unit/bo/bossa-arduino/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/bosun/default.nix => unit/bo/bosun/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bottles/default.nix => unit/bo/bottles-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bottles => unit/bo/bottles-unwrapped}/vulkan_icd.patch (100%) rename pkgs/{applications/misc/bottles/fhsenv.nix => unit/bo/bottles/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bottom-rs/default.nix => unit/bo/bottom-rs/pkg-fun.nix} (100%) rename pkgs/{tools/system/bottom/default.nix => unit/bo/bottom/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/bo}/boulder/no-build-id-test.patch (100%) rename pkgs/{tools/admin/boulder/default.nix => unit/bo/boulder/pkg-fun.nix} (100%) rename pkgs/{tools/networking/boundary/default.nix => unit/bo/boundary/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/bo}/boundary/update.sh (100%) rename pkgs/{applications/science/biology/bowtie/default.nix => unit/bo/bowtie/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bowtie2/default.nix => unit/bo/bowtie2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/box2d/default.nix => unit/bo/box2d/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/box64/default.nix => unit/bo/box64/pkg-fun.nix} (100%) rename pkgs/{tools/text/boxes/default.nix => unit/bo/boxes/pkg-fun.nix} (100%) rename pkgs/{development/libraries/boxfort/default.nix => unit/bo/boxfort/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/boxfs/default.nix => unit/bo/boxfs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/bo}/boxfs/work-around-API-borkage.patch (100%) rename pkgs/{development/tools/bpf-linker/default.nix => unit/bp/bpf-linker/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/bpfmon/default.nix => unit/bp/bpfmon/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/bp}/bpftools/include-asm-types-for-ppc64le.patch (100%) rename pkgs/{os-specific/linux/bpftools/default.nix => unit/bp/bpftools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/bp}/bpftools/strip-binary-name.patch (100%) rename pkgs/{development/tools/build-managers/build2/bpkg.nix => unit/bp/bpkg/pkg-fun.nix} (100%) rename pkgs/{tools/audio/bpm-tools/default.nix => unit/bp/bpm-tools/pkg-fun.nix} (100%) rename pkgs/{tools/system/bpytop/default.nix => unit/bp/bpytop/pkg-fun.nix} (100%) rename pkgs/{games/braincurses/default.nix => unit/br/braincurses/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis => unit/br}/brakeman/Gemfile (100%) rename pkgs/{development/tools/analysis => unit/br}/brakeman/Gemfile.lock (100%) rename pkgs/{development/tools/analysis => unit/br}/brakeman/gemset.nix (100%) rename pkgs/{development/tools/analysis/brakeman/default.nix => unit/br/brakeman/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/brasero/wrapper.nix => unit/br/brasero/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/brave/default.nix => unit/br/brave/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers => unit/br}/brave/update.sh (100%) rename pkgs/{development/misc/breakpad/default.nix => unit/br/breakpad/pkg-fun.nix} (100%) rename pkgs/{applications/networking/breitbandmessung/default.nix => unit/br/breitbandmessung/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/brgenml1cupswrapper/default.nix => unit/br/brgenml1cupswrapper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/brial/default.nix => unit/br/brial/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/briar-desktop/default.nix => unit/br/briar-desktop/pkg-fun.nix} (100%) rename pkgs/{servers/brickd/default.nix => unit/br/brickd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/br}/bridge-utils/autoconf-ar.patch (100%) rename pkgs/{os-specific/linux/bridge-utils/default.nix => unit/br/bridge-utils/pkg-fun.nix} (100%) rename pkgs/{applications/networking/brig/default.nix => unit/br/brig/pkg-fun.nix} (100%) rename pkgs/{development/libraries/brigand/default.nix => unit/br/brigand/pkg-fun.nix} (100%) rename pkgs/{misc/brightnessctl/default.nix => unit/br/brightnessctl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/brillo/default.nix => unit/br/brillo/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/br}/brillo/udev-rule.patch (100%) rename pkgs/{data/misc => unit/br}/brise/fetchPackages.nix (100%) rename pkgs/{data/misc/brise/default.nix => unit/br/brise/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/briss/default.nix => unit/br/briss/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bristol/default.nix => unit/br/bristol/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/brlaser/default.nix => unit/br/brlaser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/brltty/default.nix => unit/br/brltty/pkg-fun.nix} (100%) rename pkgs/{applications/science/engineering/brmodelo/default.nix => unit/br/brmodelo/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/broadcom-bt-firmware/default.nix => unit/br/broadcom-bt-firmware/pkg-fun.nix} (100%) rename pkgs/{tools/misc/broadlink-cli/default.nix => unit/br/broadlink-cli/pkg-fun.nix} (100%) rename pkgs/{games/brogue/default.nix => unit/br/brogue/pkg-fun.nix} (100%) rename pkgs/{data/fonts/bront/default.nix => unit/br/bront_fonts/pkg-fun.nix} (100%) rename pkgs/{tools/networking/brook/default.nix => unit/br/brook/pkg-fun.nix} (100%) rename pkgs/{tools/compression/brotli/default.nix => unit/br/brotli/pkg-fun.nix} (100%) rename pkgs/{tools/security/browserpass/default.nix => unit/br/browserpass/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/browsh/default.nix => unit/br/browsh/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/backends/brscan4/default.nix => unit/br/brscan4/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/backends => unit/br}/brscan4/preload.c (100%) rename pkgs/{applications/graphics/sane/backends => unit/br}/brscan4/udev_rules_type1.nix (100%) rename pkgs/{applications/graphics/sane/backends/brscan5/default.nix => unit/br/brscan5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/brunsli/default.nix => unit/br/brunsli/pkg-fun.nix} (100%) rename pkgs/{games/brutalmaze/default.nix => unit/br/brutalmaze/pkg-fun.nix} (100%) rename pkgs/{tools/security/bruteforce-luks/default.nix => unit/br/bruteforce-luks/pkg-fun.nix} (100%) rename pkgs/{tools/security/brutespray/default.nix => unit/br/brutespray/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/bs}/bs-platform/build-bs-platform.nix (100%) rename pkgs/{development/compilers => unit/bs}/bs-platform/jscomp-release-ninja.patch (100%) rename pkgs/{development/compilers => unit/bs}/bs-platform/ocaml.nix (100%) rename pkgs/{development/compilers/bs-platform/default.nix => unit/bs/bs-platform/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bschaffl/default.nix => unit/bs/bschaffl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bsd-finger/default.nix => unit/bs/bsd-finger/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/bs}/bsd-finger/ubuntu-0.17-9.patch (100%) rename pkgs/{development/tools/misc/bsdbuild/default.nix => unit/bs/bsdbuild/pkg-fun.nix} (100%) rename pkgs/{games/bsdgames/default.nix => unit/bs/bsdgames/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/bs}/bsdiff/CVE-2020-14315.patch (100%) rename pkgs/{tools/compression => unit/bs}/bsdiff/include-systypes.patch (100%) rename pkgs/{tools/compression/bsdiff/default.nix => unit/bs/bsdiff/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bsequencer/default.nix => unit/bs/bsequencer/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bshapr/default.nix => unit/bs/bshapr/pkg-fun.nix} (100%) rename pkgs/{applications/audio/bslizr/default.nix => unit/bs/bslizr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bsp-layout/default.nix => unit/bs/bsp-layout/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/bspwm/default.nix => unit/bs/bspwm/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/bt-fw-converter/default.nix => unit/bt/bt-fw-converter/pkg-fun.nix} (100%) rename pkgs/{games/btanks/default.nix => unit/bt/btanks/pkg-fun.nix} (100%) rename pkgs/{tools/backup/btar/default.nix => unit/bt/btar/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/btcd/default.nix => unit/bt/btcd/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/btcdeb/default.nix => unit/bt/btcdeb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/btdu/default.nix => unit/bt/btdu/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/bt}/btdu/update.py (100%) rename pkgs/{os-specific/linux/btfs/default.nix => unit/bt/btfs/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/btor2tools/default.nix => unit/bt/btor2tools/pkg-fun.nix} (100%) rename pkgs/{tools/backup/btrbk/default.nix => unit/bt/btrbk/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/btrfs-heatmap/default.nix => unit/bt/btrfs-heatmap/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/btrfs-progs/default.nix => unit/bt/btrfs-progs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/btrfs-snap/default.nix => unit/bt/btrfs-snap/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/bubblemail/default.nix => unit/bu/bubblemail/pkg-fun.nix} (100%) rename pkgs/{tools/admin/bubblewrap/default.nix => unit/bu/bubblewrap/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/bu}/buck/pex-mtime.patch (100%) rename pkgs/{development/tools/build-managers/buck/default.nix => unit/bu/buck/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/bu}/buddy/gcc-4.3.3-fixes.patch (100%) rename pkgs/{development/libraries/buddy/default.nix => unit/bu/buddy/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/buf-language-server/default.nix => unit/bu/buf-language-server/pkg-fun.nix} (100%) rename pkgs/{development/tools/buf/default.nix => unit/bu/buf/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/bu}/buf/skip_test_requiring_dotgit.patch (100%) rename pkgs/{development/tools => unit/bu}/buf/skip_test_requiring_network.patch (100%) rename pkgs/{development/bower-modules/generic/default.nix => unit/bu/buildBowerComponents/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet/build-dotnet-module => unit/bu/buildDotnetModule}/hooks/default.nix (100%) rename pkgs/{build-support/dotnet/build-dotnet-module => unit/bu/buildDotnetModule}/hooks/dotnet-build-hook.sh (100%) rename pkgs/{build-support/dotnet/build-dotnet-module => unit/bu/buildDotnetModule}/hooks/dotnet-check-hook.sh (100%) rename pkgs/{build-support/dotnet/build-dotnet-module => unit/bu/buildDotnetModule}/hooks/dotnet-configure-hook.sh (100%) rename pkgs/{build-support/dotnet/build-dotnet-module => unit/bu/buildDotnetModule}/hooks/dotnet-fixup-hook.sh (100%) rename pkgs/{build-support/dotnet/build-dotnet-module => unit/bu/buildDotnetModule}/hooks/dotnet-install-hook.sh (100%) rename pkgs/{build-support/dotnet/build-dotnet-module/default.nix => unit/bu/buildDotnetModule/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet/build-dotnet-package/default.nix => unit/bu/buildDotnetPackage/pkg-fun.nix} (100%) rename pkgs/{development/em-modules/generic/default.nix => unit/bu/buildEmscriptenPackage/pkg-fun.nix} (100%) rename pkgs/{build-support/buildenv => unit/bu/buildEnv}/builder.pl (100%) rename pkgs/{build-support/buildenv/default.nix => unit/bu/buildEnv/pkg-fun.nix} (100%) rename pkgs/{build-support/build-fhs-userenv-bubblewrap => unit/bu/buildFHSUserEnvBubblewrap}/env.nix (100%) rename pkgs/{build-support/build-fhs-userenv-bubblewrap/default.nix => unit/bu/buildFHSUserEnvBubblewrap/pkg-fun.nix} (100%) rename pkgs/{build-support/build-fhs-userenv => unit/bu/buildFHSUserEnvChroot}/chrootenv/default.nix (100%) rename pkgs/{build-support/build-fhs-userenv => unit/bu/buildFHSUserEnvChroot}/chrootenv/src/chrootenv.c (100%) rename pkgs/{build-support/build-fhs-userenv => unit/bu/buildFHSUserEnvChroot}/chrootenv/src/meson.build (100%) rename pkgs/{build-support/build-fhs-userenv => unit/bu/buildFHSUserEnvChroot}/env.nix (100%) rename pkgs/{build-support/build-fhs-userenv/default.nix => unit/bu/buildFHSUserEnvChroot/pkg-fun.nix} (100%) rename pkgs/{build-support/build-maven.nix => unit/bu/buildMaven/pkg-fun.nix} (100%) rename pkgs/{build-support/node/build-npm-package/default.nix => unit/bu/buildNpmPackage/pkg-fun.nix} (100%) rename pkgs/{build-support/rust/build-rust-crate => unit/bu/buildRustCrate}/build-crate.nix (100%) rename pkgs/{build-support/rust/build-rust-crate => unit/bu/buildRustCrate}/configure-crate.nix (100%) rename pkgs/{build-support/rust/build-rust-crate => unit/bu/buildRustCrate}/install-crate.nix (100%) rename pkgs/{build-support/rust/build-rust-crate => unit/bu/buildRustCrate}/lib.sh (100%) rename pkgs/{build-support/rust/build-rust-crate => unit/bu/buildRustCrate}/log.nix (100%) rename pkgs/{build-support/rust/build-rust-crate/default.nix => unit/bu/buildRustCrate/pkg-fun.nix} (100%) rename pkgs/{build-support/rust/build-rust-crate/helpers.nix => unit/bu/buildRustCrateHelpers/pkg-fun.nix} (100%) rename pkgs/{development/tools/buildah/default.nix => unit/bu/buildah-unwrapped/pkg-fun.nix} (100%) rename pkgs/{development/tools/buildah/wrapper.nix => unit/bu/buildah/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/buildkit-nix/default.nix => unit/bu/buildkit-nix/pkg-fun.nix} (100%) rename pkgs/{development/tools/buildkit/default.nix => unit/bu/buildkit/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/buildkite-agent-metrics/default.nix => unit/bu/buildkite-agent-metrics/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/buildkite-agent/default.nix => unit/bu/buildkite-agent/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/buildkite-cli/default.nix => unit/bu/buildkite-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/buildpack/default.nix => unit/bu/buildpack/pkg-fun.nix} (100%) rename pkgs/{tools/misc/buildtorrent/default.nix => unit/bu/buildtorrent/pkg-fun.nix} (100%) rename pkgs/{applications/misc/buku/default.nix => unit/bu/buku/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bukubrow/default.nix => unit/bu/bukubrow/pkg-fun.nix} (100%) rename pkgs/{applications/misc/bukut/default.nix => unit/bu/bukut/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bulletml/default.nix => unit/bu/bulletml/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bully/default.nix => unit/bu/bully/pkg-fun.nix} (100%) rename pkgs/{development/tools/github/bump/default.nix => unit/bu/bump/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/bumpver/default.nix => unit/bu/bumpver/pkg-fun.nix} (100%) rename pkgs/{development/web/bun/default.nix => unit/bu/bun/pkg-fun.nix} (100%) rename pkgs/{development/ruby-modules/bundix/default.nix => unit/bu/bundix/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/bu}/bundler-audit/Gemfile (100%) rename pkgs/{tools/security => unit/bu}/bundler-audit/Gemfile.lock (100%) rename pkgs/{tools/security => unit/bu}/bundler-audit/gemset.nix (100%) rename pkgs/{tools/security/bundler-audit/default.nix => unit/bu/bundler-audit/pkg-fun.nix} (100%) rename pkgs/{development/ruby-modules/bundler/default.nix => unit/bu/bundler/pkg-fun.nix} (100%) rename pkgs/{development/ruby-modules/bundler-update-script/default.nix => unit/bu/bundlerUpdateScript/pkg-fun.nix} (100%) rename pkgs/{development/tools/bundletool/default.nix => unit/bu/bundletool/pkg-fun.nix} (100%) rename pkgs/{tools/misc/bunnyfetch/default.nix => unit/bu/bunnyfetch/pkg-fun.nix} (100%) rename pkgs/{development/tools/bunyan-rs/default.nix => unit/bu/bunyan-rs/pkg-fun.nix} (100%) rename pkgs/{tools/backup/bup/default.nix => unit/bu/bup/pkg-fun.nix} (100%) rename pkgs/{development/compilers/bupc/default.nix => unit/bu/bupc/pkg-fun.nix} (100%) rename pkgs/{tools/backup/bupstash/default.nix => unit/bu/bupstash/pkg-fun.nix} (100%) rename pkgs/{tools/backup/burp/default.nix => unit/bu/burp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/burpsuite/default.nix => unit/bu/burpsuite/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/bu}/busybox/busybox-in-store.patch (100%) rename pkgs/{os-specific/linux => unit/bu}/busybox/clang-cross.patch (100%) rename pkgs/{os-specific/linux/busybox/default.nix => unit/bu/busybox/pkg-fun.nix} (100%) rename pkgs/{development/tools/butane/default.nix => unit/bu/butane/pkg-fun.nix} (100%) rename pkgs/{tools/security/buttercup-desktop/default.nix => unit/bu/buttercup-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/editors/bvi/default.nix => unit/bv/bvi/pkg-fun.nix} (100%) rename pkgs/{applications/editors/bviplus/default.nix => unit/bv/bviplus/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/bwa/default.nix => unit/bw/bwa/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/bwbasic/default.nix => unit/bw/bwbasic/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bwidget/default.nix => unit/bw/bwidget/pkg-fun.nix} (100%) rename pkgs/{tools/networking/bwm-ng/default.nix => unit/bw/bwm_ng/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/byacc/default.nix => unit/by/byacc/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/by}/byzanz/add-amflags.patch (100%) rename pkgs/{applications/video/byzanz/default.nix => unit/by/byzanz/pkg-fun.nix} (100%) rename pkgs/{tools/compression/bzip2/default.nix => unit/bz/bzip2/pkg-fun.nix} (100%) rename pkgs/{tools/compression/bzip2/1_1.nix => unit/bz/bzip2_1_1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/bzrtp/default.nix => unit/bz/bzrtp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/c-blosc/default.nix => unit/c-/c-blosc/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/c2ffi/default.nix => unit/c2/c2ffi/pkg-fun.nix} (100%) rename pkgs/{development/compilers/c3c/default.nix => unit/c3/c3c/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/cabextract/default.nix => unit/ca/cabextract/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cabin/default.nix => unit/ca/cabin/pkg-fun.nix} (100%) rename pkgs/{data/misc/cacert/default.nix => unit/ca/cacert/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/ca}/cacert/setup-hook.sh (100%) rename pkgs/{data/misc => unit/ca}/cacert/test-cert-file.crt (100%) rename pkgs/{data/misc => unit/ca}/cacert/update.sh (100%) rename pkgs/{tools/nix/cached-nix-shell/default.nix => unit/ca/cached-nix-shell/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cachefilesd/default.nix => unit/ca/cachefilesd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cadaver/default.nix => unit/ca/cadaver/pkg-fun.nix} (100%) rename pkgs/{servers/caddy/default.nix => unit/ca/caddy/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/cadical/default.nix => unit/ca/cadical/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ca}/cadre/Gemfile (100%) rename pkgs/{development/tools => unit/ca}/cadre/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ca}/cadre/gemset.nix (100%) rename pkgs/{development/tools/cadre/default.nix => unit/ca/cadre/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/cadvisor/default.nix => unit/ca/cadvisor/pkg-fun.nix} (100%) rename pkgs/{applications/misc/caerbannog/default.nix => unit/ca/caerbannog/pkg-fun.nix} (100%) rename pkgs/{development/libraries/caf/default.nix => unit/ca/caf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cairo/default.nix => unit/ca/cairo/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ca}/cairo/skip-configure-stderr-check.patch (100%) rename pkgs/{development/libraries/cairomm/default.nix => unit/ca/cairomm/pkg-fun.nix} (100%) rename pkgs/{development/compilers/cakelisp/default.nix => unit/ca/cakelisp/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/ca}/caladea/cambria-alias.conf (100%) rename pkgs/{data/fonts/caladea/default.nix => unit/ca/caladea/pkg-fun.nix} (100%) rename pkgs/{tools/misc/calamares-nixos-extensions/default.nix => unit/ca/calamares-nixos-extensions/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/calc/default.nix => unit/ca/calc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/calcium/default.nix => unit/ca/calcium/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ca}/calcoo/0001-javac-encoding.diff (100%) rename pkgs/{applications/misc/calcoo/default.nix => unit/ca/calcoo/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/ca}/calculix/calculix.patch (100%) rename pkgs/{applications/science/math/calculix/default.nix => unit/ca/calculix/pkg-fun.nix} (100%) rename pkgs/{applications/misc/calcurse/default.nix => unit/ca/calcurse/pkg-fun.nix} (100%) rename pkgs/{tools/networking/calendar-cli/default.nix => unit/ca/calendar-cli/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ca}/calibre-web/db-migrations.patch (100%) rename pkgs/{servers => unit/ca}/calibre-web/default-logger.patch (100%) rename pkgs/{servers/calibre-web/default.nix => unit/ca/calibre-web/pkg-fun.nix} (100%) rename pkgs/{applications/audio/callaudiod/default.nix => unit/ca/callaudiod/pkg-fun.nix} (100%) rename pkgs/{applications/networking/calls/default.nix => unit/ca/calls/pkg-fun.nix} (100%) rename pkgs/{development/tools/cambalache/default.nix => unit/ca/cambalache/pkg-fun.nix} (100%) rename pkgs/{tools/security/cameradar/default.nix => unit/ca/cameradar/pkg-fun.nix} (100%) rename pkgs/{data/fonts/camingo-code/default.nix => unit/ca/camingo-code/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/can-utils/default.nix => unit/ca/can-utils/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/qemu/canokey-qemu.nix => unit/ca/canokey-qemu/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/canon/default.nix => unit/ca/canon-cups-ufr2/pkg-fun.nix} (100%) rename pkgs/{build-support/java => unit/ca/canonicalize-jar}/canonicalize-jar.sh (100%) rename pkgs/{build-support/java/canonicalize-jar.nix => unit/ca/canonicalize-jar/pkg-fun.nix} (100%) rename pkgs/{data/themes/canta/default.nix => unit/ca/canta-theme/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cantarell-fonts/default.nix => unit/ca/cantarell-fonts/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/canto-curses/default.nix => unit/ca/canto-curses/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/canto-daemon/default.nix => unit/ca/canto-daemon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cantoolz/default.nix => unit/ca/cantoolz/pkg-fun.nix} (100%) rename pkgs/{data/icons/capitaine-cursors-themed/default.nix => unit/ca/capitaine-cursors-themed/pkg-fun.nix} (100%) rename pkgs/{data/icons/capitaine-cursors/default.nix => unit/ca/capitaine-cursors/pkg-fun.nix} (100%) rename pkgs/{development/tools/capnproto-java/default.nix => unit/ca/capnproto-java/pkg-fun.nix} (100%) rename pkgs/{development/libraries/capnproto/default.nix => unit/ca/capnproto/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/caprice32/default.nix => unit/ca/caprice32/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/ca}/caprice32/string.patch (100%) rename pkgs/{applications/networking/instant-messengers => unit/ca}/caprine-bin/build-from-appimage.nix (100%) rename pkgs/{applications/networking/instant-messengers => unit/ca}/caprine-bin/build-from-dmg.nix (100%) rename pkgs/{applications/networking/instant-messengers/caprine-bin/default.nix => unit/ca/caprine-bin/pkg-fun.nix} (100%) rename pkgs/{applications/audio/caps/default.nix => unit/ca/caps/pkg-fun.nix} (100%) rename pkgs/{development/libraries/capstone/default.nix => unit/ca/capstone/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/captive-browser/default.nix => unit/ca/captive-browser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/capture/default.nix => unit/ca/capture/pkg-fun.nix} (100%) rename pkgs/{shells/carapace/default.nix => unit/ca/carapace/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/cardboard/default.nix => unit/ca/cardboard/pkg-fun.nix} (100%) rename pkgs/{tools/networking/carddav-util/default.nix => unit/ca/carddav-util/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cardinal/default.nix => unit/ca/cardinal/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cardo/default.nix => unit/ca/cardo/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-about/default.nix => unit/ca/cargo-about/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust => unit/ca}/cargo-about/update-mimalloc.patch (100%) rename pkgs/{development/tools/rust => unit/ca}/cargo-about/zstd-pkg-config.patch (100%) rename pkgs/{development/tools/rust/cargo-all-features/default.nix => unit/ca/cargo-all-features/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-apk/default.nix => unit/ca/cargo-apk/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-binutils/default.nix => unit/ca/cargo-binutils/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-bitbake/default.nix => unit/ca/cargo-bitbake/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-bloat/default.nix => unit/ca/cargo-bloat/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-bolero/default.nix => unit/ca/cargo-bolero/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/bootimage/default.nix => unit/ca/cargo-bootimage/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-careful/default.nix => unit/ca/cargo-careful/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-chef/default.nix => unit/ca/cargo-chef/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-criterion/default.nix => unit/ca/cargo-criterion/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-cross/default.nix => unit/ca/cargo-cross/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-deb/default.nix => unit/ca/cargo-deb/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-depgraph/default.nix => unit/ca/cargo-depgraph/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-deps/default.nix => unit/ca/cargo-deps/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-diet/default.nix => unit/ca/cargo-diet/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-espmonitor/default.nix => unit/ca/cargo-espmonitor/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-expand/default.nix => unit/ca/cargo-expand/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-feature/default.nix => unit/ca/cargo-feature/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-fuzz/default.nix => unit/ca/cargo-fuzz/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust => unit/ca}/cargo-generate/no-vendor.patch (100%) rename pkgs/{development/tools/rust/cargo-generate/default.nix => unit/ca/cargo-generate/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-graph/default.nix => unit/ca/cargo-graph/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-guppy/default.nix => unit/ca/cargo-guppy/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-hack/default.nix => unit/ca/cargo-hack/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-hakari/default.nix => unit/ca/cargo-hakari/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-insta/default.nix => unit/ca/cargo-insta/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-kcov/default.nix => unit/ca/cargo-kcov/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-license/default.nix => unit/ca/cargo-license/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-limit/default.nix => unit/ca/cargo-limit/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-llvm-cov/default.nix => unit/ca/cargo-llvm-cov/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-llvm-lines/default.nix => unit/ca/cargo-llvm-lines/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-lock/default.nix => unit/ca/cargo-lock/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-modules/default.nix => unit/ca/cargo-modules/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-mommy/default.nix => unit/ca/cargo-mommy/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-play/default.nix => unit/ca/cargo-play/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-profiler/default.nix => unit/ca/cargo-profiler/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-public-api/default.nix => unit/ca/cargo-public-api/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-readme/default.nix => unit/ca/cargo-readme/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-release/default.nix => unit/ca/cargo-release/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-rr/default.nix => unit/ca/cargo-rr/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-semver-checks/default.nix => unit/ca/cargo-semver-checks/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-show-asm/default.nix => unit/ca/cargo-show-asm/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust => unit/ca}/cargo-show-asm/test-basic-x86_64.nix (100%) rename pkgs/{development/tools/rust/cargo-sort/default.nix => unit/ca/cargo-sort/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-sweep/default.nix => unit/ca/cargo-sweep/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-sync-readme/default.nix => unit/ca/cargo-sync-readme/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-tally/default.nix => unit/ca/cargo-tally/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-tauri/default.nix => unit/ca/cargo-tauri/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-temp/default.nix => unit/ca/cargo-temp/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-unused-features/default.nix => unit/ca/cargo-unused-features/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-valgrind/default.nix => unit/ca/cargo-valgrind/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-wipe/default.nix => unit/ca/cargo-wipe/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-xbuild/default.nix => unit/ca/cargo-xbuild/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo-zigbuild/default.nix => unit/ca/cargo-zigbuild/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cargo2junit/default.nix => unit/ca/cargo2junit/pkg-fun.nix} (100%) rename pkgs/{tools/security/cariddi/default.nix => unit/ca/cariddi/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/ca}/carlito/calibri-alias.conf (100%) rename pkgs/{data/fonts/carlito/default.nix => unit/ca/carlito/pkg-fun.nix} (100%) rename pkgs/{development/libraries/caroline/default.nix => unit/ca/caroline/pkg-fun.nix} (100%) rename pkgs/{development/compilers/carp/default.nix => unit/ca/carp/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/carps-cups/default.nix => unit/ca/carps-cups/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cascadia-code/default.nix => unit/ca/cascadia-code/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cassandra-cpp-driver/default.nix => unit/ca/cassandra-cpp-driver/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cassowary/default.nix => unit/ca/cassowary/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/castget/default.nix => unit/ca/castget/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/castor/default.nix => unit/ca/castor/pkg-fun.nix} (100%) rename pkgs/{tools/misc/castty/default.nix => unit/ca/castty/pkg-fun.nix} (100%) rename pkgs/{development/tools/castxml/default.nix => unit/ca/castxml/pkg-fun.nix} (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/builder.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/common.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/git.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/lib.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/locale-path-git.patch (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/locale-path-stable.patch (100%) rename pkgs/{games/cataclysm-dda/default.nix => unit/ca/cataclysmDDA/pkg-fun.nix} (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/pkgs/default.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/pkgs/tilesets/UndeadPeople/default.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/stable.nix (100%) rename pkgs/{games/cataclysm-dda => unit/ca/cataclysmDDA}/wrapper.nix (100%) rename pkgs/{applications/virtualization/catatonit/default.nix => unit/ca/catatonit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/catch/default.nix => unit/ca/catch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/catch2/default.nix => unit/ca/catch2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/catch2/3.nix => unit/ca/catch2_3/pkg-fun.nix} (100%) rename pkgs/{applications/misc/catclock/default.nix => unit/ca/catclock/pkg-fun.nix} (100%) rename pkgs/{tools/text/catdoc/default.nix => unit/ca/catdoc/pkg-fun.nix} (100%) rename pkgs/{tools/text/catdocx/default.nix => unit/ca/catdocx/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ca}/catfs/fix-for-rust-1.65.diff (100%) rename pkgs/{os-specific/linux/catfs/default.nix => unit/ca/catfs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/catgirl/default.nix => unit/ca/catgirl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/catimg/default.nix => unit/ca/catimg/pkg-fun.nix} (100%) rename pkgs/{data/icons/catppuccin-cursors/default.nix => unit/ca/catppuccin-cursors/pkg-fun.nix} (100%) rename pkgs/{data/themes/catppuccin-gtk/default.nix => unit/ca/catppuccin-gtk/pkg-fun.nix} (100%) rename pkgs/{data/themes/catppuccin-kde/default.nix => unit/ca/catppuccin-kde/pkg-fun.nix} (100%) rename pkgs/{applications/video/catt/default.nix => unit/ca/catt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/caudec/default.nix => unit/ca/caudec/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/cauwugo/default.nix => unit/ca/cauwugo/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cava/default.nix => unit/ca/cava/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cawbird/default.nix => unit/ca/cawbird/pkg-fun.nix} (100%) rename pkgs/{servers/cayley/default.nix => unit/ca/cayley/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cbatticon/default.nix => unit/cb/cbatticon/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/cbc/default.nix => unit/cb/cbc/pkg-fun.nix} (100%) rename pkgs/{development/tools/cbfmt/default.nix => unit/cb/cbfmt/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cbftp/default.nix => unit/cb/cbftp/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/cb}/cbmc/0001-Do-not-download-sources-in-cmake.patch (100%) rename pkgs/{applications/science/logic/cbmc/default.nix => unit/cb/cbmc/pkg-fun.nix} (100%) rename pkgs/{games/cbonsai/default.nix => unit/cb/cbonsai/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/cb}/cbor-diag/Gemfile (100%) rename pkgs/{development/tools => unit/cb}/cbor-diag/Gemfile.lock (100%) rename pkgs/{development/tools => unit/cb}/cbor-diag/gemset.nix (100%) rename pkgs/{development/tools/cbor-diag/default.nix => unit/cb/cbor-diag/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/cb}/cbrowser/backslashes-quotes.diff (100%) rename pkgs/{development/tools/misc/cbrowser/default.nix => unit/cb/cbrowser/pkg-fun.nix} (100%) rename pkgs/{development/embedded/cc-tool/default.nix => unit/cc/cc-tool/pkg-fun.nix} (100%) rename pkgs/{development/compilers/cc65/default.nix => unit/cc/cc65/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/cc}/ccache/force-objdump-on-darwin.patch (100%) rename pkgs/{development/tools/misc/ccache/default.nix => unit/cc/ccache/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis => unit/cc}/cccc/cccc.patch (100%) rename pkgs/{development/tools/analysis/cccc/default.nix => unit/cc/cccc/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/ccd2iso/default.nix => unit/cc/ccd2iso/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/ccemux/default.nix => unit/cc/ccemux/pkg-fun.nix} (100%) rename pkgs/{applications/video/ccextractor/default.nix => unit/cc/ccextractor/pkg-fun.nix} (100%) rename pkgs/{tools/security/ccid/default.nix => unit/cc/ccid/pkg-fun.nix} (100%) rename pkgs/{development/tools/ccloud-cli/default.nix => unit/cc/ccloud-cli/pkg-fun.nix} (100%) rename pkgs/{tools/text/cconv/default.nix => unit/cc/cconv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ccrtp/default.nix => unit/cc/ccrtp/pkg-fun.nix} (100%) rename pkgs/{tools/security/ccrypt/default.nix => unit/cc/ccrypt/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ccsymbols/default.nix => unit/cc/ccsymbols/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ccze/default.nix => unit/cc/ccze/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/cd}/cddl/Gemfile (100%) rename pkgs/{development/tools => unit/cd}/cddl/Gemfile.lock (100%) rename pkgs/{development/tools => unit/cd}/cddl/gemset.nix (100%) rename pkgs/{development/tools/cddl/default.nix => unit/cd/cddl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cddlib/default.nix => unit/cd/cddlib/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/cde/default.nix => unit/cd/cde/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/cd}/cdecl/cdecl-2.5-lex.patch (100%) rename pkgs/{development/tools/cdecl/default.nix => unit/cd/cdecl/pkg-fun.nix} (100%) rename pkgs/{desktops => unit/cd}/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch (100%) rename pkgs/{desktops => unit/cd}/cdesktopenv/2.3.2.patch (100%) rename pkgs/{desktops/cdesktopenv/default.nix => unit/cd/cdesktopenv/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/cdi2iso/default.nix => unit/cd/cdi2iso/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/cd}/cdimgtools/nrgtool_fix_my.patch (100%) rename pkgs/{tools/cd-dvd/cdimgtools/default.nix => unit/cd/cdimgtools/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/cd}/cdimgtools/removed_dvdcss_interface_2.patch (100%) rename pkgs/{tools/security/cdk-go/default.nix => unit/cd/cdk-go/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cdk/default.nix => unit/cd/cdk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cdo/default.nix => unit/cd/cdo/pkg-fun.nix} (100%) rename pkgs/{games/cdogs-sdl/default.nix => unit/cd/cdogs-sdl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cdpr/default.nix => unit/cd/cdpr/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/cd}/cdrdao/adjust-includes-for-glibc-212.patch (100%) rename pkgs/{tools/cd-dvd/cdrdao/default.nix => unit/cd/cdrdao/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/cd}/cdrkit/cdrkit-1.1.11-fno-common.patch (100%) rename pkgs/{tools/cd-dvd => unit/cd}/cdrkit/cdrkit-1.1.9-efi-boot.patch (100%) rename pkgs/{tools/cd-dvd => unit/cd}/cdrkit/include-path.patch (100%) rename pkgs/{tools/cd-dvd/cdrkit/default.nix => unit/cd/cdrkit/pkg-fun.nix} (100%) rename pkgs/{tools/security/cdxgen/default.nix => unit/cd/cdxgen/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/celf/default.nix => unit/ce/celf/pkg-fun.nix} (100%) rename pkgs/{applications/video/celluloid/default.nix => unit/ce/celluloid/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/ce}/cemu/cmakelists.patch (100%) rename pkgs/{applications/emulators/cemu/default.nix => unit/ce/cemu/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/cen64/default.nix => unit/ce/cen64/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/centerim/default.nix => unit/ce/centerim/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/ceph-csi/default.nix => unit/ce/ceph-csi/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/ceptre/default.nix => unit/ce/ceptre/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cereal/default.nix => unit/ce/cereal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics => unit/ce}/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch (100%) rename pkgs/{development/libraries/physics => unit/ce}/cernlib/patch.patch (100%) rename pkgs/{development/libraries/physics/cernlib/default.nix => unit/ce/cernlib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics => unit/ce}/cernlib/setup-hook.sh (100%) rename pkgs/{tools/security/certgraph/default.nix => unit/ce/certgraph/pkg-fun.nix} (100%) rename pkgs/{tools/admin/certigo/default.nix => unit/ce/certigo/pkg-fun.nix} (100%) rename pkgs/{tools/security/certipy/default.nix => unit/ce/certipy/pkg-fun.nix} (100%) rename pkgs/{tools/security/certstrap/default.nix => unit/ce/certstrap/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/ce}/cewl/Gemfile (100%) rename pkgs/{tools/security => unit/ce}/cewl/Gemfile.lock (100%) rename pkgs/{tools/security => unit/ce}/cewl/gemset.nix (100%) rename pkgs/{tools/security/cewl/default.nix => unit/ce/cewl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cf-terraforming/default.nix => unit/cf/cf-terraforming/pkg-fun.nix} (100%) rename pkgs/{tools/admin/cf-vault/default.nix => unit/cf/cf-vault/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/cfdg/default.nix => unit/cf/cfdg/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/cf}/cfdg/src-info-for-default.nix (100%) rename pkgs/{development/libraries/science/astronomy => unit/cf}/cfitsio/darwin-rpath-universal.patch (100%) rename pkgs/{development/libraries/science/astronomy/cfitsio/default.nix => unit/cf/cfitsio/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cflow/default.nix => unit/cf/cflow/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/cfm/default.nix => unit/cf/cfm/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/cf}/cfn-nag/Gemfile (100%) rename pkgs/{development/tools => unit/cf}/cfn-nag/Gemfile.lock (100%) rename pkgs/{development/tools => unit/cf}/cfn-nag/gemset.nix (100%) rename pkgs/{development/tools/cfn-nag/default.nix => unit/cf/cfn-nag/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cfonts/default.nix => unit/cf/cfonts/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/cfr/default.nix => unit/cf/cfr/pkg-fun.nix} (100%) rename pkgs/{tools/security/cfripper/default.nix => unit/cf/cfripper/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cfs-zen-tweaks/default.nix => unit/cf/cfs-zen-tweaks/pkg-fun.nix} (100%) rename pkgs/{tools/security/cfssl/default.nix => unit/cf/cfssl/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/cg3/default.nix => unit/cg/cg3/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cgdb/default.nix => unit/cg/cgdb/pkg-fun.nix} (100%) rename pkgs/{servers/http/cgiserver/default.nix => unit/cg/cgiserver/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cglm/default.nix => unit/cg/cglm/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/cgminer/default.nix => unit/cg/cgminer/pkg-fun.nix} (100%) rename pkgs/{games/cgoban/default.nix => unit/cg/cgoban/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cgreen/default.nix => unit/cg/cgreen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cgui/default.nix => unit/cg/cgui/pkg-fun.nix} (100%) rename pkgs/{applications/audio/CHOWTapeModel/default.nix => unit/ch/CHOWTapeModel/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ChowCentaur/default.nix => unit/ch/ChowCentaur/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ChowKick/default.nix => unit/ch/ChowKick/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ChowPhaser/default.nix => unit/ch/ChowPhaser/pkg-fun.nix} (100%) rename pkgs/{tools/security/chain-bench/default.nix => unit/ch/chain-bench/pkg-fun.nix} (100%) rename pkgs/{tools/admin/chamber/default.nix => unit/ch/chamber/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/changedetection-io/default.nix => unit/ch/changedetection-io/pkg-fun.nix} (100%) rename pkgs/{tools/misc/changelogger/default.nix => unit/ch/changelogger/pkg-fun.nix} (100%) rename pkgs/{tools/networking/changetower/default.nix => unit/ch/changetower/pkg-fun.nix} (100%) rename pkgs/{development/tools/changie/default.nix => unit/ch/changie/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ch}/changie/skip-flaky-test.patch (100%) rename pkgs/{tools/networking/chaos/default.nix => unit/ch/chaos/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/charge-lnd/default.nix => unit/ch/charge-lnd/pkg-fun.nix} (100%) rename pkgs/{data/fonts/charis-sil/default.nix => unit/ch/charis-sil/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/charliecloud/default.nix => unit/ch/charliecloud/pkg-fun.nix} (100%) rename pkgs/{development/libraries/charls/default.nix => unit/ch/charls/pkg-fun.nix} (100%) rename pkgs/{applications/misc/charm/default.nix => unit/ch/charm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/helm/chart-testing/default.nix => unit/ch/chart-testing/pkg-fun.nix} (100%) rename pkgs/{tools/system/chase/default.nix => unit/ch/chase/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/chatty/default.nix => unit/ch/chatty/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cheat/default.nix => unit/ch/cheat/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/esxi.nix => unit/ch/check-esxi-hardware/pkg-fun.nix} (100%) rename pkgs/{development/tools/check-jsonschema/default.nix => unit/ch/check-jsonschema/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/openvpn.nix => unit/ch/check-openvpn/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/uptime.nix => unit/ch/check-uptime/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/wmiplus/default.nix => unit/ch/check-wmiplus/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/wmiplus => unit/ch/check-wmiplus}/wmiplus_fix_manpage.patch (100%) rename pkgs/{servers/monitoring/nagios/plugins/check_ssl_cert.nix => unit/ch/checkSSLCert/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/nagios/plugins/smartmon.nix => unit/ch/check_smartmon/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/nagios/plugins/check_systemd.nix => unit/ch/check_systemd/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/nagios/plugins/zfs.nix => unit/ch/check_zfs/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/checkbashisms/default.nix => unit/ch/checkbashisms/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/empty-dirs.patch (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/etc-dirs.patch (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/glibc-check.patch (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/missing-functions.patch (100%) rename pkgs/{tools/package-management/checkinstall/default.nix => unit/ch/checkinstall/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/readlink-types.patch (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/scandir.patch (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/set-buildroot.patch (100%) rename pkgs/{tools/package-management => unit/ch}/checkinstall/use-old-memcpy.patch (100%) rename pkgs/{tools/networking/checkip/default.nix => unit/ch/checkip/pkg-fun.nix} (100%) rename pkgs/{development/tools/checkmake/default.nix => unit/ch/checkmake/pkg-fun.nix} (100%) rename pkgs/{development/tools/checkmate/default.nix => unit/ch/checkmate/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis => unit/ch}/checkov/flake8-compat-5.x.patch (100%) rename pkgs/{development/tools/analysis/checkov/default.nix => unit/ch/checkov/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/checkpolicy/default.nix => unit/ch/checkpolicy/pkg-fun.nix} (100%) rename pkgs/{development/mobile/checkra1n/default.nix => unit/ch/checkra1n/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ch}/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch (100%) rename pkgs/{os-specific/linux/checksec/default.nix => unit/ch/checksec/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/checkstyle/default.nix => unit/ch/checkstyle/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/ch}/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch (100%) rename pkgs/{applications/audio => unit/ch}/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch (100%) rename pkgs/{applications/audio/cheesecutter/default.nix => unit/ch/cheesecutter/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ch}/chefdk/Gemfile (100%) rename pkgs/{development/tools => unit/ch}/chefdk/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ch}/chefdk/gemset.nix (100%) rename pkgs/{development/tools/chefdk/default.nix => unit/ch/chefdk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/chelf/default.nix => unit/ch/chelf/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/chemtool/default.nix => unit/ch/chemtool/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cherry/default.nix => unit/ch/cherry/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cherrytree/default.nix => unit/ch/cherrytree/pkg-fun.nix} (100%) rename pkgs/{games/chessdb/default.nix => unit/ch/chessdb/pkg-fun.nix} (100%) rename pkgs/{development/chez-modules/chez-matchable/default.nix => unit/ch/chez-matchable/pkg-fun.nix} (100%) rename pkgs/{development/chez-modules/chez-mit/default.nix => unit/ch/chez-mit/pkg-fun.nix} (100%) rename pkgs/{development/compilers/chez-racket/default.nix => unit/ch/chez-racket/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/ch}/chez-racket/setup-hook.sh (100%) rename pkgs/{development/compilers => unit/ch}/chez-racket/shared.nix (100%) rename pkgs/{development/chez-modules/chez-scmutils/default.nix => unit/ch/chez-scmutils/pkg-fun.nix} (100%) rename pkgs/{development/chez-modules/chez-srfi/default.nix => unit/ch/chez-srfi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/chezmoi/default.nix => unit/ch/chezmoi/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/ch}/chia-dev-tools/fix-paths.patch (100%) rename pkgs/{applications/blockchains/chia-dev-tools/default.nix => unit/ch/chia-dev-tools/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/ch}/chia-plotter/dont_fetch_dependencies.patch (100%) rename pkgs/{applications/blockchains/chia-plotter/default.nix => unit/ch/chia-plotter/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/chia/default.nix => unit/ch/chia/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/chibi/default.nix => unit/ch/chibi/pkg-fun.nix} (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/chicken.nix (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/egg2nix.nix (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/eggDerivation.nix (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/eggs.nix (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/fetchegg/builder.sh (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/fetchegg/default.nix (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/overrides.nix (100%) rename pkgs/{development/compilers/chicken/4/default.nix => unit/ch/chickenPackages_4/pkg-fun.nix} (100%) rename pkgs/{development/compilers/chicken/4 => unit/ch/chickenPackages_4}/setup-hook.sh (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/chicken.nix (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/egg2nix.nix (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/eggDerivation.nix (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/eggs.nix (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/fetchegg/builder.sh (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/fetchegg/default.nix (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/overrides.nix (100%) rename pkgs/{development/compilers/chicken/5/default.nix => unit/ch/chickenPackages_5/pkg-fun.nix} (100%) rename pkgs/{development/compilers/chicken/5 => unit/ch/chickenPackages_5}/setup-hook.sh (100%) rename pkgs/{development/libraries/chipmunk/default.nix => unit/ch/chipmunk/pkg-fun.nix} (100%) rename pkgs/{applications/radio/chirp/default.nix => unit/ch/chirp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/chisel/default.nix => unit/ch/chisel/pkg-fun.nix} (100%) rename pkgs/{tools/admin/chkcrontab/default.nix => unit/ch/chkcrontab/pkg-fun.nix} (100%) rename pkgs/{tools/security/chkrootkit/default.nix => unit/ch/chkrootkit/pkg-fun.nix} (100%) rename pkgs/{tools/admin/chkservice/default.nix => unit/ch/chkservice/pkg-fun.nix} (100%) rename pkgs/{development/libraries/chmlib/default.nix => unit/ch/chmlib/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/ch}/chntpw/00-chntpw-build-arch-autodetect.patch (100%) rename pkgs/{tools/security => unit/ch}/chntpw/01-chntpw-install-target.patch (100%) rename pkgs/{tools/security/chntpw/default.nix => unit/ch/chntpw/pkg-fun.nix} (100%) rename pkgs/{games/chocolate-doom/default.nix => unit/ch/chocolateDoom/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/cholmod-extra/default.nix => unit/ch/cholmod-extra/pkg-fun.nix} (100%) rename pkgs/{data/fonts/chonburi/default.nix => unit/ch/chonburi-font/pkg-fun.nix} (100%) rename pkgs/{tools/text/choose/default.nix => unit/ch/choose/pkg-fun.nix} (100%) rename pkgs/{tools/security/chopchop/default.nix => unit/ch/chopchop/pkg-fun.nix} (100%) rename pkgs/{tools/text/chroma/default.nix => unit/ch/chroma/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/ch}/chroma/src.json (100%) rename pkgs/{development/libraries/chromaprint/default.nix => unit/ch/chromaprint/pkg-fun.nix} (100%) rename pkgs/{tools/misc/chrome-export/default.nix => unit/ch/chrome-export/pkg-fun.nix} (100%) rename pkgs/{games/chromium-bsu/default.nix => unit/ch/chromium-bsu/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/chromium-xorg-conf/default.nix => unit/ch/chromium-xorg-conf/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ch}/chrony/makefile.patch (100%) rename pkgs/{tools/networking/chrony/default.nix => unit/ch/chrony/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/chrpath/default.nix => unit/ch/chrpath/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/chruby-fish/default.nix => unit/ch/chruby-fish/pkg-fun.nix} (100%) rename pkgs/{applications/misc/chrysalis/default.nix => unit/ch/chrysalis/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cht.sh/default.nix => unit/ch/cht-sh/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/chunkfs/default.nix => unit/ch/chunkfs/pkg-fun.nix} (100%) rename pkgs/{tools/backup/chunksync/default.nix => unit/ch/chunksync/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ciao/default.nix => unit/ci/ciao/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cicero-tui/default.nix => unit/ci/cicero-tui/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cider/default.nix => unit/ci/cider/pkg-fun.nix} (100%) rename pkgs/{tools/text/cidrgrep/default.nix => unit/ci/cidrgrep/pkg-fun.nix} (100%) rename pkgs/{tools/security/cie-middleware-linux/default.nix => unit/ci/cie-middleware-linux/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cifs-utils/default.nix => unit/ci/cifs-utils/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/cilium/default.nix => unit/ci/cilium-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cimg/default.nix => unit/ci/cimg/pkg-fun.nix} (100%) rename pkgs/{applications/video/cinelerra/default.nix => unit/ci/cinelerra/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/ciopfs/default.nix => unit/ci/ciopfs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cipher/default.nix => unit/ci/cipher/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/circleci-cli/default.nix => unit/ci/circleci-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/circumflex/default.nix => unit/ci/circumflex/pkg-fun.nix} (100%) rename pkgs/{development/tools/circup/default.nix => unit/ci/circup/pkg-fun.nix} (100%) rename pkgs/{tools/networking/circus/default.nix => unit/ci/circus/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/cirrus-cli/default.nix => unit/ci/cirrus-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/cirrusgo/default.nix => unit/ci/cirrusgo/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cisco-packet-tracer/7.nix => unit/ci/ciscoPacketTracer7/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cisco-packet-tracer/8.nix => unit/ci/ciscoPacketTracer8/pkg-fun.nix} (100%) rename pkgs/{applications/misc/citations/default.nix => unit/ci/citations/pkg-fun.nix} (100%) rename pkgs/{development/libraries/civetweb/default.nix => unit/ci/civetweb/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/civo/default.nix => unit/ci/civo/pkg-fun.nix} (100%) rename pkgs/{tools/admin/cjdns-tools/default.nix => unit/cj/cjdns-tools/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/cj}/cjdns-tools/wrapper.sh (100%) rename pkgs/{tools/networking/cjdns/default.nix => unit/cj/cjdns/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cjose/default.nix => unit/cj/cjose/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cjson/default.nix => unit/cj/cjson/pkg-fun.nix} (100%) rename pkgs/{games/ckan/default.nix => unit/ck/ckan/pkg-fun.nix} (100%) rename pkgs/{tools/X11/ckbcomp/default.nix => unit/ck/ckbcomp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cksfv/default.nix => unit/ck/cksfv/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cl-launch/default.nix => unit/cl/cl-launch/pkg-fun.nix} (100%) rename pkgs/{games/cl-wordle/default.nix => unit/cl/cl-wordle/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clac/default.nix => unit/cl/clac/pkg-fun.nix} (100%) rename pkgs/{tools/admin/clair/default.nix => unit/cl/clair/pkg-fun.nix} (100%) rename pkgs/{tools/security/clairvoyance/default.nix => unit/cl/clairvoyance/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/cl}/clamsmtp/header-order.patch (100%) rename pkgs/{servers/mail/clamsmtp/default.nix => unit/cl/clamsmtp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/clanlib/default.nix => unit/cl/clanlib/pkg-fun.nix} (100%) rename pkgs/{applications/video/clapper/default.nix => unit/cl/clapper/pkg-fun.nix} (100%) rename pkgs/{data/misc/clash-geoip/default.nix => unit/cl/clash-geoip/pkg-fun.nix} (100%) rename pkgs/{tools/networking/clash/default.nix => unit/cl/clash/pkg-fun.nix} (100%) rename pkgs/{development/libraries/classads/default.nix => unit/cl/classads/pkg-fun.nix} (100%) rename pkgs/{games => unit/cl}/classicube/fix-linking.patch (100%) rename pkgs/{games => unit/cl}/classicube/font-location.patch (100%) rename pkgs/{games/classicube/default.nix => unit/cl/classicube/pkg-fun.nix} (100%) rename pkgs/{games => unit/cl}/classicube/use-sdl.patch (100%) rename pkgs/{applications/networking/mailreaders => unit/cl}/claws-mail/mime.patch (100%) rename pkgs/{applications/networking/mailreaders/claws-mail/default.nix => unit/cl/claws-mail/pkg-fun.nix} (100%) rename pkgs/{tools/misc/claws/default.nix => unit/cl/claws/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/clboss/default.nix => unit/cl/clboss/pkg-fun.nix} (100%) rename pkgs/{data/misc/cldr-annotations/default.nix => unit/cl/cldr-annotations/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/cl}/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch (100%) rename pkgs/{development/compilers/clean/default.nix => unit/cl/clean/pkg-fun.nix} (100%) rename pkgs/{data/themes/clearlooks-phenix/default.nix => unit/cl/clearlooks-phenix/pkg-fun.nix} (100%) rename pkgs/{data/fonts/clearlyU/default.nix => unit/cl/clearlyU/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clematis/default.nix => unit/cl/clematis/pkg-fun.nix} (100%) rename pkgs/{applications/audio/clerk/default.nix => unit/cl/clerk/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/clex/default.nix => unit/cl/clex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/clfft/default.nix => unit/cl/clfft/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/clhep/default.nix => unit/cl/clhep/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cli-visualizer/default.nix => unit/cl/cli-visualizer/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cli11/default.nix => unit/cl/cli11/pkg-fun.nix} (100%) rename pkgs/{tools/admin/cli53/default.nix => unit/cl/cli53/pkg-fun.nix} (100%) rename pkgs/{tools/security/cliam/default.nix => unit/cl/cliam/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/clib/default.nix => unit/cl/clib/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/click/default.nix => unit/cl/click/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clickclack/default.nix => unit/cl/clickclack/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/clickhouse-backup/default.nix => unit/cl/clickhouse-backup/pkg-fun.nix} (100%) rename pkgs/{servers/misc => unit/cl}/client-ip-echo/client-ip-echo.nix (100%) rename pkgs/{servers/misc/client-ip-echo/default.nix => unit/cl/client-ip-echo/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/clifm/default.nix => unit/cl/clifm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/clight/default.nix => unit/cl/clight/pkg-fun.nix} (100%) rename pkgs/{applications/misc/clight/clightd.nix => unit/cl/clightd/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/clightning/default.nix => unit/cl/clightning/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/cling/default.nix => unit/cl/cling/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/potassco/clingcon.nix => unit/cl/clingcon/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/potassco/clingo.nix => unit/cl/clingo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clini/default.nix => unit/cl/clini/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clipbuzz/default.nix => unit/cl/clipbuzz/pkg-fun.nix} (100%) rename pkgs/{applications/misc/clipcat/default.nix => unit/cl/clipcat/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/cliphist/default.nix => unit/cl/cliphist/pkg-fun.nix} (100%) rename pkgs/{applications/misc/clipit/default.nix => unit/cl/clipit/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/clipman/default.nix => unit/cl/clipman/pkg-fun.nix} (100%) rename pkgs/{applications/misc/clipmenu/default.nix => unit/cl/clipmenu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clipnotify/default.nix => unit/cl/clipnotify/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/cl}/clipp/clipp.pc (100%) rename pkgs/{development/libraries/clipp/default.nix => unit/cl/clipp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/clipper/default.nix => unit/cl/clipper/pkg-fun.nix} (100%) rename pkgs/{applications/misc/clipqr/default.nix => unit/cl/clipqr/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/clips/default.nix => unit/cl/clips/pkg-fun.nix} (100%) rename pkgs/{tools/misc/clipster/default.nix => unit/cl/clipster/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/cliquer/default.nix => unit/cl/cliquer/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/clisp/hg.nix => unit/cl/clisp-tip/pkg-fun.nix} (100%) rename pkgs/{development/tools/clj-kondo/default.nix => unit/cl/clj-kondo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/clmagma/default.nix => unit/cl/clmagma/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cln/default.nix => unit/cl/cln/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cloc/default.nix => unit/cl/cloc/pkg-fun.nix} (100%) rename pkgs/{development/tools/clog-cli/default.nix => unit/cl/clog-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/clojure-lsp/default.nix => unit/cl/clojure-lsp/pkg-fun.nix} (100%) rename pkgs/{games/clonehero/default.nix => unit/cl/clonehero-unwrapped/pkg-fun.nix} (100%) rename pkgs/{games/clonehero/fhs-wrapper.nix => unit/cl/clonehero/pkg-fun.nix} (100%) rename pkgs/{games => unit/cl}/clonehero/xdg-wrapper.nix (100%) rename pkgs/{development/libraries/cloog-ppl => unit/cl/cloogppl}/fix-ppl-version.patch (100%) rename pkgs/{development/libraries/cloog-ppl/default.nix => unit/cl/cloogppl/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/clojure/clooj.nix => unit/cl/clooj/pkg-fun.nix} (100%) rename pkgs/{build-support/closure-info.nix => unit/cl/closureInfo/pkg-fun.nix} (100%) rename pkgs/{development/compilers/closure/default.nix => unit/cl/closurecompiler/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/cloud-hypervisor/default.nix => unit/cl/cloud-hypervisor/pkg-fun.nix} (100%) rename pkgs/{development/tools/cloud-nuke/default.nix => unit/cl/cloud-nuke/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cloud-sql-proxy/default.nix => unit/cl/cloud-sql-proxy/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cloud-utils/default.nix => unit/cl/cloud-utils/pkg-fun.nix} (100%) rename pkgs/{tools/security/cloudbrute/default.nix => unit/cl/cloudbrute/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cloudflare-dyndns/default.nix => unit/cl/cloudflare-dyndns/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cloudflare-warp/default.nix => unit/cl/cloudflare-warp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cloudflared/default.nix => unit/cl/cloudflared/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/cl}/cloudflared/tests.nix (100%) rename pkgs/{applications/networking/cluster/cloudfoundry-cli/default.nix => unit/cl/cloudfoundry-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/cloudfox/default.nix => unit/cl/cloudfox/pkg-fun.nix} (100%) rename pkgs/{tools/security/cloudlist/default.nix => unit/cl/cloudlist/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/cloudmonkey/default.nix => unit/cl/cloudmonkey/pkg-fun.nix} (100%) rename pkgs/{development/tools/cloudsmith-cli/default.nix => unit/cl/cloudsmith-cli/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/clp/default.nix => unit/cl/clp/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/cl}/clpeak/clpeak-clhpp2.diff (100%) rename pkgs/{tools/misc/clpeak/default.nix => unit/cl/clpeak/pkg-fun.nix} (100%) rename pkgs/{development/tools/clpm/default.nix => unit/cl/clpm/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/clprover/clprover.nix => unit/cl/clprover/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/clustal-omega/default.nix => unit/cl/clustal-omega/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/clusterctl/default.nix => unit/cl/clusterctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/clutter-gst/default.nix => unit/cl/clutter-gst/pkg-fun.nix} (100%) rename pkgs/{development/libraries/clutter-gtk/default.nix => unit/cl/clutter-gtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/clutter/default.nix => unit/cl/clutter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cm256cc/default.nix => unit/cm/cm256cc/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cm-unicode/default.nix => unit/cm/cm_unicode/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cmark-gfm/default.nix => unit/cm/cmark-gfm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cmark/default.nix => unit/cm/cmark/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cmatrix/default.nix => unit/cm/cmatrix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/cmctl/default.nix => unit/cm/cmctl/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/cm}/cmctl/update.sh (100%) rename pkgs/{development/compilers/cmdstan/default.nix => unit/cm/cmdstan/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/cm}/cmigemo/no-http-tool-check.patch (100%) rename pkgs/{tools/text/cmigemo/default.nix => unit/cm/cmigemo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cminpack/default.nix => unit/cm/cminpack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cmocka/default.nix => unit/cm/cmocka/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cmrt/default.nix => unit/cm/cmrt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cmt/default.nix => unit/cm/cmt/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/cmtk/default.nix => unit/cm/cmtk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cmusfm/default.nix => unit/cm/cmusfm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/flannel/plugin.nix => unit/cn/cni-plugin-flannel/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/cni/plugins.nix => unit/cn/cni-plugins/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/cni/default.nix => unit/cn/cni/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter2/patches/get_protocol.patch (100%) rename pkgs/{misc/cups/drivers/cnijfilter2/default.nix => unit/cn/cnijfilter2/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch (100%) rename pkgs/{misc/cups/drivers => unit/cn}/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch (100%) rename pkgs/{misc/cups/drivers/cnijfilter_4_00/default.nix => unit/cn/cnijfilter_4_00/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cnping/default.nix => unit/cn/cnping/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cnstrokeorder/default.nix => unit/cn/cnstrokeorder/pkg-fun.nix} (100%) rename pkgs/{tools/networking/cntlm/default.nix => unit/cn/cntlm/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/cntr/default.nix => unit/cn/cntr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/CoinMP/default.nix => unit/co/CoinMP/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/coan/default.nix => unit/co/coan/pkg-fun.nix} (100%) rename pkgs/{development/tools/cobra-cli/default.nix => unit/co/cobra-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/coccinelle/default.nix => unit/co/coccinelle/pkg-fun.nix} (100%) rename pkgs/{servers/sql/cockroachdb/default.nix => unit/co/cockroachdb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cod/default.nix => unit/co/cod/pkg-fun.nix} (100%) rename pkgs/{tools/misc/code-minimap/default.nix => unit/co/code-minimap/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/co}/codeblocks/fix-clipboard-flush.patch (100%) rename pkgs/{applications/editors/codeblocks/default.nix => unit/co/codeblocks/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/co}/codeblocks/writable-projects.patch (100%) rename pkgs/{tools/misc/codebraid/default.nix => unit/co/codebraid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/codec2/default.nix => unit/co/codec2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/codecserver/default.nix => unit/co/codecserver/pkg-fun.nix} (100%) rename pkgs/{development/tools/codeowners/default.nix => unit/co/codeowners/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/codeql/default.nix => unit/co/codeql/pkg-fun.nix} (100%) rename pkgs/{development/tools/coder/default.nix => unit/co/coder/pkg-fun.nix} (100%) rename pkgs/{tools/text/codesearch/default.nix => unit/co/codesearch/pkg-fun.nix} (100%) rename pkgs/{development/tools/codespell/default.nix => unit/co/codespell/pkg-fun.nix} (100%) rename pkgs/{tools/security/coercer/default.nix => unit/co/coercer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/coeurl/default.nix => unit/co/coeurl/pkg-fun.nix} (100%) rename pkgs/{development/web/cog/default.nix => unit/co/cog/pkg-fun.nix} (100%) rename pkgs/{development/libraries/coin3d/default.nix => unit/co/coin3d/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cointop/default.nix => unit/co/cointop/pkg-fun.nix} (100%) rename pkgs/{data/misc/colemak-dh/default.nix => unit/co/colemak-dh/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/colima/default.nix => unit/co/colima/pkg-fun.nix} (100%) rename pkgs/{development/libraries/collada-dom/default.nix => unit/co/collada-dom/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/collapseos-cvm/default.nix => unit/co/collapseos-cvm/pkg-fun.nix} (100%) rename pkgs/{tools/system/collectd/data.nix => unit/co/collectd-data/pkg-fun.nix} (100%) rename pkgs/{data/themes/colloid-gtk-theme/default.nix => unit/co/colloid-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/colloid-icon-theme/default.nix => unit/co/colloid-icon-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/colloid-kde/default.nix => unit/co/colloid-kde/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/co}/colm/cross-compile.patch (100%) rename pkgs/{development/compilers/colm/default.nix => unit/co/colm/pkg-fun.nix} (100%) rename pkgs/{tools/admin/colmena/default.nix => unit/co/colmena/pkg-fun.nix} (100%) rename pkgs/{games => unit/co}/colobot/data.nix (100%) rename pkgs/{games/colobot/default.nix => unit/co/colobot/pkg-fun.nix} (100%) rename pkgs/{tools/misc/colord-gtk/default.nix => unit/co/colord-gtk/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/co}/colord/installed-tests-path.patch (100%) rename pkgs/{tools/misc/colord/default.nix => unit/co/colord/pkg-fun.nix} (100%) rename pkgs/{tools/text/colordiff/default.nix => unit/co/colordiff/pkg-fun.nix} (100%) rename pkgs/{tools/misc/colorless/default.nix => unit/co/colorless/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/co}/colorls/Gemfile (100%) rename pkgs/{tools/system => unit/co}/colorls/Gemfile.lock (100%) rename pkgs/{tools/system => unit/co}/colorls/gemset.nix (100%) rename pkgs/{tools/system/colorls/default.nix => unit/co/colorls/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/colormake/default.nix => unit/co/colormake/pkg-fun.nix} (100%) rename pkgs/{tools/misc/colorpanes/default.nix => unit/co/colorpanes/pkg-fun.nix} (100%) rename pkgs/{tools/misc/colorpicker/default.nix => unit/co/colorpicker/pkg-fun.nix} (100%) rename pkgs/{applications/misc/colort/default.nix => unit/co/colort/pkg-fun.nix} (100%) rename pkgs/{tools/misc/colorz/default.nix => unit/co/colorz/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/colpack/default.nix => unit/co/colpack/pkg-fun.nix} (100%) rename pkgs/{data/misc/combinatorial_designs/default.nix => unit/co/combinatorial_designs/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/co}/comby/comby.patch (100%) rename pkgs/{development/tools/comby/default.nix => unit/co/comby/pkg-fun.nix} (100%) rename pkgs/{development/libraries/comedilib/default.nix => unit/co/comedilib/pkg-fun.nix} (100%) rename pkgs/{data/fonts/comfortaa/default.nix => unit/co/comfortaa/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/co}/comic-mono/comic-mono-weight.conf (100%) rename pkgs/{data/fonts/comic-mono/default.nix => unit/co/comic-mono/pkg-fun.nix} (100%) rename pkgs/{data/fonts/comic-neue/default.nix => unit/co/comic-neue/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/co}/comic-relief/comic-sans-ms-alias.conf (100%) rename pkgs/{data/fonts/comic-relief/default.nix => unit/co/comic-relief/pkg-fun.nix} (100%) rename pkgs/{data/icons => unit/co}/comixcursors/makefile-shell-var.patch (100%) rename pkgs/{data/icons/comixcursors/default.nix => unit/co/comixcursors/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/comma/default.nix => unit/co/comma/pkg-fun.nix} (100%) rename pkgs/{games/commandergenius/default.nix => unit/co/commandergenius/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/commit-formatter/default.nix => unit/co/commit-formatter/pkg-fun.nix} (100%) rename pkgs/{tools/security/commix/default.nix => unit/co/commix/pkg-fun.nix} (100%) rename pkgs/{data/misc/common-licenses/default.nix => unit/co/common-licenses/pkg-fun.nix} (100%) rename pkgs/{common-updater/scripts.nix => unit/co/common-updater-scripts/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/bcel/default.nix => unit/co/commonsBcel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/bsf/default.nix => unit/co/commonsBsf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/compress/default.nix => unit/co/commonsCompress/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/daemon/default.nix => unit/co/commonsDaemon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/fileupload/default.nix => unit/co/commonsFileUpload/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/io/default.nix => unit/co/commonsIo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/lang/default.nix => unit/co/commonsLang/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/logging/default.nix => unit/co/commonsLogging/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/commons/math/default.nix => unit/co/commonsMath/pkg-fun.nix} (100%) rename pkgs/{applications/networking/compactor/default.nix => unit/co/compactor/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/co}/compass/Gemfile (100%) rename pkgs/{development/tools => unit/co}/compass/Gemfile.lock (100%) rename pkgs/{development/tools => unit/co}/compass/gemset.nix (100%) rename pkgs/{development/tools/compass/default.nix => unit/co/compass/pkg-fun.nix} (100%) rename pkgs/{development/tools/compile-daemon/default.nix => unit/co/compile-daemon/pkg-fun.nix} (100%) rename pkgs/{tools/misc/complete-alias/default.nix => unit/co/complete-alias/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/complexity/default.nix => unit/co/complexity/pkg-fun.nix} (100%) rename pkgs/{build-support/kernel/compress-firmware-xz.nix => unit/co/compressFirmwareXz/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/compsize/default.nix => unit/co/compsize/pkg-fun.nix} (100%) rename pkgs/{development/compilers/computecpp/default.nix => unit/co/computecpp-unwrapped/pkg-fun.nix} (100%) rename pkgs/{tools/text/comrak/default.nix => unit/co/comrak/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/conan/default.nix => unit/co/conan/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/conda/default.nix => unit/co/conda/pkg-fun.nix} (100%) rename pkgs/{applications/misc/conduktor/default.nix => unit/co/conduktor/pkg-fun.nix} (100%) rename pkgs/{tools/system/confd/default.nix => unit/co/confd/pkg-fun.nix} (100%) rename pkgs/{servers/confluencepot/default.nix => unit/co/confluencepot/pkg-fun.nix} (100%) rename pkgs/{development/tools/confluent-cli/default.nix => unit/co/confluent-cli/pkg-fun.nix} (100%) rename pkgs/{servers/confluent-platform/default.nix => unit/co/confluent-platform/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/conform/default.nix => unit/co/conform/pkg-fun.nix} (100%) rename pkgs/{development/tools/conftest/default.nix => unit/co/conftest/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/conglomerate/default.nix => unit/co/conglomerate/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/conmon-rs/default.nix => unit/co/conmon-rs/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/conmon/default.nix => unit/co/conmon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/connect/default.nix => unit/co/connect/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/conntrack-tools/default.nix => unit/co/conntrack-tools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/conserver/default.nix => unit/co/conserver/pkg-fun.nix} (100%) rename pkgs/{development/libraries/console-bridge/default.nix => unit/co/console-bridge/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/conspy/default.nix => unit/co/conspy/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/co}/consul-alerts/deps.nix (100%) rename pkgs/{servers/monitoring/consul-alerts/default.nix => unit/co/consul-alerts/pkg-fun.nix} (100%) rename pkgs/{tools/system/consul-template/default.nix => unit/co/consul-template/pkg-fun.nix} (100%) rename pkgs/{servers/consul/default.nix => unit/co/consul/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/containerd/default.nix => unit/co/containerd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/co}/containerpilot/deps.nix (100%) rename pkgs/{applications/networking/cluster/containerpilot/default.nix => unit/co/containerpilot/pkg-fun.nix} (100%) rename pkgs/{applications/accessibility/contrast/default.nix => unit/co/contrast/pkg-fun.nix} (100%) rename pkgs/{tools/misc/convbin/default.nix => unit/co/convbin/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/convchain/default.nix => unit/co/convchain/pkg-fun.nix} (100%) rename pkgs/{tools/text/convertlit/default.nix => unit/co/convertlit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/convfont/default.nix => unit/co/convfont/pkg-fun.nix} (100%) rename pkgs/{tools/misc/convimg/default.nix => unit/co/convimg/pkg-fun.nix} (100%) rename pkgs/{tools/misc/convmv/default.nix => unit/co/convmv/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/convos/default.nix => unit/co/convos/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/convoy/default.nix => unit/co/convoy/pkg-fun.nix} (100%) rename pkgs/{data/misc/conway_polynomials/default.nix => unit/co/conway_polynomials/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cooper-hewitt/default.nix => unit/co/cooper-hewitt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/coordgenlibs/default.nix => unit/co/coordgenlibs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/coost/default.nix => unit/co/coost/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cope/default.nix => unit/co/cope/pkg-fun.nix} (100%) rename pkgs/{tools/admin/copilot-cli/default.nix => unit/co/copilot-cli/pkg-fun.nix} (100%) rename pkgs/{development/compilers/copper/default.nix => unit/co/copper/pkg-fun.nix} (100%) rename pkgs/{tools/text/copyright-update/default.nix => unit/co/copyright-update/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/coq2html/default.nix => unit/co/coq2html/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/cordless/default.nix => unit/co/cordless/pkg-fun.nix} (100%) rename pkgs/{servers/dns/coredns/default.nix => unit/co/coredns/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/co}/corefonts/no-op.conf (100%) rename pkgs/{data/fonts/corefonts/default.nix => unit/co/corefonts/pkg-fun.nix} (100%) rename pkgs/{tools/networking/corerad/default.nix => unit/co/corerad/pkg-fun.nix} (100%) rename pkgs/{applications/networking/coreth/default.nix => unit/co/coreth/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/co}/coreutils/disable-seek-hole.patch (100%) rename pkgs/{tools/misc/coreutils/default.nix => unit/co/coreutils/pkg-fun.nix} (100%) rename pkgs/{tools/networking/corkscrew/default.nix => unit/co/corkscrew/pkg-fun.nix} (100%) rename pkgs/{servers/corosync/default.nix => unit/co/corosync/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/co}/corrosion/cmake-install-full-dir.patch (100%) rename pkgs/{development/tools/build-managers/corrosion/default.nix => unit/co/corrosion/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/co}/corundum/Gemfile (100%) rename pkgs/{development/tools => unit/co}/corundum/Gemfile.lock (100%) rename pkgs/{development/tools => unit/co}/corundum/gemset.nix (100%) rename pkgs/{development/tools/corundum/default.nix => unit/co/corundum/pkg-fun.nix} (100%) rename pkgs/{development/tools/cosmoc/default.nix => unit/co/cosmoc/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/co}/cosmopolitan/fix-paths.patch (100%) rename pkgs/{development/libraries/cosmopolitan/default.nix => unit/co/cosmopolitan/pkg-fun.nix} (100%) rename pkgs/{servers/coturn/default.nix => unit/co/coturn/pkg-fun.nix} (100%) rename pkgs/{servers => unit/co}/coturn/pure-configure.patch (100%) rename pkgs/{servers/http/couchdb/3.nix => unit/co/couchdb3/pkg-fun.nix} (100%) rename pkgs/{data/fonts/courier-prime/default.nix => unit/co/courier-prime/pkg-fun.nix} (100%) rename pkgs/{applications/misc/coursera-dl/default.nix => unit/co/coursera-dl/pkg-fun.nix} (100%) rename pkgs/{development/tools/coursier/default.nix => unit/co/coursier/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/cov-build/default.nix => unit/co/cov-build/pkg-fun.nix} (100%) rename pkgs/{tools/security/cowpatty/default.nix => unit/co/cowpatty/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cowsay/default.nix => unit/co/cowsay/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/coyim/default.nix => unit/co/coyim/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/coz/default.nix => unit/co/coz/pkg-fun.nix} (100%) rename pkgs/{data/fonts/cozette/default.nix => unit/co/cozette/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cozy-drive/default.nix => unit/co/cozy-drive/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cozy/default.nix => unit/co/cozy/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/cp2k/default.nix => unit/cp/cp2k/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cp437/default.nix => unit/cp/cp437/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/cpcfs/default.nix => unit/cp/cpcfs/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/cpio/default.nix => unit/cp/cpio/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cplay-ng/default.nix => unit/cp/cplay-ng/pkg-fun.nix} (100%) rename pkgs/{development/tools/cpm-cmake/default.nix => unit/cp/cpm-cmake/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cpp-hocon/default.nix => unit/cp/cpp-hocon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cpp-ipfs-http-client/default.nix => unit/cp/cpp-ipfs-http-client/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/cp}/cpp-ipfs-http-client/unvendor-nlohmann-json.patch (100%) rename pkgs/{development/libraries/cpp-jwt/default.nix => unit/cp/cpp-jwt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cpp-utilities/default.nix => unit/cp/cpp-utilities/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/cppcheck/default.nix => unit/cp/cppcheck/pkg-fun.nix} (100%) rename pkgs/{development/tools/cppclean/default.nix => unit/cp/cppclean/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cppcms/default.nix => unit/cp/cppcms/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cppdb/default.nix => unit/cp/cppdb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/chemistry/cppe/default.nix => unit/cp/cppe/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cppi/default.nix => unit/cp/cppi/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis => unit/cp}/cpplint/0001-Remove-pytest-runner-version-pin.patch (100%) rename pkgs/{development/tools/analysis/cpplint/default.nix => unit/cp/cpplint/pkg-fun.nix} (100%) rename pkgs/{development/misc/cppreference-doc/default.nix => unit/cp/cppreference-doc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cpptest/default.nix => unit/cp/cpptest/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cpptoml/default.nix => unit/cp/cpptoml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cppunit/default.nix => unit/cp/cppunit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cpputest/default.nix => unit/cp/cpputest/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cppzmq/default.nix => unit/cp/cppzmq/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/cp}/cproto/cproto.patch (100%) rename pkgs/{development/tools/misc/cproto/default.nix => unit/cp/cproto/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cpu-x/default.nix => unit/cp/cpu-x/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cpufetch/default.nix => unit/cp/cpufetch/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cpufrequtils/default.nix => unit/cp/cpufrequtils/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/cp}/cpufrequtils/remove-pot-creation-date.patch (100%) rename pkgs/{os-specific/linux/cpuid/default.nix => unit/cp/cpuid/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/cp}/cpulimit/get-missing-basename.patch (100%) rename pkgs/{tools/misc/cpulimit/default.nix => unit/cp/cpulimit/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/cp}/cpulimit/remove-sys-sysctl.h.patch (100%) rename pkgs/{tools/misc/cpuminer/default.nix => unit/cp/cpuminer/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cpustat/default.nix => unit/cp/cpustat/pkg-fun.nix} (100%) rename pkgs/{games/crack-attack => unit/cr/crack_attack}/crack-attack-1.1.14-gcc43.patch (100%) rename pkgs/{games/crack-attack => unit/cr/crack_attack}/crack-attack-1.1.14-glut.patch (100%) rename pkgs/{games/crack-attack/default.nix => unit/cr/crack_attack/pkg-fun.nix} (100%) rename pkgs/{tools/networking/crackle/default.nix => unit/cr/crackle/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cracklib/default.nix => unit/cr/cracklib/pkg-fun.nix} (100%) rename pkgs/{tools/security/crackmapexec/default.nix => unit/cr/crackmapexec/pkg-fun.nix} (100%) rename pkgs/{tools/security/crackql/default.nix => unit/cr/crackql/pkg-fun.nix} (100%) rename pkgs/{tools/security/crackxls/default.nix => unit/cr/crackxls/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/craftos-pc/default.nix => unit/cr/craftos-pc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/cr}/cramfsprogs/include-sysmacros.patch (100%) rename pkgs/{os-specific/linux/cramfsprogs/default.nix => unit/cr/cramfsprogs/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/cr}/cramfsswap/parallel-make.patch (100%) rename pkgs/{os-specific/linux/cramfsswap/default.nix => unit/cr/cramfsswap/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/crate2nix/default.nix => unit/cr/crate2nix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/crc/default.nix => unit/cr/crc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/cr}/crc/update.sh (100%) rename pkgs/{development/libraries/crc32c/default.nix => unit/cr/crc32c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/crcpp/default.nix => unit/cr/crcpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/crd2pulumi/default.nix => unit/cr/crd2pulumi/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/crda/default.nix => unit/cr/crda/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cre2/default.nix => unit/cr/cre2/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/cr}/createrepo_c/fix-bash-completion-path.patch (100%) rename pkgs/{tools/package-management => unit/cr}/createrepo_c/fix-python-install-path.patch (100%) rename pkgs/{tools/package-management/createrepo_c/default.nix => unit/cr/createrepo_c/pkg-fun.nix} (100%) rename pkgs/{tools/security/credential-detector/default.nix => unit/cr/credential-detector/pkg-fun.nix} (100%) rename pkgs/{tools/admin/credhub-cli/default.nix => unit/cr/credhub-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/credslayer/default.nix => unit/cr/credslayer/pkg-fun.nix} (100%) rename pkgs/{data/fonts/creep/default.nix => unit/cr/creep/pkg-fun.nix} (100%) rename pkgs/{tools/misc/crex/default.nix => unit/cr/crex/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/cri-o/default.nix => unit/cr/cri-o-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/cri-o/wrapper.nix => unit/cr/cri-o/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/cri-tools/default.nix => unit/cr/cri-tools/pkg-fun.nix} (100%) rename pkgs/{data/fonts/crimson-pro/default.nix => unit/cr/crimson-pro/pkg-fun.nix} (100%) rename pkgs/{data/fonts/crimson/default.nix => unit/cr/crimson/pkg-fun.nix} (100%) rename pkgs/{applications/audio/crip/default.nix => unit/cr/crip/pkg-fun.nix} (100%) rename pkgs/{games/crispy-doom/default.nix => unit/cr/crispyDoom/pkg-fun.nix} (100%) rename pkgs/{development/libraries/criterion/default.nix => unit/cr/criterion/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/criu/default.nix => unit/cr/criu/pkg-fun.nix} (100%) rename pkgs/{tools/security/crlfsuite/default.nix => unit/cr/crlfsuite/pkg-fun.nix} (100%) rename pkgs/{tools/security/crlfuzz/default.nix => unit/cr/crlfuzz/pkg-fun.nix} (100%) rename pkgs/{development/libraries/croaring/default.nix => unit/cr/croaring/pkg-fun.nix} (100%) rename pkgs/{tools/networking/croc/default.nix => unit/cr/croc/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/cr}/croc/test-local-relay.nix (100%) rename pkgs/{tools/system/cron/default.nix => unit/cr/cron/pkg-fun.nix} (100%) rename pkgs/{development/libraries/crossguid/default.nix => unit/cr/crossguid/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/crosvm/default.nix => unit/cr/crosvm/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization => unit/cr}/crosvm/update.py (100%) rename pkgs/{tools/security/crowbar/default.nix => unit/cr/crowbar/pkg-fun.nix} (100%) rename pkgs/{tools/text/crowdin-cli/default.nix => unit/cr/crowdin-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/crowdsec/default.nix => unit/cr/crowdsec/pkg-fun.nix} (100%) rename pkgs/{games => unit/cr}/crrcsim/gcc6.patch (100%) rename pkgs/{games/crrcsim/default.nix => unit/cr/crrcsim/pkg-fun.nix} (100%) rename pkgs/{tools/misc/crudini/default.nix => unit/cr/crudini/pkg-fun.nix} (100%) rename pkgs/{applications/misc/crumbs/default.nix => unit/cr/crumbs/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/crun/default.nix => unit/cr/crun/pkg-fun.nix} (100%) rename pkgs/{tools/security/crunch/default.nix => unit/cr/crunch/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/cryfs/default.nix => unit/cr/cryfs/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/crypto-org-wallet/default.nix => unit/cr/crypto-org-wallet/pkg-fun.nix} (100%) rename pkgs/{tools/security/cryptomator/default.nix => unit/cr/cryptomator/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/cryptominisat/default.nix => unit/cr/cryptominisat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/crypto++/default.nix => unit/cr/cryptopp/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/cryptoverif/default.nix => unit/cr/cryptoverif/pkg-fun.nix} (100%) rename pkgs/{applications/finance/cryptowatch/default.nix => unit/cr/cryptowatch-desktop/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cryptsetup/default.nix => unit/cr/cryptsetup/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/cr}/cryptsetup/relative-token-path.patch (100%) rename pkgs/{development/compilers/crystal2nix/default.nix => unit/cr/crystal2nix/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/cr}/crystal2nix/shards.nix (100%) rename pkgs/{applications/audio/csa/default.nix => unit/cs/csa/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cscope/default.nix => unit/cs/cscope/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/csdp/default.nix => unit/cs/csdp/pkg-fun.nix} (100%) rename pkgs/{applications/radio/csdr/default.nix => unit/cs/csdr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/csfml/default.nix => unit/cs/csfml/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/cshatag/default.nix => unit/cs/cshatag/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/csmith/default.nix => unit/cs/csmith/pkg-fun.nix} (100%) rename pkgs/{applications/audio/csound/csound-manual/default.nix => unit/cs/csound-manual/pkg-fun.nix} (100%) rename pkgs/{development/web/csslint/default.nix => unit/cs/csslint/pkg-fun.nix} (100%) rename pkgs/{tools/misc/csv2latex/default.nix => unit/cs/csv2latex/pkg-fun.nix} (100%) rename pkgs/{applications/office/csv2odf/default.nix => unit/cs/csv2odf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/csv2parquet/default.nix => unit/cs/csv2parquet/pkg-fun.nix} (100%) rename pkgs/{tools/text/csvdiff/default.nix => unit/cs/csvdiff/pkg-fun.nix} (100%) rename pkgs/{tools/text/csview/default.nix => unit/cs/csview/pkg-fun.nix} (100%) rename pkgs/{tools/text/csvkit/default.nix => unit/cs/csvkit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/csvs-to-sqlite/default.nix => unit/cs/csvs-to-sqlite/pkg-fun.nix} (100%) rename pkgs/{development/ocaml-modules/csv/csvtool.nix => unit/cs/csvtool/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/csxcad/default.nix => unit/cs/csxcad/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/cs}/csxcad/searchPath.patch (100%) rename pkgs/{development/tools/misc/ctags/default.nix => unit/ct/ctags/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/ct}/ctags/unused-collision.patch (100%) rename pkgs/{development/tools/misc/ctags/wrapped.nix => unit/ct/ctagsWrapped/pkg-fun.nix} (100%) rename pkgs/{development/tools/ctlptl/default.nix => unit/ct/ctlptl/pkg-fun.nix} (100%) rename pkgs/{tools/security/ctmg/default.nix => unit/ct/ctmg/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ctodo/default.nix => unit/ct/ctodo/pkg-fun.nix} (100%) rename pkgs/{tools/system/ctop/default.nix => unit/ct/ctop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ctpl/default.nix => unit/ct/ctpl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ctpp2/default.nix => unit/ct/ctpp2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ctre/default.nix => unit/ct/ctre/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/ctrtool/default.nix => unit/ct/ctrtool/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/ctx/default.nix => unit/ct/ctx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ctypes_sh/default.nix => unit/ct/ctypes_sh/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/cubicle/default.nix => unit/cu/cubicle/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/cu}/cucumber/Gemfile (100%) rename pkgs/{development/tools => unit/cu}/cucumber/Gemfile.lock (100%) rename pkgs/{development/tools => unit/cu}/cucumber/gemset.nix (100%) rename pkgs/{development/tools/cucumber/default.nix => unit/cu/cucumber/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/cu}/cudd/cudd.patch (100%) rename pkgs/{development/libraries/cudd/default.nix => unit/cu/cudd/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/cue2pops/default.nix => unit/cu/cue2pops/pkg-fun.nix} (100%) rename pkgs/{development/tools/cuelsp/default.nix => unit/cu/cuelsp/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/cuetools/default.nix => unit/cu/cuetools/pkg-fun.nix} (100%) rename pkgs/{data/fonts/culmus/default.nix => unit/cu/culmus/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cum/default.nix => unit/cu/cum/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/cuneiform/default.nix => unit/cu/cuneiform/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cunit/default.nix => unit/cu/cunit/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/cups-bjnp/default.nix => unit/cu/cups-bjnp/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/hll2350dw/default.nix => unit/cu/cups-brother-hll2350dw/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/brother/hll2375dw => unit/cu/cups-brother-hll2375dw}/fix-perm.patch (100%) rename pkgs/{misc/cups/drivers/brother/hll2375dw/default.nix => unit/cu/cups-brother-hll2375dw/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl2750dw/default.nix => unit/cu/cups-brother-mfcl2750dw/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix => unit/cu/cups-drv-rastertosag-gdi/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/dymo => unit/cu/cups-dymo}/fix-includes.patch (100%) rename pkgs/{misc/cups/drivers/dymo/default.nix => unit/cu/cups-dymo/pkg-fun.nix} (100%) rename pkgs/{misc/cups/filters.nix => unit/cu/cups-filters/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix => unit/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix => unit/cu/cups-kyocera-ecosys-m552x-p502x/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/kyocera/default.nix => unit/cu/cups-kyocera/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/kyodialog/default.nix => unit/cu/cups-kyodialog/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/cups-pdf-to-pdf/default.nix => unit/cu/cups-pdf-to-pdf/pkg-fun.nix} (100%) rename pkgs/{misc/cups/cups-pk-helper.nix => unit/cu/cups-pk-helper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/estudio/default.nix => unit/cu/cups-toshiba-estudio/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/zj-58/default.nix => unit/cu/cups-zj-58/pkg-fun.nix} (100%) rename pkgs/{misc/cups/default.nix => unit/cu/cups/pkg-fun.nix} (100%) rename pkgs/{applications/misc/cura/plugins.nix => unit/cu/curaPlugins/pkg-fun.nix} (100%) rename pkgs/{applications/misc/curaengine/stable.nix => unit/cu/curaengine_stable/pkg-fun.nix} (100%) rename pkgs/{data/fonts/curie/default.nix => unit/cu/curie/pkg-fun.nix} (100%) rename pkgs/{tools/networking/curl-impersonate/default.nix => unit/cu/curl-impersonate-bin/pkg-fun.nix} (100%) rename pkgs/{tools/networking/curl => unit/cu/curlMinimal}/7.79.1-darwin-no-systemconfiguration.patch (100%) rename pkgs/{tools/networking/curl/default.nix => unit/cu/curlMinimal/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/cu}/curlftpfs/fix-rpl_malloc.patch (100%) rename pkgs/{tools/filesystems/curlftpfs/default.nix => unit/cu/curlftpfs/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/cu}/curlie/bump-golang-x-sys.patch (100%) rename pkgs/{tools/networking/curlie/default.nix => unit/cu/curlie/pkg-fun.nix} (100%) rename pkgs/{development/libraries/curlpp/default.nix => unit/cu/curlpp/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/cu}/curseradio/mpv.patch (100%) rename pkgs/{applications/audio/curseradio/default.nix => unit/cu/curseradio/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/curtail/default.nix => unit/cu/curtail/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cutee/default.nix => unit/cu/cutee/pkg-fun.nix} (100%) rename pkgs/{games/cuyo/default.nix => unit/cu/cuyo/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/cv}/cvc4/minisat-fenv.patch (100%) rename pkgs/{applications/science/logic/cvc4/default.nix => unit/cv/cvc4/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/cvc5/default.nix => unit/cv/cvc5/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/cvehound/default.nix => unit/cv/cvehound/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/cvs-fast-export/default.nix => unit/cv/cvs-fast-export/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/cv}/cvs/CVE-2012-0804.patch (100%) rename pkgs/{applications/version-management => unit/cv}/cvs/CVE-2017-12836.patch (100%) rename pkgs/{applications/version-management => unit/cv}/cvs/getcwd-chroot.patch (100%) rename pkgs/{applications/version-management/cvs/default.nix => unit/cv/cvs/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/cvs2svn/default.nix => unit/cv/cvs2svn/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/cvsps/default.nix => unit/cv/cvsps/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/cvsq/default.nix => unit/cv/cvsq/pkg-fun.nix} (100%) rename pkgs/{tools/admin/cw/default.nix => unit/cw/cw/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/cwebbin/default.nix => unit/cw/cwebbin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cwiid/default.nix => unit/cw/cwiid/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/cwltool/default.nix => unit/cw/cwltool/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/cwm/default.nix => unit/cw/cwm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/cxx-prettyprint/default.nix => unit/cx/cxx-prettyprint/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/cx}/cxx-rs/Cargo.lock (100%) rename pkgs/{development/libraries/cxx-rs/default.nix => unit/cx/cxx-rs/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/cx}/cxxopts/fix-install-path.patch (100%) rename pkgs/{development/libraries/cxxopts/default.nix => unit/cx/cxxopts/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/cyan/default.nix => unit/cy/cyan/pkg-fun.nix} (100%) rename pkgs/{applications/audio/cyanrip/default.nix => unit/cy/cyanrip/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cyberchef/default.nix => unit/cy/cyberchef/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/cyclone/default.nix => unit/cy/cyclone-scheme/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pd-plugins/cyclone/default.nix => unit/cy/cyclone/pkg-fun.nix} (100%) rename pkgs/{tools/security/cyclonedx-gomod/default.nix => unit/cy/cyclonedx-gomod/pkg-fun.nix} (100%) rename pkgs/{tools/misc/cyclonedx-python/default.nix => unit/cy/cyclonedx-python/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/cz}/cz-cli/node-composition.nix (100%) rename pkgs/{applications/version-management => unit/cz}/cz-cli/node-env.nix (100%) rename pkgs/{applications/version-management => unit/cz}/cz-cli/node-packages.nix (100%) rename pkgs/{applications/version-management/cz-cli/default.nix => unit/cz/cz-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/czkawka/default.nix => unit/cz/czkawka/pkg-fun.nix} (100%) rename pkgs/{development/libraries/czmq/default.nix => unit/cz/czmq/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/d-seams/default.nix => unit/d-/d-seams/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/d-spy/default.nix => unit/d-/d-spy/pkg-fun.nix} (100%) rename pkgs/{tools/text/d2/default.nix => unit/d2/d2/pkg-fun.nix} (100%) rename pkgs/{data/fonts/d2coding/default.nix => unit/d2/d2coding/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dab_lib/default.nix => unit/da/dab_lib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dabet/default.nix => unit/da/dabet/pkg-fun.nix} (100%) rename pkgs/{applications/radio/dablin/default.nix => unit/da/dablin/pkg-fun.nix} (100%) rename pkgs/{applications/radio/dabtools/default.nix => unit/da/dabtools/pkg-fun.nix} (100%) rename pkgs/{tools/text/dadadodo/default.nix => unit/da/dadadodo/pkg-fun.nix} (100%) rename pkgs/{tools/system/daemon/default.nix => unit/da/daemon/pkg-fun.nix} (100%) rename pkgs/{tools/system/daemonize/default.nix => unit/da/daemonize/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/da}/daemontools/fix-nix-usernamespace-build.patch (100%) rename pkgs/{tools/admin/daemontools/default.nix => unit/da/daemontools/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/dagger/default.nix => unit/da/dagger/pkg-fun.nix} (100%) rename pkgs/{development/compilers/dale/default.nix => unit/da/dale/pkg-fun.nix} (100%) rename pkgs/{tools/security/dalfox/default.nix => unit/da/dalfox/pkg-fun.nix} (100%) rename pkgs/{tools/admin/damon/default.nix => unit/da/damon/pkg-fun.nix} (100%) rename pkgs/{data/fonts/dancing-script/default.nix => unit/da/dancing-script/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/da}/danger-gitlab/Gemfile (100%) rename pkgs/{applications/version-management => unit/da}/danger-gitlab/Gemfile.lock (100%) rename pkgs/{applications/version-management => unit/da}/danger-gitlab/gemset.nix (100%) rename pkgs/{applications/version-management/danger-gitlab/default.nix => unit/da/danger-gitlab/pkg-fun.nix} (100%) rename pkgs/{servers/dante/default.nix => unit/da/dante/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/dap/default.nix => unit/da/dap/pkg-fun.nix} (100%) rename pkgs/{development/tools/dapper/default.nix => unit/da/dapper/pkg-fun.nix} (100%) rename pkgs/{development/tools/dapr/cli/default.nix => unit/da/dapr-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ids/daq/default.nix => unit/da/daq/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/da}/darcnes/label.patch (100%) rename pkgs/{applications/emulators/darcnes/default.nix => unit/da/darcnes/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/darcs-to-git/default.nix => unit/da/darcs-to-git/pkg-fun.nix} (100%) rename pkgs/{servers/http/darkhttpd/default.nix => unit/da/darkhttpd/pkg-fun.nix} (100%) rename pkgs/{tools/audio => unit/da}/darkice/fix-undeclared-memmove.patch (100%) rename pkgs/{tools/audio/darkice/default.nix => unit/da/darkice/pkg-fun.nix} (100%) rename pkgs/{applications/misc/darkman/default.nix => unit/da/darkman/pkg-fun.nix} (100%) rename pkgs/{games/darkplaces/default.nix => unit/da/darkplaces/pkg-fun.nix} (100%) rename pkgs/{tools/networking/darkstat/default.nix => unit/da/darkstat/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/darktile/default.nix => unit/da/darktile/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/darling-dmg/default.nix => unit/da/darling-dmg/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/dart/default.nix => unit/da/dart/pkg-fun.nix} (100%) rename pkgs/{tools/system/das_watchdog/default.nix => unit/da/das_watchdog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dasel/default.nix => unit/da/dasel/pkg-fun.nix} (100%) rename pkgs/{shells/dash/default.nix => unit/da/dash/pkg-fun.nix} (100%) rename pkgs/{applications/accessibility/dasher/default.nix => unit/da/dasher/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dashing/default.nix => unit/da/dashing/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dasht/default.nix => unit/da/dasht/pkg-fun.nix} (100%) rename pkgs/{development/compilers/dasm/default.nix => unit/da/dasm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dd-agent/datadog-process-agent.nix => unit/da/datadog-process-agent/pkg-fun.nix} (100%) rename pkgs/{development/misc/datafusion/default.nix => unit/da/datafusion-cli/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/datalad/default.nix => unit/da/datalad/pkg-fun.nix} (100%) rename pkgs/{tools/misc/datamash/default.nix => unit/da/datamash/pkg-fun.nix} (100%) rename pkgs/{tools/misc/datefmt/default.nix => unit/da/datefmt/pkg-fun.nix} (100%) rename pkgs/{tools/system/datefudge/default.nix => unit/da/datefudge/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dateutils/default.nix => unit/da/dateutils/pkg-fun.nix} (100%) rename pkgs/{development/tools/datree/default.nix => unit/da/datree/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dav1d/default.nix => unit/da/dav1d/pkg-fun.nix} (100%) rename pkgs/{servers/http/dave/default.nix => unit/da/dave/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/da}/davfs2/0001-umount_davfs-substitute-ps-command.patch (100%) rename pkgs/{tools/filesystems => unit/da}/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch (100%) rename pkgs/{tools/filesystems => unit/da}/davfs2/fix-sysconfdir.patch (100%) rename pkgs/{tools/filesystems => unit/da}/davfs2/isdir.patch (100%) rename pkgs/{tools/filesystems/davfs2/default.nix => unit/da/davfs2/pkg-fun.nix} (100%) rename pkgs/{applications/video/davinci-resolve/default.nix => unit/da/davinci-resolve/pkg-fun.nix} (100%) rename pkgs/{applications/networking/davmail/default.nix => unit/da/davmail/pkg-fun.nix} (100%) rename pkgs/{tools/security/davtest/default.nix => unit/da/davtest/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/dawn/default.nix => unit/da/dawn/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/dawncut/default.nix => unit/da/dawncut/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dbacl/default.nix => unit/db/dbacl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dbeaver/default.nix => unit/db/dbeaver/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/db}/dbench/fix-missing-stdint.patch (100%) rename pkgs/{development/tools/misc/dbench/default.nix => unit/db/dbench/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/dblatex/default.nix => unit/db/dblatex/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/dbmate/default.nix => unit/db/dbmate/pkg-fun.nix} (100%) rename pkgs/{tools/security/dbmonster/default.nix => unit/db/dbmonster/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/db}/dbus-broker/paths.patch (100%) rename pkgs/{os-specific/linux/dbus-broker/default.nix => unit/db/dbus-broker/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dbus-glib/default.nix => unit/db/dbus-glib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dbus-map/default.nix => unit/db/dbus-map/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dbus-sharp/dbus-sharp-1.0.nix => unit/db/dbus-sharp-1_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dbus-sharp/default.nix => unit/db/dbus-sharp-2_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix => unit/db/dbus-sharp-glib-1_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dbus-sharp-glib/default.nix => unit/db/dbus-sharp-glib-2_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/db}/dbus/implement-getgrouplist.patch (100%) rename pkgs/{development/libraries/dbus/default.nix => unit/db/dbus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dbus-cplusplus/default.nix => unit/db/dbus_cplusplus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/dbus-java/default.nix => unit/db/dbus_java/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dbx/default.nix => unit/db/dbx/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/db}/dbxml/cxx11.patch (100%) rename pkgs/{development/libraries => unit/db}/dbxml/incorrect-optimization.patch (100%) rename pkgs/{development/libraries/dbxml/default.nix => unit/db/dbxml/pkg-fun.nix} (100%) rename pkgs/{development/tools/dcadec/default.nix => unit/dc/dcadec/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dcap/default.nix => unit/dc/dcap/pkg-fun.nix} (100%) rename pkgs/{tools/system/dcfldd/default.nix => unit/dc/dcfldd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dclib/default.nix => unit/dc/dclib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dclxvi/default.nix => unit/dc/dclxvi/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology => unit/dc}/dcm2niix/dont-fetch-external-libs.patch (100%) rename pkgs/{applications/science/biology/dcm2niix/default.nix => unit/dc/dcm2niix/pkg-fun.nix} (100%) rename pkgs/{applications/science/medicine => unit/dc}/dcmtk/0001-Fix-cmake.patch (100%) rename pkgs/{applications/science/medicine/dcmtk/default.nix => unit/dc/dcmtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dconf/default.nix => unit/dc/dconf/pkg-fun.nix} (100%) rename pkgs/{development/tools/haskell/dconf2nix/default.nix => unit/dc/dconf2nix/pkg-fun.nix} (100%) rename pkgs/{development/tools/haskell => unit/dc}/dconf2nix/update.sh (100%) rename pkgs/{tools/graphics/dcraw/default.nix => unit/dc/dcraw/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/dcrd/default.nix => unit/dc/dcrd/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/dcrwallet/default.nix => unit/dc/dcrwallet/pkg-fun.nix} (100%) rename pkgs/{tools/text/dcs/default.nix => unit/dc/dcs/pkg-fun.nix} (100%) rename pkgs/{applications/gis/gmt/dcw.nix => unit/dc/dcw-gmt/pkg-fun.nix} (100%) rename pkgs/{tools/system/dd_rescue/default.nix => unit/dd/dd_rescue/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ddate/default.nix => unit/dd/ddate/pkg-fun.nix} (100%) rename pkgs/{data/misc/ddccontrol-db/default.nix => unit/dd/ddccontrol-db/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ddccontrol/default.nix => unit/dd/ddccontrol/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ddclient/default.nix => unit/dd/ddclient/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ddcutil/default.nix => unit/dd/ddcutil/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/dd}/ddd/gcc44.patch (100%) rename pkgs/{development/tools/misc/ddd/default.nix => unit/dd/ddd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ddgr/default.nix => unit/dd/ddgr/pkg-fun.nix} (100%) rename pkgs/{tools/system/ddh/default.nix => unit/dd/ddh/pkg-fun.nix} (100%) rename pkgs/{development/tools/ddosify/default.nix => unit/dd/ddosify/pkg-fun.nix} (100%) rename pkgs/{tools/system/ddrescue/default.nix => unit/dd/ddrescue/pkg-fun.nix} (100%) rename pkgs/{tools/system/ddrescueview/default.nix => unit/dd/ddrescueview/pkg-fun.nix} (100%) rename pkgs/{tools/system/ddrutility/default.nix => unit/dd/ddrutility/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/dduper/default.nix => unit/dd/dduper/pkg-fun.nix} (100%) rename pkgs/{applications/audio/deadbeef/default.nix => unit/de/deadbeef/pkg-fun.nix} (100%) rename pkgs/{development/tools/deadcode/default.nix => unit/de/deadcode/pkg-fun.nix} (100%) rename pkgs/{applications/misc/deadd-notification-center/default.nix => unit/de/deadd-notification-center/pkg-fun.nix} (100%) rename pkgs/{development/tools/deadnix/default.nix => unit/de/deadnix/pkg-fun.nix} (100%) rename pkgs/{applications/editors/deadpixi-sam/default.nix => unit/de/deadpixi-sam-unstable/pkg-fun.nix} (100%) rename pkgs/{tools/misc/debian-devscripts/default.nix => unit/de/debian-devscripts/pkg-fun.nix} (100%) rename pkgs/{applications/misc/debian-goodies/default.nix => unit/de/debian-goodies/pkg-fun.nix} (100%) rename pkgs/{tools/misc/debianutils/default.nix => unit/de/debianutils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/debootstrap/default.nix => unit/de/debootstrap/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/debugedit/default.nix => unit/de/debugedit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/deckmaster/default.nix => unit/de/deckmaster/pkg-fun.nix} (100%) rename pkgs/{applications/misc/deco/default.nix => unit/de/deco/pkg-fun.nix} (100%) rename pkgs/{tools/security/decoder/default.nix => unit/de/decoder/pkg-fun.nix} (100%) rename pkgs/{tools/backup/dedup/default.nix => unit/de/dedup/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/deepgit/default.nix => unit/de/deepgit/pkg-fun.nix} (100%) rename pkgs/{tools/security/deepsea/default.nix => unit/de/deepsea/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-deer/default.nix => unit/de/deer/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-deer => unit/de/deer}/realpath.patch (100%) rename pkgs/{build-support/rust/default-crate-overrides.nix => unit/de/defaultCrateOverrides/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/deheader/default.nix => unit/de/deheader/pkg-fun.nix} (100%) rename pkgs/{tools/admin/dehydrated/default.nix => unit/de/dehydrated/pkg-fun.nix} (100%) rename pkgs/{applications/backup => unit/de}/deja-dup/fix-paths.patch (100%) rename pkgs/{applications/backup/deja-dup/default.nix => unit/de/deja-dup/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/dejagnu/default.nix => unit/de/dejagnu/pkg-fun.nix} (100%) rename pkgs/{tools/compression/dejsonlz4/default.nix => unit/de/dejsonlz4/pkg-fun.nix} (100%) rename pkgs/{applications/audio/delayarchitect/default.nix => unit/de/delayarchitect/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/dell-530cdn/default.nix => unit/de/dell-530cdn/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/delly/default.nix => unit/de/delly/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/deltachat-cursed/default.nix => unit/de/deltachat-cursed/pkg-fun.nix} (100%) rename pkgs/{development/tools/delve/default.nix => unit/de/delve/pkg-fun.nix} (100%) rename pkgs/{servers/demoit/default.nix => unit/de/demoit/pkg-fun.nix} (100%) rename pkgs/{servers/dendrite/default.nix => unit/de/dendrite/pkg-fun.nix} (100%) rename pkgs/{applications/audio/denemo/default.nix => unit/de/denemo/pkg-fun.nix} (100%) rename pkgs/{development/tools/dep/default.nix => unit/de/dep/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/de}/dep2nix/deps.nix (100%) rename pkgs/{development/tools/dep2nix/default.nix => unit/de/dep2nix/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/de}/depotdownloader/deps.nix (100%) rename pkgs/{tools/misc/depotdownloader/default.nix => unit/de/depotdownloader/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/de}/depotdownloader/update.sh (100%) rename pkgs/{applications/graphics/deskew/default.nix => unit/de/deskew/pkg-fun.nix} (100%) rename pkgs/{tools/misc/desktop-file-utils/default.nix => unit/de/desktop-file-utils/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/de}/desktop-file-utils/setup-hook.sh (100%) rename pkgs/{applications/emulators/desmume/default.nix => unit/de/desmume/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sync/desync/default.nix => unit/de/desync/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/de}/deterministic-uname/deterministic-uname.sh (100%) rename pkgs/{build-support/deterministic-uname/default.nix => unit/de/deterministic-uname/pkg-fun.nix} (100%) rename pkgs/{tools/misc/detox/default.nix => unit/de/detox/pkg-fun.nix} (100%) rename pkgs/{development/compilers/dev86/default.nix => unit/de/dev86/pkg-fun.nix} (100%) rename pkgs/{development/tools/devbox/default.nix => unit/de/devbox/pkg-fun.nix} (100%) rename pkgs/{development/tools/devd/default.nix => unit/de/devd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/devdocs-desktop/default.nix => unit/de/devdocs-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/video/devede/default.nix => unit/de/devede/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/device-tree/raspberrypi.nix => unit/de/device-tree_rpi/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/device-tree/default.nix => unit/de/deviceTree/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/devmem2/default.nix => unit/de/devmem2/pkg-fun.nix} (100%) rename pkgs/{tools/X11/devour/default.nix => unit/de/devour/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/devspace/default.nix => unit/de/devspace/pkg-fun.nix} (100%) rename pkgs/{development/tools/devtodo/default.nix => unit/de/devtodo/pkg-fun.nix} (100%) rename pkgs/{servers/dex/default.nix => unit/de/dex-oidc/pkg-fun.nix} (100%) rename pkgs/{tools/X11/dex/default.nix => unit/de/dex/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/dex2jar/default.nix => unit/de/dex2jar/pkg-fun.nix} (100%) rename pkgs/{tools/system/dfc/default.nix => unit/df/dfc/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/d-feet/default.nix => unit/df/dfeet/pkg-fun.nix} (100%) rename pkgs/{tools/text/dfmt/default.nix => unit/df/dfmt/pkg-fun.nix} (100%) rename pkgs/{tools/system/dfrs/default.nix => unit/df/dfrs/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/dfu-programmer/default.nix => unit/df/dfu-programmer/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/dfu-util/default.nix => unit/df/dfu-util/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/dgen-sdl/default.nix => unit/dg/dgen-sdl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dgoss/default.nix => unit/dg/dgoss/pkg-fun.nix} (100%) rename pkgs/{servers/dgraph/default.nix => unit/dg/dgraph/pkg-fun.nix} (100%) rename pkgs/{shells => unit/dg}/dgsh/glibc-2.26.patch (100%) rename pkgs/{shells/dgsh/default.nix => unit/dg/dgsh/pkg-fun.nix} (100%) rename pkgs/{build-support/dhall/directory-to-nix.nix => unit/dh/dhallDirectoryToNix/pkg-fun.nix} (100%) rename pkgs/{build-support/dhall/package-to-nix.nix => unit/dh/dhallPackageToNix/pkg-fun.nix} (100%) rename pkgs/{build-support/dhall/to-nix.nix => unit/dh/dhallToNix/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dhcp/default.nix => unit/dh/dhcp/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/dh}/dhcp/set-hostname.patch (100%) rename pkgs/{tools/networking/dhcpcd/default.nix => unit/dh/dhcpcd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dhcpdump/default.nix => unit/dh/dhcpdump/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dhcping/default.nix => unit/dh/dhcping/pkg-fun.nix} (100%) rename pkgs/{games/dhewm3/default.nix => unit/dh/dhewm3/pkg-fun.nix} (100%) rename pkgs/{applications/editors/dhex/default.nix => unit/dh/dhex/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/dht/default.nix => unit/dh/dht/pkg-fun.nix} (100%) rename pkgs/{tools/system/di/default.nix => unit/di/di/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/dia/default.nix => unit/di/dia/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/di}/dia/poppler-22_09-build-fix.patch (100%) rename pkgs/{applications/misc/dialect/default.nix => unit/di/dialect/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dialog/default.nix => unit/di/dialog/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/diamond/default.nix => unit/di/diamond/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dibbler/default.nix => unit/di/dibbler/pkg-fun.nix} (100%) rename pkgs/{servers/dico/default.nix => unit/di/dico/pkg-fun.nix} (100%) rename pkgs/{servers/dict/dictd-db-collector.nix => unit/di/dictDBCollector/pkg-fun.nix} (100%) rename pkgs/{tools/text/diction/default.nix => unit/di/diction/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/di}/dictu/0001-force-sqlite-to-be-found.patch (100%) rename pkgs/{development/compilers/dictu/default.nix => unit/di/dictu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/didu/default.nix => unit/di/didu/pkg-fun.nix} (100%) rename pkgs/{tools/security/dieharder/default.nix => unit/di/dieharder/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/di}/dieharder/stdint.patch (100%) rename pkgs/{applications/version-management/diff-so-fancy/default.nix => unit/di/diff-so-fancy/pkg-fun.nix} (100%) rename pkgs/{tools/text/diffsitter/default.nix => unit/di/diffsitter/pkg-fun.nix} (100%) rename pkgs/{tools/text/diffstat/default.nix => unit/di/diffstat/pkg-fun.nix} (100%) rename pkgs/{tools/text/difftastic/default.nix => unit/di/difftastic/pkg-fun.nix} (100%) rename pkgs/{applications/misc/diffuse/default.nix => unit/di/diffuse/pkg-fun.nix} (100%) rename pkgs/{tools/text/diffutils/default.nix => unit/di/diffutils/pkg-fun.nix} (100%) rename pkgs/{applications/radio/digiham/default.nix => unit/di/digiham/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/digital/default.nix => unit/di/digital/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/di}/digital/pom.xml.patch (100%) rename pkgs/{tools/misc/digitemp/default.nix => unit/di/digitemp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/dillong/default.nix => unit/di/dillong/pkg-fun.nix} (100%) rename pkgs/{data/fonts/dina/default.nix => unit/di/dina-font/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ding-libs/default.nix => unit/di/ding-libs/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/dippi/default.nix => unit/di/dippi/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dirb/default.nix => unit/di/dirb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/directfb/default.nix => unit/di/directfb/pkg-fun.nix} (100%) rename pkgs/{common-updater/directory-listing-updater.nix => unit/di/directoryListingUpdater/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/directvnc/default.nix => unit/di/directvnc/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/directx-shader-compiler/default.nix => unit/di/directx-shader-compiler/pkg-fun.nix} (100%) rename pkgs/{tools/misc/direnv/default.nix => unit/di/direnv/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/direvent/default.nix => unit/di/direvent/pkg-fun.nix} (100%) rename pkgs/{tools/security/dirstalk/default.nix => unit/di/dirstalk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/dirt/default.nix => unit/di/dirt/pkg-fun.nix} (100%) rename pkgs/{tools/backup/dirvish/default.nix => unit/di/dirvish/pkg-fun.nix} (100%) rename pkgs/{tools/misc/discocss/default.nix => unit/di/discocss/pkg-fun.nix} (100%) rename pkgs/{tools/networking/discord-sh/default.nix => unit/di/discord-sh/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/di}/discordchatexporter-cli/deps.nix (100%) rename pkgs/{tools/backup/discordchatexporter-cli/default.nix => unit/di/discordchatexporter-cli/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/di}/discordchatexporter-cli/updater.sh (100%) rename pkgs/{tools/text => unit/di}/discount/fix-configure-path.patch (100%) rename pkgs/{tools/text/discount/default.nix => unit/di/discount/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/discourse/mail_receiver/default.nix => unit/di/discourse-mail-receiver/pkg-fun.nix} (100%) rename pkgs/{tools/misc/disfetch/default.nix => unit/di/disfetch/pkg-fun.nix} (100%) rename pkgs/{tools/system/disk-filltest/default.nix => unit/di/disk-filltest/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/disk-indicator/default.nix => unit/di/disk_indicator/pkg-fun.nix} (100%) rename pkgs/{tools/misc/diskonaut/default.nix => unit/di/diskonaut/pkg-fun.nix} (100%) rename pkgs/{tools/backup/diskrsync/default.nix => unit/di/diskrsync/pkg-fun.nix} (100%) rename pkgs/{tools/misc/diskscan/default.nix => unit/di/diskscan/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/dislocker/default.nix => unit/di/dislocker/pkg-fun.nix} (100%) rename pkgs/{tools/security/dismap/default.nix => unit/di/dismap/pkg-fun.nix} (100%) rename pkgs/{tools/security/dismember/default.nix => unit/di/dismember/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/disnix/default.nix => unit/di/disnix/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/disnix/disnixos/default.nix => unit/di/disnixos/pkg-fun.nix} (100%) rename pkgs/{tools/X11/dispad/default.nix => unit/di/dispad/pkg-fun.nix} (100%) rename pkgs/{development/tools/distgen/default.nix => unit/di/distgen/pkg-fun.nix} (100%) rename pkgs/{applications/audio/distrho/default.nix => unit/di/distrho/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/distrobox/default.nix => unit/di/distrobox/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/distrobuilder/default.nix => unit/di/distrobuilder/pkg-fun.nix} (100%) rename pkgs/{applications/networking/diswall/default.nix => unit/di/diswall/pkg-fun.nix} (100%) rename pkgs/{applications/editors/dit/default.nix => unit/di/dit/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/ditaa/default.nix => unit/di/ditaa/pkg-fun.nix} (100%) rename pkgs/{development/tools/dive/default.nix => unit/di/dive/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/diylc/default.nix => unit/di/diylc/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/dj}/djbdns/fix-nix-usernamespace-build.patch (100%) rename pkgs/{tools/networking => unit/dj}/djbdns/hier.patch (100%) rename pkgs/{tools/networking/djbdns/default.nix => unit/dj/djbdns/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/dj}/djbdns/softlimit.patch (100%) rename pkgs/{tools/filesystems/djmount/default.nix => unit/dj/djmount/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/djv/default.nix => unit/dj/djv/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/djvu2pdf/default.nix => unit/dj/djvu2pdf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/djvulibre/default.nix => unit/dj/djvulibre/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/dkh/default.nix => unit/dk/dkh/pkg-fun.nix} (100%) rename pkgs/{servers/mail/dkimproxy/default.nix => unit/dk/dkimproxy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dleyna-connector-dbus/default.nix => unit/dl/dleyna-connector-dbus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dleyna-core/default.nix => unit/dl/dleyna-core/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/dl}/dleyna-core/setup-hook.sh (100%) rename pkgs/{development/libraries/dleyna-renderer/default.nix => unit/dl/dleyna-renderer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dleyna-server/default.nix => unit/dl/dleyna-server/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dlib/default.nix => unit/dl/dlib/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/dlx/default.nix => unit/dl/dlx/pkg-fun.nix} (100%) rename pkgs/{data/fonts/dm-sans/default.nix => unit/dm/dm-sans/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix => unit/dm/dmarc-metrics-exporter/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/dm}/dmenu-rs/Cargo.lock (100%) rename pkgs/{applications/misc/dmenu-rs/default.nix => unit/dm/dmenu-rs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dmenu/wayland.nix => unit/dm/dmenu-wayland/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dmenu/default.nix => unit/dm/dmenu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dmg2img/default.nix => unit/dm/dmg2img/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/dmidecode/default.nix => unit/dm/dmidecode/pkg-fun.nix} (100%) rename pkgs/{applications/radio/dmrconfig/default.nix => unit/dm/dmrconfig/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/dm}/dmtcp/ld-linux-so-buffer-size.patch (100%) rename pkgs/{os-specific/linux/dmtcp/default.nix => unit/dm/dmtcp/pkg-fun.nix} (100%) rename pkgs/{tools/nix/dnadd/default.nix => unit/dn/dnadd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dnd-tools/default.nix => unit/dn/dnd-tools/pkg-fun.nix} (100%) rename pkgs/{data/misc/dns-root-data/default.nix => unit/dn/dns-root-data/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/dn}/dns-root-data/root.ds (100%) rename pkgs/{data/misc => unit/dn}/dns-root-data/root.key (100%) rename pkgs/{data/misc => unit/dn}/dns-root-data/update-root-key.sh (100%) rename pkgs/{applications/networking/dnscontrol/default.nix => unit/dn/dnscontrol/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnscrypt-proxy2/default.nix => unit/dn/dnscrypt-proxy2/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnscrypt-wrapper/default.nix => unit/dn/dnscrypt-wrapper/pkg-fun.nix} (100%) rename pkgs/{servers/dns => unit/dn}/dnsdist/disable-network-tests.patch (100%) rename pkgs/{servers/dns/dnsdist/default.nix => unit/dn/dnsdist/pkg-fun.nix} (100%) rename pkgs/{tools/security/dnsenum/default.nix => unit/dn/dnsenum/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnsmasq/default.nix => unit/dn/dnsmasq/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnsmon-go/default.nix => unit/dn/dnsmon-go/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnsmonster/default.nix => unit/dn/dnsmonster/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/dnsname-cni/default.nix => unit/dn/dnsname-cni/pkg-fun.nix} (100%) rename pkgs/{tools/security/dnspeep/default.nix => unit/dn/dnspeep/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnsperf/default.nix => unit/dn/dnsperf/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnsproxy/default.nix => unit/dn/dnsproxy/pkg-fun.nix} (100%) rename pkgs/{tools/security/dnsrecon/default.nix => unit/dn/dnsrecon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnstake/default.nix => unit/dn/dnstake/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnstop/default.nix => unit/dn/dnstop/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dnstwist/default.nix => unit/dn/dnstwist/pkg-fun.nix} (100%) rename pkgs/{tools/security/dnsx/default.nix => unit/dn/dnsx/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/do-agent/default.nix => unit/do/do-agent/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/do}/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch (100%) rename pkgs/{tools/security => unit/do}/doas/disable-shared.patch (100%) rename pkgs/{tools/security/doas/default.nix => unit/do/doas/pkg-fun.nix} (100%) rename pkgs/{tools/misc/docbook2mdoc/default.nix => unit/do/docbook2mdoc/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/docbook2odf/default.nix => unit/do/docbook2odf/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting => unit/do}/docbook2x/db2x_texixml-to-stdout.patch (100%) rename pkgs/{tools/typesetting/docbook2x/default.nix => unit/do/docbook2x/pkg-fun.nix} (100%) rename pkgs/{data/sgml+xml/schemas/docbook-5.0/default.nix => unit/do/docbook5/pkg-fun.nix} (100%) rename pkgs/{data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix => unit/do/docbook_sgml_dtd_31/pkg-fun.nix} (100%) rename pkgs/{data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix => unit/do/docbook_sgml_dtd_41/pkg-fun.nix} (100%) rename pkgs/{data/sgml+xml/schemas/xml-dtd/docbook-ebnf => unit/do/docbook_xml_ebnf_dtd}/docbook-ebnf.cat (100%) rename pkgs/{data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix => unit/do/docbook_xml_ebnf_dtd/pkg-fun.nix} (100%) rename pkgs/{applications/office/docear/default.nix => unit/do/docear/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/windowmaker => unit/do}/dockapps/AlsaMixer-app.nix (100%) rename pkgs/{applications/window-managers/windowmaker => unit/do}/dockapps/libdockapp.nix (100%) rename pkgs/{applications/window-managers/windowmaker/dockapps/default.nix => unit/do/dockapps/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/windowmaker => unit/do}/dockapps/wmCalClock.nix (100%) rename pkgs/{applications/window-managers/windowmaker => unit/do}/dockapps/wmsm-app.nix (100%) rename pkgs/{applications/window-managers/windowmaker => unit/do}/dockapps/wmsystemtray.nix (100%) rename pkgs/{applications/misc/dockbarx/default.nix => unit/do/dockbarx/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/docker/buildx.nix => unit/do/docker-buildx/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/docker/compose.nix => unit/do/docker-compose/pkg-fun.nix} (100%) rename pkgs/{tools/admin/docker-credential-gcr/default.nix => unit/do/docker-credential-gcr/pkg-fun.nix} (100%) rename pkgs/{tools/admin/docker-credential-helpers/default.nix => unit/do/docker-credential-helpers/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/docker/distribution.nix => unit/do/docker-distribution/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/docker/gc.nix => unit/do/docker-gc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/docker-ls/default.nix => unit/do/docker-ls/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/docker-machine/hyperkit.nix => unit/do/docker-machine-hyperkit/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/docker-machine => unit/do/docker-machine-kvm}/kvm-deps.nix (100%) rename pkgs/{applications/networking/cluster/docker-machine/kvm.nix => unit/do/docker-machine-kvm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/docker-machine/kvm2.nix => unit/do/docker-machine-kvm2/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/docker-machine/default.nix => unit/do/docker-machine/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/docker/proxy.nix => unit/do/docker-proxy/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/docker-slim/default.nix => unit/do/docker-slim/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/do}/docker-sync/Gemfile (100%) rename pkgs/{tools/misc => unit/do}/docker-sync/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/do}/docker-sync/gemset.nix (100%) rename pkgs/{tools/misc/docker-sync/default.nix => unit/do/docker-sync/pkg-fun.nix} (100%) rename pkgs/{development/tools/dockfmt/default.nix => unit/do/dockfmt/pkg-fun.nix} (100%) rename pkgs/{development/tools/dockle/default.nix => unit/do/dockle/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/dockstarter/default.nix => unit/do/dockstarter/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/dockutil/default.nix => unit/do/dockutil/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/doclifter/default.nix => unit/do/doclifter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/docopt_cpp/default.nix => unit/do/docopt_cpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/do}/docopts/deps.nix (100%) rename pkgs/{development/tools/misc/docopts/default.nix => unit/do/docopts/pkg-fun.nix} (100%) rename pkgs/{development/libraries/doctest/default.nix => unit/do/doctest/pkg-fun.nix} (100%) rename pkgs/{development/tools/doctl/default.nix => unit/do/doctl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/docui/default.nix => unit/do/docui/pkg-fun.nix} (100%) rename pkgs/{misc => unit/do}/documentation-highlighter/LICENSE (100%) rename pkgs/{misc => unit/do}/documentation-highlighter/README.md (100%) rename pkgs/{misc => unit/do}/documentation-highlighter/highlight.pack.js (100%) rename pkgs/{misc => unit/do}/documentation-highlighter/loader.js (100%) rename pkgs/{misc => unit/do}/documentation-highlighter/mono-blue.css (100%) rename pkgs/{misc/documentation-highlighter/default.nix => unit/do/documentation-highlighter/pkg-fun.nix} (100%) rename pkgs/{misc => unit/do}/documentation-highlighter/update.sh (100%) rename pkgs/{servers/documize-community/default.nix => unit/do/documize-community/pkg-fun.nix} (100%) rename pkgs/{tools/system/dog/default.nix => unit/do/dog/pkg-fun.nix} (100%) rename pkgs/{misc/doge/default.nix => unit/do/doge/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/do}/doing/Gemfile (100%) rename pkgs/{applications/misc => unit/do}/doing/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/do}/doing/gemset.nix (100%) rename pkgs/{applications/misc/doing/default.nix => unit/do/doing/pkg-fun.nix} (100%) rename pkgs/{tools/misc/doitlive/default.nix => unit/do/doitlive/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/dokuwiki/default.nix => unit/do/dokuwiki/pkg-fun.nix} (100%) rename pkgs/{applications/audio/dolbybcsoftwaredecode/default.nix => unit/do/dolbybcsoftwaredecode/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/dolibarr/default.nix => unit/do/dolibarr/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/dolphin-emu/default.nix => unit/do/dolphin-emu/pkg-fun.nix} (100%) rename pkgs/{servers/sql/dolt/default.nix => unit/do/dolt/pkg-fun.nix} (100%) rename pkgs/{games/domination/default.nix => unit/do/domination/pkg-fun.nix} (100%) rename pkgs/{servers/domoticz/default.nix => unit/do/domoticz/pkg-fun.nix} (100%) rename pkgs/{tools/security/dontgo403/default.nix => unit/do/dontgo403/pkg-fun.nix} (100%) rename pkgs/{applications/search/doodle/default.nix => unit/do/doodle/pkg-fun.nix} (100%) rename pkgs/{games/zdoom => unit/do/doom-bcc}/bcc-warning-fix.patch (100%) rename pkgs/{games/zdoom/bcc-git.nix => unit/do/doom-bcc/pkg-fun.nix} (100%) rename pkgs/{tools/security/doona/default.nix => unit/do/doona/pkg-fun.nix} (100%) rename pkgs/{tools/security/doppler/default.nix => unit/do/doppler/pkg-fun.nix} (100%) rename pkgs/{tools/security/dorkscout/default.nix => unit/do/dorkscout/pkg-fun.nix} (100%) rename pkgs/{tools/text/dos2unix/default.nix => unit/do/dos2unix/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/dosage/default.nix => unit/do/dosage/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/dosbox-staging/default.nix => unit/do/dosbox-staging/pkg-fun.nix} (100%) rename pkgs/{data/fonts/dosemu-fonts/default.nix => unit/do/dosemu_fonts/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/dosfstools/default.nix => unit/do/dosfstools/pkg-fun.nix} (100%) rename pkgs/{data/fonts/dosis/default.nix => unit/do/dosis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dotconf/default.nix => unit/do/dotconf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dotfiles/default.nix => unit/do/dotfiles/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet => unit/do}/dotnetbuildhelpers/create-pkg-config-for-dll.sh (100%) rename pkgs/{build-support/dotnet => unit/do}/dotnetbuildhelpers/patch-fsharp-targets.sh (100%) rename pkgs/{build-support/dotnet/dotnetbuildhelpers/default.nix => unit/do/dotnetbuildhelpers/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet => unit/do}/dotnetbuildhelpers/placate-nuget.sh (100%) rename pkgs/{build-support/dotnet => unit/do}/dotnetbuildhelpers/placate-paket.sh (100%) rename pkgs/{build-support/dotnet => unit/do}/dotnetbuildhelpers/remove-duplicated-dlls.sh (100%) rename pkgs/{development/libraries/dotnetfx35/default.nix => unit/do/dotnetfx35/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dotnetfx40/default.nix => unit/do/dotnetfx40/pkg-fun.nix} (100%) rename pkgs/{development/libraries/double-conversion/default.nix => unit/do/double-conversion/pkg-fun.nix} (100%) rename pkgs/{data/fonts/doulos-sil/default.nix => unit/do/doulos-sil/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/do}/dovecot/2.3.x-module_dir.patch (100%) rename pkgs/{servers/mail/dovecot/default.nix => unit/do/dovecot/pkg-fun.nix} (100%) rename pkgs/{servers/mail/dovecot/plugins/fts_xapian/default.nix => unit/do/dovecot_fts_xapian/pkg-fun.nix} (100%) rename pkgs/{servers/mail/dovecot/plugins/pigeonhole/default.nix => unit/do/dovecot_pigeonhole/pkg-fun.nix} (100%) rename pkgs/{applications/misc/downonspot/default.nix => unit/do/downonspot/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/do}/dozenal/lua-header.patch (100%) rename pkgs/{applications/misc/dozenal/default.nix => unit/do/dozenal/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/dpic/default.nix => unit/dp/dpic/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/dpkg/default.nix => unit/dp/dpkg/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dpt-rp1-py/default.nix => unit/dp/dpt-rp1-py/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dqlite/default.nix => unit/dq/dqlite/pkg-fun.nix} (100%) rename pkgs/{applications/audio/dr14_tmeter/default.nix => unit/dr/dr14_tmeter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/draco/default.nix => unit/dr/draco/pkg-fun.nix} (100%) rename pkgs/{data/themes/dracula-theme/default.nix => unit/dr/dracula-theme/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/dracut/default.nix => unit/dr/dracut/pkg-fun.nix} (100%) rename pkgs/{applications/audio/dragonfly-reverb/default.nix => unit/dr/dragonfly-reverb/pkg-fun.nix} (100%) rename pkgs/{servers/nosql => unit/dr}/dragonflydb/fixes.patch (100%) rename pkgs/{servers/nosql => unit/dr}/dragonflydb/glog.patch (100%) rename pkgs/{servers/nosql/dragonflydb/default.nix => unit/dr/dragonflydb/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/dr}/drake/Gemfile (100%) rename pkgs/{development/tools/build-managers => unit/dr}/drake/Gemfile.lock (100%) rename pkgs/{development/tools/build-managers => unit/dr}/drake/gemset.nix (100%) rename pkgs/{development/tools/build-managers/drake/default.nix => unit/dr/drake/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/drat-trim/default.nix => unit/dr/drat-trim/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/drawing/default.nix => unit/dr/drawing/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/drawio/headless.nix => unit/dr/drawio-headless/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/drawio/default.nix => unit/dr/drawio/pkg-fun.nix} (100%) rename pkgs/{tools/admin/drawterm/default.nix => unit/dr/drawterm/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/drbd/default.nix => unit/dr/drbd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/driftctl/default.nix => unit/dr/driftctl/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/dr}/driftnet/libwebsockets-4.3.0.patch (100%) rename pkgs/{tools/networking/driftnet/default.nix => unit/dr/driftnet/pkg-fun.nix} (100%) rename pkgs/{development/tools/drip/default.nix => unit/dr/drip/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/dr}/drive/deps.nix (100%) rename pkgs/{applications/networking/drive/default.nix => unit/dr/drive/pkg-fun.nix} (100%) rename pkgs/{development/tools/drm_info/default.nix => unit/dr/drm_info/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/dr}/drogon/fix_find_package.patch (100%) rename pkgs/{development/libraries/drogon/default.nix => unit/dr/drogon/pkg-fun.nix} (100%) rename pkgs/{applications/video/droidcam/default.nix => unit/dr/droidcam/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/droidmote/default.nix => unit/dr/droidmote/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration => unit/dr}/drone-cli/0001-use-different-upstream-for-gomod.patch (100%) rename pkgs/{development/tools/continuous-integration/drone-cli/default.nix => unit/dr/drone-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/drone-runner-docker/default.nix => unit/dr/drone-runner-docker/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/drone-runner-exec/default.nix => unit/dr/drone-runner-exec/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/dr}/dropbear/pass-path.patch (100%) rename pkgs/{tools/networking/dropbear/default.nix => unit/dr/dropbear/pkg-fun.nix} (100%) rename pkgs/{applications/networking/dropbox => unit/dr/dropbox-cli}/fix-cli-paths.patch (100%) rename pkgs/{applications/networking/dropbox => unit/dr/dropbox-cli}/nautilus-43.patch (100%) rename pkgs/{applications/networking/dropbox/cli.nix => unit/dr/dropbox-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/dropbox/default.nix => unit/dr/dropbox/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/dropwatch/default.nix => unit/dr/dropwatch/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/drush/default.nix => unit/dr/drush/pkg-fun.nix} (100%) rename pkgs/{applications/radio/dsd/default.nix => unit/ds/dsd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dsdcc/default.nix => unit/ds/dsdcc/pkg-fun.nix} (100%) rename pkgs/{applications/audio/dsf2flac/default.nix => unit/ds/dsf2flac/pkg-fun.nix} (100%) rename pkgs/{tools/networking/dsniff/default.nix => unit/ds/dsniff/pkg-fun.nix} (100%) rename pkgs/{tools/audio/dsp/default.nix => unit/ds/dsp/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/ds}/dspam/mariadb.patch (100%) rename pkgs/{servers/mail/dspam/default.nix => unit/ds/dspam/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dsq/default.nix => unit/ds/dsq/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/backends/dsseries/default.nix => unit/ds/dsseries/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dssi/default.nix => unit/ds/dssi/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/dssp/default.nix => unit/ds/dssp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dstask/default.nix => unit/ds/dstask/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ds}/dstat/fix_pluginpath.patch (100%) rename pkgs/{os-specific/linux/dstat/default.nix => unit/ds/dstat/pkg-fun.nix} (100%) rename pkgs/{development/tools/dstp/default.nix => unit/ds/dstp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/dsvpn/default.nix => unit/ds/dsvpn/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dt-shell-color-scripts/default.nix => unit/dt/dt-shell-color-scripts/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dtach/default.nix => unit/dt/dtach/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/dt}/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch (100%) rename pkgs/{development/compilers/dtc/default.nix => unit/dt/dtc/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/dt}/dtc/python-3.10.patch (100%) rename pkgs/{applications/terminal-emulators/dterm/default.nix => unit/dt/dterm/pkg-fun.nix} (100%) rename pkgs/{development/tools/dtools/default.nix => unit/dt/dtools/pkg-fun.nix} (100%) rename pkgs/{tools/compression/dtrx/default.nix => unit/dt/dtrx/pkg-fun.nix} (100%) rename pkgs/{data/misc/dtv-scan-tables/linuxtv.nix => unit/dt/dtv-scan-tables_linuxtv/pkg-fun.nix} (100%) rename pkgs/{data/misc/dtv-scan-tables/tvheadend.nix => unit/dt/dtv-scan-tables_tvheadend/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/dub/default.nix => unit/du/dub/pkg-fun.nix} (100%) rename pkgs/{tools/misc/duc/default.nix => unit/du/duc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/duckdb/default.nix => unit/du/duckdb/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/du}/duckdb/version.patch (100%) rename pkgs/{servers/duckling-proxy/default.nix => unit/du/duckling-proxy/pkg-fun.nix} (100%) rename pkgs/{tools/misc/duf/default.nix => unit/du/duf/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/du}/duktape/duktape.pc.in (100%) rename pkgs/{development/interpreters/duktape/default.nix => unit/du/duktape/pkg-fun.nix} (100%) rename pkgs/{development/tools/dum/default.nix => unit/du/dum/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/dumb-init/default.nix => unit/du/dumb-init/pkg-fun.nix} (100%) rename pkgs/{misc/dumb/default.nix => unit/du/dumb/pkg-fun.nix} (100%) rename pkgs/{tools/backup/dump/default.nix => unit/du/dump/pkg-fun.nix} (100%) rename pkgs/{applications/radio/dump1090/default.nix => unit/du/dump1090/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dumptorrent/default.nix => unit/du/dumptorrent/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dunst/default.nix => unit/du/dunst/pkg-fun.nix} (100%) rename pkgs/{tools/security/duo-unix/default.nix => unit/du/duo-unix/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dupd/default.nix => unit/du/dupd/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/du}/dupe-krill/Cargo.lock (100%) rename pkgs/{tools/filesystems/dupe-krill/default.nix => unit/du/dupe-krill/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dupeguru/default.nix => unit/du/dupeguru/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/duperemove/default.nix => unit/du/duperemove/pkg-fun.nix} (100%) rename pkgs/{tools/backup/duplicacy/default.nix => unit/du/duplicacy/pkg-fun.nix} (100%) rename pkgs/{tools/backup/duplicati/default.nix => unit/du/duplicati/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/du}/duplicity/gnutar-in-test.patch (100%) rename pkgs/{tools/backup => unit/du}/duplicity/linux-disable-timezone-test.patch (100%) rename pkgs/{tools/backup/duplicity/default.nix => unit/du/duplicity/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/du}/duplicity/use-installed-scripts-in-test.patch (100%) rename pkgs/{tools/backup/duply/default.nix => unit/du/duply/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dutree/default.nix => unit/du/dutree/pkg-fun.nix} (100%) rename pkgs/{applications/video/dvd-slideshow/default.nix => unit/dv/dvd-slideshow/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/dvd-vr/default.nix => unit/dv/dvd-vr/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/dv}/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch (100%) rename pkgs/{applications/video => unit/dv}/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch (100%) rename pkgs/{applications/video => unit/dv}/dvdauthor/dvdauthor-imagemagick-0.7.0.patch (100%) rename pkgs/{applications/video/dvdauthor/default.nix => unit/dv/dvdauthor/pkg-fun.nix} (100%) rename pkgs/{applications/video/dvdbackup/default.nix => unit/dv/dvdbackup/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/dv}/dvdisaster/dvdrom.patch (100%) rename pkgs/{tools/cd-dvd => unit/dv}/dvdisaster/encryption.patch (100%) rename pkgs/{tools/cd-dvd/dvdisaster/default.nix => unit/dv/dvdisaster/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/dvd+rw-tools/default.nix => unit/dv/dvdplusrwtools/pkg-fun.nix} (100%) rename pkgs/{tools/video/dvgrab/default.nix => unit/dv/dvgrab/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dwarf2json/default.nix => unit/dw/dwarf2json/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/dwarfs/default.nix => unit/dw/dwarfs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/dw}/dwarfs/version_info.patch (100%) rename pkgs/{applications/misc/dwdiff/default.nix => unit/dw/dwdiff/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/dwfv/default.nix => unit/dw/dwfv/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/dwl/default.nix => unit/dw/dwl/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/dwm/dwm-status.nix => unit/dw/dwm-status/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dwmbar/default.nix => unit/dw/dwmbar/pkg-fun.nix} (100%) rename pkgs/{applications/misc/dwmblocks/default.nix => unit/dw/dwmblocks/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/dwz/default.nix => unit/dw/dwz/pkg-fun.nix} (100%) rename pkgs/{development/compilers/xa/dxa.nix => unit/dx/dxa/pkg-fun.nix} (100%) rename pkgs/{misc => unit/dx}/dxvk/darwin-dxvk-compat.patch (100%) rename pkgs/{misc => unit/dx}/dxvk/darwin-thread-primitives.patch (100%) rename pkgs/{misc => unit/dx}/dxvk/dxvk.nix (100%) rename pkgs/{misc => unit/dx}/dxvk/mcfgthread.patch (100%) rename pkgs/{misc/dxvk/default.nix => unit/dx/dxvk/pkg-fun.nix} (100%) rename pkgs/{games/dxx-rebirth/default.nix => unit/dx/dxx-rebirth/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/disnix/dydisnix/default.nix => unit/dy/dydisnix/pkg-fun.nix} (100%) rename pkgs/{development/tools/dyff/default.nix => unit/dy/dyff/pkg-fun.nix} (100%) rename pkgs/{tools/misc/dynamic-colors/default.nix => unit/dy/dynamic-colors/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/dynamic-wallpaper/default.nix => unit/dy/dynamic-wallpaper/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/dynamips/default.nix => unit/dy/dynamips/pkg-fun.nix} (100%) rename pkgs/{development/libraries/dyncall/default.nix => unit/dy/dyncall/pkg-fun.nix} (100%) rename pkgs/{applications/networking/dyndns/dyndnsc/default.nix => unit/dy/dyndnsc/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/dzen2/default.nix => unit/dz/dzen2/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/e16/default.nix => unit/e1/e16/pkg-fun.nix} (100%) rename pkgs/{data/themes/e17gtk/default.nix => unit/e1/e17gtk/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/e2fsprogs/default.nix => unit/e2/e2fsprogs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/e2tools/default.nix => unit/e2/e2tools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ea/default.nix => unit/ea/ea/pkg-fun.nix} (100%) rename pkgs/{tools/text/each/default.nix => unit/ea/each/pkg-fun.nix} (100%) rename pkgs/{applications/misc/eaglemode/default.nix => unit/ea/eaglemode/pkg-fun.nix} (100%) rename pkgs/{tools/security/earlybird/default.nix => unit/ea/earlybird/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ea}/earlyoom/fix-dbus-path.patch (100%) rename pkgs/{os-specific/linux/earlyoom/default.nix => unit/ea/earlyoom/pkg-fun.nix} (100%) rename pkgs/{applications/audio/eartag/default.nix => unit/ea/eartag/pkg-fun.nix} (100%) rename pkgs/{development/tools/earthly/default.nix => unit/ea/earthly/pkg-fun.nix} (100%) rename pkgs/{tools/misc/easeprobe/default.nix => unit/ea/easeprobe/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/easycrypt/runtest.nix => unit/ea/easycrypt-runtest/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/easycrypt/default.nix => unit/ea/easycrypt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/easyeffects/default.nix => unit/ea/easyeffects/pkg-fun.nix} (100%) rename pkgs/{development/tools/easyjson/default.nix => unit/ea/easyjson/pkg-fun.nix} (100%) rename pkgs/{development/libraries/easyloggingpp/default.nix => unit/ea/easyloggingpp/pkg-fun.nix} (100%) rename pkgs/{development/embedded/easypdkprog/default.nix => unit/ea/easypdkprog/pkg-fun.nix} (100%) rename pkgs/{games/easyrpg-player/default.nix => unit/ea/easyrpg-player/pkg-fun.nix} (100%) rename pkgs/{tools/networking/easyrsa/default.nix => unit/ea/easyrsa/pkg-fun.nix} (100%) rename pkgs/{tools/backup/easysnap/default.nix => unit/ea/easysnap/pkg-fun.nix} (100%) rename pkgs/{applications/audio/easytag/default.nix => unit/ea/easytag/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/biology/EBTKS/default.nix => unit/eb/EBTKS/pkg-fun.nix} (100%) rename pkgs/{data/fonts/eb-garamond/default.nix => unit/eb/eb-garamond/pkg-fun.nix} (100%) rename pkgs/{games => unit/eb}/eboard/eboard.patch (100%) rename pkgs/{games/eboard/default.nix => unit/eb/eboard/pkg-fun.nix} (100%) rename pkgs/{applications/radio/ebook2cw/default.nix => unit/eb/ebook2cw/pkg-fun.nix} (100%) rename pkgs/{tools/text/ebook-tools/default.nix => unit/eb/ebook_tools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ebtables/default.nix => unit/eb/ebtables/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ebumeter/default.nix => unit/eb/ebumeter/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/ec2-ami-tools/default.nix => unit/ec/ec2-ami-tools/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization => unit/ec}/ec2-ami-tools/writable.patch (100%) rename pkgs/{tools/virtualization/ec2-api-tools/default.nix => unit/ec/ec2-api-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/ec2-metadata-mock/default.nix => unit/ec/ec2-metadata-mock/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ecasound/default.nix => unit/ec/ecasound/pkg-fun.nix} (100%) rename pkgs/{tools/security/ecdsatool/default.nix => unit/ec/ecdsatool/pkg-fun.nix} (100%) rename pkgs/{tools/security/ecdsautils/default.nix => unit/ec/ecdsautils/pkg-fun.nix} (100%) rename pkgs/{servers/echoip/default.nix => unit/ec/echoip/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ecl/default.nix => unit/ec/ecl/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ecl => unit/ec/ecl_16_1_2}/ecl-1.16.2-libffi-3.3-abi.patch (100%) rename pkgs/{development/compilers/ecl/16.1.2.nix => unit/ec/ecl_16_1_2/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/eclair/default.nix => unit/ec/eclair/pkg-fun.nix} (100%) rename pkgs/{development/libraries/eclib/default.nix => unit/ec/eclib/pkg-fun.nix} (100%) rename pkgs/{development/tools/eclint/default.nix => unit/ec/eclint/pkg-fun.nix} (100%) rename pkgs/{development/tools/eclipse-mat/default.nix => unit/ec/eclipse-mat/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/ecm/default.nix => unit/ec/ecm/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/ecm-tools/default.nix => unit/ec/ecmtools/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/ecopcr/default.nix => unit/ec/ecopcr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/ecos/default.nix => unit/ec/ecos/pkg-fun.nix} (100%) rename pkgs/{tools/security/ecryptfs/helper.nix => unit/ec/ecryptfs-helper/pkg-fun.nix} (100%) rename pkgs/{tools/security/ecryptfs/default.nix => unit/ec/ecryptfs/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/ecs-agent/default.nix => unit/ec/ecs-agent/pkg-fun.nix} (100%) rename pkgs/{games/ecwolf/default.nix => unit/ec/ecwolf/pkg-fun.nix} (100%) rename pkgs/{applications/editors/ed/default.nix => unit/ed/ed/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/edac-utils/default.nix => unit/ed/edac-utils/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/ed}/edbrowse/0001-small-fixes.patch (100%) rename pkgs/{applications/editors/edbrowse/default.nix => unit/ed/edbrowse/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/robotics/edgetpu-compiler/default.nix => unit/ed/edgetpu-compiler/pkg-fun.nix} (100%) rename pkgs/{tools/misc/edid-decode/default.nix => unit/ed/edid-decode/pkg-fun.nix} (100%) rename pkgs/{tools/misc/edid-generator/default.nix => unit/ed/edid-generator/pkg-fun.nix} (100%) rename pkgs/{tools/misc/edir/default.nix => unit/ed/edir/pkg-fun.nix} (100%) rename pkgs/{applications/editors/edit/default.nix => unit/ed/edit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/editline/default.nix => unit/ed/editline/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/editorconfig-checker/default.nix => unit/ed/editorconfig-checker/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/editorconfig-core-c/default.nix => unit/ed/editorconfig-core-c/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/editres/default.nix => unit/ed/editres/pkg-fun.nix} (100%) rename pkgs/{tools/misc/edk2-uefi-shell/default.nix => unit/ed/edk2-uefi-shell/pkg-fun.nix} (100%) rename pkgs/{development/compilers/edk2/default.nix => unit/ed/edk2/pkg-fun.nix} (100%) rename pkgs/{applications/editors/edlin/default.nix => unit/ed/edlin/pkg-fun.nix} (100%) rename pkgs/{data/fonts/edukai/default.nix => unit/ed/edukai/pkg-fun.nix} (100%) rename pkgs/{data/fonts/eduli/default.nix => unit/ed/eduli/pkg-fun.nix} (100%) rename pkgs/{data/fonts/edusong/default.nix => unit/ed/edusong/pkg-fun.nix} (100%) rename pkgs/{data/fonts/edwin/default.nix => unit/ed/edwin/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/eff/default.nix => unit/ef/eff/pkg-fun.nix} (100%) rename pkgs/{tools/compression/efficient-compression-tool/default.nix => unit/ef/efficient-compression-tool/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/ef}/efficient-compression-tool/use-nixpkgs-libpng.patch (100%) rename pkgs/{applications/misc/effitask/default.nix => unit/ef/effitask/pkg-fun.nix} (100%) rename pkgs/{tools/system/efibootmgr/default.nix => unit/ef/efibootmgr/pkg-fun.nix} (100%) rename pkgs/{tools/security/efitools/default.nix => unit/ef/efitools/pkg-fun.nix} (100%) rename pkgs/{tools/system/efivar/default.nix => unit/ef/efivar/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/ef}/eflite/format.patch (100%) rename pkgs/{applications/audio/eflite/default.nix => unit/ef/eflite/pkg-fun.nix} (100%) rename pkgs/{development/tools/efm-langserver/default.nix => unit/ef/efm-langserver/pkg-fun.nix} (100%) rename pkgs/{data/fonts/efont-unicode/default.nix => unit/ef/efont-unicode/pkg-fun.nix} (100%) rename pkgs/{tools/misc/eget/default.nix => unit/eg/eget/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/eggdbus/default.nix => unit/eg/eggdbus/pkg-fun.nix} (100%) rename pkgs/{tools/networking/eggdrop/default.nix => unit/eg/eggdrop/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/eggnog-mapper/default.nix => unit/eg/eggnog-mapper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/egl-wayland/default.nix => unit/eg/egl-wayland/pkg-fun.nix} (100%) rename pkgs/{games/egoboo/default.nix => unit/eg/egoboo/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/egypt/default.nix => unit/eg/egypt/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/eiciel/default.nix => unit/ei/eiciel/pkg-fun.nix} (100%) rename pkgs/{games => unit/ei}/eidolon/cargo-lock.patch (100%) rename pkgs/{games/eidolon/default.nix => unit/ei/eidolon/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ei}/eigen/include-dir.patch (100%) rename pkgs/{development/libraries/eigen/default.nix => unit/ei/eigen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/eigen/2.0.nix => unit/ei/eigen2/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ej}/ejson/Gemfile (100%) rename pkgs/{development/tools => unit/ej}/ejson/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ej}/ejson/gemset.nix (100%) rename pkgs/{development/tools/ejson/default.nix => unit/ej/ejson/pkg-fun.nix} (100%) rename pkgs/{tools/admin/ejson2env/default.nix => unit/ej/ejson2env/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/ekam/default.nix => unit/ek/ekam/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ekho/default.nix => unit/ek/ekho/pkg-fun.nix} (100%) rename pkgs/{tools/admin/eksctl/default.nix => unit/ek/eksctl/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/el}/elan/0001-dynamically-patchelf-binaries.patch (100%) rename pkgs/{applications/science/logic/elan/default.nix => unit/el/elan/pkg-fun.nix} (100%) rename pkgs/{tools/admin/elasticsearch-curator/default.nix => unit/el/elasticsearch-curator/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/electricsheep/default.nix => unit/el/electricsheep/pkg-fun.nix} (100%) rename pkgs/{development/tools/electron-fiddle/default.nix => unit/el/electron-fiddle/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/electron-mail/default.nix => unit/el/electron-mail/pkg-fun.nix} (100%) rename pkgs/{applications/video/electronplayer/electronplayer.nix => unit/el/electronplayer/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/element/default.nix => unit/el/element/pkg-fun.nix} (100%) rename pkgs/{development/libraries/elementary-cmake-modules/default.nix => unit/el/elementary-cmake-modules/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/el}/elementary-cmake-modules/setup-hook.sh (100%) rename pkgs/{applications/office/elementary-planner/default.nix => unit/el/elementary-planner/pkg-fun.nix} (100%) rename pkgs/{data/icons/elementary-xfce-icon-theme/default.nix => unit/el/elementary-xfce-icon-theme/pkg-fun.nix} (100%) rename pkgs/{development/libraries/elf-header/default.nix => unit/el/elf-header-real/pkg-fun.nix} (100%) rename pkgs/{development/embedded/elf2uf2-rs/default.nix => unit/el/elf2uf2-rs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/elfcat/default.nix => unit/el/elfcat/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/elfinfo/default.nix => unit/el/elfinfo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/elfio/default.nix => unit/el/elfio/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/elfkickers/default.nix => unit/el/elfkickers/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/el}/elfutils/debug-info-from-env.patch (100%) rename pkgs/{development/tools/misc => unit/el}/elfutils/musl-error_h.patch (100%) rename pkgs/{development/tools/misc/elfutils/default.nix => unit/el/elfutils/pkg-fun.nix} (100%) rename pkgs/{applications/misc/elfx86exts/default.nix => unit/el/elfx86exts/pkg-fun.nix} (100%) rename pkgs/{development/compilers/eli/default.nix => unit/el/eli/pkg-fun.nix} (100%) rename pkgs/{development/tools/eliot-tree/default.nix => unit/el/eliot-tree/pkg-fun.nix} (100%) rename pkgs/{development/tools/elkhound/default.nix => unit/el/elkhound/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ell/default.nix => unit/el/ell/pkg-fun.nix} (100%) rename pkgs/{data/misc/elliptic_curves/default.nix => unit/el/elliptic_curves/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/el}/elm-github-install/Gemfile (100%) rename pkgs/{tools/package-management => unit/el}/elm-github-install/Gemfile.lock (100%) rename pkgs/{tools/package-management => unit/el}/elm-github-install/gemset.nix (100%) rename pkgs/{tools/package-management/elm-github-install/default.nix => unit/el/elm-github-install/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics => unit/el}/elmerfem/patches/0001-fix-import-of-QPainterPath.patch (100%) rename pkgs/{applications/science/physics => unit/el}/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch (100%) rename pkgs/{applications/science/physics => unit/el}/elmerfem/patches/0003-ignore-qwt_compat.patch (100%) rename pkgs/{applications/science/physics/elmerfem/default.nix => unit/el/elmerfem/pkg-fun.nix} (100%) rename pkgs/{applications/misc/elogind/default.nix => unit/el/elogind/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/el}/elpa/pkg-config.patch (100%) rename pkgs/{development/libraries/elpa/default.nix => unit/el/elpa/pkg-fun.nix} (100%) rename pkgs/{development/tools/eltclsh/default.nix => unit/el/eltclsh/pkg-fun.nix} (100%) rename pkgs/{applications/editors/elvis/default.nix => unit/el/elvis/pkg-fun.nix} (100%) rename pkgs/{shells/elvish/default.nix => unit/el/elvish/pkg-fun.nix} (100%) rename pkgs/{games/empty-epsilon => unit/em/EmptyEpsilon}/0001-bundle-system-glm-in-seriousproton.patch (100%) rename pkgs/{games/empty-epsilon/default.nix => unit/em/EmptyEpsilon/pkg-fun.nix} (100%) rename pkgs/{applications/editors/em/default.nix => unit/em/em/pkg-fun.nix} (100%) rename pkgs/{data/fonts/emacs-all-the-icons-fonts/default.nix => unit/em/emacs-all-the-icons-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/networking/email/default.nix => unit/em/email/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/emboss/default.nix => unit/em/emboss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/embree/default.nix => unit/em/embree/pkg-fun.nix} (100%) rename pkgs/{development/libraries/embree/2.x.nix => unit/em/embree2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/emem/default.nix => unit/em/emem/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/emma/default.nix => unit/em/emma/pkg-fun.nix} (100%) rename pkgs/{applications/misc/emoji-picker/default.nix => unit/em/emoji-picker/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/em}/emoji-picker/xsys.patch (100%) rename pkgs/{applications/misc/emojipick/default.nix => unit/em/emojipick/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/emote/default.nix => unit/em/emote/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/emplace/default.nix => unit/em/emplace/pkg-fun.nix} (100%) rename pkgs/{applications/display-managers/emptty/default.nix => unit/em/emptty/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/em}/empty/0.6-Makefile.patch (100%) rename pkgs/{tools/misc/empty/default.nix => unit/em/empty/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/emu2/default.nix => unit/em/emu2/pkg-fun.nix} (100%) rename pkgs/{applications/science/robotics/emuflight-configurator/default.nix => unit/em/emuflight-configurator/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/emulationstation/default.nix => unit/em/emulationstation/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/emulsion-palette/default.nix => unit/em/emulsion-palette/pkg-fun.nix} (100%) rename pkgs/{tools/misc/emv/default.nix => unit/em/emv/pkg-fun.nix} (100%) rename pkgs/{tools/text/enca/default.nix => unit/en/enca/pkg-fun.nix} (100%) rename pkgs/{development/libraries/enchant/2.x.nix => unit/en/enchant2/pkg-fun.nix} (100%) rename pkgs/{tools/security/enchive/default.nix => unit/en/enchive/pkg-fun.nix} (100%) rename pkgs/{data/fonts/encode-sans/default.nix => unit/en/encode-sans/pkg-fun.nix} (100%) rename pkgs/{applications/office/endeavour/default.nix => unit/en/endeavour/pkg-fun.nix} (100%) rename pkgs/{games/endgame-singularity/default.nix => unit/en/endgame-singularity/pkg-fun.nix} (100%) rename pkgs/{games => unit/en}/endless-sky/fixes.patch (100%) rename pkgs/{games/endless-sky/default.nix => unit/en/endless-sky/pkg-fun.nix} (100%) rename pkgs/{servers/endlessh-go/default.nix => unit/en/endlessh-go/pkg-fun.nix} (100%) rename pkgs/{servers/endlessh/default.nix => unit/en/endlessh/pkg-fun.nix} (100%) rename pkgs/{development/libraries/enet/default.nix => unit/en/enet/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/enhanced-ctorrent/default.nix => unit/en/enhanced-ctorrent/pkg-fun.nix} (100%) rename pkgs/{games/enigma/default.nix => unit/en/enigma/pkg-fun.nix} (100%) rename pkgs/{tools/misc/enjarify/default.nix => unit/en/enjarify/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/en}/enpass/data.json (100%) rename pkgs/{tools/security/enpass/default.nix => unit/en/enpass/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/en}/enpass/update_script.py (100%) rename pkgs/{tools/text/enscript/default.nix => unit/en/enscript/pkg-fun.nix} (100%) rename pkgs/{development/tools/ent/default.nix => unit/en/ent-go/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ent/default.nix => unit/en/ent/pkg-fun.nix} (100%) rename pkgs/{tools/misc/entr/default.nix => unit/en/entr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/entt/default.nix => unit/en/entt/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/entwine/default.nix => unit/en/entwine/pkg-fun.nix} (100%) rename pkgs/{tools/security/enum4linux/default.nix => unit/en/enum4linux/pkg-fun.nix} (100%) rename pkgs/{tools/misc/enumer/default.nix => unit/en/enumer/pkg-fun.nix} (100%) rename pkgs/{tools/system/envconsul/default.nix => unit/en/envconsul/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/envfs/default.nix => unit/en/envfs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/envsubst/default.nix => unit/en/envsubst/pkg-fun.nix} (100%) rename pkgs/{data/fonts/envypn-font/default.nix => unit/en/envypn-font/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/eolie/default.nix => unit/eo/eolie/pkg-fun.nix} (100%) rename pkgs/{applications/misc/eos-installer/default.nix => unit/eo/eos-installer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/eot-utilities/default.nix => unit/eo/eot_utilities/pkg-fun.nix} (100%) rename pkgs/{applications/misc/epdfview/default.nix => unit/ep/epdfview/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/epeg/default.nix => unit/ep/epeg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/ephemeral/default.nix => unit/ep/ephemeral/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/ephemeralpg/default.nix => unit/ep/ephemeralpg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/epic5/default.nix => unit/ep/epic5/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ep}/epkowa/firmware_location.patch (100%) rename pkgs/{misc/drivers/epkowa/default.nix => unit/ep/epkowa/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ep}/epkowa/sscanf.patch (100%) rename pkgs/{tools/graphics/eplot/default.nix => unit/ep/eplot/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/epm/default.nix => unit/ep/epm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/epr/default.nix => unit/ep/epr/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/epson-201106w/default.nix => unit/ep/epson-201106w/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ep}/epson-201401w/fixbuild.patch (100%) rename pkgs/{misc/drivers/epson-201401w/default.nix => unit/ep/epson-201401w/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ep}/epson-alc1100/cups-data-dir.patch (100%) rename pkgs/{misc/drivers/epson-alc1100/default.nix => unit/ep/epson-alc1100/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ep}/epson-alc1100/ppd.patch (100%) rename pkgs/{misc/drivers => unit/ep}/epson-escpr/cups-filter-ppd-dirs.patch (100%) rename pkgs/{misc/drivers/epson-escpr/default.nix => unit/ep/epson-escpr/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/ep}/epson-escpr2/cups-filter-ppd-dirs.patch (100%) rename pkgs/{misc/drivers/epson-escpr2/default.nix => unit/ep/epson-escpr2/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/epson-workforce-635-nx625-series/default.nix => unit/ep/epson-workforce-635-nx625-series/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/epson_201207w/default.nix => unit/ep/epson_201207w/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/ep}/epstool/gcc43.patch (100%) rename pkgs/{tools/graphics/epstool/default.nix => unit/ep/epstool/pkg-fun.nix} (100%) rename pkgs/{tools/text/epubcheck/default.nix => unit/ep/epubcheck/pkg-fun.nix} (100%) rename pkgs/{applications/audio/eq10q/default.nix => unit/eq/eq10q/pkg-fun.nix} (100%) rename pkgs/{development/compilers/eql/default.nix => unit/eq/eql/pkg-fun.nix} (100%) rename pkgs/{data/themes/equilux-theme/default.nix => unit/eq/equilux-theme/pkg-fun.nix} (100%) rename pkgs/{tools/games/er-patcher/default.nix => unit/er/er-patcher/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/eresi/default.nix => unit/er/eresi/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/ergo/default.nix => unit/er/ergo/pkg-fun.nix} (100%) rename pkgs/{servers/irc/ergochat/default.nix => unit/er/ergochat/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry => unit/er}/ergoscf/math-constants.patch (100%) rename pkgs/{applications/science/chemistry/ergoscf/default.nix => unit/er/ergoscf/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/erigon/default.nix => unit/er/erigon/pkg-fun.nix} (100%) rename pkgs/{servers/eris-go/default.nix => unit/er/eris-go/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/erofs-utils/default.nix => unit/er/erofs-utils/pkg-fun.nix} (100%) rename pkgs/{tools/security/erosmb/default.nix => unit/er/erosmb/pkg-fun.nix} (100%) rename pkgs/{applications/networking/errbot/default.nix => unit/er/errbot/pkg-fun.nix} (100%) rename pkgs/{development/tools/errcheck/default.nix => unit/er/errcheck/pkg-fun.nix} (100%) rename pkgs/{shells/es/default.nix => unit/es/es/pkg-fun.nix} (100%) rename pkgs/{development/tools/esbuild/default.nix => unit/es/esbuild/pkg-fun.nix} (100%) rename pkgs/{development/tools/esbuild/netlify.nix => unit/es/esbuild_netlify/pkg-fun.nix} (100%) rename pkgs/{tools/security/eschalot/default.nix => unit/es/eschalot/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/escrotum/default.nix => unit/es/escrotum/pkg-fun.nix} (100%) rename pkgs/{tools/text/esh/default.nix => unit/es/esh/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/es}/espeak-ng/mbrola.patch (100%) rename pkgs/{applications/audio/espeak-ng/default.nix => unit/es/espeak-ng/pkg-fun.nix} (100%) rename pkgs/{applications/accessibility/espeakup/default.nix => unit/es/espeakup/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/es}/esphome/dashboard.nix (100%) rename pkgs/{tools/misc/esphome/default.nix => unit/es/esphome/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/es}/esphome/update.nix (100%) rename pkgs/{tools/misc/esptool-ck/default.nix => unit/es/esptool-ck/pkg-fun.nix} (100%) rename pkgs/{tools/misc/esptool/default.nix => unit/es/esptool/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/es}/esptool/test-call-bin-directly.patch (100%) rename pkgs/{tools/misc/esptool/3.nix => unit/es/esptool_3/pkg-fun.nix} (100%) rename pkgs/{tools/audio/essentia-extractor/default.nix => unit/es/essentia-extractor/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/esshader/default.nix => unit/es/esshader/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/est-sfs/default.nix => unit/es/est-sfs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/et/default.nix => unit/et/et/pkg-fun.nix} (100%) rename pkgs/{data/fonts/et-book/default.nix => unit/et/etBook/pkg-fun.nix} (100%) rename pkgs/{servers/etcd/3.3.nix => unit/et/etcd_3_3/pkg-fun.nix} (100%) rename pkgs/{servers/etcd/3.4.nix => unit/et/etcd_3_4/pkg-fun.nix} (100%) rename pkgs/{servers/etcd/3.5.nix => unit/et/etcd_3_5/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/eterm/default.nix => unit/et/eterm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/eternal-terminal/default.nix => unit/et/eternal-terminal/pkg-fun.nix} (100%) rename pkgs/{games/eternity-engine/default.nix => unit/et/eternity/pkg-fun.nix} (100%) rename pkgs/{applications/misc/etesync-dav/default.nix => unit/et/etesync-dav/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/et}/ethabi/add-Cargo-lock.patch (100%) rename pkgs/{applications/blockchains/ethabi/default.nix => unit/et/ethabi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ethash/default.nix => unit/et/ethash/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniffers/etherape/default.nix => unit/et/etherape/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ethtool/default.nix => unit/et/ethtool/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ets/default.nix => unit/et/ets/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniffers/ettercap/default.nix => unit/et/ettercap/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/eu}/eukleides/gs-allowpstransparency.patch (100%) rename pkgs/{applications/science/math/eukleides/default.nix => unit/eu/eukleides/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/eu}/eukleides/use-CC.patch (100%) rename pkgs/{data/fonts/eunomia/default.nix => unit/eu/eunomia/pkg-fun.nix} (100%) rename pkgs/{applications/misc/eureka-editor/default.nix => unit/eu/eureka-editor/pkg-fun.nix} (100%) rename pkgs/{tools/misc/eva/default.nix => unit/ev/eva/pkg-fun.nix} (100%) rename pkgs/{development/tools/evans/default.nix => unit/ev/evans/pkg-fun.nix} (100%) rename pkgs/{servers/home-automation/evcc/default.nix => unit/ev/evcc/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/evdevremapkeys/default.nix => unit/ev/evdevremapkeys/pkg-fun.nix} (100%) rename pkgs/{tools/system/evemu/default.nix => unit/ev/evemu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/eventlog/default.nix => unit/ev/eventlog/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/eventstat/default.nix => unit/ev/eventstat/pkg-fun.nix} (100%) rename pkgs/{servers/nosql => unit/ev}/eventstore/deps.nix (100%) rename pkgs/{servers/nosql/eventstore/default.nix => unit/ev/eventstore/pkg-fun.nix} (100%) rename pkgs/{servers/nosql => unit/ev}/eventstore/updater.sh (100%) rename pkgs/{games/everspace/default.nix => unit/ev/everspace/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/ev}/evil-winrm/Gemfile (100%) rename pkgs/{tools/security => unit/ev}/evil-winrm/Gemfile.lock (100%) rename pkgs/{tools/security => unit/ev}/evil-winrm/gemset.nix (100%) rename pkgs/{tools/security/evil-winrm/default.nix => unit/ev/evil-winrm/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis => unit/ev}/evmdis/go.mod (100%) rename pkgs/{development/tools/analysis/evmdis/default.nix => unit/ev/evmdis/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/evolution => unit/ev}/evolution-ews/hardcode-gsettings.patch (100%) rename pkgs/{applications/networking/mailreaders/evolution/evolution-ews/default.nix => unit/ev/evolution-ews/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/evolution/evolution/default.nix => unit/ev/evolution/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/evscript/default.nix => unit/ev/evscript/pkg-fun.nix} (100%) rename pkgs/{applications/misc/evtest/default.nix => unit/ev/evtest/pkg-fun.nix} (100%) rename pkgs/{tools/security/evtx/default.nix => unit/ev/evtx/pkg-fun.nix} (100%) rename pkgs/{development/tools/literate-programming/eweb/default.nix => unit/ew/eweb/pkg-fun.nix} (100%) rename pkgs/{applications/audio/exact-audio-copy/default.nix => unit/ex/exactaudiocopy/pkg-fun.nix} (100%) rename pkgs/{applications/audio/exaile/default.nix => unit/ex/exaile/pkg-fun.nix} (100%) rename pkgs/{development/libraries/example-robot-data/default.nix => unit/ex/example-robot-data/pkg-fun.nix} (100%) rename pkgs/{development/libraries/exempi/default.nix => unit/ex/exempi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/exercism/default.nix => unit/ex/exercism/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/exfat/default.nix => unit/ex/exfat/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/exfatprogs/default.nix => unit/ex/exfatprogs/pkg-fun.nix} (100%) rename pkgs/{servers/exhibitor/default.nix => unit/ex/exhibitor/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/exif/default.nix => unit/ex/exif/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/exifprobe/default.nix => unit/ex/exifprobe/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/exiftags/default.nix => unit/ex/exiftags/pkg-fun.nix} (100%) rename pkgs/{servers/mail/exim/default.nix => unit/ex/exim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/exiv2/default.nix => unit/ex/exiv2/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/exodus/default.nix => unit/ex/exodus/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/exonerate/default.nix => unit/ex/exonerate/pkg-fun.nix} (100%) rename pkgs/{tools/admin/exoscale-cli/default.nix => unit/ex/exoscale-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/expat/default.nix => unit/ex/expat/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ex}/expect/fix-cross-compilation.patch (100%) rename pkgs/{tools/misc/expect/default.nix => unit/ex/expect/pkg-fun.nix} (100%) rename pkgs/{development/libraries/expected-lite/default.nix => unit/ex/expected-lite/pkg-fun.nix} (100%) rename pkgs/{applications/misc/expenses/default.nix => unit/ex/expenses/pkg-fun.nix} (100%) rename pkgs/{development/tools/explain/default.nix => unit/ex/explain/pkg-fun.nix} (100%) rename pkgs/{tools/security/expliot/default.nix => unit/ex/expliot/pkg-fun.nix} (100%) rename pkgs/{tools/security/exploitdb/default.nix => unit/ex/exploitdb/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/exportarr/default.nix => unit/ex/exportarr/pkg-fun.nix} (100%) rename pkgs/{applications/networking/expressvpn/default.nix => unit/ex/expressvpn/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/exrtools/default.nix => unit/ex/exrtools/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/ex}/ext4magic/glibc-fix.patch (100%) rename pkgs/{tools/filesystems/ext4magic/default.nix => unit/ex/ext4magic/pkg-fun.nix} (100%) rename pkgs/{development/tools/extism-cli/default.nix => unit/ex/extism-cli/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/extra-container/default.nix => unit/ex/extra-container/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/extrace/default.nix => unit/ex/extrace/pkg-fun.nix} (100%) rename pkgs/{applications/misc/extract_url/default.nix => unit/ex/extract_url/pkg-fun.nix} (100%) rename pkgs/{tools/security/extrude/default.nix => unit/ex/extrude/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/extundelete/default.nix => unit/ex/extundelete/pkg-fun.nix} (100%) rename pkgs/{games/exult/default.nix => unit/ex/exult/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/eyedropper/default.nix => unit/ey/eyedropper/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/EZminc/default.nix => unit/ez/ezminc/pkg-fun.nix} (100%) rename pkgs/{games/ezquake/default.nix => unit/ez/ezquake/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ezra-sil/default.nix => unit/ez/ezra-sil/pkg-fun.nix} (100%) rename pkgs/{tools/audio/ezstream/default.nix => unit/ez/ezstream/pkg-fun.nix} (100%) rename pkgs/{development/tools/profiling/EZTrace/default.nix => unit/ez/eztrace/pkg-fun.nix} (100%) rename pkgs/{applications/video/f1viewer/default.nix => unit/f1/f1viewer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/f2/default.nix => unit/f2/f2/pkg-fun.nix} (100%) rename pkgs/{development/tools/f2c/default.nix => unit/f2/f2c/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/f2}/f2fs-tools/f2fs-tools-cross-fix.patch (100%) rename pkgs/{tools/filesystems/f2fs-tools/default.nix => unit/f2/f2fs-tools/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/f3/default.nix => unit/f3/f3/pkg-fun.nix} (100%) rename pkgs/{data/fonts/f5_6/default.nix => unit/f5/f5_6/pkg-fun.nix} (100%) rename pkgs/{development/libraries/faac/default.nix => unit/fa/faac/pkg-fun.nix} (100%) rename pkgs/{development/libraries/faad2/default.nix => unit/fa/faad2/pkg-fun.nix} (100%) rename pkgs/{development/tools/faas-cli/default.nix => unit/fa/faas-cli/pkg-fun.nix} (100%) rename pkgs/{data/icons/faba-icon-theme/default.nix => unit/fa/faba-icon-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/faba-mono-icons/default.nix => unit/fa/faba-mono-icons/pkg-fun.nix} (100%) rename pkgs/{tools/games/minecraft/fabric-installer/default.nix => unit/fa/fabric-installer/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/fa}/fac/deps.nix (100%) rename pkgs/{development/tools/fac/default.nix => unit/fa/fac/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/facedetect/default.nix => unit/fa/facedetect/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/facetimehd-calibration/default.nix => unit/fa/facetimehd-calibration/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/facetimehd-firmware/default.nix => unit/fa/facetimehd-firmware/pkg-fun.nix} (100%) rename pkgs/{tools/system/facter/default.nix => unit/fa/facter/pkg-fun.nix} (100%) rename pkgs/{development/compilers/factor-lang => unit/fa/factor-lang-scope}/adjust-paths-in-unit-tests.patch (100%) rename pkgs/{development/compilers/factor-lang => unit/fa/factor-lang-scope}/factor98.nix (100%) rename pkgs/{development/compilers/factor-lang/scope.nix => unit/fa/factor-lang-scope/pkg-fun.nix} (100%) rename pkgs/{development/compilers/factor-lang => unit/fa/factor-lang-scope}/staging-command-line-0.98-pre.patch (100%) rename pkgs/{development/compilers/factor-lang => unit/fa/factor-lang-scope}/workdir-0.98-pre.patch (100%) rename pkgs/{games/factorio/mods.nix => unit/fa/factorio-mods/pkg-fun.nix} (100%) rename pkgs/{games/factorio/utils.nix => unit/fa/factorio-utils/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/foldingathome/client.nix => unit/fa/fahclient/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/foldingathome/control.nix => unit/fa/fahcontrol/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/foldingathome/viewer.nix => unit/fa/fahviewer/pkg-fun.nix} (100%) rename pkgs/{tools/security/fail2ban/default.nix => unit/fa/fail2ban/pkg-fun.nix} (100%) rename pkgs/{applications/misc/faircamp/default.nix => unit/fa/faircamp/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/fa}/faircamp/test-wav.nix (100%) rename pkgs/{games/fairymax/default.nix => unit/fa/fairymax/pkg-fun.nix} (100%) rename pkgs/{build-support/fake-nss/default.nix => unit/fa/fakeNss/pkg-fun.nix} (100%) rename pkgs/{tools/system/fakechroot/default.nix => unit/fa/fakechroot/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/fa}/fakeroot/einval.patch (100%) rename pkgs/{tools/system/fakeroot/default.nix => unit/fa/fakeroot/pkg-fun.nix} (100%) rename pkgs/{tools/networking/fakeroute/default.nix => unit/fa/fakeroute/pkg-fun.nix} (100%) rename pkgs/{tools/misc/faketty/default.nix => unit/fa/faketty/pkg-fun.nix} (100%) rename pkgs/{applications/audio/famistudio/default.nix => unit/fa/famistudio/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fan2go/default.nix => unit/fa/fan2go/pkg-fun.nix} (100%) rename pkgs/{tools/system/fancy-motd/default.nix => unit/fa/fancy-motd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fancypp/default.nix => unit/fa/fancypp/pkg-fun.nix} (100%) rename pkgs/{tools/text/fanficfare/default.nix => unit/fa/fanficfare/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fantasque-sans-mono/default.nix => unit/fa/fantasque-sans-mono/pkg-fun.nix} (100%) rename pkgs/{tools/security/faraday-agent-dispatcher/default.nix => unit/fa/faraday-agent-dispatcher/pkg-fun.nix} (100%) rename pkgs/{tools/security/faraday-cli/default.nix => unit/fa/faraday-cli/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/faraday/default.nix => unit/fa/faraday/pkg-fun.nix} (100%) rename pkgs/{development/libraries/farbfeld/default.nix => unit/fa/farbfeld/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fasd/default.nix => unit/fa/fasd/pkg-fun.nix} (100%) rename pkgs/{development/compilers/fasm/bin.nix => unit/fa/fasm-bin/pkg-fun.nix} (100%) rename pkgs/{development/compilers/fasmg/default.nix => unit/fa/fasmg/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/fa}/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in (100%) rename pkgs/{development/libraries/fast-cpp-csv-parser/default.nix => unit/fa/fast-cpp-csv-parser/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/fast-downward/default.nix => unit/fa/fast-downward/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fastjson/default.nix => unit/fa/fastJson/pkg-fun.nix} (100%) rename pkgs/{tools/networking/fastd/default.nix => unit/fa/fastd/pkg-fun.nix} (100%) rename pkgs/{development/tools/fastddsgen/default.nix => unit/fa/fastddsgen/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/fastjar/default.nix => unit/fa/fastjar/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/fastjet-contrib/default.nix => unit/fa/fastjet-contrib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/fastjet/default.nix => unit/fa/fastjet/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/fa}/fastlane/Gemfile (100%) rename pkgs/{tools/admin => unit/fa}/fastlane/Gemfile.lock (100%) rename pkgs/{tools/admin => unit/fa}/fastlane/gemset.nix (100%) rename pkgs/{tools/admin/fastlane/default.nix => unit/fa/fastlane/pkg-fun.nix} (100%) rename pkgs/{misc/fastly/default.nix => unit/fa/fastly/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/fastnlo_toolkit/default.nix => unit/fa/fastnlo_toolkit/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/fastp/default.nix => unit/fa/fastp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fastpbkdf2/default.nix => unit/fa/fastpbkdf2/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning/fasttext/default.nix => unit/fa/fasttext/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fatrace/default.nix => unit/fa/fatrace/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/fatresize/default.nix => unit/fa/fatresize/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/fatsort/default.nix => unit/fa/fatsort/pkg-fun.nix} (100%) rename pkgs/{development/libraries/faudio/default.nix => unit/fa/faudio/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust1.nix => unit/fa/faust1/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2.nix => unit/fa/faust2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2alqt.nix => unit/fa/faust2alqt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2alsa.nix => unit/fa/faust2alsa/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2csound.nix => unit/fa/faust2csound/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2firefox.nix => unit/fa/faust2firefox/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2jack.nix => unit/fa/faust2jack/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2jackrust.nix => unit/fa/faust2jackrust/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2jaqt.nix => unit/fa/faust2jaqt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2ladspa.nix => unit/fa/faust2ladspa/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faust2lv2.nix => unit/fa/faust2lv2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faustPhysicalModeling/default.nix => unit/fa/faustPhysicalModeling/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faustStk/default.nix => unit/fa/faustStk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/faust/faustlive.nix => unit/fa/faustlive/pkg-fun.nix} (100%) rename pkgs/{applications/office/fava/default.nix => unit/fa/fava/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fbcat/default.nix => unit/fb/fbcat/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/fbida/default.nix => unit/fb/fbida/pkg-fun.nix} (100%) rename pkgs/{development/tools/fblog/default.nix => unit/fb/fblog/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fbmark/default.nix => unit/fb/fbmark/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/fb}/fbmenugen/0001-Fix-paths.patch (100%) rename pkgs/{applications/misc/fbmenugen/default.nix => unit/fb/fbmenugen/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/fbpanel/default.nix => unit/fb/fbpanel/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fbterm/default.nix => unit/fb/fbterm/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/fb}/fbterm/select.patch (100%) rename pkgs/{tools/graphics/fbv/default.nix => unit/fb/fbv/pkg-fun.nix} (100%) rename pkgs/{tools/admin/fbvnc/default.nix => unit/fb/fbvnc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fcft/default.nix => unit/fc/fcft/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/fc}/fcgi/gcc-4.4.diff (100%) rename pkgs/{development/libraries/fcgi/default.nix => unit/fc/fcgi/pkg-fun.nix} (100%) rename pkgs/{servers/fcgiwrap/default.nix => unit/fc/fcgiwrap/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx/fcitx-configtool.nix => unit/fc/fcitx-configtool/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-anthy.nix => unit/fc/fcitx5-anthy/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-chewing.nix => unit/fc/fcitx5-chewing/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-gtk.nix => unit/fc/fcitx5-gtk/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-hangul.nix => unit/fc/fcitx5-hangul/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-m17n.nix => unit/fc/fcitx5-m17n/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5 => unit/fc/fcitx5-rime}/fcitx5-rime-with-nix-env-variable.patch (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-rime.nix => unit/fc/fcitx5-rime/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-table-extra.nix => unit/fc/fcitx5-table-extra/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/fcitx5/fcitx5-table-other.nix => unit/fc/fcitx5-table-other/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fcl/default.nix => unit/fc/fcl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fcp/default.nix => unit/fc/fcp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fcppt/default.nix => unit/fc/fcppt/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/fc}/fcrackzip/fcrackzip_forkexec.patch (100%) rename pkgs/{tools/security/fcrackzip/default.nix => unit/fc/fcrackzip/pkg-fun.nix} (100%) rename pkgs/{tools/system/fcron/default.nix => unit/fc/fcron/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/fc}/fcron/relative-fcronsighup.patch (100%) rename pkgs/{tools/misc/fd/default.nix => unit/fd/fd/pkg-fun.nix} (100%) rename pkgs/{applications/audio/fdkaac/default.nix => unit/fd/fdk-aac-encoder/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fdk-aac/default.nix => unit/fd/fdk_aac/pkg-fun.nix} (100%) rename pkgs/{tools/networking/fdm/default.nix => unit/fd/fdm/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/fd}/fdtools/new-skalibs.patch (100%) rename pkgs/{tools/misc/fdtools/default.nix => unit/fd/fdtools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fdupes/default.nix => unit/fd/fdupes/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/fe}/febio/fix-cmake.patch (100%) rename pkgs/{development/libraries/febio/default.nix => unit/fe/febio/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/fe}/fedora-backgrounds/f33-fix-xfce-path.patch (100%) rename pkgs/{data/misc => unit/fe}/fedora-backgrounds/f34-fix-xfce-path.patch (100%) rename pkgs/{data/misc => unit/fe}/fedora-backgrounds/generic.nix (100%) rename pkgs/{data/misc/fedora-backgrounds/default.nix => unit/fe/fedora-backgrounds/pkg-fun.nix} (100%) rename pkgs/{applications/misc/feedbackd/default.nix => unit/fe/feedbackd/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/feedgnuplot/default.nix => unit/fe/feedgnuplot/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fehlstart/default.nix => unit/fe/fehlstart/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/fe}/fehlstart/use-nix-profiles.patch (100%) rename pkgs/{applications/networking/instant-messengers/feishu/default.nix => unit/fe/feishu/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/felix-fm/default.nix => unit/fe/felix-fm/pkg-fun.nix} (100%) rename pkgs/{servers/felix/default.nix => unit/fe/felix/pkg-fun.nix} (100%) rename pkgs/{servers/felix/remoteshell.nix => unit/fe/felix_remoteshell/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fend/default.nix => unit/fe/fend/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ferm/default.nix => unit/fe/ferm/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/ferretdb/default.nix => unit/fe/ferretdb/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ferrum/default.nix => unit/fe/ferrum/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fet-sh/default.nix => unit/fe/fet-sh/pkg-fun.nix} (100%) rename pkgs/{build-support/rust/fetchcrate.nix => unit/fe/fetchCrate/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchbitbucket/default.nix => unit/fe/fetchFromBitbucket/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchgithub/default.nix => unit/fe/fetchFromGitHub/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchgitlab/default.nix => unit/fe/fetchFromGitLab/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchgitea/default.nix => unit/fe/fetchFromGitea/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchgitiles/default.nix => unit/fe/fetchFromGitiles/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchrepoorcz/default.nix => unit/fe/fetchFromRepoOrCz/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchsavannah/default.nix => unit/fe/fetchFromSavannah/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchsourcehut/default.nix => unit/fe/fetchFromSourcehut/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchmavenartifact/default.nix => unit/fe/fetchMavenArtifact/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchnextcloudapp/default.nix => unit/fe/fetchNextcloudApp/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet/fetchnuget/default.nix => unit/fe/fetchNuGet/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchpypi/default.nix => unit/fe/fetchPypi/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchrepoproject/default.nix => unit/fe/fetchRepoProject/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchbzr/builder.sh (100%) rename pkgs/{build-support/fetchbzr/default.nix => unit/fe/fetchbzr/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchdarcs/builder.sh (100%) rename pkgs/{build-support/fetchdarcs/default.nix => unit/fe/fetchdarcs/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchdocker/fetchdocker-builder.sh (100%) rename pkgs/{build-support/fetchdocker/default.nix => unit/fe/fetchdocker/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchfossil/builder.sh (100%) rename pkgs/{build-support/fetchfossil/default.nix => unit/fe/fetchfossil/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchgitlocal/default.nix => unit/fe/fetchgitLocal/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchgx/default.nix => unit/fe/fetchgx/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchhg/builder.sh (100%) rename pkgs/{build-support/fetchhg/default.nix => unit/fe/fetchhg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/fetchit/default.nix => unit/fe/fetchit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fetchmail/default.nix => unit/fe/fetchmail/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fetchmail/v7.nix => unit/fe/fetchmail_7/pkg-fun.nix} (100%) rename pkgs/{build-support/fetchs3/default.nix => unit/fe/fetchs3/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchsvnssh/builder.sh (100%) rename pkgs/{build-support/fetchsvnssh/default.nix => unit/fe/fetchsvnssh/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/fe}/fetchsvnssh/sshsubversion.exp (100%) rename pkgs/{tools/misc/fetchutils/default.nix => unit/fe/fetchutils/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ff2mpv/default.nix => unit/ff/ff2mpv/pkg-fun.nix} (100%) rename pkgs/{tools/X11/ffcast/default.nix => unit/ff/ffcast/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fff/default.nix => unit/ff/fff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fflas-ffpack/default.nix => unit/ff/fflas-ffpack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ffmpegthumbnailer/default.nix => unit/ff/ffmpegthumbnailer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ffms/default.nix => unit/ff/ffms/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fftw/default.nix => unit/ff/fftw/pkg-fun.nix} (100%) rename pkgs/{tools/security/ffuf/default.nix => unit/ff/ffuf/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/fgallery/default.nix => unit/fg/fgallery/pkg-fun.nix} (100%) rename pkgs/{games/fheroes2/default.nix => unit/fh/fheroes2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/FIL-plugins/default.nix => unit/fi/FIL-plugins/pkg-fun.nix} (100%) rename pkgs/{servers/fiche/default.nix => unit/fi/fiche/pkg-fun.nix} (100%) rename pkgs/{tools/security/fido2luks/default.nix => unit/fi/fido2luks/pkg-fun.nix} (100%) rename pkgs/{tools/security/fierce/default.nix => unit/fi/fierce/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/fig2dev/default.nix => unit/fi/fig2dev/pkg-fun.nix} (100%) rename pkgs/{tools/misc/figlet/default.nix => unit/fi/figlet/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/figma-linux/default.nix => unit/fi/figma-linux/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/fiji/default.nix => unit/fi/fiji/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/file-rename/default.nix => unit/fi/file-rename/pkg-fun.nix} (100%) rename pkgs/{tools/misc/filebench/default.nix => unit/fi/filebench/pkg-fun.nix} (100%) rename pkgs/{applications/video/filebot/default.nix => unit/fi/filebot/pkg-fun.nix} (100%) rename pkgs/{tools/networking/filegive/default.nix => unit/fi/filegive/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fileschanged/default.nix => unit/fi/fileschanged/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/fi}/fileschanged/unused-variables.debian.patch (100%) rename pkgs/{servers/fileshare/default.nix => unit/fi/fileshare/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/fileshelter/default.nix => unit/fi/fileshelter/pkg-fun.nix} (100%) rename pkgs/{applications/misc/filet/default.nix => unit/fi/filet/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ftp/filezilla/default.nix => unit/fi/filezilla/pkg-fun.nix} (100%) rename pkgs/{development/libraries/filter-audio/default.nix => unit/fi/filter-audio/pkg-fun.nix} (100%) rename pkgs/{servers => unit/fi}/filtron/deps.nix (100%) rename pkgs/{servers/filtron/default.nix => unit/fi/filtron/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/fim/default.nix => unit/fi/fim/pkg-fun.nix} (100%) rename pkgs/{tools/X11/find-cursor/default.nix => unit/fi/find-cursor/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/findbugs/default.nix => unit/fi/findbugs/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/findimagedupes/default.nix => unit/fi/findimagedupes/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/findnewest/default.nix => unit/fi/findnewest/pkg-fun.nix} (100%) rename pkgs/{tools/misc/findup/default.nix => unit/fi/findup/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/fi}/findutils/no-install-statedir.patch (100%) rename pkgs/{tools/misc/findutils/default.nix => unit/fi/findutils/pkg-fun.nix} (100%) rename pkgs/{tools/system/fio/default.nix => unit/fi/fio/pkg-fun.nix} (100%) rename pkgs/{tools/admin/fioctl/default.nix => unit/fi/fioctl/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fira-code/symbols.nix => unit/fi/fira-code-symbols/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fira-code/default.nix => unit/fi/fira-code/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fira-go/default.nix => unit/fi/fira-go/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fira-mono/default.nix => unit/fi/fira-mono/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fira/default.nix => unit/fi/fira/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/firecracker/default.nix => unit/fi/firecracker/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/firectl/default.nix => unit/fi/firectl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/firefly-desktop/default.nix => unit/fi/firefly-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/fi}/firehol/firehol-ping6.patch (100%) rename pkgs/{applications/networking => unit/fi}/firehol/firehol-sysconfdir.patch (100%) rename pkgs/{applications/networking => unit/fi}/firehol/firehol-uname-command.patch (100%) rename pkgs/{applications/networking/firehol/default.nix => unit/fi/firehol/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/fi}/firejail/fbuilder-call-firejail-on-path.patch (100%) rename pkgs/{os-specific/linux => unit/fi}/firejail/mount-nix-dir-on-overlay.patch (100%) rename pkgs/{os-specific/linux/firejail/default.nix => unit/fi/firejail/pkg-fun.nix} (100%) rename pkgs/{applications/misc/firestarter/default.nix => unit/fi/firestarter/pkg-fun.nix} (100%) rename pkgs/{applications/networking/firewalld/default.nix => unit/fi/firewalld/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/fi}/firewalld/respect-xml-catalog-files-var.patch (100%) rename pkgs/{os-specific/linux/firmware/firmware-updater/default.nix => unit/fi/firmware-updater/pkg-fun.nix} (100%) rename pkgs/{development/compilers/firrtl/default.nix => unit/fi/firrtl/pkg-fun.nix} (100%) rename pkgs/{games => unit/fi}/fish-fillets-ng/icon.xpm (100%) rename pkgs/{games/fish-fillets-ng/default.nix => unit/fi/fish-fillets-ng/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/irssi/fish => unit/fi/fish-irssi}/irssi-include-dir.patch (100%) rename pkgs/{applications/networking/irc/irssi/fish/default.nix => unit/fi/fish-irssi/pkg-fun.nix} (100%) rename pkgs/{shells/fish/default.nix => unit/fi/fish/pkg-fun.nix} (100%) rename pkgs/{servers => unit/fi}/fishnet/Cargo.lock.patch (100%) rename pkgs/{servers/fishnet/default.nix => unit/fi/fishnet/pkg-fun.nix} (100%) rename pkgs/{development/tools/fission/default.nix => unit/fi/fission/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fitnesstrax/default.nix => unit/fi/fitnesstrax/pkg-fun.nix} (100%) rename pkgs/{tools/admin/fits-cloudctl/default.nix => unit/fi/fits-cloudctl/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/fityk/default.nix => unit/fi/fityk/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fixedsys-excelsior/default.nix => unit/fi/fixedsys-excelsior/pkg-fun.nix} (100%) rename pkgs/{applications/audio/flac/default.nix => unit/fl/flac/pkg-fun.nix} (100%) rename pkgs/{applications/audio/flac123/default.nix => unit/fl/flac123/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/flam3/default.nix => unit/fl/flam3/pkg-fun.nix} (100%) rename pkgs/{development/tools/flamegraph/default.nix => unit/fl/flamegraph/pkg-fun.nix} (100%) rename pkgs/{applications/misc/flamerobin/default.nix => unit/fl/flamerobin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/flann/default.nix => unit/fl/flann/pkg-fun.nix} (100%) rename pkgs/{tools/networking/flannel/default.nix => unit/fl/flannel/pkg-fun.nix} (100%) rename pkgs/{tools/security/flare-floss/default.nix => unit/fl/flare-floss/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/flashbench/default.nix => unit/fl/flashbench/pkg-fun.nix} (100%) rename pkgs/{misc/flashfocus/default.nix => unit/fl/flashfocus/pkg-fun.nix} (100%) rename pkgs/{tools/misc/flashrom/default.nix => unit/fl/flashrom/pkg-fun.nix} (100%) rename pkgs/{development/compilers/flasm/default.nix => unit/fl/flasm/pkg-fun.nix} (100%) rename pkgs/{data/themes/flat-remix-gnome/default.nix => unit/fl/flat-remix-gnome/pkg-fun.nix} (100%) rename pkgs/{data/themes/flat-remix-gtk/default.nix => unit/fl/flat-remix-gtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/flatbuffers/default.nix => unit/fl/flatbuffers/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/flatcam/default.nix => unit/fl/flatcam/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/fl}/flatcam/release.patch (100%) rename pkgs/{development/libraries/flatcc/default.nix => unit/fl/flatcc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/flavours/default.nix => unit/fl/flavours/pkg-fun.nix} (100%) rename pkgs/{development/tools/flawfinder/default.nix => unit/fl/flawfinder/pkg-fun.nix} (100%) rename pkgs/{applications/radio/flex-ncat/default.nix => unit/fl/flex-ncat/pkg-fun.nix} (100%) rename pkgs/{applications/radio/flex-ndax/default.nix => unit/fl/flex-ndax/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/flex/default.nix => unit/fl/flex/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/flex/2.5.35.nix => unit/fl/flex_2_5_35/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/flexc++/default.nix => unit/fl/flexcpp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/flexget/default.nix => unit/fl/flexget/pkg-fun.nix} (100%) rename pkgs/{applications/office/flexibee/default.nix => unit/fl/flexibee/pkg-fun.nix} (100%) rename pkgs/{tools/misc/flexoptix-app/default.nix => unit/fl/flexoptix-app/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/flink/default.nix => unit/fl/flink/pkg-fun.nix} (100%) rename pkgs/{development/libraries/flint/default.nix => unit/fl/flint/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/flintlock/default.nix => unit/fl/flintlock/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/flintqs/default.nix => unit/fl/flintqs/pkg-fun.nix} (100%) rename pkgs/{development/tools/flip-link/default.nix => unit/fl/flip-link/pkg-fun.nix} (100%) rename pkgs/{tools/compression/flips/default.nix => unit/fl/flips/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/fl}/flips/use-system-libdivsufsort.patch (100%) rename pkgs/{development/libraries/flite/default.nix => unit/fl/flite/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/fl}/flitter/flitter.patch (100%) rename pkgs/{tools/misc/flitter/default.nix => unit/fl/flitter/pkg-fun.nix} (100%) rename pkgs/{applications/radio/fllog/default.nix => unit/fl/fllog/pkg-fun.nix} (100%) rename pkgs/{applications/radio/flmsg/default.nix => unit/fl/flmsg/pkg-fun.nix} (100%) rename pkgs/{development/tools/flock/default.nix => unit/fl/flock/pkg-fun.nix} (100%) rename pkgs/{tools/backup/flockit/default.nix => unit/fl/flockit/pkg-fun.nix} (100%) rename pkgs/{development/tools/flootty/default.nix => unit/fl/flootty/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/flopoco/default.nix => unit/fl/flopoco/pkg-fun.nix} (100%) rename pkgs/{applications/video/flowblade/default.nix => unit/fl/flowblade/pkg-fun.nix} (100%) rename pkgs/{applications/editors/flpsed/default.nix => unit/fl/flpsed/pkg-fun.nix} (100%) rename pkgs/{applications/radio/flrig/default.nix => unit/fl/flrig/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fluent-bit/default.nix => unit/fl/fluent-bit/pkg-fun.nix} (100%) rename pkgs/{data/themes/fluent-gtk-theme/default.nix => unit/fl/fluent-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/fluent-icon-theme/default.nix => unit/fl/fluent-icon-theme/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/fluent-reader/default.nix => unit/fl/fluent-reader/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/fl}/fluentd/Gemfile (100%) rename pkgs/{tools/misc => unit/fl}/fluentd/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/fl}/fluentd/gemset.nix (100%) rename pkgs/{tools/misc/fluentd/default.nix => unit/fl/fluentd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/fluffychat/default.nix => unit/fl/fluffychat/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fluidd/default.nix => unit/fl/fluidd/pkg-fun.nix} (100%) rename pkgs/{development/compilers/flux/default.nix => unit/fl/flux/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/fluxbox/default.nix => unit/fl/fluxbox/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fluxboxlauncher/default.nix => unit/fl/fluxboxlauncher/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/fl}/fluxcd/patches/disable-tests-ssh_key.patch (100%) rename pkgs/{applications/networking/cluster/fluxcd/default.nix => unit/fl/fluxcd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/fl}/fluxcd/update.sh (100%) rename pkgs/{applications/networking/cluster/fluxctl/default.nix => unit/fl/fluxctl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/flvstreamer/default.nix => unit/fl/flvstreamer/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/fly/default.nix => unit/fl/fly/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/flycast/default.nix => unit/fl/flycast/pkg-fun.nix} (100%) rename pkgs/{development/web/flyctl/default.nix => unit/fl/flyctl/pkg-fun.nix} (100%) rename pkgs/{development/tools/flyway/default.nix => unit/fl/flyway/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/flywheel-cli/default.nix => unit/fl/flywheel-cli/pkg-fun.nix} (100%) rename pkgs/{applications/audio/fmsynth/default.nix => unit/fm/fmsynth/pkg-fun.nix} (100%) rename pkgs/{tools/audio/fmtoy/default.nix => unit/fm/fmtoy/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/fn-cli/default.nix => unit/fn/fn-cli/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/fnc/default.nix => unit/fn/fnc/pkg-fun.nix} (100%) rename pkgs/{development/tools/fnlfmt/default.nix => unit/fn/fnlfmt/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fnotifystat/default.nix => unit/fn/fnotifystat/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fnott/default.nix => unit/fn/fnott/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fntsample/default.nix => unit/fn/fntsample/pkg-fun.nix} (100%) rename pkgs/{tools/X11/focus/default.nix => unit/fo/focus/pkg-fun.nix} (100%) rename pkgs/{applications/office/foliate/default.nix => unit/fo/foliate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/folks/default.nix => unit/fo/folks/pkg-fun.nix} (100%) rename pkgs/{development/libraries/folly/default.nix => unit/fo/folly/pkg-fun.nix} (100%) rename pkgs/{tools/misc/foma/default.nix => unit/fo/foma/pkg-fun.nix} (100%) rename pkgs/{applications/audio/fomp/default.nix => unit/fo/fomp/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/fondo/default.nix => unit/fo/fondo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/font-config-info/default.nix => unit/fo/font-config-info/pkg-fun.nix} (100%) rename pkgs/{applications/misc/font-manager/default.nix => unit/fo/font-manager/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fontfor/default.nix => unit/fo/fontfor/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fontforge/fontforge-fonttools.nix => unit/fo/fontforge-fonttools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fontpreview/default.nix => unit/fo/fontpreview/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/fo}/foo2zjs/dell1250c-color-fix.patch (100%) rename pkgs/{misc/drivers => unit/fo}/foo2zjs/hbpl1.patch (100%) rename pkgs/{misc/drivers => unit/fo}/foo2zjs/no-hardcode-fw.diff (100%) rename pkgs/{misc/drivers => unit/fo}/foo2zjs/papercode-format-fix.patch (100%) rename pkgs/{misc/drivers/foo2zjs/default.nix => unit/fo/foo2zjs/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/foomatic-db-engine/default.nix => unit/fo/foomatic-db-engine/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/foomatic-db-nonfree/default.nix => unit/fo/foomatic-db-nonfree/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/foomatic-db/default.nix => unit/fo/foomatic-db/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/foomatic-filters/default.nix => unit/fo/foomatic-filters/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/foot/default.nix => unit/fo/foot/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/footswitch/default.nix => unit/fo/footswitch/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/fo}/foreman/Gemfile (100%) rename pkgs/{tools/system => unit/fo}/foreman/Gemfile.lock (100%) rename pkgs/{tools/system => unit/fo}/foreman/gemset.nix (100%) rename pkgs/{tools/system/foreman/default.nix => unit/fo/foreman/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/fo}/foremost/makefile.patch (100%) rename pkgs/{tools/system/foremost/default.nix => unit/fo/foremost/pkg-fun.nix} (100%) rename pkgs/{games => unit/fo}/forge-mtg/no-launch4j.patch (100%) rename pkgs/{games/forge-mtg/default.nix => unit/fo/forge-mtg/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/forkstat/default.nix => unit/fo/forkstat/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/forktty/default.nix => unit/fo/forktty/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/form/default.nix => unit/fo/form/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/fo}/formatter/fix-paths.patch (100%) rename pkgs/{applications/misc/formatter/default.nix => unit/fo/formatter/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/fo}/formula/nuget.nix (100%) rename pkgs/{applications/science/logic/formula/default.nix => unit/fo/formula/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/fornalder/default.nix => unit/fo/fornalder/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fortune/default.nix => unit/fo/fortune/pkg-fun.nix} (100%) rename pkgs/{applications/misc/foxtrotgps/default.nix => unit/fo/foxtrotgps/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/fparser/default.nix => unit/fp/fparser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fpart/default.nix => unit/fp/fpart/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/fp}/fpc/binary-builder-darwin.sh (100%) rename pkgs/{development/compilers => unit/fp}/fpc/binary-builder.sh (100%) rename pkgs/{development/compilers => unit/fp}/fpc/binary.nix (100%) rename pkgs/{development/compilers => unit/fp}/fpc/mark-paths.patch (100%) rename pkgs/{development/compilers/fpc/default.nix => unit/fp/fpc/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/fp}/fpc/remove-signature.sh (100%) rename pkgs/{applications/science/electronics/fped/default.nix => unit/fp/fped/pkg-fun.nix} (100%) rename pkgs/{tools/networking/fping/default.nix => unit/fp/fping/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fplll/default.nix => unit/fp/fplll/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fplll/20160331.nix => unit/fp/fplll_20160331/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/fp}/fpm/Gemfile (100%) rename pkgs/{tools/package-management => unit/fp}/fpm/Gemfile.lock (100%) rename pkgs/{tools/package-management => unit/fp}/fpm/gemset.nix (100%) rename pkgs/{tools/package-management/fpm/default.nix => unit/fp/fpm/pkg-fun.nix} (100%) rename pkgs/{tools/security/fpm2/default.nix => unit/fp/fpm2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fpp/default.nix => unit/fp/fpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/fprettify/default.nix => unit/fp/fprettify/pkg-fun.nix} (100%) rename pkgs/{tools/security/fprintd/tod.nix => unit/fp/fprintd-tod/pkg-fun.nix} (100%) rename pkgs/{tools/security/fprintd/default.nix => unit/fp/fprintd/pkg-fun.nix} (100%) rename pkgs/{development/tools/fq/default.nix => unit/fq/fq/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/fragments/default.nix => unit/fr/fragments/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/frama-c/default.nix => unit/fr/framac/pkg-fun.nix} (100%) rename pkgs/{development/libraries/frame/default.nix => unit/fr/frame/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/framesh/default.nix => unit/fr/framesh/pkg-fun.nix} (100%) rename pkgs/{tools/text/frangipanni/default.nix => unit/fr/frangipanni/pkg-fun.nix} (100%) rename pkgs/{data/fonts/fraunces/default.nix => unit/fr/fraunces/pkg-fun.nix} (100%) rename pkgs/{tools/text/frawk/default.nix => unit/fr/frawk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/freac/default.nix => unit/fr/freac/pkg-fun.nix} (100%) rename pkgs/{development/tools/frece/default.nix => unit/fr/frece/pkg-fun.nix} (100%) rename pkgs/{applications/misc/free42/default.nix => unit/fr/free42/pkg-fun.nix} (100%) rename pkgs/{development/libraries/freealut/default.nix => unit/fr/freealut/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/freebayes/default.nix => unit/fr/freebayes/pkg-fun.nix} (100%) rename pkgs/{tools/networking/freebind/default.nix => unit/fr/freebind/pkg-fun.nix} (100%) rename pkgs/{games/freecell-solver/default.nix => unit/fr/freecell-solver/pkg-fun.nix} (100%) rename pkgs/{games/freedink/default.nix => unit/fr/freedink/pkg-fun.nix} (100%) rename pkgs/{games/freedroid/default.nix => unit/fr/freedroid/pkg-fun.nix} (100%) rename pkgs/{games => unit/fr}/freedroidrpg/drop-build-deps.patch (100%) rename pkgs/{games/freedroidrpg/default.nix => unit/fr/freedroidrpg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/freefilesync/default.nix => unit/fr/freefilesync/pkg-fun.nix} (100%) rename pkgs/{data/fonts/freefont-ttf/default.nix => unit/fr/freefont_ttf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/freeglut/default.nix => unit/fr/freeglut/pkg-fun.nix} (100%) rename pkgs/{tools/system/freeipmi/default.nix => unit/fr/freeipmi/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p => unit/fr}/freenet/freenetWrapper (100%) rename pkgs/{applications/networking/p2p/freenet/default.nix => unit/fr/freenet/pkg-fun.nix} (100%) rename pkgs/{games/freenukum/default.nix => unit/fr/freenukum/pkg-fun.nix} (100%) rename pkgs/{games => unit/fr}/freeorion/fix-paths.sh (100%) rename pkgs/{games => unit/fr}/freeorion/fix-paths.xslt (100%) rename pkgs/{games/freeorion/default.nix => unit/fr/freeorion/pkg-fun.nix} (100%) rename pkgs/{data/misc/freepats/default.nix => unit/fr/freepats/pkg-fun.nix} (100%) rename pkgs/{applications/misc/freeplane/default.nix => unit/fr/freeplane/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/freepv/default.nix => unit/fr/freepv/pkg-fun.nix} (100%) rename pkgs/{games/freesweep/default.nix => unit/fr/freesweep/pkg-fun.nix} (100%) rename pkgs/{development/libraries/freetds/default.nix => unit/fr/freetds/pkg-fun.nix} (100%) rename pkgs/{applications/video/freetube/default.nix => unit/fr/freetube/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/fr}/freetype/enable-subpixel-rendering.patch (100%) rename pkgs/{development/libraries => unit/fr}/freetype/enable-table-validation.patch (100%) rename pkgs/{development/libraries/freetype/default.nix => unit/fr/freetype/pkg-fun.nix} (100%) rename pkgs/{applications/audio/freewheeling/default.nix => unit/fr/freewheeling/pkg-fun.nix} (100%) rename pkgs/{development/libraries/freexl/default.nix => unit/fr/freexl/pkg-fun.nix} (100%) rename pkgs/{tools/security/freeze/default.nix => unit/fr/freeze/pkg-fun.nix} (100%) rename pkgs/{tools/misc/frei/default.nix => unit/fr/frei/pkg-fun.nix} (100%) rename pkgs/{development/libraries/frei0r/default.nix => unit/fr/frei0r/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/freshrss/default.nix => unit/fr/freshrss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fribidi/default.nix => unit/fr/fribidi/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/fricas/default.nix => unit/fr/fricas/pkg-fun.nix} (100%) rename pkgs/{games => unit/fr}/frogatto/data.nix (100%) rename pkgs/{games => unit/fr}/frogatto/engine.nix (100%) rename pkgs/{games/frogatto/default.nix => unit/fr/frogatto/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/frostwire/frostwire-bin.nix => unit/fr/frostwire-bin/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/frostwire/default.nix => unit/fr/frostwire/pkg-fun.nix} (100%) rename pkgs/{games/frotz/default.nix => unit/fr/frotz/pkg-fun.nix} (100%) rename pkgs/{games => unit/fr}/frozen-bubble/fix-compilation.patch (100%) rename pkgs/{games/frozen-bubble/default.nix => unit/fr/frozen-bubble/pkg-fun.nix} (100%) rename pkgs/{tools/networking/frp/default.nix => unit/fr/frp/pkg-fun.nix} (100%) rename pkgs/{servers/frr/default.nix => unit/fr/frr/pkg-fun.nix} (100%) rename pkgs/{development/tools/frugal/default.nix => unit/fr/frugal/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/fsarchiver/default.nix => unit/fs/fsarchiver/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/fsatrace/default.nix => unit/fs/fsatrace/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fscrypt/default.nix => unit/fs/fscrypt-experimental/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fscryptctl/default.nix => unit/fs/fscryptctl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fsearch/default.nix => unit/fs/fsearch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fselect/default.nix => unit/fs/fselect/pkg-fun.nix} (100%) rename pkgs/{games/fsg/default.nix => unit/fs/fsg/pkg-fun.nix} (100%) rename pkgs/{games => unit/fs}/fsg/wxgtk-3.2.patch (100%) rename pkgs/{development/compilers/fsharp/default.nix => unit/fs/fsharp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fsmark/default.nix => unit/fs/fsmark/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fsmon/default.nix => unit/fs/fsmon/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fspy/default.nix => unit/fs/fspy/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fsql/default.nix => unit/fs/fsql/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fsrx/default.nix => unit/fs/fsrx/pkg-fun.nix} (100%) rename pkgs/{tools/text/fst/default.nix => unit/fs/fst/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/fs}/fstrcmp/cross.patch (100%) rename pkgs/{development/libraries/fstrcmp/default.nix => unit/fs/fstrcmp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/fstrm/default.nix => unit/fs/fstrm/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/fs-uae/default.nix => unit/fs/fsuae/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fsv/default.nix => unit/fs/fsv/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fsverity-utils/default.nix => unit/fs/fsverity-utils/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/fs}/fsverity-utils/remove-dynamic-libs.patch (100%) rename pkgs/{os-specific/linux/fswebcam/default.nix => unit/fs/fswebcam/pkg-fun.nix} (100%) rename pkgs/{applications/editors/fte/default.nix => unit/ft/fte/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ftgl/default.nix => unit/ft/ftgl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ft}/ftop/ftop-fix_buffer_overflow.patch (100%) rename pkgs/{os-specific/linux => unit/ft}/ftop/ftop-fix_printf_format.patch (100%) rename pkgs/{os-specific/linux/ftop/default.nix => unit/ft/ftop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ftxui/default.nix => unit/ft/ftxui/pkg-fun.nix} (100%) rename pkgs/{tools/security/fulcio/default.nix => unit/fu/fulcio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/funambol/default.nix => unit/fu/funambol/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/func/default.nix => unit/fu/func/pkg-fun.nix} (100%) rename pkgs/{development/tools/fundoc/default.nix => unit/fu/fundoc/pkg-fun.nix} (100%) rename pkgs/{development/tools/literate-programming/funnelweb/default.nix => unit/fu/funnelweb/pkg-fun.nix} (100%) rename pkgs/{applications/misc/furtherance/default.nix => unit/fu/furtherance/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/fu}/fuse-7z-ng/no-pthread.patch (100%) rename pkgs/{tools/filesystems/fuse-7z-ng/default.nix => unit/fu/fuse-7z-ng/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/fuse-emulator/default.nix => unit/fu/fuse-emulator/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/fuse-overlayfs/default.nix => unit/fu/fuse-overlayfs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fusee-interfacee-tk/default.nix => unit/fu/fusee-interfacee-tk/pkg-fun.nix} (100%) rename pkgs/{development/tools/fusee-launcher/default.nix => unit/fu/fusee-launcher/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/fuseiso/default.nix => unit/fu/fuseiso/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/fusion-inventory/default.nix => unit/fu/fusionInventory/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods => unit/fu}/fusuma/Gemfile (100%) rename pkgs/{tools/inputmethods => unit/fu}/fusuma/Gemfile.lock (100%) rename pkgs/{tools/inputmethods => unit/fu}/fusuma/gemset.nix (100%) rename pkgs/{tools/inputmethods/fusuma/default.nix => unit/fu/fusuma/pkg-fun.nix} (100%) rename pkgs/{applications/misc/fuzzel/default.nix => unit/fu/fuzzel/pkg-fun.nix} (100%) rename pkgs/{applications/audio/fverb/default.nix => unit/fv/fverb/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/fvwm/2.6.nix => unit/fv/fvwm2/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/fvwm/3.nix => unit/fv/fvwm3/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/fwanalyzer/default.nix => unit/fw/fwanalyzer/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fwts/default.nix => unit/fw/fwts/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/fwupd-efi/default.nix => unit/fw/fwupd-efi/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware => unit/fw}/fwupd/add-option-for-installation-sysconfdir.patch (100%) rename pkgs/{os-specific/linux/firmware => unit/fw}/fwupd/efi-app-path.patch (100%) rename pkgs/{os-specific/linux/firmware => unit/fw}/fwupd/install-fwupdplugin-to-out.patch (100%) rename pkgs/{os-specific/linux/firmware => unit/fw}/fwupd/installed-tests-path.patch (100%) rename pkgs/{os-specific/linux/firmware/fwupd/default.nix => unit/fw/fwupd/pkg-fun.nix} (100%) rename pkgs/{development/tools/fx/default.nix => unit/fx/fx/pkg-fun.nix} (100%) rename pkgs/{applications/networking/n8n => unit/fx/fx_cast_bridge}/node-env.nix (100%) rename pkgs/{tools/misc/fx_cast => unit/fx/fx_cast_bridge}/node-packages.nix (100%) rename pkgs/{tools/misc/fx_cast/default.nix => unit/fx/fx_cast_bridge/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/fxlinuxprint/default.nix => unit/fx/fxlinuxprint/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/fx}/fxlinuxprintutil/fxlocalechk.tcl.patch (100%) rename pkgs/{tools/misc => unit/fx}/fxlinuxprintutil/fxlputil.patch (100%) rename pkgs/{tools/misc => unit/fx}/fxlinuxprintutil/fxlputil.tcl.patch (100%) rename pkgs/{tools/misc/fxlinuxprintutil/default.nix => unit/fx/fxlinuxprintutil/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/fxload/default.nix => unit/fx/fxload/pkg-fun.nix} (100%) rename pkgs/{shells/fzf-git-sh/default.nix => unit/fz/fzf-git-sh/pkg-fun.nix} (100%) rename pkgs/{shells/bash/fzf-obc/default.nix => unit/fz/fzf-obc/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/fzf-zsh/default.nix => unit/fz/fzf-zsh/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fzf/default.nix => unit/fz/fzf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/fzy/default.nix => unit/fz/fzy/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/g1}/g15daemon/pid_location.patch (100%) rename pkgs/{os-specific/linux/g15daemon/default.nix => unit/g1/g15daemon/pkg-fun.nix} (100%) rename pkgs/{tools/misc/g203-led/default.nix => unit/g2/g203-led/pkg-fun.nix} (100%) rename pkgs/{tools/misc/g933-utils/default.nix => unit/g9/g933-utils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/galario/default.nix => unit/ga/galario/pkg-fun.nix} (100%) rename pkgs/{data/fonts/galatia-sil/default.nix => unit/ga/galatia-sil/pkg-fun.nix} (100%) rename pkgs/{games/galaxis/default.nix => unit/ga/galaxis/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/ga}/galaxy-buds-client/deps.nix (100%) rename pkgs/{applications/audio/galaxy-buds-client/default.nix => unit/ga/galaxy-buds-client/pkg-fun.nix} (100%) rename pkgs/{development/tools/galen/default.nix => unit/ga/galen/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/galene/default.nix => unit/ga/galene/pkg-fun.nix} (100%) rename pkgs/{tools/security/galer/default.nix => unit/ga/galer/pkg-fun.nix} (100%) rename pkgs/{tools/security/gallia/default.nix => unit/ga/gallia/pkg-fun.nix} (100%) rename pkgs/{tools/admin/gam/default.nix => unit/ga/gam/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/ga}/gam/signal_files_as_env_vars.patch (100%) rename pkgs/{applications/science/geometry/gama/default.nix => unit/ga/gama/pkg-fun.nix} (100%) rename pkgs/{games => unit/ga}/gambatte/fix-scons-paths.patch (100%) rename pkgs/{games/gambatte/default.nix => unit/ga/gambatte/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gambit => unit/ga/gambit-support}/bootstrap.nix (100%) rename pkgs/{development/compilers/gambit/gambit-support.nix => unit/ga/gambit-support/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/game-music-emu/default.nix => unit/ga/game-music-emu/pkg-fun.nix} (100%) rename pkgs/{development/tools/gamecube-tools/default.nix => unit/ga/gamecube-tools/pkg-fun.nix} (100%) rename pkgs/{games/gamehub/default.nix => unit/ga/gamehub/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gamenetworkingsockets/default.nix => unit/ga/gamenetworkingsockets/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/gamescope/default.nix => unit/ga/gamescope/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers => unit/ga}/gamescope/use-pkgconfig.patch (100%) rename pkgs/{development/libraries => unit/ga}/gamin/abstract-socket-namespace.patch (100%) rename pkgs/{development/libraries => unit/ga}/gamin/deadlock.patch (100%) rename pkgs/{development/libraries => unit/ga}/gamin/debian-patches.nix (100%) rename pkgs/{development/libraries => unit/ga}/gamin/debian-patches.txt (100%) rename pkgs/{development/libraries/gamin/default.nix => unit/ga/gamin/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ga}/gamin/returnval.patch (100%) rename pkgs/{applications/misc => unit/ga}/gammu/bashcomp-dir.patch (100%) rename pkgs/{applications/misc => unit/ga}/gammu/gammu-config-dialog.patch (100%) rename pkgs/{applications/misc/gammu/default.nix => unit/ga/gammu/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ga}/gammu/systemd.patch (100%) rename pkgs/{data/fonts/gandom-fonts/default.nix => unit/ga/gandom-fonts/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ganttproject-bin/default.nix => unit/ga/ganttproject-bin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ganv/default.nix => unit/ga/ganv/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/gap/default.nix => unit/ga/gap/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/gappa/default.nix => unit/ga/gappa/pkg-fun.nix} (100%) rename pkgs/{data/fonts/garamond-libre/default.nix => unit/ga/garamond-libre/pkg-fun.nix} (100%) rename pkgs/{development/tools/garble/default.nix => unit/ga/garble/pkg-fun.nix} (100%) rename pkgs/{applications/misc/garmin-plugin/default.nix => unit/ga/garmin-plugin/pkg-fun.nix} (100%) rename pkgs/{applications/misc/qlandkartegt/garmindev.nix => unit/ga/garmindev/pkg-fun.nix} (100%) rename pkgs/{development/libraries/garmintools/default.nix => unit/ga/garmintools/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/gatekeeper/default.nix => unit/ga/gatekeeper/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/gatk/default.nix => unit/ga/gatk/pkg-fun.nix} (100%) rename pkgs/{servers/http/gatling/default.nix => unit/ga/gatling/pkg-fun.nix} (100%) rename pkgs/{tools/security/gau/default.nix => unit/ga/gau/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/gauche/default.nix => unit/ga/gauche/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/gauche/boot.nix => unit/ga/gaucheBootstrap/pkg-fun.nix} (100%) rename pkgs/{development/tools/gauge/default.nix => unit/ga/gauge/pkg-fun.nix} (100%) rename pkgs/{games => unit/ga}/gav/gcc.patch (100%) rename pkgs/{games/gav/default.nix => unit/ga/gav/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gavrasm/default.nix => unit/ga/gavrasm/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/gaw/default.nix => unit/ga/gaw/pkg-fun.nix} (100%) rename pkgs/{tools/text/gawk/gawkextlib.nix => unit/ga/gawkextlib/pkg-fun.nix} (100%) rename pkgs/{tools/text/gawk => unit/ga/gawkextlib}/setup-hook.sh (100%) rename pkgs/{tools/misc/gay/default.nix => unit/ga/gay/pkg-fun.nix} (100%) rename pkgs/{tools/backup/gamerbackup/default.nix => unit/gb/gb-backup/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gbenchmark/default.nix => unit/gb/gbenchmark/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gbsplay/default.nix => unit/gb/gbsplay/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gc}/gcab/installed-tests-path.patch (100%) rename pkgs/{development/libraries/gcab/default.nix => unit/gc/gcab/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gcal/default.nix => unit/gc/gcal/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gcalcli/default.nix => unit/gc/gcalcli/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/10/default.nix => unit/gc/gcc-arm-embedded-10/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/11/default.nix => unit/gc/gcc-arm-embedded-11/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/12/default.nix => unit/gc/gcc-arm-embedded-12/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/6/default.nix => unit/gc/gcc-arm-embedded-6/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/7/default.nix => unit/gc/gcc-arm-embedded-7/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/8/default.nix => unit/gc/gcc-arm-embedded-8/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcc-arm-embedded/9/default.nix => unit/gc/gcc-arm-embedded-9/pkg-fun.nix} (100%) rename pkgs/{development/tools/gci/default.nix => unit/gc/gci/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gcl/2.6.13-pre.nix => unit/gc/gcl_2_6_13_pre/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/gc}/gcolor2/gcolor2-amd64.patch (100%) rename pkgs/{applications/graphics/gcolor2/default.nix => unit/gc/gcolor2/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/gcolor3/default.nix => unit/gc/gcolor3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gcr/default.nix => unit/gc/gcr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gcr/4.nix => unit/gc/gcr_4/pkg-fun.nix} (100%) rename pkgs/{games/gcs/default.nix => unit/gc/gcs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/gcsfuse/default.nix => unit/gc/gcsfuse/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gcstar/default.nix => unit/gc/gcstar/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gdal/default.nix => unit/gd/gdal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gdbm/default.nix => unit/gd/gdbm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gdk-pixbuf/xlib.nix => unit/gd/gdk-pixbuf-xlib/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gd}/gdk-pixbuf/installed-tests-path.patch (100%) rename pkgs/{development/libraries/gdk-pixbuf/default.nix => unit/gd/gdk-pixbuf/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gd}/gdk-pixbuf/setup-hook.sh (100%) rename pkgs/{development/libraries/gdl/default.nix => unit/gd/gdl/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/gd}/gdmap/get_sensitive.patch (100%) rename pkgs/{tools/system/gdmap/default.nix => unit/gd/gdmap/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/gd}/gdmap/set_flags.patch (100%) rename pkgs/{development/libraries => unit/gd}/gdome2/fno-common.patch (100%) rename pkgs/{development/libraries/gdome2/default.nix => unit/gd/gdome2/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gd}/gdome2/xml-document.patch (100%) rename pkgs/{applications/networking/gdrive/default.nix => unit/gd/gdrive/pkg-fun.nix} (100%) rename pkgs/{tools/system/gdu/default.nix => unit/gd/gdu/pkg-fun.nix} (100%) rename pkgs/{applications/editors/geany/with-vte.nix => unit/ge/geany-with-vte/pkg-fun.nix} (100%) rename pkgs/{applications/editors/geany/default.nix => unit/ge/geany/pkg-fun.nix} (100%) rename pkgs/{applications/misc/geek-life/default.nix => unit/ge/geek-life/pkg-fun.nix} (100%) rename pkgs/{tools/misc/geekbench/4.nix => unit/ge/geekbench4/pkg-fun.nix} (100%) rename pkgs/{tools/misc/geekbench/default.nix => unit/ge/geekbench5/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/geeqie/default.nix => unit/ge/geeqie/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gef/default.nix => unit/ge/gef/pkg-fun.nix} (100%) rename pkgs/{development/libraries/geis/default.nix => unit/ge/geis/pkg-fun.nix} (100%) rename pkgs/{data/fonts/gelasio/default.nix => unit/ge/gelasio/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pd-plugins/gem/default.nix => unit/ge/gem/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gemget/default.nix => unit/ge/gemget/pkg-fun.nix} (100%) rename pkgs/{games/gemrb/default.nix => unit/ge/gemrb/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ge}/gemstash/Gemfile (100%) rename pkgs/{development/tools => unit/ge}/gemstash/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ge}/gemstash/gemset.nix (100%) rename pkgs/{development/tools/gemstash/default.nix => unit/ge/gemstash/pkg-fun.nix} (100%) rename pkgs/{tools/security/gen-oath-safe/default.nix => unit/ge/gen-oath-safe/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gen6dns/default.nix => unit/ge/gen6dns/pkg-fun.nix} (100%) rename pkgs/{applications/misc/genact/default.nix => unit/ge/genact/pkg-fun.nix} (100%) rename pkgs/{development/libraries/genann/default.nix => unit/ge/genann/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/ge}/gencfsm/makefile-mkdir.patch (100%) rename pkgs/{tools/security/gencfsm/default.nix => unit/ge/gencfsm/pkg-fun.nix} (100%) rename pkgs/{common-updater/generic-updater.nix => unit/ge/genericUpdater/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/genext2fs/default.nix => unit/ge/genext2fs/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gengetopt/default.nix => unit/ge/gengetopt/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/genimage/default.nix => unit/ge/genimage/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology => unit/ge}/genmap/gtest.patch (100%) rename pkgs/{applications/science/biology/genmap/default.nix => unit/ge/genmap/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/genromfs/default.nix => unit/ge/genromfs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gensio/default.nix => unit/ge/gensio/pkg-fun.nix} (100%) rename pkgs/{data/fonts/gentium-book-basic/default.nix => unit/ge/gentium-book-basic/pkg-fun.nix} (100%) rename pkgs/{data/fonts/gentium/default.nix => unit/ge/gentium/pkg-fun.nix} (100%) rename pkgs/{applications/misc/genxword/default.nix => unit/ge/genxword/pkg-fun.nix} (100%) rename pkgs/{development/mobile/genymotion/default.nix => unit/ge/genymotion/pkg-fun.nix} (100%) rename pkgs/{development/libraries/geoclue => unit/ge/geoclue2}/add-option-for-installation-sysconfdir.patch (100%) rename pkgs/{development/libraries/geoclue/default.nix => unit/ge/geoclue2/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ge}/geocode-glib/installed-tests-path.patch (100%) rename pkgs/{development/libraries/geocode-glib/default.nix => unit/ge/geocode-glib/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/geogebra/default.nix => unit/ge/geogebra/pkg-fun.nix} (100%) rename pkgs/{development/libraries/geographiclib/default.nix => unit/ge/geographiclib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/geoipjava/default.nix => unit/ge/geoipjava/pkg-fun.nix} (100%) rename pkgs/{applications/misc/geoipupdate/default.nix => unit/ge/geoipupdate/pkg-fun.nix} (100%) rename pkgs/{data/misc/geolite-legacy/default.nix => unit/ge/geolite-legacy/pkg-fun.nix} (100%) rename pkgs/{applications/networking/gopher => unit/ge}/geomyidae/modification-time.patch (100%) rename pkgs/{applications/networking/gopher/geomyidae/default.nix => unit/ge/geomyidae/pkg-fun.nix} (100%) rename pkgs/{applications/audio/geonkick/default.nix => unit/ge/geonkick/pkg-fun.nix} (100%) rename pkgs/{development/libraries/geos/default.nix => unit/ge/geos/pkg-fun.nix} (100%) rename pkgs/{development/libraries/geos/3.9.nix => unit/ge/geos39/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/geoserver/default.nix => unit/ge/geoserver/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/gephi/default.nix => unit/ge/gephi/pkg-fun.nix} (100%) rename pkgs/{servers/gerbera/default.nix => unit/ge/gerbera/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/gerbil-crypto.nix (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/gerbil-ethereum.nix (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/gerbil-libp2p.nix (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/gerbil-persist.nix (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/gerbil-poo.nix (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/gerbil-utils.nix (100%) rename pkgs/{development/compilers/gerbil/gerbil-support.nix => unit/ge/gerbil-support/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gerbil => unit/ge/gerbil-support}/smug-gerbil.nix (100%) rename pkgs/{applications/science/electronics/gerbv/default.nix => unit/ge/gerbv/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/germinal/default.nix => unit/ge/germinal/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gerrit/default.nix => unit/ge/gerrit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/get_iplayer/default.nix => unit/ge/get_iplayer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/getdata/default.nix => unit/ge/getdata/pkg-fun.nix} (100%) rename pkgs/{tools/misc/geteltorito/default.nix => unit/ge/geteltorito/pkg-fun.nix} (100%) rename pkgs/{tools/networking/getmail6/default.nix => unit/ge/getmail6/pkg-fun.nix} (100%) rename pkgs/{tools/misc/getopt/default.nix => unit/ge/getopt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/getoptions/default.nix => unit/ge/getoptions/pkg-fun.nix} (100%) rename pkgs/{applications/misc/getxbook/default.nix => unit/ge/getxbook/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gex/default.nix => unit/ge/gex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gexiv2/default.nix => unit/ge/gexiv2/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/gf}/gf/build-use-optional-freetype-with-pkg-config.patch (100%) rename pkgs/{development/tools/misc/gf/default.nix => unit/gf/gf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gf2x/default.nix => unit/gf/gf2x/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/gf}/gfan/gfan-0.6.2-cddlib-prefix.patch (100%) rename pkgs/{applications/science/math/gfan/default.nix => unit/gf/gfan/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gfbgraph/default.nix => unit/gf/gfbgraph/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gflags/default.nix => unit/gf/gflags/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/gf}/gforth/boot-forth.nix (100%) rename pkgs/{development/compilers/gforth/default.nix => unit/gf/gforth/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/gf}/gforth/swig.nix (100%) rename pkgs/{tools/filesystems/gfs2-utils/default.nix => unit/gf/gfs2-utils/pkg-fun.nix} (100%) rename pkgs/{tools/security/gfshare/default.nix => unit/gf/gfshare/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/gfxreconstruct/default.nix => unit/gf/gfxreconstruct/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/gfxtablet/default.nix => unit/gf/gfxtablet/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gg/default.nix => unit/gg/gg-scm/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/ggobi/default.nix => unit/gg/ggobi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ggz_base_libs/default.nix => unit/gg/ggz_base_libs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gh-dash/default.nix => unit/gh/gh-dash/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gh-eco/default.nix => unit/gh/gh-eco/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gh-markdown-preview/default.nix => unit/gh/gh-markdown-preview/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gh-ost/default.nix => unit/gh/gh-ost/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gh/default.nix => unit/gh/gh/pkg-fun.nix} (100%) rename pkgs/{tools/backup/gh2md/default.nix => unit/gh/gh2md/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ghc_filesystem/default.nix => unit/gh/ghc_filesystem/pkg-fun.nix} (100%) rename pkgs/{tools/security/ghdorker/default.nix => unit/gh/ghdorker/pkg-fun.nix} (100%) rename pkgs/{tools/security/ghidra/default.nix => unit/gh/ghidra-bin/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/gh}/ghidra/0001-Use-protobuf-gradle-plugin.patch (100%) rename pkgs/{tools/security/ghidra/build.nix => unit/gh/ghidra/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/ghorg/default.nix => unit/gh/ghorg/pkg-fun.nix} (100%) rename pkgs/{tools/security/ghost/default.nix => unit/gh/ghost/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ghostie/default.nix => unit/gh/ghostie/pkg-fun.nix} (100%) rename pkgs/{misc => unit/gh}/ghostscript/doc-no-ref.diff (100%) rename pkgs/{misc/ghostscript/default.nix => unit/gh/ghostscript/pkg-fun.nix} (100%) rename pkgs/{misc => unit/gh}/ghostscript/test-corpus-render.nix (100%) rename pkgs/{misc => unit/gh}/ghostscript/urw-font-files.patch (100%) rename pkgs/{tools/networking/ghostunnel/default.nix => unit/gh/ghostunnel/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/ghq/default.nix => unit/gh/ghq/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/ghr/default.nix => unit/gh/ghr/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ghz/default.nix => unit/gh/ghz/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gImageReader/default.nix => unit/gi/gImageReader/pkg-fun.nix} (100%) rename pkgs/{development/tools/documentation/gi-docgen/default.nix => unit/gi/gi-docgen/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/giac/default.nix => unit/gi/giac/pkg-fun.nix} (100%) rename pkgs/{applications/audio/giada/default.nix => unit/gi/giada/pkg-fun.nix} (100%) rename pkgs/{applications/networking/giara/default.nix => unit/gi/giara/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gibo/default.nix => unit/gi/gibo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gif-for-cli/default.nix => unit/gi/gif-for-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gi}/giflib/4.1.nix (100%) rename pkgs/{development/libraries/giflib/default.nix => unit/gi/giflib/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/gifsicle/default.nix => unit/gi/gifsicle/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/gifski/default.nix => unit/gi/gifski/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/biology/gifticlib/default.nix => unit/gi/gifticlib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gigalixir/default.nix => unit/gi/gigalixir/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gigedit/default.nix => unit/gi/gigedit/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy => unit/gi}/gildas/aarch64.patch (100%) rename pkgs/{applications/science/astronomy => unit/gi}/gildas/clang.patch (100%) rename pkgs/{applications/science/astronomy/gildas/default.nix => unit/gi/gildas/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy => unit/gi}/gildas/python-ldflags.patch (100%) rename pkgs/{applications/science/astronomy => unit/gi}/gildas/wrapper.patch (100%) rename pkgs/{games => unit/gi}/gimx/conf.patch (100%) rename pkgs/{games => unit/gi}/gimx/custom/Dualshock4.xml (100%) rename pkgs/{games/gimx/default.nix => unit/gi/gimx/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/ginac/default.nix => unit/gi/ginac/pkg-fun.nix} (100%) rename pkgs/{development/tools/ginkgo/default.nix => unit/gi/ginkgo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gio-sharp/default.nix => unit/gi/gio-sharp/pkg-fun.nix} (100%) rename pkgs/{applications/video/giph/default.nix => unit/gi/giph/pkg-fun.nix} (100%) rename pkgs/{development/tools/gir/default.nix => unit/gi/gir-rs/pkg-fun.nix} (100%) rename pkgs/{tools/text/gist/default.nix => unit/gi/gist/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-aggregator/default.nix => unit/gi/git-aggregator/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-annex-remote-rclone/default.nix => unit/gi/git-annex-remote-rclone/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-annex-utils/default.nix => unit/gi/git-annex-utils/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-appraise/default.nix => unit/gi/git-appraise/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-big-picture/default.nix => unit/gi/git-big-picture/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-bug-migration/default.nix => unit/gi/git-bug-migration/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-bug/default.nix => unit/gi/git-bug/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-chglog/default.nix => unit/gi/git-chglog/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-codeowners/default.nix => unit/gi/git-codeowners/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-codereview/default.nix => unit/gi/git-codereview/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-cola/default.nix => unit/gi/git-cola/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-crecord/default.nix => unit/gi/git-crecord/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-credential-1password/default.nix => unit/gi/git-credential-1password/pkg-fun.nix} (100%) rename pkgs/{tools/security/gopass/git-credential.nix => unit/gi/git-credential-gopass/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-crypt/default.nix => unit/gi/git-crypt/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-delete-merged-branches/default.nix => unit/gi/git-delete-merged-branches/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-extras/default.nix => unit/gi/git-extras/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/gi}/git-fame/Gemfile (100%) rename pkgs/{applications/version-management => unit/gi}/git-fame/Gemfile.lock (100%) rename pkgs/{applications/version-management => unit/gi}/git-fame/gemset.nix (100%) rename pkgs/{applications/version-management/git-fame/default.nix => unit/gi/git-fame/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/fast-export/default.nix => unit/gi/git-fast-export/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-fire/default.nix => unit/gi/git-fire/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-ftp/default.nix => unit/gi/git-ftp/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-hound/default.nix => unit/gi/git-hound/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-hub/default.nix => unit/gi/git-hub/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-ignore/default.nix => unit/gi/git-ignore/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/git-latexdiff/default.nix => unit/gi/git-latexdiff/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting => unit/gi}/git-latexdiff/version-test.patch (100%) rename pkgs/{applications/version-management/git-my/default.nix => unit/gi/git-my/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-nomad/default.nix => unit/gi/git-nomad/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-octopus/default.nix => unit/gi/git-octopus/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-open/default.nix => unit/gi/git-open/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-privacy/default.nix => unit/gi/git-privacy/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-quick-stats/default.nix => unit/gi/git-quick-stats/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-radar/default.nix => unit/gi/git-radar/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-remote-gcrypt/default.nix => unit/gi/git-remote-gcrypt/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-remote-hg/default.nix => unit/gi/git-remote-hg/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-reparent/default.nix => unit/gi/git-reparent/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/gi}/git-repo/import-ssl-module.patch (100%) rename pkgs/{applications/version-management/git-repo/default.nix => unit/gi/git-repo/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-secret/default.nix => unit/gi/git-secret/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-secrets/default.nix => unit/gi/git-secrets/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-sizer/default.nix => unit/gi/git-sizer/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-standup/default.nix => unit/gi/git-standup/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-stree/default.nix => unit/gi/git-stree/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-subrepo/default.nix => unit/gi/git-subrepo/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-subtrac/default.nix => unit/gi/git-subtrac/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-sync/default.nix => unit/gi/git-sync/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-team/default.nix => unit/gi/git-team/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-test/default.nix => unit/gi/git-test/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-town/default.nix => unit/gi/git-town/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-vanity-hash/default.nix => unit/gi/git-vanity-hash/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-vendor/default.nix => unit/gi/git-vendor/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git-when-merged/default.nix => unit/gi/git-when-merged/pkg-fun.nix} (100%) rename pkgs/{development/libraries/git2-cpp/default.nix => unit/gi/git2-cpp/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/git2cl/default.nix => unit/gi/git2cl/pkg-fun.nix} (100%) rename pkgs/{common-updater/git-updater.nix => unit/gi/gitUpdater/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitlab => unit/gi}/gitaly/Gemfile (100%) rename pkgs/{applications/version-management/gitlab => unit/gi}/gitaly/Gemfile.lock (100%) rename pkgs/{applications/version-management/gitlab => unit/gi}/gitaly/gemset.nix (100%) rename pkgs/{applications/version-management/gitlab/gitaly/default.nix => unit/gi/gitaly/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitbatch/default.nix => unit/gi/gitbatch/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitflow/default.nix => unit/gi/gitflow/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/gitfs/default.nix => unit/gi/gitfs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/github-backup/default.nix => unit/gi/github-backup/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/gi}/github-changelog-generator/Gemfile (100%) rename pkgs/{development/tools => unit/gi}/github-changelog-generator/Gemfile.lock (100%) rename pkgs/{development/tools => unit/gi}/github-changelog-generator/gemset.nix (100%) rename pkgs/{development/tools/github-changelog-generator/default.nix => unit/gi/github-changelog-generator/pkg-fun.nix} (100%) rename pkgs/{development/tools/github-commenter/default.nix => unit/gi/github-commenter/pkg-fun.nix} (100%) rename pkgs/{development/tools/github/github-release/default.nix => unit/gi/github-release/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gitit/default.nix => unit/gi/gitit/pkg-fun.nix} (100%) rename pkgs/{tools/security/gitjacker/default.nix => unit/gi/gitjacker/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitkraken/default.nix => unit/gi/gitkraken/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/gitlab-clippy/default.nix => unit/gi/gitlab-clippy/pkg-fun.nix} (100%) rename pkgs/{servers/http/gitlab-pages/default.nix => unit/gi/gitlab-pages/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration => unit/gi}/gitlab-runner/fix-shell-path.patch (100%) rename pkgs/{development/tools/continuous-integration/gitlab-runner/default.nix => unit/gi/gitlab-runner/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration => unit/gi}/gitlab-runner/remove-bash-test.patch (100%) rename pkgs/{applications/version-management/gitlab/gitlab-shell/default.nix => unit/gi/gitlab-shell/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitlab => unit/gi}/gitlab-shell/remove-hardcoded-locations.patch (100%) rename pkgs/{applications/version-management => unit/gi}/gitlab-triage/Gemfile (100%) rename pkgs/{applications/version-management => unit/gi}/gitlab-triage/Gemfile.lock (100%) rename pkgs/{applications/version-management => unit/gi}/gitlab-triage/gemset.nix (100%) rename pkgs/{applications/version-management/gitlab-triage/default.nix => unit/gi/gitlab-triage/pkg-fun.nix} (100%) rename pkgs/{tools/security/gitleaks/default.nix => unit/gi/gitleaks/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitless/default.nix => unit/gi/gitless/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitls/default.nix => unit/gi/gitls/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitmux/default.nix => unit/gi/gitmux/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitnuro/default.nix => unit/gi/gitnuro/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitolite/default.nix => unit/gi/gitolite/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitprompt-rs/default.nix => unit/gi/gitprompt-rs/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitsign/default.nix => unit/gi/gitsign/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitstats/default.nix => unit/gi/gitstats/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitstatus/default.nix => unit/gi/gitstatus/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/gi}/gitstatus/romkatv_libgit2.nix (100%) rename pkgs/{applications/networking/instant-messengers/gitter/default.nix => unit/gi/gitter/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitty/default.nix => unit/gi/gitty/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gitweb/default.nix => unit/gi/gitweb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/givaro/default.nix => unit/gi/givaro/pkg-fun.nix} (100%) rename pkgs/{development/libraries/givaro/3.nix => unit/gi/givaro_3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/givaro/3.7.nix => unit/gi/givaro_3_7/pkg-fun.nix} (100%) rename pkgs/{tools/admin/gixy/default.nix => unit/gi/gixy/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gjay/default.nix => unit/gj/gjay/pkg-fun.nix} (100%) rename pkgs/{tools/text/gjo/default.nix => unit/gj/gjo/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gj}/gjs/fix-paths.patch (100%) rename pkgs/{development/libraries => unit/gj}/gjs/installed-tests-path.patch (100%) rename pkgs/{development/libraries/gjs/default.nix => unit/gj/gjs/pkg-fun.nix} (100%) rename pkgs/{tools/system/gkraken/default.nix => unit/gk/gkraken/pkg-fun.nix} (100%) rename pkgs/{games/gl-117/default.nix => unit/gl/gl117/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gl2ps/default.nix => unit/gl/gl2ps/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gl3w/default.nix => unit/gl/gl3w/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/glab/default.nix => unit/gl/glab/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/glabels/default.nix => unit/gl/glabels/pkg-fun.nix} (100%) rename pkgs/{development/tools/glade/default.nix => unit/gl/glade/pkg-fun.nix} (100%) rename pkgs/{data/fonts/glasstty-ttf/default.nix => unit/gl/glasstty-ttf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/glava/default.nix => unit/gl/glava/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glbinding/default.nix => unit/gl/glbinding/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gle/default.nix => unit/gl/gle/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/glee/default.nix => unit/gl/glee/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glfw/2.x.nix => unit/gl/glfw2/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gl}/glib-networking/hardcode-gsettings.patch (100%) rename pkgs/{development/libraries => unit/gl}/glib-networking/installed-tests-path.patch (100%) rename pkgs/{development/libraries/glib-networking/default.nix => unit/gl/glib-networking/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gl}/glib-testing/installed-tests-path.patch (100%) rename pkgs/{development/libraries/glib-testing/default.nix => unit/gl/glib-testing/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glibmm/default.nix => unit/gl/glibmm/pkg-fun.nix} (100%) rename pkgs/{development/tools/glide/default.nix => unit/gl/glide/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/glitter/default.nix => unit/gl/glitter/pkg-fun.nix} (100%) rename pkgs/{development/tools/gllvm/default.nix => unit/gl/gllvm/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gl}/glm/glm.pc.in (100%) rename pkgs/{development/libraries/glm/default.nix => unit/gl/glm/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/glmark2/default.nix => unit/gl/glmark2/pkg-fun.nix} (100%) rename pkgs/{development/tools/global-platform-pro/default.nix => unit/gl/global-platform-pro/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/global/default.nix => unit/gl/global/pkg-fun.nix} (100%) rename pkgs/{development/libraries/globalarrays/default.nix => unit/gl/globalarrays/pkg-fun.nix} (100%) rename pkgs/{applications/misc/globe-cli/default.nix => unit/gl/globe-cli/pkg-fun.nix} (100%) rename pkgs/{games/globulation => unit/gl/globulation2}/header-order.patch (100%) rename pkgs/{games/globulation/default.nix => unit/gl/globulation2/pkg-fun.nix} (100%) rename pkgs/{games/globulation => unit/gl/globulation2}/public-buildproject.patch (100%) rename pkgs/{development/tools => unit/gl}/glock/deps.nix (100%) rename pkgs/{development/tools/glock/default.nix => unit/gl/glock/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glog/default.nix => unit/gl/glog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/glom/default.nix => unit/gl/glom/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/glooctl/default.nix => unit/gl/glooctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gloox/default.nix => unit/gl/gloox/pkg-fun.nix} (100%) rename pkgs/{applications/editors/glow/default.nix => unit/gl/glow/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/glowing-bear/default.nix => unit/gl/glowing-bear/pkg-fun.nix} (100%) rename pkgs/{development/tools/glpaper/default.nix => unit/gl/glpaper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glpk/default.nix => unit/gl/glpk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glpng/default.nix => unit/gl/glpng/pkg-fun.nix} (100%) rename pkgs/{development/compilers/glslang/default.nix => unit/gl/glslang/pkg-fun.nix} (100%) rename pkgs/{games => unit/gl}/gltron/gentoo-prototypes.patch (100%) rename pkgs/{games/gltron/default.nix => unit/gl/gltron/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/glucose/syrup.nix => unit/gl/glucose-syrup/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/glucose/default.nix => unit/gl/glucose/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glui/default.nix => unit/gl/glui/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/glusterfs/default.nix => unit/gl/glusterfs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/gl}/glusterfs/ssl_cert_path.patch (100%) rename pkgs/{tools/graphics/glxinfo/default.nix => unit/gl/glxinfo/pkg-fun.nix} (100%) rename pkgs/{tools/audio/glyr/default.nix => unit/gl/glyr/pkg-fun.nix} (100%) rename pkgs/{games/gmad/default.nix => unit/gm/gmad/pkg-fun.nix} (100%) rename pkgs/{applications/networking/gmailctl/default.nix => unit/gm/gmailctl/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/gmic/default.nix => unit/gm/gmic/pkg-fun.nix} (100%) rename pkgs/{servers/gemini/gmid/default.nix => unit/gm/gmid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gmime/2.nix => unit/gm/gmime2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gmime/3.nix => unit/gm/gmime3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gmm/default.nix => unit/gm/gmm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/gmni/default.nix => unit/gm/gmni/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gmnitohtml/default.nix => unit/gm/gmnitohtml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gmp/4.3.2.nix => unit/gm/gmp4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gmp => unit/gm/gmp5}/5.1.3-CVE-2021-43618.patch (100%) rename pkgs/{development/libraries/gmp => unit/gm/gmp5}/need-size-t.patch (100%) rename pkgs/{development/libraries/gmp/5.1.x.nix => unit/gm/gmp5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gmp => unit/gm/gmp6}/6.2.1-CVE-2021-43618.patch (100%) rename pkgs/{development/libraries/gmp/6.x.nix => unit/gm/gmp6/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/gm}/gmpc/libmpd-11.8.17-remove-strndup.patch (100%) rename pkgs/{applications/audio/gmpc/default.nix => unit/gm/gmpc/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gmqcc/default.nix => unit/gm/gmqcc/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/gm}/gmrun/find-config-file-in-system-etc-dir.patch (100%) rename pkgs/{applications/misc => unit/gm}/gmrun/gcc43.patch (100%) rename pkgs/{applications/misc => unit/gm}/gmrun/gmrun-0.9.2-xdg.patch (100%) rename pkgs/{applications/misc/gmrun/default.nix => unit/gm/gmrun/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gm}/gmtk/fix-paths.patch (100%) rename pkgs/{development/libraries/gmtk/default.nix => unit/gm/gmtk/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gmtp/default.nix => unit/gm/gmtp/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gmu/default.nix => unit/gm/gmu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ada/gnatcoll/core.nix => unit/gn/gnatcoll-core/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gnaural/default.nix => unit/gn/gnaural/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gnet/default.nix => unit/gn/gnet/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gnirehtet/default.nix => unit/gn/gnirehtet/pkg-fun.nix} (100%) rename pkgs/{desktops/gnome/games/gnome-2048/default.nix => unit/gn/gnome-2048/pkg-fun.nix} (100%) rename pkgs/{desktops/gnome/extensions/gnome-browser-connector/default.nix => unit/gn/gnome-browser-connector/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/gn}/gnome-builder/fix-finding-test-typelibs.patch (100%) rename pkgs/{applications/editors/gnome-builder/default.nix => unit/gn/gnome-builder/pkg-fun.nix} (100%) rename pkgs/{desktops/gnome/apps/gnome-connections/default.nix => unit/gn/gnome-connections/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/gnome-console/default.nix => unit/gn/gnome-console/pkg-fun.nix} (100%) rename pkgs/{development/tools/gnome-desktop-testing/default.nix => unit/gn/gnome-desktop-testing/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gn}/gnome-desktop/bubblewrap-paths.patch (100%) rename pkgs/{development/libraries/gnome-desktop/default.nix => unit/gn/gnome-desktop/pkg-fun.nix} (100%) rename pkgs/{development/tools/documentation/gnome-doc-utils/default.nix => unit/gn/gnome-doc-utils/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-epub-thumbnailer/default.nix => unit/gn/gnome-epub-thumbnailer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-extension-manager/default.nix => unit/gn/gnome-extension-manager/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders => unit/gn}/gnome-feeds/listparser.nix (100%) rename pkgs/{applications/networking/feedreaders/gnome-feeds/default.nix => unit/gn/gnome-feeds/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-firmware/default.nix => unit/gn/gnome-firmware/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-frog/default.nix => unit/gn/gnome-frog/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/gn}/gnome-frog/update-compatible-with-non-flatpak-env.patch (100%) rename pkgs/{games/gnome-hexgl/default.nix => unit/gn/gnome-hexgl/pkg-fun.nix} (100%) rename pkgs/{data/icons/gnome-icon-theme/default.nix => unit/gn/gnome-icon-theme/pkg-fun.nix} (100%) rename pkgs/{applications/editors/gnome-inform7/default.nix => unit/gn/gnome-inform7/pkg-fun.nix} (100%) rename pkgs/{tools/security/gnome-keysign/default.nix => unit/gn/gnome-keysign/pkg-fun.nix} (100%) rename pkgs/{applications/editors/gnome-latex/default.nix => unit/gn/gnome-latex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gnome-menus/default.nix => unit/gn/gnome-menus/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-multi-writer/default.nix => unit/gn/gnome-multi-writer/pkg-fun.nix} (100%) rename pkgs/{applications/networking/gnome-network-displays/default.nix => unit/gn/gnome-network-displays/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gnome-online-accounts/default.nix => unit/gn/gnome-online-accounts/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/gn}/gnome-photos/installed-tests-path.patch (100%) rename pkgs/{applications/graphics/gnome-photos/default.nix => unit/gn/gnome-photos/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gnome-podcasts/default.nix => unit/gn/gnome-podcasts/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/gnome-randr/default.nix => unit/gn/gnome-randr/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-secrets/default.nix => unit/gn/gnome-secrets/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-solanum/default.nix => unit/gn/gnome-solanum/pkg-fun.nix} (100%) rename pkgs/{desktops/gnome/apps/gnome-text-editor/default.nix => unit/gn/gnome-text-editor/pkg-fun.nix} (100%) rename pkgs/{desktops/gnome/core/gnome-tour/default.nix => unit/gn/gnome-tour/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gnome-usage/default.nix => unit/gn/gnome-usage/pkg-fun.nix} (100%) rename pkgs/{data/documentation/gnome-user-docs/default.nix => unit/gn/gnome-user-docs/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gn}/gnome-video-effects/fix-pc-file.patch (100%) rename pkgs/{development/libraries/gnome-video-effects/default.nix => unit/gn/gnome-video-effects/pkg-fun.nix} (100%) rename pkgs/{applications/video/gnome-mplayer => unit/gn/gnome_mplayer}/fix-paths.patch (100%) rename pkgs/{applications/video/gnome-mplayer/default.nix => unit/gn/gnome_mplayer/pkg-fun.nix} (100%) rename pkgs/{applications/video/gnomecast/default.nix => unit/gn/gnomecast/pkg-fun.nix} (100%) rename pkgs/{games/gnonograms/default.nix => unit/gn/gnonograms/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gnostic/default.nix => unit/gn/gnostic/pkg-fun.nix} (100%) rename pkgs/{applications/radio => unit/gn}/gnss-sdr/fix_libcpu_features_install_path.patch (100%) rename pkgs/{applications/radio/gnss-sdr/default.nix => unit/gn/gnss-sdr/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gnu-cobol/default.nix => unit/gn/gnu-cobol/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gnu-config/default.nix => unit/gn/gnu-config/pkg-fun.nix} (100%) rename pkgs/{tools/security/gnu-pw-mgr/default.nix => unit/gn/gnu-pw-mgr/pkg-fun.nix} (100%) rename pkgs/{misc/gnu-shepherd/default.nix => unit/gn/gnu-shepherd/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gnu-smalltalk/default.nix => unit/gn/gnu-smalltalk/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/gnu-apl/default.nix => unit/gn/gnuapl/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/gnuastro/default.nix => unit/gn/gnuastro/pkg-fun.nix} (100%) rename pkgs/{games/gnubg/default.nix => unit/gn/gnubg/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/gnucap/default.nix => unit/gn/gnucap/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/gn}/gnucash/0001-disable-date-and-time-tests.patch (100%) rename pkgs/{applications/office => unit/gn}/gnucash/0002-disable-gnc-fq-update.patch (100%) rename pkgs/{applications/office => unit/gn}/gnucash/0003-remove-valgrind.patch (100%) rename pkgs/{applications/office => unit/gn}/gnucash/0004-exec-fq-helpers.patch (100%) rename pkgs/{applications/office/gnucash/default.nix => unit/gn/gnucash/pkg-fun.nix} (100%) rename pkgs/{games/gnuchess/default.nix => unit/gn/gnuchess/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/gnuclad/default.nix => unit/gn/gnuclad/pkg-fun.nix} (100%) rename pkgs/{games/gnugo/default.nix => unit/gn/gnugo/pkg-fun.nix} (100%) rename pkgs/{tools/text/gnugrep/default.nix => unit/gn/gnugrep/pkg-fun.nix} (100%) rename pkgs/{games => unit/gn}/gnujump/gnujump.xpm (100%) rename pkgs/{games/gnujump/default.nix => unit/gn/gnujump/pkg-fun.nix} (100%) rename pkgs/{development/tools/gnulib/default.nix => unit/gn/gnulib/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gnum4/default.nix => unit/gn/gnum4/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/gn}/gnumake/0001-No-impure-bin-sh.patch (100%) rename pkgs/{development/tools/build-managers => unit/gn}/gnumake/0002-remove-impure-dirs.patch (100%) rename pkgs/{development/tools/build-managers/gnumake/default.nix => unit/gn/gnumake/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/gnumake/4.2 => unit/gn/gnumake42}/glibc-2.27-glob.patch (100%) rename pkgs/{development/tools/build-managers/gnumake/4.2 => unit/gn/gnumake42}/glibc-2.33-glob.patch (100%) rename pkgs/{development/tools/build-managers/gnumake/4.2 => unit/gn/gnumake42}/impure-dirs.patch (100%) rename pkgs/{development/tools/build-managers/gnumake/4.2/default.nix => unit/gn/gnumake42/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/gnumake/4.2 => unit/gn/gnumake42}/pselect.patch (100%) rename pkgs/{applications/office/gnumeric/default.nix => unit/gn/gnumeric/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/gnunet/gtk.nix => unit/gn/gnunet-gtk/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/gnunet/default.nix => unit/gn/gnunet/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/gn}/gnupatch/Allow_input_files_to_be_missing_for_ed-style_patches.patch (100%) rename pkgs/{tools/text => unit/gn}/gnupatch/CVE-2018-1000156.patch (100%) rename pkgs/{tools/text => unit/gn}/gnupatch/CVE-2018-6951.patch (100%) rename pkgs/{tools/text => unit/gn}/gnupatch/CVE-2018-6952.patch (100%) rename pkgs/{tools/text => unit/gn}/gnupatch/CVE-2019-13636.patch (100%) rename pkgs/{tools/text => unit/gn}/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch (100%) rename pkgs/{tools/text/gnupatch/default.nix => unit/gn/gnupatch/pkg-fun.nix} (100%) rename pkgs/{tools/security/gnupg-pkcs11-scd/default.nix => unit/gn/gnupg-pkcs11-scd/pkg-fun.nix} (100%) rename pkgs/{tools/security/gnupg/1compat.nix => unit/gn/gnupg1compat/pkg-fun.nix} (100%) rename pkgs/{tools/security/gnupg/1.nix => unit/gn/gnupg1orig/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pth/default.nix => unit/gn/gnupth/pkg-fun.nix} (100%) rename pkgs/{tools/text/gnused/default.nix => unit/gn/gnused/pkg-fun.nix} (100%) rename pkgs/{games/gnushogi/default.nix => unit/gn/gnushogi/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/gnutar/default.nix => unit/gn/gnutar/pkg-fun.nix} (100%) rename pkgs/{applications/editors/neovim/gnvim/wrapper.nix => unit/gn/gnvim/pkg-fun.nix} (100%) rename pkgs/{tools/security/2fa/default.nix => unit/go/go-2fa/pkg-fun.nix} (100%) rename pkgs/{tools/system/go-audit/default.nix => unit/go/go-audit/pkg-fun.nix} (100%) rename pkgs/{servers/go-autoconfig/default.nix => unit/go/go-autoconfig/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-bindata-assetfs/default.nix => unit/go/go-bindata-assetfs/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-bindata/default.nix => unit/go/go-bindata/pkg-fun.nix} (100%) rename pkgs/{servers/http/go-camo/default.nix => unit/go/go-camo/pkg-fun.nix} (100%) rename pkgs/{development/tools/check/default.nix => unit/go/go-check/pkg-fun.nix} (100%) rename pkgs/{applications/video/go-chromecast/default.nix => unit/go/go-chromecast/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-containerregistry/default.nix => unit/go/go-containerregistry/pkg-fun.nix} (100%) rename pkgs/{servers/go-cqhttp/default.nix => unit/go/go-cqhttp/pkg-fun.nix} (100%) rename pkgs/{tools/security/go-cve-search/default.nix => unit/go/go-cve-search/pkg-fun.nix} (100%) rename pkgs/{development/tools/gdm => unit/go/go-dependency-manager}/deps.nix (100%) rename pkgs/{development/tools/gdm/default.nix => unit/go/go-dependency-manager/pkg-fun.nix} (100%) rename pkgs/{data/fonts/go-font/default.nix => unit/go/go-font/pkg-fun.nix} (100%) rename pkgs/{applications/networking/go-graft/default.nix => unit/go/go-graft/pkg-fun.nix} (100%) rename pkgs/{applications/misc/go-jira/default.nix => unit/go/go-jira/pkg-fun.nix} (100%) rename pkgs/{development/compilers/go-jsonnet/default.nix => unit/go/go-jsonnet/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-junit-report/default.nix => unit/go/go-junit-report/pkg-fun.nix} (100%) rename pkgs/{servers/go-libp2p-daemon/default.nix => unit/go/go-libp2p-daemon/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/go-license-detector/default.nix => unit/go/go-license-detector/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/go-md2man/default.nix => unit/go/go-md2man/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-migrate/default.nix => unit/go/go-migrate/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-minimock/default.nix => unit/go/go-minimock/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-mockery/default.nix => unit/go/go-mockery/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-motion/default.nix => unit/go/go-motion/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/go-mtpfs/default.nix => unit/go/go-mtpfs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/go-neb/default.nix => unit/go/go-neb/pkg-fun.nix} (100%) rename pkgs/{applications/misc/go-org/default.nix => unit/go/go-org/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-outline/default.nix => unit/go/go-outline/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-protobuf/default.nix => unit/go/go-protobuf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/go.rice/default.nix => unit/go/go-rice/pkg-fun.nix} (100%) rename pkgs/{tools/X11/go-sct/default.nix => unit/go/go-sct/pkg-fun.nix} (100%) rename pkgs/{tools/networking/go-shadowsocks2/default.nix => unit/go/go-shadowsocks2/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-swag/default.nix => unit/go/go-swag/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-swagger/default.nix => unit/go/go-swagger/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/go}/go-symbols/deps.nix (100%) rename pkgs/{development/tools/go-symbols/default.nix => unit/go/go-symbols/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-task/default.nix => unit/go/go-task/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-toml/default.nix => unit/go/go-toml/pkg-fun.nix} (100%) rename pkgs/{development/tools/go-tools/default.nix => unit/go/go-tools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/upower-notify => unit/go/go-upower-notify}/deps.nix (100%) rename pkgs/{tools/misc/upower-notify/default.nix => unit/go/go-upower-notify/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/go}/go2nix/deps.nix (100%) rename pkgs/{development/tools/go2nix/default.nix => unit/go/go2nix/pkg-fun.nix} (100%) rename pkgs/{tools/security/go365/default.nix => unit/go/go365/pkg-fun.nix} (100%) rename pkgs/{development/tools/goa/default.nix => unit/go/goa/pkg-fun.nix} (100%) rename pkgs/{tools/misc/goaccess/default.nix => unit/go/goaccess/pkg-fun.nix} (100%) rename pkgs/{tools/text/goawk/default.nix => unit/go/goawk/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gob2/default.nix => unit/go/gob2/pkg-fun.nix} (100%) rename pkgs/{applications/editors/gobby/default.nix => unit/go/gobby/pkg-fun.nix} (100%) rename pkgs/{servers => unit/go}/gobetween/gomod.patch (100%) rename pkgs/{servers/gobetween/default.nix => unit/go/gobetween/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gobgp/default.nix => unit/go/gobgp/pkg-fun.nix} (100%) rename pkgs/{servers/misc/gobgpd/default.nix => unit/go/gobgpd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/gobi_loader/default.nix => unit/go/gobi_loader/pkg-fun.nix} (100%) rename pkgs/{tools/security/gobuster/default.nix => unit/go/gobuster/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/gocd-agent/default.nix => unit/go/gocd-agent/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/gocd-server/default.nix => unit/go/gocd-server/pkg-fun.nix} (100%) rename pkgs/{development/tools/gocode-gomod/default.nix => unit/go/gocode-gomod/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/go}/gocode/deps.nix (100%) rename pkgs/{development/tools/gocode/default.nix => unit/go/gocode/pkg-fun.nix} (100%) rename pkgs/{development/tools/goconst/default.nix => unit/go/goconst/pkg-fun.nix} (100%) rename pkgs/{development/tools/goconvey/default.nix => unit/go/goconvey/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/gocr/default.nix => unit/go/gocr/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/gocryptfs/default.nix => unit/go/gocryptfs/pkg-fun.nix} (100%) rename pkgs/{development/tools/gocyclo/default.nix => unit/go/gocyclo/pkg-fun.nix} (100%) rename pkgs/{development/tools/goda/default.nix => unit/go/goda/pkg-fun.nix} (100%) rename pkgs/{development/tools/godef/default.nix => unit/go/godef/pkg-fun.nix} (100%) rename pkgs/{tools/networking/godns/default.nix => unit/go/godns/pkg-fun.nix} (100%) rename pkgs/{development/tools/godot/3/export-templates.nix => unit/go/godot-export-templates/pkg-fun.nix} (100%) rename pkgs/{development/tools/godot/3/headless.nix => unit/go/godot-headless/pkg-fun.nix} (100%) rename pkgs/{development/tools/godot/3/server.nix => unit/go/godot-server/pkg-fun.nix} (100%) rename pkgs/{development/tools/godot/3 => unit/go/godot}/dont_clobber_environment.patch (100%) rename pkgs/{development/tools/godot/3/default.nix => unit/go/godot/pkg-fun.nix} (100%) rename pkgs/{development/tools/godot/3 => unit/go/godot}/pkg_config_additions.patch (100%) rename pkgs/{development/tools/godot/4/default.nix => unit/go/godot_4/pkg-fun.nix} (100%) rename pkgs/{development/tools/godot/4 => unit/go/godot_4}/xfixes.patch (100%) rename pkgs/{tools/networking/godspeed/default.nix => unit/go/godspeed/pkg-fun.nix} (100%) rename pkgs/{tools/misc/godu/default.nix => unit/go/godu/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/goeland/default.nix => unit/go/goeland/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gof5/default.nix => unit/go/gof5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/goffice/default.nix => unit/go/goffice/pkg-fun.nix} (100%) rename pkgs/{servers/gopher/gofish/default.nix => unit/go/gofish/pkg-fun.nix} (100%) rename pkgs/{tools/networking/goflow/default.nix => unit/go/goflow/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gofu/default.nix => unit/go/gofu/pkg-fun.nix} (100%) rename pkgs/{development/tools/gofumpt/default.nix => unit/go/gofumpt/pkg-fun.nix} (100%) rename pkgs/{development/tools/gogetdoc/default.nix => unit/go/gogetdoc/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gogs/default.nix => unit/go/gogs/pkg-fun.nix} (100%) rename pkgs/{games/gogui/default.nix => unit/go/gogui/pkg-fun.nix} (100%) rename pkgs/{tools/system/gohai/default.nix => unit/go/gohai/pkg-fun.nix} (100%) rename pkgs/{data/fonts/gohufont/default.nix => unit/go/gohufont/pkg-fun.nix} (100%) rename pkgs/{tools/networking/goimapnotify/default.nix => unit/go/goimapnotify/pkg-fun.nix} (100%) rename pkgs/{development/tools/gojq/default.nix => unit/go/gojq/pkg-fun.nix} (100%) rename pkgs/{development/tools/gojsontoyaml/default.nix => unit/go/gojsontoyaml/pkg-fun.nix} (100%) rename pkgs/{development/tools/gokart/default.nix => unit/go/gokart/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/goku/default.nix => unit/go/goku/pkg-fun.nix} (100%) rename pkgs/{development/tools/golangci-lint-langserver/default.nix => unit/go/golangci-lint-langserver/pkg-fun.nix} (100%) rename pkgs/{development/tools/golangci-lint/default.nix => unit/go/golangci-lint/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/go}/goldberg-emu/dont-install-unsupported.patch (100%) rename pkgs/{applications/emulators/goldberg-emu/default.nix => unit/go/goldberg-emu/pkg-fun.nix} (100%) rename pkgs/{development/tools/golines/default.nix => unit/go/golines/pkg-fun.nix} (100%) rename pkgs/{development/tools/golint/default.nix => unit/go/golint/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/go}/gollum/Gemfile (100%) rename pkgs/{applications/misc => unit/go}/gollum/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/go}/gollum/gemset.nix (100%) rename pkgs/{applications/misc/gollum/default.nix => unit/go/gollum/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/go}/gom/longer-stress-timeout.patch (100%) rename pkgs/{development/libraries/gom/default.nix => unit/go/gom/pkg-fun.nix} (100%) rename pkgs/{development/tools/gomacro/default.nix => unit/go/gomacro/pkg-fun.nix} (100%) rename pkgs/{tools/security/gomapenum/default.nix => unit/go/gomapenum/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gomatrix/default.nix => unit/go/gomatrix/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gometer/default.nix => unit/go/gometer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gomi/default.nix => unit/go/gomi/pkg-fun.nix} (100%) rename pkgs/{development/mobile/gomobile/default.nix => unit/go/gomobile/pkg-fun.nix} (100%) rename pkgs/{development/tools/gomodifytags/default.nix => unit/go/gomodifytags/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gomp/default.nix => unit/go/gomp/pkg-fun.nix} (100%) rename pkgs/{development/tools/gomplate/default.nix => unit/go/gomplate/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/gomuks/default.nix => unit/go/gomuks/pkg-fun.nix} (100%) rename pkgs/{servers/gonic/default.nix => unit/go/gonic/pkg-fun.nix} (100%) rename pkgs/{development/libraries/goocanvas/default.nix => unit/go/goocanvas/pkg-fun.nix} (100%) rename pkgs/{development/libraries/goocanvas/2.x.nix => unit/go/goocanvas2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/goocanvas/3.x.nix => unit/go/goocanvas3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/goocanvasmm/default.nix => unit/go/goocanvasmm2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/goodvibes/default.nix => unit/go/goodvibes/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/goofys/default.nix => unit/go/goofys/pkg-fun.nix} (100%) rename pkgs/{development/tools/google-app-engine-go-sdk/default.nix => unit/go/google-app-engine-go-sdk/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/google-authenticator/default.nix => unit/go/google-authenticator/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/google-chrome/default.nix => unit/go/google-chrome/pkg-fun.nix} (100%) rename pkgs/{development/libraries/google-cloud-cpp/default.nix => unit/go/google-cloud-cpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/go}/google-cloud-cpp/skipped_tests.toml (100%) rename pkgs/{data/fonts/google-fonts/default.nix => unit/go/google-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization => unit/go}/google-guest-agent/disable-etc-mutation.patch (100%) rename pkgs/{tools/virtualization => unit/go}/google-guest-agent/fix-paths.patch (100%) rename pkgs/{tools/virtualization/google-guest-agent/default.nix => unit/go/google-guest-agent/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization => unit/go}/google-guest-configs/fix-paths.patch (100%) rename pkgs/{tools/virtualization/google-guest-configs/default.nix => unit/go/google-guest-configs/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/google-guest-oslogin/default.nix => unit/go/google-guest-oslogin/pkg-fun.nix} (100%) rename pkgs/{development/tools/google-java-format/default.nix => unit/go/google-java-format/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gopacked/default.nix => unit/go/gopacked/pkg-fun.nix} (100%) rename pkgs/{tools/security/gopass/hibp.nix => unit/go/gopass-hibp/pkg-fun.nix} (100%) rename pkgs/{tools/security/gopass/jsonapi.nix => unit/go/gopass-jsonapi/pkg-fun.nix} (100%) rename pkgs/{tools/security/gopass/summon.nix => unit/go/gopass-summon-provider/pkg-fun.nix} (100%) rename pkgs/{tools/security/gopass/default.nix => unit/go/gopass/pkg-fun.nix} (100%) rename pkgs/{applications/networking/gopher/gopher/default.nix => unit/go/gopher/pkg-fun.nix} (100%) rename pkgs/{applications/editors/gophernotes/default.nix => unit/go/gophernotes/pkg-fun.nix} (100%) rename pkgs/{development/tools/gopkgs/default.nix => unit/go/gopkgs/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/gopls/default.nix => unit/go/gopls/pkg-fun.nix} (100%) rename pkgs/{tools/video/gopro/default.nix => unit/go/gopro/pkg-fun.nix} (100%) rename pkgs/{development/tools/gops/default.nix => unit/go/gops/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/go}/gopsuinfo/no_bin_install.patch (100%) rename pkgs/{tools/system/gopsuinfo/default.nix => unit/go/gopsuinfo/pkg-fun.nix} (100%) rename pkgs/{development/tools/gore/default.nix => unit/go/gore/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/go}/goredo/fix-tests.diff (100%) rename pkgs/{development/tools/build-managers/goredo/default.nix => unit/go/goredo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/goreleaser/default.nix => unit/go/goreleaser/pkg-fun.nix} (100%) rename pkgs/{tools/system/goreman/default.nix => unit/go/goreman/pkg-fun.nix} (100%) rename pkgs/{tools/networking/goreplay/default.nix => unit/go/goreplay/pkg-fun.nix} (100%) rename pkgs/{development/tools/goresym/default.nix => unit/go/goresym/pkg-fun.nix} (100%) rename pkgs/{tools/security/gorilla-bin/default.nix => unit/go/gorilla-bin/pkg-fun.nix} (100%) rename pkgs/{servers/gortr/default.nix => unit/go/gortr/pkg-fun.nix} (100%) rename pkgs/{development/tools/gosec/default.nix => unit/go/gosec/pkg-fun.nix} (100%) rename pkgs/{tools/security/gosh/default.nix => unit/go/gosh/pkg-fun.nix} (100%) rename pkgs/{tools/security/gospider/default.nix => unit/go/gospider/pkg-fun.nix} (100%) rename pkgs/{tools/misc/goss/default.nix => unit/go/goss/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gost/default.nix => unit/go/gost/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gostatic/default.nix => unit/go/gostatic/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gosu/default.nix => unit/go/gosu/pkg-fun.nix} (100%) rename pkgs/{development/tools/gotags/default.nix => unit/go/gotags/pkg-fun.nix} (100%) rename pkgs/{development/tools/gotest/default.nix => unit/go/gotest/pkg-fun.nix} (100%) rename pkgs/{development/tools/gotestfmt/default.nix => unit/go/gotestfmt/pkg-fun.nix} (100%) rename pkgs/{development/tools/gotests/default.nix => unit/go/gotests/pkg-fun.nix} (100%) rename pkgs/{development/tools/gotestsum/default.nix => unit/go/gotestsum/pkg-fun.nix} (100%) rename pkgs/{tools/security/gotestwaf/default.nix => unit/go/gotestwaf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gotify-cli/default.nix => unit/go/gotify-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gotify-desktop/default.nix => unit/go/gotify-desktop/pkg-fun.nix} (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/package.json (100%) rename pkgs/{servers/gotify/default.nix => unit/go/gotify-server/pkg-fun.nix} (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/source-sha.nix (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/ui.nix (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/update.sh (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/vendor-sha.nix (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/version.nix (100%) rename pkgs/{servers/gotify => unit/go/gotify-server}/yarndeps.nix (100%) rename pkgs/{applications/networking/instant-messengers/gotktrix/default.nix => unit/go/gotktrix/pkg-fun.nix} (100%) rename pkgs/{development/tools/gotools/default.nix => unit/go/gotools/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/go}/gotools/setup-hook.sh (100%) rename pkgs/{tools/security/gotrue/supabase.nix => unit/go/gotrue-supabase/pkg-fun.nix} (100%) rename pkgs/{tools/security/gotrue/default.nix => unit/go/gotrue/pkg-fun.nix} (100%) rename pkgs/{servers/gotty/default.nix => unit/go/gotty/pkg-fun.nix} (100%) rename pkgs/{games/gotypist/default.nix => unit/go/gotypist/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gource/default.nix => unit/go/gource/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/govc/default.nix => unit/go/govc/pkg-fun.nix} (100%) rename pkgs/{development/tools/govendor/default.nix => unit/go/govendor/pkg-fun.nix} (100%) rename pkgs/{development/tools/govers/default.nix => unit/go/govers/pkg-fun.nix} (100%) rename pkgs/{tools/security/govulncheck/default.nix => unit/go/govulncheck/pkg-fun.nix} (100%) rename pkgs/{tools/security/gowitness/default.nix => unit/go/gowitness/pkg-fun.nix} (100%) rename pkgs/{development/tools/gox/default.nix => unit/go/gox/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/go}/goxel/disable-imgui_ini.patch (100%) rename pkgs/{applications/graphics/goxel/default.nix => unit/go/goxel/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/pari/gp2c.nix => unit/gp/gp2c/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gpa/default.nix => unit/gp/gpa/pkg-fun.nix} (100%) rename pkgs/{applications/video/gpac/default.nix => unit/gp/gpac/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/gpart/default.nix => unit/gp/gpart/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gparted/default.nix => unit/gp/gparted/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/gp}/gparted/polkit.patch (100%) rename pkgs/{development/tools/misc/gperf/default.nix => unit/gp/gperf/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gperf => unit/gp/gperf_3_0}/gperf-ar-fix.patch (100%) rename pkgs/{development/tools/misc/gperf/3.0.x.nix => unit/gp/gperf_3_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gperftools/default.nix => unit/gp/gperftools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gpg-mdp/default.nix => unit/gp/gpg-mdp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gphoto2/default.nix => unit/gp/gphoto2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gphoto2/gphotofs.nix => unit/gp/gphoto2fs/pkg-fun.nix} (100%) rename pkgs/{tools/backup/gphotos-sync/default.nix => unit/gp/gphotos-sync/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/gp}/gphotos-sync/skip-network-tests.patch (100%) rename pkgs/{tools/misc => unit/gp}/gpick/dot-version.patch (100%) rename pkgs/{tools/misc/gpick/default.nix => unit/gp/gpick/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kernel/gpio-utils.nix => unit/gp/gpio-utils/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/gp}/gpodder/disable-autoupdate.patch (100%) rename pkgs/{applications/audio/gpodder/default.nix => unit/gp/gpodder/pkg-fun.nix} (100%) rename pkgs/{development/tools/gpp/default.nix => unit/gp/gpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/gprbuild => unit/gp/gprbuild-boot}/gpr-project-path-hook.sh (100%) rename pkgs/{development/tools/build-managers/gprbuild => unit/gp/gprbuild-boot}/nixpkgs-gnat.xml (100%) rename pkgs/{development/tools/build-managers/gprbuild/boot.nix => unit/gp/gprbuild-boot/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/gprbuild/default.nix => unit/gp/gprbuild/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/gprojector/default.nix => unit/gp/gprojector/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gprolog/default.nix => unit/gp/gprolog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gpscorrelate/default.nix => unit/gp/gpscorrelate/pkg-fun.nix} (100%) rename pkgs/{servers/gpsd/default.nix => unit/gp/gpsd/pkg-fun.nix} (100%) rename pkgs/{servers => unit/gp}/gpsd/sconstruct-env-fixes.patch (100%) rename pkgs/{applications/misc/gpsprune/default.nix => unit/gp/gpsprune/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/gp}/gpt2tc/0001-add-python-shebang.patch (100%) rename pkgs/{tools/text/gpt2tc/default.nix => unit/gp/gpt2tc/pkg-fun.nix} (100%) rename pkgs/{tools/system/gptfdisk/default.nix => unit/gp/gptfdisk/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/gp}/gptfdisk/popt-1-19.patch (100%) rename pkgs/{tools/system => unit/gp}/gptfdisk/uuid.patch (100%) rename pkgs/{tools/system/gptman/default.nix => unit/gp/gptman/pkg-fun.nix} (100%) rename pkgs/{applications/video/gpu-screen-recorder => unit/gp/gpu-screen-recorder-gtk}/fix-nvfbc-check.patch (100%) rename pkgs/{applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix => unit/gp/gpu-screen-recorder-gtk/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/gpu-switch/default.nix => unit/gp/gpu-switch/pkg-fun.nix} (100%) rename pkgs/{development/embedded/gputils/default.nix => unit/gp/gputils/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gpuvis/default.nix => unit/gp/gpuvis/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gpx-viewer/default.nix => unit/gp/gpx-viewer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gpx/default.nix => unit/gp/gpx/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/gqview/default.nix => unit/gq/gqview/pkg-fun.nix} (100%) rename pkgs/{tools/backup/grab-site/default.nix => unit/gr/grab-site/pkg-fun.nix} (100%) rename pkgs/{development/tools/grabserial/default.nix => unit/gr/grabserial/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/gradle-completion/default.nix => unit/gr/gradle-completion/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/gradm/default.nix => unit/gr/gradm/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/grafana-agent/default.nix => unit/gr/grafana-agent/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/gr}/grafana-image-renderer/package.json (100%) rename pkgs/{servers/monitoring/grafana-image-renderer/default.nix => unit/gr/grafana-image-renderer/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/gr}/grafana-image-renderer/yarn.lock (100%) rename pkgs/{servers/monitoring => unit/gr}/grafana-image-renderer/yarn.nix (100%) rename pkgs/{servers/monitoring/loki/default.nix => unit/gr/grafana-loki/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/grafana/default.nix => unit/gr/grafana/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/gr}/grafana/update.sh (100%) rename pkgs/{servers/monitoring/grafana-reporter/default.nix => unit/gr/grafana_reporter/pkg-fun.nix} (100%) rename pkgs/{tools/misc/grafterm/default.nix => unit/gr/grafterm/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/grafx2/default.nix => unit/gr/grafx2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/grail/default.nix => unit/gr/grail/pkg-fun.nix} (100%) rename pkgs/{development/libraries/grantlee/default.nix => unit/gr/grantlee/pkg-fun.nix} (100%) rename pkgs/{tools/security/grap/default.nix => unit/gr/grap/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/graph-cli/default.nix => unit/gr/graph-cli/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/graph-easy/default.nix => unit/gr/graph-easy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/graphene-hardened-malloc/default.nix => unit/gr/graphene-hardened-malloc/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gr}/graphene/0001-meson-add-options-for-tests-installation-dirs.patch (100%) rename pkgs/{development/libraries/graphene/default.nix => unit/gr/graphene/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/graphicsmagick/compat.nix => unit/gr/graphicsmagick-imagemagick-compat/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/gr}/graphicsmagick/disable-popen.patch (100%) rename pkgs/{applications/graphics/graphicsmagick/default.nix => unit/gr/graphicsmagick/pkg-fun.nix} (100%) rename pkgs/{tools/security/graphinder/default.nix => unit/gr/graphinder/pkg-fun.nix} (100%) rename pkgs/{data/themes/graphite-gtk-theme/default.nix => unit/gr/graphite-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/graphite-kde-theme/default.nix => unit/gr/graphite-kde-theme/pkg-fun.nix} (100%) rename pkgs/{development/libraries/silgraphite => unit/gr/graphite2}/macosx.patch (100%) rename pkgs/{development/libraries/silgraphite/graphite2.nix => unit/gr/graphite2/pkg-fun.nix} (100%) rename pkgs/{tools/security/graphqlmap/default.nix => unit/gr/graphqlmap/pkg-fun.nix} (100%) rename pkgs/{data/misc/graphs/default.nix => unit/gr/graphs/pkg-fun.nix} (100%) rename pkgs/{tools/security/graphw00f/default.nix => unit/gr/graphw00f/pkg-fun.nix} (100%) rename pkgs/{games/graphwar/default.nix => unit/gr/graphwar/pkg-fun.nix} (100%) rename pkgs/{applications/gis => unit/gr}/grass/no_symbolic_links.patch (100%) rename pkgs/{applications/gis/grass/default.nix => unit/gr/grass/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/gravit/default.nix => unit/gr/gravit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/graylog/default.nix => unit/gr/graylog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/grb/default.nix => unit/gr/grb/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/grcov/default.nix => unit/gr/grcov/pkg-fun.nix} (100%) rename pkgs/{applications/search/grepcidr/default.nix => unit/gr/grepcidr/pkg-fun.nix} (100%) rename pkgs/{applications/search/grepm/default.nix => unit/gr/grepm/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/gretl/default.nix => unit/gr/gretl/pkg-fun.nix} (100%) rename pkgs/{data/themes/greybird/default.nix => unit/gr/greybird/pkg-fun.nix} (100%) rename pkgs/{applications/radio/gridtracker/default.nix => unit/gr/gridtracker/pkg-fun.nix} (100%) rename pkgs/{applications/radio/grig/default.nix => unit/gr/grig/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gr}/grilo-plugins/chromaprint-gst-plugins.patch (100%) rename pkgs/{development/libraries/grilo-plugins/default.nix => unit/gr/grilo-plugins/pkg-fun.nix} (100%) rename pkgs/{development/libraries/grilo/default.nix => unit/gr/grilo/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gr}/grilo/setup-hook.sh (100%) rename pkgs/{tools/graphics/grim/default.nix => unit/gr/grim/pkg-fun.nix} (100%) rename pkgs/{tools/text/grin/default.nix => unit/gr/grin/pkg-fun.nix} (100%) rename pkgs/{tools/text/grip-search/default.nix => unit/gr/grip-search/pkg-fun.nix} (100%) rename pkgs/{applications/misc/grip/default.nix => unit/gr/grip/pkg-fun.nix} (100%) rename pkgs/{tools/misc/grit/default.nix => unit/gr/grit/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/grive2/default.nix => unit/gr/grive2/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/grml-zsh-config/default.nix => unit/gr/grml-zsh-config/pkg-fun.nix} (100%) rename pkgs/{tools/X11/grobi/default.nix => unit/gr/grobi/pkg-fun.nix} (100%) rename pkgs/{servers => unit/gr}/grocy/0001-Define-configs-with-env-vars.patch (100%) rename pkgs/{servers => unit/gr}/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch (100%) rename pkgs/{servers/grocy/default.nix => unit/gr/grocy/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/gr}/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch (100%) rename pkgs/{tools/text/groff/default.nix => unit/gr/groff/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/gr}/groff/site.tmac (100%) rename pkgs/{development/tools/gron/default.nix => unit/gr/gron/pkg-fun.nix} (100%) rename pkgs/{servers/search/groonga/default.nix => unit/gr/groonga/pkg-fun.nix} (100%) rename pkgs/{applications/science/programming/groove/default.nix => unit/gr/groove/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/groovy/default.nix => unit/gr/groovy/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/grpc-client-cli/default.nix => unit/gr/grpc-client-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/grpc-gateway/default.nix => unit/gr/grpc-gateway/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/grpc-tools/default.nix => unit/gr/grpc-tools/pkg-fun.nix} (100%) rename pkgs/{tools/networking/grpcui/default.nix => unit/gr/grpcui/pkg-fun.nix} (100%) rename pkgs/{tools/networking/grpcurl/default.nix => unit/gr/grpcurl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/grsync/default.nix => unit/gr/grsync/pkg-fun.nix} (100%) rename pkgs/{tools/misc/grub/pvgrub_image => unit/gr/grub2_pvgrub_image}/configs/grub-bootstrap.cfg (100%) rename pkgs/{tools/misc/grub/pvgrub_image => unit/gr/grub2_pvgrub_image}/configs/grub.cfg (100%) rename pkgs/{tools/misc/grub/pvgrub_image/default.nix => unit/gr/grub2_pvgrub_image/pkg-fun.nix} (100%) rename pkgs/{data/themes/gruvbox-dark-gtk/default.nix => unit/gr/gruvbox-dark-gtk/pkg-fun.nix} (100%) rename pkgs/{data/themes/gruvbox-gtk-theme/default.nix => unit/gr/gruvbox-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{tools/security/grype/default.nix => unit/gr/grype/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gs}/gsasl/gsasl.patch (100%) rename pkgs/{development/libraries/gsasl/default.nix => unit/gs/gsasl/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/gs}/gscan2pdf/ffmpeg5-compat.patch (100%) rename pkgs/{applications/graphics/gscan2pdf/default.nix => unit/gs/gscan2pdf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gsctl/default.nix => unit/gs/gsctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gsettings-desktop-schemas/default.nix => unit/gs/gsettings-desktop-schemas/pkg-fun.nix} (100%) rename pkgs/{applications/gis/gmt/gshhg.nix => unit/gs/gshhg-gmt/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gsimplecal/default.nix => unit/gs/gsimplecal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gsl-lite/default.nix => unit/gs/gsl-lite/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gsl/default.nix => unit/gs/gsl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gsm/default.nix => unit/gs/gsm/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/gs}/gsmartcontrol/fix-paths.patch (100%) rename pkgs/{tools/misc/gsmartcontrol/default.nix => unit/gs/gsmartcontrol/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gsoap/default.nix => unit/gs/gsoap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gsound/default.nix => unit/gs/gsound/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gspeech/default.nix => unit/gs/gspeech/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gs}/gspell/0001-Darwin-build-fix.patch (100%) rename pkgs/{development/libraries/gspell/default.nix => unit/gs/gspell/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gss/default.nix => unit/gs/gss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gssdp/tools.nix => unit/gs/gssdp-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gssdp => unit/gs/gssdp-tools}/standalone-tools.patch (100%) rename pkgs/{development/libraries/gssdp/default.nix => unit/gs/gssdp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gssdp/1.6.nix => unit/gs/gssdp_1_6/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/gst/default.nix => unit/gs/gst/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/gt/default.nix => unit/gt/gt/pkg-fun.nix} (100%) rename pkgs/{tools/system/gt5/default.nix => unit/gt/gt5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtdialog/default.nix => unit/gt/gtdialog/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gt}/gtest/fix-cmake-config-includedir.patch (100%) rename pkgs/{development/libraries/gtest/default.nix => unit/gt/gtest/pkg-fun.nix} (100%) rename pkgs/{applications/office/gtg/default.nix => unit/gt/gtg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gthree/default.nix => unit/gt/gthree/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/gthumb/default.nix => unit/gt/gthumb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gti/default.nix => unit/gt/gti/pkg-fun.nix} (100%) rename pkgs/{development/tools/documentation/gtk-doc/default.nix => unit/gt/gtk-doc/pkg-fun.nix} (100%) rename pkgs/{development/tools/documentation => unit/gt}/gtk-doc/respect-xml-catalog-files-var.patch (100%) rename pkgs/{development/libraries/gtk-engine-bluecurve/default.nix => unit/gt/gtk-engine-bluecurve/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtk-engine-murrine/default.nix => unit/gt/gtk-engine-murrine/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtk-frdp/default.nix => unit/gt/gtk-frdp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtk-layer-shell/default.nix => unit/gt/gtk-layer-shell/pkg-fun.nix} (100%) rename pkgs/{development/tools/gtk-mac-bundler/default.nix => unit/gt/gtk-mac-bundler/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/gtk-server/default.nix => unit/gt/gtk-server/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtk-sharp-beans/default.nix => unit/gt/gtk-sharp-beans/pkg-fun.nix} (100%) rename pkgs/{tools/admin/gtk-vnc/default.nix => unit/gt/gtk-vnc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gtk2fontsel/default.nix => unit/gt/gtk2fontsel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtk-engines/default.nix => unit/gt/gtk_engines/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gtkcord4/default.nix => unit/gt/gtkcord4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkdatabox/default.nix => unit/gt/gtkdatabox/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/gtkdialog/default.nix => unit/gt/gtkdialog/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkextra/default.nix => unit/gt/gtkextra/pkg-fun.nix} (100%) rename pkgs/{tools/networking/p2p/gtk-gnutella/default.nix => unit/gt/gtkgnutella/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkimageview/default.nix => unit/gt/gtkimageview/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/gtklock/default.nix => unit/gt/gtklock/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/gt}/gtklp/patches/autoconf.patch (100%) rename pkgs/{tools/misc => unit/gt}/gtklp/patches/mdv-fix-str-fmt.patch (100%) rename pkgs/{tools/misc/gtklp/default.nix => unit/gt/gtklp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkmm/2.x.nix => unit/gt/gtkmm2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkmm/3.x.nix => unit/gt/gtkmm3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkmm/4.x.nix => unit/gt/gtkmm4/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/gt}/gtkperf/bench.patch (100%) rename pkgs/{development/tools/misc/gtkperf/default.nix => unit/gt/gtkperf/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gtkpod/default.nix => unit/gt/gtkpod/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gtkradiant/default.nix => unit/gt/gtkradiant/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtksourceview => unit/gt/gtksourceview3}/3.x-nix_share_path.patch (100%) rename pkgs/{development/libraries/gtksourceview/3.x.nix => unit/gt/gtksourceview3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtksourceviewmm/default.nix => unit/gt/gtksourceviewmm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtksourceviewmm/4.x.nix => unit/gt/gtksourceviewmm4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkspell/default.nix => unit/gt/gtkspell2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkspell/3.nix => unit/gt/gtkspell3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gtkspellmm/default.nix => unit/gt/gtkspellmm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gtkterm/default.nix => unit/gt/gtkterm/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/gt}/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch (100%) rename pkgs/{applications/science/electronics => unit/gt}/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch (100%) rename pkgs/{applications/science/electronics/gtkwave/default.nix => unit/gt/gtkwave/pkg-fun.nix} (100%) rename pkgs/{tools/text/gtranslator/default.nix => unit/gt/gtranslator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gts/default.nix => unit/gt/gts/pkg-fun.nix} (100%) rename pkgs/{games/gtypist/default.nix => unit/gt/gtypist/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/guake/default.nix => unit/gu/guake/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/gu}/guardian-agent/deps.nix (100%) rename pkgs/{tools/networking/guardian-agent/default.nix => unit/gu/guardian-agent/pkg-fun.nix} (100%) rename pkgs/{data/fonts/gubbi/default.nix => unit/gu/gubbi-font/pkg-fun.nix} (100%) rename pkgs/{tools/text/gucci/default.nix => unit/gu/gucci/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/guestfs-tools/default.nix => unit/gu/guestfs-tools/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/guetzli/default.nix => unit/gu/guetzli/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/guff/default.nix => unit/gu/guff/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-cairo/default.nix => unit/gu/guile-cairo/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-commonmark/default.nix => unit/gu/guile-commonmark/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-config/default.nix => unit/gu/guile-config/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-fibers/default.nix => unit/gu/guile-fibers/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-gcrypt/default.nix => unit/gu/guile-gcrypt/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-git/default.nix => unit/gu/guile-git/pkg-fun.nix} (100%) rename pkgs/{development/tools/guile/guile-hall/default.nix => unit/gu/guile-hall/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-json/default.nix => unit/gu/guile-json/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-lib/default.nix => unit/gu/guile-lib/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-ncurses/default.nix => unit/gu/guile-ncurses/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-opengl/default.nix => unit/gu/guile-opengl/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-reader/default.nix => unit/gu/guile-reader/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-sdl/default.nix => unit/gu/guile-sdl/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-sdl2/default.nix => unit/gu/guile-sdl2/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-sqlite3/default.nix => unit/gu/guile-sqlite3/pkg-fun.nix} (100%) rename pkgs/{development/guile-modules/guile-ssh/default.nix => unit/gu/guile-ssh/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/guile => unit/gu/guile_1_8}/CVE-2016-8605.patch (100%) rename pkgs/{development/interpreters/guile => unit/gu/guile_1_8}/cpp-4.5.patch (100%) rename pkgs/{development/interpreters/guile/1.8.nix => unit/gu/guile_1_8/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/guile => unit/gu/guile_1_8}/setup-hook-1.8.sh (100%) rename pkgs/{applications/misc/gum/default.nix => unit/gu/gum/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gumbo/default.nix => unit/gu/gumbo/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gummi/default.nix => unit/gu/gummi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/gummy/default.nix => unit/gu/gummy/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/gup/default.nix => unit/gu/gup/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gupnp-av/default.nix => unit/gu/gupnp-av/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gupnp-dlna/default.nix => unit/gu/gupnp-dlna/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gupnp-igd/default.nix => unit/gu/gupnp-igd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gupnp-tools/default.nix => unit/gu/gupnp-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gu}/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch (100%) rename pkgs/{development/libraries/gupnp/default.nix => unit/gu/gupnp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gupnp/1.6.nix => unit/gu/gupnp_1_6/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/gurobi/default.nix => unit/gu/gurobi/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/gu}/gusb/fix-python-path.patch (100%) rename pkgs/{development/libraries/gusb/default.nix => unit/gu/gusb/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/gutenprint/default.nix => unit/gu/gutenprint/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/gutenprint/bin.nix => unit/gu/gutenprintBin/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gv/default.nix => unit/gv/gv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gvfs/default.nix => unit/gv/gvfs/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/gvisor/default.nix => unit/gv/gvisor/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gvm-libs/default.nix => unit/gv/gvm-libs/pkg-fun.nix} (100%) rename pkgs/{tools/audio/gvolicon/default.nix => unit/gv/gvolicon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gvpe/default.nix => unit/gv/gvpe/pkg-fun.nix} (100%) rename pkgs/{tools/networking/gvproxy/default.nix => unit/gv/gvproxy/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gwc/default.nix => unit/gw/gwc/pkg-fun.nix} (100%) rename pkgs/{games/gweled/default.nix => unit/gw/gweled/pkg-fun.nix} (100%) rename pkgs/{development/compilers/gwt/2.4.0.nix => unit/gw/gwt240/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry => unit/gw}/gwyddion/codegen.patch (100%) rename pkgs/{applications/science/chemistry/gwyddion/default.nix => unit/gw/gwyddion/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/gx/go/default.nix => unit/gx/gx-go/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/gx/default.nix => unit/gx/gx/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/gx}/gxemul/0001-fix-attributes.patch (100%) rename pkgs/{applications/emulators/gxemul/default.nix => unit/gx/gxemul/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gxkb/default.nix => unit/gx/gxkb/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gxmatcheq-lv2/default.nix => unit/gx/gxmatcheq-lv2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/gxmessage/default.nix => unit/gx/gxmessage/pkg-fun.nix} (100%) rename pkgs/{applications/audio/gxplugins-lv2/default.nix => unit/gx/gxplugins-lv2/pkg-fun.nix} (100%) rename pkgs/{tools/backup/gyb/default.nix => unit/gy/gyb/pkg-fun.nix} (100%) rename pkgs/{data/fonts/gyre/default.nix => unit/gy/gyre-fonts/pkg-fun.nix} (100%) rename pkgs/{games/gzdoom/default.nix => unit/gz/gzdoom/pkg-fun.nix} (100%) rename pkgs/{tools/compression/gzip/default.nix => unit/gz/gzip/pkg-fun.nix} (100%) rename pkgs/{tools/compression/gzrt/default.nix => unit/gz/gzrt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/h/default.nix => unit/h/h/pkg-fun.nix} (100%) rename pkgs/{servers/h2/default.nix => unit/h2/h2/pkg-fun.nix} (100%) rename pkgs/{servers/http/h2o/default.nix => unit/h2/h2o/pkg-fun.nix} (100%) rename pkgs/{development/misc/h3/default.nix => unit/h3/h3/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hack/default.nix => unit/ha/hack-font/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/hackedbox/default.nix => unit/ha/hackedbox/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hackertyper/default.nix => unit/ha/hackertyper/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hackgen/default.nix => unit/ha/hackgen-font/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hackgen/nerdfont.nix => unit/ha/hackgen-nf-font/pkg-fun.nix} (100%) rename pkgs/{data/icons/hackneyed/default.nix => unit/ha/hackneyed/pkg-fun.nix} (100%) rename pkgs/{applications/radio/hackrf/default.nix => unit/ha/hackrf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hacksaw/default.nix => unit/ha/hacksaw/pkg-fun.nix} (100%) rename pkgs/{tools/compression/hacpack/default.nix => unit/ha/hacpack/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/ha}/hactool/musl-compat.patch (100%) rename pkgs/{tools/compression/hactool/default.nix => unit/ha/hactool/pkg-fun.nix} (100%) rename pkgs/{tools/networking/haguichi/default.nix => unit/ha/haguichi/pkg-fun.nix} (100%) rename pkgs/{tools/security/haka/default.nix => unit/ha/haka/pkg-fun.nix} (100%) rename pkgs/{tools/security/hakrawler/default.nix => unit/ha/hakrawler/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hakuneko/default.nix => unit/ha/hakuneko/pkg-fun.nix} (100%) rename pkgs/{development/libraries/half/default.nix => unit/ha/half/pkg-fun.nix} (100%) rename pkgs/{development/tools/halfempty/default.nix => unit/ha/halfempty/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/halibut/default.nix => unit/ha/halibut/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hamlib/default.nix => unit/ha/hamlib_3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hamlib/4.nix => unit/ha/hamlib_4/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/hammer/default.nix => unit/ha/hammer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hamster/default.nix => unit/ha/hamster/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hanazono/default.nix => unit/ha/hanazono/pkg-fun.nix} (100%) rename pkgs/{tools/misc/handlr/default.nix => unit/ha/handlr/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hannom/default.nix => unit/ha/hannom/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hans/default.nix => unit/ha/hans/pkg-fun.nix} (100%) rename pkgs/{tools/networking/haproxy/default.nix => unit/ha/haproxy/pkg-fun.nix} (100%) rename pkgs/{tools/system/hardinfo/default.nix => unit/ha/hardinfo/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/harmonia/default.nix => unit/ha/harmonia/pkg-fun.nix} (100%) rename pkgs/{games/harmonist/default.nix => unit/ha/harmonist/pkg-fun.nix} (100%) rename pkgs/{tools/video/harvid/default.nix => unit/ha/harvid/pkg-fun.nix} (100%) rename pkgs/{tools/security/hash-identifier/default.nix => unit/ha/hash-identifier/pkg-fun.nix} (100%) rename pkgs/{tools/security/hash-slinger/default.nix => unit/ha/hash-slinger/pkg-fun.nix} (100%) rename pkgs/{tools/security/hashcash/default.nix => unit/ha/hashcash/pkg-fun.nix} (100%) rename pkgs/{tools/security/hashcat-utils/default.nix => unit/ha/hashcat-utils/pkg-fun.nix} (100%) rename pkgs/{tools/security/hashcat/default.nix => unit/ha/hashcat/pkg-fun.nix} (100%) rename pkgs/{tools/security/hashdeep/default.nix => unit/ha/hashdeep/pkg-fun.nix} (100%) rename pkgs/{servers/hashi-ui/default.nix => unit/ha/hashi-ui/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/hashi-up/default.nix => unit/ha/hashi-up/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hashit/default.nix => unit/ha/hashit/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/ha}/hashlink/hashlink.patch (100%) rename pkgs/{development/interpreters/hashlink/default.nix => unit/ha/hashlink/pkg-fun.nix} (100%) rename pkgs/{tools/security/hashrat/default.nix => unit/ha/hashrat/pkg-fun.nix} (100%) rename pkgs/{development/tools/haskell/haskell-language-server/withWrapper.nix => unit/ha/haskell-language-server/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hasklig/default.nix => unit/ha/hasklig/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/hasmail/default.nix => unit/ha/hasmail/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ha}/haste-client/Gemfile (100%) rename pkgs/{tools/misc => unit/ha}/haste-client/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/ha}/haste-client/gemset.nix (100%) rename pkgs/{tools/misc/haste-client/default.nix => unit/ha/haste-client/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ha}/haste-server/node-composition.nix (100%) rename pkgs/{servers => unit/ha}/haste-server/node-deps.nix (100%) rename pkgs/{development/web/netlify-cli => unit/ha/haste-server}/node-env.nix (100%) rename pkgs/{servers/haste-server/default.nix => unit/ha/haste-server/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ha}/haste-server/update.sh (100%) rename pkgs/{servers/hasura/cli.nix => unit/ha/hasura-cli/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/hatari/default.nix => unit/ha/hatari/pkg-fun.nix} (100%) rename pkgs/{applications/misc/haunt/default.nix => unit/ha/haunt/pkg-fun.nix} (100%) rename pkgs/{tools/security/haveged/default.nix => unit/ha/haveged/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/havoc/default.nix => unit/ha/havoc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hawknl/default.nix => unit/ha/hawknl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/haxor-news/default.nix => unit/ha/haxor-news/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/hci/default.nix => unit/hc/hci/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hcl2json/default.nix => unit/hc/hcl2json/pkg-fun.nix} (100%) rename pkgs/{development/tools/hclfmt/default.nix => unit/hc/hclfmt/pkg-fun.nix} (100%) rename pkgs/{development/tools/hcloud/default.nix => unit/hc/hcloud/pkg-fun.nix} (100%) rename pkgs/{tools/security/hcxdumptool/default.nix => unit/hc/hcxdumptool/pkg-fun.nix} (100%) rename pkgs/{tools/security/hcxtools/default.nix => unit/hc/hcxtools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/hd-idle/default.nix => unit/hd/hd-idle/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hdaps-gl/default.nix => unit/hd/hdaps-gl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/hdapsd/default.nix => unit/hd/hdapsd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/hd}/hdapsd/postInstall.sh (100%) rename pkgs/{applications/misc/hdate/default.nix => unit/hd/hdate/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/hd}/hddtemp/byteswap.patch (100%) rename pkgs/{tools/misc => unit/hd}/hddtemp/dontwake.patch (100%) rename pkgs/{tools/misc => unit/hd}/hddtemp/execinfo.patch (100%) rename pkgs/{tools/misc/hddtemp/default.nix => unit/hd/hddtemp/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/hd}/hddtemp/satacmds.patch (100%) rename pkgs/{tools/misc => unit/hd}/hdf4/darwin-aarch64.patch (100%) rename pkgs/{tools/misc/hdf4/default.nix => unit/hd/hdf4/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/hd}/hdf5-blosc/blosc_filter.pc.in (100%) rename pkgs/{development/libraries => unit/hd}/hdf5-blosc/no-external-blosc.patch (100%) rename pkgs/{development/libraries/hdf5-blosc/default.nix => unit/hd/hdf5-blosc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hdf5/1.10.nix => unit/hd/hdf5_1_10/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/hd}/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch (100%) rename pkgs/{tools/misc/hdfview/default.nix => unit/hd/hdfview/pkg-fun.nix} (100%) rename pkgs/{applications/video/hdhomerun-config-gui/default.nix => unit/hd/hdhomerun-config-gui/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hdl-dump/default.nix => unit/hd/hdl-dump/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/hdparm/default.nix => unit/hd/hdparm/pkg-fun.nix} (100%) rename pkgs/{misc/hdt/default.nix => unit/hd/hdt/pkg-fun.nix} (100%) rename pkgs/{applications/misc/HentaiAtHome/default.nix => unit/he/HentaiAtHome/pkg-fun.nix} (100%) rename pkgs/{applications/networking/headlines/default.nix => unit/he/headlines/pkg-fun.nix} (100%) rename pkgs/{servers/headphones/default.nix => unit/he/headphones/pkg-fun.nix} (100%) rename pkgs/{servers/headscale/default.nix => unit/he/headscale/pkg-fun.nix} (100%) rename pkgs/{tools/audio/headset-charge-indicator/default.nix => unit/he/headset-charge-indicator/pkg-fun.nix} (100%) rename pkgs/{applications/audio/headset/default.nix => unit/he/headset/pkg-fun.nix} (100%) rename pkgs/{tools/audio/headsetcontrol/default.nix => unit/he/headsetcontrol/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/health-check/default.nix => unit/he/health-check/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/healthchecks/default.nix => unit/he/healthchecks/pkg-fun.nix} (100%) rename pkgs/{tools/misc/heatseeker/default.nix => unit/he/heatseeker/pkg-fun.nix} (100%) rename pkgs/{tools/compression/heatshrink/default.nix => unit/he/heatshrink/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hebcal/default.nix => unit/he/hebcal/pkg-fun.nix} (100%) rename pkgs/{applications/editors/hecate/default.nix => unit/he/hecate/pkg-fun.nix} (100%) rename pkgs/{tools/admin/hedgedoc-cli/default.nix => unit/he/hedgedoc-cli/pkg-fun.nix} (100%) rename pkgs/{servers/heisenbridge/default.nix => unit/he/heisenbridge/pkg-fun.nix} (100%) rename pkgs/{applications/audio/helio-workstation/default.nix => unit/he/helio-workstation/pkg-fun.nix} (100%) rename pkgs/{applications/editors/helix/default.nix => unit/he/helix/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hello-unfree/default.nix => unit/he/hello-unfree/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/hello-wayland/default.nix => unit/he/hello-wayland/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hello/default.nix => unit/he/hello/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/he}/hello/test.nix (100%) rename pkgs/{applications/networking/cluster/helm-docs/default.nix => unit/he/helm-docs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/helm/default.nix => unit/he/helm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/helmfile/default.nix => unit/he/helmfile/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pd-plugins/helmholtz/default.nix => unit/he/helmholtz/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/helmsman/default.nix => unit/he/helmsman/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/he}/help2man/1.40.4-cygwin-nls.patch (100%) rename pkgs/{development/tools/misc/help2man/default.nix => unit/he/help2man/pkg-fun.nix} (100%) rename pkgs/{data/fonts/helvetica-neue-lt-std/default.nix => unit/he/helvetica-neue-lt-std/pkg-fun.nix} (100%) rename pkgs/{applications/audio/helvum/default.nix => unit/he/helvum/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/hepmc2/default.nix => unit/he/hepmc2/pkg-fun.nix} (100%) rename pkgs/{development/compilers/heptagon/default.nix => unit/he/heptagon/pkg-fun.nix} (100%) rename pkgs/{applications/misc/herbe/default.nix => unit/he/herbe/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/herbstluftwm/default.nix => unit/he/herbstluftwm/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers => unit/he}/herbstluftwm/test-path-environment.patch (100%) rename pkgs/{development/tools/continuous-integration/hercules-ci-agent/default.nix => unit/he/hercules-ci-agent/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/hercules/default.nix => unit/he/hercules/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hermit/default.nix => unit/he/hermit/pkg-fun.nix} (100%) rename pkgs/{games/heroic => unit/he/heroic-unwrapped}/package.json (100%) rename pkgs/{games/heroic/default.nix => unit/he/heroic-unwrapped/pkg-fun.nix} (100%) rename pkgs/{games/heroic => unit/he/heroic-unwrapped}/yarn.lock (100%) rename pkgs/{games/heroic => unit/he/heroic-unwrapped}/yarn.nix (100%) rename pkgs/{development/tools/heroku/default.nix => unit/he/heroku/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/herwig/default.nix => unit/he/herwig/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/he}/hetzner-kube/fix-home.patch (100%) rename pkgs/{applications/networking/cluster/hetzner-kube/default.nix => unit/he/hetzner-kube/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/hevea/default.nix => unit/he/hevea/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hex/default.nix => unit/he/hex/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/hexchat/default.nix => unit/he/hexchat/pkg-fun.nix} (100%) rename pkgs/{applications/editors/hexcurse/default.nix => unit/he/hexcurse/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hexd/default.nix => unit/he/hexd/pkg-fun.nix} (100%) rename pkgs/{applications/editors/hexdino/default.nix => unit/he/hexdino/pkg-fun.nix} (100%) rename pkgs/{applications/editors/hexedit/default.nix => unit/he/hexedit/pkg-fun.nix} (100%) rename pkgs/{games/hexgui/default.nix => unit/he/hexgui/pkg-fun.nix} (100%) rename pkgs/{development/tools/hexio/default.nix => unit/he/hexio/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hexyl/default.nix => unit/he/hexyl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hey/default.nix => unit/he/hey/pkg-fun.nix} (100%) rename pkgs/{tools/security/hfinger/default.nix => unit/hf/hfinger/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/hfsprogs/default.nix => unit/hf/hfsprogs/pkg-fun.nix} (100%) rename pkgs/{games/hhexen/default.nix => unit/hh/hhexen/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hhpc/default.nix => unit/hh/hhpc/pkg-fun.nix} (100%) rename pkgs/{servers/http/hiawatha/default.nix => unit/hi/hiawatha/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/hi}/hibernate/gen-manpages.patch (100%) rename pkgs/{os-specific/linux => unit/hi}/hibernate/hibernate.patch (100%) rename pkgs/{os-specific/linux => unit/hi}/hibernate/install.patch (100%) rename pkgs/{os-specific/linux/hibernate/default.nix => unit/hi/hibernate/pkg-fun.nix} (100%) rename pkgs/{data/icons/hicolor-icon-theme/default.nix => unit/hi/hicolor-icon-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons => unit/hi}/hicolor-icon-theme/setup-hook.sh (100%) rename pkgs/{tools/misc/hid-listen/default.nix => unit/hi/hid-listen/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hid-tools/default.nix => unit/hi/hid-tools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hidrd/default.nix => unit/hi/hidrd/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/hi}/hiera-eyaml/Gemfile (100%) rename pkgs/{tools/system => unit/hi}/hiera-eyaml/Gemfile.lock (100%) rename pkgs/{tools/system => unit/hi}/hiera-eyaml/gemset.nix (100%) rename pkgs/{tools/system/hiera-eyaml/default.nix => unit/hi/hiera-eyaml/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/bsnes => unit/hi}/higan/001-include-cmath.patch (100%) rename pkgs/{applications/emulators/bsnes => unit/hi}/higan/002-sips-to-png2icns.patch (100%) rename pkgs/{applications/emulators/bsnes/higan/default.nix => unit/hi/higan/pkg-fun.nix} (100%) rename pkgs/{development/libraries/highfive/default.nix => unit/hi/highfive/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/highlight-assertions/default.nix => unit/hi/highlight-assertions/pkg-fun.nix} (100%) rename pkgs/{games/hikounomizu/default.nix => unit/hi/hikounomizu/pkg-fun.nix} (100%) rename pkgs/{shells/hilbish/default.nix => unit/hi/hilbish/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/hime/default.nix => unit/hi/hime/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/hipchat/default.nix => unit/hi/hipchat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hiredis-vip/default.nix => unit/hi/hiredis-vip/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hiredis/default.nix => unit/hi/hiredis/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/hisat2/default.nix => unit/hi/hisat2/pkg-fun.nix} (100%) rename pkgs/{servers/hitch/default.nix => unit/hi/hitch/pkg-fun.nix} (100%) rename pkgs/{applications/audio/hivelytracker/default.nix => unit/hi/hivelytracker/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hivemind/default.nix => unit/hi/hivemind/pkg-fun.nix} (100%) rename pkgs/{development/tools/hjson-go/default.nix => unit/hj/hjson-go/pkg-fun.nix} (100%) rename pkgs/{applications/office/hledger-check-fancyassertions/default.nix => unit/hl/hledger-check-fancyassertions/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/hll2390dw-cups/default.nix => unit/hl/hll2390dw-cups/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hmat-oss/default.nix => unit/hm/hmat-oss/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/hmmer/default.nix => unit/hm/hmmer/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/hol/default.nix => unit/ho/hol/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/holo-build/default.nix => unit/ho/holo-build/pkg-fun.nix} (100%) rename pkgs/{applications/misc/holochain-launcher/default.nix => unit/ho/holochain-launcher/pkg-fun.nix} (100%) rename pkgs/{tools/security/hologram/default.nix => unit/ho/hologram/pkg-fun.nix} (100%) rename pkgs/{servers/home-assistant/cli.nix => unit/ho/home-assistant-cli/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ho}/home-assistant/component-packages.nix (100%) rename pkgs/{servers => unit/ho}/home-assistant/frontend.nix (100%) rename pkgs/{servers => unit/ho}/home-assistant/patches/ffmpeg-path.patch (100%) rename pkgs/{servers => unit/ho}/home-assistant/patches/tests-mock-source-ip.patch (100%) rename pkgs/{servers/home-assistant/default.nix => unit/ho/home-assistant/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ho}/home-assistant/tests.nix (100%) rename pkgs/{tools/package-management/home-manager/default.nix => unit/ho/home-manager/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ho}/homesick/Gemfile (100%) rename pkgs/{tools/misc => unit/ho}/homesick/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/ho}/homesick/gemset.nix (100%) rename pkgs/{tools/misc/homesick/default.nix => unit/ho/homesick/pkg-fun.nix} (100%) rename pkgs/{tools/system/honcho/default.nix => unit/ho/honcho/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/honeycomb/refinery => unit/ho/honeycomb-refinery}/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch (100%) rename pkgs/{servers/tracing/honeycomb/refinery/default.nix => unit/ho/honeycomb-refinery/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/honeycomb/honeymarker/default.nix => unit/ho/honeymarker/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/honeycomb => unit/ho}/honeymarker/versions.nix (100%) rename pkgs/{servers/tracing/honeycomb/honeytail/default.nix => unit/ho/honeytail/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/honeycomb => unit/ho}/honeytail/versions.nix (100%) rename pkgs/{tools/security/honeytrap/default.nix => unit/ho/honeytrap/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/honeycomb/honeyvent/default.nix => unit/ho/honeyvent/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/honeycomb => unit/ho}/honeyvent/versions.nix (100%) rename pkgs/{servers/honk/default.nix => unit/ho/honk/pkg-fun.nix} (100%) rename pkgs/{development/compilers/hop/default.nix => unit/ho/hop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/hoppet/default.nix => unit/ho/hoppet/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/horizon-eda/default.nix => unit/ho/horizon-eda/pkg-fun.nix} (100%) rename pkgs/{tools/networking/horst/default.nix => unit/ho/horst/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hostapd-mana/default.nix => unit/ho/hostapd-mana/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/hostapd/default.nix => unit/ho/hostapd/pkg-fun.nix} (100%) rename pkgs/{tools/system/hostctl/default.nix => unit/ho/hostctl/pkg-fun.nix} (100%) rename pkgs/{development/tools/hostess/default.nix => unit/ho/hostess/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hostname-debian/default.nix => unit/ho/hostname-debian/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hostsblock/default.nix => unit/ho/hostsblock/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ho}/hotpatch/no-loader-test.patch (100%) rename pkgs/{development/libraries/hotpatch/default.nix => unit/ho/hotpatch/pkg-fun.nix} (100%) rename pkgs/{tools/text/hottext/default.nix => unit/ho/hottext/pkg-fun.nix} (100%) rename pkgs/{applications/misc/houdini/default.nix => unit/ho/houdini/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ho}/houdini/runtime.nix (100%) rename pkgs/{development/tools/misc/hound/default.nix => unit/ho/hound/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ho}/hover/fix-assets-path.patch (100%) rename pkgs/{development/tools/hover/default.nix => unit/ho/hover/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ho}/howard-hinnant-date/make-zoneinfo-available.diff (100%) rename pkgs/{development/libraries/howard-hinnant-date/default.nix => unit/ho/howard-hinnant-date/pkg-fun.nix} (100%) rename pkgs/{applications/editors/howl/default.nix => unit/ho/howl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hp2p/default.nix => unit/hp/hp2p/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/hp}/hp2p/python3.patch (100%) rename pkgs/{tools/misc/hpcg/default.nix => unit/hp/hpcg/pkg-fun.nix} (100%) rename pkgs/{tools/backup/hpe-ltfs/default.nix => unit/hp/hpe-ltfs/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/hp}/hpe-ltfs/remove-sysctl.patch (100%) rename pkgs/{tools/networking/hping/default.nix => unit/hp/hping/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hpl/default.nix => unit/hp/hpl/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/hp}/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch (100%) rename pkgs/{misc/drivers => unit/hp}/hplip/hplip.state (100%) rename pkgs/{misc/drivers/hplip/default.nix => unit/hp/hplip/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/hp}/hplip/revert-snprintf-change.patch (100%) rename pkgs/{servers => unit/hq}/hqplayerd/add-option-for-installation-sysconfdir.patch (100%) rename pkgs/{servers/hqplayerd/default.nix => unit/hq/hqplayerd/pkg-fun.nix} (100%) rename pkgs/{servers => unit/hq}/hqplayerd/rygel.nix (100%) rename pkgs/{applications/misc/hr/default.nix => unit/hr/hr/pkg-fun.nix} (100%) rename pkgs/{development/tools/hred/default.nix => unit/hr/hred/pkg-fun.nix} (100%) rename pkgs/{tools/X11/hsetroot/default.nix => unit/hs/hsetroot/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hspell/default.nix => unit/hs/hspell/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hspell/dicts.nix => unit/hs/hspellDicts/pkg-fun.nix} (100%) rename pkgs/{servers/pulseaudio/hsphfpd.nix => unit/hs/hsphfpd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/hsqldb/default.nix => unit/hs/hsqldb/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hss/default.nix => unit/hs/hss/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hstr/default.nix => unit/hs/hstr/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/ht}/ht/gcc7.patch (100%) rename pkgs/{applications/editors/ht/default.nix => unit/ht/ht/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ht}/html-proofer/Gemfile (100%) rename pkgs/{tools/misc => unit/ht}/html-proofer/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/ht}/html-proofer/gemset.nix (100%) rename pkgs/{tools/misc/html-proofer/default.nix => unit/ht/html-proofer/pkg-fun.nix} (100%) rename pkgs/{tools/text/html-tidy/default.nix => unit/ht/html-tidy/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml/html-xml-utils/default.nix => unit/ht/html-xml-utils/pkg-fun.nix} (100%) rename pkgs/{tools/text/html2text/default.nix => unit/ht/html2text/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ht}/htmlcxx/c++17.patch (100%) rename pkgs/{development/libraries/htmlcxx/default.nix => unit/ht/htmlcxx/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ht}/htmlcxx/ptrdiff.patch (100%) rename pkgs/{development/tools/htmltest/default.nix => unit/ht/htmltest/pkg-fun.nix} (100%) rename pkgs/{development/tools/selenium/htmlunit-driver/default.nix => unit/ht/htmlunit-driver/pkg-fun.nix} (100%) rename pkgs/{tools/system/htop/htop-vim.nix => unit/ht/htop-vim/pkg-fun.nix} (100%) rename pkgs/{tools/networking/htpdate/default.nix => unit/ht/htpdate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/biology/htslib/default.nix => unit/ht/htslib/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/httm/default.nix => unit/ht/httm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/flent/http-getter.nix => unit/ht/http-getter/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ht}/http-parser/build-shared.patch (100%) rename pkgs/{development/libraries/http-parser/default.nix => unit/ht/http-parser/pkg-fun.nix} (100%) rename pkgs/{tools/networking/http2tcp/default.nix => unit/ht/http2tcp/pkg-fun.nix} (100%) rename pkgs/{common-updater/http-two-levels-updater.nix => unit/ht/httpTwoLevelsUpdater/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/httpdirfs/default.nix => unit/ht/httpdirfs/pkg-fun.nix} (100%) rename pkgs/{tools/security/httpdump/default.nix => unit/ht/httpdump/pkg-fun.nix} (100%) rename pkgs/{tools/networking/httperf/default.nix => unit/ht/httperf/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/httpfs/default.nix => unit/ht/httpfs2/pkg-fun.nix} (100%) rename pkgs/{tools/networking/httping/default.nix => unit/ht/httping/pkg-fun.nix} (100%) rename pkgs/{tools/networking/httplab/default.nix => unit/ht/httplab/pkg-fun.nix} (100%) rename pkgs/{development/libraries/httplib/default.nix => unit/ht/httplib/pkg-fun.nix} (100%) rename pkgs/{servers/dns/https-dns-proxy/default.nix => unit/ht/https-dns-proxy/pkg-fun.nix} (100%) rename pkgs/{tools/networking/httpstat/default.nix => unit/ht/httpstat/pkg-fun.nix} (100%) rename pkgs/{tools/networking/httptunnel/default.nix => unit/ht/httptunnel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/httpunit/default.nix => unit/ht/httpunit/pkg-fun.nix} (100%) rename pkgs/{tools/security/httpx/default.nix => unit/ht/httpx/pkg-fun.nix} (100%) rename pkgs/{tools/backup/httrack/default.nix => unit/ht/httrack/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/hub/default.nix => unit/hu/hub/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/hubble/default.nix => unit/hu/hubble/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/hubicfuse/default.nix => unit/hu/hubicfuse/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hubot-sans/default.nix => unit/hu/hubot-sans/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hubstaff/default.nix => unit/hu/hubstaff/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/hu}/hue-cli/Gemfile (100%) rename pkgs/{tools/networking => unit/hu}/hue-cli/Gemfile.lock (100%) rename pkgs/{tools/networking => unit/hu}/hue-cli/gemset.nix (100%) rename pkgs/{tools/networking/hue-cli/default.nix => unit/hu/hue-cli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/hugo/default.nix => unit/hu/hugo/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/hugs/default.nix => unit/hu/hugs/pkg-fun.nix} (100%) rename pkgs/{data/icons/humanity-icon-theme/default.nix => unit/hu/humanity-icon-theme/pkg-fun.nix} (100%) rename pkgs/{applications/logging/humioctl/default.nix => unit/hu/humioctl/pkg-fun.nix} (100%) rename pkgs/{tools/text/huniq/default.nix => unit/hu/huniq/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/hu}/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch (100%) rename pkgs/{development/libraries/hunspell/default.nix => unit/hu/hunspell/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hunt/default.nix => unit/hu/hunt/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hurl/default.nix => unit/hu/hurl/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/hut/default.nix => unit/hu/hut/pkg-fun.nix} (100%) rename pkgs/{development/compilers/hvm/default.nix => unit/hv/hvm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hwatch/default.nix => unit/hw/hwatch/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/hwdata/default.nix => unit/hw/hwdata/pkg-fun.nix} (100%) rename pkgs/{tools/system/hwinfo/default.nix => unit/hw/hwinfo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hwloc/default.nix => unit/hw/hwloc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/hydra-ant-logger/default.nix => unit/hy/hydraAntLogger/pkg-fun.nix} (100%) rename pkgs/{applications/audio/hydrogen/0.nix => unit/hy/hydrogen_0/pkg-fun.nix} (100%) rename pkgs/{servers/hydron/default.nix => unit/hy/hydron/pkg-fun.nix} (100%) rename pkgs/{applications/networking/hydroxide/default.nix => unit/hy/hydroxide/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hyena/default.nix => unit/hy/hyena/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hyenae/default.nix => unit/hy/hyenae/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hyfetch/default.nix => unit/hy/hyfetch/pkg-fun.nix} (100%) rename pkgs/{servers => unit/hy}/hylafaxplus/config.site (100%) rename pkgs/{servers => unit/hy}/hylafaxplus/libtiff-4.patch (100%) rename pkgs/{servers/hylafaxplus/default.nix => unit/hy/hylafaxplus/pkg-fun.nix} (100%) rename pkgs/{servers => unit/hy}/hylafaxplus/post-install-check.sh (100%) rename pkgs/{servers => unit/hy}/hylafaxplus/post-install.sh (100%) rename pkgs/{servers => unit/hy}/hylafaxplus/post-patch.sh (100%) rename pkgs/{servers/http/hyp/default.nix => unit/hy/hyp/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/hyp2mat/default.nix => unit/hy/hyp2mat/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/hyper/default.nix => unit/hy/hyper/pkg-fun.nix} (100%) rename pkgs/{tools/misc/hyperledger-fabric/default.nix => unit/hy/hyperledger-fabric/pkg-fun.nix} (100%) rename pkgs/{games/hyperrogue/default.nix => unit/hy/hyperrogue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hyperscan/default.nix => unit/hy/hyperscan/pkg-fun.nix} (100%) rename pkgs/{data/fonts/hyperscrypt/default.nix => unit/hy/hyperscrypt-font/pkg-fun.nix} (100%) rename pkgs/{development/libraries/hyphen/default.nix => unit/hy/hyphen/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/hy}/hypnotix/libmpv-path.patch (100%) rename pkgs/{applications/video/hypnotix/default.nix => unit/hy/hypnotix/pkg-fun.nix} (100%) rename pkgs/{tools/networking/hysteria/default.nix => unit/hy/hysteria/pkg-fun.nix} (100%) rename pkgs/{tools/text/hyx/default.nix => unit/hy/hyx/pkg-fun.nix} (100%) rename pkgs/{data/fonts/i-dot-ming/default.nix => unit/i-/i-dot-ming/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/i2c-tools/default.nix => unit/i2/i2c-tools/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/i2}/i2p/i2p.patch (100%) rename pkgs/{tools/networking/i2p/default.nix => unit/i2/i2p/pkg-fun.nix} (100%) rename pkgs/{tools/networking/i2pd/default.nix => unit/i2/i2pd/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/auto-layout.nix => unit/i3/i3-auto-layout/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/easyfocus.nix => unit/i3/i3-easyfocus/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/layout-manager.nix => unit/i3/i3-layout-manager/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/i3-ratiosplit.nix => unit/i3/i3-ratiosplit/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/rounded.nix => unit/i3/i3-rounded/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/wk-switch.nix => unit/i3/i3-wk-switch/pkg-fun.nix} (100%) rename pkgs/{misc/i3a/default.nix => unit/i3/i3a/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/altlayout.nix => unit/i3/i3altlayout/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/blocks-gaps.nix => unit/i3/i3blocks-gaps/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/blocks.nix => unit/i3/i3blocks/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/i3ipc-glib.nix => unit/i3/i3ipc-glib/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/lock-blur.nix => unit/i3/i3lock-blur/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/lock-color.nix => unit/i3/i3lock-color/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/lock-fancy-rapid.nix => unit/i3/i3lock-fancy-rapid/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/lock-fancy.nix => unit/i3/i3lock-fancy/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/i3lock-pixeled/default.nix => unit/i3/i3lock-pixeled/pkg-fun.nix} (100%) rename pkgs/{tools/misc/i3minator/default.nix => unit/i3/i3minator/pkg-fun.nix} (100%) rename pkgs/{tools/misc/i3nator/default.nix => unit/i3/i3nator/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/pystatus.nix => unit/i3/i3pystatus/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/status-rust.nix => unit/i3/i3status-rust/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/status.nix => unit/i3/i3status/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/wsr.nix => unit/i3/i3wsr/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/i810switch/default.nix => unit/i8/i810switch/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ia-writer-duospace/default.nix => unit/ia/ia-writer-duospace/pkg-fun.nix} (100%) rename pkgs/{development/tools/iaca/2.1.nix => unit/ia/iaca_2_1/pkg-fun.nix} (100%) rename pkgs/{development/tools/iaca/3.0.nix => unit/ia/iaca_3_0/pkg-fun.nix} (100%) rename pkgs/{tools/misc/iam-policy-json-to-terraform/default.nix => unit/ia/iam-policy-json-to-terraform/pkg-fun.nix} (100%) rename pkgs/{tools/admin/iamy/default.nix => unit/ia/iamy/pkg-fun.nix} (100%) rename pkgs/{data/misc/iana-etc/default.nix => unit/ia/iana-etc/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ibm-plex/default.nix => unit/ib/ibm-plex/pkg-fun.nix} (100%) rename pkgs/{tools/security/ibm-sw-tpm2/default.nix => unit/ib/ibm-sw-tpm2/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/ibniz/default.nix => unit/ib/ibniz/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/ibus/ibus-qt.nix => unit/ib/ibus-qt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ibus-theme-tools/default.nix => unit/ib/ibus-theme-tools/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/ibus/wrapper.nix => unit/ib/ibus-with-plugins/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods => unit/ib}/ibus/fix-paths.patch (100%) rename pkgs/{tools/inputmethods/ibus/default.nix => unit/ib/ibus/pkg-fun.nix} (100%) rename pkgs/{tools/security/ic-keysmith/default.nix => unit/ic/ic-keysmith/pkg-fun.nix} (100%) rename pkgs/{games/icbm3d/default.nix => unit/ic/icbm3d/pkg-fun.nix} (100%) rename pkgs/{tools/text/icdiff/default.nix => unit/ic/icdiff/pkg-fun.nix} (100%) rename pkgs/{servers/icecast/default.nix => unit/ic/icecast/pkg-fun.nix} (100%) rename pkgs/{servers/icecream/default.nix => unit/ic/icecream/pkg-fun.nix} (100%) rename pkgs/{tools/backup/iceshelf/default.nix => unit/ic/iceshelf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/icesl/default.nix => unit/ic/icesl/pkg-fun.nix} (100%) rename pkgs/{development/embedded/fpga/icestorm/default.nix => unit/ic/icestorm/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/icewm/default.nix => unit/ic/icewm/pkg-fun.nix} (100%) rename pkgs/{servers/icingaweb2/ipl.nix => unit/ic/icingaweb2-ipl/pkg-fun.nix} (100%) rename pkgs/{servers/icingaweb2/thirdparty.nix => unit/ic/icingaweb2-thirdparty/pkg-fun.nix} (100%) rename pkgs/{servers/icingaweb2/default.nix => unit/ic/icingaweb2/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/icmake/default.nix => unit/ic/icmake/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/icon-lang/default.nix => unit/ic/icon-lang/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/icon-library/default.nix => unit/ic/icon-library/pkg-fun.nix} (100%) rename pkgs/{tools/X11/icon-slicer/default.nix => unit/ic/icon-slicer/pkg-fun.nix} (100%) rename pkgs/{build-support/icon-conv-tools => unit/ic/iconConvTools}/bin/extractWinRscIconsToStdFreeDesktopDir.sh (100%) rename pkgs/{build-support/icon-conv-tools => unit/ic/iconConvTools}/bin/icoFileToHiColorTheme (100%) rename pkgs/{build-support/icon-conv-tools/default.nix => unit/ic/iconConvTools/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/icon-naming-utils/default.nix => unit/ic/iconnamingutils/pkg-fun.nix} (100%) rename pkgs/{data/icons/iconpack-jade/default.nix => unit/ic/iconpack-jade/pkg-fun.nix} (100%) rename pkgs/{data/icons/iconpack-obsidian/default.nix => unit/ic/iconpack-obsidian/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/icoutils/default.nix => unit/ic/icoutils/pkg-fun.nix} (100%) rename pkgs/{development/tools/icr/default.nix => unit/ic/icr/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ic}/icr/shards.nix (100%) rename pkgs/{development/libraries => unit/id}/id3lib/id3lib-3.8.3-gcc43-1.patch (100%) rename pkgs/{development/libraries => unit/id}/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff (100%) rename pkgs/{development/libraries/id3lib/default.nix => unit/id/id3lib/pkg-fun.nix} (100%) rename pkgs/{applications/audio/id3v2/default.nix => unit/id/id3v2/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/ideogram/default.nix => unit/id/ideogram/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ideviceinstaller/default.nix => unit/id/ideviceinstaller/pkg-fun.nix} (100%) rename pkgs/{tools/misc/idevicerestore/default.nix => unit/id/idevicerestore/pkg-fun.nix} (100%) rename pkgs/{tools/system/idle3tools/default.nix => unit/id/idle3tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/idnkit/default.nix => unit/id/idnkit/pkg-fun.nix} (100%) rename pkgs/{development/compilers/idris2/default.nix => unit/id/idris2/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/id}/idris2/tests.nix (100%) rename pkgs/{tools/misc => unit/id}/idutils/nix-mapping.patch (100%) rename pkgs/{tools/misc/idutils/default.nix => unit/id/idutils/pkg-fun.nix} (100%) rename pkgs/{tools/security/ifdnfc/default.nix => unit/if/ifdnfc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ifenslave/default.nix => unit/if/ifenslave/pkg-fun.nix} (100%) rename pkgs/{development/tools/iferr/default.nix => unit/if/iferr/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/ifm/default.nix => unit/if/ifm/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ifmetric/default.nix => unit/if/ifmetric/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ifstat-legacy/default.nix => unit/if/ifstat-legacy/pkg-fun.nix} (100%) rename pkgs/{tools/networking/iftop/default.nix => unit/if/iftop/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/ifuse/default.nix => unit/if/ifuse/pkg-fun.nix} (100%) rename pkgs/{tools/networking/igmpproxy/default.nix => unit/ig/igmpproxy/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/ignite/default.nix => unit/ig/ignite/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/igprof/default.nix => unit/ig/igprof/pkg-fun.nix} (100%) rename pkgs/{development/libraries/igraph/default.nix => unit/ig/igraph/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/igv/default.nix => unit/ig/igv/pkg-fun.nix} (100%) rename pkgs/{development/web/ihp-new/default.nix => unit/ih/ihp-new/pkg-fun.nix} (100%) rename pkgs/{applications/video/iina/default.nix => unit/ii/iina/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iio-sensor-proxy/default.nix => unit/ii/iio-sensor-proxy/pkg-fun.nix} (100%) rename pkgs/{development/tools/ijq/default.nix => unit/ij/ijq/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ijs/default.nix => unit/ij/ijs/pkg-fun.nix} (100%) rename pkgs/{tools/security/ike-scan/default.nix => unit/ik/ike-scan/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ikill/default.nix => unit/ik/ikill/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/il}/ilbc/CMakeLists.txt (100%) rename pkgs/{development/libraries => unit/il}/ilbc/extract-cfile.awk (100%) rename pkgs/{development/libraries/ilbc/default.nix => unit/il/ilbc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ili2c/default.nix => unit/il/ili2c/pkg-fun.nix} (100%) rename pkgs/{tools/system/illum/default.nix => unit/il/illum/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ilmbase/default.nix => unit/il/ilmbase/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ima-evm-utils/default.nix => unit/im/ima-evm-utils/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/image-roll/default.nix => unit/im/image-roll/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/imagej/default.nix => unit/im/imagej/pkg-fun.nix} (100%) rename pkgs/{tools/compression/imagelol/default.nix => unit/im/imagelol/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/imageworsener/default.nix => unit/im/imageworsener/pkg-fun.nix} (100%) rename pkgs/{servers/imaginary/default.nix => unit/im/imaginary/pkg-fun.nix} (100%) rename pkgs/{applications/video/imagination/default.nix => unit/im/imagination/pkg-fun.nix} (100%) rename pkgs/{tools/networking/imapsync/default.nix => unit/im/imapsync/pkg-fun.nix} (100%) rename pkgs/{development/libraries/imath/default.nix => unit/im/imath/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/img-cat/default.nix => unit/im/img-cat/pkg-fun.nix} (100%) rename pkgs/{development/tools/img/default.nix => unit/im/img/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/imgcat/default.nix => unit/im/imgcat/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/imgcrypt/default.nix => unit/im/imgcrypt/pkg-fun.nix} (100%) rename pkgs/{development/mobile/imgpatchtools/default.nix => unit/im/imgpatchtools/pkg-fun.nix} (100%) rename pkgs/{servers/imgproxy/default.nix => unit/im/imgproxy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/imgui/default.nix => unit/im/imgui/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/imgur-screenshot/default.nix => unit/im/imgur-screenshot/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/imgurbash2/default.nix => unit/im/imgurbash2/pkg-fun.nix} (100%) rename pkgs/{applications/editors/imhex/default.nix => unit/im/imhex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/iml/default.nix => unit/im/iml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/imlib2/default.nix => unit/im/imlib2/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/immudb/default.nix => unit/im/immudb/pkg-fun.nix} (100%) rename pkgs/{development/tools/impl/default.nix => unit/im/impl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/impy/default.nix => unit/im/impy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/imtui/default.nix => unit/im/imtui/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/imv/default.nix => unit/im/imv/pkg-fun.nix} (100%) rename pkgs/{tools/X11/imwheel/default.nix => unit/im/imwheel/pkg-fun.nix} (100%) rename pkgs/{applications/audio/in-formant/default.nix => unit/in/in-formant/pkg-fun.nix} (100%) rename pkgs/{tools/networking/inadyn/default.nix => unit/in/inadyn/pkg-fun.nix} (100%) rename pkgs/{tools/misc/inav-blackbox-tools/default.nix => unit/in/inav-blackbox-tools/pkg-fun.nix} (100%) rename pkgs/{applications/science/robotics/inav-configurator/default.nix => unit/in/inav-configurator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/inchi/default.nix => unit/in/inchi/pkg-fun.nix} (100%) rename pkgs/{data/fonts/inconsolata/lgc.nix => unit/in/inconsolata-lgc/pkg-fun.nix} (100%) rename pkgs/{data/fonts/inconsolata/default.nix => unit/in/inconsolata/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/in}/incron/default_path.patch (100%) rename pkgs/{tools/system/incron/default.nix => unit/in/incron/pkg-fun.nix} (100%) rename pkgs/{development/libraries/incrtcl/default.nix => unit/in/incrtcl/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/in}/indent/darwin.patch (100%) rename pkgs/{development/tools/misc/indent/default.nix => unit/in/indent/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/astronomy/indilib => unit/in/indi-full}/indi-3rdparty.nix (100%) rename pkgs/{development/libraries/science/astronomy/indilib => unit/in/indi-full}/indi-firmware.nix (100%) rename pkgs/{development/libraries/science/astronomy/indilib => unit/in/indi-full}/indi-with-drivers.nix (100%) rename pkgs/{development/libraries/science/astronomy/indilib/indi-full.nix => unit/in/indi-full/pkg-fun.nix} (100%) rename pkgs/{development/libraries/indicator-application/gtk2.nix => unit/in/indicator-application-gtk2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/indicator-application/gtk3.nix => unit/in/indicator-application-gtk3/pkg-fun.nix} (100%) rename pkgs/{applications/audio/indicator-sound-switcher/default.nix => unit/in/indicator-sound-switcher/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/indigenous-desktop/default.nix => unit/in/indigenous-desktop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/astronomy/indilib/default.nix => unit/in/indilib/pkg-fun.nix} (100%) rename pkgs/{applications/audio/industrializer/default.nix => unit/in/industrializer/pkg-fun.nix} (100%) rename pkgs/{development/tools/ineffassign/default.nix => unit/in/ineffassign/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/in}/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch (100%) rename pkgs/{tools/networking/inetutils/default.nix => unit/in/inetutils/pkg-fun.nix} (100%) rename pkgs/{applications/audio/infamousPlugins/default.nix => unit/in/infamousPlugins/pkg-fun.nix} (100%) rename pkgs/{development/tools/inferno/default.nix => unit/in/inferno/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/influxdb/default.nix => unit/in/influxdb/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/influxdb2/cli.nix => unit/in/influxdb2-cli/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/influxdb2/default.nix => unit/in/influxdb2-server/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/influxdb2/combined.nix => unit/in/influxdb2/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/in}/infnoise/makefile.patch (100%) rename pkgs/{misc/drivers/infnoise/default.nix => unit/in/infnoise/pkg-fun.nix} (100%) rename pkgs/{development/compilers/inform6/default.nix => unit/in/inform6/pkg-fun.nix} (100%) rename pkgs/{development/compilers/inform7/default.nix => unit/in/inform7/pkg-fun.nix} (100%) rename pkgs/{games/infra-arcana/default.nix => unit/in/infra-arcana/pkg-fun.nix} (100%) rename pkgs/{tools/admin/infra/default.nix => unit/in/infra/pkg-fun.nix} (100%) rename pkgs/{tools/misc/infracost/default.nix => unit/in/infracost/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/inframap/default.nix => unit/in/inframap/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ingen/default.nix => unit/in/ingen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/inih/default.nix => unit/in/inih/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/in}/iniparser/iniparser.pc.in (100%) rename pkgs/{development/libraries => unit/in}/iniparser/no-usr.patch (100%) rename pkgs/{development/libraries/iniparser/default.nix => unit/in/iniparser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ink/default.nix => unit/in/ink/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/in}/inklecate/deps.nix (100%) rename pkgs/{development/compilers/inklecate/default.nix => unit/in/inklecate/pkg-fun.nix} (100%) rename pkgs/{tools/misc/inklingreader/default.nix => unit/in/inklingreader/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/inkscape/with-extensions.nix => unit/in/inkscape-with-extensions/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/innoextract/default.nix => unit/in/innoextract/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology => unit/in}/inormalize/lgmask-interp.patch (100%) rename pkgs/{applications/science/biology => unit/in}/inormalize/nu_correct_norm-interp.patch (100%) rename pkgs/{applications/science/biology/inormalize/default.nix => unit/in/inormalize/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/inotify-tools/default.nix => unit/in/inotify-tools/pkg-fun.nix} (100%) rename pkgs/{data/fonts/input-fonts/default.nix => unit/in/input-fonts/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/input-utils/default.nix => unit/in/input-utils/pkg-fun.nix} (100%) rename pkgs/{tools/X11/inputplug/default.nix => unit/in/inputplug/pkg-fun.nix} (100%) rename pkgs/{tools/security/inql/default.nix => unit/in/inql/pkg-fun.nix} (100%) rename pkgs/{data/fonts/inriafonts/default.nix => unit/in/inriafonts/pkg-fun.nix} (100%) rename pkgs/{development/web/insomnia/default.nix => unit/in/insomnia/pkg-fun.nix} (100%) rename pkgs/{applications/radio/inspectrum/default.nix => unit/in/inspectrum/pkg-fun.nix} (100%) rename pkgs/{servers/irc/inspircd/default.nix => unit/in/inspircd/pkg-fun.nix} (100%) rename pkgs/{games => unit/in}/instead-launcher/path.patch (100%) rename pkgs/{games/instead-launcher/default.nix => unit/in/instead-launcher/pkg-fun.nix} (100%) rename pkgs/{games/instead/default.nix => unit/in/instead/pkg-fun.nix} (100%) rename pkgs/{applications/networking/insync/default.nix => unit/in/insync/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/intel-cmt-cat/default.nix => unit/in/intel-cmt-cat/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/intel-compute-runtime/default.nix => unit/in/intel-compute-runtime/pkg-fun.nix} (100%) rename pkgs/{development/libraries/intel-gmmlib/default.nix => unit/in/intel-gmmlib/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/intel-gpu-tools/default.nix => unit/in/intel-gpu-tools/pkg-fun.nix} (100%) rename pkgs/{development/compilers/intel-graphics-compiler/default.nix => unit/in/intel-graphics-compiler/pkg-fun.nix} (100%) rename pkgs/{development/libraries/intel-media-driver/default.nix => unit/in/intel-media-driver/pkg-fun.nix} (100%) rename pkgs/{development/libraries/intel-media-sdk/default.nix => unit/in/intel-media-sdk/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/intel-ocl/default.nix => unit/in/intel-ocl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/intel2200BGFirmware/default.nix => unit/in/intel2200BGFirmware/pkg-fun.nix} (100%) rename pkgs/{data/fonts/inter/default.nix => unit/in/inter/pkg-fun.nix} (100%) rename pkgs/{tools/misc/interactsh/default.nix => unit/in/interactsh/pkg-fun.nix} (100%) rename pkgs/{development/compilers/intercal/default.nix => unit/in/intercal/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/interception-tools/default.nix => unit/in/interception-tools/pkg-fun.nix} (100%) rename pkgs/{servers/interlock/default.nix => unit/in/interlock/pkg-fun.nix} (100%) rename pkgs/{tools/misc/intermodal/default.nix => unit/in/intermodal/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/intltool/default.nix => unit/in/intltool/pkg-fun.nix} (100%) rename pkgs/{tools/text/invoice2data/default.nix => unit/in/invoice2data/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/invoiceplane/default.nix => unit/in/invoiceplane/pkg-fun.nix} (100%) rename pkgs/{tools/system/inxi/default.nix => unit/in/inxi/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/io/default.nix => unit/io/io/pkg-fun.nix} (100%) rename pkgs/{tools/security/ioccheck/default.nix => unit/io/ioccheck/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/io}/iodash/0001-Add-cmake-install-directives.patch (100%) rename pkgs/{development/libraries/iodash/default.nix => unit/io/iodash/pkg-fun.nix} (100%) rename pkgs/{tools/networking/iodine/default.nix => unit/io/iodine/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iomelt/default.nix => unit/io/iomelt/pkg-fun.nix} (100%) rename pkgs/{shells => unit/io}/ion/build-script.patch (100%) rename pkgs/{shells/ion/default.nix => unit/io/ion/pkg-fun.nix} (100%) rename pkgs/{tools/system/ioping/default.nix => unit/io/ioping/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ioport/default.nix => unit/io/ioport/pkg-fun.nix} (100%) rename pkgs/{games/quake3/ioquake/default.nix => unit/io/ioquake3/pkg-fun.nix} (100%) rename pkgs/{tools/system/ior/default.nix => unit/io/ior/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/io}/ios-cross-compile/9.2_builder.sh (100%) rename pkgs/{development/compilers => unit/io}/ios-cross-compile/alt_wrapper.c (100%) rename pkgs/{development/compilers/ios-cross-compile/9.2.nix => unit/io/ios-cross-compile/pkg-fun.nix} (100%) rename pkgs/{data/fonts/iosevka/bin.nix => unit/io/iosevka-bin/pkg-fun.nix} (100%) rename pkgs/{data/fonts/iosevka => unit/io/iosevka-bin}/update-bin.sh (100%) rename pkgs/{data/fonts/iosevka => unit/io/iosevka-bin}/variants.nix (100%) rename pkgs/{tools/misc/iotools/default.nix => unit/io/iotools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iotop-c/default.nix => unit/io/iotop-c/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iotop/default.nix => unit/io/iotop/pkg-fun.nix} (100%) rename pkgs/{tools/networking/iouyap/default.nix => unit/io/iouyap/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/iozone/default.nix => unit/io/iozone/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/ioztat/default.nix => unit/io/ioztat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ip2location-c/default.nix => unit/ip/ip2location-c/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ip2location/default.nix => unit/ip/ip2location/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ip2unix/default.nix => unit/ip/ip2unix/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ipad_charge/default.nix => unit/ip/ipad_charge/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ipaexfont/default.nix => unit/ip/ipaexfont/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ipafont/default.nix => unit/ip/ipafont/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ipbt/default.nix => unit/ip/ipbt/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ipcalc/default.nix => unit/ip/ipcalc/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ip}/ipcalc/sandbox_tests.patch (100%) rename pkgs/{tools/networking/iperf/2.nix => unit/ip/iperf2/pkg-fun.nix} (100%) rename pkgs/{tools/networking/iperf/3.nix => unit/ip/iperf3/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ipfetch/default.nix => unit/ip/ipfetch/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ipfs-cluster/default.nix => unit/ip/ipfs-cluster/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ipfs-upload-client/default.nix => unit/ip/ipfs-upload-client/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ipgrep/default.nix => unit/ip/ipgrep/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ipinfo/default.nix => unit/ip/ipinfo/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ipmicfg/default.nix => unit/ip/ipmicfg/pkg-fun.nix} (100%) rename pkgs/{tools/system/ipmitool/default.nix => unit/ip/ipmitool/pkg-fun.nix} (100%) rename pkgs/{tools/system/ipmiutil/default.nix => unit/ip/ipmiutil/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ipmiview/default.nix => unit/ip/ipmiview/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/ipopt/default.nix => unit/ip/ipopt/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ipp-usb/default.nix => unit/ip/ipp-usb/pkg-fun.nix} (100%) rename pkgs/{applications/networking/firehol/iprange.nix => unit/ip/iprange/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iproute/default.nix => unit/ip/iproute2/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/iprover/default.nix => unit/ip/iprover/pkg-fun.nix} (100%) rename pkgs/{tools/security/ipscan/default.nix => unit/ip/ipscan/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ipset/default.nix => unit/ip/ipset/pkg-fun.nix} (100%) rename pkgs/{applications/networking/iptraf-ng/default.nix => unit/ip/iptraf-ng/pkg-fun.nix} (100%) rename pkgs/{applications/misc/iptsd/default.nix => unit/ip/iptsd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iptstate/default.nix => unit/ip/iptstate/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ipv6calc/default.nix => unit/ip/ipv6calc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ipvsadm/default.nix => unit/ip/ipvsadm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ipxe/default.nix => unit/ip/ipxe/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/iqtree/default.nix => unit/iq/iqtree/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ir-standard-fonts/default.nix => unit/ir/ir-standard-fonts/pkg-fun.nix} (100%) rename pkgs/{servers/irc/irccat/default.nix => unit/ir/irccat/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/irccloud/default.nix => unit/ir/irccloud/pkg-fun.nix} (100%) rename pkgs/{servers/irc/ircd-hybrid/default.nix => unit/ir/ircdHybrid/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/ircdog/default.nix => unit/ir/ircdog/pkg-fun.nix} (100%) rename pkgs/{tools/admin/iredis/default.nix => unit/ir/iredis/pkg-fun.nix} (100%) rename pkgs/{servers/irker/default.nix => unit/ir/irker/pkg-fun.nix} (100%) rename pkgs/{applications/finance/irpf/default.nix => unit/ir/irpf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/irqbalance/default.nix => unit/ir/irqbalance/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/irssi/default.nix => unit/ir/irssi/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jupyter-kernels => unit/ir}/iruby/Gemfile (100%) rename pkgs/{applications/editors/jupyter-kernels => unit/ir}/iruby/Gemfile.lock (100%) rename pkgs/{applications/editors/jupyter-kernels => unit/ir}/iruby/gemset.nix (100%) rename pkgs/{applications/editors/jupyter-kernels/iruby/default.nix => unit/ir/iruby/pkg-fun.nix} (100%) rename pkgs/{development/libraries/isa-l/default.nix => unit/is/isa-l/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ised/default.nix => unit/is/ised/pkg-fun.nix} (100%) rename pkgs/{data/icons/iso-flags/default.nix => unit/is/iso-flags/pkg-fun.nix} (100%) rename pkgs/{development/libraries/iso-codes/default.nix => unit/is/isocodes/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/isolyzer/default.nix => unit/is/isolyzer/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/isomd5sum/default.nix => unit/is/isomd5sum/pkg-fun.nix} (100%) rename pkgs/{tools/text/ispell/default.nix => unit/is/ispell/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/istioctl/default.nix => unit/is/istioctl/pkg-fun.nix} (100%) rename pkgs/{games/itch/default.nix => unit/it/itch/pkg-fun.nix} (100%) rename pkgs/{applications/misc/itd/default.nix => unit/it/itd/pkg-fun.nix} (100%) rename pkgs/{misc/ite-backlight/default.nix => unit/it/ite-backlight/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/iterm2/default.nix => unit/it/iterm2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/itktcl/default.nix => unit/it/itktcl/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/it}/itm-tools/cargo-lock.patch (100%) rename pkgs/{development/tools/misc/itm-tools/default.nix => unit/it/itm-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/itpp/default.nix => unit/it/itpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/itstool/default.nix => unit/it/itstool/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/itsx/default.nix => unit/it/itsx/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/microcode/iucode-tool.nix => unit/iu/iucode-tool/pkg-fun.nix} (100%) rename pkgs/{games/ivan/default.nix => unit/iv/ivan/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iw/default.nix => unit/iw/iw/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/iwd/default.nix => unit/iw/iwd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/iwgtk/default.nix => unit/iw/iwgtk/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/iw}/iwgtk/systemd-service.patch (100%) rename pkgs/{data/fonts/iwona/default.nix => unit/iw/iwona/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ix/default.nix => unit/ix/ix/pkg-fun.nix} (100%) rename pkgs/{applications/misc/j4-dmenu-desktop/default.nix => unit/j4/j4-dmenu-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jaaa/default.nix => unit/ja/jaaa/pkg-fun.nix} (100%) rename pkgs/{misc/jackaudio/jack1.nix => unit/ja/jack1/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jack-capture/default.nix => unit/ja/jack_capture/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jack-oscrolloscope/default.nix => unit/ja/jack_oscrolloscope/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jack-rack/default.nix => unit/ja/jack_rack/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ja}/jackett/deps.nix (100%) rename pkgs/{servers/jackett/default.nix => unit/ja/jackett/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ja}/jackett/updater.sh (100%) rename pkgs/{applications/networking/instant-messengers/jackline/default.nix => unit/ja/jackline/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jackmeter/default.nix => unit/ja/jackmeter/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/jacoco/default.nix => unit/ja/jacoco/pkg-fun.nix} (100%) rename pkgs/{tools/text/sgml/jade/default.nix => unit/ja/jade/pkg-fun.nix} (100%) rename pkgs/{tools/security/jadx/default.nix => unit/ja/jadx/pkg-fun.nix} (100%) rename pkgs/{tools/security/jaeles/default.nix => unit/ja/jaeles/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/jags/default.nix => unit/ja/jags/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jalv/default.nix => unit/ja/jalv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jama/default.nix => unit/ja/jama/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jamin/default.nix => unit/ja/jamin/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/janet/default.nix => unit/ja/janet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jansson/default.nix => unit/ja/jansson/pkg-fun.nix} (100%) rename pkgs/{servers/janus-gateway/default.nix => unit/ja/janus-gateway/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/janusgraph/default.nix => unit/ja/janusgraph/pkg-fun.nix} (100%) rename pkgs/{applications/audio/japa/default.nix => unit/ja/japa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jarowinkler-cpp/default.nix => unit/ja/jarowinkler-cpp/pkg-fun.nix} (100%) rename pkgs/{development/compilers/jasmin-compiler/default.nix => unit/ja/jasmin-compiler/pkg-fun.nix} (100%) rename pkgs/{development/compilers/jasmin/default.nix => unit/ja/jasmin/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/ja}/jasmin/test-assemble-hello-world/HelloWorld.j (100%) rename pkgs/{development/compilers => unit/ja}/jasmin/test-assemble-hello-world/default.nix (100%) rename pkgs/{development/libraries/jasper/default.nix => unit/ja/jasper/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/java-language-server/default.nix => unit/ja/java-language-server/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/jay/default.nix => unit/ja/jay/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ja}/jazzy/Gemfile (100%) rename pkgs/{development/tools => unit/ja}/jazzy/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ja}/jazzy/gemset.nix (100%) rename pkgs/{development/tools/jazzy/default.nix => unit/ja/jazzy/pkg-fun.nix} (100%) rename pkgs/{development/tools/jbake/default.nix => unit/jb/jbake/pkg-fun.nix} (100%) rename pkgs/{development/tools/jbang/default.nix => unit/jb/jbang/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jbig2dec/default.nix => unit/jb/jbig2dec/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/jb}/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch (100%) rename pkgs/{tools/graphics/jbig2enc/default.nix => unit/jb/jbig2enc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jbigkit/default.nix => unit/jb/jbigkit/pkg-fun.nix} (100%) rename pkgs/{tools/text/jbofihe/default.nix => unit/jb/jbofihe/pkg-fun.nix} (100%) rename pkgs/{servers/http/jboss/default.nix => unit/jb/jboss/pkg-fun.nix} (100%) rename pkgs/{servers/http/jboss/jdbc/mysql/default.nix => unit/jb/jboss_mysql_jdbc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jcal/default.nix => unit/jc/jcal/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jconvolver/default.nix => unit/jc/jconvolver/pkg-fun.nix} (100%) rename pkgs/{tools/security/jd-cli/default.nix => unit/jd/jd-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/jd-diff-patch/default.nix => unit/jd/jd-diff-patch/pkg-fun.nix} (100%) rename pkgs/{tools/security/jd-gui/default.nix => unit/jd/jd-gui/pkg-fun.nix} (100%) rename pkgs/{tools/misc/jdiskreport/default.nix => unit/jd/jdiskreport/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/jdom/default.nix => unit/jd/jdom/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/jdt-language-server/default.nix => unit/jd/jdt-language-server/pkg-fun.nix} (100%) rename pkgs/{tools/misc/jdupes/default.nix => unit/jd/jdupes/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jed/default.nix => unit/je/jed/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/je}/jedit/build.xml.patch (100%) rename pkgs/{applications/editors/jedit/default.nix => unit/je/jedit/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/je}/jekyll/basic/Gemfile (100%) rename pkgs/{applications/misc => unit/je}/jekyll/basic/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/je}/jekyll/basic/gemset.nix (100%) rename pkgs/{applications/misc => unit/je}/jekyll/full/Gemfile (100%) rename pkgs/{applications/misc => unit/je}/jekyll/full/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/je}/jekyll/full/gemset.nix (100%) rename pkgs/{applications/misc/jekyll/default.nix => unit/je/jekyll/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/je}/jekyll/update.sh (100%) rename pkgs/{development/interpreters/jelly/default.nix => unit/je/jelly/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/je}/jellycli/fix-test-dir.patch (100%) rename pkgs/{applications/audio/jellycli/default.nix => unit/je/jellycli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jellyfin-ffmpeg/default.nix => unit/je/jellyfin-ffmpeg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jemalloc/default.nix => unit/je/jemalloc/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration/jenkins/default.nix => unit/je/jenkins/pkg-fun.nix} (100%) rename pkgs/{development/tools/jet/default.nix => unit/je/jet/pkg-fun.nix} (100%) rename pkgs/{data/fonts/jetbrains-mono/default.nix => unit/je/jetbrains-mono/pkg-fun.nix} (100%) rename pkgs/{servers/http/jetty/default.nix => unit/je/jetty/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/jffi/default.nix => unit/jf/jffi/pkg-fun.nix} (100%) rename pkgs/{applications/science/engineering/jflap/default.nix => unit/jf/jflap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/jflex/default.nix => unit/jf/jflex/pkg-fun.nix} (100%) rename pkgs/{development/tools/jfmt/default.nix => unit/jf/jfmt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/jfrog-cli/default.nix => unit/jf/jfrog-cli/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/jf}/jfsutils/ar-fix.patch (100%) rename pkgs/{tools/filesystems => unit/jf}/jfsutils/hardening-format.patch (100%) rename pkgs/{tools/filesystems/jfsutils/default.nix => unit/jf/jfsutils/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/jf}/jfsutils/types.patch (100%) rename pkgs/{applications/video/jftui/default.nix => unit/jf/jftui/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jgmenu/default.nix => unit/jg/jgmenu/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/jhead/default.nix => unit/jh/jhead/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/jhiccup/default.nix => unit/jh/jhiccup/pkg-fun.nix} (100%) rename pkgs/{servers/jibri/default.nix => unit/ji/jibri/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ji}/jibri/update.sh (100%) rename pkgs/{servers => unit/ji}/jicofo/logging.properties-journal (100%) rename pkgs/{servers/jicofo/default.nix => unit/ji/jicofo/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ji}/jicofo/update.sh (100%) rename pkgs/{development/tools => unit/ji}/jid/deps.nix (100%) rename pkgs/{development/tools/jid/default.nix => unit/ji/jid/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/jikespg/default.nix => unit/ji/jikespg/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/jimtcl/default.nix => unit/ji/jimtcl/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/jiq/default.nix => unit/ji/jiq/pkg-fun.nix} (100%) rename pkgs/{development/tools/jira-cli-go/default.nix => unit/ji/jira-cli-go/pkg-fun.nix} (100%) rename pkgs/{development/tools/jira_cli/default.nix => unit/ji/jira-cli/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/jirafeau/default.nix => unit/ji/jirafeau/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jiten/default.nix => unit/ji/jiten/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/jitsi-meet-electron/default.nix => unit/ji/jitsi-meet-electron/pkg-fun.nix} (100%) rename pkgs/{misc/jitsi-meet-prosody/default.nix => unit/ji/jitsi-meet-prosody/pkg-fun.nix} (100%) rename pkgs/{misc => unit/ji}/jitsi-meet-prosody/update.sh (100%) rename pkgs/{servers/web-apps/jitsi-meet/default.nix => unit/ji/jitsi-meet/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/ji}/jitsi-meet/update.sh (100%) rename pkgs/{servers => unit/ji}/jitsi-videobridge/logging.properties-journal (100%) rename pkgs/{servers/jitsi-videobridge/default.nix => unit/ji/jitsi-videobridge/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ji}/jitsi-videobridge/update.sh (100%) rename pkgs/{applications/networking/instant-messengers => unit/ji}/jitsi/jitsi.patch (100%) rename pkgs/{applications/networking/instant-messengers/jitsi/default.nix => unit/ji/jitsi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jitterentropy/default.nix => unit/ji/jitterentropy/pkg-fun.nix} (100%) rename pkgs/{development/tools/jmespath/default.nix => unit/jm/jmespath/pkg-fun.nix} (100%) rename pkgs/{applications/networking/jmeter/default.nix => unit/jm/jmeter/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/jmtpfs/default.nix => unit/jm/jmtpfs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/jmusicbot/default.nix => unit/jm/jmusicbot/pkg-fun.nix} (100%) rename pkgs/{development/java-modules/jna/default.nix => unit/jn/jna/pkg-fun.nix} (100%) rename pkgs/{applications/networking/jnetmap/default.nix => unit/jn/jnetmap/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/jn}/jnettop/no-dns-resolution.patch (100%) rename pkgs/{tools/networking/jnettop/default.nix => unit/jn/jnettop/pkg-fun.nix} (100%) rename pkgs/{development/tools/jo/default.nix => unit/jo/jo/pkg-fun.nix} (100%) rename pkgs/{tools/system/jobber/default.nix => unit/jo/jobber/pkg-fun.nix} (100%) rename pkgs/{applications/editors/joe/default.nix => unit/jo/joe/pkg-fun.nix} (100%) rename pkgs/{tools/security/john/default.nix => unit/jo/john/pkg-fun.nix} (100%) rename pkgs/{applications/misc/join-desktop/default.nix => unit/jo/join-desktop/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/joker/default.nix => unit/jo/joker/pkg-fun.nix} (100%) rename pkgs/{applications/misc/joplin-desktop/default.nix => unit/jo/joplin-desktop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jose/default.nix => unit/jo/jose/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/josh/default.nix => unit/jo/josh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/josm/default.nix => unit/jo/josm/pkg-fun.nix} (100%) rename pkgs/{data/fonts/jost/default.nix => unit/jo/jost/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jot/default.nix => unit/jo/jot/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jotta-cli/default.nix => unit/jo/jotta-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/journaldriver/default.nix => unit/jo/journaldriver/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jove/default.nix => unit/jo/jove/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/joycond/default.nix => unit/jo/joycond/pkg-fun.nix} (100%) rename pkgs/{data/fonts/joypixels/default.nix => unit/jo/joypixels/pkg-fun.nix} (100%) rename pkgs/{tools/games/joystickwake/default.nix => unit/jo/joystickwake/pkg-fun.nix} (100%) rename pkgs/{development/tools/jp/default.nix => unit/jp/jp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jp2a/default.nix => unit/jp/jp2a/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/jpeg-archive/default.nix => unit/jp/jpeg-archive/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/jpegexiforient/default.nix => unit/jp/jpegexiforient/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/jpeginfo/default.nix => unit/jp/jpeginfo/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/jpegoptim/default.nix => unit/jp/jpegoptim/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/jpegrescan/default.nix => unit/jp/jpegrescan/pkg-fun.nix} (100%) rename pkgs/{development/tools/jpexs/default.nix => unit/jp/jpexs/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/janet/jpm.nix => unit/jp/jpm/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/jq}/jq/fix-tests-when-building-without-regex-supports.patch (100%) rename pkgs/{development/tools/jq/default.nix => unit/jq/jq/pkg-fun.nix} (100%) rename pkgs/{development/tools/jql/default.nix => unit/jq/jql/pkg-fun.nix} (100%) rename pkgs/{development/tools/jqp/default.nix => unit/jq/jqp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jquake/default.nix => unit/jq/jquake/pkg-fun.nix} (100%) rename pkgs/{applications/misc/jrnl/default.nix => unit/jr/jrnl/pkg-fun.nix} (100%) rename pkgs/{development/compilers/jrsonnet/default.nix => unit/jr/jrsonnet/pkg-fun.nix} (100%) rename pkgs/{tools/text/jsawk/default.nix => unit/js/jsawk/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/js}/jscoverage/jsfalse_to_null.patch (100%) rename pkgs/{development/tools/misc/jscoverage/default.nix => unit/js/jscoverage/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/js}/jsduck/Gemfile (100%) rename pkgs/{development/tools => unit/js}/jsduck/Gemfile.lock (100%) rename pkgs/{development/tools => unit/js}/jsduck/gemset.nix (100%) rename pkgs/{development/tools/jsduck/default.nix => unit/js/jsduck/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/jshon/default.nix => unit/js/jshon/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/js}/json-glib/meson-add-installed-tests-prefix-option.patch (100%) rename pkgs/{development/libraries/json-glib/default.nix => unit/js/json-glib/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/json-plot/default.nix => unit/js/json-plot/pkg-fun.nix} (100%) rename pkgs/{development/tools/json2hcl/default.nix => unit/js/json2hcl/pkg-fun.nix} (100%) rename pkgs/{development/tools/json2tsv/default.nix => unit/js/json2tsv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/json-c/default.nix => unit/js/json_c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jsoncpp/default.nix => unit/js/jsoncpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/jsonnet-bundler/default.nix => unit/js/jsonnet-bundler/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/jsonnet-language-server/default.nix => unit/js/jsonnet-language-server/pkg-fun.nix} (100%) rename pkgs/{development/compilers/jsonnet/default.nix => unit/js/jsonnet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jsonrpc-glib/default.nix => unit/js/jsonrpc-glib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/jstest-gtk/default.nix => unit/js/jstest-gtk/pkg-fun.nix} (100%) rename pkgs/{tools/security/jsubfinder/default.nix => unit/js/jsubfinder/pkg-fun.nix} (100%) rename pkgs/{tools/system/jsvc/default.nix => unit/js/jsvc/pkg-fun.nix} (100%) rename pkgs/{development/embedded/jtag-remote-server/default.nix => unit/jt/jtag-remote-server/pkg-fun.nix} (100%) rename pkgs/{development/tools/jtc/default.nix => unit/jt/jtc/pkg-fun.nix} (100%) rename pkgs/{servers/sql/mssql/jdbc/jtds.nix => unit/jt/jtds_jdbc/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jucipp/default.nix => unit/ju/jucipp/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ju}/judy/cross.patch (100%) rename pkgs/{development/libraries/judy/default.nix => unit/ju/judy/pkg-fun.nix} (100%) rename pkgs/{tools/misc/jugglinglab/default.nix => unit/ju/jugglinglab/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/juicefs/default.nix => unit/ju/juicefs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/juju/default.nix => unit/ju/juju/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/jujuutils/default.nix => unit/ju/jujuutils/pkg-fun.nix} (100%) rename pkgs/{data/fonts/julia-mono/default.nix => unit/ju/julia-mono/pkg-fun.nix} (100%) rename pkgs/{development/compilers/julia => unit/ju/julia_16-bin}/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch (100%) rename pkgs/{development/compilers/julia/1.6-bin.nix => unit/ju/julia_16-bin/pkg-fun.nix} (100%) rename pkgs/{development/compilers/julia => unit/ju/julia_18-bin}/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch (100%) rename pkgs/{development/compilers/julia/1.8-bin.nix => unit/ju/julia_18-bin/pkg-fun.nix} (100%) rename pkgs/{games/julius/default.nix => unit/ju/julius/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/ju}/jumanpp/0001-Exclude-all-tests-from-the-build.patch (100%) rename pkgs/{tools/text/jumanpp/default.nix => unit/ju/jumanpp/pkg-fun.nix} (100%) rename pkgs/{tools/system/jump/default.nix => unit/ju/jump/pkg-fun.nix} (100%) rename pkgs/{tools/X11/jumpapp/default.nix => unit/ju/jumpapp/pkg-fun.nix} (100%) rename pkgs/{games/jumpnbump/default.nix => unit/ju/jumpnbump/pkg-fun.nix} (100%) rename pkgs/{games/jumpy/default.nix => unit/ju/jumpy/pkg-fun.nix} (100%) rename pkgs/{applications/misc/junction/default.nix => unit/ju/junction/pkg-fun.nix} (100%) rename pkgs/{data/fonts/junicode/default.nix => unit/ju/junicode/pkg-fun.nix} (100%) rename pkgs/{development/compilers/juniper/default.nix => unit/ju/juniper/pkg-fun.nix} (100%) rename pkgs/{tools/networking/junkie/default.nix => unit/ju/junkie/pkg-fun.nix} (100%) rename pkgs/{data/themes/juno/default.nix => unit/ju/juno-theme/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jupp/default.nix => unit/ju/jupp/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jupyter/kernel.nix => unit/ju/jupyter-kernel/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jupyter/default.nix => unit/ju/jupyter/pkg-fun.nix} (100%) rename pkgs/{shells/jush/default.nix => unit/ju/jush/pkg-fun.nix} (100%) rename pkgs/{development/tools/just/default.nix => unit/ju/just/pkg-fun.nix} (100%) rename pkgs/{tools/text/justify/default.nix => unit/ju/justify/pkg-fun.nix} (100%) rename pkgs/{development/compilers/jwasm/default.nix => unit/jw/jwasm/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/jw}/jwhois/connect.patch (100%) rename pkgs/{tools/networking/jwhois/default.nix => unit/jw/jwhois/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/jw}/jwhois/service-name.patch (100%) rename pkgs/{applications/window-managers/jwm/jwm-settings-manager.nix => unit/jw/jwm-settings-manager/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/jwm/default.nix => unit/jw/jwm/pkg-fun.nix} (100%) rename pkgs/{tools/security/jwt-hack/default.nix => unit/jw/jwt-hack/pkg-fun.nix} (100%) rename pkgs/{tools/security/jwx/default.nix => unit/jw/jwx/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/jx/default.nix => unit/jx/jx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/jxrlib/default.nix => unit/jx/jxrlib/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/jython/default.nix => unit/jy/jython/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/k0sctl/default.nix => unit/k0/k0sctl/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/k2}/k2pdfopt/0001-Fix-CMakeLists.patch (100%) rename pkgs/{applications/misc/k2pdfopt/default.nix => unit/k2/k2pdfopt/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/k2tf/default.nix => unit/k2/k2tf/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/k3}/k3s/chart-versions.nix (100%) rename pkgs/{applications/networking/cluster/k3s/default.nix => unit/k3/k3s/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/k3}/k3s/update.sh (100%) rename pkgs/{applications/networking/cluster/k3sup/default.nix => unit/k3/k3sup/pkg-fun.nix} (100%) rename pkgs/{applications/misc/k40-whisperer/default.nix => unit/k4/k40-whisperer/pkg-fun.nix} (100%) rename pkgs/{development/tools/k6/default.nix => unit/k6/k6/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/k9s/default.nix => unit/k9/k9s/pkg-fun.nix} (100%) rename pkgs/{games/kabeljau/default.nix => unit/ka/kabeljau/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kacst/default.nix => unit/ka/kacst/pkg-fun.nix} (100%) rename pkgs/{development/tools/kaf/default.nix => unit/ka/kaf/pkg-fun.nix} (100%) rename pkgs/{development/tools/kafka-delta-ingest/default.nix => unit/ka/kafka-delta-ingest/pkg-fun.nix} (100%) rename pkgs/{development/tools/kafkactl/default.nix => unit/ka/kafkactl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/kail/default.nix => unit/ka/kail/pkg-fun.nix} (100%) rename pkgs/{development/compilers/kaitai-struct-compiler/default.nix => unit/ka/kaitai-struct-compiler/pkg-fun.nix} (100%) rename pkgs/{tools/text/kakasi/default.nix => unit/ka/kakasi/pkg-fun.nix} (100%) rename pkgs/{applications/editors/kakoune/plugins => unit/ka/kakouneUtils}/build-kakoune-plugin.nix (100%) rename pkgs/{applications/editors/kakoune/plugins/kakoune-utils.nix => unit/ka/kakouneUtils/pkg-fun.nix} (100%) rename pkgs/{applications/radio/kalibrate-hackrf/default.nix => unit/ka/kalibrate-hackrf/pkg-fun.nix} (100%) rename pkgs/{applications/radio/kalibrate-rtl/default.nix => unit/ka/kalibrate-rtl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kalker/default.nix => unit/ka/kalker/pkg-fun.nix} (100%) rename pkgs/{servers/ftp/kamid/default.nix => unit/ka/kamid/pkg-fun.nix} (100%) rename pkgs/{tools/system/kanata/default.nix => unit/ka/kanata/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kanboard/default.nix => unit/ka/kanboard/pkg-fun.nix} (100%) rename pkgs/{servers/kanidm/default.nix => unit/ka/kanidm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kanif/default.nix => unit/ka/kanif/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kanit/default.nix => unit/ka/kanit-font/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kanji-stroke-order-font/default.nix => unit/ka/kanji-stroke-order-font/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kanjidraw/default.nix => unit/ka/kanjidraw/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/kanshi/default.nix => unit/ka/kanshi/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/kapacitor/default.nix => unit/ka/kapacitor/pkg-fun.nix} (100%) rename pkgs/{applications/audio/kapitonov-plugins-pack/default.nix => unit/ka/kapitonov-plugins-pack/pkg-fun.nix} (100%) rename pkgs/{servers/kapowbang/default.nix => unit/ka/kapowbang/pkg-fun.nix} (100%) rename pkgs/{tools/networking/kapp/default.nix => unit/ka/kapp/pkg-fun.nix} (100%) rename pkgs/{applications/radio/kappanhang/default.nix => unit/ka/kappanhang/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/karabiner-elements/default.nix => unit/ka/karabiner-elements/pkg-fun.nix} (100%) rename pkgs/{development/tools/karate/default.nix => unit/ka/karate/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kargo/default.nix => unit/ka/kargo/pkg-fun.nix} (100%) rename pkgs/{applications/office/karlender/default.nix => unit/ka/karlender/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/ka}/karma/node-composition.nix (100%) rename pkgs/{development/web/newman => unit/ka/karma}/node-env.nix (100%) rename pkgs/{servers/monitoring => unit/ka}/karma/node-packages.nix (100%) rename pkgs/{servers/monitoring/karma/default.nix => unit/ka/karma/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/karmor/default.nix => unit/ka/karmor/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/kasmweb/default.nix => unit/ka/kasmweb/pkg-fun.nix} (100%) rename pkgs/{games/katago/default.nix => unit/ka/katago/pkg-fun.nix} (100%) rename pkgs/{tools/security/katana/default.nix => unit/ka/katana/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/kati/default.nix => unit/ka/kati/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/ka}/kati/version.patch (100%) rename pkgs/{applications/window-managers/katriawm/default.nix => unit/ka/katriawm/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kawkab-mono/default.nix => unit/ka/kawkab-mono-font/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/ka}/kazam/fix-paths.patch (100%) rename pkgs/{applications/video/kazam/default.nix => unit/ka/kazam/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kbd/default.nix => unit/kb/kbd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/kb}/kbd/search-paths.patch (100%) rename pkgs/{applications/window-managers/kbdd/default.nix => unit/kb/kbdd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kbdlight/default.nix => unit/kb/kbdlight/pkg-fun.nix} (100%) rename pkgs/{tools/security/keybase/kbfs.nix => unit/kb/kbfs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kbst/default.nix => unit/kb/kbst/pkg-fun.nix} (100%) rename pkgs/{development/tools/kcat/default.nix => unit/kc/kcat/pkg-fun.nix} (100%) rename pkgs/{development/web/kcgi/default.nix => unit/kc/kcgi/pkg-fun.nix} (100%) rename pkgs/{development/tools/kcli/default.nix => unit/kc/kcli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kconf/default.nix => unit/kc/kconf/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/kcov/default.nix => unit/kc/kcov/pkg-fun.nix} (100%) rename pkgs/{data/themes/kde-gruvbox/default.nix => unit/kd/kde-gruvbox/pkg-fun.nix} (100%) rename pkgs/{tools/security/kdigger/default.nix => unit/kd/kdigger/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ke}/kea/dont-create-var.patch (100%) rename pkgs/{tools/networking/kea/default.nix => unit/ke/kea/pkg-fun.nix} (100%) rename pkgs/{games/keen4/default.nix => unit/ke/keen4/pkg-fun.nix} (100%) rename pkgs/{tools/networking/keepalived/default.nix => unit/ke/keepalived/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/charactercopy/default.nix => unit/ke/keepass-charactercopy/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-diff/default.nix => unit/ke/keepass-diff/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/keeagent/default.nix => unit/ke/keepass-keeagent/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/keepasshttp/default.nix => unit/ke/keepass-keepasshttp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/keepassrpc/default.nix => unit/ke/keepass-keepassrpc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/keetraytotp/default.nix => unit/ke/keepass-keetraytotp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/otpkeyprov/default.nix => unit/ke/keepass-otpkeyprov/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepass-plugins/qrcodeview/default.nix => unit/ke/keepass-qrcodeview/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ke}/keepass/extractWinRscIconsToStdFreeDesktopDir.sh (100%) rename pkgs/{applications/misc => unit/ke}/keepass/fix-paths.patch (100%) rename pkgs/{applications/misc => unit/ke}/keepass/keepass-plugins-load.patch (100%) rename pkgs/{applications/misc => unit/ke}/keepass/keepass-plugins.patch (100%) rename pkgs/{applications/misc/keepass/default.nix => unit/ke/keepass/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepassx/default.nix => unit/ke/keepassx/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ke}/keepassx/random.patch (100%) rename pkgs/{applications/misc/keepassx/2.0.nix => unit/ke/keepassx2/pkg-fun.nix} (100%) rename pkgs/{games/keeperrl/default.nix => unit/ke/keeperrl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keepmenu/default.nix => unit/ke/keepmenu/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/keet/default.nix => unit/ke/keet/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keeweb/default.nix => unit/ke/keeweb/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/kent/default.nix => unit/ke/kent/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kepubify/default.nix => unit/ke/kepubify/pkg-fun.nix} (100%) rename pkgs/{tools/security/kerbrute/default.nix => unit/ke/kerbrute/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/kermit-terminal/default.nix => unit/ke/kermit-terminal/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kermit/default.nix => unit/ke/kermit/pkg-fun.nix} (100%) rename pkgs/{tools/security/kestrel/default.nix => unit/ke/kestrel/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kexec-tools/default.nix => unit/ke/kexec-tools/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/key/default.nix => unit/ke/key/pkg-fun.nix} (100%) rename pkgs/{tools/security/keybase/gui.nix => unit/ke/keybase-gui/pkg-fun.nix} (100%) rename pkgs/{tools/security/keycard-cli/default.nix => unit/ke/keycard-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/keychain/default.nix => unit/ke/keychain/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ke}/keycloak/all-plugins.nix (100%) rename pkgs/{servers => unit/ke}/keycloak/config_vars.patch (100%) rename pkgs/{servers => unit/ke}/keycloak/keycloak-discord/default.nix (100%) rename pkgs/{servers => unit/ke}/keycloak/keycloak-metrics-spi/default.nix (100%) rename pkgs/{servers/keycloak/default.nix => unit/ke/keycloak/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ke}/keycloak/scim-for-keycloak/default.nix (100%) rename pkgs/{servers => unit/ke}/keycloak/scim-keycloak-user-storage-spi/default.nix (100%) rename pkgs/{tools/inputmethods/keyd/default.nix => unit/ke/keyd/pkg-fun.nix} (100%) rename pkgs/{applications/audio/keyfinder-cli/default.nix => unit/ke/keyfinder-cli/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/keyfuzz/default.nix => unit/ke/keyfuzz/pkg-fun.nix} (100%) rename pkgs/{applications/misc/keylight-controller-mschneider82/default.nix => unit/ke/keylight-controller-mschneider82/pkg-fun.nix} (100%) rename pkgs/{tools/misc/keymapviz/default.nix => unit/ke/keymapviz/pkg-fun.nix} (100%) rename pkgs/{tools/X11/keynav/default.nix => unit/ke/keynav/pkg-fun.nix} (100%) rename pkgs/{development/libraries/keystone/default.nix => unit/ke/keystone/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ke}/keyutils/0001-Remove-unused-function-after_eq.patch (100%) rename pkgs/{os-specific/linux => unit/ke}/keyutils/conf-symlink.patch (100%) rename pkgs/{os-specific/linux/keyutils/default.nix => unit/ke/keyutils/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kfctl/default.nix => unit/kf/kfctl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/khal/default.nix => unit/kh/khal/pkg-fun.nix} (100%) rename pkgs/{applications/misc/khard/default.nix => unit/kh/khard/pkg-fun.nix} (100%) rename pkgs/{data/fonts/khmeros/default.nix => unit/kh/khmeros/pkg-fun.nix} (100%) rename pkgs/{development/libraries/khronos-ocl-icd-loader/default.nix => unit/kh/khronos-ocl-icd-loader/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/kh}/khronos-ocl-icd-loader/tracing.patch (100%) rename pkgs/{applications/office/khronos/default.nix => unit/kh/khronos/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/kibana => unit/ki/kibana7}/disable-nodejs-version-check-7.patch (100%) rename pkgs/{development/tools/misc/kibana => unit/ki/kibana7}/disable-nodejs-version-check.patch (100%) rename pkgs/{development/tools/misc/kibana/7.x.nix => unit/ki/kibana7/pkg-fun.nix} (100%) rename pkgs/{applications/editors/kibi/default.nix => unit/ki/kibi/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/ki}/kicad/base.nix (100%) rename pkgs/{applications/science/electronics => unit/ki}/kicad/libraries.nix (100%) rename pkgs/{applications/science/electronics/kicad/default.nix => unit/ki/kicad/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/ki}/kicad/update.sh (100%) rename pkgs/{applications/science/electronics => unit/ki}/kicad/versions.nix (100%) rename pkgs/{applications/science/electronics => unit/ki}/kicad/writable.patch (100%) rename pkgs/{tools/admin/kics/default.nix => unit/ki/kics/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kile-wl/default.nix => unit/ki/kile-wl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kiln/default.nix => unit/ki/kiln/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/kime/default.nix => unit/ki/kime/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ki}/kind/kernel-module-path.patch (100%) rename pkgs/{development/tools/kind/default.nix => unit/ki/kind/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ki}/kinect-audio-setup/libusb-1-import-path.patch (100%) rename pkgs/{os-specific/linux/kinect-audio-setup/default.nix => unit/ki/kinect-audio-setup/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ki}/kinect-audio-setup/udev-rules-extra-devices.patch (100%) rename pkgs/{applications/networking/irc/kirc/default.nix => unit/ki/kirc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniffers/kismet/default.nix => unit/ki/kismet/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/kissat/default.nix => unit/ki/kissat/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/ki}/kissat/writable-passwd-is-ok.patch (100%) rename pkgs/{development/libraries => unit/ki}/kissfft/0001-pkgconfig-darwin.patch (100%) rename pkgs/{development/libraries/kissfft/default.nix => unit/ki/kissfft/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kisslicer/default.nix => unit/ki/kisslicer/pkg-fun.nix} (100%) rename pkgs/{tools/security/kiterunner/default.nix => unit/ki/kiterunner/pkg-fun.nix} (100%) rename pkgs/{misc/kitty-themes/default.nix => unit/ki/kitty-themes/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kiwix/tools.nix => unit/ki/kiwix-tools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kjv/default.nix => unit/kj/kjv/pkg-fun.nix} (100%) rename pkgs/{games => unit/kl}/klavaro/icons.patch (100%) rename pkgs/{games/klavaro/default.nix => unit/kl/klavaro/pkg-fun.nix} (100%) rename pkgs/{games => unit/kl}/klavaro/trans_lang_get_similar.patch (100%) rename pkgs/{os-specific/linux => unit/kl}/klibc/no-reinstall-kernel-headers.patch (100%) rename pkgs/{os-specific/linux/klibc/default.nix => unit/kl/klibc/pkg-fun.nix} (100%) rename pkgs/{applications/audio/klick/default.nix => unit/kl/klick/pkg-fun.nix} (100%) rename pkgs/{servers/klipper/klipper-genconf.nix => unit/kl/klipper-genconf/pkg-fun.nix} (100%) rename pkgs/{servers/klipper/default.nix => unit/kl/klipper/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kluctl/default.nix => unit/kl/kluctl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/klystrack/default.nix => unit/kl/klystrack/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kmod-blacklist-ubuntu/default.nix => unit/km/kmod-blacklist-ubuntu/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kmod-debian-aliases/default.nix => unit/km/kmod-debian-aliases/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/km}/kmod/enable-static.patch (100%) rename pkgs/{os-specific/linux => unit/km}/kmod/module-dir.patch (100%) rename pkgs/{os-specific/linux/kmod/default.nix => unit/km/kmod/pkg-fun.nix} (100%) rename pkgs/{tools/system/kmon/default.nix => unit/km/kmon/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kmscon/default.nix => unit/km/kmscon/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kmscube/default.nix => unit/km/kmscube/pkg-fun.nix} (100%) rename pkgs/{development/libraries/kmsxx/default.nix => unit/km/kmsxx/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kn/default.nix => unit/kn/kn/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/genkfs/default.nix => unit/kn/knightos-genkfs/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/kcc/default.nix => unit/kn/knightos-kcc/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/kimg/default.nix => unit/kn/knightos-kimg/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/kpack/default.nix => unit/kn/knightos-kpack/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/mkrom/default.nix => unit/kn/knightos-mkrom/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/mktiupgrade/default.nix => unit/kn/knightos-mktiupgrade/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/patchrom/default.nix => unit/kn/knightos-patchrom/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/scas/default.nix => unit/kn/knightos-scas/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/z80e/default.nix => unit/kn/knightos-z80e/pkg-fun.nix} (100%) rename pkgs/{tools/security/knockpy/default.nix => unit/kn/knockpy/pkg-fun.nix} (100%) rename pkgs/{servers/dns => unit/kn}/knot-dns/dont-create-run-time-dirs.patch (100%) rename pkgs/{servers/dns/knot-dns/default.nix => unit/kn/knot-dns/pkg-fun.nix} (100%) rename pkgs/{servers/dns => unit/kn}/knot-dns/runtime-deps.patch (100%) rename pkgs/{development/tools/ko/default.nix => unit/ko/ko/pkg-fun.nix} (100%) rename pkgs/{games => unit/ko}/kobodeluxe/glibc29.patch (100%) rename pkgs/{games/kobodeluxe/default.nix => unit/ko/kobodeluxe/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kochi-substitute-naga10/default.nix => unit/ko/kochi-substitute-naga10/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kochi-substitute/default.nix => unit/ko/kochi-substitute/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kodi-cli/default.nix => unit/ko/kodi-cli/pkg-fun.nix} (100%) rename pkgs/{servers/komga/default.nix => unit/ko/komga/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kompose/default.nix => unit/ko/kompose/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/kona/default.nix => unit/ko/kona/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kondo/default.nix => unit/ko/kondo/pkg-fun.nix} (100%) rename pkgs/{development/tools/konf/default.nix => unit/ko/konf/pkg-fun.nix} (100%) rename pkgs/{development/tools/konstraint/default.nix => unit/ko/konstraint/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/ko}/kontemplate/deps.nix (100%) rename pkgs/{applications/networking/cluster/kontemplate/default.nix => unit/ko/kontemplate/pkg-fun.nix} (100%) rename pkgs/{applications/video/kooha/default.nix => unit/ko/kooha/pkg-fun.nix} (100%) rename pkgs/{tools/backup/kopia/default.nix => unit/ko/kopia/pkg-fun.nix} (100%) rename pkgs/{applications/misc/koreader/default.nix => unit/ko/koreader/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix => unit/ko/kotatogram-desktop-with-webkit/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/kotlin-language-server/default.nix => unit/ko/kotlin-language-server/pkg-fun.nix} (100%) rename pkgs/{development/compilers/kotlin/native.nix => unit/ko/kotlin-native/pkg-fun.nix} (100%) rename pkgs/{development/compilers/kotlin/default.nix => unit/ko/kotlin/pkg-fun.nix} (100%) rename pkgs/{games/koules/default.nix => unit/ko/koules/pkg-fun.nix} (100%) rename pkgs/{tools/security/kpcli/default.nix => unit/kp/kpcli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kpt/default.nix => unit/kp/kpt/pkg-fun.nix} (100%) rename pkgs/{tools/system/krakenx/default.nix => unit/kr/krakenx/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting => unit/kr}/kramdown-asciidoc/Gemfile (100%) rename pkgs/{tools/typesetting => unit/kr}/kramdown-asciidoc/Gemfile.lock (100%) rename pkgs/{tools/typesetting => unit/kr}/kramdown-asciidoc/gemset.nix (100%) rename pkgs/{tools/typesetting/kramdown-asciidoc/default.nix => unit/kr/kramdown-asciidoc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/kr}/krane/Gemfile (100%) rename pkgs/{applications/networking/cluster => unit/kr}/krane/Gemfile.lock (100%) rename pkgs/{applications/networking/cluster => unit/kr}/krane/gemset.nix (100%) rename pkgs/{applications/networking/cluster/krane/default.nix => unit/kr/krane/pkg-fun.nix} (100%) rename pkgs/{development/tools/krankerl/default.nix => unit/kr/krankerl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/krapslog/default.nix => unit/kr/krapslog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kratos/default.nix => unit/kr/kratos/pkg-fun.nix} (100%) rename pkgs/{data/fonts/kreative-square-fonts/default.nix => unit/kr/kreative-square-fonts/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/krelay/default.nix => unit/kr/krelay/pkg-fun.nix} (100%) rename pkgs/{development/tools/krew/default.nix => unit/kr/krew/pkg-fun.nix} (100%) rename pkgs/{development/libraries/kronosnet/default.nix => unit/kr/kronosnet/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/krop/default.nix => unit/kr/krop/pkg-fun.nix} (100%) rename pkgs/{shells/ksh/default.nix => unit/ks/ksh/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ksmbd-tools/default.nix => unit/ks/ksmbd-tools/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/kssd/default.nix => unit/ks/kssd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/ksuperkey/default.nix => unit/ks/ksuperkey/pkg-fun.nix} (100%) rename pkgs/{tools/misc/kt/default.nix => unit/kt/kt/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/kthxbye.nix => unit/kt/kthxbye/pkg-fun.nix} (100%) rename pkgs/{development/tools/ktlint/default.nix => unit/kt/ktlint/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/ktunnel/default.nix => unit/kt/ktunnel/pkg-fun.nix} (100%) rename pkgs/{tools/security/kube-bench/default.nix => unit/ku/kube-bench/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kube-capacity/default.nix => unit/ku/kube-capacity/pkg-fun.nix} (100%) rename pkgs/{tools/security/kube-hunter/default.nix => unit/ku/kube-hunter/pkg-fun.nix} (100%) rename pkgs/{development/tools/kube-linter/default.nix => unit/ku/kube-linter/pkg-fun.nix} (100%) rename pkgs/{development/tools/kube-prompt/default.nix => unit/ku/kube-prompt/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kube-router/default.nix => unit/ku/kube-router/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kube-score/default.nix => unit/ku/kube-score/pkg-fun.nix} (100%) rename pkgs/{tools/security/kubeaudit/default.nix => unit/ku/kubeaudit/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubebuilder/default.nix => unit/ku/kubebuilder/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubecfg/default.nix => unit/ku/kubecfg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubecolor/default.nix => unit/ku/kubecolor/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubeconform/default.nix => unit/ku/kubeconform/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubectl-doctor/default.nix => unit/ku/kubectl-doctor/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubectl-evict-pod/default.nix => unit/ku/kubectl-evict-pod/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubectl-example/default.nix => unit/ku/kubectl-example/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubectl-images/default.nix => unit/ku/kubectl-images/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubectl-node-shell/default.nix => unit/ku/kubectl-node-shell/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubectl-tree/default.nix => unit/ku/kubectl-tree/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubernetes/kubectl.nix => unit/ku/kubectl/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ku}/kubectx/bump-golang-x-sys.patch (100%) rename pkgs/{development/tools/kubectx/default.nix => unit/ku/kubectx/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubedb-cli/default.nix => unit/ku/kubedb-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubedog/default.nix => unit/ku/kubedog/pkg-fun.nix} (100%) rename pkgs/{tools/security/kubei/default.nix => unit/ku/kubei/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubelogin-oidc/default.nix => unit/ku/kubelogin-oidc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubelogin/default.nix => unit/ku/kubelogin/pkg-fun.nix} (100%) rename pkgs/{servers/kubemq-community/default.nix => unit/ku/kubemq-community/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubemqctl/default.nix => unit/ku/kubemqctl/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubent/default.nix => unit/ku/kubent/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubeone/default.nix => unit/ku/kubeone/pkg-fun.nix} (100%) rename pkgs/{development/tools/kubeprompt/default.nix => unit/ku/kubeprompt/pkg-fun.nix} (100%) rename pkgs/{development/tools/kubepug/default.nix => unit/ku/kubepug/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ku}/kubepug/skip-external-network-tests.patch (100%) rename pkgs/{applications/networking/cluster/kubergrunt/default.nix => unit/ku/kubergrunt/pkg-fun.nix} (100%) rename pkgs/{development/tools/kubernetes-code-generator/default.nix => unit/ku/kubernetes-code-generator/pkg-fun.nix} (100%) rename pkgs/{development/tools/kubernetes-controller-tools/default.nix => unit/ku/kubernetes-controller-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ku}/kubernetes-controller-tools/version.patch (100%) rename pkgs/{applications/networking/cluster/helm/default.nix => unit/ku/kubernetes-helm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/ku}/kubernetes/fixup-addonmanager-lib-path.patch (100%) rename pkgs/{applications/networking/cluster/kubernetes/default.nix => unit/ku/kubernetes/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubernix/default.nix => unit/ku/kubernix/pkg-fun.nix} (100%) rename pkgs/{tools/security/kubescape/default.nix => unit/ku/kubescape/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubeseal/default.nix => unit/ku/kubeseal/pkg-fun.nix} (100%) rename pkgs/{tools/security/kubesec/default.nix => unit/ku/kubesec/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubespy/default.nix => unit/ku/kubespy/pkg-fun.nix} (100%) rename pkgs/{development/tools/kubeswitch/default.nix => unit/ku/kubeswitch/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubetail/default.nix => unit/ku/kubetail/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubeval/schema.nix => unit/ku/kubeval-schema/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kubeval/default.nix => unit/ku/kubeval/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/kubevirt/default.nix => unit/ku/kubevirt/pkg-fun.nix} (100%) rename pkgs/{applications/networking/kubo-migrator/all-migrations.nix => unit/ku/kubo-migrator-all-fs-repo-migrations/pkg-fun.nix} (100%) rename pkgs/{applications/networking/kubo-migrator/unwrapped.nix => unit/ku/kubo-migrator-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/networking/kubo-migrator/default.nix => unit/ku/kubo-migrator/pkg-fun.nix} (100%) rename pkgs/{applications/networking/kubo/default.nix => unit/ku/kubo/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kupfer/default.nix => unit/ku/kupfer/pkg-fun.nix} (100%) rename pkgs/{development/tools/kustomize/kustomize-sops.nix => unit/ku/kustomize-sops/pkg-fun.nix} (100%) rename pkgs/{development/tools/kustomize/default.nix => unit/ku/kustomize/pkg-fun.nix} (100%) rename pkgs/{development/tools/kustomize/3.nix => unit/ku/kustomize_3/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kuttl/default.nix => unit/ku/kuttl/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/kvmtool/default.nix => unit/kv/kvmtool/pkg-fun.nix} (100%) rename pkgs/{servers/kwakd/default.nix => unit/kw/kwakd/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin => unit/kw}/kwm/org.nixos.kwm.plist (100%) rename pkgs/{os-specific/darwin/kwm/default.nix => unit/kw/kwm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/kyotocabinet/default.nix => unit/ky/kyotocabinet/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/ky}/kytea/gcc-O3.patch (100%) rename pkgs/{tools/text/kytea/default.nix => unit/ky/kytea/pkg-fun.nix} (100%) rename pkgs/{development/tools/kythe/default.nix => unit/ky/kythe/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/kyverno/default.nix => unit/ky/kyverno/pkg-fun.nix} (100%) rename pkgs/{tools/text/l2md/default.nix => unit/l2/l2md/pkg-fun.nix} (100%) rename pkgs/{applications/editors/l3afpad/default.nix => unit/l3/l3afpad/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/la}/LAStools/drop-64-suffix.patch (100%) rename pkgs/{development/libraries/LAStools/default.nix => unit/la/LAStools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/LASzip/default.nix => unit/la/LASzip/pkg-fun.nix} (100%) rename pkgs/{development/libraries/LASzip/LASzip2.nix => unit/la/LASzip2/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/lab/default.nix => unit/la/lab/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning/labelimg/default.nix => unit/la/labelImg/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/labwc/default.nix => unit/la/labwc/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ladspa-sdk/default.nix => unit/la/ladspa-sdk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ladspa-sdk/ladspah.nix => unit/la/ladspaH/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lalezar-fonts/default.nix => unit/la/lalezar-fonts/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/lambda-delta/default.nix => unit/la/lambda-delta/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/lambda-mod-zsh-theme/default.nix => unit/la/lambda-mod-zsh-theme/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lame/default.nix => unit/la/lame/pkg-fun.nix} (100%) rename pkgs/{development/tools/continuous-integration => unit/la}/laminar/patches/no-network.patch (100%) rename pkgs/{development/tools/continuous-integration/laminar/default.nix => unit/la/laminar/pkg-fun.nix} (100%) rename pkgs/{tools/text/languagetool/default.nix => unit/la/languagetool/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lao/default.nix => unit/la/lao/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/liblapack/default.nix => unit/la/lapack-reference/pkg-fun.nix} (100%) rename pkgs/{build-support/alternatives/lapack/default.nix => unit/la/lapack/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/larswm/default.nix => unit/la/larswm/pkg-fun.nix} (100%) rename pkgs/{tools/audio/larynx/default.nix => unit/la/larynx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lasem/default.nix => unit/la/lasem/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/la}/lash/gcc-47.patch (100%) rename pkgs/{applications/audio/lash/default.nix => unit/la/lash/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/la}/lash/socket.patch (100%) rename pkgs/{development/libraries/lasso/default.nix => unit/la/lasso/pkg-fun.nix} (100%) rename pkgs/{data/fonts/last-resort/default.nix => unit/la/last-resort/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/last/default.nix => unit/la/last/pkg-fun.nix} (100%) rename pkgs/{tools/security/lastpass-cli/default.nix => unit/la/lastpass-cli/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/latencytop/default.nix => unit/la/latencytop/pkg-fun.nix} (100%) rename pkgs/{tools/misc/latex2html/default.nix => unit/la/latex2html/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/latexrun/default.nix => unit/la/latexrun/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lato/default.nix => unit/la/lato/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/latte-integrale/default.nix => unit/la/latte-integrale/pkg-fun.nix} (100%) rename pkgs/{development/embedded/fpga/lattice-diamond/default.nix => unit/la/lattice-diamond/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lavalauncher/default.nix => unit/la/lavalauncher/pkg-fun.nix} (100%) rename pkgs/{data/themes/layan-gtk-theme/default.nix => unit/la/layan-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/layan-kde/default.nix => unit/la/layan-kde/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/lazpaint/default.nix => unit/la/lazpaint/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lazycli/default.nix => unit/la/lazycli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lazydocker/default.nix => unit/la/lazydocker/pkg-fun.nix} (100%) rename pkgs/{development/tools/lazygit/default.nix => unit/la/lazygit/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/lb}/lbdb/add-methods-to-rc.patch (100%) rename pkgs/{tools/misc/lbdb/default.nix => unit/lb/lbdb/pkg-fun.nix} (100%) rename pkgs/{games/lgames/lbreakout2/default.nix => unit/lb/lbreakout2/pkg-fun.nix} (100%) rename pkgs/{games/lgames/lbreakouthd/default.nix => unit/lb/lbreakouthd/pkg-fun.nix} (100%) rename pkgs/{applications/video/lbry/default.nix => unit/lb/lbry/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lbzip2/default.nix => unit/lb/lbzip2/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/lc}/lc3tools/0001-mangle-configure.patch (100%) rename pkgs/{development/tools => unit/lc}/lc3tools/0002-lc3os-path.patch (100%) rename pkgs/{development/tools => unit/lc}/lc3tools/0003-lc3sim-tk-path.patch (100%) rename pkgs/{development/tools => unit/lc}/lc3tools/0004-configure-use-cc.patch (100%) rename pkgs/{development/tools/lc3tools/default.nix => unit/lc/lc3tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/lcalc/default.nix => unit/lc/lcalc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lcdf-typetools/default.nix => unit/lc/lcdf-typetools/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/lc}/lcdproc/hardcode_mtab.patch (100%) rename pkgs/{servers/monitoring/lcdproc/default.nix => unit/lc/lcdproc/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/lci/default.nix => unit/lc/lci/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lcm/default.nix => unit/lc/lcm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lcms => unit/lc/lcms1}/cve-2013-4276.patch (100%) rename pkgs/{development/libraries/lcms/default.nix => unit/lc/lcms1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lcms2/default.nix => unit/lc/lcms2/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/lcov/default.nix => unit/lc/lcov/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ldacbt/default.nix => unit/ld/ldacbt/pkg-fun.nix} (100%) rename pkgs/{tools/security/ldapmonitor/default.nix => unit/ld/ldapmonitor/pkg-fun.nix} (100%) rename pkgs/{tools/security/ldapnomnom/default.nix => unit/ld/ldapnomnom/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ldapvi/default.nix => unit/ld/ldapvi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ldb/default.nix => unit/ld/ldb/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/ld}/ldc/binary.nix (100%) rename pkgs/{development/compilers => unit/ld}/ldc/bootstrap.nix (100%) rename pkgs/{development/compilers => unit/ld}/ldc/generic.nix (100%) rename pkgs/{development/compilers/ldc/default.nix => unit/ld/ldc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ldm/default.nix => unit/ld/ldm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ldmtool/default.nix => unit/ld/ldmtool/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ldns/default.nix => unit/ld/ldns/pkg-fun.nix} (100%) rename pkgs/{applications/editors/ldtk/default.nix => unit/ld/ldtk/pkg-fun.nix} (100%) rename pkgs/{servers/news/leafnode/default.nix => unit/le/leafnode/pkg-fun.nix} (100%) rename pkgs/{applications/editors/leafpad/default.nix => unit/le/leafpad/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/le}/league-of-moveable-type/fonts.nix (100%) rename pkgs/{data/fonts/league-of-moveable-type/default.nix => unit/le/league-of-moveable-type/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/le}/league-of-moveable-type/update.sh (100%) rename pkgs/{applications/science/logic/lean/default.nix => unit/le/lean/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/lean2/default.nix => unit/le/lean2/pkg-fun.nix} (100%) rename pkgs/{development/tools/leaps/default.nix => unit/le/leaps/pkg-fun.nix} (100%) rename pkgs/{development/libraries/leatherman/default.nix => unit/le/leatherman/pkg-fun.nix} (100%) rename pkgs/{applications/office/ledger-autosync/default.nix => unit/le/ledger-autosync/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/ledger-live-desktop/default.nix => unit/le/ledger-live-desktop/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ledger-udev-rules/default.nix => unit/le/ledger-udev-rules/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/le}/ledger-web/Gemfile (100%) rename pkgs/{applications/office => unit/le}/ledger-web/Gemfile.lock (100%) rename pkgs/{applications/office => unit/le}/ledger-web/gemset.nix (100%) rename pkgs/{applications/office/ledger-web/default.nix => unit/le/ledger-web/pkg-fun.nix} (100%) rename pkgs/{applications/office/ledger/default.nix => unit/le/ledger/pkg-fun.nix} (100%) rename pkgs/{tools/text/ledger2beancount/default.nix => unit/le/ledger2beancount/pkg-fun.nix} (100%) rename pkgs/{tools/system/ledmon/default.nix => unit/le/ledmon/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/leela/default.nix => unit/le/leela/pkg-fun.nix} (100%) rename pkgs/{applications/misc/leetcode-cli/default.nix => unit/le/leetcode-cli/pkg-fun.nix} (100%) rename pkgs/{games/left4gore/default.nix => unit/le/left4gore-bin/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/lefthook/default.nix => unit/le/lefthook/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/leftwm/default.nix => unit/le/leftwm/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/legit/default.nix => unit/le/legit/pkg-fun.nix} (100%) rename pkgs/{development/tools/legitify/default.nix => unit/le/legitify/pkg-fun.nix} (100%) rename pkgs/{tools/admin/lego/default.nix => unit/le/lego/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/leiningen/default.nix => unit/le/leiningen/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lemmeknow/default.nix => unit/le/lemmeknow/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lemmy-help/default.nix => unit/le/lemmy-help/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/lemon/default.nix => unit/le/lemon/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lemonade/default.nix => unit/le/lemonade/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/lemonbar/xft.nix => unit/le/lemonbar-xft/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/lemonbar/default.nix => unit/le/lemonbar/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lenmus/default.nix => unit/le/lenmus/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/lens/default.nix => unit/le/lens/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lensfun/default.nix => unit/le/lensfun/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/leo3/binary.nix => unit/le/leo3-bin/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/lepton-eda/default.nix => unit/le/lepton-eda/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/lepton/default.nix => unit/le/lepton/pkg-fun.nix} (100%) rename pkgs/{development/libraries/leptonica/default.nix => unit/le/leptonica/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lerc/default.nix => unit/le/lerc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/less/default.nix => unit/le/less/pkg-fun.nix} (100%) rename pkgs/{tools/security/lesspass-cli/default.nix => unit/le/lesspass-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lesspipe/default.nix => unit/le/lesspipe/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/le}/lesstif/c-missing_xm_h.patch (100%) rename pkgs/{development/libraries => unit/le}/lesstif/c-render_table_crash.patch (100%) rename pkgs/{development/libraries => unit/le}/lesstif/c-xpmpipethrough.patch (100%) rename pkgs/{development/libraries/lesstif/default.nix => unit/le/lesstif/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/levant/default.nix => unit/le/levant/pkg-fun.nix} (100%) rename pkgs/{development/libraries/level-zero/default.nix => unit/le/level-zero/pkg-fun.nix} (100%) rename pkgs/{development/libraries/leveldb/default.nix => unit/le/leveldb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/levmar/default.nix => unit/le/levmar/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lexend/default.nix => unit/le/lexend/pkg-fun.nix} (100%) rename pkgs/{tools/admin/lexicon/default.nix => unit/le/lexicon/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/lf/default.nix => unit/lf/lf/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/lfs/default.nix => unit/lf/lfs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/lftp/default.nix => unit/lf/lftp/pkg-fun.nix} (100%) rename pkgs/{misc/lguf-brightness/default.nix => unit/lg/lguf-brightness/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/lha/default.nix => unit/lh/lha/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lhasa/default.nix => unit/lh/lhasa/pkg-fun.nix} (100%) rename pkgs/{applications/audio/LibreArp/lv2.nix => unit/li/LibreArp-lv2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/LibreArp/default.nix => unit/li/LibreArp/pkg-fun.nix} (100%) rename pkgs/{development/tools/literate-programming/Literate/default.nix => unit/li/Literate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lib2geom/default.nix => unit/li/lib2geom/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lib3ds/default.nix => unit/li/lib3ds/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lib3mf/default.nix => unit/li/lib3mf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libAfterImage/default.nix => unit/li/libAfterImage/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libHX/default.nix => unit/li/libHX/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libaacs/default.nix => unit/li/libaacs/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libaal/libaal-1.0.6-glibc-2.26.patch (100%) rename pkgs/{development/libraries/libaal/default.nix => unit/li/libaal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libabigail/default.nix => unit/li/libabigail/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libabw/default.nix => unit/li/libabw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libaccounts-glib/default.nix => unit/li/libaccounts-glib/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libaccounts-glib/py-override.patch (100%) rename pkgs/{development/libraries/libad9361/default.nix => unit/li/libad9361/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libaec/default.nix => unit/li/libaec/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libaio/default.nix => unit/li/libaio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libajantv2/default.nix => unit/li/libajantv2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/li}/libamplsolver/libamplsolver-sharedlib.patch (100%) rename pkgs/{development/libraries/science/math/libamplsolver/default.nix => unit/li/libamplsolver/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libamqpcpp/libamqpcpp-darwin.patch (100%) rename pkgs/{development/libraries/libamqpcpp/default.nix => unit/li/libamqpcpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libantlr3c/default.nix => unit/li/libantlr3c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libaosd/default.nix => unit/li/libaosd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libappindicator/default.nix => unit/li/libappindicator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libarchive/default.nix => unit/li/libarchive/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libargon2/default.nix => unit/li/libargon2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libargs/default.nix => unit/li/libargs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libasr/default.nix => unit/li/libasr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libass/default.nix => unit/li/libass/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libassuan/default.nix => unit/li/libassuan/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libast/default.nix => unit/li/libast/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libasyncns/default.nix => unit/li/libasyncns/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libatasmart/default.nix => unit/li/libatasmart/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libatomic_ops/default.nix => unit/li/libatomic_ops/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libaudclient/default.nix => unit/li/libaudclient/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libaudec/default.nix => unit/li/libaudec/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libavc1394/default.nix => unit/li/libavc1394/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libavif/default.nix => unit/li/libavif/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libax25/default.nix => unit/li/libax25/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libayatana-appindicator/default.nix => unit/li/libayatana-appindicator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libayatana-indicator/default.nix => unit/li/libayatana-indicator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libb2/default.nix => unit/li/libb2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libb64/default.nix => unit/li/libb64/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbacktrace/default.nix => unit/li/libbacktrace/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbaseencode/default.nix => unit/li/libbaseencode/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbde/default.nix => unit/li/libbde/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbdplus/default.nix => unit/li/libbdplus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbladeRF/default.nix => unit/li/libbladeRF/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libblockdev/fix-paths.patch (100%) rename pkgs/{development/libraries/libblockdev/default.nix => unit/li/libblockdev/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libblocksruntime/default.nix => unit/li/libblocksruntime/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libbpf/default.nix => unit/li/libbpf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libbpf/0.x.nix => unit/li/libbpf_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbpkg/default.nix => unit/li/libbpkg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/libbraiding/default.nix => unit/li/libbraiding/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libbs2b/default.nix => unit/li/libbs2b/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libbsd/darwin.patch (100%) rename pkgs/{development/libraries/libbsd/default.nix => unit/li/libbsd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbson/default.nix => unit/li/libbson/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libburn/default.nix => unit/li/libburn/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libbytesize/default.nix => unit/li/libbytesize/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcaca/default.nix => unit/li/libcaca/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcacard/default.nix => unit/li/libcacard/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcamera/default.nix => unit/li/libcamera/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcangjie/default.nix => unit/li/libcangjie/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libcap/default.nix => unit/li/libcap/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libcap-ng/default.nix => unit/li/libcap_ng/pkg-fun.nix} (100%) rename pkgs/{misc/libcardiacarrest/default.nix => unit/li/libcardiacarrest/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcbor/default.nix => unit/li/libcbor/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libccd/default.nix => unit/li/libccd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcdada/default.nix => unit/li/libcdada/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcdaudio/default.nix => unit/li/libcdaudio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcddb/default.nix => unit/li/libcddb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcec/default.nix => unit/li/libcec/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcec/platform.nix => unit/li/libcec_platform/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcef/default.nix => unit/li/libcef/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libcef/update.sh (100%) rename pkgs/{development/libraries/libcello/default.nix => unit/li/libcello/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcerf/default.nix => unit/li/libcerf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libcgroup/default.nix => unit/li/libcgroup/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libchamplain/default.nix => unit/li/libchamplain/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libchardet/default.nix => unit/li/libchardet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libchewing/default.nix => unit/li/libchewing/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch (100%) rename pkgs/{development/libraries => unit/li}/libchop/gets-undeclared.patch (100%) rename pkgs/{development/libraries/libchop/default.nix => unit/li/libchop/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libchop/size_t.patch (100%) rename pkgs/{development/libraries/libcifpp/default.nix => unit/li/libcifpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcint/default.nix => unit/li/libcint/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libck/default.nix => unit/li/libck/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcli/default.nix => unit/li/libcli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcloudproviders/default.nix => unit/li/libcloudproviders/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libclthreads/default.nix => unit/li/libclthreads/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libclxclient/default.nix => unit/li/libclxclient/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcmis/default.nix => unit/li/libcmis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcollectdclient/default.nix => unit/li/libcollectdclient/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libconfig/default.nix => unit/li/libconfig/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libconfuse/default.nix => unit/li/libconfuse/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcork/default.nix => unit/li/libcork/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcotp/default.nix => unit/li/libcotp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcouchbase/default.nix => unit/li/libcouchbase/pkg-fun.nix} (100%) rename pkgs/{tools/misc/libcpuid/default.nix => unit/li/libcpuid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcrafter/default.nix => unit/li/libcrafter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcredis/default.nix => unit/li/libcredis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcrossguid/default.nix => unit/li/libcrossguid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcsptr/default.nix => unit/li/libcsptr/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libctb/include-kbhit.patch (100%) rename pkgs/{development/libraries/libctb/default.nix => unit/li/libctb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libctemplate/default.nix => unit/li/libctemplate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libctl/default.nix => unit/li/libctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcue/default.nix => unit/li/libcue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcutl/default.nix => unit/li/libcutl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libcyaml/default.nix => unit/li/libcyaml/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libdaemon/fix-includes.patch (100%) rename pkgs/{development/libraries/libdaemon/default.nix => unit/li/libdaemon/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libdatovka/libdatovka-deprecated-fn-curl.patch (100%) rename pkgs/{development/libraries/libdatovka/default.nix => unit/li/libdatovka/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdatrie/default.nix => unit/li/libdatrie/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdazzle/default.nix => unit/li/libdazzle/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdbi/default.nix => unit/li/libdbi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdbi-drivers/default.nix => unit/li/libdbiDrivers/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdbusmenu/default.nix => unit/li/libdbusmenu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libde265/default.nix => unit/li/libde265/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdecor/default.nix => unit/li/libdecor/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdeflate/default.nix => unit/li/libdeflate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdigidocpp/default.nix => unit/li/libdigidocpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdiscid/default.nix => unit/li/libdiscid/pkg-fun.nix} (100%) rename pkgs/{tools/security/afl/libdislocator.nix => unit/li/libdislocator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdivecomputer/default.nix => unit/li/libdivecomputer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdivsufsort/default.nix => unit/li/libdivsufsort/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdmapsharing/default.nix => unit/li/libdmapsharing/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdmtx/default.nix => unit/li/libdmtx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdnet/default.nix => unit/li/libdnet/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/libdnf/default.nix => unit/li/libdnf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdrm/default.nix => unit/li/libdrm/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/libdsk/default.nix => unit/li/libdsk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdv/default.nix => unit/li/libdv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdvbcsa/default.nix => unit/li/libdvbcsa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdvbpsi/default.nix => unit/li/libdvbpsi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdvdnav/default.nix => unit/li/libdvdnav/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdvdread/default.nix => unit/li/libdvdread/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdvdread/4.9.9.nix => unit/li/libdvdread_4_9_9/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libdwg/default.nix => unit/li/libdwg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libe57format/default.nix => unit/li/libe57format/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libeb/default.nix => unit/li/libeb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libebml/default.nix => unit/li/libebml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libebur128/default.nix => unit/li/libebur128/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libedit/01-cygwin.patch (100%) rename pkgs/{development/libraries/libedit/default.nix => unit/li/libedit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libee/default.nix => unit/li/libee/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libelfin/0001-Don-t-detect-package-version-with-Git.patch (100%) rename pkgs/{development/libraries/libelfin/default.nix => unit/li/libelfin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libemf2svg/default.nix => unit/li/libemf2svg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libepc/default.nix => unit/li/libepc/pkg-fun.nix} (100%) rename pkgs/{games/liberal-crime-squad/default.nix => unit/li/liberal-crime-squad/pkg-fun.nix} (100%) rename pkgs/{data/fonts/liberastika/default.nix => unit/li/liberastika/pkg-fun.nix} (100%) rename pkgs/{applications/misc/liberasurecode/default.nix => unit/li/liberasurecode/pkg-fun.nix} (100%) rename pkgs/{games/liberation-circuit/default.nix => unit/li/liberation-circuit/pkg-fun.nix} (100%) rename pkgs/{data/fonts/liberation-sans-narrow/default.nix => unit/li/liberation-sans-narrow/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liberfa/default.nix => unit/li/liberfa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liberio/default.nix => unit/li/liberio/pkg-fun.nix} (100%) rename pkgs/{data/fonts/libertine/default.nix => unit/li/libertine/pkg-fun.nix} (100%) rename pkgs/{data/fonts/libertinus/default.nix => unit/li/libertinus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libesmtp/default.nix => unit/li/libesmtp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libestr/default.nix => unit/li/libestr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libetpan/default.nix => unit/li/libetpan/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libev/default.nix => unit/li/libev/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libevdev/default.nix => unit/li/libevdev/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libevdevc/default.nix => unit/li/libevdevc/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libevdevplus/0001-Add-cmake-install-directives.patch (100%) rename pkgs/{development/libraries/libevdevplus/default.nix => unit/li/libevdevplus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libevent/default.nix => unit/li/libevent/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libewf/default.nix => unit/li/libewf/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libexecinfo/30-linux-makefile.patch (100%) rename pkgs/{development/libraries/libexecinfo/default.nix => unit/li/libexecinfo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libexif/default.nix => unit/li/libexif/pkg-fun.nix} (100%) rename pkgs/{development/libraries/exosip/default.nix => unit/li/libexosip/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libexsid/default.nix => unit/li/libexsid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libexttextcat/default.nix => unit/li/libexttextcat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libf2c/default.nix => unit/li/libf2c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfabric/default.nix => unit/li/libfabric/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xpra/libfakeXinerama.nix => unit/li/libfakeXinerama/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfakekey/default.nix => unit/li/libfakekey/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libfaketime/0001-Remove-unsupported-clang-flags.patch (100%) rename pkgs/{development/libraries => unit/li}/libfaketime/nix-store-date.patch (100%) rename pkgs/{development/libraries => unit/li}/libfaketime/no-date-in-gzip-man-page.patch (100%) rename pkgs/{development/libraries/libfaketime/default.nix => unit/li/libfaketime/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfann/default.nix => unit/li/libfann/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libff/default.nix => unit/li/libff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libffcall/default.nix => unit/li/libffcall/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libffi/default.nix => unit/li/libffi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libffi/3.3.nix => unit/li/libffi_3_3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfishsound/default.nix => unit/li/libfishsound/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfixposix/default.nix => unit/li/libfixposix/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfm/default.nix => unit/li/libfm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfprint-2-tod1-goodix/default.nix => unit/li/libfprint-2-tod1-goodix/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch (100%) rename pkgs/{development/libraries => unit/li}/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch (100%) rename pkgs/{development/libraries/libfprint-2-tod1-vfs0090/default.nix => unit/li/libfprint-2-tod1-vfs0090/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfprint-tod/default.nix => unit/li/libfprint-tod/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfprint/default.nix => unit/li/libfprint/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfpx/default.nix => unit/li/libfpx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfreeaptx/default.nix => unit/li/libfreeaptx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfsm/default.nix => unit/li/libfsm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libftdi/1.x.nix => unit/li/libftdi1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libfyaml/default.nix => unit/li/libfyaml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgadu/default.nix => unit/li/libgadu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgaminggear/default.nix => unit/li/libgaminggear/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgbinder/default.nix => unit/li/libgbinder/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgcrypt/default.nix => unit/li/libgcrypt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgcrypt/1.5.nix => unit/li/libgcrypt_1_5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgda/default.nix => unit/li/libgda/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgda/6.x.nix => unit/li/libgda6/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgdamm/default.nix => unit/li/libgdamm/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libgdata/installed-tests-path.patch (100%) rename pkgs/{development/libraries/libgdata/default.nix => unit/li/libgdata/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgee/default.nix => unit/li/libgee/pkg-fun.nix} (100%) rename pkgs/{tools/misc/libgen-cli/default.nix => unit/li/libgen-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgeotiff/default.nix => unit/li/libgeotiff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgepub/default.nix => unit/li/libgepub/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/li}/libgestures/include-fix.patch (100%) rename pkgs/{os-specific/linux/libgestures/default.nix => unit/li/libgestures/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgflow/default.nix => unit/li/libgflow/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgig/default.nix => unit/li/libgig/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgit2-glib/default.nix => unit/li/libgit2-glib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libglibutil/default.nix => unit/li/libglibutil/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libglvnd/default.nix => unit/li/libglvnd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgmpris/default.nix => unit/li/libgmpris/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgnome-games-support/default.nix => unit/li/libgnome-games-support/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgnome-games-support/2.0.nix => unit/li/libgnome-games-support_2_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgnome-keyring/default.nix => unit/li/libgnome-keyring/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgnomekbd/default.nix => unit/li/libgnomekbd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgnt/default.nix => unit/li/libgnt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgnurl/default.nix => unit/li/libgnurl/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization => unit/li}/libgovirt/no-version-script-ld-flag.patch (100%) rename pkgs/{applications/virtualization/libgovirt/default.nix => unit/li/libgovirt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgpg-error/default.nix => unit/li/libgpg-error/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgphoto2/default.nix => unit/li/libgphoto2/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch (100%) rename pkgs/{development/libraries/libgpiod/default.nix => unit/li/libgpiod/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgringotts/default.nix => unit/li/libgringotts/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgsf/default.nix => unit/li/libgsf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgssglue/default.nix => unit/li/libgssglue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgtkflow3/default.nix => unit/li/libgtkflow3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgtkflow4/default.nix => unit/li/libgtkflow4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgtop/default.nix => unit/li/libgtop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgudev/default.nix => unit/li/libgudev/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libguestfs/appliance.nix => unit/li/libguestfs-appliance/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgumath/default.nix => unit/li/libgumath/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libgweather/fix-pkgconfig.patch (100%) rename pkgs/{development/libraries/libgweather/default.nix => unit/li/libgweather/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libgxps/default.nix => unit/li/libgxps/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhandy/default.nix => unit/li/libhandy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhandy/0.x.nix => unit/li/libhandy_0/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhangul/default.nix => unit/li/libhangul/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libharu/default.nix => unit/li/libharu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhdhomerun/default.nix => unit/li/libhdhomerun/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libheif/default.nix => unit/li/libheif/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/libhomfly/default.nix => unit/li/libhomfly/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhsts/default.nix => unit/li/libhsts/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libhsts/update.sh (100%) rename pkgs/{development/libraries/libhttpseverywhere/default.nix => unit/li/libhttpseverywhere/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhugetlbfs/default.nix => unit/li/libhugetlbfs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libhwy/default.nix => unit/li/libhwy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libiberty/default.nix => unit/li/libiberty/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libibmad/default.nix => unit/li/libibmad/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libibumad/default.nix => unit/li/libibumad/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libical/default.nix => unit/li/libical/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libical/respect-env-tzdir.patch (100%) rename pkgs/{development/libraries/libicns/default.nix => unit/li/libicns/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch (100%) rename pkgs/{development/libraries => unit/li}/libid3tag/debian-patches.patch (100%) rename pkgs/{development/libraries => unit/li}/libid3tag/id3tag.pc (100%) rename pkgs/{development/libraries/libid3tag/default.nix => unit/li/libid3tag/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libidn/default.nix => unit/li/libidn/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libidn2/fix-error-darwin.patch (100%) rename pkgs/{development/libraries/libidn2/default.nix => unit/li/libidn2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libiec61883/default.nix => unit/li/libiec61883/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libieee1284/default.nix => unit/li/libieee1284/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libimagequant/default.nix => unit/li/libimagequant/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libime/default.nix => unit/li/libime/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libimobiledevice-glue/default.nix => unit/li/libimobiledevice-glue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libindicator/default.nix => unit/li/libindicator/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libinfinity/default.nix => unit/li/libinfinity/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libinjection/default.nix => unit/li/libinjection/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libinklevel/default.nix => unit/li/libinklevel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libinotify-kqueue/default.nix => unit/li/libinotify-kqueue/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods => unit/li}/libinput-gestures/0001-hardcode-name.patch (100%) rename pkgs/{tools/inputmethods => unit/li}/libinput-gestures/0002-paths.patch (100%) rename pkgs/{tools/inputmethods/libinput-gestures/default.nix => unit/li/libinput-gestures/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libinsane/default.nix => unit/li/libinsane/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libinstpatch/default.nix => unit/li/libinstpatch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libipfix/default.nix => unit/li/libipfix/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libipt/default.nix => unit/li/libipt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libiptcdata/default.nix => unit/li/libiptcdata/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libircclient/default.nix => unit/li/libircclient/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libirecovery/default.nix => unit/li/libirecovery/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libiscsi/default.nix => unit/li/libiscsi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libisds/default.nix => unit/li/libisds/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libisoburn/default.nix => unit/li/libisoburn/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libisofs/default.nix => unit/li/libisofs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libite/default.nix => unit/li/libite/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libivykis/default.nix => unit/li/libivykis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libixp/default.nix => unit/li/libixp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libjaylink/default.nix => unit/li/libjaylink/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libjcat/installed-tests-path.patch (100%) rename pkgs/{development/libraries/libjcat/default.nix => unit/li/libjcat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libjpeg/default.nix => unit/li/libjpeg_original/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libjpeg-turbo => unit/li/libjpeg_turbo}/0001-Compile-transupp.c-as-part-of-the-library.patch (100%) rename pkgs/{development/libraries/libjpeg-turbo => unit/li/libjpeg_turbo}/mingw-boolean.patch (100%) rename pkgs/{development/libraries/libjpeg-turbo/default.nix => unit/li/libjpeg_turbo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libjreen/default.nix => unit/li/libjreen/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libjson/install-fix.patch (100%) rename pkgs/{development/libraries/libjson/default.nix => unit/li/libjson/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libjwt/default.nix => unit/li/libjwt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libjxl/default.nix => unit/li/libjxl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libkate/default.nix => unit/li/libkate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libkeyfinder/default.nix => unit/li/libkeyfinder/pkg-fun.nix} (100%) rename pkgs/{applications/misc/kiwix/lib.nix => unit/li/libkiwix/pkg-fun.nix} (100%) rename pkgs/{data/misc/libkkc-data/default.nix => unit/li/libkkc-data/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/libkkc/default.nix => unit/li/libkkc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libkqueue/default.nix => unit/li/libkqueue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libkrunfw/default.nix => unit/li/libkrunfw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libks/default.nix => unit/li/libks/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libksba/default.nix => unit/li/libksba/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libksi/default.nix => unit/li/libksi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblastfmSF/default.nix => unit/li/liblastfmSF/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblaxjson/default.nix => unit/li/liblaxjson/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/liblbfgs/default.nix => unit/li/liblbfgs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblc3/default.nix => unit/li/liblc3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblcf/default.nix => unit/li/liblcf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libliftoff/default.nix => unit/li/libliftoff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblinear/default.nix => unit/li/liblinear/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblinphone/default.nix => unit/li/liblinphone/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/liblinphone/use-normal-jsoncpp.patch (100%) rename pkgs/{development/libraries/liblo/default.nix => unit/li/liblo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblockfile/default.nix => unit/li/liblockfile/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblogging/default.nix => unit/li/liblogging/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblognorm/default.nix => unit/li/liblognorm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblouis/default.nix => unit/li/liblouis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblscp/default.nix => unit/li/liblscp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libltc/default.nix => unit/li/libltc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liblxi/default.nix => unit/li/liblxi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmad/default.nix => unit/li/libmad/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmanette/default.nix => unit/li/libmanette/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmatchbox/default.nix => unit/li/libmatchbox/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmatroska/default.nix => unit/li/libmatroska/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmaxminddb/default.nix => unit/li/libmaxminddb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmbim/default.nix => unit/li/libmbim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmcrypt/default.nix => unit/li/libmcrypt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmd/default.nix => unit/li/libmd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmediaart/default.nix => unit/li/libmediaart/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmediainfo/default.nix => unit/li/libmediainfo/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libmemcached/libmemcached-fix-linking-with-libpthread.patch (100%) rename pkgs/{development/libraries => unit/li}/libmemcached/musl-fixes.patch (100%) rename pkgs/{development/libraries/libmemcached/default.nix => unit/li/libmemcached/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmesode/default.nix => unit/li/libmesode/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libmhash/autotools-define-conflict-debian-fix.patch (100%) rename pkgs/{development/libraries/libmhash/default.nix => unit/li/libmhash/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmicrodns/default.nix => unit/li/libmicrodns/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libmilter/darwin.patch (100%) rename pkgs/{development/libraries => unit/li}/libmilter/install.patch (100%) rename pkgs/{development/libraries/libmilter/default.nix => unit/li/libmilter/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libmilter/sharedlib.patch (100%) rename pkgs/{development/libraries/libminc/default.nix => unit/li/libminc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmkv/default.nix => unit/li/libmkv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmms/default.nix => unit/li/libmms/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmng/default.nix => unit/li/libmng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmnl/default.nix => unit/li/libmnl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmodbus/default.nix => unit/li/libmodbus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmodplug/default.nix => unit/li/libmodplug/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmodule/default.nix => unit/li/libmodule/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libmodulemd/glib-devdoc.patch (100%) rename pkgs/{development/libraries/libmodulemd/default.nix => unit/li/libmodulemd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmongo-client/default.nix => unit/li/libmongo-client/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmowgli/default.nix => unit/li/libmowgli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmp3splt/default.nix => unit/li/libmp3splt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmpack/default.nix => unit/li/libmpack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmpc/default.nix => unit/li/libmpc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmpcdec/default.nix => unit/li/libmpcdec/pkg-fun.nix} (100%) rename pkgs/{servers/mpd/libmpdclient.nix => unit/li/libmpdclient/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmpeg2/default.nix => unit/li/libmpeg2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmrss/default.nix => unit/li/libmrss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmspack/default.nix => unit/li/libmspack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/chemistry/libmsym/default.nix => unit/li/libmsym/pkg-fun.nix} (100%) rename pkgs/{applications/audio/munt/libmt32emu.nix => unit/li/libmt32emu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmtp/default.nix => unit/li/libmtp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmusicbrainz/default.nix => unit/li/libmusicbrainz3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmusicbrainz => unit/li/libmusicbrainz3}/v3-darwin.patch (100%) rename pkgs/{development/libraries/libmusicbrainz/5.x.nix => unit/li/libmusicbrainz5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmwaw/default.nix => unit/li/libmwaw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmx/default.nix => unit/li/libmx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmypaint/default.nix => unit/li/libmypaint/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libmysofa/default.nix => unit/li/libmysofa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libmysqlconnectorcpp/default.nix => unit/li/libmysqlconnectorcpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnabo/default.nix => unit/li/libnabo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnatpmp/default.nix => unit/li/libnatpmp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnats-c/default.nix => unit/li/libnats-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnatspec/default.nix => unit/li/libnatspec/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnbd/default.nix => unit/li/libnbd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libndctl/default.nix => unit/li/libndctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libndp/default.nix => unit/li/libndp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libndtypes/default.nix => unit/li/libndtypes/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnet/default.nix => unit/li/libnet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnetfilter_acct/default.nix => unit/li/libnetfilter_acct/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnetfilter_conntrack/default.nix => unit/li/libnetfilter_conntrack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnetfilter_cthelper/default.nix => unit/li/libnetfilter_cthelper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnetfilter_cttimeout/default.nix => unit/li/libnetfilter_cttimeout/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnetfilter_log/default.nix => unit/li/libnetfilter_log/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnetfilter_queue/default.nix => unit/li/libnetfilter_queue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnfc/default.nix => unit/li/libnfc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnfnetlink/default.nix => unit/li/libnfnetlink/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnfs/default.nix => unit/li/libnfs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnftnl/default.nix => unit/li/libnftnl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libngspice/default.nix => unit/li/libngspice/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnice/default.nix => unit/li/libnice/pkg-fun.nix} (100%) rename pkgs/{tools/networking/libnids/default.nix => unit/li/libnids/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnixxml/default.nix => unit/li/libnixxml/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libnl/default.nix => unit/li/libnl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager => unit/li}/libnma/hardcode-gsettings.patch (100%) rename pkgs/{tools/networking/networkmanager/libnma/default.nix => unit/li/libnma/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager => unit/li}/libnma/remove-path-from-eap.patch (100%) rename pkgs/{development/libraries/libnotify/default.nix => unit/li/libnotify/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/astronomy/libnova/default.nix => unit/li/libnova/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnsl/default.nix => unit/li/libnsl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libnss-mysql/default.nix => unit/li/libnss-mysql/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libnvme/default.nix => unit/li/libnvme/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libnxml/default.nix => unit/li/libnxml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liboauth/default.nix => unit/li/liboauth/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libodb-sqlite/default.nix => unit/li/libodb-sqlite/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libodb/default.nix => unit/li/libodb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libodfgen/default.nix => unit/li/libodfgen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libofa/default.nix => unit/li/libofa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libofx/default.nix => unit/li/libofx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libogg/default.nix => unit/li/libogg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liboggz/default.nix => unit/li/liboggz/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liboil/default.nix => unit/li/liboil/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/liboil/x86_64-cpuid.patch (100%) rename pkgs/{development/libraries => unit/li}/libomxil-bellagio/fedora-fixes.patch (100%) rename pkgs/{development/libraries => unit/li}/libomxil-bellagio/fno-common.patch (100%) rename pkgs/{development/libraries/libomxil-bellagio/default.nix => unit/li/libomxil-bellagio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liboop/default.nix => unit/li/liboop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libopenaptx/default.nix => unit/li/libopenaptx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libopenglrecorder/default.nix => unit/li/libopenglrecorder/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libopenmpt-modplug/default.nix => unit/li/libopenmpt-modplug/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libopenmpt/default.nix => unit/li/libopenmpt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio => unit/li}/libopenmpt/update.sh (100%) rename pkgs/{servers/mail/opensmtpd => unit/li}/libopensmtpd/no-chown-while-installing.patch (100%) rename pkgs/{servers/mail/opensmtpd/libopensmtpd/default.nix => unit/li/libopensmtpd/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/liboping/ncurses-6.3.patch (100%) rename pkgs/{development/libraries/liboping/default.nix => unit/li/liboping/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libopus/default.nix => unit/li/libopus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libopusenc/default.nix => unit/li/libopusenc/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libosinfo/osinfo-db-data-dir.patch (100%) rename pkgs/{development/libraries/libosinfo/default.nix => unit/li/libosinfo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/osip/default.nix => unit/li/libosip/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libosmium/default.nix => unit/li/libosmium/pkg-fun.nix} (100%) rename pkgs/{applications/misc/libosmocore/default.nix => unit/li/libosmocore/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libossp-uuid/default.nix => unit/li/libossp_uuid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libossp-uuid => unit/li/libossp_uuid}/shtool.patch (100%) rename pkgs/{tools/inputmethods/m17n-lib/otf.nix => unit/li/libotf/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libotr/fix-regtest-client.patch (100%) rename pkgs/{development/libraries/libotr/default.nix => unit/li/libotr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libow/default.nix => unit/li/libow/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libowfat/default.nix => unit/li/libowfat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libowlevelzs/default.nix => unit/li/libowlevelzs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpam-wrapper/default.nix => unit/li/libpam-wrapper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpanel/default.nix => unit/li/libpanel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpaper/default.nix => unit/li/libpaper/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libpar2/libpar2-0.4-external-verification.patch (100%) rename pkgs/{development/libraries/libpar2/default.nix => unit/li/libpar2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpcap/default.nix => unit/li/libpcap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpeas/default.nix => unit/li/libpeas/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpfm/default.nix => unit/li/libpfm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpg_query/default.nix => unit/li/libpg_query/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpgf/default.nix => unit/li/libpgf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpinyin/default.nix => unit/li/libpinyin/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libpipeline/fix-on-osx.patch (100%) rename pkgs/{development/libraries/libpipeline/default.nix => unit/li/libpipeline/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libplacebo/default.nix => unit/li/libplacebo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libplctag/default.nix => unit/li/libplctag/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libplist/default.nix => unit/li/libplist/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpng/default.nix => unit/li/libpng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpng/12.nix => unit/li/libpng12/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpointmatcher/default.nix => unit/li/libpointmatcher/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/poly/default.nix => unit/li/libpoly/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libportal/default.nix => unit/li/libportal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpostal/default.nix => unit/li/libpostal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpqxx/default.nix => unit/li/libpqxx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpqxx/6.nix => unit/li/libpqxx_6/pkg-fun.nix} (100%) rename pkgs/{misc/apulse/pressureaudio.nix => unit/li/libpressureaudio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpseudo/default.nix => unit/li/libpseudo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpsl/default.nix => unit/li/libpsl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libpsm2/default.nix => unit/li/libpsm2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpst/default.nix => unit/li/libpst/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libptytty/default.nix => unit/li/libptytty/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libpulsar/default.nix => unit/li/libpulsar/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libqalculate/default.nix => unit/li/libqalculate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libqb/default.nix => unit/li/libqb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libqmi/default.nix => unit/li/libqmi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libqrtr-glib/default.nix => unit/li/libqrtr-glib/pkg-fun.nix} (100%) rename pkgs/{applications/video/quvi/library.nix => unit/li/libquvi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libr3/default.nix => unit/li/libr3/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/li}/librarian-puppet-go/deps.nix (100%) rename pkgs/{development/tools/librarian-puppet-go/default.nix => unit/li/librarian-puppet-go/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libraspberrypi/default.nix => unit/li/libraspberrypi/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libratbag/default.nix => unit/li/libratbag/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libraw/default.nix => unit/li/libraw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libraw1394/default.nix => unit/li/libraw1394/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libraw/unstable.nix => unit/li/libraw_unstable/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librdf/raptor.nix => unit/li/librdf_raptor/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librdf/raptor2.nix => unit/li/librdf_raptor2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librdf/rasqal.nix => unit/li/librdf_rasqal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librdf/redland.nix => unit/li/librdf_redland/pkg-fun.nix} (100%) rename pkgs/{data/fonts/libre-baskerville/default.nix => unit/li/libre-baskerville/pkg-fun.nix} (100%) rename pkgs/{data/fonts/libre-bodoni/default.nix => unit/li/libre-bodoni/pkg-fun.nix} (100%) rename pkgs/{data/fonts/libre-caslon/default.nix => unit/li/libre-caslon/pkg-fun.nix} (100%) rename pkgs/{data/fonts/libre-franklin/default.nix => unit/li/libre-franklin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libre/default.nix => unit/li/libre/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/li}/libredirect/libredirect.c (100%) rename pkgs/{build-support/libredirect/default.nix => unit/li/libredirect/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/li}/libredirect/test.c (100%) rename pkgs/{development/libraries/libredwg/default.nix => unit/li/libredwg/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/libreelec-dvb-firmware/default.nix => unit/li/libreelec-dvb-firmware/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librelp/default.nix => unit/li/librelp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librem/default.nix => unit/li/librem/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librep/default.nix => unit/li/librep/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/librep/setup-hook.sh (100%) rename pkgs/{development/libraries/libresample/default.nix => unit/li/libresample/pkg-fun.nix} (100%) rename pkgs/{tools/misc/librespeed-cli/default.nix => unit/li/librespeed-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librest/default.nix => unit/li/librest/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librest/1.0.nix => unit/li/librest_1_0/pkg-fun.nix} (100%) rename pkgs/{tools/networking/libreswan/default.nix => unit/li/libreswan/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/retroarch/libretro-core-info.nix => unit/li/libretro-core-info/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librevenge/default.nix => unit/li/librevenge/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/librewolf => unit/li/librewolf-unwrapped}/librewolf.nix (100%) rename pkgs/{applications/networking/browsers/librewolf/default.nix => unit/li/librewolf-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/librewolf => unit/li/librewolf-unwrapped}/src.json (100%) rename pkgs/{applications/networking/browsers/librewolf => unit/li/librewolf-unwrapped}/src.nix (100%) rename pkgs/{applications/networking/browsers/librewolf => unit/li/librewolf-unwrapped}/update.nix (100%) rename pkgs/{development/libraries/librist/default.nix => unit/li/librist/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libroxml/default.nix => unit/li/libroxml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librseq/default.nix => unit/li/librseq/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librsync/default.nix => unit/li/librsync/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librtlsdr/default.nix => unit/li/librtlsdr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librtprocess/default.nix => unit/li/librtprocess/pkg-fun.nix} (100%) rename pkgs/{development/libraries/librttopo/default.nix => unit/li/librttopo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libs3/default.nix => unit/li/libs3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsass/default.nix => unit/li/libsass/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libschrift/default.nix => unit/li/libschrift/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsciter/default.nix => unit/li/libsciter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libscrypt/default.nix => unit/li/libscrypt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsearpc/default.nix => unit/li/libsearpc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libseccomp/default.nix => unit/li/libseccomp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsecret/default.nix => unit/li/libsecret/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libselinux/default.nix => unit/li/libselinux/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libsepol/default.nix => unit/li/libsepol/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libserdes/default.nix => unit/li/libserdes/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libserialport/default.nix => unit/li/libserialport/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libshout/default.nix => unit/li/libshout/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libshumate/default.nix => unit/li/libshumate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsidplayfp/default.nix => unit/li/libsidplayfp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsieve/default.nix => unit/li/libsieve/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsigcxx/default.nix => unit/li/libsigcxx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsigcxx/1.2.nix => unit/li/libsigcxx12/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsigcxx/3.0.nix => unit/li/libsigcxx30/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsignal-protocol-c/default.nix => unit/li/libsignal-protocol-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsignon-glib/default.nix => unit/li/libsignon-glib/pkg-fun.nix} (100%) rename pkgs/{development/tools/libsigrokdecode/default.nix => unit/li/libsigrokdecode/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsigsegv/default.nix => unit/li/libsigsegv/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libsigsegv/sigbus_fix.patch (100%) rename pkgs/{development/libraries/libsixel/default.nix => unit/li/libsixel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libslirp/default.nix => unit/li/libslirp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsmartcols/default.nix => unit/li/libsmartcols/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libsmbios/default.nix => unit/li/libsmbios/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libsmf/default.nix => unit/li/libsmf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsmi/default.nix => unit/li/libsmi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsnark/default.nix => unit/li/libsnark/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libsodium/mingw-no-fortify.patch (100%) rename pkgs/{development/libraries/libsodium/default.nix => unit/li/libsodium/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsolv/default.nix => unit/li/libsolv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsoup/default.nix => unit/li/libsoup/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsoup/3.x.nix => unit/li/libsoup_3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspatialaudio/default.nix => unit/li/libspatialaudio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspatialindex/default.nix => unit/li/libspatialindex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspatialite/default.nix => unit/li/libspatialite/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/libspecbleach/default.nix => unit/li/libspecbleach/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libspectre/libspectre-0.2.7-gs918.patch (100%) rename pkgs/{development/libraries/libspectre/default.nix => unit/li/libspectre/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspectrum/default.nix => unit/li/libspectrum/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspf2/default.nix => unit/li/libspf2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspiro/default.nix => unit/li/libspiro/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libspnav/configure-socket-path.patch (100%) rename pkgs/{development/libraries/libspnav/default.nix => unit/li/libspnav/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libspng/default.nix => unit/li/libspng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsrs2/default.nix => unit/li/libsrs2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libssh/default.nix => unit/li/libssh/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libssh2/openssl_add_support_for_libressl_3_5.patch (100%) rename pkgs/{development/libraries/libssh2/default.nix => unit/li/libssh2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/startup-notification/default.nix => unit/li/libstartup_notification/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gcc/libstdc++ => unit/li/libstdcxx5}/no-sys-dirs.patch (100%) rename pkgs/{development/libraries/gcc/libstdc++/5.nix => unit/li/libstdcxx5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/gcc/libstdc++ => unit/li/libstdcxx5}/struct-ucontext.patch (100%) rename pkgs/{development/libraries/libstemmer/default.nix => unit/li/libstemmer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libstroke/default.nix => unit/li/libstroke/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libstrophe/default.nix => unit/li/libstrophe/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsurvive/default.nix => unit/li/libsurvive/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsvm/default.nix => unit/li/libsvm/pkg-fun.nix} (100%) rename pkgs/{development/tools/profiling/sysprof/capture.nix => unit/li/libsysprof-capture/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libsystemtap/default.nix => unit/li/libsystemtap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtap/default.nix => unit/li/libtap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtar/default.nix => unit/li/libtar/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtasn1/default.nix => unit/li/libtasn1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtcod/default.nix => unit/li/libtcod/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtelnet/default.nix => unit/li/libtelnet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtermkey/default.nix => unit/li/libtermkey/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libthai/default.nix => unit/li/libthai/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtheora/default.nix => unit/li/libtheora/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libthreadar/default.nix => unit/li/libthreadar/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libticables2/default.nix => unit/li/libticables2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libticonv/default.nix => unit/li/libticonv/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libtiff/headers.patch (100%) rename pkgs/{development/libraries/libtiff/default.nix => unit/li/libtiff/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libtiff/rename-version.patch (100%) rename pkgs/{development/libraries/libtifiles2/default.nix => unit/li/libtifiles2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtiger/default.nix => unit/li/libtiger/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtins/default.nix => unit/li/libtins/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ti-rpc/default.nix => unit/li/libtirpc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtomcrypt/default.nix => unit/li/libtomcrypt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtommath/default.nix => unit/li/libtommath/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/libtool/default.nix => unit/li/libtool_1_5/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/libtool/libtool2.nix => unit/li/libtool_2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtoxcore/default.nix => unit/li/libtoxcore/pkg-fun.nix} (100%) rename pkgs/{tools/security/libtpms/default.nix => unit/li/libtpms/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libtraceevent/default.nix => unit/li/libtraceevent/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libtracefs/default.nix => unit/li/libtracefs/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/libtree/default.nix => unit/li/libtree/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libtsm/default.nix => unit/li/libtsm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libu2f-host/default.nix => unit/li/libu2f-host/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libu2f-server/default.nix => unit/li/libu2f-server/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libubox/default.nix => unit/li/libubox/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libuchardet/default.nix => unit/li/libuchardet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libucl/default.nix => unit/li/libucl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libucontext/default.nix => unit/li/libucontext/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libudev-zero/default.nix => unit/li/libudev-zero/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libudev0-shim/default.nix => unit/li/libudev0-shim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libudfread/default.nix => unit/li/libudfread/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libuecc/default.nix => unit/li/libuecc/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libuinputplus/0001-Add-cmake-install-directives.patch (100%) rename pkgs/{development/libraries/libuinputplus/default.nix => unit/li/libuinputplus/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libuldaq/0001-uldaq.patch (100%) rename pkgs/{development/libraries/libuldaq/default.nix => unit/li/libuldaq/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libunarr/default.nix => unit/li/libunarr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libunibreak/default.nix => unit/li/libunibreak/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libuninameslist/default.nix => unit/li/libuninameslist/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libunique/1.1.6-G_CONST_RETURN.patch (100%) rename pkgs/{development/libraries => unit/li}/libunique/1.1.6-compiler-warnings.patch (100%) rename pkgs/{development/libraries => unit/li}/libunique/1.1.6-fix-test.patch (100%) rename pkgs/{development/libraries => unit/li}/libunique/1.1.6-include-terminator.patch (100%) rename pkgs/{development/libraries => unit/li}/libunique/gcc7-bug.patch (100%) rename pkgs/{development/libraries/libunique/default.nix => unit/li/libunique/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libunique/3.x.nix => unit/li/libunique3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libunistring/default.nix => unit/li/libunistring/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libunity/fix-vala.patch (100%) rename pkgs/{development/libraries/libunity/default.nix => unit/li/libunity/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pupnp/default.nix => unit/li/libupnp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liburcu/default.nix => unit/li/liburcu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liburing/default.nix => unit/li/liburing/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libusb-compat => unit/li/libusb-compat-0_1}/fix-headers.patch (100%) rename pkgs/{development/libraries/libusb-compat/0.1.nix => unit/li/libusb-compat-0_1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libusbgx/default.nix => unit/li/libusbgx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libusbmuxd/default.nix => unit/li/libusbmuxd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libusbsio/default.nix => unit/li/libusbsio/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libutempter/exec_path.patch (100%) rename pkgs/{development/libraries/libutempter/default.nix => unit/li/libutempter/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/libutp/default.nix => unit/li/libutp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libuvc/default.nix => unit/li/libuvc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libva/utils.nix => unit/li/libva-utils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libva/1.nix => unit/li/libva1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvarlink/default.nix => unit/li/libvarlink/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvdpau-va-gl/default.nix => unit/li/libvdpau-va-gl/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libvdpau/installdir.patch (100%) rename pkgs/{development/libraries/libvdpau/default.nix => unit/li/libvdpau/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/chemistry/libvdwxc/default.nix => unit/li/libvdwxc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libversion/default.nix => unit/li/libversion/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libverto/default.nix => unit/li/libverto/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libviper/default.nix => unit/li/libviper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libviperfx/default.nix => unit/li/libviperfx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvirt-glib/default.nix => unit/li/libvirt-glib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvisio/default.nix => unit/li/libvisio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvisio2svg/default.nix => unit/li/libvisio2svg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvisual/default.nix => unit/li/libvisual/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvmaf/default.nix => unit/li/libvmaf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvmi/default.nix => unit/li/libvmi/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libvolume_id/default.nix => unit/li/libvolume_id/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvorbis/default.nix => unit/li/libvorbis/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvori/default.nix => unit/li/libvori/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvpx/default.nix => unit/li/libvpx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvpx/1_8.nix => unit/li/libvpx_1_8/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvterm-neovim/default.nix => unit/li/libvterm-neovim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libvterm/default.nix => unit/li/libvterm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwacom/default.nix => unit/li/libwacom/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwbxml/default.nix => unit/li/libwbxml/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libwebcam/default.nix => unit/li/libwebcam/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/li}/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch (100%) rename pkgs/{development/libraries/libwebp/default.nix => unit/li/libwebp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwebsockets/default.nix => unit/li/libwebsockets/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwhereami/default.nix => unit/li/libwhereami/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/libwhich/default.nix => unit/li/libwhich/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwmf/default.nix => unit/li/libwmf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwnck/default.nix => unit/li/libwnck/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwnck/2.nix => unit/li/libwnck2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwpd/default.nix => unit/li/libwpd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwpd => unit/li/libwpd_08}/gcc-0.8.patch (100%) rename pkgs/{development/libraries/libwpd/0.8.nix => unit/li/libwpd_08/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwpe/fdo.nix => unit/li/libwpe-fdo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwpe/default.nix => unit/li/libwpe/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwpg/default.nix => unit/li/libwpg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libwps/default.nix => unit/li/libwps/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libx86/constants.patch (100%) rename pkgs/{development/libraries => unit/li}/libx86/non-x86.patch (100%) rename pkgs/{development/libraries/libx86/default.nix => unit/li/libx86/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libx86/src-for-default.nix (100%) rename pkgs/{development/libraries => unit/li}/libx86/src-info-for-default.nix (100%) rename pkgs/{development/libraries/libx86emu/default.nix => unit/li/libx86emu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxc/default.nix => unit/li/libxc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxcomp/default.nix => unit/li/libxcomp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxdg-basedir/default.nix => unit/li/libxdg_basedir/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxkbcommon/libxkbcommon_7.nix => unit/li/libxkbcommon_7/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxkbcommon/default.nix => unit/li/libxkbcommon_8/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libxklavier/honor-XKB_CONFIG_ROOT.patch (100%) rename pkgs/{development/libraries/libxklavier/default.nix => unit/li/libxklavier/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxl/default.nix => unit/li/libxl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxls/default.nix => unit/li/libxls/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxlsxwriter/default.nix => unit/li/libxlsxwriter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxmi/default.nix => unit/li/libxmi/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libxmlb/installed-tests-path.patch (100%) rename pkgs/{development/libraries/libxmlb/default.nix => unit/li/libxmlb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxmlxx/default.nix => unit/li/libxmlxx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxmlxx/v3.nix => unit/li/libxmlxx3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxmp/default.nix => unit/li/libxmp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxnd/default.nix => unit/li/libxnd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xpdf => unit/li/libxpdf}/libxpdf.patch (100%) rename pkgs/{applications/misc/xpdf/libxpdf.nix => unit/li/libxpdf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xpdf => unit/li/libxpdf}/xpdf-3.02-protection.patch (100%) rename pkgs/{applications/video/xplayer/plparser.nix => unit/li/libxplayer-plparser/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libxsmm/default.nix => unit/li/libxsmm/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/libyafaray/default.nix => unit/li/libyafaray/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libyaml/default.nix => unit/li/libyaml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libyaml-cpp/default.nix => unit/li/libyamlcpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libyaml-cpp/0.3.0.nix => unit/li/libyamlcpp_0_3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libyang/default.nix => unit/li/libyang/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libykclient/default.nix => unit/li/libykclient/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libykneomgr/default.nix => unit/li/libykneomgr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libytnef/default.nix => unit/li/libytnef/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libyubikey/default.nix => unit/li/libyubikey/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libyuv/link-library-against-libjpeg.patch (100%) rename pkgs/{development/libraries/libyuv/default.nix => unit/li/libyuv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libzapojit/default.nix => unit/li/libzapojit/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libzbc/default.nix => unit/li/libzbc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/libzbd/default.nix => unit/li/libzbd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libzdb/default.nix => unit/li/libzdb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libzen/default.nix => unit/li/libzen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libzim/default.nix => unit/li/libzim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libzip/default.nix => unit/li/libzip/pkg-fun.nix} (100%) rename pkgs/{development/libraries/libzmf/default.nix => unit/li/libzmf/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/libzra/fix-pkg-config.patch (100%) rename pkgs/{development/libraries/libzra/default.nix => unit/li/libzra/pkg-fun.nix} (100%) rename pkgs/{tools/misc/license-generator/default.nix => unit/li/license-generator/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/li}/license_finder/Gemfile (100%) rename pkgs/{development/tools => unit/li}/license_finder/Gemfile.lock (100%) rename pkgs/{development/tools => unit/li}/license_finder/gemset.nix (100%) rename pkgs/{development/tools/license_finder/default.nix => unit/li/license_finder/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/li}/licensee/Gemfile (100%) rename pkgs/{tools/package-management => unit/li}/licensee/Gemfile.lock (100%) rename pkgs/{tools/package-management => unit/li}/licensee/gemset.nix (100%) rename pkgs/{tools/package-management/licensee/default.nix => unit/li/licensee/pkg-fun.nix} (100%) rename pkgs/{tools/misc/licensor/default.nix => unit/li/licensor/pkg-fun.nix} (100%) rename pkgs/{servers/lidarr/default.nix => unit/li/lidarr/pkg-fun.nix} (100%) rename pkgs/{servers => unit/li}/lidarr/update.sh (100%) rename pkgs/{applications/science/math/LiE/default.nix => unit/li/lie/pkg-fun.nix} (100%) rename pkgs/{applications/networking/lieer/default.nix => unit/li/lieer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lifecycled/default.nix => unit/li/lifecycled/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lifelines/default.nix => unit/li/lifelines/pkg-fun.nix} (100%) rename pkgs/{applications/editors/lifeograph/default.nix => unit/li/lifeograph/pkg-fun.nix} (100%) rename pkgs/{applications/networking/newsreaders/liferea/default.nix => unit/li/liferea/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/light/default.nix => unit/li/light/pkg-fun.nix} (100%) rename pkgs/{applications/display-managers => unit/li}/lightdm-enso-os-greeter/fix-paths.patch (100%) rename pkgs/{applications/display-managers/lightdm-enso-os-greeter/default.nix => unit/li/lightdm-enso-os-greeter/pkg-fun.nix} (100%) rename pkgs/{applications/display-managers/lightdm-mini-greeter/default.nix => unit/li/lightdm-mini-greeter/pkg-fun.nix} (100%) rename pkgs/{applications/display-managers/lightdm-mobile-greeter/default.nix => unit/li/lightdm-mobile-greeter/pkg-fun.nix} (100%) rename pkgs/{applications/display-managers/lightdm-slick-greeter/default.nix => unit/li/lightdm-slick-greeter/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lighthouse-steamvr/default.nix => unit/li/lighthouse-steamvr/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/light-locker/default.nix => unit/li/lightlocker/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lightning-loop/default.nix => unit/li/lightning-loop/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lightning-pool/default.nix => unit/li/lightning-pool/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lightning/default.nix => unit/li/lightning/pkg-fun.nix} (100%) rename pkgs/{development/tools/lightningcss/default.nix => unit/li/lightningcss/pkg-fun.nix} (100%) rename pkgs/{misc/lightspark/default.nix => unit/li/lightspark/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lightstep-tracer-cpp/default.nix => unit/li/lightstep-tracer-cpp/pkg-fun.nix} (100%) rename pkgs/{servers/http/lighttpd/default.nix => unit/li/lighttpd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lightum/default.nix => unit/li/lightum/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lightwalletd/default.nix => unit/li/lightwalletd/pkg-fun.nix} (100%) rename pkgs/{applications/video/lightworks/default.nix => unit/li/lightworks/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ligolo-ng/default.nix => unit/li/ligolo-ng/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lilo/default.nix => unit/li/lilo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio => unit/li}/lilv/lilv-pkgconfig.patch (100%) rename pkgs/{development/libraries/audio/lilv/default.nix => unit/li/lilv/pkg-fun.nix} (100%) rename pkgs/{misc/lilypond/unstable.nix => unit/li/lilypond-unstable/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lime/default.nix => unit/li/lime/pkg-fun.nix} (100%) rename pkgs/{applications/misc/limesctl/default.nix => unit/li/limesctl/pkg-fun.nix} (100%) rename pkgs/{servers/limesurvey/default.nix => unit/li/limesurvey/pkg-fun.nix} (100%) rename pkgs/{tools/misc/limitcpu/default.nix => unit/li/limitcpu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/linbox/default.nix => unit/li/linbox/pkg-fun.nix} (100%) rename pkgs/{games/lincity/default.nix => unit/li/lincity/pkg-fun.nix} (100%) rename pkgs/{data/fonts/line-awesome/default.nix => unit/li/line-awesome/pkg-fun.nix} (100%) rename pkgs/{development/libraries/linenoise-ng/default.nix => unit/li/linenoise-ng/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/linenoise/create-pkg-config-file.sh (100%) rename pkgs/{development/libraries/linenoise/default.nix => unit/li/linenoise/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/lingeling/default.nix => unit/li/lingeling/pkg-fun.nix} (100%) rename pkgs/{applications/audio/lingot/default.nix => unit/li/lingot/pkg-fun.nix} (100%) rename pkgs/{development/compilers/lingua-franca/default.nix => unit/li/lingua-franca/pkg-fun.nix} (100%) rename pkgs/{data/fonts/linja-pi-pu-lukin/default.nix => unit/li/linja-pi-pu-lukin/pkg-fun.nix} (100%) rename pkgs/{tools/text/link-grammar/default.nix => unit/li/link-grammar/pkg-fun.nix} (100%) rename pkgs/{tools/networking/linkchecker/default.nix => unit/li/linkchecker/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/links2/default.nix => unit/li/links2/pkg-fun.nix} (100%) rename pkgs/{games/linthesia/default.nix => unit/li/linthesia/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/kernel/htmldocs.nix => unit/li/linux-doc/pkg-fun.nix} (100%) rename pkgs/{tools/security/linux-exploit-suggester/default.nix => unit/li/linux-exploit-suggester/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/linux-firmware/default.nix => unit/li/linux-firmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware => unit/li}/linux-firmware/source.nix (100%) rename pkgs/{os-specific/linux/firmware => unit/li}/linux-firmware/update.sh (100%) rename pkgs/{data/documentation/linux-manual/default.nix => unit/li/linux-manual/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam/default.nix => unit/li/linux-pam/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam => unit/li/linux-pam}/suid-wrapper-path.patch (100%) rename pkgs/{tools/networking/linux-router/default.nix => unit/li/linux-router/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/linux-wifi-hotspot/default.nix => unit/li/linux-wifi-hotspot/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/consoletools/default.nix => unit/li/linuxConsoleTools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/linux-logo/default.nix => unit/li/linux_logo/pkg-fun.nix} (100%) rename pkgs/{tools/text/sgml/linuxdoc-tools/default.nix => unit/li/linuxdoc-tools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/linuxptp/default.nix => unit/li/linuxptp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/linuxquota/default.nix => unit/li/linuxquota/pkg-fun.nix} (100%) rename pkgs/{applications/audio/linuxsampler/default.nix => unit/li/linuxsampler/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/linx-server/default.nix => unit/li/linx-server/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/li}/linx-server/test.patch (100%) rename pkgs/{development/tools/database/liquibase/default.nix => unit/li/liquibase/pkg-fun.nix} (100%) rename pkgs/{development/java-modules/liquibase_redshift_extension/default.nix => unit/li/liquibase_redshift_extension/pkg-fun.nix} (100%) rename pkgs/{development/libraries/liquidfun/default.nix => unit/li/liquidfun/pkg-fun.nix} (100%) rename pkgs/{shells/liquidprompt/default.nix => unit/li/liquidprompt/pkg-fun.nix} (100%) rename pkgs/{games/liquidwar/5.nix => unit/li/liquidwar5/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/li}/lirc/linux-headers-5.18.patch (100%) rename pkgs/{development/libraries/lirc/default.nix => unit/li/lirc/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/lisgd/default.nix => unit/li/lisgd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/listadmin/default.nix => unit/li/listadmin/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/li}/listmonk/frontend.nix (100%) rename pkgs/{servers/mail => unit/li}/listmonk/package.json (100%) rename pkgs/{servers/mail/listmonk/default.nix => unit/li/listmonk/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/li}/listmonk/yarn.lock (100%) rename pkgs/{servers/mail => unit/li}/listmonk/yarn.nix (100%) rename pkgs/{development/tools/misc/lit/default.nix => unit/li/lit/pkg-fun.nix} (100%) rename pkgs/{applications/editors/lite/default.nix => unit/li/lite/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/litebrowser/default.nix => unit/li/litebrowser/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/litecli/default.nix => unit/li/litecli/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/litefs/default.nix => unit/li/litefs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/litehtml/default.nix => unit/li/litehtml/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/litemdview/default.nix => unit/li/litemdview/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/litestream/default.nix => unit/li/litestream/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/littlefs-fuse/default.nix => unit/li/littlefs-fuse/pkg-fun.nix} (100%) rename pkgs/{development/libraries/live555/default.nix => unit/li/live555/pkg-fun.nix} (100%) rename pkgs/{tools/misc/livedl/default.nix => unit/li/livedl/pkg-fun.nix} (100%) rename pkgs/{servers/livepeer/default.nix => unit/li/livepeer/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/lizardfs/default.nix => unit/li/lizardfs/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lklug-sinhala/default.nix => unit/lk/lklug-sinhala/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/lkproof/default.nix => unit/lk/lkproof/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lksctp-tools/default.nix => unit/lk/lksctp-tools/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/llama/default.nix => unit/ll/llama/pkg-fun.nix} (100%) rename pkgs/{tools/networking/lldpd/default.nix => unit/ll/lldpd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/lls/default.nix => unit/ll/lls/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lm-sensors/default.nix => unit/lm/lm_sensors/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/lm}/lmdb/bin-ext.patch (100%) rename pkgs/{development/libraries => unit/lm}/lmdb/hardcoded-compiler.patch (100%) rename pkgs/{development/libraries/lmdb/default.nix => unit/lm/lmdb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lmdbxx/default.nix => unit/lm/lmdbxx/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lmmath/default.nix => unit/lm/lmmath/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lmodern/default.nix => unit/lm/lmodern/pkg-fun.nix} (100%) rename pkgs/{tools/security/lmp/default.nix => unit/lm/lmp/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ln}/lnav/0001-Forcefully-disable-docs-build.patch (100%) rename pkgs/{tools/misc/lnav/default.nix => unit/ln/lnav/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lnch/default.nix => unit/ln/lnch/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lnd/default.nix => unit/ln/lnd/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lndconnect/default.nix => unit/ln/lndconnect/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lndhub-go/default.nix => unit/ln/lndhub-go/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/lndmanage/default.nix => unit/ln/lndmanage/pkg-fun.nix} (100%) rename pkgs/{tools/misc/loadlibrary/default.nix => unit/lo/loadlibrary/pkg-fun.nix} (100%) rename pkgs/{tools/system/loadwatch/default.nix => unit/lo/loadwatch/pkg-fun.nix} (100%) rename pkgs/{development/misc/loc/default.nix => unit/lo/loc/pkg-fun.nix} (100%) rename pkgs/{tools/system/localtime/default.nix => unit/lo/localtime/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/loccount/default.nix => unit/lo/loccount/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lockdep/default.nix => unit/lo/lockdep/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lockfile-progs/default.nix => unit/lo/lockfileProgs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/log4cplus/default.nix => unit/lo/log4cplus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/log4cpp/default.nix => unit/lo/log4cpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/lo}/log4cxx/narrowing-fixes.patch (100%) rename pkgs/{development/libraries/log4cxx/default.nix => unit/lo/log4cxx/pkg-fun.nix} (100%) rename pkgs/{tools/security/log4j-detect/default.nix => unit/lo/log4j-detect/pkg-fun.nix} (100%) rename pkgs/{tools/security/log4j-scan/default.nix => unit/lo/log4j-scan/pkg-fun.nix} (100%) rename pkgs/{tools/security/log4j-sniffer/default.nix => unit/lo/log4j-sniffer/pkg-fun.nix} (100%) rename pkgs/{tools/security/log4j-vuln-scanner/default.nix => unit/lo/log4j-vuln-scanner/pkg-fun.nix} (100%) rename pkgs/{tools/security/log4jcheck/default.nix => unit/lo/log4jcheck/pkg-fun.nix} (100%) rename pkgs/{tools/security/log4shell-detector/default.nix => unit/lo/log4shell-detector/pkg-fun.nix} (100%) rename pkgs/{development/libraries/log4shib/default.nix => unit/lo/log4shib/pkg-fun.nix} (100%) rename pkgs/{tools/system/logcheck/default.nix => unit/lo/logcheck/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/logiops/default.nix => unit/lo/logiops/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/logisim-evolution/default.nix => unit/lo/logisim-evolution/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/logisim/default.nix => unit/lo/logisim/pkg-fun.nix} (100%) rename pkgs/{tools/security/logkeys/default.nix => unit/lo/logkeys/pkg-fun.nix} (100%) rename pkgs/{tools/security/logmap/default.nix => unit/lo/logmap/pkg-fun.nix} (100%) rename pkgs/{tools/networking/logmein-hamachi/default.nix => unit/lo/logmein-hamachi/pkg-fun.nix} (100%) rename pkgs/{tools/system/logrotate/default.nix => unit/lo/logrotate/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/logstalgia/default.nix => unit/lo/logstalgia/pkg-fun.nix} (100%) rename pkgs/{tools/misc/logstash/contrib.nix => unit/lo/logstash-contrib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/logtop/default.nix => unit/lo/logtop/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lokalise2-cli/default.nix => unit/lo/lokalise2-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/lokinet/default.nix => unit/lo/lokinet/pkg-fun.nix} (100%) rename pkgs/{shells/loksh/default.nix => unit/lo/loksh/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/lo}/lolcat/Gemfile (100%) rename pkgs/{tools/misc => unit/lo}/lolcat/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/lo}/lolcat/gemset.nix (100%) rename pkgs/{tools/misc/lolcat/default.nix => unit/lo/lolcat/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/lolcode/default.nix => unit/lo/lolcode/pkg-fun.nix} (100%) rename pkgs/{applications/audio/lollypop/default.nix => unit/lo/lollypop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/lombok/default.nix => unit/lo/lombok/pkg-fun.nix} (100%) rename pkgs/{misc/long-shebang/default.nix => unit/lo/long-shebang/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/lo}/longview/log-stdout.patch (100%) rename pkgs/{servers/monitoring/longview/default.nix => unit/lo/longview/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/looking-glass-client/default.nix => unit/lo/looking-glass-client/pkg-fun.nix} (100%) rename pkgs/{tools/misc/loop/default.nix => unit/lo/loop/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/lorien/default.nix => unit/lo/lorien/pkg-fun.nix} (100%) rename pkgs/{applications/audio/losslessaudiochecker/default.nix => unit/lo/losslessaudiochecker/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/lo}/losslesscut-bin/build-from-appimage.nix (100%) rename pkgs/{applications/video => unit/lo}/losslesscut-bin/build-from-dmg.nix (100%) rename pkgs/{applications/video => unit/lo}/losslesscut-bin/build-from-windows.nix (100%) rename pkgs/{applications/video/losslesscut-bin/default.nix => unit/lo/losslesscut-bin/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lottieconverter/default.nix => unit/lo/lottieconverter/pkg-fun.nix} (100%) rename pkgs/{tools/audio/loudgain/default.nix => unit/lo/loudgain/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/lo}/loudmouth/glib-2.32.patch (100%) rename pkgs/{development/libraries/loudmouth/default.nix => unit/lo/loudmouth/pkg-fun.nix} (100%) rename pkgs/{data/themes/lounge/default.nix => unit/lo/lounge-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting => unit/lo}/lout/CVE-2019-19917-and-CVE-2019-19918.patch (100%) rename pkgs/{tools/typesetting => unit/lo}/lout/builder.sh (100%) rename pkgs/{tools/typesetting/lout/default.nix => unit/lo/lout/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/love/0.10.nix => unit/lo/love_0_10/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/love/11.nix => unit/lo/love_11/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/lowdown/default.nix => unit/lo/lowdown/pkg-fun.nix} (100%) rename pkgs/{applications/misc/loxodo/default.nix => unit/lo/loxodo/pkg-fun.nix} (100%) rename pkgs/{games/lgames/lpairs2/default.nix => unit/lp/lpairs2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lpcnetfreedv/default.nix => unit/lp/lpcnetfreedv/pkg-fun.nix} (100%) rename pkgs/{tools/system/lr/default.nix => unit/lr/lr/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/lrcalc/default.nix => unit/lr/lrcalc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lrdf/default.nix => unit/lr/lrdf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/lrs/default.nix => unit/lr/lrs/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lrzip/default.nix => unit/lr/lrzip/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lrzsz/default.nix => unit/lr/lrzsz/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ls}/lsb-release/lsb_release.sh (100%) rename pkgs/{os-specific/linux/lsb-release/default.nix => unit/ls/lsb-release/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lscolors/default.nix => unit/ls/lscolors/pkg-fun.nix} (100%) rename pkgs/{tools/misc/lsd/default.nix => unit/ls/lsd/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/lsdvd/default.nix => unit/ls/lsdvd/pkg-fun.nix} (100%) rename pkgs/{tools/system/lshw/default.nix => unit/ls/lshw/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lsirec/default.nix => unit/ls/lsirec/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lsiutil/default.nix => unit/ls/lsiutil/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/lsix/default.nix => unit/ls/lsix/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/ls}/lsof/no-build-info.patch (100%) rename pkgs/{development/tools/misc/lsof/default.nix => unit/ls/lsof/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lsscsi/default.nix => unit/ls/lsscsi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lswt/default.nix => unit/ls/lswt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ltc-tools/default.nix => unit/lt/ltc-tools/pkg-fun.nix} (100%) rename pkgs/{tools/text/ltex-ls/default.nix => unit/lt/ltex-ls/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/ltl2ba/default.nix => unit/lt/ltl2ba/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/ltrace/default.nix => unit/lt/ltrace/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/lt}/ltrace/sysdeps-x86.patch (100%) rename pkgs/{development/tools/misc => unit/lt}/ltrace/testsuite-newfstatat.patch (100%) rename pkgs/{games/lgames/ltris/default.nix => unit/lt/ltris/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/lttng-tools/default.nix => unit/lt/lttng-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/lttv/default.nix => unit/lt/lttv/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ltunify/default.nix => unit/lt/ltunify/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ltwheelconf/default.nix => unit/lt/ltwheelconf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/luabridge/default.nix => unit/lu/luabridge/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/luau/default.nix => unit/lu/luau/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/lucene/default.nix => unit/lu/lucene/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lucene++/default.nix => unit/lu/lucenepp/pkg-fun.nix} (100%) rename pkgs/{development/web/lucky-cli/default.nix => unit/lu/lucky-cli/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/lu}/lucky-cli/shard.lock (100%) rename pkgs/{development/web => unit/lu}/lucky-cli/shards.nix (100%) rename pkgs/{data/fonts/luculent/default.nix => unit/lu/luculent/pkg-fun.nix} (100%) rename pkgs/{applications/backup/ludusavi/default.nix => unit/lu/ludusavi/pkg-fun.nix} (100%) rename pkgs/{games/lugaru/default.nix => unit/lu/lugaru/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/luigi/default.nix => unit/lu/luigi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/lukesmithxyz-bible/kjv.nix => unit/lu/lukesmithxyz-bible-kjv/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/st => unit/lu}/lukesmithxyz-st/0000-makefile-fix-install.diff (100%) rename pkgs/{applications/terminal-emulators/st/lukesmithxyz-st/default.nix => unit/lu/lukesmithxyz-st/pkg-fun.nix} (100%) rename pkgs/{games/lunar-client/default.nix => unit/lu/lunar-client/pkg-fun.nix} (100%) rename pkgs/{applications/audio/luppp/default.nix => unit/lu/luppp/pkg-fun.nix} (100%) rename pkgs/{development/tools/lurk/default.nix => unit/lu/lurk/pkg-fun.nix} (100%) rename pkgs/{tools/video/lux/default.nix => unit/lu/lux/pkg-fun.nix} (100%) rename pkgs/{tools/text/lv/default.nix => unit/lv/lv/pkg-fun.nix} (100%) rename pkgs/{applications/audio/lv2-cpp-tools/default.nix => unit/lv/lv2-cpp-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/lv2/default.nix => unit/lv/lv2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/lv2bm/default.nix => unit/lv/lv2bm/pkg-fun.nix} (100%) rename pkgs/{applications/audio/lv2lint/default.nix => unit/lv/lv2lint/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/lv}/lvmsync/Gemfile (100%) rename pkgs/{tools/backup => unit/lv}/lvmsync/Gemfile.lock (100%) rename pkgs/{tools/backup => unit/lv}/lvmsync/gemset.nix (100%) rename pkgs/{tools/backup/lvmsync/default.nix => unit/lv/lvmsync/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/lvtk/default.nix => unit/lv/lvtk/pkg-fun.nix} (100%) rename pkgs/{servers/http/lwan/default.nix => unit/lw/lwan/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/lwm/default.nix => unit/lw/lwm/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/lxcfs/default.nix => unit/lx/lxcfs/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/lxd-image-server/default.nix => unit/lx/lxd-image-server/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization => unit/lx}/lxd-image-server/run.patch (100%) rename pkgs/{tools/virtualization => unit/lx}/lxd-image-server/state.patch (100%) rename pkgs/{tools/admin/lxd/default.nix => unit/lx/lxd/pkg-fun.nix} (100%) rename pkgs/{applications/video/lxdvdrip/default.nix => unit/lx/lxdvdrip/pkg-fun.nix} (100%) rename pkgs/{data/fonts/lxgw-wenkai/default.nix => unit/lx/lxgw-wenkai/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/lxterminal/default.nix => unit/lx/lxterminal/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators => unit/lx}/lxterminal/respect-xml-catalog-files-var.patch (100%) rename pkgs/{applications/display-managers/ly/default.nix => unit/ly/ly/pkg-fun.nix} (100%) rename pkgs/{tools/security/lynis/default.nix => unit/ly/lynis/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/lynx/default.nix => unit/ly/lynx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lyra/default.nix => unit/ly/lyra/pkg-fun.nix} (100%) rename pkgs/{applications/audio/lyrebird/default.nix => unit/ly/lyrebird/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lz4/default.nix => unit/lz/lz4/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lzbench/default.nix => unit/lz/lzbench/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lzfse/default.nix => unit/lz/lzfse/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lzham/default.nix => unit/lz/lzham/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/lz}/lzip/lzip-setup-hook.sh (100%) rename pkgs/{tools/compression/lzip/default.nix => unit/lz/lzip/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lziprecover/default.nix => unit/lz/lziprecover/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lzlib/default.nix => unit/lz/lzlib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/lzo/default.nix => unit/lz/lzo/pkg-fun.nix} (100%) rename pkgs/{tools/compression/lzop/default.nix => unit/lz/lzop/pkg-fun.nix} (100%) rename pkgs/{games/lzwolf/default.nix => unit/lz/lzwolf/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/m-cli/default.nix => unit/m-/m-cli/pkg-fun.nix} (100%) rename pkgs/{applications/radio/m17-cxx-demod/default.nix => unit/m1/m17-cxx-demod/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/m17n-db/default.nix => unit/m1/m17n_db/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/m17n-lib/default.nix => unit/m1/m17n_lib/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/m33-linux/default.nix => unit/m3/m33-linux/pkg-fun.nix} (100%) rename pkgs/{applications/audio/m4acut/default.nix => unit/m4/m4acut/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/m4ri/default.nix => unit/m4/m4ri/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/m4rie/default.nix => unit/m4/m4rie/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/MACS2/default.nix => unit/ma/MACS2/pkg-fun.nix} (100%) rename pkgs/{servers/ma1sd/default.nix => unit/ma/ma1sd/pkg-fun.nix} (100%) rename pkgs/{tools/system/mac-fdisk/default.nix => unit/ma/mac-fdisk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mac/default.nix => unit/ma/mac/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/macchanger/default.nix => unit/ma/macchanger/pkg-fun.nix} (100%) rename pkgs/{tools/misc/macchina/default.nix => unit/ma/macchina/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/mackerel-agent/default.nix => unit/ma/mackerel-agent/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/macse/default.nix => unit/ma/macse/pkg-fun.nix} (100%) rename pkgs/{servers/maddy/default.nix => unit/ma/maddy/pkg-fun.nix} (100%) rename pkgs/{applications/misc/madonctl/default.nix => unit/ma/madonctl/pkg-fun.nix} (100%) rename pkgs/{games => unit/ma}/maelstrom/fix-compilation.patch (100%) rename pkgs/{games/maelstrom/default.nix => unit/ma/maelstrom/pkg-fun.nix} (100%) rename pkgs/{development/libraries/maeparser/default.nix => unit/ma/maeparser/pkg-fun.nix} (100%) rename pkgs/{development/mobile/maestro/default.nix => unit/ma/maestro/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/mafft/default.nix => unit/ma/mafft/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/mage/default.nix => unit/ma/mage/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/ma}/magic-vlsi/0001-strip-bin-prefix.patch (100%) rename pkgs/{applications/science/electronics/magic-vlsi/default.nix => unit/ma/magic-vlsi/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/magnetico/default.nix => unit/ma/magnetico/pkg-fun.nix} (100%) rename pkgs/{tools/security/maigret/default.nix => unit/ma/maigret/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/maiko/default.nix => unit/ma/maiko/pkg-fun.nix} (100%) rename pkgs/{data/misc/mailcap/default.nix => unit/ma/mailcap/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/ma}/mailcatcher/Gemfile (100%) rename pkgs/{development/web => unit/ma}/mailcatcher/Gemfile.lock (100%) rename pkgs/{development/web => unit/ma}/mailcatcher/gemset.nix (100%) rename pkgs/{development/web/mailcatcher/default.nix => unit/ma/mailcatcher/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders => unit/ma}/mailcheck/mailcheck-Makefile.patch (100%) rename pkgs/{applications/networking/mailreaders/mailcheck/default.nix => unit/ma/mailcheck/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ma}/maildrop/maildrop.configure.hack.patch (100%) rename pkgs/{tools/networking/maildrop/default.nix => unit/ma/maildrop/pkg-fun.nix} (100%) rename pkgs/{servers/mail/mailhog/default.nix => unit/ma/mailhog/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mailman-rss/default.nix => unit/ma/mailman-rss/pkg-fun.nix} (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/hyperkitty.nix (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/log-stderr.patch (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/mailman-hyperkitty.nix (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/package.nix (100%) rename pkgs/{servers/mail/mailman/default.nix => unit/ma/mailmanPackages/pkg-fun.nix} (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/postorius.nix (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/python.nix (100%) rename pkgs/{servers/mail/mailman => unit/ma/mailmanPackages}/web.nix (100%) rename pkgs/{tools/networking/mailsend/default.nix => unit/ma/mailsend/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/mailspring/default.nix => unit/ma/mailspring/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/maim/default.nix => unit/ma/maim/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/ma}/mairix/mmap.patch (100%) rename pkgs/{tools/text/mairix/default.nix => unit/ma/mairix/pkg-fun.nix} (100%) rename pkgs/{build-support/make-startupitem/default.nix => unit/ma/makeAutostartItem/pkg-fun.nix} (100%) rename pkgs/{build-support/setup-hooks/make-binary-wrapper => unit/ma/makeBinaryWrapper}/make-binary-wrapper.sh (100%) rename pkgs/{build-support/setup-hooks/make-binary-wrapper/default.nix => unit/ma/makeBinaryWrapper/pkg-fun.nix} (100%) rename pkgs/{build-support/make-darwin-bundle/default.nix => unit/ma/makeDarwinBundle/pkg-fun.nix} (100%) rename pkgs/{build-support/make-desktopitem/default.nix => unit/ma/makeDesktopItem/pkg-fun.nix} (100%) rename pkgs/{build-support/make-hardcode-gsettings-patch => unit/ma/makeHardcodeGsettingsPatch}/hardcode-gsettings.cocci (100%) rename pkgs/{build-support/make-hardcode-gsettings-patch/default.nix => unit/ma/makeHardcodeGsettingsPatch/pkg-fun.nix} (100%) rename pkgs/{build-support/kernel => unit/ma/makeInitrdNGTool}/make-initrd-ng/Cargo.lock (100%) rename pkgs/{build-support/kernel => unit/ma/makeInitrdNGTool}/make-initrd-ng/update.sh (100%) rename pkgs/{build-support/kernel/make-initrd-ng-tool.nix => unit/ma/makeInitrdNGTool/pkg-fun.nix} (100%) rename pkgs/{build-support/make-pkgconfigitem/default.nix => unit/ma/makePkgconfigItem/pkg-fun.nix} (100%) rename pkgs/{tools/misc/makebootfat/default.nix => unit/ma/makebootfat/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/makefile2graph/default.nix => unit/ma/makefile2graph/pkg-fun.nix} (100%) rename pkgs/{tools/misc/maker-panel/default.nix => unit/ma/maker-panel/pkg-fun.nix} (100%) rename pkgs/{development/tools/makerpm/default.nix => unit/ma/makerpm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/makeself/default.nix => unit/ma/makeself/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mako/default.nix => unit/ma/mako/pkg-fun.nix} (100%) rename pkgs/{development/tools/maligned/default.nix => unit/ma/maligned/pkg-fun.nix} (100%) rename pkgs/{development/tools/profiling/malt/default.nix => unit/ma/malt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mamba/default.nix => unit/ma/mamba/pkg-fun.nix} (100%) rename pkgs/{tools/misc/man-db/default.nix => unit/ma/man-db/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ma}/man-db/systemwide-man-db-conf.patch (100%) rename pkgs/{data/documentation/man-pages-posix/default.nix => unit/ma/man-pages-posix/pkg-fun.nix} (100%) rename pkgs/{data/documentation/man-pages/default.nix => unit/ma/man-pages/pkg-fun.nix} (100%) rename pkgs/{games/manaplus/default.nix => unit/ma/manaplus/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mandoc/default.nix => unit/ma/mandoc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mandown/default.nix => unit/ma/mandown/pkg-fun.nix} (100%) rename pkgs/{tools/misc/manga-cli/default.nix => unit/ma/manga-cli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mangal/default.nix => unit/ma/mangal/pkg-fun.nix} (100%) rename pkgs/{development/tools/mani/default.nix => unit/ma/mani/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/ma}/manim/failing_tests.nix (100%) rename pkgs/{applications/video/manim/default.nix => unit/ma/manim/pkg-fun.nix} (100%) rename pkgs/{data/fonts/manrope/default.nix => unit/ma/manrope/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/manta/default.nix => unit/ma/manta/pkg-fun.nix} (100%) rename pkgs/{development/compilers/manticore/default.nix => unit/ma/manticore/pkg-fun.nix} (100%) rename pkgs/{servers/search/manticoresearch/default.nix => unit/ma/manticoresearch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/map/default.nix => unit/ma/map-cmd/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/mapcache/default.nix => unit/ma/mapcache/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mapcidr/default.nix => unit/ma/mapcidr/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ma}/maphosts/Gemfile (100%) rename pkgs/{tools/networking => unit/ma}/maphosts/Gemfile.lock (100%) rename pkgs/{tools/networking => unit/ma}/maphosts/gemset.nix (100%) rename pkgs/{tools/networking/maphosts/default.nix => unit/ma/maphosts/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/mapproxy/default.nix => unit/ma/mapproxy/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/mapserver/default.nix => unit/ma/mapserver/pkg-fun.nix} (100%) rename pkgs/{games/mar1d/default.nix => unit/ma/mar1d/pkg-fun.nix} (100%) rename pkgs/{data/fonts/marathi-cursive/default.nix => unit/ma/marathi-cursive/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/marathonctl/default.nix => unit/ma/marathonctl/pkg-fun.nix} (100%) rename pkgs/{games/mari0/default.nix => unit/ma/mari0/pkg-fun.nix} (100%) rename pkgs/{servers/sql/mariadb/galera/default.nix => unit/ma/mariadb-galera/pkg-fun.nix} (100%) rename pkgs/{development/libraries/marisa/default.nix => unit/ma/marisa/pkg-fun.nix} (100%) rename pkgs/{tools/text/mark/default.nix => unit/ma/mark/pkg-fun.nix} (100%) rename pkgs/{tools/misc/markdown-anki-decks/default.nix => unit/ma/markdown-anki-decks/pkg-fun.nix} (100%) rename pkgs/{tools/text/markdown-pp/default.nix => unit/ma/markdown-pp/pkg-fun.nix} (100%) rename pkgs/{applications/editors/marker/default.nix => unit/ma/marker/pkg-fun.nix} (100%) rename pkgs/{applications/misc/markets/default.nix => unit/ma/markets/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ma}/marksman/deps.nix (100%) rename pkgs/{development/tools/marksman/default.nix => unit/ma/marksman/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ma}/marksman/update.sh (100%) rename pkgs/{applications/misc/marktext/default.nix => unit/ma/marktext/pkg-fun.nix} (100%) rename pkgs/{development/libraries/marl/default.nix => unit/ma/marl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/marlin-calc/default.nix => unit/ma/marlin-calc/pkg-fun.nix} (100%) rename pkgs/{development/tools/mars-mips/default.nix => unit/ma/mars-mips/pkg-fun.nix} (100%) rename pkgs/{games/mars/default.nix => unit/ma/mars/pkg-fun.nix} (100%) rename pkgs/{development/compilers/marst/default.nix => unit/ma/marst/pkg-fun.nix} (100%) rename pkgs/{data/fonts/martian-mono/default.nix => unit/ma/martian-mono/pkg-fun.nix} (100%) rename pkgs/{development/libraries/martyr/default.nix => unit/ma/martyr/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry => unit/ma}/marvin/LicenseManager.desktop (100%) rename pkgs/{applications/science/chemistry => unit/ma}/marvin/MarvinSketch.desktop (100%) rename pkgs/{applications/science/chemistry => unit/ma}/marvin/MarvinView.desktop (100%) rename pkgs/{applications/science/chemistry/marvin/default.nix => unit/ma/marvin/pkg-fun.nix} (100%) rename pkgs/{data/themes/marwaita-manjaro/default.nix => unit/ma/marwaita-manjaro/pkg-fun.nix} (100%) rename pkgs/{data/themes/marwaita-peppermint/default.nix => unit/ma/marwaita-peppermint/pkg-fun.nix} (100%) rename pkgs/{data/themes/marwaita-pop_os/default.nix => unit/ma/marwaita-pop_os/pkg-fun.nix} (100%) rename pkgs/{data/themes/marwaita-ubuntu/default.nix => unit/ma/marwaita-ubuntu/pkg-fun.nix} (100%) rename pkgs/{data/themes/marwaita/default.nix => unit/ma/marwaita/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/mas/default.nix => unit/ma/mas/pkg-fun.nix} (100%) rename pkgs/{development/tools/mask/default.nix => unit/ma/mask/pkg-fun.nix} (100%) rename pkgs/{tools/security/masscan/default.nix => unit/ma/masscan/pkg-fun.nix} (100%) rename pkgs/{tools/misc/massren/default.nix => unit/ma/massren/pkg-fun.nix} (100%) rename pkgs/{tools/backup/mastodon-archive/default.nix => unit/ma/mastodon-archive/pkg-fun.nix} (100%) rename pkgs/{servers/mastodon/default.nix => unit/ma/mastodon/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ma}/mastodon/source.nix (100%) rename pkgs/{servers => unit/ma}/mastodon/update.nix (100%) rename pkgs/{servers => unit/ma}/mastodon/update.sh (100%) rename pkgs/{servers => unit/ma}/mastodon/version.nix (100%) rename pkgs/{data/themes/matcha/default.nix => unit/ma/matcha-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/matchbox/default.nix => unit/ma/matchbox/pkg-fun.nix} (100%) rename pkgs/{data/themes/materia-kde/default.nix => unit/ma/materia-kde-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/materia-theme/default.nix => unit/ma/materia-theme/pkg-fun.nix} (100%) rename pkgs/{data/fonts/material-design-icons/default.nix => unit/ma/material-design-icons/pkg-fun.nix} (100%) rename pkgs/{data/fonts/material-icons/default.nix => unit/ma/material-icons/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mathpix-snipping-tool/default.nix => unit/ma/mathpix-snipping-tool/pkg-fun.nix} (100%) rename pkgs/{development/libraries/matio/default.nix => unit/ma/matio/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/ma}/matrix-alertmanager/package.json (100%) rename pkgs/{servers/monitoring/matrix-alertmanager/default.nix => unit/ma/matrix-alertmanager/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/ma}/matrix-alertmanager/update.nix (100%) rename pkgs/{servers/monitoring => unit/ma}/matrix-alertmanager/yarn-hash (100%) rename pkgs/{servers/monitoring => unit/ma}/matrix-alertmanager/yarn.lock (100%) rename pkgs/{servers => unit/ma}/matrix-appservice-discord/package.json (100%) rename pkgs/{servers => unit/ma}/matrix-appservice-discord/pin.json (100%) rename pkgs/{servers/matrix-appservice-discord/default.nix => unit/ma/matrix-appservice-discord/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ma}/matrix-appservice-discord/update.sh (100%) rename pkgs/{servers/matrix-synapse/matrix-appservice-irc/default.nix => unit/ma/matrix-appservice-irc/pkg-fun.nix} (100%) rename pkgs/{servers/matrix-synapse => unit/ma}/matrix-appservice-slack/package.json (100%) rename pkgs/{servers/matrix-synapse => unit/ma}/matrix-appservice-slack/pin.json (100%) rename pkgs/{servers/matrix-synapse/matrix-appservice-slack/default.nix => unit/ma/matrix-appservice-slack/pkg-fun.nix} (100%) rename pkgs/{servers/matrix-synapse => unit/ma}/matrix-appservice-slack/update.sh (100%) rename pkgs/{servers => unit/ma}/matrix-conduit/cargo-11192-workaround.patch (100%) rename pkgs/{servers/matrix-conduit/default.nix => unit/ma/matrix-conduit/pkg-fun.nix} (100%) rename pkgs/{servers/matrix-corporal/default.nix => unit/ma/matrix-corporal/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/matrix-dl/default.nix => unit/ma/matrix-dl/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/ma}/matrix-recorder/composition.nix (100%) rename pkgs/{applications/networking/instant-messengers => unit/ma}/matrix-recorder/node-env.nix (100%) rename pkgs/{applications/networking/instant-messengers => unit/ma}/matrix-recorder/node-packages.nix (100%) rename pkgs/{applications/networking/instant-messengers/matrix-recorder/default.nix => unit/ma/matrix-recorder/pkg-fun.nix} (100%) rename pkgs/{development/libraries/matrix-sdk-crypto-nodejs/default.nix => unit/ma/matrix-sdk-crypto-nodejs/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ma}/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch (100%) rename pkgs/{servers/matrix-synapse/default.nix => unit/ma/matrix-synapse/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/plugins/default.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/plugins/ldap3.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/plugins/mjolnir-antispam.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/plugins/pam.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/plugins/shared-secret-auth.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/tools/default.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/tools/rust-synapse-compress-state.nix (100%) rename pkgs/{servers => unit/ma}/matrix-synapse/tools/synadm.nix (100%) rename pkgs/{development/compilers => unit/ma}/matter-compiler/Gemfile (100%) rename pkgs/{development/compilers => unit/ma}/matter-compiler/Gemfile.lock (100%) rename pkgs/{development/compilers => unit/ma}/matter-compiler/gemset.nix (100%) rename pkgs/{development/compilers/matter-compiler/default.nix => unit/ma/matter-compiler/pkg-fun.nix} (100%) rename pkgs/{servers/matterbridge/default.nix => unit/ma/matterbridge/pkg-fun.nix} (100%) rename pkgs/{servers/mattermost/matterircd.nix => unit/ma/matterircd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/mattermost-desktop/default.nix => unit/ma/mattermost-desktop/pkg-fun.nix} (100%) rename pkgs/{servers/mattermost/default.nix => unit/ma/mattermost/pkg-fun.nix} (100%) rename pkgs/{servers/mautrix-facebook/default.nix => unit/ma/mautrix-facebook/pkg-fun.nix} (100%) rename pkgs/{servers/mautrix-googlechat/default.nix => unit/ma/mautrix-googlechat/pkg-fun.nix} (100%) rename pkgs/{servers/mautrix-whatsapp/default.nix => unit/ma/mautrix-whatsapp/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/apache-maven => unit/ma/maven3}/builder.sh (100%) rename pkgs/{development/tools/build-managers/apache-maven/default.nix => unit/ma/maven3/pkg-fun.nix} (100%) rename pkgs/{tools/text/mawk/default.nix => unit/ma/mawk/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/maxcso/default.nix => unit/ma/maxcso/pkg-fun.nix} (100%) rename pkgs/{development/libraries/maxflow/default.nix => unit/ma/maxflow/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pd-plugins/maxlib/default.nix => unit/ma/maxlib/pkg-fun.nix} (100%) rename pkgs/{tools/text/mb2md/default.nix => unit/mb/mb2md/pkg-fun.nix} (100%) rename pkgs/{development/tools/mbed-cli/default.nix => unit/mb/mbed-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/mbelib/default.nix => unit/mb/mbelib/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mbidled/default.nix => unit/mb/mbidled/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/mblaze/default.nix => unit/mb/mblaze/pkg-fun.nix} (100%) rename pkgs/{development/tools/mblock-mlink/default.nix => unit/mb/mblock-mlink/pkg-fun.nix} (100%) rename pkgs/{tools/security/mbox/default.nix => unit/mb/mbox/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mbpfan/default.nix => unit/mb/mbpfan/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/bqn/mlochbaum-bqn => unit/mb/mbqn}/001-libbqn-path.patch (100%) rename pkgs/{development/interpreters/bqn/mlochbaum-bqn/default.nix => unit/mb/mbqn/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mbrola/default.nix => unit/mb/mbrola/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/mbtileserver/default.nix => unit/mb/mbtileserver/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mbuffer/default.nix => unit/mb/mbuffer/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/mcabber/default.nix => unit/mc/mcabber/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/st/mcaimi-st.nix => unit/mc/mcaimi-st/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mceinject/default.nix => unit/mc/mceinject/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mcfly/default.nix => unit/mc/mcfly/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/mcomix/default.nix => unit/mc/mcomix/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mcpp/default.nix => unit/mc/mcpp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mcrcon/default.nix => unit/mc/mcrcon/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/mcrl2/default.nix => unit/mc/mcrl2/pkg-fun.nix} (100%) rename pkgs/{tools/system/mcron/default.nix => unit/mc/mcron/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/mc}/mcrypt/format-string_CVE-2012-4426.patch (100%) rename pkgs/{tools/misc => unit/mc}/mcrypt/malloc_to_stdlib.patch (100%) rename pkgs/{tools/misc => unit/mc}/mcrypt/overflow_CVE-2012-4409.patch (100%) rename pkgs/{tools/misc/mcrypt/default.nix => unit/mc/mcrypt/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/mc}/mcrypt/segv.patch (100%) rename pkgs/{tools/misc => unit/mc}/mcrypt/sprintf_CVE-2012-4527.patch (100%) rename pkgs/{applications/science/logic/mcy/default.nix => unit/mc/mcy/pkg-fun.nix} (100%) rename pkgs/{development/tools/literate-programming/md-tangle/default.nix => unit/md/md-tangle/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/md}/md4c/fix-pkgconfig.patch (100%) rename pkgs/{development/libraries/md4c/default.nix => unit/md/md4c/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mda-lv2/default.nix => unit/md/mda_lv2/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mdadm => unit/md/mdadm4}/no-self-references.patch (100%) rename pkgs/{os-specific/linux/mdadm/default.nix => unit/md/mdadm4/pkg-fun.nix} (100%) rename pkgs/{tools/text/mdbook-cmdrun/default.nix => unit/md/mdbook-cmdrun/pkg-fun.nix} (100%) rename pkgs/{tools/text/mdbook-man/default.nix => unit/md/mdbook-man/pkg-fun.nix} (100%) rename pkgs/{tools/text/mdbook-open-on-gh/default.nix => unit/md/mdbook-open-on-gh/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mdbtools/default.nix => unit/md/mdbtools/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/mdctags/default.nix => unit/md/mdctags/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mdds/default.nix => unit/md/mdds/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mdevctl/default.nix => unit/md/mdevctl/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/mdf2iso/default.nix => unit/md/mdf2iso/pkg-fun.nix} (100%) rename pkgs/{development/tools/mdk/default.nix => unit/md/mdk/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mdk4/default.nix => unit/md/mdk4/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/md}/mdl/Gemfile (100%) rename pkgs/{development/tools/misc => unit/md}/mdl/Gemfile.lock (100%) rename pkgs/{development/tools/misc => unit/md}/mdl/gemset.nix (100%) rename pkgs/{development/tools/misc/mdl/default.nix => unit/md/mdl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mdp/default.nix => unit/md/mdp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mdr/default.nix => unit/md/mdr/pkg-fun.nix} (100%) rename pkgs/{development/tools/documentation/mdsh/default.nix => unit/md/mdsh/pkg-fun.nix} (100%) rename pkgs/{tools/misc/me_cleaner/default.nix => unit/me/me_cleaner/pkg-fun.nix} (100%) rename pkgs/{applications/video/media-downloader/default.nix => unit/me/media-downloader/pkg-fun.nix} (100%) rename pkgs/{data/misc/media-player-info/default.nix => unit/me/media-player-info/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mediainfo-gui/default.nix => unit/me/mediainfo-gui/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mediainfo/default.nix => unit/me/mediainfo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mediastreamer/msopenh264.nix => unit/me/mediastreamer-openh264/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/mediawiki/default.nix => unit/me/mediawiki/pkg-fun.nix} (100%) rename pkgs/{data/fonts/medio/default.nix => unit/me/medio/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/mednafen/server.nix => unit/me/mednafen-server/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/mednafen/default.nix => unit/me/mednafen/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/mednaffe/default.nix => unit/me/mednaffe/pkg-fun.nix} (100%) rename pkgs/{tools/security/medusa/default.nix => unit/me/medusa/pkg-fun.nix} (100%) rename pkgs/{applications/misc/meerk40t/camera.nix => unit/me/meerk40t-camera/pkg-fun.nix} (100%) rename pkgs/{applications/misc/meerk40t/default.nix => unit/me/meerk40t/pkg-fun.nix} (100%) rename pkgs/{tools/misc/megacli/default.nix => unit/me/megacli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/megacmd/default.nix => unit/me/megacmd/pkg-fun.nix} (100%) rename pkgs/{games/megaglest/default.nix => unit/me/megaglest/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/megahit/default.nix => unit/me/megahit/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc => unit/me}/megam/ocaml-3.12.patch (100%) rename pkgs/{applications/science/misc => unit/me}/megam/ocaml-includes.patch (100%) rename pkgs/{applications/science/misc/megam/default.nix => unit/me/megam/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/megapixels/default.nix => unit/me/megapixels/pkg-fun.nix} (100%) rename pkgs/{tools/networking/megatools/default.nix => unit/me/megatools/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/meh/default.nix => unit/me/meh/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/mela/default.nix => unit/me/mela/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/meld/default.nix => unit/me/meld/pkg-fun.nix} (100%) rename pkgs/{tools/misc/melody/default.nix => unit/me/melody/pkg-fun.nix} (100%) rename pkgs/{tools/security/melt/default.nix => unit/me/melt/pkg-fun.nix} (100%) rename pkgs/{servers/memcached/default.nix => unit/me/memcached/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/meme-image-generator/default.nix => unit/me/meme-image-generator/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/meme-suite/default.nix => unit/me/meme-suite/pkg-fun.nix} (100%) rename pkgs/{applications/misc/memo/default.nix => unit/me/memo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/memorymapping/default.nix => unit/me/memorymapping/pkg-fun.nix} (100%) rename pkgs/{development/tools/memray/default.nix => unit/me/memray/pkg-fun.nix} (100%) rename pkgs/{development/libraries/memstream/default.nix => unit/me/memstream/pkg-fun.nix} (100%) rename pkgs/{tools/misc/memtest86-efi/default.nix => unit/me/memtest86-efi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/memtest86+/default.nix => unit/me/memtest86plus/pkg-fun.nix} (100%) rename pkgs/{tools/system/memtester/default.nix => unit/me/memtester/pkg-fun.nix} (100%) rename pkgs/{tools/networking/memtier-benchmark/default.nix => unit/me/memtier-benchmark/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mencal/default.nix => unit/me/mencal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/menu-cache/default.nix => unit/me/menu-cache/pkg-fun.nix} (100%) rename pkgs/{applications/misc/menumaker/default.nix => unit/me/menumaker/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mepo/default.nix => unit/me/mepo/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mercury/default.nix => unit/me/mercury/pkg-fun.nix} (100%) rename pkgs/{servers/http/merecat/default.nix => unit/me/merecat/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/mergerfs/tools.nix => unit/me/mergerfs-tools/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/mergerfs/default.nix => unit/me/mergerfs/pkg-fun.nix} (100%) rename pkgs/{games/meritous/default.nix => unit/me/meritous/pkg-fun.nix} (100%) rename pkgs/{data/fonts/merriweather-sans/default.nix => unit/me/merriweather-sans/pkg-fun.nix} (100%) rename pkgs/{data/fonts/merriweather/default.nix => unit/me/merriweather/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/me}/mesa-demos/demos-data-dir.patch (100%) rename pkgs/{tools/graphics/mesa-demos/default.nix => unit/me/mesa-demos/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/me}/meshcentral/fix-js-include-paths.patch (100%) rename pkgs/{tools/admin => unit/me}/meshcentral/package.json (100%) rename pkgs/{tools/admin/meshcentral/default.nix => unit/me/meshcentral/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/me}/meshcentral/update.sh (100%) rename pkgs/{tools/admin => unit/me}/meshcentral/yarn.lock (100%) rename pkgs/{tools/admin => unit/me}/meshcentral/yarn.nix (100%) rename pkgs/{data/fonts/meslo-lg/default.nix => unit/me/meslo-lg/pkg-fun.nix} (100%) rename pkgs/{data/fonts/meslo-lgs-nf/default.nix => unit/me/meslo-lgs-nf/pkg-fun.nix} (100%) rename pkgs/{misc/meson-tools/default.nix => unit/me/meson-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/me}/meson/boost-Do-not-add-system-paths-on-nix.patch (100%) rename pkgs/{development/tools/build-managers => unit/me}/meson/clear-old-rpath.patch (100%) rename pkgs/{development/tools/build-managers => unit/me}/meson/fix-rpath.patch (100%) rename pkgs/{development/tools/build-managers => unit/me}/meson/gir-fallback-path.patch (100%) rename pkgs/{development/tools/build-managers => unit/me}/meson/more-env-vars.patch (100%) rename pkgs/{development/tools/build-managers/meson/default.nix => unit/me/meson/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/me}/meson/setup-hook.sh (100%) rename pkgs/{servers => unit/me}/mesos-dns/deps.nix (100%) rename pkgs/{servers/mesos-dns/default.nix => unit/me/mesos-dns/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/messer-slim/default.nix => unit/me/messer-slim/pkg-fun.nix} (100%) rename pkgs/{development/compilers/meta-environment/meta-build-env/default.nix => unit/me/metaBuildEnv/pkg-fun.nix} (100%) rename pkgs/{tools/security/metabigor/default.nix => unit/me/metabigor/pkg-fun.nix} (100%) rename pkgs/{applications/misc/metadata-cleaner/default.nix => unit/me/metadata-cleaner/pkg-fun.nix} (100%) rename pkgs/{development/tools/metal-cli/default.nix => unit/me/metal-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/metals/default.nix => unit/me/metals/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/metamath/default.nix => unit/me/metamath/pkg-fun.nix} (100%) rename pkgs/{applications/misc/metamorphose2/default.nix => unit/me/metamorphose2/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/metapixel/default.nix => unit/me/metapixel/pkg-fun.nix} (100%) rename pkgs/{applications/misc/metar/default.nix => unit/me/metar/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/me}/metasploit/Gemfile (100%) rename pkgs/{tools/security => unit/me}/metasploit/Gemfile.lock (100%) rename pkgs/{tools/security => unit/me}/metasploit/gemset.nix (100%) rename pkgs/{tools/security/metasploit/default.nix => unit/me/metasploit/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/me}/metasploit/shell.nix (100%) rename pkgs/{tools/security => unit/me}/metasploit/update.sh (100%) rename pkgs/{os-specific/linux/metastore/default.nix => unit/me/metastore/pkg-fun.nix} (100%) rename pkgs/{applications/networking/weather/meteo/default.nix => unit/me/meteo/pkg-fun.nix} (100%) rename pkgs/{servers => unit/me}/meteor/main.patch (100%) rename pkgs/{servers/meteor/default.nix => unit/me/meteor/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/me}/meterbridge/buf_rect.patch (100%) rename pkgs/{applications/audio => unit/me}/meterbridge/fix_build_with_gcc-5.patch (100%) rename pkgs/{applications/audio/meterbridge/default.nix => unit/me/meterbridge/pkg-fun.nix} (100%) rename pkgs/{applications/audio/meters_lv2/default.nix => unit/me/metersLv2/pkg-fun.nix} (100%) rename pkgs/{games/methane/default.nix => unit/me/methane/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/metis-prover/default.nix => unit/me/metis-prover/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/metis/default.nix => unit/me/metis/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfc9140cdncupswrapper/default.nix => unit/mf/mfc9140cdncupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfc9140cdnlpr/default.nix => unit/mf/mfc9140cdnlpr/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcj470dwcupswrapper/default.nix => unit/mf/mfcj470dw-cupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcj6510dwcupswrapper/default.nix => unit/mf/mfcj6510dw-cupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl2700dncupswrapper/default.nix => unit/mf/mfcl2700dncupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl2720dwcupswrapper/default.nix => unit/mf/mfcl2720dwcupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl2720dwlpr/default.nix => unit/mf/mfcl2720dwlpr/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl2740dwcupswrapper/default.nix => unit/mf/mfcl2740dwcupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl2740dwlpr/default.nix => unit/mf/mfcl2740dwlpr/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix => unit/mf/mfcl8690cdwcupswrapper/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/mfcl8690cdwlpr/default.nix => unit/mf/mfcl8690cdwlpr/pkg-fun.nix} (100%) rename pkgs/{tools/security/mfcuk/default.nix => unit/mf/mfcuk/pkg-fun.nix} (100%) rename pkgs/{tools/security/mfoc/default.nix => unit/mf/mfoc/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/mftrace/default.nix => unit/mf/mftrace/pkg-fun.nix} (100%) rename pkgs/{applications/editors/mg/default.nix => unit/mg/mg/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/mgba/default.nix => unit/mg/mgba/pkg-fun.nix} (100%) rename pkgs/{applications/system/mgmt/default.nix => unit/mg/mgmt/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/mh}/mhddfs/fix-format-security-error.patch (100%) rename pkgs/{tools/filesystems/mhddfs/default.nix => unit/mh/mhddfs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mi2ly/default.nix => unit/mi/mi2ly/pkg-fun.nix} (100%) rename pkgs/{servers/http/micro-httpd/default.nix => unit/mi/micro-httpd/pkg-fun.nix} (100%) rename pkgs/{applications/editors/micro/default.nix => unit/mi/micro/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/mi}/micro/test-with-expect.nix (100%) rename pkgs/{servers/microbin/default.nix => unit/mi/microbin/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/microcode/amd.nix => unit/mi/microcodeAmd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/microcode/intel.nix => unit/mi/microcodeIntel/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/microcom/default.nix => unit/mi/microcom/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/microdnf/default.nix => unit/mi/microdnf/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/micromamba/default.nix => unit/mi/micromamba/pkg-fun.nix} (100%) rename pkgs/{development/tools/micronaut/default.nix => unit/mi/micronaut/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/micronucleus/default.nix => unit/mi/micronucleus/pkg-fun.nix} (100%) rename pkgs/{tools/misc/microplane/default.nix => unit/mi/microplane/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/micropython/default.nix => unit/mi/micropython/pkg-fun.nix} (100%) rename pkgs/{development/compilers/microscheme/default.nix => unit/mi/microscheme/pkg-fun.nix} (100%) rename pkgs/{servers/microserver/default.nix => unit/mi/microserver/pkg-fun.nix} (100%) rename pkgs/{development/libraries/microsoft_gsl/default.nix => unit/mi/microsoft_gsl/pkg-fun.nix} (100%) rename pkgs/{tools/audio/mictray/default.nix => unit/mi/mictray/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mid2key/default.nix => unit/mi/mid2key/pkg-fun.nix} (100%) rename pkgs/{applications/audio/midi-trigger/default.nix => unit/mi/midi-trigger/pkg-fun.nix} (100%) rename pkgs/{tools/audio/midicsv/default.nix => unit/mi/midicsv/pkg-fun.nix} (100%) rename pkgs/{tools/audio/midimonster/default.nix => unit/mi/midimonster/pkg-fun.nix} (100%) rename pkgs/{applications/audio/midisheetmusic/default.nix => unit/mi/midisheetmusic/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/midori/default.nix => unit/mi/midori-unwrapped/pkg-fun.nix} (100%) rename pkgs/{data/fonts/migmix/default.nix => unit/mi/migmix/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/migrate/default.nix => unit/mi/migrate/pkg-fun.nix} (100%) rename pkgs/{data/fonts/migu/default.nix => unit/mi/migu/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mikmod/default.nix => unit/mi/mikmod/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/Gemfile (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/Gemfile.lock (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/gemset.nix (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/plugin/gtk/Gemfile (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/plugin/image_file_cache/Gemfile (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/plugin/photo_support/Gemfile (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/deps/plugin/uitranslator/Gemfile (100%) rename pkgs/{applications/networking/instant-messengers/mikutter/default.nix => unit/mi/mikutter/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/test_plugin.rb (100%) rename pkgs/{applications/networking/instant-messengers => unit/mi}/mikutter/update.sh (100%) rename pkgs/{applications/audio/milkytracker/default.nix => unit/mi/milkytracker/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/mill/default.nix => unit/mi/mill/pkg-fun.nix} (100%) rename pkgs/{tools/text/miller/default.nix => unit/mi/miller/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/millet/default.nix => unit/mi/millet/pkg-fun.nix} (100%) rename pkgs/{applications/misc/milu/default.nix => unit/mi/milu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mimalloc/default.nix => unit/mi/mimalloc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mimeo/default.nix => unit/mi/mimeo/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/mi}/mimetic/narrowing.patch (100%) rename pkgs/{development/libraries/mimetic/default.nix => unit/mi/mimetic/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mimic/default.nix => unit/mi/mimic/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/mimir/default.nix => unit/mi/mimir/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/minc-widgets/default.nix => unit/mi/minc_widgets/pkg-fun.nix} (100%) rename pkgs/{applications/misc/minder/default.nix => unit/mi/minder/pkg-fun.nix} (100%) rename pkgs/{tools/games/minecraft/minecraft-server-hibernation/default.nix => unit/mi/minecraft-server-hibernation/pkg-fun.nix} (100%) rename pkgs/{games/minecraft/default.nix => unit/mi/minecraft/pkg-fun.nix} (100%) rename pkgs/{games => unit/mi}/minecraft/update.sh (100%) rename pkgs/{os-specific/linux/mingetty/default.nix => unit/mi/mingetty/pkg-fun.nix} (100%) rename pkgs/{servers/http/mini-httpd/default.nix => unit/mi/miniHttpd/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology => unit/mi}/minia/no-bundle.patch (100%) rename pkgs/{applications/science/biology/minia/default.nix => unit/mi/minia/pkg-fun.nix} (100%) rename pkgs/{development/libraries/miniaudio/default.nix => unit/mi/miniaudio/pkg-fun.nix} (100%) rename pkgs/{development/libraries/miniball/default.nix => unit/mi/miniball/pkg-fun.nix} (100%) rename pkgs/{tools/security/minica/default.nix => unit/mi/minica/pkg-fun.nix} (100%) rename pkgs/{tools/misc/minicom/default.nix => unit/mi/minicom/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/mi}/minicom/xminicom_terminal_paths.patch (100%) rename pkgs/{applications/graphics/minidjvu/default.nix => unit/mi/minidjvu/pkg-fun.nix} (100%) rename pkgs/{tools/networking/minidlna/default.nix => unit/mi/minidlna/pkg-fun.nix} (100%) rename pkgs/{servers/miniflux/default.nix => unit/mi/miniflux/pkg-fun.nix} (100%) rename pkgs/{development/web/minify/default.nix => unit/mi/minify/pkg-fun.nix} (100%) rename pkgs/{applications/misc/minigalaxy/default.nix => unit/mi/minigalaxy/pkg-fun.nix} (100%) rename pkgs/{tools/system/minijail/default.nix => unit/mi/minijail/pkg-fun.nix} (100%) rename pkgs/{development/libraries/minilibx/default.nix => unit/mi/minilibx/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/minimap2/default.nix => unit/mi/minimap2/pkg-fun.nix} (100%) rename pkgs/{applications/radio/minimodem/default.nix => unit/mi/minimodem/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/mininet/default.nix => unit/mi/mininet/pkg-fun.nix} (100%) rename pkgs/{tools/security/minio-certgen/default.nix => unit/mi/minio-certgen/pkg-fun.nix} (100%) rename pkgs/{tools/networking/minio-client/default.nix => unit/mi/minio-client/pkg-fun.nix} (100%) rename pkgs/{servers/minio/default.nix => unit/mi/minio/pkg-fun.nix} (100%) rename pkgs/{servers/minio/legacy_fs.nix => unit/mi/minio_legacy_fs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/miniplayer/default.nix => unit/mi/miniplayer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/minipro/default.nix => unit/mi/minipro/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/minisat/default.nix => unit/mi/minisat/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/miniscript/default.nix => unit/mi/miniscript/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/minishift/default.nix => unit/mi/minishift/pkg-fun.nix} (100%) rename pkgs/{tools/security/minisign/default.nix => unit/mi/minisign/pkg-fun.nix} (100%) rename pkgs/{tools/networking/minissdpd/default.nix => unit/mi/minissdpd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ministat/default.nix => unit/mi/ministat/pkg-fun.nix} (100%) rename pkgs/{tools/networking/miniupnpc/default.nix => unit/mi/miniupnpc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/miniupnpd/default.nix => unit/mi/miniupnpd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/minixml/default.nix => unit/mi/minixml/pkg-fun.nix} (100%) rename pkgs/{development/libraries/miniz/default.nix => unit/mi/miniz/pkg-fun.nix} (100%) rename pkgs/{development/tools/minizinc/default.nix => unit/mi/minizinc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/minizip-ng/default.nix => unit/mi/minizip-ng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/minizip/default.nix => unit/mi/minizip/pkg-fun.nix} (100%) rename pkgs/{servers/mir/default.nix => unit/mi/mir/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/miraclecast/default.nix => unit/mi/miraclecast/pkg-fun.nix} (100%) rename pkgs/{development/compilers/miranda/default.nix => unit/mi/miranda/pkg-fun.nix} (100%) rename pkgs/{tools/networking/miredo/default.nix => unit/mi/miredo/pkg-fun.nix} (100%) rename pkgs/{servers => unit/mi}/mirrorbits/deps.nix (100%) rename pkgs/{servers/mirrorbits/default.nix => unit/mi/mirrorbits/pkg-fun.nix} (100%) rename pkgs/{data/misc/miscfiles/default.nix => unit/mi/miscfiles/pkg-fun.nix} (100%) rename pkgs/{applications/science/robotics/mission-planner/default.nix => unit/mi/mission-planner/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mitama-cpp-result/default.nix => unit/mi/mitama-cpp-result/pkg-fun.nix} (100%) rename pkgs/{tools/security/mitmproxy2swagger/default.nix => unit/mi/mitmproxy2swagger/pkg-fun.nix} (100%) rename pkgs/{development/tools/mix2nix/default.nix => unit/mi/mix2nix/pkg-fun.nix} (100%) rename pkgs/{servers => unit/mj}/mjolnir/node-composition.nix (100%) rename pkgs/{servers => unit/mj}/mjolnir/node-deps.nix (100%) rename pkgs/{servers => unit/mj}/mjolnir/node-env.nix (100%) rename pkgs/{servers/mjolnir/default.nix => unit/mj/mjolnir/pkg-fun.nix} (100%) rename pkgs/{servers => unit/mj}/mjolnir/update.sh (100%) rename pkgs/{tools/video/mjpegtools/default.nix => unit/mj/mjpegtools/pkg-fun.nix} (100%) rename pkgs/{applications/video/mjpg-streamer/default.nix => unit/mj/mjpg-streamer/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet/make-nuget-deps/default.nix => unit/mk/mkNugetDeps/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet/make-nuget-source/default.nix => unit/mk/mkNugetSource/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/config.nix => unit/mk/mkSaneConfig/pkg-fun.nix} (100%) rename pkgs/{build-support/mkshell/default.nix => unit/mk/mkShell/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/mkcert/default.nix => unit/mk/mkcert/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mkcl/default.nix => unit/mk/mkcl/pkg-fun.nix} (100%) rename pkgs/{applications/video/mkclean/default.nix => unit/mk/mkclean/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mkinitcpio-nfs-utils/default.nix => unit/mk/mkinitcpio-nfs-utils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/mkl/default.nix => unit/mk/mkl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/mk}/mkl/test/default.nix (100%) rename pkgs/{development/libraries/science/math => unit/mk}/mkl/test/test.c (100%) rename pkgs/{tools/security/mkp224o/default.nix => unit/mk/mkp224o/pkg-fun.nix} (100%) rename pkgs/{tools/security/mkrand/default.nix => unit/mk/mkrand/pkg-fun.nix} (100%) rename pkgs/{shells/mksh/default.nix => unit/mk/mksh/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/mkspiffs/default.nix => unit/mk/mkspiffs/pkg-fun.nix} (100%) rename pkgs/{tools/security/mktemp/default.nix => unit/mk/mktemp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mktorrent/default.nix => unit/mk/mktorrent/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/mlarchive2maildir/default.nix => unit/ml/mlarchive2maildir/pkg-fun.nix} (100%) rename pkgs/{tools/system/mlc/default.nix => unit/ml/mlc/pkg-fun.nix} (100%) rename pkgs/{applications/editors/mle/default.nix => unit/ml/mle/pkg-fun.nix} (100%) rename pkgs/{servers/mlflow-server/default.nix => unit/ml/mlflow-server/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mlib/default.nix => unit/ml/mlib/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mlkit/default.nix => unit/ml/mlkit/pkg-fun.nix} (100%) rename pkgs/{servers/mail/mlmmj/default.nix => unit/ml/mlmmj/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mloader/default.nix => unit/ml/mloader/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mlocate/default.nix => unit/ml/mlocate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mlt/default.nix => unit/ml/mlt/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/mlvwm/default.nix => unit/ml/mlvwm/pkg-fun.nix} (100%) rename pkgs/{applications/audio/MMA/default.nix => unit/mm/MMA/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mm-common/default.nix => unit/mm/mm-common/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/mm/default.nix => unit/mm/mm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mmake/default.nix => unit/mm/mmake/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/mmark/default.nix => unit/mm/mmark/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mmc-utils/default.nix => unit/mm/mmc-utils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mmctl/default.nix => unit/mm/mmctl/pkg-fun.nix} (100%) rename pkgs/{tools/text/mmdoc/default.nix => unit/mm/mmdoc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/mmh/default.nix => unit/mm/mmh/pkg-fun.nix} (100%) rename pkgs/{development/tools/mmixware/default.nix => unit/mm/mmixware/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mmsd-tng/default.nix => unit/mm/mmsd-tng/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mmsd/default.nix => unit/mm/mmsd/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mmtc/default.nix => unit/mm/mmtc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/chemistry/mmtf-cpp/default.nix => unit/mm/mmtf-cpp/pkg-fun.nix} (100%) rename pkgs/{tools/X11/mmutils/default.nix => unit/mm/mmutils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mmv-go/default.nix => unit/mm/mmv-go/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mmv/default.nix => unit/mm/mmv/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mnamer/default.nix => unit/mn/mnamer/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/mn}/mnamer/remove_requirements.patch (100%) rename pkgs/{applications/misc => unit/mn}/mnamer/update_hack.patch (100%) rename pkgs/{tools/misc/mnc/default.nix => unit/mn/mnc/pkg-fun.nix} (100%) rename pkgs/{misc/mnemonicode/default.nix => unit/mn/mnemonicode/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/mni_autoreg/default.nix => unit/mn/mni_autoreg/pkg-fun.nix} (100%) rename pkgs/{data/machine-learning/mnist/default.nix => unit/mn/mnist/pkg-fun.nix} (100%) rename pkgs/{data/fonts/mno16/default.nix => unit/mn/mno16/pkg-fun.nix} (100%) rename pkgs/{tools/misc/moar/default.nix => unit/mo/moar/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mob/default.nix => unit/mo/mob/pkg-fun.nix} (100%) rename pkgs/{data/misc/mobile-broadband-provider-info/default.nix => unit/mo/mobile-broadband-provider-info/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mobilecoin-wallet/default.nix => unit/mo/mobilecoin-wallet/pkg-fun.nix} (100%) rename pkgs/{development/tools/mockgen/default.nix => unit/mo/mockgen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/mockobjects/default.nix => unit/mo/mockobjects/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mod-arpeggiator-lv2/default.nix => unit/mo/mod-arpeggiator-lv2/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mod-distortion/default.nix => unit/mo/mod-distortion/pkg-fun.nix} (100%) rename pkgs/{development/tools/mod/default.nix => unit/mo/mod/pkg-fun.nix} (100%) rename pkgs/{development/tools/modd/default.nix => unit/mo/modd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/modem-manager-gui/default.nix => unit/mo/modem-manager-gui/pkg-fun.nix} (100%) rename pkgs/{tools/networking/modemmanager/default.nix => unit/mo/modemmanager/pkg-fun.nix} (100%) rename pkgs/{tools/security/modsecurity-crs/default.nix => unit/mo/modsecurity-crs/pkg-fun.nix} (100%) rename pkgs/{tools/security/modsecurity => unit/mo/modsecurity_standalone}/Makefile.am.patch (100%) rename pkgs/{tools/security/modsecurity/default.nix => unit/mo/modsecurity_standalone/pkg-fun.nix} (100%) rename pkgs/{applications/editors/moe/default.nix => unit/mo/moe/pkg-fun.nix} (100%) rename pkgs/{data/icons/moka-icon-theme/default.nix => unit/mo/moka-icon-theme/pkg-fun.nix} (100%) rename pkgs/{tools/security/mokutil/default.nix => unit/mo/mokutil/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry => unit/mo}/molden/dont_register_file_types.patch (100%) rename pkgs/{applications/science/chemistry/molden/default.nix => unit/mo/molden/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mole/default.nix => unit/mo/mole/pkg-fun.nix} (100%) rename pkgs/{servers/gemini => unit/mo}/molly-brown/deps.nix (100%) rename pkgs/{servers/gemini/molly-brown/default.nix => unit/mo/molly-brown/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/molly-guard/default.nix => unit/mo/molly-guard/pkg-fun.nix} (100%) rename pkgs/{applications/audio/molot-lite/default.nix => unit/mo/molot-lite/pkg-fun.nix} (100%) rename pkgs/{applications/video/molotov/default.nix => unit/mo/molotov/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/moltengamepad/default.nix => unit/mo/moltengamepad/pkg-fun.nix} (100%) rename pkgs/{data/fonts/mona-sans/default.nix => unit/mo/mona-sans/pkg-fun.nix} (100%) rename pkgs/{servers/sql/monetdb/default.nix => unit/mo/monetdb/pkg-fun.nix} (100%) rename pkgs/{applications/office/moneyplex/default.nix => unit/mo/moneyplex/pkg-fun.nix} (100%) rename pkgs/{tools/security/mongoaudit/default.nix => unit/mo/mongoaudit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mongoc/default.nix => unit/mo/mongoc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mongodb-compass/default.nix => unit/mo/mongodb-compass/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mongodb-tools/default.nix => unit/mo/mongodb-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/mongoose/default.nix => unit/mo/mongoose/pkg-fun.nix} (100%) rename pkgs/{tools/system/monit/default.nix => unit/mo/monit/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/default.nix => unit/mo/monitoring-plugins/pkg-fun.nix} (100%) rename pkgs/{applications/audio/monkeys-audio => unit/mo/monkeysAudio}/buildfix.diff (100%) rename pkgs/{applications/audio/monkeys-audio/default.nix => unit/mo/monkeysAudio/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/mo}/monkeysphere/monkeysphere.patch (100%) rename pkgs/{tools/security => unit/mo}/monkeysphere/openssh-nixos-sandbox.patch (100%) rename pkgs/{tools/security/monkeysphere/default.nix => unit/mo/monkeysphere/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mono-addins/default.nix => unit/mo/mono-addins/pkg-fun.nix} (100%) rename pkgs/{build-support/mono-dll-fixer => unit/mo/monoDLLFixer}/dll-fixer.pl (100%) rename pkgs/{build-support/mono-dll-fixer/default.nix => unit/mo/monoDLLFixer/pkg-fun.nix} (100%) rename pkgs/{data/fonts/monocraft/default.nix => unit/mo/monocraft/pkg-fun.nix} (100%) rename pkgs/{development/libraries/monocypher/default.nix => unit/mo/monocypher/pkg-fun.nix} (100%) rename pkgs/{data/fonts/monoid/default.nix => unit/mo/monoid/pkg-fun.nix} (100%) rename pkgs/{data/fonts/mononoki/default.nix => unit/mo/mononoki/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/monosat/default.nix => unit/mo/monosat/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mons/default.nix => unit/mo/mons/pkg-fun.nix} (100%) rename pkgs/{tools/security/monsoon/default.nix => unit/mo/monsoon/pkg-fun.nix} (100%) rename pkgs/{data/fonts/montserrat/default.nix => unit/mo/montserrat/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mooSpace/default.nix => unit/mo/mooSpace/pkg-fun.nix} (100%) rename pkgs/{tools/networking/moodle-dl/default.nix => unit/mo/moodle-dl/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/moodle/moodle-utils.nix => unit/mo/moodle-utils/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/moodle/default.nix => unit/mo/moodle/pkg-fun.nix} (100%) rename pkgs/{games/moon-buggy/default.nix => unit/mo/moon-buggy/pkg-fun.nix} (100%) rename pkgs/{applications/misc/moonlight-embedded/default.nix => unit/mo/moonlight-embedded/pkg-fun.nix} (100%) rename pkgs/{servers/moonraker/default.nix => unit/mo/moonraker/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/moosefs/default.nix => unit/mo/moosefs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mop/default.nix => unit/mo/mop/pkg-fun.nix} (100%) rename pkgs/{development/tools/moq/default.nix => unit/mo/moq/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/morph/default.nix => unit/mo/morph/pkg-fun.nix} (100%) rename pkgs/{tools/text/morsel/default.nix => unit/mo/morsel/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/morty/default.nix => unit/mo/morty/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/mosdepth/default.nix => unit/mo/mosdepth/pkg-fun.nix} (100%) rename pkgs/{tools/misc/moserial/default.nix => unit/mo/moserial/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/mo}/mosh/bash_completion_datadir.patch (100%) rename pkgs/{tools/networking => unit/mo}/mosh/mosh-client_path.patch (100%) rename pkgs/{tools/networking/mosh/default.nix => unit/mo/mosh/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/mo}/mosh/ssh_path.patch (100%) rename pkgs/{development/compilers/mosml/default.nix => unit/mo/mosml/pkg-fun.nix} (100%) rename pkgs/{servers/mqtt/mosquitto/default.nix => unit/mo/mosquitto/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/mo}/most/parallel-make.patch (100%) rename pkgs/{tools/misc/most/default.nix => unit/mo/most/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/mo}/motif/Add-X.Org-to-bindings-file.patch (100%) rename pkgs/{development/libraries => unit/mo}/motif/Remove-unsupported-weak-refs-on-darwin.patch (100%) rename pkgs/{development/libraries/motif/default.nix => unit/mo/motif/pkg-fun.nix} (100%) rename pkgs/{applications/video/motion/default.nix => unit/mo/motion/pkg-fun.nix} (100%) rename pkgs/{tools/networking/motrix/default.nix => unit/mo/motrix/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/mo}/mousai/paths.patch (100%) rename pkgs/{applications/audio/mousai/default.nix => unit/mo/mousai/pkg-fun.nix} (100%) rename pkgs/{applications/accessibility/mousetweaks/default.nix => unit/mo/mousetweaks/pkg-fun.nix} (100%) rename pkgs/{applications/video/mov-cli/default.nix => unit/mo/mov-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/movit/default.nix => unit/mo/movit/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mozart/binary.nix => unit/mo/mozart2-binary/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/mozjpeg/default.nix => unit/mo/mozjpeg/pkg-fun.nix} (100%) rename pkgs/{tools/compression/mozlz4a/default.nix => unit/mo/mozlz4a/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mozphab/default.nix => unit/mo/mozphab/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mp3blaster/default.nix => unit/mp/mp3blaster/pkg-fun.nix} (100%) rename pkgs/{tools/audio/mp3cat/default.nix => unit/mp/mp3cat/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/mp3fs/default.nix => unit/mp/mp3fs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mp3gain/default.nix => unit/mp/mp3gain/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mp3info/default.nix => unit/mp/mp3info/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mp3splt/default.nix => unit/mp/mp3splt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mp3val/default.nix => unit/mp/mp3val/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/mp}/mp4v2/fix-build-clang.patch (100%) rename pkgs/{development/libraries/mp4v2/default.nix => unit/mp/mp4v2/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/mp}/mpack/build-fix.patch (100%) rename pkgs/{tools/networking/mpack/default.nix => unit/mp/mpack/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/mp}/mpack/sendmail-via-execvp.diff (100%) rename pkgs/{tools/text/mpage/default.nix => unit/mp/mpage/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mpc123/default.nix => unit/mp/mpc123/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/mp}/mpc123/use-gcc.patch (100%) rename pkgs/{tools/audio/mpd-mpris/default.nix => unit/mp/mpd-mpris/pkg-fun.nix} (100%) rename pkgs/{tools/audio/mpdas/default.nix => unit/mp/mpdas/pkg-fun.nix} (100%) rename pkgs/{tools/audio => unit/mp}/mpdcron/Gemfile (100%) rename pkgs/{tools/audio => unit/mp}/mpdcron/Gemfile.lock (100%) rename pkgs/{tools/audio => unit/mp}/mpdcron/gemset.nix (100%) rename pkgs/{tools/audio/mpdcron/default.nix => unit/mp/mpdcron/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mpdecimal/default.nix => unit/mp/mpdecimal/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mpdevil/default.nix => unit/mp/mpdevil/pkg-fun.nix} (100%) rename pkgs/{tools/audio/mpdris2/default.nix => unit/mp/mpdris2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mpdscribble/default.nix => unit/mp/mpdscribble/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mpfi/default.nix => unit/mp/mpfi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mpfr/default.nix => unit/mp/mpfr/pkg-fun.nix} (100%) rename pkgs/{development/tools/mpfshell/default.nix => unit/mp/mpfshell/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mpg321/default.nix => unit/mp/mpg321/pkg-fun.nix} (100%) rename pkgs/{data/fonts/mph-2b-damase/default.nix => unit/mp/mph_2b_damase/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mpir/default.nix => unit/mp/mpir/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mprime/default.nix => unit/mp/mprime/pkg-fun.nix} (100%) rename pkgs/{tools/audio/mpris-scrobbler/default.nix => unit/mp/mpris-scrobbler/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mprocs/default.nix => unit/mp/mprocs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mps-youtube/default.nix => unit/mp/mps-youtube/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mpvc/default.nix => unit/mp/mpvc/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/mpvpaper/default.nix => unit/mp/mpvpaper/pkg-fun.nix} (100%) rename pkgs/{tools/security/mpw/default.nix => unit/mp/mpw/pkg-fun.nix} (100%) rename pkgs/{tools/system/mq-cli/default.nix => unit/mq/mq-cli/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/mr/default.nix => unit/mr/mr/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/mrbayes/default.nix => unit/mr/mrbayes/pkg-fun.nix} (100%) rename pkgs/{data/fonts/mro-unicode/default.nix => unit/mr/mro-unicode/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pd-plugins/mrpeach/default.nix => unit/mr/mrpeach/pkg-fun.nix} (100%) rename pkgs/{games/mrrescue/default.nix => unit/mr/mrrescue/pkg-fun.nix} (100%) rename pkgs/{shells/mrsh/default.nix => unit/mr/mrsh/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mrtg/default.nix => unit/mr/mrtg/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mruby/default.nix => unit/mr/mruby/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mrustc/minicargo.nix => unit/mr/mrustc-minicargo/pkg-fun.nix} (100%) rename pkgs/{development/compilers/mrustc/default.nix => unit/mr/mrustc/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/mrxvt/default.nix => unit/mr/mrxvt/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ms}/ms-sys/manpages-without-build-timestamps.patch (100%) rename pkgs/{tools/misc/ms-sys/default.nix => unit/ms/ms-sys/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/ms}/msbuild/create-deps.sh (100%) rename pkgs/{development/tools/build-managers => unit/ms}/msbuild/deps.nix (100%) rename pkgs/{development/tools/build-managers/msbuild/default.nix => unit/ms/msbuild/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/mscgen/default.nix => unit/ms/mscgen/pkg-fun.nix} (100%) rename pkgs/{tools/security/msfpc/default.nix => unit/ms/msfpc/pkg-fun.nix} (100%) rename pkgs/{development/tools/msgpack-tools/default.nix => unit/ms/msgpack-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ms}/msgpack/generic.nix (100%) rename pkgs/{development/libraries/msgpack/default.nix => unit/ms/msgpack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/msgpuck/default.nix => unit/ms/msgpuck/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/msgviewer/default.nix => unit/ms/msgviewer/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/msieve/default.nix => unit/ms/msieve/pkg-fun.nix} (100%) rename pkgs/{development/libraries/msilbc/default.nix => unit/ms/msilbc/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/msitools/default.nix => unit/ms/msitools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mslink/default.nix => unit/ms/mslink/pkg-fun.nix} (100%) rename pkgs/{development/misc/msp430/gcc-support.nix => unit/ms/msp430GccSupport/pkg-fun.nix} (100%) rename pkgs/{development/misc/msp430/mspdebug.nix => unit/ms/mspdebug/pkg-fun.nix} (100%) rename pkgs/{development/misc/msp430/mspds/binary.nix => unit/ms/mspds-bin/pkg-fun.nix} (100%) rename pkgs/{development/misc/msp430 => unit/ms}/mspds/bsl430.patch (100%) rename pkgs/{development/misc/msp430/mspds/default.nix => unit/ms/mspds/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/msr-tools/default.nix => unit/ms/msr-tools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ms}/msr/000-include-sysmacros.patch (100%) rename pkgs/{os-specific/linux/msr/default.nix => unit/ms/msr/pkg-fun.nix} (100%) rename pkgs/{servers/sql/mssql/jdbc/default.nix => unit/ms/mssql_jdbc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mstflint/default.nix => unit/ms/mstflint/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/mstpd/default.nix => unit/ms/mstpd/pkg-fun.nix} (100%) rename pkgs/{tools/backup/mt-st/default.nix => unit/mt/mt-st/pkg-fun.nix} (100%) rename pkgs/{applications/audio/munt/mt32emu-smf2wav.nix => unit/mt/mt32emu-smf2wav/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/mtail/default.nix => unit/mt/mtail/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mtdev/default.nix => unit/mt/mtdev/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/mtdutils/default.nix => unit/mt/mtdutils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mtm/default.nix => unit/mt/mtm/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/mt}/mtools/UNUSED-darwin.patch (100%) rename pkgs/{tools/filesystems/mtools/default.nix => unit/mt/mtools/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/mtpaint/default.nix => unit/mt/mtpaint/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/mtpfs/default.nix => unit/mt/mtpfs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mtr-exporter/default.nix => unit/mt/mtr-exporter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/glibc/mtrace.nix => unit/mt/mtrace/pkg-fun.nix} (100%) rename pkgs/{tools/backup/mtx/default.nix => unit/mt/mtx/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mubeng/default.nix => unit/mu/mubeng/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/notmuch/muchsync.nix => unit/mu/muchsync/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/mucommander/default.nix => unit/mu/mucommander/pkg-fun.nix} (100%) rename pkgs/{development/tools/haskell/mueval/default.nix => unit/mu/mueval/pkg-fun.nix} (100%) rename pkgs/{applications/science/robotics => unit/mu}/mujoco/dependencies.patch (100%) rename pkgs/{applications/science/robotics/mujoco/default.nix => unit/mu/mujoco/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/mujs/default.nix => unit/mu/mujs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mullvad-vpn/default.nix => unit/mu/mullvad-vpn/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/multilockscreen/default.nix => unit/mu/multilockscreen/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/multimarkdown/default.nix => unit/mu/multimarkdown/pkg-fun.nix} (100%) rename pkgs/{applications/radio/multimon-ng/default.nix => unit/mu/multimon-ng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/multipart-parser-c/default.nix => unit/mu/multipart-parser-c/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/multipath-tools/default.nix => unit/mu/multipath-tools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/multitail/default.nix => unit/mu/multitail/pkg-fun.nix} (100%) rename pkgs/{tools/misc/multitime/default.nix => unit/mu/multitime/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/multus-cni/default.nix => unit/mu/multus-cni/pkg-fun.nix} (100%) rename pkgs/{tools/security/munge/default.nix => unit/mu/munge/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/mu}/munin/adding_sconfdir_munin-node.patch (100%) rename pkgs/{servers/monitoring => unit/mu}/munin/adding_servicedir_munin-node.patch (100%) rename pkgs/{servers/monitoring => unit/mu}/munin/dont_preserve_source_dir_permissions.patch (100%) rename pkgs/{servers/monitoring/munin/default.nix => unit/mu/munin/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/mu}/munin/preserve_environment.patch (100%) rename pkgs/{development/tools/build-managers/muon/default.nix => unit/mu/muon/pkg-fun.nix} (100%) rename pkgs/{development/compilers/muonlang/default.nix => unit/mu/muonlang/pkg-fun.nix} (100%) rename pkgs/{development/libraries/muparserx/default.nix => unit/mu/muparserx/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/mu}/mupdf/0001-Use-command-v-in-favor-of-which.patch (100%) rename pkgs/{applications/misc => unit/mu}/mupdf/0002-Add-Darwin-deps.patch (100%) rename pkgs/{applications/misc/mupdf/default.nix => unit/mu/mupdf/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mupdf => unit/mu/mupdf_1_17}/darwin.patch (100%) rename pkgs/{applications/misc/mupdf => unit/mu/mupdf_1_17}/mupdf-1.14-shared_libs.patch (100%) rename pkgs/{applications/misc/mupdf/1.17.nix => unit/mu/mupdf_1_17/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/mupen64plus/default.nix => unit/mu/mupen64plus/pkg-fun.nix} (100%) rename pkgs/{shells/murex/default.nix => unit/mu/murex/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/muscle/default.nix => unit/mu/muscle/pkg-fun.nix} (100%) rename pkgs/{applications/audio/museeks/default.nix => unit/mu/museeks/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/musl-fts/default.nix => unit/mu/musl-fts/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/musl-obstack/default.nix => unit/mu/musl-obstack/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/musl/default.nix => unit/mu/musl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/musly/default.nix => unit/mu/musly/pkg-fun.nix} (100%) rename pkgs/{development/tools/mustache-go/default.nix => unit/mu/mustache-go/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mustache-hpp/default.nix => unit/mu/mustache-hpp/pkg-fun.nix} (100%) rename pkgs/{data/documentation/mustache-spec/default.nix => unit/mu/mustache-spec/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mutagen-compose/default.nix => unit/mu/mutagen-compose/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mutagen/default.nix => unit/mu/mutagen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mutest/default.nix => unit/mu/mutest/pkg-fun.nix} (100%) rename pkgs/{development/tools/mutmut/default.nix => unit/mu/mutmut/pkg-fun.nix} (100%) rename pkgs/{tools/networking/mutt-ics/default.nix => unit/mu/mutt-ics/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mutt-wizard/default.nix => unit/mu/mutt-wizard/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/mutt/default.nix => unit/mu/mutt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mvapich/default.nix => unit/mv/mvapich/pkg-fun.nix} (100%) rename pkgs/{misc/mxt-app/default.nix => unit/mx/mxt-app/pkg-fun.nix} (100%) rename pkgs/{tools/admin/mycli/default.nix => unit/my/mycli/pkg-fun.nix} (100%) rename pkgs/{servers/mycorrhiza/default.nix => unit/my/mycorrhiza/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/mycrypto/default.nix => unit/my/mycrypto/pkg-fun.nix} (100%) rename pkgs/{tools/backup/mydumper/default.nix => unit/my/mydumper/pkg-fun.nix} (100%) rename pkgs/{tools/backup/mylvmbackup/default.nix => unit/my/mylvmbackup/pkg-fun.nix} (100%) rename pkgs/{applications/audio/mympd/default.nix => unit/my/mympd/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/mynewt-newt/default.nix => unit/my/mynewt-newt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mynewt-newtmgr/default.nix => unit/my/mynewt-newtmgr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mypaint-brushes/default.nix => unit/my/mypaint-brushes/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mypaint-brushes/1.0.nix => unit/my/mypaint-brushes1/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/mypaint/default.nix => unit/my/mypaint/pkg-fun.nix} (100%) rename pkgs/{development/compilers/myrddin/default.nix => unit/my/myrddin/pkg-fun.nix} (100%) rename pkgs/{data/fonts/myrica/default.nix => unit/my/myrica/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/mysides/default.nix => unit/my/mysides/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/my}/mysocketw/gcc.patch (100%) rename pkgs/{development/libraries/mysocketw/default.nix => unit/my/mysocketw/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mysql2pgsql/default.nix => unit/my/mysql2pgsql/pkg-fun.nix} (100%) rename pkgs/{servers/sql/mysql/jdbc/default.nix => unit/my/mysql_jdbc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/mysqltuner/default.nix => unit/my/mysqltuner/pkg-fun.nix} (100%) rename pkgs/{applications/misc/mystem/default.nix => unit/my/mystem/pkg-fun.nix} (100%) rename pkgs/{development/libraries/mythes/default.nix => unit/my/mythes/pkg-fun.nix} (100%) rename pkgs/{games/n2048/default.nix => unit/n2/n2048/pkg-fun.nix} (100%) rename pkgs/{tools/networking/n2n/default.nix => unit/n2/n2n/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/N3/default.nix => unit/n3/n3/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/n8}/n8n/fix-permissions.diff (100%) rename pkgs/{applications/networking => unit/n8}/n8n/generate-dependencies.sh (100%) rename pkgs/{applications/networking => unit/n8}/n8n/node-composition.nix (100%) rename pkgs/{servers/haste-server => unit/n8/n8n}/node-env.nix (100%) rename pkgs/{applications/networking => unit/n8}/n8n/node-packages.nix (100%) rename pkgs/{applications/networking/n8n/default.nix => unit/n8/n8n/pkg-fun.nix} (100%) rename pkgs/{tools/security/naabu/default.nix => unit/na/naabu/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/nabi/default.nix => unit/na/nabi/pkg-fun.nix} (100%) rename pkgs/{games/naev/default.nix => unit/na/naev/pkg-fun.nix} (100%) rename pkgs/{data/fonts/nafees/default.nix => unit/na/nafees/pkg-fun.nix} (100%) rename pkgs/{development/tools/nagelfar/default.nix => unit/na/nagelfar/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/na}/nagios/nagios.patch (100%) rename pkgs/{servers/monitoring/nagios/default.nix => unit/na/nagios/pkg-fun.nix} (100%) rename pkgs/{data/fonts/nahid-fonts/default.nix => unit/na/nahid-fonts/pkg-fun.nix} (100%) rename pkgs/{development/tools/nailgun/default.nix => unit/na/nailgun/pkg-fun.nix} (100%) rename pkgs/{applications/networking/nali/default.nix => unit/na/nali/pkg-fun.nix} (100%) rename pkgs/{tools/text/namazu/default.nix => unit/na/namazu/pkg-fun.nix} (100%) rename pkgs/{applications/editors/nano/default.nix => unit/na/nano/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/na}/nano/test-with-expect.nix (100%) rename pkgs/{applications/misc/nanoblogger/default.nix => unit/na/nanoblogger/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nanodbc/default.nix => unit/na/nanodbc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nanoflann/default.nix => unit/na/nanoflann/pkg-fun.nix} (100%) rename pkgs/{servers/mqtt/nanomq/default.nix => unit/na/nanomq/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nanomsg/default.nix => unit/na/nanomsg/pkg-fun.nix} (100%) rename pkgs/{applications/editors/nano/nanorc/default.nix => unit/na/nanorc/pkg-fun.nix} (100%) rename pkgs/{games/nanosaur/default.nix => unit/na/nanosaur/pkg-fun.nix} (100%) rename pkgs/{games/nanosaur2/default.nix => unit/na/nanosaur2/pkg-fun.nix} (100%) rename pkgs/{tools/audio/nanotts/default.nix => unit/na/nanotts/pkg-fun.nix} (100%) rename pkgs/{data/fonts/nanum-gothic-coding/default.nix => unit/na/nanum-gothic-coding/pkg-fun.nix} (100%) rename pkgs/{data/fonts/nanum/default.nix => unit/na/nanum/pkg-fun.nix} (100%) rename pkgs/{development/tools/nap/default.nix => unit/na/nap/pkg-fun.nix} (100%) rename pkgs/{development/tools/napi-rs-cli/default.nix => unit/na/napi-rs-cli/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/naproche/default.nix => unit/na/naproche/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nar-serve/default.nix => unit/na/nar-serve/pkg-fun.nix} (100%) rename pkgs/{servers/nas/default.nix => unit/na/nas/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/nasc/default.nix => unit/na/nasc/pkg-fun.nix} (100%) rename pkgs/{development/compilers/nasm/default.nix => unit/na/nasm/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/na}/nasmfmt/go.mod (100%) rename pkgs/{development/tools/nasmfmt/default.nix => unit/na/nasmfmt/pkg-fun.nix} (100%) rename pkgs/{tools/security/nasty/default.nix => unit/na/nasty/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nat-traverse/default.nix => unit/na/nat-traverse/pkg-fun.nix} (100%) rename pkgs/{data/fonts/national-park/default.nix => unit/na/national-park-typeface/pkg-fun.nix} (100%) rename pkgs/{tools/misc/natls/default.nix => unit/na/natls/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/na}/natron/config.pri (100%) rename pkgs/{applications/video/natron/default.nix => unit/na/natron/pkg-fun.nix} (100%) rename pkgs/{servers/nats-server/default.nix => unit/na/nats-server/pkg-fun.nix} (100%) rename pkgs/{servers/nats-streaming-server/default.nix => unit/na/nats-streaming-server/pkg-fun.nix} (100%) rename pkgs/{tools/system/nats-top/default.nix => unit/na/nats-top/pkg-fun.nix} (100%) rename pkgs/{tools/system/natscli/default.nix => unit/na/natscli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/natural-docs/default.nix => unit/na/natural-docs/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/na}/nautilus-open-any-terminal/hardcode-gsettings.patch (100%) rename pkgs/{tools/misc/nautilus-open-any-terminal/default.nix => unit/na/nautilus-open-any-terminal/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/nauty/default.nix => unit/na/nauty/pkg-fun.nix} (100%) rename pkgs/{applications/misc/navi/default.nix => unit/na/navi/pkg-fun.nix} (100%) rename pkgs/{servers/misc/navidrome/default.nix => unit/na/navidrome/pkg-fun.nix} (100%) rename pkgs/{servers/misc => unit/na}/navidrome/ui/default.nix (100%) rename pkgs/{development/web/newman => unit/na/navidrome/ui}/node-composition.nix (100%) rename pkgs/{servers/misc => unit/na}/navidrome/ui/node-env.nix (100%) rename pkgs/{servers/misc => unit/na}/navidrome/ui/node-packages.nix (100%) rename pkgs/{servers/misc => unit/na}/navidrome/update.nix (100%) rename pkgs/{applications/misc/navipowm/default.nix => unit/na/navipowm/pkg-fun.nix} (100%) rename pkgs/{tools/text/nawk/default.nix => unit/na/nawk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nb/default.nix => unit/nb/nb/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nbd/default.nix => unit/nb/nbd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nbench/default.nix => unit/nb/nbench/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/nbstripout/default.nix => unit/nb/nbstripout/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/nb}/nbxplorer/deps.nix (100%) rename pkgs/{applications/blockchains/nbxplorer/default.nix => unit/nb/nbxplorer/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/nb}/nbxplorer/update.sh (100%) rename pkgs/{applications/blockchains => unit/nb}/nbxplorer/util/update-common.sh (100%) rename pkgs/{development/tools/nc4nix/default.nix => unit/nc/nc4nix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/ncdc/default.nix => unit/nc/ncdc/pkg-fun.nix} (100%) rename pkgs/{servers/dns => unit/nc}/ncdns/fix-tpl-path.patch (100%) rename pkgs/{servers/dns/ncdns/default.nix => unit/nc/ncdns/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ncdu/default.nix => unit/nc/ncdu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ncdu/1.nix => unit/nc/ncdu_1/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ncftp/default.nix => unit/nc/ncftp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ncgopher/default.nix => unit/nc/ncgopher/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ncmpc/default.nix => unit/nc/ncmpc/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ncmpcpp/default.nix => unit/nc/ncmpcpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/nc}/ncnn/cmakelists.patch (100%) rename pkgs/{development/libraries/ncnn/default.nix => unit/nc/ncnn/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nco/default.nix => unit/nc/nco/pkg-fun.nix} (100%) rename pkgs/{tools/compression/ncompress/default.nix => unit/nc/ncompress/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ncpamixer/default.nix => unit/nc/ncpamixer/pkg-fun.nix} (100%) rename pkgs/{tools/security/ncrack/default.nix => unit/nc/ncrack/pkg-fun.nix} (100%) rename pkgs/{tools/X11/ncview/default.nix => unit/nc/ncview/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ndi/default.nix => unit/nd/ndi/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/nd}/ndi/update.py (100%) rename pkgs/{development/libraries => unit/nd}/ndi/version.json (100%) rename pkgs/{tools/networking/ndisc6/default.nix => unit/nd/ndisc6/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ndjbdns/default.nix => unit/nd/ndjbdns/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ndpi/default.nix => unit/nd/ndpi/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ndppd/default.nix => unit/nd/ndppd/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/ndstool/default.nix => unit/nd/ndstool/pkg-fun.nix} (100%) rename pkgs/{applications/editors/ne/default.nix => unit/ne/ne/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/ne}/nearcore/0001-make-near-test-contracts-optional.patch (100%) rename pkgs/{applications/blockchains/nearcore/default.nix => unit/ne/nearcore/pkg-fun.nix} (100%) rename pkgs/{servers/neard/default.nix => unit/ne/neard/pkg-fun.nix} (100%) rename pkgs/{development/libraries/neardal/default.nix => unit/ne/neardal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/neatvnc/default.nix => unit/ne/neatvnc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nebula/default.nix => unit/ne/nebula/pkg-fun.nix} (100%) rename pkgs/{applications/editors/nedit/default.nix => unit/ne/nedit/pkg-fun.nix} (100%) rename pkgs/{development/tools/neil/default.nix => unit/ne/neil/pkg-fun.nix} (100%) rename pkgs/{development/compilers/neko/default.nix => unit/ne/neko/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/nelua/default.nix => unit/ne/nelua/pkg-fun.nix} (100%) rename pkgs/{development/tools/nemiver/default.nix => unit/ne/nemiver/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning/nengo-gui/default.nix => unit/ne/nengo-gui/pkg-fun.nix} (100%) rename pkgs/{tools/misc/neo-cowsay/default.nix => unit/ne/neo-cowsay/pkg-fun.nix} (100%) rename pkgs/{applications/misc/neo/default.nix => unit/ne/neo/pkg-fun.nix} (100%) rename pkgs/{applications/misc/neo4j-desktop/default.nix => unit/ne/neo4j-desktop/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/neo4j/default.nix => unit/ne/neo4j/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/neocomp/default.nix => unit/ne/neocomp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/neofetch/default.nix => unit/ne/neofetch/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/neomutt/default.nix => unit/ne/neomutt/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ne}/neon/darwin-fix-configure.patch (100%) rename pkgs/{development/libraries/neon/default.nix => unit/ne/neon/pkg-fun.nix} (100%) rename pkgs/{applications/editors/neovim/neovide/default.nix => unit/ne/neovide/pkg-fun.nix} (100%) rename pkgs/{applications/editors/neovim => unit/ne}/neovide/skia-externals.json (100%) rename pkgs/{applications/editors/neovim/neovim-remote.nix => unit/ne/neovim-remote/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nerd-font-patcher/default.nix => unit/ne/nerd-font-patcher/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/nerdctl/default.nix => unit/ne/nerdctl/pkg-fun.nix} (100%) rename pkgs/{data/fonts/nerdfonts/default.nix => unit/ne/nerdfonts/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/ne}/nerdfonts/shas.nix (100%) rename pkgs/{data/fonts => unit/ne}/nerdfonts/update.sh (100%) rename pkgs/{data/fonts => unit/ne}/nerdfonts/version.nix (100%) rename pkgs/{applications/emulators => unit/ne}/nestopia/build-fix.patch (100%) rename pkgs/{applications/emulators => unit/ne}/nestopia/gcc6.patch (100%) rename pkgs/{applications/emulators/nestopia/default.nix => unit/ne/nestopia/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/net-snmp/default.nix => unit/ne/net-snmp/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/ne}/netatalk/000-no-suid.patch (100%) rename pkgs/{tools/filesystems => unit/ne}/netatalk/001-omit-localstatedir-creation.patch (100%) rename pkgs/{tools/filesystems/netatalk/default.nix => unit/ne/netatalk/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netavark/default.nix => unit/ne/netavark/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netboot/default.nix => unit/ne/netboot/pkg-fun.nix} (100%) rename pkgs/{tools/misc/netbootxyz-efi/default.nix => unit/ne/netbootxyz-efi/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/ne}/netbox/config.patch (100%) rename pkgs/{servers/web-apps => unit/ne}/netbox/graphql-3_2_0.patch (100%) rename pkgs/{servers/web-apps/netbox/default.nix => unit/ne/netbox/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netcat/default.nix => unit/ne/netcat-gnu/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netcat-openbsd/default.nix => unit/ne/netcat-openbsd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/netcdf-cxx4/default.nix => unit/ne/netcdfcxx4/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/ne}/netcoredbg/deps.nix (100%) rename pkgs/{development/tools/misc => unit/ne}/netcoredbg/limits.patch (100%) rename pkgs/{development/tools/misc/netcoredbg/default.nix => unit/ne/netcoredbg/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netdiscover/default.nix => unit/ne/netdiscover/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/ne}/netease-music-tui/cargo-lock.patch (100%) rename pkgs/{applications/audio/netease-music-tui/default.nix => unit/ne/netease-music-tui/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/ne}/netease-music-tui/update-cargo-lock.sh (100%) rename pkgs/{tools/inputmethods/netevent/default.nix => unit/ne/netevent/pkg-fun.nix} (100%) rename pkgs/{applications/video/netflix/default.nix => unit/ne/netflix/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nethogs/default.nix => unit/ne/nethogs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nethoscope/default.nix => unit/ne/nethoscope/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netifd/default.nix => unit/ne/netifd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netkit/tftp/default.nix => unit/ne/netkittftp/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/ne}/netlify-cli/composition.nix (100%) rename pkgs/{development/web => unit/ne}/netlify-cli/netlify-cli.json (100%) rename pkgs/{servers/monitoring/karma => unit/ne/netlify-cli}/node-env.nix (100%) rename pkgs/{development/web => unit/ne}/netlify-cli/node-packages.nix (100%) rename pkgs/{development/web/netlify-cli/default.nix => unit/ne/netlify-cli/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/ne}/netlify-cli/test.nix (100%) rename pkgs/{applications/science/misc/netlogo/default.nix => unit/ne/netlogo/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netmask/default.nix => unit/ne/netmask/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/netpbm/default.nix => unit/ne/netpbm/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/ne}/netpbm/update.sh (100%) rename pkgs/{applications/networking/netperf/default.nix => unit/ne/netperf/pkg-fun.nix} (100%) rename pkgs/{tools/admin/netplan/default.nix => unit/ne/netplan/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netproc/default.nix => unit/ne/netproc/pkg-fun.nix} (100%) rename pkgs/{games/netris/default.nix => unit/ne/netris/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netrw/default.nix => unit/ne/netrw/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netselect/default.nix => unit/ne/netselect/pkg-fun.nix} (100%) rename pkgs/{tools/networking/netsniff-ng/default.nix => unit/ne/netsniff-ng/pkg-fun.nix} (100%) rename pkgs/{servers/networkaudiod/default.nix => unit/ne/networkaudiod/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ne}/networking-ts-cxx/networking_ts.pc.in (100%) rename pkgs/{development/libraries/networking-ts-cxx/default.nix => unit/ne/networking-ts-cxx/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/fortisslvpn => unit/ne/networkmanager-fortisslvpn}/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/fortisslvpn/default.nix => unit/ne/networkmanager-fortisslvpn/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/iodine => unit/ne/networkmanager-iodine}/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/iodine/default.nix => unit/ne/networkmanager-iodine/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/l2tp => unit/ne/networkmanager-l2tp}/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/l2tp/default.nix => unit/ne/networkmanager-l2tp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/openconnect => unit/ne/networkmanager-openconnect}/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/openconnect/default.nix => unit/ne/networkmanager-openconnect/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/openvpn => unit/ne/networkmanager-openvpn}/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/openvpn/default.nix => unit/ne/networkmanager-openvpn/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/sstp/default.nix => unit/ne/networkmanager-sstp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/vpnc => unit/ne/networkmanager-vpnc}/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/vpnc/default.nix => unit/ne/networkmanager-vpnc/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ne}/networkmanager/fix-install-paths.patch (100%) rename pkgs/{tools/networking => unit/ne}/networkmanager/fix-paths.patch (100%) rename pkgs/{tools/networking/networkmanager/default.nix => unit/ne/networkmanager/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/dmenu/default.nix => unit/ne/networkmanager_dmenu/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/strongswan/default.nix => unit/ne/networkmanager_strongswan/pkg-fun.nix} (100%) rename pkgs/{tools/networking/networkmanager/applet/default.nix => unit/ne/networkmanagerapplet/pkg-fun.nix} (100%) rename pkgs/{games/neverball/default.nix => unit/ne/neverball/pkg-fun.nix} (100%) rename pkgs/{applications/audio/new-session-manager/default.nix => unit/ne/new-session-manager/pkg-fun.nix} (100%) rename pkgs/{servers/misc/navidrome/ui => unit/ne/newman}/node-composition.nix (100%) rename pkgs/{servers/monitoring/uptime-kuma => unit/ne/newman}/node-env.nix (100%) rename pkgs/{development/web => unit/ne}/newman/node-packages.nix (100%) rename pkgs/{development/web => unit/ne}/newman/package.json (100%) rename pkgs/{development/web/newman/default.nix => unit/ne/newman/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/newrelic-sysmond/default.nix => unit/ne/newrelic-sysmond/pkg-fun.nix} (100%) rename pkgs/{games/newtonwars/default.nix => unit/ne/newtonwars/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/nex/default.nix => unit/ne/nex/pkg-fun.nix} (100%) rename pkgs/{servers/nextcloud/news-updater.nix => unit/ne/nextcloud-news-updater/pkg-fun.nix} (100%) rename pkgs/{applications/networking/nextdns/default.nix => unit/ne/nextdns/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/nextflow/default.nix => unit/ne/nextflow/pkg-fun.nix} (100%) rename pkgs/{games/nexuiz/default.nix => unit/ne/nexuiz/pkg-fun.nix} (100%) rename pkgs/{servers/nfd/default.nix => unit/nf/nfd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nfdump/default.nix => unit/nf/nfdump/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nfpm/default.nix => unit/nf/nfpm/pkg-fun.nix} (100%) rename pkgs/{servers/nfs-ganesha/default.nix => unit/nf/nfs-ganesha/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/nfs-utils/default.nix => unit/nf/nfs-utils/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nfstrace/default.nix => unit/nf/nfstrace/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/nftables/default.nix => unit/nf/nftables/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ngadmin/default.nix => unit/ng/ngadmin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nghttp2/default.nix => unit/ng/nghttp2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nghttp3/default.nix => unit/ng/nghttp3/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nginx-config-formatter/default.nix => unit/ng/nginx-config-formatter/pkg-fun.nix} (100%) rename pkgs/{data/documentation => unit/ng}/nginx-doc/exclude-google-analytics.patch (100%) rename pkgs/{data/documentation/nginx-doc/default.nix => unit/ng/nginx-doc/pkg-fun.nix} (100%) rename pkgs/{servers/nginx-sso/default.nix => unit/ng/nginx-sso/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ng}/nginx-sso/rune.patch (100%) rename pkgs/{servers/irc/ngircd/default.nix => unit/ng/ngircd/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/ngn-k/default.nix => unit/ng/ngn-k/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/ng}/ngn-k/repl-license-path.patch (100%) rename pkgs/{tools/networking/ngrep/default.nix => unit/ng/ngrep/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ngrok/default.nix => unit/ng/ngrok/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ng}/ngrok/update.sh (100%) rename pkgs/{tools/networking => unit/ng}/ngrok/versions.json (100%) rename pkgs/{applications/science/electronics/ngspice/default.nix => unit/ng/ngspice/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ngt/default.nix => unit/ng/ngt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ngtcp2/gnutls.nix => unit/ng/ngtcp2-gnutls/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ngtcp2/default.nix => unit/ng/ngtcp2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nhentai/default.nix => unit/nh/nhentai/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/nice-dcv-client/default.nix => unit/ni/nice-dcv-client/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/nickel/default.nix => unit/ni/nickel/pkg-fun.nix} (100%) rename pkgs/{applications/networking/soulseek/nicotine-plus/default.nix => unit/ni/nicotine-plus/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/niff/default.nix => unit/ni/niff/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/nifi/default.nix => unit/ni/nifi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/biology/nifticlib/default.nix => unit/ni/nifticlib/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/niftyreg/default.nix => unit/ni/niftyreg/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/niftyseg/default.nix => unit/ni/niftyseg/pkg-fun.nix} (100%) rename pkgs/{data/fonts/nika-fonts/default.nix => unit/ni/nika-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ni}/nikto/NIKTODIR-nix-wrapper-fix.patch (100%) rename pkgs/{tools/networking/nikto/default.nix => unit/ni/nikto/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/nil/default.nix => unit/ni/nil/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/nilfs-utils/default.nix => unit/ni/nilfs-utils/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/nimlsp/default.nix => unit/ni/nimlsp/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/nimmm/default.nix => unit/ni/nimmm/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/ninja/default.nix => unit/ni/ninja/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/ni}/ninja/setup-hook.sh (100%) rename pkgs/{applications/audio/ninjas2/default.nix => unit/ni/ninjas2/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/ninka/default.nix => unit/ni/ninka/pkg-fun.nix} (100%) rename pkgs/{games/ninvaders/default.nix => unit/ni/ninvaders/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/nip2/default.nix => unit/ni/nip2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nitch/default.nix => unit/ni/nitch/pkg-fun.nix} (100%) rename pkgs/{tools/X11/nitrogen/default.nix => unit/ni/nitrogen/pkg-fun.nix} (100%) rename pkgs/{tools/security/nitrokey-app/udev-rules.nix => unit/ni/nitrokey-udev-rules/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ni}/nitter/nitter-version.patch (100%) rename pkgs/{servers/nitter/default.nix => unit/ni/nitter/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ni}/nitter/update.sh (100%) rename pkgs/{shells/bash/nix-bash-completions/default.nix => unit/ni/nix-bash-completions/pkg-fun.nix} (100%) rename pkgs/{servers/http => unit/ni}/nix-binary-cache/nix-binary-cache-start.in (100%) rename pkgs/{servers/http => unit/ni}/nix-binary-cache/nix-binary-cache.cgi.in (100%) rename pkgs/{servers/http/nix-binary-cache/default.nix => unit/ni/nix-binary-cache/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/nix-bisect/default.nix => unit/ni/nix-bisect/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/nix-build-uncached/default.nix => unit/ni/nix-build-uncached/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-bundle/default.nix => unit/ni/nix-bundle/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nix-direnv/default.nix => unit/ni/nix-direnv/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-doc/default.nix => unit/ni/nix-doc/pkg-fun.nix} (100%) rename {maintainers/scripts => pkgs/unit/ni/nix-generate-from-cpan}/nix-generate-from-cpan.pl (100%) rename maintainers/scripts/nix-generate-from-cpan.nix => pkgs/unit/ni/nix-generate-from-cpan/pkg-fun.nix (100%) rename pkgs/{build-support/nix-gitignore/default.nix => unit/ni/nix-gitignore/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-index/wrapper.nix => unit/ni/nix-index/pkg-fun.nix} (100%) rename pkgs/{tools/nix/info => unit/ni/nix-info}/info.sh (100%) rename pkgs/{tools/nix/info => unit/ni/nix-info}/multiuser.nix (100%) rename pkgs/{tools/nix/info/default.nix => unit/ni/nix-info/pkg-fun.nix} (100%) rename pkgs/{tools/nix/info => unit/ni/nix-info}/relaxedsandbox.nix (100%) rename pkgs/{tools/nix/info => unit/ni/nix-info}/sandbox.nix (100%) rename pkgs/{os-specific/linux/nix-ld/default.nix => unit/ni/nix-ld/pkg-fun.nix} (100%) rename pkgs/{tools/nix => unit/ni}/nix-output-monitor/generated-package.nix (100%) rename pkgs/{tools/nix/nix-output-monitor/default.nix => unit/ni/nix-output-monitor/pkg-fun.nix} (100%) rename pkgs/{tools/nix => unit/ni}/nix-output-monitor/update.sh (100%) rename pkgs/{tools/package-management/nix-pin/default.nix => unit/ni/nix-pin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nix-plugins/default.nix => unit/ni/nix-plugins/pkg-fun.nix} (100%) rename pkgs/{build-support/docker => unit/ni/nix-prefetch-docker}/nix-prefetch-docker (100%) rename pkgs/{build-support/docker/nix-prefetch-docker.nix => unit/ni/nix-prefetch-docker/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-prefetch/default.nix => unit/ni/nix-prefetch/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nix-query-tree-viewer/default.nix => unit/ni/nix-query-tree-viewer/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nix-script/default.nix => unit/ni/nix-script/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-serve/default.nix => unit/ni/nix-serve/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-simple-deploy/default.nix => unit/ni/nix-simple-deploy/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nix-store-gcs-proxy/default.nix => unit/ni/nix-store-gcs-proxy/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-top/default.nix => unit/ni/nix-top/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nix-tour/default.nix => unit/ni/nix-tour/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-universal-prefetch/default.nix => unit/ni/nix-universal-prefetch/pkg-fun.nix} (100%) rename pkgs/{common-updater/nix-update.nix => unit/ni/nix-update-script/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nix-update-source/default.nix => unit/ni/nix-update-source/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/nix-zsh-completions/default.nix => unit/ni/nix-zsh-completions/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nixdoc/default.nix => unit/ni/nixdoc/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nixel/default.nix => unit/ni/nixel/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nixops => unit/ni/nixops-dns}/deps.nix (100%) rename pkgs/{tools/package-management/nixops/nixops-dns.nix => unit/ni/nixops-dns/pkg-fun.nix} (100%) rename pkgs/{data/misc/nixos-artwork/default.nix => unit/ni/nixos-artwork/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/ni}/nixos-artwork/wallpapers.nix (100%) rename pkgs/{tools/virtualization => unit/ni}/nixos-container/nixos-container-completion.sh (100%) rename pkgs/{tools/virtualization => unit/ni}/nixos-container/nixos-container.pl (100%) rename pkgs/{tools/virtualization/nixos-container/default.nix => unit/ni/nixos-container/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nixos-generators/default.nix => unit/ni/nixos-generators/pkg-fun.nix} (100%) rename pkgs/{data/misc/nixos-artwork/grub2-theme.nix => unit/ni/nixos-grub2-theme/pkg-fun.nix} (100%) rename pkgs/{data/misc/nixos-artwork/icons.nix => unit/ni/nixos-icons/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nixos-install-tools/default.nix => unit/ni/nixos-install-tools/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/nixos-shell/default.nix => unit/ni/nixos-shell/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/nixpacks/default.nix => unit/ni/nixpacks/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nixpkgs-fmt/default.nix => unit/ni/nixpkgs-fmt/pkg-fun.nix} (100%) rename pkgs/{tools/nix/nixpkgs-hammering/default.nix => unit/ni/nixpkgs-hammering/pkg-fun.nix} (100%) rename {maintainers/scripts => pkgs/unit/ni/nixpkgs-lint}/nixpkgs-lint.pl (100%) rename maintainers/scripts/nixpkgs-lint.nix => pkgs/unit/ni/nixpkgs-lint/pkg-fun.nix (100%) rename pkgs/{tools/package-management/nixpkgs-review/default.nix => unit/ni/nixpkgs-review/pkg-fun.nix} (100%) rename pkgs/{games => unit/nj}/njam/logfile.patch (100%) rename pkgs/{games/njam/default.nix => unit/nj/njam/pkg-fun.nix} (100%) rename pkgs/{tools/system/nkeys/default.nix => unit/nk/nkeys/pkg-fun.nix} (100%) rename pkgs/{tools/text/nkf/default.nix => unit/nk/nkf/pkg-fun.nix} (100%) rename pkgs/{applications/networking/nload/default.nix => unit/nl/nload/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nlohmann_json/default.nix => unit/nl/nlohmann_json/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics => unit/nl}/nlojet/nlojet_clang_fix.patch (100%) rename pkgs/{development/libraries/physics/nlojet/default.nix => unit/nl/nlojet/pkg-fun.nix} (100%) rename pkgs/{tools/security/nmap-formatter/default.nix => unit/nm/nmap-formatter/pkg-fun.nix} (100%) rename pkgs/{tools/security/nmap/default.nix => unit/nm/nmap/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/nm}/nmap/zenmap.patch (100%) rename pkgs/{os-specific/linux/nmon/default.nix => unit/nm/nmon/pkg-fun.nix} (100%) rename pkgs/{development/embedded/nmrpflash/default.nix => unit/nm/nmrpflash/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nms/default.nix => unit/nm/nms/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nng/default.nix => unit/nn/nng/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/nnn/default.nix => unit/nn/nnn/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/nnpdf/default.nix => unit/nn/nnpdf/pkg-fun.nix} (100%) rename pkgs/{applications/networking/nntp-proxy/default.nix => unit/nn/nntp-proxy/pkg-fun.nix} (100%) rename pkgs/{applications/radio/noaa-apt/default.nix => unit/no/noaa-apt/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/node-problem-detector/default.nix => unit/no/node-problem-detector/pkg-fun.nix} (100%) rename pkgs/{development/tools/nodenv/default.nix => unit/no/nodenv/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/noice/default.nix => unit/no/noice/pkg-fun.nix} (100%) rename pkgs/{tools/networking/noip/default.nix => unit/no/noip/pkg-fun.nix} (100%) rename pkgs/{applications/audio/noise-repellent/default.nix => unit/no/noise-repellent/pkg-fun.nix} (100%) rename pkgs/{applications/audio/noisetorch/default.nix => unit/no/noisetorch/pkg-fun.nix} (100%) rename pkgs/{tools/admin/nomachine-client/default.nix => unit/no/nomachine-client/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/nomad-autoscaler/default.nix => unit/no/nomad-autoscaler/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/nomad-driver-podman/default.nix => unit/no/nomad-driver-podman/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/nomad-pack/default.nix => unit/no/nomad-pack/pkg-fun.nix} (100%) rename pkgs/{servers/nominatim/default.nix => unit/no/nominatim/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nomino/default.nix => unit/no/nomino/pkg-fun.nix} (100%) rename pkgs/{data/themes/nordic/default.nix => unit/no/nordic/pkg-fun.nix} (100%) rename pkgs/{data/icons/nordzy-cursor-theme/default.nix => unit/no/nordzy-cursor-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/nordzy-icon-theme/default.nix => unit/no/nordzy-icon-theme/pkg-fun.nix} (100%) rename pkgs/{applications/audio/normalize/default.nix => unit/no/normalize/pkg-fun.nix} (100%) rename pkgs/{development/tools/norminette/default.nix => unit/no/norminette/pkg-fun.nix} (100%) rename pkgs/{data/fonts/norwester/default.nix => unit/no/norwester-font/pkg-fun.nix} (100%) rename pkgs/{tools/security/nosqli/default.nix => unit/no/nosqli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/notable/default.nix => unit/no/notable/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/no}/notary/no-git-usage.patch (100%) rename pkgs/{tools/security/notary/default.nix => unit/no/notary/pkg-fun.nix} (100%) rename pkgs/{development/libraries/notcurses/default.nix => unit/no/notcurses/pkg-fun.nix} (100%) rename pkgs/{applications/misc/notejot/default.nix => unit/no/notejot/pkg-fun.nix} (100%) rename pkgs/{tools/networking/notemap/default.nix => unit/no/notemap/pkg-fun.nix} (100%) rename pkgs/{applications/office/notes-up/default.nix => unit/no/notes-up/pkg-fun.nix} (100%) rename pkgs/{tools/misc/noteshrink/default.nix => unit/no/noteshrink/pkg-fun.nix} (100%) rename pkgs/{tools/misc/notify-desktop/default.nix => unit/no/notify-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/misc/notify-osd-customizable/default.nix => unit/no/notify-osd-customizable/pkg-fun.nix} (100%) rename pkgs/{applications/misc/notify-osd/default.nix => unit/no/notify-osd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/notify-sharp/default.nix => unit/no/notify-sharp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/notify/default.nix => unit/no/notify/pkg-fun.nix} (100%) rename pkgs/{applications/misc/notifymuch/default.nix => unit/no/notifymuch/pkg-fun.nix} (100%) rename pkgs/{applications/office/notion-app-enhanced/default.nix => unit/no/notion-app-enhanced/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/notion/default.nix => unit/no/notion/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/notmuch-addrlookup/default.nix => unit/no/notmuch-addrlookup/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/notmuch-bower/default.nix => unit/no/notmuch-bower/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/notmuch/notmuch-mailmover.nix => unit/no/notmuch-mailmover/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/notmuch/mutt.nix => unit/no/notmuch-mutt/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/no}/novnc/fix-paths.patch (100%) rename pkgs/{applications/networking/novnc/default.nix => unit/no/novnc/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/no}/novnc/websockify.patch (100%) rename pkgs/{development/tools/literate-programming => unit/no}/noweb/no-FAQ.patch (100%) rename pkgs/{development/tools/literate-programming/noweb/default.nix => unit/no/noweb/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/no}/nox/nox-review-wip.patch (100%) rename pkgs/{tools/package-management/nox/default.nix => unit/no/nox/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/np2kai/default.nix => unit/np/np2kai/pkg-fun.nix} (100%) rename pkgs/{development/libraries/npapi-sdk/default.nix => unit/np/npapi_sdk/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/npiet/default.nix => unit/np/npiet/pkg-fun.nix} (100%) rename pkgs/{tools/nix/npins/default.nix => unit/np/npins/pkg-fun.nix} (100%) rename pkgs/{tools/nix => unit/np}/npins/source.nix (100%) rename pkgs/{tools/nix => unit/np}/npins/sources.json (100%) rename pkgs/{build-support/node/build-npm-package/hooks => unit/np/npmHooks}/npm-build-hook.sh (100%) rename pkgs/{build-support/node/build-npm-package/hooks => unit/np/npmHooks}/npm-config-hook.sh (100%) rename pkgs/{build-support/node/build-npm-package/hooks => unit/np/npmHooks}/npm-install-hook.sh (100%) rename pkgs/{build-support/node/build-npm-package/hooks/default.nix => unit/np/npmHooks/pkg-fun.nix} (100%) rename pkgs/{development/libraries/npth/default.nix => unit/np/npth/pkg-fun.nix} (100%) rename pkgs/{games/npush/default.nix => unit/np/npush/pkg-fun.nix} (100%) rename pkgs/{tools/system/nq/default.nix => unit/nq/nq/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/nq}/nqc/nqc-unistd.patch (100%) rename pkgs/{development/compilers/nqc/default.nix => unit/nq/nqc/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/rakudo/nqp.nix => unit/nq/nqp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nqptp/default.nix => unit/nq/nqptp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/nrf-command-line-tools/default.nix => unit/nr/nrf-command-line-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nrf5-sdk/default.nix => unit/nr/nrf5-sdk/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/nrfconnect/default.nix => unit/nr/nrfconnect/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/nrfutil/default.nix => unit/nr/nrfutil/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/nrg2iso/default.nix => unit/nr/nrg2iso/pkg-fun.nix} (100%) rename pkgs/{development/tools/nrpl/default.nix => unit/nr/nrpl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nrsc5/default.nix => unit/nr/nrsc5/pkg-fun.nix} (100%) rename pkgs/{development/libraries/NSPlist/default.nix => unit/ns/NSPlist/pkg-fun.nix} (100%) rename pkgs/{shells/nsh/default.nix => unit/ns/nsh/pkg-fun.nix} (100%) rename pkgs/{development/tools/nsis/default.nix => unit/ns/nsis/pkg-fun.nix} (100%) rename pkgs/{tools/security/nsjail/default.nix => unit/ns/nsjail/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/nsncd/default.nix => unit/ns/nsncd/pkg-fun.nix} (100%) rename pkgs/{servers/nsq/default.nix => unit/ns/nsq/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ns}/nss_ldap/crashes.patch (100%) rename pkgs/{os-specific/linux => unit/ns}/nss_ldap/nss_ldap-265-glibc-2.16.patch (100%) rename pkgs/{os-specific/linux/nss_ldap/default.nix => unit/ns/nss_ldap/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nss-pam-ldapd/default.nix => unit/ns/nss_pam_ldapd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nss_wrapper/default.nix => unit/ns/nss_wrapper/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nss-mdns/default.nix => unit/ns/nssmdns/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nsync/default.nix => unit/ns/nsync/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ntbtls/default.nix => unit/nt/ntbtls/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ntirpc/default.nix => unit/nt/ntirpc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/ntk/default.nix => unit/nt/ntk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ntl/default.nix => unit/nt/ntl/pkg-fun.nix} (100%) rename pkgs/{tools/security/ntlmrecon/default.nix => unit/nt/ntlmrecon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ntopng/default.nix => unit/nt/ntopng/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/nt}/ntp/glibc-2.34-fix.patch (100%) rename pkgs/{tools/networking/ntp/default.nix => unit/nt/ntp/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/nt}/ntrack/libnl-fix.patch (100%) rename pkgs/{development/libraries/ntrack/default.nix => unit/nt/ntrack/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/nt}/nttcp/format-security.patch (100%) rename pkgs/{tools/networking/nttcp/default.nix => unit/nt/nttcp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ntttcp/default.nix => unit/nt/ntttcp/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/nuXmv/default.nix => unit/nu/nuXmv/pkg-fun.nix} (100%) rename pkgs/{applications/audio/nuclear/default.nix => unit/nu/nuclear/pkg-fun.nix} (100%) rename pkgs/{tools/security/nuclei/default.nix => unit/nu/nuclei/pkg-fun.nix} (100%) rename pkgs/{games/nudoku/default.nix => unit/nu/nudoku/pkg-fun.nix} (100%) rename pkgs/{build-support/dotnet => unit/nu}/nuget-to-nix/nuget-to-nix.sh (100%) rename pkgs/{build-support/dotnet/nuget-to-nix/default.nix => unit/nu/nuget-to-nix/pkg-fun.nix} (100%) rename pkgs/{servers/identd/nullidentdmod/default.nix => unit/nu/nullidentdmod/pkg-fun.nix} (100%) rename pkgs/{tools/text/num-utils/default.nix => unit/nu/num-utils/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/numactl/default.nix => unit/nu/numactl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/nu}/numad/numad-linker-flags.patch (100%) rename pkgs/{os-specific/linux/numad/default.nix => unit/nu/numad/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/numatop/default.nix => unit/nu/numatop/pkg-fun.nix} (100%) rename pkgs/{applications/misc/numberstation/default.nix => unit/nu/numberstation/pkg-fun.nix} (100%) rename pkgs/{tools/text/numdiff/default.nix => unit/nu/numdiff/pkg-fun.nix} (100%) rename pkgs/{data/icons/numix-cursor-theme/default.nix => unit/nu/numix-cursor-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/numix/default.nix => unit/nu/numix-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/numix-icon-theme-circle/default.nix => unit/nu/numix-icon-theme-circle/pkg-fun.nix} (100%) rename pkgs/{data/icons/numix-icon-theme-square/default.nix => unit/nu/numix-icon-theme-square/pkg-fun.nix} (100%) rename pkgs/{data/themes/numix-solarized/default.nix => unit/nu/numix-solarized-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/numix-sx/default.nix => unit/nu/numix-sx-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{tools/X11/numlockx/default.nix => unit/nu/numlockx/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/nu}/numworks-epsilon/0001-ion-linux-makerules.patch (100%) rename pkgs/{applications/science/math/numworks-epsilon/default.nix => unit/nu/numworks-epsilon/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/nu}/numworks-udev-rules/50-numworks-calculator.rules (100%) rename pkgs/{os-specific/linux/numworks-udev-rules/default.nix => unit/nu/numworks-udev-rules/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/nu}/numworks-udev-rules/update.sh (100%) rename pkgs/{development/libraries/nuraft/default.nix => unit/nu/nuraft/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nurl/default.nix => unit/nu/nurl/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/nusmv/default.nix => unit/nu/nusmv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nuspell/default.nix => unit/nu/nuspell/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/nu}/nut/hardcode-paths.patch (100%) rename pkgs/{applications/misc/nut/default.nix => unit/nu/nut/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nuttcp/default.nix => unit/nu/nuttcp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nux/default.nix => unit/nu/nux/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nv-codec-headers/10_x.nix => unit/nv/nv-codec-headers-10/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nv-codec-headers/11_x.nix => unit/nv/nv-codec-headers-11/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nv-codec-headers/default.nix => unit/nv/nv-codec-headers/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/nvc/default.nix => unit/nv/nvc/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/nvd/default.nix => unit/nv/nvd/pkg-fun.nix} (100%) rename pkgs/{applications/editors/nvi/default.nix => unit/nv/nvi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nvidia-optical-flow-sdk/default.nix => unit/nv/nvidia-optical-flow-sdk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nvidia-texture-tools/default.nix => unit/nv/nvidia-texture-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/nvidia-video-sdk/default.nix => unit/nv/nvidia-video-sdk/pkg-fun.nix} (100%) rename pkgs/{development/compilers/nvidia-cg-toolkit/default.nix => unit/nv/nvidia_cg_toolkit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nvimpager/default.nix => unit/nv/nvimpager/pkg-fun.nix} (100%) rename pkgs/{tools/system/nvitop/default.nix => unit/nv/nvitop/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/nvme-cli/default.nix => unit/nv/nvme-cli/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/nvmet-cli/default.nix => unit/nv/nvmet-cli/pkg-fun.nix} (100%) rename pkgs/{applications/editors/nvpy/default.nix => unit/nv/nvpy/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/nw}/nwg-bar/fix-paths.patch (100%) rename pkgs/{applications/misc/nwg-bar/default.nix => unit/nw/nwg-bar/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nwg-dock/default.nix => unit/nw/nwg-dock/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nwg-drawer/default.nix => unit/nw/nwg-drawer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nwg-launchers/default.nix => unit/nw/nwg-launchers/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nwg-menu/default.nix => unit/nw/nwg-menu/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nwg-panel/default.nix => unit/nw/nwg-panel/pkg-fun.nix} (100%) rename pkgs/{applications/misc/nwg-wrapper/default.nix => unit/nw/nwg-wrapper/pkg-fun.nix} (100%) rename pkgs/{tools/security/nwipe/default.nix => unit/nw/nwipe/pkg-fun.nix} (100%) rename pkgs/{tools/X11/nx-libs/default.nix => unit/nx/nx-libs/pkg-fun.nix} (100%) rename pkgs/{tools/compression/nx2elf/default.nix => unit/nx/nx2elf/pkg-fun.nix} (100%) rename pkgs/{games/nxengine-evo/default.nix => unit/nx/nxengine-evo/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/nxpmicro-mfgtools/default.nix => unit/nx/nxpmicro-mfgtools/pkg-fun.nix} (100%) rename pkgs/{tools/misc/nyancat/default.nix => unit/ny/nyancat/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ny}/nylon/configure-use-solib.patch (100%) rename pkgs/{tools/networking/nylon/default.nix => unit/ny/nylon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/nyx/default.nix => unit/ny/nyx/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/nyxt/default.nix => unit/ny/nyxt/pkg-fun.nix} (100%) rename pkgs/{applications/editors/o/default.nix => unit/o/o/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/oak/default.nix => unit/oa/oak/pkg-fun.nix} (100%) rename pkgs/{tools/networking/oapi-codegen/default.nix => unit/oa/oapi-codegen/pkg-fun.nix} (100%) rename pkgs/{tools/security/oath-toolkit/default.nix => unit/oa/oath-toolkit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/oatpp/default.nix => unit/oa/oatpp/pkg-fun.nix} (100%) rename pkgs/{servers/oauth2-proxy/default.nix => unit/oa/oauth2-proxy/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/clojure/obb.nix => unit/ob/obb/pkg-fun.nix} (100%) rename pkgs/{tools/X11/obconf/default.nix => unit/ob/obconf/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/oberon-risc-emu/default.nix => unit/ob/oberon-risc-emu/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/obex-data-server => unit/ob/obex_data_server}/obex-data-server-0.4.6-build-fixes-1.patch (100%) rename pkgs/{tools/bluetooth/obex-data-server/default.nix => unit/ob/obex_data_server/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/obexd/default.nix => unit/ob/obexd/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/obexfs/default.nix => unit/ob/obexfs/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/obexftp/default.nix => unit/ob/obexftp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/obfs4/default.nix => unit/ob/obfs4/pkg-fun.nix} (100%) rename pkgs/{applications/misc/obinskit/default.nix => unit/ob/obinskit/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/obitools/obitools3.nix => unit/ob/obitools3/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/objconv/default.nix => unit/ob/objconv/pkg-fun.nix} (100%) rename pkgs/{applications/misc/obsidian/default.nix => unit/ob/obsidian/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/obuild/default.nix => unit/ob/obuild/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/ocaml-top/default.nix => unit/oc/ocaml-top/pkg-fun.nix} (100%) rename pkgs/{development/ocaml-modules/ocamlmake/default.nix => unit/oc/ocaml_make/pkg-fun.nix} (100%) rename pkgs/{development/ocaml-modules/ocamlmake => unit/oc/ocaml_make}/setup-hook.sh (100%) rename pkgs/{applications/audio/ocenaudio/default.nix => unit/oc/ocenaudio/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ocf-resource-agents/default.nix => unit/oc/ocf-resource-agents/pkg-fun.nix} (100%) rename pkgs/{tools/admin/oci-cli/default.nix => unit/oc/oci-cli/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/oci-seccomp-bpf-hook/default.nix => unit/oc/oci-seccomp-bpf-hook/pkg-fun.nix} (100%) rename pkgs/{build-support/oci-tools/default.nix => unit/oc/ociTools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ocl-icd/default.nix => unit/oc/ocl-icd/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/oclgrind/default.nix => unit/oc/oclgrind/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/ocm/default.nix => unit/oc/ocm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ocproxy/default.nix => unit/oc/ocproxy/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ocr-a/default.nix => unit/oc/ocr-a/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/ocrad/default.nix => unit/oc/ocrad/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/oc}/ocrfeeder/fix-launch.diff (100%) rename pkgs/{applications/graphics/ocrfeeder/default.nix => unit/oc/ocrfeeder/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ocserv/default.nix => unit/oc/ocserv/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/ocsigen-i18n/default.nix => unit/oc/ocsigen-i18n/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/octant/desktop.nix => unit/oc/octant-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/octant => unit/oc/octant-desktop}/update-desktop.sh (100%) rename pkgs/{applications/networking/cluster/octant/default.nix => unit/oc/octant/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/oc}/octant/update.sh (100%) rename pkgs/{applications/editors/jupyter-kernels/octave => unit/oc/octave-kernel}/kernel.nix (100%) rename pkgs/{applications/editors/jupyter-kernels/octave/default.nix => unit/oc/octave-kernel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/octomap/default.nix => unit/oc/octomap/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/oc}/octoprint/ffmpeg-path.patch (100%) rename pkgs/{applications/misc => unit/oc}/octoprint/pip-path.patch (100%) rename pkgs/{applications/misc/octoprint/default.nix => unit/oc/octoprint/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/oc}/octoprint/plugins.nix (100%) rename pkgs/{applications/science/biology/octopus/default.nix => unit/oc/octopus-caller/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/octopus/default.nix => unit/oc/octopus/pkg-fun.nix} (100%) rename pkgs/{tools/misc/octosql/default.nix => unit/oc/octosql/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/oculante/default.nix => unit/oc/oculante/pkg-fun.nix} (100%) rename pkgs/{games/odamex/default.nix => unit/od/odamex/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ode/default.nix => unit/od/ode/pkg-fun.nix} (100%) rename pkgs/{development/compilers/odin/default.nix => unit/od/odin/pkg-fun.nix} (100%) rename pkgs/{applications/audio/odin2/default.nix => unit/od/odin2/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/odo/default.nix => unit/od/odo/pkg-fun.nix} (100%) rename pkgs/{applications/finance/odoo/default.nix => unit/od/odoo/pkg-fun.nix} (100%) rename pkgs/{applications/finance => unit/od}/odoo/update.sh (100%) rename pkgs/{development/libraries/odpic/default.nix => unit/od/odpic/pkg-fun.nix} (100%) rename pkgs/{tools/misc/odroid-xu3-bootloader/default.nix => unit/od/odroid-xu3-bootloader/pkg-fun.nix} (100%) rename pkgs/{tools/text/odt2txt/default.nix => unit/od/odt2txt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/odyssey/default.nix => unit/od/odyssey/pkg-fun.nix} (100%) rename pkgs/{applications/editors/oed/default.nix => unit/oe/oed/pkg-fun.nix} (100%) rename pkgs/{tools/security/offensive-azure/default.nix => unit/of/offensive-azure/pkg-fun.nix} (100%) rename pkgs/{data/fonts/office-code-pro/default.nix => unit/of/office-code-pro/pkg-fun.nix} (100%) rename pkgs/{tools/networking/offlineimap/default.nix => unit/of/offlineimap/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/offpunk/default.nix => unit/of/offpunk/pkg-fun.nix} (100%) rename pkgs/{applications/networking/offrss/default.nix => unit/of/offrss/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/of}/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch (100%) rename pkgs/{tools/networking/ofono/default.nix => unit/of/ofono/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ogdf/default.nix => unit/og/ogdf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/oggvideotools/default.nix => unit/og/oggvideotools/pkg-fun.nix} (100%) rename pkgs/{applications/video/ogmtools/default.nix => unit/og/ogmtools/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/ograc/default.nix => unit/og/ograc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ogre/1.10.x.nix => unit/og/ogre1_10/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ogre/1.9.x.nix => unit/og/ogre1_9/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/oguri/default.nix => unit/og/oguri/pkg-fun.nix} (100%) rename pkgs/{shells/fish/oh-my-fish/default.nix => unit/oh/oh-my-fish/pkg-fun.nix} (100%) rename pkgs/{games/oh-my-git/default.nix => unit/oh/oh-my-git/pkg-fun.nix} (100%) rename pkgs/{development/tools/oh-my-posh/default.nix => unit/oh/oh-my-posh/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/oh-my-zsh/default.nix => unit/oh/oh-my-zsh/pkg-fun.nix} (100%) rename pkgs/{shells/oh/default.nix => unit/oh/oh/pkg-fun.nix} (100%) rename pkgs/{servers/identd/oidentd/default.nix => unit/oi/oidentd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/oil-buku/default.nix => unit/oi/oil-buku/pkg-fun.nix} (100%) rename pkgs/{shells/oil/default.nix => unit/oi/oil/pkg-fun.nix} (100%) rename pkgs/{games/oilrush/default.nix => unit/oi/oilrush/pkg-fun.nix} (100%) rename pkgs/{shells/oksh/default.nix => unit/ok/oksh/pkg-fun.nix} (100%) rename pkgs/{development/tools/okteto/default.nix => unit/ok/okteto/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ola/default.nix => unit/ol/ola/pkg-fun.nix} (100%) rename pkgs/{servers/olaris/default.nix => unit/ol/olaris-server/pkg-fun.nix} (100%) rename pkgs/{data/fonts/oldsindhi/default.nix => unit/ol/oldsindhi/pkg-fun.nix} (100%) rename pkgs/{data/fonts/oldstandard/default.nix => unit/ol/oldstandard/pkg-fun.nix} (100%) rename pkgs/{development/libraries/olm/default.nix => unit/ol/olm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/olsrd/default.nix => unit/ol/olsrd/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/om4/default.nix => unit/om/om4/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/omake/default.nix => unit/om/omake/pkg-fun.nix} (100%) rename pkgs/{tools/security/omapd/default.nix => unit/om/omapd/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/om}/omapd/zlib.patch (100%) rename pkgs/{servers/ombi/default.nix => unit/om/ombi/pkg-fun.nix} (100%) rename pkgs/{servers => unit/om}/ombi/update.sh (100%) rename pkgs/{applications/misc/omegat.nix => unit/om/omegat/pkg-fun.nix} (100%) rename pkgs/{data/themes/omni-gtk-theme/default.nix => unit/om/omni-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{development/tools/omniorb/default.nix => unit/om/omniorb/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/om}/omnisharp-roslyn/deps.nix (100%) rename pkgs/{development/tools/omnisharp-roslyn/default.nix => unit/om/omnisharp-roslyn/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/om}/omnisharp-roslyn/updater.sh (100%) rename pkgs/{applications/networking/omping/default.nix => unit/om/omping/pkg-fun.nix} (100%) rename pkgs/{applications/video/omxplayer/default.nix => unit/om/omxplayer/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/on}/onboard/fix-paths.patch (100%) rename pkgs/{applications/misc => unit/on}/onboard/hunspell-use-xdg-datadirs.patch (100%) rename pkgs/{applications/misc/onboard/default.nix => unit/on/onboard/pkg-fun.nix} (100%) rename pkgs/{development/libraries/oneDNN/default.nix => unit/on/oneDNN/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/on}/one_gadget/Gemfile (100%) rename pkgs/{development/tools/misc => unit/on}/one_gadget/Gemfile.lock (100%) rename pkgs/{development/tools/misc => unit/on}/one_gadget/gemset.nix (100%) rename pkgs/{development/tools/misc/one_gadget/default.nix => unit/on/one_gadget/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sync/onedrive/default.nix => unit/on/onedrive/pkg-fun.nix} (100%) rename pkgs/{applications/misc/oneko/default.nix => unit/on/oneko/pkg-fun.nix} (100%) rename pkgs/{tools/networking/oneshot/default.nix => unit/on/oneshot/pkg-fun.nix} (100%) rename pkgs/{tools/security/onesixtyone/default.nix => unit/on/onesixtyone/pkg-fun.nix} (100%) rename pkgs/{data/themes/onestepback/default.nix => unit/on/onestepback/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/on}/oni2/common.nix (100%) rename pkgs/{applications/editors => unit/on}/oni2/esy_skia_use_nixpkgs.patch (100%) rename pkgs/{applications/editors => unit/on}/oni2/extensions.lock (100%) rename pkgs/{applications/editors => unit/on}/oni2/extensions.nix (100%) rename pkgs/{applications/editors => unit/on}/oni2/node.lock (100%) rename pkgs/{applications/editors => unit/on}/oni2/node.nix (100%) rename pkgs/{applications/editors/oni2/default.nix => unit/on/oni2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/oniguruma/default.nix => unit/on/oniguruma/pkg-fun.nix} (100%) rename pkgs/{tools/security/onioncircuits/default.nix => unit/on/onioncircuits/pkg-fun.nix} (100%) rename pkgs/{tools/security/onlykey-agent/default.nix => unit/on/onlykey-agent/pkg-fun.nix} (100%) rename pkgs/{tools/security/onlykey-cli/default.nix => unit/on/onlykey-cli/pkg-fun.nix} (100%) rename pkgs/{applications/office/onlyoffice-bin/default.nix => unit/on/onlyoffice-bin/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/on}/onlyoffice-bin/update.sh (100%) rename pkgs/{servers/onlyoffice-documentserver/default.nix => unit/on/onlyoffice-documentserver/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/onmetal-image/default.nix => unit/on/onmetal-image/pkg-fun.nix} (100%) rename pkgs/{games/onscripter-en/default.nix => unit/on/onscripter-en/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/biology/oobicpl/default.nix => unit/oo/oobicpl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ookla-speedtest/default.nix => unit/oo/ookla-speedtest/pkg-fun.nix} (100%) rename pkgs/{tools/networking/oonf-olsrd2/default.nix => unit/oo/oonf-olsrd2/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ooniprobe-cli/default.nix => unit/oo/ooniprobe-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opae/default.nix => unit/op/opae/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/opaline/default.nix => unit/op/opaline/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/opam/installer.nix => unit/op/opam-installer/pkg-fun.nix} (100%) rename pkgs/{development/tools/ocaml/opam2json/default.nix => unit/op/opam2json/pkg-fun.nix} (100%) rename pkgs/{development/tools/opcr-policy/default.nix => unit/op/opcr-policy/pkg-fun.nix} (100%) rename pkgs/{data/fonts/open-dyslexic/default.nix => unit/op/open-dyslexic/pkg-fun.nix} (100%) rename pkgs/{tools/security/open-ecard/default.nix => unit/op/open-ecard/pkg-fun.nix} (100%) rename pkgs/{data/fonts/open-fonts/default.nix => unit/op/open-fonts/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/open-isns/default.nix => unit/op/open-isns/pkg-fun.nix} (100%) rename pkgs/{tools/misc/open-pdf-sign/default.nix => unit/op/open-pdf-sign/pkg-fun.nix} (100%) rename pkgs/{development/tools/open-policy-agent/default.nix => unit/op/open-policy-agent/pkg-fun.nix} (100%) rename pkgs/{data/fonts/open-sans/default.nix => unit/op/open-sans/pkg-fun.nix} (100%) rename pkgs/{applications/audio/open-stage-control/default.nix => unit/op/open-stage-control/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/op}/open-stage-control/update.sh (100%) rename pkgs/{applications/virtualization/open-vm-tools/default.nix => unit/op/open-vm-tools/pkg-fun.nix} (100%) rename pkgs/{development/compilers/open-watcom/bin.nix => unit/op/open-watcom-bin-unwrapped/pkg-fun.nix} (100%) rename pkgs/{development/compilers/open-watcom/v2.nix => unit/op/open-watcom-v2-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/open-wbo/default.nix => unit/op/open-wbo/pkg-fun.nix} (100%) rename pkgs/{games/openarena/default.nix => unit/op/openarena/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openbabel/2.nix => unit/op/openbabel2/pkg-fun.nix} (100%) rename pkgs/{servers/openbgpd/default.nix => unit/op/openbgpd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/openblas/default.nix => unit/op/openblas/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/openboardview/default.nix => unit/op/openboardview/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/openbox/default.nix => unit/op/openbox/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/op}/openbsm/bsm-add-audit_token_to_pid.patch (100%) rename pkgs/{development/libraries/openbsm/default.nix => unit/op/openbsm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opencascade-occt/default.nix => unit/op/opencascade-occt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/opencbm/default.nix => unit/op/opencbm/pkg-fun.nix} (100%) rename pkgs/{tools/text/opencc/default.nix => unit/op/opencc/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/op}/opencl-clang/opencl-headers-dir.patch (100%) rename pkgs/{development/libraries/opencl-clang/default.nix => unit/op/opencl-clang/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opencl-clhpp/default.nix => unit/op/opencl-clhpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opencl-headers/default.nix => unit/op/opencl-headers/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/op}/opencl-info/opencl-info-clhpp2.diff (100%) rename pkgs/{tools/system/opencl-info/default.nix => unit/op/opencl-info/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/op}/opencollada/pcre.patch (100%) rename pkgs/{development/libraries/opencollada/default.nix => unit/op/opencollada/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opencolorio/1.x.nix => unit/op/opencolorio_1/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openconnect => unit/op/openconnectPackages}/common.nix (100%) rename pkgs/{tools/networking/openconnect/default.nix => unit/op/openconnectPackages/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opencore-amr/default.nix => unit/op/opencore-amr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/opencorsairlink/default.nix => unit/op/opencorsairlink/pkg-fun.nix} (100%) rename pkgs/{tools/security/opencryptoki/default.nix => unit/op/opencryptoki/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openct/default.nix => unit/op/openct/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opendkim/default.nix => unit/op/opendkim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opendmarc/default.nix => unit/op/opendmarc/pkg-fun.nix} (100%) rename pkgs/{games/opendune/default.nix => unit/op/opendune/pkg-fun.nix} (100%) rename pkgs/{development/compilers/opendylan/bin.nix => unit/op/opendylan_bin/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/openethereum/default.nix => unit/op/openethereum/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openexr/default.nix => unit/op/openexr_2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openexr/3.nix => unit/op/openexr_3/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/op}/openexrid-unstable/openexrid.patch (100%) rename pkgs/{development/libraries/openexrid-unstable/default.nix => unit/op/openexrid-unstable/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openfec/default.nix => unit/op/openfec/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openfortivpn/default.nix => unit/op/openfortivpn/pkg-fun.nix} (100%) rename pkgs/{development/embedded/fpga/openfpgaloader/default.nix => unit/op/openfpgaloader/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openfst/default.nix => unit/op/openfst/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openfx/default.nix => unit/op/openfx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opengrm-ngram/default.nix => unit/op/opengrm-ngram/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/opengrok/default.nix => unit/op/opengrok/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openh264/default.nix => unit/op/openh264/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openhmd/default.nix => unit/op/openhmd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openimagedenoise/default.nix => unit/op/openimagedenoise/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openimagedenoise/1_2_x.nix => unit/op/openimagedenoise_1_2_x/pkg-fun.nix} (100%) rename pkgs/{tools/system/openipmi/default.nix => unit/op/openipmi/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/open-iscsi/default.nix => unit/op/openiscsi/pkg-fun.nix} (100%) rename pkgs/{tools/text/sgml => unit/op}/openjade/msggen.patch (100%) rename pkgs/{tools/text/sgml/openjade/default.nix => unit/op/openjade/pkg-fun.nix} (100%) rename pkgs/{games/openjk/default.nix => unit/op/openjk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openjpeg/default.nix => unit/op/openjpeg/pkg-fun.nix} (100%) rename pkgs/{applications/misc/openjump/default.nix => unit/op/openjump/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/openlibm/default.nix => unit/op/openlibm/pkg-fun.nix} (100%) rename pkgs/{games/openlierox/default.nix => unit/op/openlierox/pkg-fun.nix} (100%) rename pkgs/{misc/lilypond/fonts.nix => unit/op/openlilylib-fonts/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/chemistry/openmm/default.nix => unit/op/openmm/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry => unit/op}/openmolcas/MKL-MPICH.patch (100%) rename pkgs/{applications/science/chemistry => unit/op}/openmolcas/openblasPath.patch (100%) rename pkgs/{applications/science/chemistry/openmolcas/default.nix => unit/op/openmolcas/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openmpi/default.nix => unit/op/openmpi/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/op}/openmsx/custom-nix.mk (100%) rename pkgs/{applications/emulators/openmsx/default.nix => unit/op/openmsx/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/openmvg/default.nix => unit/op/openmvg/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/openmvs/default.nix => unit/op/openmvs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openntpd/default.nix => unit/op/openntpd/pkg-fun.nix} (100%) rename pkgs/{tools/bluetooth/openobex/default.nix => unit/op/openobex/pkg-fun.nix} (100%) rename pkgs/{development/embedded/openocd/default.nix => unit/op/openocd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openpa/default.nix => unit/op/openpa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openpam/default.nix => unit/op/openpam/pkg-fun.nix} (100%) rename pkgs/{games/openrct2/default.nix => unit/op/openrct2/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openresolv/default.nix => unit/op/openresolv/pkg-fun.nix} (100%) rename pkgs/{applications/misc/openring/default.nix => unit/op/openring/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opensaml-cpp/default.nix => unit/op/opensaml-cpp/pkg-fun.nix} (100%) rename pkgs/{misc/opensbi/default.nix => unit/op/opensbi/pkg-fun.nix} (100%) rename pkgs/{tools/system/openseachest/default.nix => unit/op/openseachest/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/openshift/default.nix => unit/op/openshift/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openslide/default.nix => unit/op/openslide/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/op}/openslp/CVE-2016-4912.patch (100%) rename pkgs/{development/libraries => unit/op}/openslp/CVE-2019-5544.patch (100%) rename pkgs/{development/libraries/openslp/default.nix => unit/op/openslp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/opensm/default.nix => unit/op/opensm/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/opensmt/default.nix => unit/op/opensmt/pkg-fun.nix} (100%) rename pkgs/{servers/mail/opensmtpd/extras.nix => unit/op/opensmtpd-extras/pkg-fun.nix} (100%) rename pkgs/{servers/mail/opensmtpd/filter-dkimsign => unit/op/opensmtpd-filter-dkimsign}/no-chown-while-installing.patch (100%) rename pkgs/{servers/mail/opensmtpd/filter-dkimsign/default.nix => unit/op/opensmtpd-filter-dkimsign/pkg-fun.nix} (100%) rename pkgs/{servers/mail/opensmtpd/filter-rspamd.nix => unit/op/opensmtpd-filter-rspamd/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/op}/opensmtpd/cross_fix.diff (100%) rename pkgs/{servers/mail/opensmtpd/default.nix => unit/op/opensmtpd/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/op}/opensmtpd/proc_path.diff (100%) rename pkgs/{tools/networking => unit/op}/opensnitch/go.mod (100%) rename pkgs/{tools/networking => unit/op}/opensnitch/go.sum (100%) rename pkgs/{tools/networking/opensnitch/daemon.nix => unit/op/opensnitch/pkg-fun.nix} (100%) rename pkgs/{games/opensoldat/default.nix => unit/op/opensoldat/pkg-fun.nix} (100%) rename pkgs/{tools/text/sgml/opensp/default.nix => unit/op/opensp/pkg-fun.nix} (100%) rename pkgs/{tools/text/sgml => unit/op}/opensp/setup-hook.sh (100%) rename pkgs/{development/libraries/science/math/openspecfun/default.nix => unit/op/openspecfun/pkg-fun.nix} (100%) rename pkgs/{development/compilers/openspin/default.nix => unit/op/openspin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opensubdiv/default.nix => unit/op/opensubdiv/pkg-fun.nix} (100%) rename pkgs/{games/opensupaplex/default.nix => unit/op/opensupaplex/pkg-fun.nix} (100%) rename pkgs/{tools/X11 => unit/op}/opentabletdriver/deps.nix (100%) rename pkgs/{tools/X11/opentabletdriver/default.nix => unit/op/opentabletdriver/pkg-fun.nix} (100%) rename pkgs/{tools/X11 => unit/op}/opentabletdriver/update.sh (100%) rename pkgs/{tools/misc/opentelemetry-collector/contrib.nix => unit/op/opentelemetry-collector-contrib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/opentelemetry-collector/default.nix => unit/op/opentelemetry-collector/pkg-fun.nix} (100%) rename pkgs/{development/libraries/opentracing-cpp/default.nix => unit/op/opentracing-cpp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/opentracker/default.nix => unit/op/opentracker/pkg-fun.nix} (100%) rename pkgs/{tools/misc/opentsdb/default.nix => unit/op/opentsdb/pkg-fun.nix} (100%) rename pkgs/{games/openttd/grfcodec.nix => unit/op/openttd-grfcodec/pkg-fun.nix} (100%) rename pkgs/{games/openttd/nml.nix => unit/op/openttd-nml/pkg-fun.nix} (100%) rename pkgs/{games/opentyrian/default.nix => unit/op/opentyrian/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openvdb/default.nix => unit/op/openvdb/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openvpn3/default.nix => unit/op/openvpn3/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openvpn/openvpn_learnaddress.nix => unit/op/openvpn_learnaddress/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openwsman/default.nix => unit/op/openwsman/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openxr-loader/default.nix => unit/op/openxr-loader/pkg-fun.nix} (100%) rename pkgs/{games/openxray/default.nix => unit/op/openxray/pkg-fun.nix} (100%) rename pkgs/{data/themes/openzone/default.nix => unit/op/openzone-cursors/pkg-fun.nix} (100%) rename pkgs/{development/libraries/openzwave/default.nix => unit/op/openzwave/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/opera/default.nix => unit/op/opera/pkg-fun.nix} (100%) rename pkgs/{development/tools/operator-sdk/default.nix => unit/op/operator-sdk/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/opkg-utils/default.nix => unit/op/opkg-utils/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/opkg/default.nix => unit/op/opkg/pkg-fun.nix} (100%) rename pkgs/{tools/misc/oppai-ng/default.nix => unit/op/oppai-ng/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/ops/default.nix => unit/op/ops/pkg-fun.nix} (100%) rename pkgs/{applications/networking/opsdroid/default.nix => unit/op/opsdroid/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/optar/default.nix => unit/op/optar/pkg-fun.nix} (100%) rename pkgs/{tools/games/minecraft/optifine => unit/op/optifinePackages}/generic.nix (100%) rename pkgs/{tools/games/minecraft/optifine/default.nix => unit/op/optifinePackages/pkg-fun.nix} (100%) rename pkgs/{tools/games/minecraft/optifine => unit/op/optifinePackages}/update.py (100%) rename pkgs/{tools/games/minecraft/optifine => unit/op/optifinePackages}/versions.json (100%) rename pkgs/{development/libraries/optparse-bash/default.nix => unit/op/optparse-bash/pkg-fun.nix} (100%) rename pkgs/{applications/audio/opus-tools/default.nix => unit/op/opusTools/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/op}/opusfile/disable-cert-store.patch (100%) rename pkgs/{applications/audio => unit/op}/opusfile/include-multistream.patch (100%) rename pkgs/{applications/audio/opusfile/default.nix => unit/op/opusfile/pkg-fun.nix} (100%) rename pkgs/{applications/audio/opustags/default.nix => unit/op/opustags/pkg-fun.nix} (100%) rename pkgs/{development/tools/oq/default.nix => unit/oq/oq/pkg-fun.nix} (100%) rename pkgs/{development/misc/or1k/newlib.nix => unit/or/or1k-newlib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/oracle-instantclient/default.nix => unit/or/oracle-instantclient/pkg-fun.nix} (100%) rename pkgs/{development/compilers/oraclejdk/jdk11-linux.nix => unit/or/oraclejdk11/pkg-fun.nix} (100%) rename pkgs/{data/icons/oranchelo-icon-theme/default.nix => unit/or/oranchelo-icon-theme/pkg-fun.nix} (100%) rename pkgs/{development/tools/oras/default.nix => unit/or/oras/pkg-fun.nix} (100%) rename pkgs/{data/fonts/orbitron/default.nix => unit/or/orbitron/pkg-fun.nix} (100%) rename pkgs/{development/embedded/orbuculum/default.nix => unit/or/orbuculum/pkg-fun.nix} (100%) rename pkgs/{development/compilers/orc/default.nix => unit/or/orc/pkg-fun.nix} (100%) rename pkgs/{applications/audio/orca-c/default.nix => unit/or/orca-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/orcania/default.nix => unit/or/orcania/pkg-fun.nix} (100%) rename pkgs/{data/themes/orchis-theme/default.nix => unit/or/orchis-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/orion/default.nix => unit/or/orion/pkg-fun.nix} (100%) rename pkgs/{tools/security/orjail/default.nix => unit/or/orjail/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/oroborus/default.nix => unit/or/oroborus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/orocos-kdl/default.nix => unit/or/orocos-kdl/pkg-fun.nix} (100%) rename pkgs/{games/orthorobot/default.nix => unit/or/orthorobot/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ortp/default.nix => unit/or/ortp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/os-prober/default.nix => unit/os/os-prober/pkg-fun.nix} (100%) rename pkgs/{tools/misc/oscclip/default.nix => unit/os/oscclip/pkg-fun.nix} (100%) rename pkgs/{applications/audio/osdlyrics/default.nix => unit/os/osdlyrics/pkg-fun.nix} (100%) rename pkgs/{development/tools/oshka/default.nix => unit/os/oshka/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/osi/default.nix => unit/os/osi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/osinfo-db-tools/default.nix => unit/os/osinfo-db-tools/pkg-fun.nix} (100%) rename pkgs/{data/misc/osinfo-db/default.nix => unit/os/osinfo-db/pkg-fun.nix} (100%) rename pkgs/{development/libraries/osm-gps-map/default.nix => unit/os/osm-gps-map/pkg-fun.nix} (100%) rename pkgs/{applications/misc/osmctools/default.nix => unit/os/osmctools/pkg-fun.nix} (100%) rename pkgs/{applications/audio/osmid/default.nix => unit/os/osmid/pkg-fun.nix} (100%) rename pkgs/{applications/misc/osmium-tool/default.nix => unit/os/osmium-tool/pkg-fun.nix} (100%) rename pkgs/{applications/office/osmo/default.nix => unit/os/osmo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/osqp/default.nix => unit/os/osqp/pkg-fun.nix} (100%) rename pkgs/{servers/osrm-backend/default.nix => unit/os/osrm-backend/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/os}/ossec/no-root.patch (100%) rename pkgs/{tools/security/ossec/default.nix => unit/os/ossec/pkg-fun.nix} (100%) rename pkgs/{development/tools/osslsigncode/default.nix => unit/os/osslsigncode/pkg-fun.nix} (100%) rename pkgs/{tools/admin/ossutil/default.nix => unit/os/ossutil/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/os}/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch (100%) rename pkgs/{tools/misc => unit/os}/ostree/fix-1592.patch (100%) rename pkgs/{tools/misc => unit/os}/ostree/fix-test-paths.patch (100%) rename pkgs/{tools/misc/ostree/default.nix => unit/os/ostree/pkg-fun.nix} (100%) rename pkgs/{games/osu-lazer/bin.nix => unit/os/osu-lazer-bin/pkg-fun.nix} (100%) rename pkgs/{games => unit/os}/osu-lazer/deps.nix (100%) rename pkgs/{games => unit/os}/osu-lazer/osu.runtimeconfig.json (100%) rename pkgs/{games/osu-lazer/default.nix => unit/os/osu-lazer/pkg-fun.nix} (100%) rename pkgs/{games => unit/os}/osu-lazer/update.sh (100%) rename pkgs/{tools/security/osv-detector/default.nix => unit/os/osv-detector/pkg-fun.nix} (100%) rename pkgs/{tools/security/osv-scanner/default.nix => unit/os/osv-scanner/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/osxsnarf/default.nix => unit/os/osxsnarf/pkg-fun.nix} (100%) rename pkgs/{tools/misc/otel-cli/default.nix => unit/ot/otel-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ot}/otfcc/fix-aarch64.patch (100%) rename pkgs/{tools/misc => unit/ot}/otfcc/move-makefiles.patch (100%) rename pkgs/{tools/misc/otfcc/default.nix => unit/ot/otfcc/pkg-fun.nix} (100%) rename pkgs/{tools/security/otpauth/default.nix => unit/ot/otpauth/pkg-fun.nix} (100%) rename pkgs/{applications/misc/otpclient/default.nix => unit/ot/otpclient/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/otpw/default.nix => unit/ot/otpw/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/ott/default.nix => unit/ot/ott/pkg-fun.nix} (100%) rename pkgs/{games/otto-matic/default.nix => unit/ot/otto-matic/pkg-fun.nix} (100%) rename pkgs/{tools/compression/ouch/default.nix => unit/ou/ouch/pkg-fun.nix} (100%) rename pkgs/{development/tools/out-of-tree/default.nix => unit/ou/out-of-tree/pkg-fun.nix} (100%) rename pkgs/{tools/misc/outils/default.nix => unit/ou/outils/pkg-fun.nix} (100%) rename pkgs/{tools/text/ov/default.nix => unit/ov/ov/pkg-fun.nix} (100%) rename pkgs/{servers/misc/oven-media-engine/default.nix => unit/ov/oven-media-engine/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ov}/overcommit/Gemfile (100%) rename pkgs/{development/tools => unit/ov}/overcommit/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ov}/overcommit/gemset.nix (100%) rename pkgs/{development/tools/overcommit/default.nix => unit/ov/overcommit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/overmind/default.nix => unit/ov/overmind/pkg-fun.nix} (100%) rename pkgs/{data/fonts/overpass/default.nix => unit/ov/overpass/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ov}/oversteer/fix-install-dir.patch (100%) rename pkgs/{applications/misc/oversteer/default.nix => unit/ov/oversteer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ovh-ttyrec/default.nix => unit/ov/ovh-ttyrec/pkg-fun.nix} (100%) rename pkgs/{applications/networking/owamp/default.nix => unit/ow/owamp/pkg-fun.nix} (100%) rename pkgs/{development/compilers/owl-lisp/default.nix => unit/ow/owl-lisp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/owl/default.nix => unit/ow/owl/pkg-fun.nix} (100%) rename pkgs/{servers/owncast/default.nix => unit/ow/owncast/pkg-fun.nix} (100%) rename pkgs/{applications/editors/ox/default.nix => unit/ox/ox/pkg-fun.nix} (100%) rename pkgs/{applications/audio/oxefmsynth/default.nix => unit/ox/oxefmsynth/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/ox}/oxidized/Gemfile (100%) rename pkgs/{tools/admin => unit/ox}/oxidized/Gemfile.lock (100%) rename pkgs/{tools/admin => unit/ox}/oxidized/gemset.nix (100%) rename pkgs/{tools/admin/oxidized/default.nix => unit/ox/oxidized/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/oxipng/default.nix => unit/ox/oxipng/pkg-fun.nix} (100%) rename pkgs/{applications/misc/oxker/default.nix => unit/ox/oxker/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/oxtools/default.nix => unit/ox/oxtools/pkg-fun.nix} (100%) rename pkgs/{data/fonts/oxygenfonts/default.nix => unit/ox/oxygenfonts/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/oysttyer/default.nix => unit/oy/oysttyer/pkg-fun.nix} (100%) rename pkgs/{tools/security/p0f/default.nix => unit/p0/p0f/pkg-fun.nix} (100%) rename pkgs/{development/libraries/p11-kit/default.nix => unit/p1/p11-kit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/p2pool/default.nix => unit/p2/p2pool/pkg-fun.nix} (100%) rename pkgs/{applications/video/p2pvc/default.nix => unit/p2/p2pvc/pkg-fun.nix} (100%) rename pkgs/{applications/office/p3x-onenote/default.nix => unit/p3/p3x-onenote/pkg-fun.nix} (100%) rename pkgs/{development/compilers/p4c/default.nix => unit/p4/p4c/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/p4d/default.nix => unit/p4/p4d/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/p4}/p4v/darwin.nix (100%) rename pkgs/{applications/version-management => unit/p4}/p4v/linux.nix (100%) rename pkgs/{applications/version-management/p4v/default.nix => unit/p4/p4v/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/p7zip/default.nix => unit/p7/p7zip/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/p7}/p7zip/setup-hook.sh (100%) rename pkgs/{tools/archivers => unit/p7}/p7zip/update.sh (100%) rename pkgs/{servers/p910nd/default.nix => unit/p9/p910nd/pkg-fun.nix} (100%) rename pkgs/{tools/audio/pa-applet/default.nix => unit/pa/pa_applet/pkg-fun.nix} (100%) rename pkgs/{misc/logging/pacemaker/default.nix => unit/pa/pacemaker/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/pachyderm/default.nix => unit/pa/pachyderm/pkg-fun.nix} (100%) rename pkgs/{development/tools/package-project-cmake/default.nix => unit/pa/package-project-cmake/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/packagekit/default.nix => unit/pa/packagekit/pkg-fun.nix} (100%) rename pkgs/{development/tools/packcc/default.nix => unit/pa/packcc/pkg-fun.nix} (100%) rename pkgs/{development/tools/packer/default.nix => unit/pa/packer/pkg-fun.nix} (100%) rename pkgs/{development/tools/packet-sd/default.nix => unit/pa/packet-sd/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/pa}/packet/deps.nix (100%) rename pkgs/{development/tools/packet/default.nix => unit/pa/packet/pkg-fun.nix} (100%) rename pkgs/{tools/networking/packetdrill/default.nix => unit/pa/packetdrill/pkg-fun.nix} (100%) rename pkgs/{development/libraries/packr/default.nix => unit/pa/packr/pkg-fun.nix} (100%) rename pkgs/{tools/games/minecraft/packwiz/default.nix => unit/pa/packwiz/pkg-fun.nix} (100%) rename pkgs/{tools/package-management => unit/pa}/pacman/dont-create-empty-dirs.patch (100%) rename pkgs/{tools/package-management/pacman/default.nix => unit/pa/pacman/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/pa}/paco/deps.nix (100%) rename pkgs/{development/compilers/paco/default.nix => unit/pa/paco/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pacparser/default.nix => unit/pa/pacparser/pkg-fun.nix} (100%) rename pkgs/{games/pacvim/default.nix => unit/pa/pacvim/pkg-fun.nix} (100%) rename pkgs/{tools/security/padbuster/default.nix => unit/pa/padbuster/pkg-fun.nix} (100%) rename pkgs/{tools/misc/page/default.nix => unit/pa/page/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pagemon/default.nix => unit/pa/pagemon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pagmo2/default.nix => unit/pa/pagmo2/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/pagsuite/default.nix => unit/pa/pagsuite/pkg-fun.nix} (100%) rename pkgs/{development/libraries/paho-mqtt-c/default.nix => unit/pa/paho-mqtt-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/paho-mqtt-cpp/default.nix => unit/pa/paho-mqtt-cpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/pahole/default.nix => unit/pa/pahole/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pal/default.nix => unit/pa/pal/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers => unit/pa}/palemoon/mozconfig (100%) rename pkgs/{applications/networking/browsers/palemoon/default.nix => unit/pa/palemoon/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/palp/default.nix => unit/pa/palp/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/pam-reattach/default.nix => unit/pa/pam-reattach/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_ccreds/default.nix => unit/pa/pam_ccreds/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_gnupg/default.nix => unit/pa/pam_gnupg/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_krb5/default.nix => unit/pa/pam_krb5/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_ldap/default.nix => unit/pa/pam_ldap/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/pa}/pam_mount/insert_utillinux_path_hooks.patch (100%) rename pkgs/{os-specific/linux/pam_mount/default.nix => unit/pa/pam_mount/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_mysql/default.nix => unit/pa/pam_mysql/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_p11/default.nix => unit/pa/pam_p11/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_pgsql/default.nix => unit/pa/pam_pgsql/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/pa}/pam_ssh_agent_auth/edcsa-crash-fix.patch (100%) rename pkgs/{os-specific/linux => unit/pa}/pam_ssh_agent_auth/multiple-key-files.patch (100%) rename pkgs/{os-specific/linux/pam_ssh_agent_auth/default.nix => unit/pa/pam_ssh_agent_auth/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_tmpdir/default.nix => unit/pa/pam_tmpdir/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_u2f/default.nix => unit/pa/pam_u2f/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pam_usb/default.nix => unit/pa/pam_usb/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/pa}/pam_ussh/go.mod (100%) rename pkgs/{os-specific/linux => unit/pa}/pam_ussh/go.sum (100%) rename pkgs/{os-specific/linux/pam_ussh/default.nix => unit/pa/pam_ussh/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pamix/default.nix => unit/pa/pamix/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pamixer/default.nix => unit/pa/pamixer/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/paml/default.nix => unit/pa/paml/pkg-fun.nix} (100%) rename pkgs/{tools/security/pamtester/default.nix => unit/pa/pamtester/pkg-fun.nix} (100%) rename pkgs/{applications/networking/newsreaders => unit/pa}/pan/move-out-of-extern-c.diff (100%) rename pkgs/{applications/networking/newsreaders/pan/default.nix => unit/pa/pan/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pandoc-katex/default.nix => unit/pa/pandoc-katex/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pandoc-lua-filters/default.nix => unit/pa/pandoc-lua-filters/pkg-fun.nix} (100%) rename pkgs/{development/tools/pandoc/default.nix => unit/pa/pandoc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/panoply/default.nix => unit/pa/panoply/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/panopticon/default.nix => unit/pa/panopticon/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/panotools/default.nix => unit/pa/panotools/pkg-fun.nix} (100%) rename pkgs/{desktops/pantheon/third-party => unit/pa}/pantheon-tweaks/fix-paths.patch (100%) rename pkgs/{desktops/pantheon/third-party/pantheon-tweaks/default.nix => unit/pa/pantheon-tweaks/pkg-fun.nix} (100%) rename pkgs/{data/themes/paper-gtk/default.nix => unit/pa/paper-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/paper-icon-theme/default.nix => unit/pa/paper-icon-theme/pkg-fun.nix} (100%) rename pkgs/{applications/office/paper-note/default.nix => unit/pa/paper-note/pkg-fun.nix} (100%) rename pkgs/{tools/security/paperkey/default.nix => unit/pa/paperkey/pkg-fun.nix} (100%) rename pkgs/{applications/office/paperless-ngx/default.nix => unit/pa/paperless-ngx/pkg-fun.nix} (100%) rename pkgs/{tools/misc/paperlike-go/default.nix => unit/pa/paperlike-go/pkg-fun.nix} (100%) rename pkgs/{games/papermc/default.nix => unit/pa/papermc/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/pa}/papertrail/Gemfile (100%) rename pkgs/{tools/text => unit/pa}/papertrail/Gemfile.lock (100%) rename pkgs/{tools/text => unit/pa}/papertrail/gemset.nix (100%) rename pkgs/{tools/text/papertrail/default.nix => unit/pa/papertrail/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/benchmark/papi/default.nix => unit/pa/papi/pkg-fun.nix} (100%) rename pkgs/{data/misc/papirus-folders/default.nix => unit/pa/papirus-folders/pkg-fun.nix} (100%) rename pkgs/{applications/printing/pappl/default.nix => unit/pa/pappl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/paprefs/default.nix => unit/pa/paprefs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/paps/default.nix => unit/pa/paps/pkg-fun.nix} (100%) rename pkgs/{tools/text/par/default.nix => unit/pa/par/pkg-fun.nix} (100%) rename pkgs/{tools/networking/par2cmdline/default.nix => unit/pa/par2cmdline/pkg-fun.nix} (100%) rename pkgs/{tools/misc/parallel/wrapper.nix => unit/pa/parallel-full/pkg-fun.nix} (100%) rename pkgs/{tools/misc/parallel/default.nix => unit/pa/parallel/pkg-fun.nix} (100%) rename pkgs/{data/fonts/parastoo-fonts/default.nix => unit/pa/parastoo-fonts/pkg-fun.nix} (100%) rename pkgs/{data/fonts/paratype-pt/mono.nix => unit/pa/paratype-pt-mono/pkg-fun.nix} (100%) rename pkgs/{data/fonts/paratype-pt/sans.nix => unit/pa/paratype-pt-sans/pkg-fun.nix} (100%) rename pkgs/{data/fonts/paratype-pt/serif.nix => unit/pa/paratype-pt-serif/pkg-fun.nix} (100%) rename pkgs/{data/misc/pari-galdata/default.nix => unit/pa/pari-galdata/pkg-fun.nix} (100%) rename pkgs/{data/misc/pari-seadata-small/default.nix => unit/pa/pari-seadata-small/pkg-fun.nix} (100%) rename pkgs/{development/tools/parinfer-rust/default.nix => unit/pa/parinfer-rust/pkg-fun.nix} (100%) rename pkgs/{applications/audio/parlatype/default.nix => unit/pa/parlatype/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/parmetis/default.nix => unit/pa/parmetis/pkg-fun.nix} (100%) rename pkgs/{tools/misc/parquet-tools/default.nix => unit/pa/parquet-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/parse-cli-bin/default.nix => unit/pa/parse-cli-bin/pkg-fun.nix} (100%) rename pkgs/{applications/misc/parsec/bin.nix => unit/pa/parsec-bin/pkg-fun.nix} (100%) rename pkgs/{tools/security/parsero/default.nix => unit/pa/parsero/pkg-fun.nix} (100%) rename pkgs/{tools/backup/partclone/default.nix => unit/pa/partclone/pkg-fun.nix} (100%) rename pkgs/{tools/misc/parted/default.nix => unit/pa/parted/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/particl-core/default.nix => unit/pa/particl-core/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/pa}/partimage/gentoos-zlib.patch (100%) rename pkgs/{tools/backup/partimage/default.nix => unit/pa/partimage/pkg-fun.nix} (100%) rename pkgs/{development/libraries/partio/default.nix => unit/pa/partio/pkg-fun.nix} (100%) rename pkgs/{shells/pash/default.nix => unit/pa/pash/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pass-secret-service/default.nix => unit/pa/pass-secret-service/pkg-fun.nix} (100%) rename pkgs/{tools/security/passage/default.nix => unit/pa/passage/pkg-fun.nix} (100%) rename pkgs/{development/compilers/passerine/default.nix => unit/pa/passerine/pkg-fun.nix} (100%) rename pkgs/{tools/security/passff-host/default.nix => unit/pa/passff-host/pkg-fun.nix} (100%) rename pkgs/{tools/networking/passh/default.nix => unit/pa/passh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/passky-desktop/default.nix => unit/pa/passky-desktop/pkg-fun.nix} (100%) rename pkgs/{tools/security/passphrase2pgp/default.nix => unit/pa/passphrase2pgp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pastebinit/default.nix => unit/pa/pastebinit/pkg-fun.nix} (100%) rename pkgs/{tools/audio => unit/pa}/pasystray/fix-wayland.patch (100%) rename pkgs/{tools/audio/pasystray/default.nix => unit/pa/pasystray/pkg-fun.nix} (100%) rename pkgs/{development/tools/patatt/default.nix => unit/pa/patatt/pkg-fun.nix} (100%) rename pkgs/{build-support/setup-hooks/patch-ppd-files => unit/pa/patchPpdFilesHook}/patch-ppd-hook.sh (100%) rename pkgs/{build-support/setup-hooks/patch-ppd-files => unit/pa/patchPpdFilesHook}/patch-ppd-lines.awk (100%) rename pkgs/{build-support/setup-hooks/patch-ppd-files/default.nix => unit/pa/patchPpdFilesHook/pkg-fun.nix} (100%) rename pkgs/{build-support/setup-hooks/patch-ppd-files => unit/pa/patchPpdFilesHook}/test.nix (100%) rename pkgs/{build-support/setup-hooks/patch-ppd-files => unit/pa/patchPpdFilesHook}/test.ppd (100%) rename pkgs/{applications/audio/patchage/default.nix => unit/pa/patchage/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pathvector/default.nix => unit/pa/pathvector/pkg-fun.nix} (100%) rename pkgs/{tools/audio/patray/default.nix => unit/pa/patray/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/patsh/default.nix => unit/pa/patsh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pattypan/default.nix => unit/pa/pattypan/pkg-fun.nix} (100%) rename pkgs/{applications/audio/paulstretch/default.nix => unit/pa/paulstretch/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pavucontrol/default.nix => unit/pa/pavucontrol/pkg-fun.nix} (100%) rename pkgs/{development/tools/pax-rs/default.nix => unit/pa/pax-rs/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pax-utils/default.nix => unit/pa/pax-utils/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/paxctl/default.nix => unit/pa/paxctl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/pa}/paxctl/setup-hook.sh (100%) rename pkgs/{os-specific/linux/paxtest/default.nix => unit/pa/paxtest/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/payload_dumper/default.nix => unit/pa/payload_dumper/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pazi/default.nix => unit/pa/pazi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pb_cli/default.nix => unit/pb/pb_cli/pkg-fun.nix} (100%) rename pkgs/{tools/text/pbgopy/default.nix => unit/pb/pbgopy/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/pb}/pbrt/openexr-cmake-3.12.patch (100%) rename pkgs/{applications/graphics/pbrt/default.nix => unit/pb/pbrt/pkg-fun.nix} (100%) rename pkgs/{tools/compression/pbzip2/default.nix => unit/pb/pbzip2/pkg-fun.nix} (100%) rename pkgs/{tools/compression/pbzx/default.nix => unit/pb/pbzx/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/pcalc/default.nix => unit/pc/pcalc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pcapc/default.nix => unit/pc/pcapc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pcapfix/default.nix => unit/pc/pcapfix/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pcaudiolib/default.nix => unit/pc/pcaudiolib/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/pcb/default.nix => unit/pc/pcb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pcb2gcode/default.nix => unit/pc/pcb2gcode/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/pcem/default.nix => unit/pc/pcem/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pcg-c/default.nix => unit/pc/pcg_c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pcg-c => unit/pc/pcg_c}/prefix-variable.patch (100%) rename pkgs/{os-specific/linux/pcimem/default.nix => unit/pc/pcimem/pkg-fun.nix} (100%) rename pkgs/{applications/networking/pcloud/default.nix => unit/pc/pcloud/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pcm/default.nix => unit/pc/pcm/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/pcmanfm/default.nix => unit/pc/pcmanfm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pcmanx-gtk2/default.nix => unit/pc/pcmanx-gtk2/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pcmciautils/default.nix => unit/pc/pcmciaUtils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pcmsolver/default.nix => unit/pc/pcmsolver/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pcp/default.nix => unit/pc/pcp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pcre/default.nix => unit/pc/pcre/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/pc}/pcre/stacksize-detection.patch (100%) rename pkgs/{development/libraries/pcre2/default.nix => unit/pc/pcre2/pkg-fun.nix} (100%) rename pkgs/{tools/security/pcsc-cyberjack/default.nix => unit/pc/pcsc-cyberjack/pkg-fun.nix} (100%) rename pkgs/{tools/security/pcsc-safenet/default.nix => unit/pc/pcsc-safenet/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/pc}/pcsc-scm-scl011/eid.patch (100%) rename pkgs/{tools/security/pcsc-scm-scl011/default.nix => unit/pc/pcsc-scm-scl011/pkg-fun.nix} (100%) rename pkgs/{tools/security/pcsctools/default.nix => unit/pc/pcsctools/pkg-fun.nix} (100%) rename pkgs/{tools/system/pcstat/default.nix => unit/pc/pcstat/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/pc}/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch (100%) rename pkgs/{applications/emulators/pcsxr/default.nix => unit/pc/pcsxr/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/pc}/pcsxr/uncompress2.patch (100%) rename pkgs/{development/libraries/pdal/default.nix => unit/pd/pdal/pkg-fun.nix} (100%) rename pkgs/{development/php-packages/pdepend/default.nix => unit/pd/pdepend/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pdf-parser/default.nix => unit/pd/pdf-parser/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pdf-quench/default.nix => unit/pd/pdf-quench/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/pdf2djvu/default.nix => unit/pd/pdf2djvu/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/pdf2odt/default.nix => unit/pd/pdf2odt/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting => unit/pd}/pdf2odt/use_mktemp.patch (100%) rename pkgs/{tools/graphics/pdf2svg/default.nix => unit/pd/pdf2svg/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/pd}/pdf2xml/pdf2xml.patch (100%) rename pkgs/{development/libraries/pdf2xml/default.nix => unit/pd/pdf2xml/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pdfarranger/default.nix => unit/pd/pdfarranger/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/pdfchain/default.nix => unit/pd/pdfchain/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pdfcpu/default.nix => unit/pd/pdfcpu/pkg-fun.nix} (100%) rename pkgs/{tools/security/pdfcrack/default.nix => unit/pd/pdfcrack/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pdfdiff/default.nix => unit/pd/pdfdiff/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/pdfgrep/default.nix => unit/pd/pdfgrep/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pdfsam-basic/default.nix => unit/pd/pdfsam-basic/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/pdfsandwich/default.nix => unit/pd/pdfsandwich/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pdfslicer/default.nix => unit/pd/pdfslicer/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pdftag/default.nix => unit/pd/pdftag/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/pdftk/default.nix => unit/pd/pdftk/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pdftoipe/default.nix => unit/pd/pdftoipe/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/pdm/default.nix => unit/pd/pdm/pkg-fun.nix} (100%) rename pkgs/{servers/dns/pdns-recursor/default.nix => unit/pd/pdns-recursor/pkg-fun.nix} (100%) rename pkgs/{servers/dns/pdns/default.nix => unit/pd/pdns/pkg-fun.nix} (100%) rename pkgs/{servers/dns => unit/pd}/pdns/version.patch (100%) rename pkgs/{tools/networking/pdnsd/default.nix => unit/pd/pdnsd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pe-parse/default.nix => unit/pe/pe-parse/pkg-fun.nix} (100%) rename pkgs/{tools/admin/pebble/default.nix => unit/pe/pebble/pkg-fun.nix} (100%) rename pkgs/{data/fonts/pecita/default.nix => unit/pe/pecita/pkg-fun.nix} (100%) rename pkgs/{tools/text/peco/default.nix => unit/pe/peco/pkg-fun.nix} (100%) rename pkgs/{applications/video/peek/default.nix => unit/pe/peek/pkg-fun.nix} (100%) rename pkgs/{tools/misc/peep/default.nix => unit/pe/peep/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/peering-manager/default.nix => unit/pe/peering-manager/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/pe}/peering-manager/redis-unix-sock.patch (100%) rename pkgs/{development/tools/parsing/peg/default.nix => unit/pe/peg/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pell/default.nix => unit/pe/pell/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pencil/default.nix => unit/pe/pencil/pkg-fun.nix} (100%) rename pkgs/{data/fonts/penna/default.nix => unit/pe/penna/pkg-fun.nix} (100%) rename pkgs/{tools/misc/perccli/default.nix => unit/pe/perccli/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/perceptualdiff/default.nix => unit/pe/perceptualdiff/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/perf-tools/default.nix => unit/pe/perf-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/perfect-hash/default.nix => unit/pe/perfect-hash/pkg-fun.nix} (100%) rename pkgs/{games => unit/pe}/performous/performous-cmake.patch (100%) rename pkgs/{games => unit/pe}/performous/performous-fftw.patch (100%) rename pkgs/{games/performous/default.nix => unit/pe/performous/pkg-fun.nix} (100%) rename pkgs/{applications/misc/perkeep/default.nix => unit/pe/perkeep/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/perseus/default.nix => unit/pe/perseus/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/peru/default.nix => unit/pe/peru/pkg-fun.nix} (100%) rename pkgs/{development/tools/pet/default.nix => unit/pe/pet/pkg-fun.nix} (100%) rename pkgs/{servers/mail/petidomo/default.nix => unit/pe/petidomo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/petsc/default.nix => unit/pe/petsc/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/pev/default.nix => unit/pe/pev/pkg-fun.nix} (100%) rename pkgs/{development/tools/pew/default.nix => unit/pe/pew/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pferd/default.nix => unit/pf/pferd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pfetch/default.nix => unit/pf/pfetch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pffft/default.nix => unit/pf/pffft/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pflask/default.nix => unit/pf/pflask/pkg-fun.nix} (100%) rename pkgs/{servers/mail/postfix/pflogsumm.nix => unit/pf/pflogsumm/pkg-fun.nix} (100%) rename pkgs/{development/compilers/pforth/default.nix => unit/pf/pforth/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pfsshell/default.nix => unit/pf/pfsshell/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/pg_activity/default.nix => unit/pg/pg_activity/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/pg_checksums/default.nix => unit/pg/pg_checksums/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/pg_featureserv/default.nix => unit/pg/pg_featureserv/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pg_flame/default.nix => unit/pg/pg_flame/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/pg_tileserv/default.nix => unit/pg/pg_tileserv/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pg_top/default.nix => unit/pg/pg_top/pkg-fun.nix} (100%) rename pkgs/{tools/backup/pgbackrest/default.nix => unit/pg/pgbackrest/pkg-fun.nix} (100%) rename pkgs/{servers/sql/pgbouncer/default.nix => unit/pg/pgbouncer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pgcenter/default.nix => unit/pg/pgcenter/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgf-pie.nix => unit/pg/pgf-pie/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix => unit/pg/pgf-umlcd/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix => unit/pg/pgf-umlsd/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgf-1.x.nix => unit/pg/pgf1/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgf-2.x.nix => unit/pg/pgf2/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgf-3.x.nix => unit/pg/pgf3/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pgf/default.nix => unit/pg/pgf_graphics/pkg-fun.nix} (100%) rename pkgs/{development/tools/pgformatter/default.nix => unit/pg/pgformatter/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pgf-tikz/pgfplots.nix => unit/pg/pgfplots/pkg-fun.nix} (100%) rename pkgs/{development/tools/pgloader/default.nix => unit/pg/pgloader/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pgmanage/default.nix => unit/pg/pgmanage/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pgmetrics/default.nix => unit/pg/pgmetrics/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/pgo-client/default.nix => unit/pg/pgo-client/pkg-fun.nix} (100%) rename pkgs/{tools/security/pgpdump/default.nix => unit/pg/pgpdump/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/pgpkeyserver-lite/default.nix => unit/pg/pgpkeyserver-lite/pkg-fun.nix} (100%) rename pkgs/{servers/sql/pgpool/default.nix => unit/pg/pgpool/pkg-fun.nix} (100%) rename pkgs/{development/tools/database => unit/pg}/pgsync/Gemfile (100%) rename pkgs/{development/tools/database => unit/pg}/pgsync/Gemfile.lock (100%) rename pkgs/{development/tools/database => unit/pg}/pgsync/gemset.nix (100%) rename pkgs/{development/tools/database/pgsync/default.nix => unit/pg/pgsync/pkg-fun.nix} (100%) rename pkgs/{development/tools/pgtop/default.nix => unit/pg/pgtop/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/pgweb/default.nix => unit/pg/pgweb/pkg-fun.nix} (100%) rename pkgs/{development/pharo/launcher/default.nix => unit/ph/pharo-launcher/pkg-fun.nix} (100%) rename pkgs/{development/libraries/phash/default.nix => unit/ph/phash/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/phd2/default.nix => unit/ph/phd2/pkg-fun.nix} (100%) rename pkgs/{data/icons/phinger-cursors/default.nix => unit/ph/phinger-cursors/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ph}/phoc/0001-handle-outputs-that-arent-in-the-layout.patch (100%) rename pkgs/{applications/misc/phoc/default.nix => unit/ph/phoc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/phockup/default.nix => unit/ph/phockup/pkg-fun.nix} (100%) rename pkgs/{tools/networking/phodav/default.nix => unit/ph/phodav/pkg-fun.nix} (100%) rename pkgs/{tools/networking/phodav/2.0.nix => unit/ph/phodav_2_0/pkg-fun.nix} (100%) rename pkgs/{tools/misc/phoronix-test-suite/default.nix => unit/ph/phoronix-test-suite/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ph}/phoronix-test-suite/tests.nix (100%) rename pkgs/{applications/window-managers/phosh/phosh-mobile-settings.nix => unit/ph/phosh-mobile-settings/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/phosh/default.nix => unit/ph/phosh/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/ph}/photoflow/CMakeLists.patch (100%) rename pkgs/{applications/graphics => unit/ph}/photoflow/fix-build.patch (100%) rename pkgs/{applications/graphics/photoflow/default.nix => unit/ph/photoflow/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/photon/default.nix => unit/ph/photon-rss/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/ph}/photon/destdir.patch (100%) rename pkgs/{tools/networking/photon/default.nix => unit/ph/photon/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ph}/photoprism/backend.nix (100%) rename pkgs/{servers => unit/ph}/photoprism/frontend.nix (100%) rename pkgs/{servers => unit/ph}/photoprism/libtensorflow.nix (100%) rename pkgs/{servers/photoprism/default.nix => unit/ph/photoprism/pkg-fun.nix} (100%) rename pkgs/{tools/misc/phrase-cli/default.nix => unit/ph/phrase-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/phrasendrescher/default.nix => unit/ph/phrasendrescher/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/phylactery/default.nix => unit/ph/phylactery/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/physlock/default.nix => unit/ph/physlock/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pianobar/default.nix => unit/pi/pianobar/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pianoteq/default.nix => unit/pi/pianoteq/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/picard-tools/default.nix => unit/pi/picard-tools/pkg-fun.nix} (100%) rename pkgs/{applications/audio/picard/default.nix => unit/pi/picard/pkg-fun.nix} (100%) rename pkgs/{development/compilers/picat/default.nix => unit/pi/picat/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pick/default.nix => unit/pi/pick/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pico-sdk/default.nix => unit/pi/pico-sdk/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/picoc/default.nix => unit/pi/picoc/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/picolisp/default.nix => unit/pi/picolisp/pkg-fun.nix} (100%) rename pkgs/{applications/audio/picoloop/default.nix => unit/pi/picoloop/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/picom/picom-jonaburg.nix => unit/pi/picom-jonaburg/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/picom/picom-next.nix => unit/pi/picom-next/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/picom/default.nix => unit/pi/picom/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/picosat/default.nix => unit/pi/picosat/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/picoscope/default.nix => unit/pi/picoscope/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/pi}/picoscope/sources.json (100%) rename pkgs/{applications/science/electronics => unit/pi}/picoscope/update.py (100%) rename pkgs/{development/tools/picotool/default.nix => unit/pi/picotool/pkg-fun.nix} (100%) rename pkgs/{tools/audio/picotts/default.nix => unit/pi/picotts/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix => unit/pi/pidgin-carbons/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix => unit/pi/pidgin-indicator/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix => unit/pi/pidgin-mra/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix => unit/pi/pidgin-msn-pecan/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix => unit/pi/pidgin-opensteamworks/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix => unit/pi/pidgin-osd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/otr/default.nix => unit/pi/pidgin-otr/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix => unit/pi/pidgin-sipe/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix => unit/pi/pidgin-skypeweb/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix => unit/pi/pidgin-window-merge/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix => unit/pi/pidgin-xmpp-receipts/pkg-fun.nix} (100%) rename pkgs/{servers/pies/default.nix => unit/pi/pies/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/pig/default.nix => unit/pi/pig/pkg-fun.nix} (100%) rename pkgs/{development/tools/pigeon/default.nix => unit/pi/pigeon/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/piglit/default.nix => unit/pi/piglit/pkg-fun.nix} (100%) rename pkgs/{tools/compression/pigz/default.nix => unit/pi/pigz/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/pijul/default.nix => unit/pi/pijul/pkg-fun.nix} (100%) rename pkgs/{applications/backup => unit/pi}/pika-backup/borg-path.patch (100%) rename pkgs/{applications/backup/pika-backup/default.nix => unit/pi/pika-backup/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pika/default.nix => unit/pi/pika/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pikchr/default.nix => unit/pi/pikchr/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pikopixel/default.nix => unit/pi/pikopixel/pkg-fun.nix} (100%) rename pkgs/{servers/pim6sd/default.nix => unit/pi/pim6sd/pkg-fun.nix} (100%) rename pkgs/{games/pinball/default.nix => unit/pi/pinball/pkg-fun.nix} (100%) rename pkgs/{tools/security/pinentry-bemenu/default.nix => unit/pi/pinentry-bemenu/pkg-fun.nix} (100%) rename pkgs/{tools/security/pinentry-rofi/default.nix => unit/pi/pinentry-rofi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pinfo/default.nix => unit/pi/pinfo/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pingtcp/default.nix => unit/pi/pingtcp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pingu/default.nix => unit/pi/pingu/pkg-fun.nix} (100%) rename pkgs/{games/pingus/default.nix => unit/pi/pingus/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/pinniped/default.nix => unit/pi/pinniped/pkg-fun.nix} (100%) rename pkgs/{servers/pinnwand/default.nix => unit/pi/pinnwand/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pinocchio/default.nix => unit/pi/pinocchio/pkg-fun.nix} (100%) rename pkgs/{applications/office/pinpoint/default.nix => unit/pi/pinpoint/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pinsel/default.nix => unit/pi/pinsel/pkg-fun.nix} (100%) rename pkgs/{applications/graphics => unit/pi}/pinta/deps.nix (100%) rename pkgs/{applications/graphics/pinta/default.nix => unit/pi/pinta/pkg-fun.nix} (100%) rename pkgs/{games/pioneer/default.nix => unit/pi/pioneer/pkg-fun.nix} (100%) rename pkgs/{games/pioneers/default.nix => unit/pi/pioneers/pkg-fun.nix} (100%) rename pkgs/{development/tools/pip-audit/default.nix => unit/pi/pip-audit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pipe-rename/default.nix => unit/pi/pipe-rename/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pipectl/default.nix => unit/pi/pipectl/pkg-fun.nix} (100%) rename pkgs/{development/tools/pipenv/default.nix => unit/pi/pipenv/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/piper/default.nix => unit/pi/piper/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/pipes-rs/default.nix => unit/pi/pipes-rs/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/pipes/default.nix => unit/pi/pipes/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pipewire/0.2.nix => unit/pi/pipewire_0_2/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pipework/default.nix => unit/pi/pipework/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pipr/default.nix => unit/pi/pipr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pipreqs/default.nix => unit/pi/pipreqs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pirate-get/default.nix => unit/pi/pirate-get/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pistol/default.nix => unit/pi/pistol/pkg-fun.nix} (100%) rename pkgs/{data/themes/pitch-black/default.nix => unit/pi/pitch-black/pkg-fun.nix} (100%) rename pkgs/{applications/video/pitivi/default.nix => unit/pi/pitivi/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/pi}/pitivi/prevent-closure-contamination.patch (100%) rename pkgs/{tools/security/pius/default.nix => unit/pi/pius/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pixd/default.nix => unit/pi/pixd/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pixelnuke/default.nix => unit/pi/pixelnuke/pkg-fun.nix} (100%) rename pkgs/{applications/editors/pixelorama/default.nix => unit/pi/pixelorama/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pixeluvo/default.nix => unit/pi/pixeluvo/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pixiecore/default.nix => unit/pi/pixiecore/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pixiewps/default.nix => unit/pi/pixiewps/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pixman/default.nix => unit/pi/pixman/pkg-fun.nix} (100%) rename pkgs/{tools/compression/pixz/default.nix => unit/pi/pixz/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pizarra/default.nix => unit/pi/pizarra/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pk2cmd/default.nix => unit/pk/pk2cmd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pkcs11helper/default.nix => unit/pk/pkcs11helper/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/pkg-config => unit/pk/pkg-config-unwrapped}/2.36.3-not-win32.patch (100%) rename pkgs/{development/tools/misc/pkg-config/default.nix => unit/pk/pkg-config-unwrapped/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/pkg-config => unit/pk/pkg-config-unwrapped}/requires-private.patch (100%) rename pkgs/{development/tools/misc/pkgconf/default.nix => unit/pk/pkgconf-unwrapped/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pkgdiff/default.nix => unit/pk/pkgdiff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pkger/default.nix => unit/pk/pkger/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/planarity/default.nix => unit/pl/planarity/pkg-fun.nix} (100%) rename pkgs/{games/planetaryannihilation/default.nix => unit/pl/planetary_annihilation/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/pl}/plank/hide-in-pantheon.patch (100%) rename pkgs/{applications/misc/plank/default.nix => unit/pl/plank/pkg-fun.nix} (100%) rename pkgs/{data/themes/plano/default.nix => unit/pl/plano-theme/pkg-fun.nix} (100%) rename pkgs/{tools/misc/plantuml/plantuml-c4.nix => unit/pl/plantuml-c4/pkg-fun.nix} (100%) rename pkgs/{tools/misc/plantuml-server/default.nix => unit/pl/plantuml-server/pkg-fun.nix} (100%) rename pkgs/{tools/misc/plantuml/default.nix => unit/pl/plantuml/pkg-fun.nix} (100%) rename pkgs/{misc/plasma-hud/default.nix => unit/pl/plasma-hud/pkg-fun.nix} (100%) rename pkgs/{data/themes/plasma-overdose-kde-theme/default.nix => unit/pl/plasma-overdose-kde-theme/pkg-fun.nix} (100%) rename pkgs/{development/libraries/platform-folders/default.nix => unit/pl/platform-folders/pkg-fun.nix} (100%) rename pkgs/{misc/platformsh/default.nix => unit/pl/platformsh/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/pl}/platinum-searcher/deps.nix (100%) rename pkgs/{tools/text/platinum-searcher/default.nix => unit/pl/platinum-searcher/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/platypus/default.nix => unit/pl/platypus/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/pl}/plausible/package.json (100%) rename pkgs/{servers/web-apps/plausible/default.nix => unit/pl/plausible/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/pl}/plausible/update.sh (100%) rename pkgs/{servers/web-apps => unit/pl}/plausible/yarn.lock (100%) rename pkgs/{servers/web-apps => unit/pl}/plausible/yarn.nix (100%) rename pkgs/{tools/video/play-with-mpv/default.nix => unit/pl/play-with-mpv/pkg-fun.nix} (100%) rename pkgs/{tools/audio/playerctl/default.nix => unit/pl/playerctl/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/pl}/please/nixos-specific.patch (100%) rename pkgs/{tools/security/please/default.nix => unit/pl/please/pkg-fun.nix} (100%) rename pkgs/{tools/security/plecost/default.nix => unit/pl/plecost/pkg-fun.nix} (100%) rename pkgs/{servers => unit/pl}/pleroma/mix.nix (100%) rename pkgs/{servers/pleroma/default.nix => unit/pl/pleroma/pkg-fun.nix} (100%) rename pkgs/{servers/plex/default.nix => unit/pl/plex/pkg-fun.nix} (100%) rename pkgs/{servers/plex/raw.nix => unit/pl/plexRaw/pkg-fun.nix} (100%) rename pkgs/{applications/audio/plexamp/default.nix => unit/pl/plexamp/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/pl}/plexamp/update-plexamp.sh (100%) rename pkgs/{development/libraries/plib/default.nix => unit/pl/plib/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/plink-ng/default.nix => unit/pl/plink-ng/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin => unit/pl}/plistwatch/go-modules.patch (100%) rename pkgs/{os-specific/darwin/plistwatch/default.nix => unit/pl/plistwatch/pkg-fun.nix} (100%) rename pkgs/{applications/science/programming/plm/default.nix => unit/pl/plm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/plocate/default.nix => unit/pl/plocate/pkg-fun.nix} (100%) rename pkgs/{tools/misc/plotinus/default.nix => unit/pl/plotinus/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/pl}/plotutils/debian-patches.nix (100%) rename pkgs/{tools/graphics => unit/pl}/plotutils/debian-patches.txt (100%) rename pkgs/{tools/graphics/plotutils/default.nix => unit/pl/plotutils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/plowshare/default.nix => unit/pl/plowshare/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pls/default.nix => unit/pl/pls/pkg-fun.nix} (100%) rename pkgs/{applications/audio/plugin-torture/default.nix => unit/pl/plugin-torture/pkg-fun.nix} (100%) rename pkgs/{applications/audio/plujain-ramp/default.nix => unit/pl/plujain-ramp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/pluto/default.nix => unit/pl/pluto/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/plymouth/default.nix => unit/pl/plymouth/pkg-fun.nix} (100%) rename pkgs/{tools/compression/plzip/default.nix => unit/pl/plzip/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pmacct/default.nix => unit/pm/pmacct/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/pm}/pmccabe/getopt_on_darwin.patch (100%) rename pkgs/{development/tools/misc/pmccabe/default.nix => unit/pm/pmccabe/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pmdk/default.nix => unit/pm/pmdk/pkg-fun.nix} (100%) rename pkgs/{tools/X11/pmenu/default.nix => unit/pm/pmenu/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pmidi/default.nix => unit/pm/pmidi/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pmix/default.nix => unit/pm/pmix/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pmount/default.nix => unit/pm/pmount/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pms/default.nix => unit/pm/pms/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pm-utils/default.nix => unit/pm/pmutils/pkg-fun.nix} (100%) rename pkgs/{tools/text/pn/default.nix => unit/pn/pn/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngcheck/default.nix => unit/pn/pngcheck/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngcrush/default.nix => unit/pn/pngcrush/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngloss/default.nix => unit/pn/pngloss/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngnq/default.nix => unit/pn/pngnq/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngoptimizer/default.nix => unit/pn/pngoptimizer/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngout/default.nix => unit/pn/pngout/pkg-fun.nix} (100%) rename pkgs/{development/libraries/png++/default.nix => unit/pn/pngpp/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngquant/default.nix => unit/pn/pngquant/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pngtools/default.nix => unit/pn/pngtools/pkg-fun.nix} (100%) rename pkgs/{tools/audio/pnmixer/default.nix => unit/pn/pnmixer/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pocket-casts/default.nix => unit/po/pocket-casts/pkg-fun.nix} (100%) rename pkgs/{servers/pocketbase/default.nix => unit/po/pocketbase/pkg-fun.nix} (100%) rename pkgs/{development/libraries/poco/default.nix => unit/po/poco/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pod2mdoc/default.nix => unit/po/pod2mdoc/pkg-fun.nix} (100%) rename pkgs/{servers/misc/podgrab/default.nix => unit/po/podgrab/pkg-fun.nix} (100%) rename pkgs/{tools/text/podiff/default.nix => unit/po/podiff/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/podman-tui/default.nix => unit/po/podman-tui/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/podman/default.nix => unit/po/podman-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/podman => unit/po/podman-unwrapped}/rm-podman-mac-helper-msg.patch (100%) rename pkgs/{applications/virtualization/podman/wrapper.nix => unit/po/podman/pkg-fun.nix} (100%) rename pkgs/{development/libraries/podofo/default.nix => unit/po/podofo/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/pods/default.nix => unit/po/pods/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/poetry/default.nix => unit/po/poetry/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/poetry2conda/default.nix => unit/po/poetry2conda/pkg-fun.nix} (100%) rename pkgs/{applications/editors/poke/default.nix => unit/po/poke/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pokemon-colorscripts-mac/default.nix => unit/po/pokemon-colorscripts-mac/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pokemonsay/default.nix => unit/po/pokemonsay/pkg-fun.nix} (100%) rename pkgs/{games/pokete/default.nix => unit/po/pokete/pkg-fun.nix} (100%) rename pkgs/{applications/misc/polar-bookshelf/default.nix => unit/po/polar-bookshelf/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/po}/polar/Gemfile (100%) rename pkgs/{tools/misc => unit/po}/polar/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/po}/polar/gemset.nix (100%) rename pkgs/{tools/misc/polar/default.nix => unit/po/polar/pkg-fun.nix} (100%) rename pkgs/{servers/polaris/default.nix => unit/po/polaris/pkg-fun.nix} (100%) rename pkgs/{servers => unit/po}/polaris/update.sh (100%) rename pkgs/{os-specific/linux/policycoreutils/default.nix => unit/po/policycoreutils/pkg-fun.nix} (100%) rename pkgs/{servers/polipo/default.nix => unit/po/polipo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/polkit/default.nix => unit/po/polkit/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/po}/polkit/system_bus.conf (100%) rename pkgs/{tools/security/polkit-gnome/default.nix => unit/po/polkit_gnome/pkg-fun.nix} (100%) rename pkgs/{tools/security/polkit-gnome => unit/po/polkit_gnome}/polkit-gnome-authentication-agent-1.desktop (100%) rename pkgs/{data/fonts/poly/default.nix => unit/po/poly/pkg-fun.nix} (100%) rename pkgs/{development/libraries/poly2tri-c/default.nix => unit/po/poly2tri-c/pkg-fun.nix} (100%) rename pkgs/{tools/networking/polygraph/default.nix => unit/po/polygraph/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/polylith/default.nix => unit/po/polylith/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/polymake/default.nix => unit/po/polymake/pkg-fun.nix} (100%) rename pkgs/{development/compilers/polyml/default.nix => unit/po/polyml/pkg-fun.nix} (100%) rename pkgs/{development/compilers/polyml/5.6.nix => unit/po/polyml56/pkg-fun.nix} (100%) rename pkgs/{development/compilers/polyml => unit/po/polyml57}/5.7-new-libffi-FFI_SYSV.patch (100%) rename pkgs/{development/compilers/polyml/5.7.nix => unit/po/polyml57/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/polypane/default.nix => unit/po/polypane/pkg-fun.nix} (100%) rename pkgs/{data/misc/polytopes_db/default.nix => unit/po/polytopes_db/pkg-fun.nix} (100%) rename pkgs/{tools/security/pomerium-cli/default.nix => unit/po/pomerium-cli/pkg-fun.nix} (100%) rename pkgs/{servers/http => unit/po}/pomerium/external-envoy.diff (100%) rename pkgs/{servers/http/pomerium/default.nix => unit/po/pomerium/pkg-fun.nix} (100%) rename pkgs/{servers/http => unit/po}/pomerium/pomerium-ui-package.json (100%) rename pkgs/{os-specific/linux/pommed-light/default.nix => unit/po/pommed_light/pkg-fun.nix} (100%) rename pkgs/{tools/text/pomsky/default.nix => unit/po/pomsky/pkg-fun.nix} (100%) rename pkgs/{games/pong3d/default.nix => unit/po/pong3d/pkg-fun.nix} (100%) rename pkgs/{development/compilers/ponyc/pony-corral.nix => unit/po/pony-corral/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ponymix/default.nix => unit/po/ponymix/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ponysay/default.nix => unit/po/ponysay/pkg-fun.nix} (100%) rename pkgs/{data/themes/pop-gtk/default.nix => unit/po/pop-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/po}/popa3d/enable-standalone-mode.patch (100%) rename pkgs/{servers/mail => unit/po}/popa3d/fix-mail-spool-path.patch (100%) rename pkgs/{servers/mail/popa3d/default.nix => unit/po/popa3d/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/po}/popa3d/use-glibc-crypt.patch (100%) rename pkgs/{servers/mail => unit/po}/popa3d/use-openssl.patch (100%) rename pkgs/{applications/video/popcorntime/default.nix => unit/po/popcorntime/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/popeye/default.nix => unit/po/popeye/pkg-fun.nix} (100%) rename pkgs/{tools/text/popfile/default.nix => unit/po/popfile/pkg-fun.nix} (100%) rename pkgs/{development/libraries/popl/default.nix => unit/po/popl/pkg-fun.nix} (100%) rename pkgs/{data/misc/poppler-data/default.nix => unit/po/poppler_data/pkg-fun.nix} (100%) rename pkgs/{tools/misc/popsicle/default.nix => unit/po/popsicle/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/po}/popt/1.16-cygwin.patch (100%) rename pkgs/{development/libraries => unit/po}/popt/1.16-vpath.patch (100%) rename pkgs/{development/libraries/popt/default.nix => unit/po/popt/pkg-fun.nix} (100%) rename pkgs/{tools/networking/popura/default.nix => unit/po/popura/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/poretools/default.nix => unit/po/poretools/pkg-fun.nix} (100%) rename pkgs/{build-support/portable-service/default.nix => unit/po/portableService/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/portfolio-filemanager/default.nix => unit/po/portfolio-filemanager/pkg-fun.nix} (100%) rename pkgs/{games/portmod/default.nix => unit/po/portmod/pkg-fun.nix} (100%) rename pkgs/{servers/portunus/default.nix => unit/po/portunus/pkg-fun.nix} (100%) rename pkgs/{applications/misc/posterazor/default.nix => unit/po/posterazor/pkg-fun.nix} (100%) rename pkgs/{servers/mail/postfix/default.nix => unit/po/postfix/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/po}/postfix/post-install-script.patch (100%) rename pkgs/{servers/mail => unit/po}/postfix/postfix-3.0-no-warnings.patch (100%) rename pkgs/{servers/mail => unit/po}/postfix/postfix-script-shell.patch (100%) rename pkgs/{servers/mail => unit/po}/postfix/relative-symlinks.patch (100%) rename pkgs/{servers/mail => unit/po}/postfix/update.sh (100%) rename pkgs/{servers/postfixadmin/default.nix => unit/po/postfixadmin/pkg-fun.nix} (100%) rename pkgs/{build-support/setup-hooks/postgresql-test-hook/default.nix => unit/po/postgresqlTestHook/pkg-fun.nix} (100%) rename pkgs/{build-support/setup-hooks/postgresql-test-hook => unit/po/postgresqlTestHook}/postgresql-test-hook.sh (100%) rename pkgs/{build-support/setup-hooks/postgresql-test-hook => unit/po/postgresqlTestHook}/test.nix (100%) rename pkgs/{development/java-modules/postgresql_jdbc/default.nix => unit/po/postgresql_jdbc/pkg-fun.nix} (100%) rename pkgs/{servers/mail/postgrey/default.nix => unit/po/postgrey/pkg-fun.nix} (100%) rename pkgs/{development/tools/postiats-utilities/default.nix => unit/po/postiats-utilities/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/po}/postman/darwin.nix (100%) rename pkgs/{development/web => unit/po}/postman/linux.nix (100%) rename pkgs/{development/web/postman/default.nix => unit/po/postman/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/postscript-lexmark/default.nix => unit/po/postscript-lexmark/pkg-fun.nix} (100%) rename pkgs/{servers/mail/postsrsd/default.nix => unit/po/postsrsd/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/potrace/default.nix => unit/po/potrace/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pouf/default.nix => unit/po/pouf/pkg-fun.nix} (100%) rename pkgs/{servers/pounce/default.nix => unit/po/pounce/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/power-calibrate/default.nix => unit/po/power-calibrate/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/power-profiles-daemon/default.nix => unit/po/power-profiles-daemon/pkg-fun.nix} (100%) rename pkgs/{tools/misc/poweralertd/default.nix => unit/po/poweralertd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/powercap/default.nix => unit/po/powercap/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/po}/powerdns-admin/package.json (100%) rename pkgs/{applications/networking/powerdns-admin/default.nix => unit/po/powerdns-admin/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/po}/powerdns-admin/update-asset-deps.sh (100%) rename pkgs/{applications/networking => unit/po}/powerdns-admin/yarndeps.nix (100%) rename pkgs/{data/fonts/powerline-fonts/default.nix => unit/po/powerline-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/misc/powerline-go/default.nix => unit/po/powerline-go/pkg-fun.nix} (100%) rename pkgs/{data/fonts/powerline-symbols/default.nix => unit/po/powerline-symbols/pkg-fun.nix} (100%) rename pkgs/{games/powermanga/default.nix => unit/po/powermanga/pkg-fun.nix} (100%) rename pkgs/{shells => unit/po}/powershell/getHashes.sh (100%) rename pkgs/{shells/powershell/default.nix => unit/po/powershell/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/powerstat/default.nix => unit/po/powerstat/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/powertop/default.nix => unit/po/powertop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ppl/default.nix => unit/pp/ppl/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/pplatex/default.nix => unit/pp/pplatex/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/pp}/ppp/nix-purity.patch (100%) rename pkgs/{tools/networking => unit/pp}/ppp/nonpriv.patch (100%) rename pkgs/{tools/networking/ppp/default.nix => unit/pp/ppp/pkg-fun.nix} (100%) rename pkgs/{development/tools/profiling/pprof/default.nix => unit/pp/pprof/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pps-tools/default.nix => unit/pp/pps-tools/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/ppsspp/default.nix => unit/pp/ppsspp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pptp/default.nix => unit/pp/pptp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pptpd/default.nix => unit/pp/pptpd/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pqiv/default.nix => unit/pq/pqiv/pkg-fun.nix} (100%) rename pkgs/{development/tools/pqrs/default.nix => unit/pq/pqrs/pkg-fun.nix} (100%) rename pkgs/{servers/pr-tracker/default.nix => unit/pr/pr-tracker/pkg-fun.nix} (100%) rename pkgs/{applications/audio/praat/default.nix => unit/pr/praat/pkg-fun.nix} (100%) rename pkgs/{servers => unit/pr}/prayer/install.patch (100%) rename pkgs/{servers/prayer/default.nix => unit/pr/prayer/pkg-fun.nix} (100%) rename pkgs/{games/prboom-plus/default.nix => unit/pr/prboom-plus/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/pr}/pre-commit/hook-tmpl.patch (100%) rename pkgs/{tools/misc => unit/pr}/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch (100%) rename pkgs/{tools/misc/pre-commit/default.nix => unit/pr/pre-commit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/precice-config-visualizer/default.nix => unit/pr/precice-config-visualizer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/precice/default.nix => unit/pr/precice/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/prelink/default.nix => unit/pr/prelink/pkg-fun.nix} (100%) rename pkgs/{applications/misc/premid/default.nix => unit/pr/premid/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/pr}/presage/fixed-cppunit-detection.patch (100%) rename pkgs/{development/libraries/presage/default.nix => unit/pr/presage/pkg-fun.nix} (100%) rename pkgs/{misc/present/default.nix => unit/pr/present/pkg-fun.nix} (100%) rename pkgs/{tools/security/pretender/default.nix => unit/pr/pretender/pkg-fun.nix} (100%) rename pkgs/{development/tools/pretty-simple/default.nix => unit/pr/pretty-simple/pkg-fun.nix} (100%) rename pkgs/{tools/networking/prettyping/default.nix => unit/pr/prettyping/pkg-fun.nix} (100%) rename pkgs/{applications/misc/prevo/data.nix => unit/pr/prevo-data/pkg-fun.nix} (100%) rename pkgs/{applications/misc/prevo/tools.nix => unit/pr/prevo-tools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/prevo/default.nix => unit/pr/prevo/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/pr}/pridecat/fix_install.patch (100%) rename pkgs/{tools/misc/pridecat/default.nix => unit/pr/pridecat/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pridefetch/default.nix => unit/pr/pridefetch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/prime-server/default.nix => unit/pr/prime-server/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/primecount/default.nix => unit/pr/primecount/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/primesieve/default.nix => unit/pr/primesieve/pkg-fun.nix} (100%) rename pkgs/{applications/misc/printrun/default.nix => unit/pr/printrun/pkg-fun.nix} (100%) rename pkgs/{applications/video/prism/default.nix => unit/pr/prism/pkg-fun.nix} (100%) rename pkgs/{development/libraries/prison/default.nix => unit/pr/prison/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pritunl-client/default.nix => unit/pr/pritunl-client/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pritunl-ssh/default.nix => unit/pr/pritunl-ssh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/privacyidea/default.nix => unit/pr/privacyidea/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/procdump/default.nix => unit/pr/procdump/pkg-fun.nix} (100%) rename pkgs/{applications/misc/process-compose/default.nix => unit/pr/process-compose/pkg-fun.nix} (100%) rename pkgs/{development/libraries/process-cpp/default.nix => unit/pr/process-cpp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/process-viewer/default.nix => unit/pr/process-viewer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/procmail/default.nix => unit/pr/procmail/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/pr}/procodile/Gemfile (100%) rename pkgs/{tools/system => unit/pr}/procodile/Gemfile.lock (100%) rename pkgs/{tools/system => unit/pr}/procodile/gemset.nix (100%) rename pkgs/{tools/system/procodile/default.nix => unit/pr/procodile/pkg-fun.nix} (100%) rename pkgs/{tools/misc/procyon/default.nix => unit/pr/procyon/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/prodigal/default.nix => unit/pr/prodigal/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/professor/default.nix => unit/pr/professor/pkg-fun.nix} (100%) rename pkgs/{tools/misc/profetch/default.nix => unit/pr/profetch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/profile-cleaner/default.nix => unit/pr/profile-cleaner/pkg-fun.nix} (100%) rename pkgs/{tools/misc/profile-sync-daemon/default.nix => unit/pr/profile-sync-daemon/pkg-fun.nix} (100%) rename pkgs/{data/fonts/profont/default.nix => unit/pr/profont/pkg-fun.nix} (100%) rename pkgs/{data/fonts/proggyfonts/default.nix => unit/pr/proggyfonts/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/programmer-calculator/default.nix => unit/pr/programmer-calculator/pkg-fun.nix} (100%) rename pkgs/{tools/misc/progress/default.nix => unit/pr/progress/pkg-fun.nix} (100%) rename pkgs/{development/libraries/proj-datumgrid/default.nix => unit/pr/proj-datumgrid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/proj/default.nix => unit/pr/proj/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/pr}/proj/tests.nix (100%) rename pkgs/{development/libraries/proj/7.nix => unit/pr/proj_7/pkg-fun.nix} (100%) rename pkgs/{development/libraries/proj => unit/pr/proj_7}/tests-sqlite-3.39.patch (100%) rename pkgs/{servers/monitoring/prometheus/prom2json.nix => unit/pr/prom2json/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/alertmanager.nix => unit/pr/prometheus-alertmanager/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/apcupsd-exporter.nix => unit/pr/prometheus-apcupsd-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/artifactory-exporter.nix => unit/pr/prometheus-artifactory-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/aws-s3-exporter.nix => unit/pr/prometheus-aws-s3-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/bind-exporter.nix => unit/pr/prometheus-bind-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/bird-exporter.nix => unit/pr/prometheus-bird-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/bitcoin-exporter.nix => unit/pr/prometheus-bitcoin-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/blackbox-exporter.nix => unit/pr/prometheus-blackbox-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/collectd-exporter.nix => unit/pr/prometheus-collectd-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/consul-exporter.nix => unit/pr/prometheus-consul-exporter/pkg-fun.nix} (100%) rename pkgs/{development/libraries/prometheus-cpp/default.nix => unit/pr/prometheus-cpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/pr}/prometheus-cpp/prometheus-cpp.pc.in (100%) rename pkgs/{servers/monitoring/prometheus/dnsmasq-exporter.nix => unit/pr/prometheus-dnsmasq-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/domain-exporter.nix => unit/pr/prometheus-domain-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus => unit/pr/prometheus-dovecot-exporter}/dovecot-exporter-deps.nix (100%) rename pkgs/{servers/monitoring/prometheus/dovecot-exporter.nix => unit/pr/prometheus-dovecot-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/fastly-exporter.nix => unit/pr/prometheus-fastly-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/flow-exporter.nix => unit/pr/prometheus-flow-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/fritzbox-exporter.nix => unit/pr/prometheus-fritzbox-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix => unit/pr/prometheus-gitlab-ci-pipelines-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/haproxy-exporter.nix => unit/pr/prometheus-haproxy-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/influxdb-exporter.nix => unit/pr/prometheus-influxdb-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/ipmi-exporter.nix => unit/pr/prometheus-ipmi-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/jitsi-exporter.nix => unit/pr/prometheus-jitsi-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/jmx-httpserver.nix => unit/pr/prometheus-jmx-httpserver/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/json-exporter.nix => unit/pr/prometheus-json-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/kea-exporter.nix => unit/pr/prometheus-kea-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/keylight-exporter.nix => unit/pr/prometheus-keylight-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/knot-exporter.nix => unit/pr/prometheus-knot-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/lnd-exporter.nix => unit/pr/prometheus-lnd-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/mail-exporter.nix => unit/pr/prometheus-mail-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/mikrotik-exporter.nix => unit/pr/prometheus-mikrotik-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/minio-exporter => unit/pr/prometheus-minio-exporter}/deps.nix (100%) rename pkgs/{servers/monitoring/prometheus/minio-exporter/default.nix => unit/pr/prometheus-minio-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/modemmanager-exporter.nix => unit/pr/prometheus-modemmanager-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/mysqld-exporter.nix => unit/pr/prometheus-mysqld-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/nats-exporter.nix => unit/pr/prometheus-nats-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/nextcloud-exporter.nix => unit/pr/prometheus-nextcloud-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/nginx-exporter.nix => unit/pr/prometheus-nginx-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/nginxlog-exporter.nix => unit/pr/prometheus-nginxlog-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/nut-exporter.nix => unit/pr/prometheus-nut-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/openvpn-exporter.nix => unit/pr/prometheus-openvpn-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/pihole-exporter.nix => unit/pr/prometheus-pihole-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/postfix-exporter.nix => unit/pr/prometheus-postfix-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/postgres-exporter.nix => unit/pr/prometheus-postgres-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/process-exporter.nix => unit/pr/prometheus-process-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/pushgateway.nix => unit/pr/prometheus-pushgateway/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/pve-exporter.nix => unit/pr/prometheus-pve-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/rabbitmq-exporter.nix => unit/pr/prometheus-rabbitmq-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/redis-exporter.nix => unit/pr/prometheus-redis-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/rtl_433-exporter.nix => unit/pr/prometheus-rtl_433-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/sachet.nix => unit/pr/prometheus-sachet/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/script-exporter.nix => unit/pr/prometheus-script-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/smartctl-exporter => unit/pr/prometheus-smartctl-exporter}/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch (100%) rename pkgs/{servers/monitoring/prometheus/smartctl-exporter/default.nix => unit/pr/prometheus-smartctl-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/smokeping-prober.nix => unit/pr/prometheus-smokeping-prober/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/snmp-exporter.nix => unit/pr/prometheus-snmp-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/speedtest-exporter.nix => unit/pr/prometheus-speedtest-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/sql-exporter.nix => unit/pr/prometheus-sql-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/statsd-exporter.nix => unit/pr/prometheus-statsd-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/surfboard-exporter.nix => unit/pr/prometheus-surfboard-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/systemd-exporter.nix => unit/pr/prometheus-systemd-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/tor-exporter.nix => unit/pr/prometheus-tor-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/v2ray-exporter.nix => unit/pr/prometheus-v2ray-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/varnish-exporter.nix => unit/pr/prometheus-varnish-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/xmpp-alerts.nix => unit/pr/prometheus-xmpp-alerts/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/zfs-exporter.nix => unit/pr/prometheus-zfs-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus/default.nix => unit/pr/prometheus/pkg-fun.nix} (100%) rename pkgs/{tools/misc/promql-cli/default.nix => unit/pr/promql-cli/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/prometheus => unit/pr}/promscale/0001-remove-jaeger-test-dep.patch (100%) rename pkgs/{servers/monitoring/prometheus/promscale/default.nix => unit/pr/promscale/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/loki/promtail.nix => unit/pr/promtail/pkg-fun.nix} (100%) rename pkgs/{tools/system/proot/default.nix => unit/pr/proot/pkg-fun.nix} (100%) rename pkgs/{development/libraries/properties-cpp/default.nix => unit/pr/properties-cpp/pkg-fun.nix} (100%) rename pkgs/{servers/xmpp/prosody-filer/default.nix => unit/pr/prosody-filer/pkg-fun.nix} (100%) rename pkgs/{development/tools/prospector/default.nix => unit/pr/prospector/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/pr}/prospector/setoptconf.nix (100%) rename pkgs/{development/web => unit/pr}/protege-distribution/disable-console-log.patch (100%) rename pkgs/{development/web/protege-distribution/default.nix => unit/pr/protege-distribution/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/pr}/protege-distribution/static-path.patch (100%) rename pkgs/{development/tools/proto-contrib/default.nix => unit/pr/proto-contrib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/protobuf => unit/pr/protobuf3_21}/generic-v3-cmake.nix (100%) rename pkgs/{development/libraries/protobuf/3.21.nix => unit/pr/protobuf3_21/pkg-fun.nix} (100%) rename pkgs/{development/libraries/protobuf => unit/pr/protobuf3_21}/static-executables-have-no-rpath.patch (100%) rename pkgs/{development/libraries/protobufc/default.nix => unit/pr/protobufc/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-connect-go/default.nix => unit/pr/protoc-gen-connect-go/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-doc/default.nix => unit/pr/protoc-gen-doc/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-entgrpc/default.nix => unit/pr/protoc-gen-entgrpc/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-go-grpc/default.nix => unit/pr/protoc-gen-go-grpc/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-go-vtproto/default.nix => unit/pr/protoc-gen-go-vtproto/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-go/default.nix => unit/pr/protoc-gen-go/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/pr}/protoc-gen-grpc-web/optional-static.patch (100%) rename pkgs/{development/tools/protoc-gen-grpc-web/default.nix => unit/pr/protoc-gen-grpc-web/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-rust/default.nix => unit/pr/protoc-gen-rust/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-twirp/default.nix => unit/pr/protoc-gen-twirp/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-twirp_php/default.nix => unit/pr/protoc-gen-twirp_php/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-twirp_swagger/default.nix => unit/pr/protoc-gen-twirp_swagger/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-twirp_typescript/default.nix => unit/pr/protoc-gen-twirp_typescript/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoc-gen-validate/default.nix => unit/pr/protoc-gen-validate/pkg-fun.nix} (100%) rename pkgs/{applications/networking/protocol/default.nix => unit/pr/protocol/pkg-fun.nix} (100%) rename pkgs/{development/tools/protolint/default.nix => unit/pr/protolint/pkg-fun.nix} (100%) rename pkgs/{development/libraries/protolock/default.nix => unit/pr/protolock/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/proton-caller/default.nix => unit/pr/proton-caller/pkg-fun.nix} (100%) rename pkgs/{applications/networking/protonmail-bridge/default.nix => unit/pr/protonmail-bridge/pkg-fun.nix} (100%) rename pkgs/{development/tools/protoscope/default.nix => unit/pr/protoscope/pkg-fun.nix} (100%) rename pkgs/{development/tools/prototool/default.nix => unit/pr/prototool/pkg-fun.nix} (100%) rename pkgs/{development/libraries/prototypejs/default.nix => unit/pr/prototypejs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/protozero/default.nix => unit/pr/protozero/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/prover9/default.nix => unit/pr/prover9/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/proverif/default.nix => unit/pr/proverif/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/prow/default.nix => unit/pr/prow/pkg-fun.nix} (100%) rename pkgs/{servers/prowlarr/default.nix => unit/pr/prowlarr/pkg-fun.nix} (100%) rename pkgs/{servers => unit/pr}/prowlarr/update.sh (100%) rename pkgs/{tools/networking/proxify/default.nix => unit/pr/proxify/pkg-fun.nix} (100%) rename pkgs/{tools/misc/proximity-sort/default.nix => unit/pr/proximity-sort/pkg-fun.nix} (100%) rename pkgs/{applications/backup => unit/pr}/proxmox-backup-client/Cargo.lock (100%) rename pkgs/{applications/backup/proxmox-backup-client/default.nix => unit/pr/proxmox-backup-client/pkg-fun.nix} (100%) rename pkgs/{applications/backup => unit/pr}/proxmox-backup-client/re-route-dependencies.patch (100%) rename pkgs/{tools/networking/proxychains-ng/default.nix => unit/pr/proxychains-ng/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/pr}/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch (100%) rename pkgs/{tools/networking/proxychains/default.nix => unit/pr/proxychains/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/pr}/proxychains/swap-priority-4-and-5-in-get_config_path.patch (100%) rename pkgs/{servers/sql => unit/pr}/proxysql/dont-phone-home.patch (100%) rename pkgs/{servers/sql => unit/pr}/proxysql/makefiles.patch (100%) rename pkgs/{servers/sql/proxysql/default.nix => unit/pr/proxysql/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/proycon-wayout/default.nix => unit/pr/proycon-wayout/pkg-fun.nix} (100%) rename pkgs/{tools/security/prs/default.nix => unit/pr/prs/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/pr}/pru/Gemfile (100%) rename pkgs/{tools/text => unit/pr}/pru/Gemfile.lock (100%) rename pkgs/{tools/text => unit/pr}/pru/gemset.nix (100%) rename pkgs/{tools/text/pru/default.nix => unit/pr/pru/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/pr}/pry/Gemfile (100%) rename pkgs/{development/tools => unit/pr}/pry/Gemfile.lock (100%) rename pkgs/{development/tools => unit/pr}/pry/gemset.nix (100%) rename pkgs/{development/tools/pry/default.nix => unit/pr/pry/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ps2client/default.nix => unit/ps/ps2client/pkg-fun.nix} (100%) rename pkgs/{tools/games => unit/ps}/ps3-disc-dumper/deps.nix (100%) rename pkgs/{tools/games/ps3-disc-dumper/default.nix => unit/ps/ps3-disc-dumper/pkg-fun.nix} (100%) rename pkgs/{servers/ps3netsrv/default.nix => unit/ps/ps3netsrv/pkg-fun.nix} (100%) rename pkgs/{tools/system/ps_mem/default.nix => unit/ps/ps_mem/pkg-fun.nix} (100%) rename pkgs/{development/compilers/purescript/psc-package/default.nix => unit/ps/psc-package/pkg-fun.nix} (100%) rename pkgs/{development/tools/pscale/default.nix => unit/ps/pscale/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/pscircle/default.nix => unit/ps/pscircle/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/psftools/default.nix => unit/ps/psftools/pkg-fun.nix} (100%) rename pkgs/{servers/http/pshs/default.nix => unit/ps/pshs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/psi-notify/default.nix => unit/ps/psi-notify/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pslib/default.nix => unit/ps/pslib/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/psmisc/default.nix => unit/ps/psmisc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/psol/default.nix => unit/ps/psol/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pspg/default.nix => unit/ps/pspg/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/pspp/default.nix => unit/ps/pspp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/psqlodbc/default.nix => unit/ps/psqlodbc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pssh/default.nix => unit/ps/pssh/pkg-fun.nix} (100%) rename pkgs/{applications/audio/psst/default.nix => unit/ps/psst/pkg-fun.nix} (100%) rename pkgs/{tools/system/psstop/default.nix => unit/ps/psstop/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/pstoedit/default.nix => unit/ps/pstoedit/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/ps}/pstoedit/pstoedit-gs-9.22-compat.patch (100%) rename pkgs/{development/libraries/pstreams/default.nix => unit/ps/pstreams/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pstree/default.nix => unit/ps/pstree/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/psutils/default.nix => unit/ps/psutils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/psw/default.nix => unit/ps/psw/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/pt}/pt/Gemfile (100%) rename pkgs/{applications/misc => unit/pt}/pt/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/pt}/pt/gemset.nix (100%) rename pkgs/{applications/misc/pt/default.nix => unit/pt/pt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pt2-clone/default.nix => unit/pt/pt2-clone/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/ptags/default.nix => unit/pt/ptags/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/pt}/ptask/json_c_is_error.patch (100%) rename pkgs/{applications/misc/ptask/default.nix => unit/pt/ptask/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/pt}/ptask/tw-version.patch (100%) rename pkgs/{development/libraries/ptex/default.nix => unit/pt/ptex/pkg-fun.nix} (100%) rename pkgs/{misc/ptouch-print/default.nix => unit/pt/ptouch-print/pkg-fun.nix} (100%) rename pkgs/{data/fonts/public-sans/default.nix => unit/pu/public-sans/pkg-fun.nix} (100%) rename pkgs/{data/misc/publicsuffix-list/default.nix => unit/pu/publicsuffix-list/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pubs/default.nix => unit/pu/pubs/pkg-fun.nix} (100%) rename pkgs/{servers/pufferpanel/default.nix => unit/pu/pufferpanel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pugixml/default.nix => unit/pu/pugixml/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pulseaudio-ctl/default.nix => unit/pu/pulseaudio-ctl/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/pu}/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch (100%) rename pkgs/{applications/audio/pulseaudio-dlna/default.nix => unit/pu/pulseaudio-dlna/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/pu}/pulseaudio-dlna/zeroconf.nix (100%) rename pkgs/{tools/audio/pulsemixer/default.nix => unit/pu/pulsemixer/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/pu}/pulumi-bin/data.nix (100%) rename pkgs/{tools/admin/pulumi-bin/default.nix => unit/pu/pulumi-bin/pkg-fun.nix} (100%) rename pkgs/{tools/admin/pulumi/default.nix => unit/pu/pulumi/pkg-fun.nix} (100%) rename pkgs/{development/tools/pulumictl/default.nix => unit/pu/pulumictl/pkg-fun.nix} (100%) rename pkgs/{development/tools/pup/default.nix => unit/pu/pup/pkg-fun.nix} (100%) rename pkgs/{tools/admin/puppet => unit/pu}/puppet-bolt/Gemfile (100%) rename pkgs/{tools/admin/puppet => unit/pu}/puppet-bolt/Gemfile.lock (100%) rename pkgs/{tools/admin/puppet => unit/pu}/puppet-bolt/gemset.nix (100%) rename pkgs/{tools/admin/puppet/puppet-bolt/default.nix => unit/pu/puppet-bolt/pkg-fun.nix} (100%) rename pkgs/{development/tools/puppet => unit/pu}/puppet-lint/Gemfile (100%) rename pkgs/{development/tools/puppet => unit/pu}/puppet-lint/Gemfile.lock (100%) rename pkgs/{development/tools/puppet => unit/pu}/puppet-lint/gemset.nix (100%) rename pkgs/{development/tools/puppet/puppet-lint/default.nix => unit/pu/puppet-lint/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/pu}/puppeteer-cli/package.json (100%) rename pkgs/{tools/graphics/puppeteer-cli/default.nix => unit/pu/puppeteer-cli/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/pu}/puppeteer-cli/yarn.lock (100%) rename pkgs/{tools/graphics => unit/pu}/puppeteer-cli/yarn.nix (100%) rename pkgs/{development/tools/pur/default.nix => unit/pu/pur/pkg-fun.nix} (100%) rename pkgs/{servers/ftp/pure-ftpd/default.nix => unit/pu/pure-ftpd/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/pure-prompt/default.nix => unit/pu/pure-prompt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/puredata/default.nix => unit/pu/puredata/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pd-plugins/puremapping/default.nix => unit/pu/puremapping/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/pureref/default.nix => unit/pu/pureref/pkg-fun.nix} (100%) rename pkgs/{development/compilers/purescript/purescript/default.nix => unit/pu/purescript/pkg-fun.nix} (100%) rename pkgs/{development/compilers/purescript => unit/pu}/purescript/test-minimal-module/Main.js (100%) rename pkgs/{development/compilers/purescript => unit/pu}/purescript/test-minimal-module/Main.purs (100%) rename pkgs/{development/compilers/purescript => unit/pu}/purescript/test-minimal-module/default.nix (100%) rename pkgs/{development/compilers/purescript => unit/pu}/purescript/update.sh (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix => unit/pu/purple-discord/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix => unit/pu/purple-facebook/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix => unit/pu/purple-googlechat/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix => unit/pu/purple-hangouts/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix => unit/pu/purple-lurch/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix => unit/pu/purple-matrix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix => unit/pu/purple-mm-sms/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix => unit/pu/purple-plugin-pack/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix => unit/pu/purple-signald/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix => unit/pu/purple-slack/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix => unit/pu/purple-vk-plugin/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix => unit/pu/purple-xmpp-http-upload/pkg-fun.nix} (100%) rename pkgs/{games/purpur/default.nix => unit/pu/purpur/pkg-fun.nix} (100%) rename pkgs/{tools/misc/pv/default.nix => unit/pv/pv/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pw-viz/default.nix => unit/pw/pw-viz/pkg-fun.nix} (100%) rename pkgs/{tools/security/pwdsafety/default.nix => unit/pw/pwdsafety/pkg-fun.nix} (100%) rename pkgs/{tools/security/pwgen-secure/default.nix => unit/pw/pwgen-secure/pkg-fun.nix} (100%) rename pkgs/{tools/security/pwgen/default.nix => unit/pw/pwgen/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pwnat/default.nix => unit/pw/pwnat/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/pwndbg/default.nix => unit/pw/pwndbg/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/pw}/pws/Gemfile (100%) rename pkgs/{tools/misc => unit/pw}/pws/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/pw}/pws/gemset.nix (100%) rename pkgs/{tools/misc/pws/default.nix => unit/pw/pws/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pwsafe/default.nix => unit/pw/pwsafe/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/pxattr/default.nix => unit/px/pxattr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pxlib/default.nix => unit/px/pxlib/pkg-fun.nix} (100%) rename pkgs/{development/tools/pxview/default.nix => unit/px/pxview/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/px}/pxz/flush-stdout-help-version.patch (100%) rename pkgs/{tools/compression/pxz/default.nix => unit/px/pxz/pkg-fun.nix} (100%) rename pkgs/{development/tools/py-spy/default.nix => unit/py/py-spy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/py3c/default.nix => unit/py/py3c/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pydf/default.nix => unit/py/pydf/pkg-fun.nix} (100%) rename pkgs/{tools/networking/pykms/default.nix => unit/py/pykms/pkg-fun.nix} (100%) rename pkgs/{development/tools/pylint-exit/default.nix => unit/py/pylint-exit/pkg-fun.nix} (100%) rename pkgs/{misc/pylode/default.nix => unit/py/pylode/pkg-fun.nix} (100%) rename pkgs/{applications/science/chemistry/pymol/default.nix => unit/py/pymol/pkg-fun.nix} (100%) rename pkgs/{applications/office/pympress/default.nix => unit/py/pympress/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/pynac/default.nix => unit/py/pynac/pkg-fun.nix} (100%) rename pkgs/{tools/security/pynitrokey/default.nix => unit/py/pynitrokey/pkg-fun.nix} (100%) rename pkgs/{development/tools/pypi-mirror/default.nix => unit/py/pypi-mirror/pkg-fun.nix} (100%) rename pkgs/{development/tools/pypi2nix/default.nix => unit/py/pypi2nix/pkg-fun.nix} (100%) rename pkgs/{applications/audio/pyradio/default.nix => unit/py/pyradio/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/pyrseas/default.nix => unit/py/pyrseas/pkg-fun.nix} (100%) rename pkgs/{development/python-modules/pyside/apiextractor.nix => unit/py/pysideApiextractor/pkg-fun.nix} (100%) rename pkgs/{development/python-modules/pyside/generatorrunner.nix => unit/py/pysideGeneratorrunner/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pystring/default.nix => unit/py/pystring/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/python-cosmopolitan/default.nix => unit/py/python-cosmopolitan/pkg-fun.nix} (100%) rename pkgs/{development/dotnet-modules => unit/py}/python-language-server/deps.nix (100%) rename pkgs/{development/dotnet-modules/python-language-server/default.nix => unit/py/python-language-server/pkg-fun.nix} (100%) rename pkgs/{development/dotnet-modules => unit/py}/python-language-server/updater.sh (100%) rename pkgs/{development/tools/misc/python-launcher/default.nix => unit/py/python-launcher/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/python/conda/default.nix => unit/py/pythonCondaPackages/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/python/manylinux/default.nix => unit/py/pythonManylinuxPackages/pkg-fun.nix} (100%) rename pkgs/{applications/misc/pytrainer/default.nix => unit/py/pytrainer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/q-text-as-data/default.nix => unit/q-/q-text-as-data/pkg-fun.nix} (100%) rename pkgs/{tools/networking/q/default.nix => unit/q/q/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/qalculate-gtk/default.nix => unit/qa/qalculate-gtk/pkg-fun.nix} (100%) rename pkgs/{development/compilers/qbe/default.nix => unit/qb/qbe/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/qb}/qbe/test-can-run-hello-world.nix (100%) rename pkgs/{applications/networking/cluster/qbec/default.nix => unit/qb/qbec/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/qcdnum/default.nix => unit/qc/qcdnum/pkg-fun.nix} (100%) rename pkgs/{tools/misc/qdl/default.nix => unit/qd/qdl/pkg-fun.nix} (100%) rename pkgs/{applications/editors/qemacs/default.nix => unit/qe/qemacs/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/qemu/utils.nix => unit/qe/qemu-utils/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/qf}/qfsm/drop-hardcoded-prefix.patch (100%) rename pkgs/{applications/science/electronics => unit/qf}/qfsm/gcc6-fixes.patch (100%) rename pkgs/{applications/science/electronics/qfsm/default.nix => unit/qf/qfsm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qhull/default.nix => unit/qh/qhull/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qimageblitz/default.nix => unit/qi/qimageblitz/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/qi}/qimageblitz/qimageblitz-9999-exec-stack.patch (100%) rename pkgs/{development/libraries/audio/qm-dsp/default.nix => unit/qm/qm-dsp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/qmetro/default.nix => unit/qm/qmetro/pkg-fun.nix} (100%) rename pkgs/{applications/audio/qmidiarp/default.nix => unit/qm/qmidiarp/pkg-fun.nix} (100%) rename pkgs/{applications/audio/qmidiroute/default.nix => unit/qm/qmidiroute/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/qmk-udev-rules/default.nix => unit/qm/qmk-udev-rules/pkg-fun.nix} (100%) rename pkgs/{tools/misc/qmk/default.nix => unit/qm/qmk/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/qnial/default.nix => unit/qn/qnial/pkg-fun.nix} (100%) rename pkgs/{tools/networking/qodem/default.nix => unit/qo/qodem/pkg-fun.nix} (100%) rename pkgs/{data/icons/qogir-icon-theme/default.nix => unit/qo/qogir-icon-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/qogir-kde/default.nix => unit/qo/qogir-kde/pkg-fun.nix} (100%) rename pkgs/{data/themes/qogir/default.nix => unit/qo/qogir-theme/pkg-fun.nix} (100%) rename pkgs/{tools/admin/qovery-cli/default.nix => unit/qo/qovery-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qpdf/default.nix => unit/qp/qpdf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/qperf/default.nix => unit/qp/qperf/pkg-fun.nix} (100%) rename pkgs/{servers/amqp/qpid-cpp/default.nix => unit/qp/qpid-cpp/pkg-fun.nix} (100%) rename pkgs/{tools/text/qprint/default.nix => unit/qp/qprint/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/qq/default.nix => unit/qq/qq/pkg-fun.nix} (100%) rename pkgs/{games/qqwing/default.nix => unit/qq/qqwing/pkg-fun.nix} (100%) rename pkgs/{applications/radio/qradiolink/default.nix => unit/qr/qradiolink/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/qrcode/default.nix => unit/qr/qrcode/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qrcodegen/default.nix => unit/qr/qrcodegen/pkg-fun.nix} (100%) rename pkgs/{tools/networking/qrcp/default.nix => unit/qr/qrcp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qrupdate/default.nix => unit/qr/qrupdate/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/qs}/qscintilla-qt4/fix-qt4-build.patch (100%) rename pkgs/{development/libraries/qscintilla-qt4/default.nix => unit/qs/qscintilla-qt4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qt-mobility/default.nix => unit/qt/qt-mobility/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers => unit/qt}/qtile/fix-restart.patch (100%) rename pkgs/{applications/window-managers/qtile/default.nix => unit/qt/qtile/pkg-fun.nix} (100%) rename pkgs/{applications/audio/qtscrobbler/default.nix => unit/qt/qtscrobbler/pkg-fun.nix} (100%) rename pkgs/{development/libraries/qtstyleplugin-kvantum-qt4/default.nix => unit/qt/qtstyleplugin-kvantum-qt4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/QuadProgpp/default.nix => unit/qu/QuadProgpp/pkg-fun.nix} (100%) rename pkgs/{applications/audio/quadrafuzz/default.nix => unit/qu/quadrafuzz/pkg-fun.nix} (100%) rename pkgs/{games/quake3/content/demo.nix => unit/qu/quake3demodata/pkg-fun.nix} (100%) rename pkgs/{games/quake3/quake3e/default.nix => unit/qu/quake3e/pkg-fun.nix} (100%) rename pkgs/{games/quake3/content/hires.nix => unit/qu/quake3hires/pkg-fun.nix} (100%) rename pkgs/{games/quake3/content/pointrelease.nix => unit/qu/quake3pointrelease/pkg-fun.nix} (100%) rename pkgs/{games/quake3/wrapper/default.nix => unit/qu/quake3wrapper/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/quantomatic/default.nix => unit/qu/quantomatic/pkg-fun.nix} (100%) rename pkgs/{games/quantumminigolf/default.nix => unit/qu/quantumminigolf/pkg-fun.nix} (100%) rename pkgs/{tools/security/quark-engine/default.nix => unit/qu/quark-engine/pkg-fun.nix} (100%) rename pkgs/{servers/http/quark/default.nix => unit/qu/quark/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/qu}/quarto/fix-deno-path.patch (100%) rename pkgs/{development/libraries/quarto/default.nix => unit/qu/quarto/pkg-fun.nix} (100%) rename pkgs/{applications/editors/quartus-prime/default.nix => unit/qu/quartus-prime-lite/pkg-fun.nix} (100%) rename pkgs/{applications/editors/quartus-prime => unit/qu/quartus-prime-lite}/quartus.nix (100%) rename pkgs/{applications/science/biology/quast/default.nix => unit/qu/quast/pkg-fun.nix} (100%) rename pkgs/{data/fonts/quattrocento-sans/default.nix => unit/qu/quattrocento-sans/pkg-fun.nix} (100%) rename pkgs/{data/fonts/quattrocento/default.nix => unit/qu/quattrocento/pkg-fun.nix} (100%) rename pkgs/{applications/qubes/qubes-core-vchan-xen/default.nix => unit/qu/qubes-core-vchan-xen/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/qucs-s/default.nix => unit/qu/qucs-s/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics => unit/qu}/qucs/cmakelists.patch (100%) rename pkgs/{applications/science/electronics/qucs/default.nix => unit/qu/qucs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/quesoglc/default.nix => unit/qu/quesoglc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/quich/default.nix => unit/qu/quich/pkg-fun.nix} (100%) rename pkgs/{development/tools/quick-lint-js/default.nix => unit/qu/quick-lint-js/pkg-fun.nix} (100%) rename pkgs/{development/libraries/quickder/default.nix => unit/qu/quickder/pkg-fun.nix} (100%) rename pkgs/{development/quickemu/default.nix => unit/qu/quickemu/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/qu}/quickfix/disableUnitTests.patch (100%) rename pkgs/{development/libraries/quickfix/default.nix => unit/qu/quickfix/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/quickjs/default.nix => unit/qu/quickjs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/quickmem/default.nix => unit/qu/quickmem/pkg-fun.nix} (100%) rename pkgs/{tools/networking/quickserve/default.nix => unit/qu/quickserve/pkg-fun.nix} (100%) rename pkgs/{applications/misc/quicksynergy/default.nix => unit/qu/quicksynergy/pkg-fun.nix} (100%) rename pkgs/{development/tools/quicktemplate/default.nix => unit/qu/quicktemplate/pkg-fun.nix} (100%) rename pkgs/{tools/networking/quicktun/default.nix => unit/qu/quicktun/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/qu}/quicktun/tar-1.30.diff (100%) rename pkgs/{tools/security/quill-qr/default.nix => unit/qu/quill-qr/pkg-fun.nix} (100%) rename pkgs/{development/tools/quilt/default.nix => unit/qu/quilt/pkg-fun.nix} (100%) rename pkgs/{data/icons/quintom-cursor-theme/default.nix => unit/qu/quintom-cursor-theme/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/qu}/quirc/0001-dont-build-demos.patch (100%) rename pkgs/{tools/graphics/quirc/default.nix => unit/qu/quirc/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/quorum/default.nix => unit/qu/quorum/pkg-fun.nix} (100%) rename pkgs/{applications/video/quvi/scripts.nix => unit/qu/quvi_scripts/pkg-fun.nix} (100%) rename pkgs/{applications/editors/qxw/default.nix => unit/qx/qxw/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/r1}/r10k/Gemfile (100%) rename pkgs/{tools/system => unit/r1}/r10k/Gemfile.lock (100%) rename pkgs/{tools/system => unit/r1}/r10k/gemset.nix (100%) rename pkgs/{tools/system/r10k/default.nix => unit/r1/r10k/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/r1}/r128gain/ffmpeg-location.patch (100%) rename pkgs/{applications/audio/r128gain/default.nix => unit/r1/r128gain/pkg-fun.nix} (100%) rename pkgs/{games/r2mod_cli/default.nix => unit/r2/r2mod_cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/r53-ddns/default.nix => unit/r5/r53-ddns/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rabbitmq-c/default.nix => unit/ra/rabbitmq-c/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/rabbitvcs/default.nix => unit/ra/rabbitvcs/pkg-fun.nix} (100%) rename pkgs/{games => unit/ra}/racer/mkdir.patch (100%) rename pkgs/{games/racer/default.nix => unit/ra/racer/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/racket/minimal.nix => unit/ra/racket-minimal/pkg-fun.nix} (100%) rename pkgs/{tools/security/radamsa/default.nix => unit/ra/radamsa/pkg-fun.nix} (100%) rename pkgs/{servers/radarr/default.nix => unit/ra/radarr/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ra}/radarr/update.sh (100%) rename pkgs/{os-specific/linux/radeontools/default.nix => unit/ra/radeontools/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/radeontop/default.nix => unit/ra/radeontop/pkg-fun.nix} (100%) rename pkgs/{servers/radicale/2.x.nix => unit/ra/radicale2/pkg-fun.nix} (100%) rename pkgs/{servers/radicale/3.x.nix => unit/ra/radicale3/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/radicle-upstream/default.nix => unit/ra/radicle-upstream/pkg-fun.nix} (100%) rename pkgs/{applications/audio/radioboat/default.nix => unit/ra/radioboat/pkg-fun.nix} (100%) rename pkgs/{tools/networking/radsecproxy/default.nix => unit/ra/radsecproxy/pkg-fun.nix} (100%) rename pkgs/{tools/networking/radvd/default.nix => unit/ra/radvd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/raft-canonical/default.nix => unit/ra/raft-canonical/pkg-fun.nix} (100%) rename pkgs/{applications/misc/raider/default.nix => unit/ra/raider/pkg-fun.nix} (100%) rename pkgs/{development/tools/railway/default.nix => unit/ra/railway/pkg-fun.nix} (100%) rename pkgs/{development/tools/rain/default.nix => unit/ra/rain/pkg-fun.nix} (100%) rename pkgs/{applications/misc/raiseorlaunch/default.nix => unit/ra/raiseorlaunch/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/ra}/rake/Gemfile (100%) rename pkgs/{development/tools/build-managers => unit/ra}/rake/Gemfile.lock (100%) rename pkgs/{development/tools/build-managers => unit/ra}/rake/gemset.nix (100%) rename pkgs/{development/tools/build-managers/rake/default.nix => unit/ra/rake/pkg-fun.nix} (100%) rename pkgs/{development/tools/rakkess/default.nix => unit/ra/rakkess/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/rakudo/default.nix => unit/ra/rakudo/pkg-fun.nix} (100%) rename pkgs/{data/fonts/raleway/default.nix => unit/ra/raleway/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/rambox/default.nix => unit/ra/rambox/pkg-fun.nix} (100%) rename pkgs/{servers/http/ran/default.nix => unit/ra/ran/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/rancher/default.nix => unit/ra/rancher/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/randoop/default.nix => unit/ra/randoop/pkg-fun.nix} (100%) rename pkgs/{games/randtype/default.nix => unit/ra/randtype/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rang/default.nix => unit/ra/rang/pkg-fun.nix} (100%) rename pkgs/{development/libraries/range-v3/default.nix => unit/ra/range-v3/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/ranger/default.nix => unit/ra/ranger/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/rankwidth/default.nix => unit/ra/rankwidth/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rapidcheck/default.nix => unit/ra/rapidcheck/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rapidfuzz-cpp/default.nix => unit/ra/rapidfuzz-cpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rapidjson/default.nix => unit/ra/rapidjson/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/ra}/rapidsvn/fix-build.patch (100%) rename pkgs/{applications/version-management/rapidsvn/default.nix => unit/ra/rapidsvn/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rapidxml/default.nix => unit/ra/rapidxml/pkg-fun.nix} (100%) rename pkgs/{development/misc/rappel/default.nix => unit/ra/rappel/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/rar/default.nix => unit/ra/rar/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/rar2fs/default.nix => unit/ra/rar2fs/pkg-fun.nix} (100%) rename pkgs/{tools/security/rarcrack/default.nix => unit/ra/rarcrack/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rargs/default.nix => unit/ra/rargs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rarian/default.nix => unit/ra/rarian/pkg-fun.nix} (100%) rename pkgs/{development/tools/rars/default.nix => unit/ra/rars/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/rascal/default.nix => unit/ra/rascal/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rasdaemon/default.nix => unit/ra/rasdaemon/pkg-fun.nix} (100%) rename pkgs/{development/compilers/rasm/default.nix => unit/ra/rasm/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/raspberrypi/armstubs.nix => unit/ra/raspberrypi-armstubs/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/raspberrypi-eeprom/default.nix => unit/ra/raspberrypi-eeprom/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/raspberrypi-wireless/default.nix => unit/ra/raspberrypiWirelessFirmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/raspberrypi/default.nix => unit/ra/raspberrypifw/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ratman/default.nix => unit/ra/ratman/pkg-fun.nix} (100%) rename pkgs/{tools/X11/ratmen/default.nix => unit/ra/ratmen/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ratools/default.nix => unit/ra/ratools/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/ratox/default.nix => unit/ra/ratox/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/ratpoints/default.nix => unit/ra/ratpoints/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/ratpoison/default.nix => unit/ra/ratpoison/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ratt/default.nix => unit/ra/ratt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rauc/default.nix => unit/ra/rauc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/raul/default.nix => unit/ra/raul/pkg-fun.nix} (100%) rename pkgs/{applications/networking/newsreaders/raven-reader/default.nix => unit/ra/raven-reader/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/raxml/default.nix => unit/ra/raxml/pkg-fun.nix} (100%) rename pkgs/{games/raylib-games/default.nix => unit/ra/raylib-games/pkg-fun.nix} (100%) rename pkgs/{development/libraries/raylib/default.nix => unit/ra/raylib/pkg-fun.nix} (100%) rename pkgs/{development/ruby-modules/rbenv/default.nix => unit/rb/rbenv/pkg-fun.nix} (100%) rename pkgs/{development/tools/rbspy/default.nix => unit/rb/rbspy/pkg-fun.nix} (100%) rename pkgs/{shells/rc/default.nix => unit/rc/rc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sync/rclone/default.nix => unit/rc/rclone/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/rc}/rcm/fix-rcmlib-path.patch (100%) rename pkgs/{tools/misc/rcm/default.nix => unit/rc/rcm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rcon/default.nix => unit/rc/rcon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rconc/default.nix => unit/rc/rconc/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/rcs/default.nix => unit/rc/rcs/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/rcshist/default.nix => unit/rc/rcshist/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rdap/default.nix => unit/rd/rdap/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/rdc/default.nix => unit/rd/rdc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/rdesktop/default.nix => unit/rd/rdesktop/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/rdfind/default.nix => unit/rd/rdfind/pkg-fun.nix} (100%) rename pkgs/{tools/backup/rdiff-backup/default.nix => unit/rd/rdiff-backup/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rdkafka/default.nix => unit/rd/rdkafka/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rdma-core/default.nix => unit/rd/rdma-core/pkg-fun.nix} (100%) rename pkgs/{development/tools/rdocker/default.nix => unit/rd/rdocker/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rdrview/default.nix => unit/rd/rdrview/pkg-fun.nix} (100%) rename pkgs/{tools/backup/rdup/default.nix => unit/rd/rdup/pkg-fun.nix} (100%) rename pkgs/{applications/search/re-isearch/default.nix => unit/re/re-isearch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/re2/default.nix => unit/re/re2/pkg-fun.nix} (100%) rename pkgs/{development/tools/parsing/re2c/default.nix => unit/re/re2c/pkg-fun.nix} (100%) rename pkgs/{development/tools/react-native-debugger/default.nix => unit/re/react-native-debugger/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/re}/read-edid/fno-common.patch (100%) rename pkgs/{os-specific/linux/read-edid/default.nix => unit/re/read-edid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/readosm/default.nix => unit/re/readosm/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/readstat/default.nix => unit/re/readstat/pkg-fun.nix} (100%) rename pkgs/{applications/audio/real_time_config_quick_scan/default.nix => unit/re/real_time_config_quick_scan/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/re}/realesrgan-ncnn-vulkan/cmakelists.patch (100%) rename pkgs/{tools/graphics => unit/re}/realesrgan-ncnn-vulkan/models_path.patch (100%) rename pkgs/{tools/graphics/realesrgan-ncnn-vulkan/default.nix => unit/re/realesrgan-ncnn-vulkan/pkg-fun.nix} (100%) rename pkgs/{tools/admin/realvnc-vnc-viewer/default.nix => unit/re/realvnc-vnc-viewer/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/reap/default.nix => unit/re/reap/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/reattach-to-user-namespace/default.nix => unit/re/reattach-to-user-namespace/pkg-fun.nix} (100%) rename pkgs/{tools/networking/reaver-wps-t6x/default.nix => unit/re/reaverwps-t6x/pkg-fun.nix} (100%) rename pkgs/{tools/networking/reaver-wps => unit/re/reaverwps}/parallel-build.patch (100%) rename pkgs/{tools/networking/reaver-wps/default.nix => unit/re/reaverwps/pkg-fun.nix} (100%) rename pkgs/{applications/video/recapp/default.nix => unit/re/recapp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/recastnavigation/default.nix => unit/re/recastnavigation/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/re}/reckon/Gemfile (100%) rename pkgs/{tools/text => unit/re}/reckon/Gemfile.lock (100%) rename pkgs/{tools/text => unit/re}/reckon/gemset.nix (100%) rename pkgs/{tools/text/reckon/default.nix => unit/re/reckon/pkg-fun.nix} (100%) rename pkgs/{tools/text/recode/default.nix => unit/re/recode/pkg-fun.nix} (100%) rename pkgs/{tools/misc/recoverjpeg/default.nix => unit/re/recoverjpeg/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/rectangle/default.nix => unit/re/rectangle/pkg-fun.nix} (100%) rename pkgs/{data/fonts/recursive/default.nix => unit/re/recursive/pkg-fun.nix} (100%) rename pkgs/{tools/misc/recutils/default.nix => unit/re/recutils/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/red/default.nix => unit/re/red/pkg-fun.nix} (100%) rename pkgs/{games/redeclipse/default.nix => unit/re/redeclipse/pkg-fun.nix} (100%) rename pkgs/{tools/networking/redfang/default.nix => unit/re/redfang/pkg-fun.nix} (100%) rename pkgs/{data/fonts/redhat-official/default.nix => unit/re/redhat-official-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/networking/redir/default.nix => unit/re/redir/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/re}/redis-dump/Gemfile (100%) rename pkgs/{development/tools => unit/re}/redis-dump/Gemfile.lock (100%) rename pkgs/{development/tools => unit/re}/redis-dump/gemset.nix (100%) rename pkgs/{development/tools/redis-dump/default.nix => unit/re/redis-dump/pkg-fun.nix} (100%) rename pkgs/{development/libraries/redis-plus-plus/default.nix => unit/re/redis-plus-plus/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/redis/default.nix => unit/re/redis/pkg-fun.nix} (100%) rename pkgs/{tools/networking/redli/default.nix => unit/re/redli/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/re}/redmine/0001-python3.patch (100%) rename pkgs/{applications/version-management => unit/re}/redmine/Gemfile (100%) rename pkgs/{applications/version-management => unit/re}/redmine/Gemfile.lock (100%) rename pkgs/{applications/version-management => unit/re}/redmine/gemset.nix (100%) rename pkgs/{applications/version-management/redmine/default.nix => unit/re/redmine/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/re}/redmine/update.sh (100%) rename pkgs/{development/tools/build-managers/redo-apenwarr/default.nix => unit/re/redo-apenwarr/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/re}/redo-c/Makefile (100%) rename pkgs/{development/tools/build-managers/redo-c/default.nix => unit/re/redo-c/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/redo-sh/default.nix => unit/re/redo-sh/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/redo/default.nix => unit/re/redo/pkg-fun.nix} (100%) rename pkgs/{applications/audio/redoflacs/default.nix => unit/re/redoflacs/pkg-fun.nix} (100%) rename pkgs/{servers/redpanda/default.nix => unit/re/redpanda/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/redprl/default.nix => unit/re/redprl/pkg-fun.nix} (100%) rename pkgs/{development/java-modules/redshift_jdbc/default.nix => unit/re/redshift_jdbc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/redsocks/default.nix => unit/re/redsocks/pkg-fun.nix} (100%) rename pkgs/{servers/http/redstore/default.nix => unit/re/redstore/pkg-fun.nix} (100%) rename pkgs/{applications/audio/redux/default.nix => unit/re/redux/pkg-fun.nix} (100%) rename pkgs/{tools/security/redwax-tool/default.nix => unit/re/redwax-tool/pkg-fun.nix} (100%) rename pkgs/{build-support/references-by-popularity => unit/re/referencesByPopularity}/closure-graph.py (100%) rename pkgs/{build-support/references-by-popularity/default.nix => unit/re/referencesByPopularity/pkg-fun.nix} (100%) rename pkgs/{tools/bootloaders => unit/re}/refind/0001-toolchain.patch (100%) rename pkgs/{tools/bootloaders/refind/default.nix => unit/re/refind/pkg-fun.nix} (100%) rename pkgs/{development/tools/refinery-cli/default.nix => unit/re/refinery-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/reflex/default.nix => unit/re/reflex/pkg-fun.nix} (100%) rename pkgs/{development/tools/reftools/default.nix => unit/re/reftools/pkg-fun.nix} (100%) rename pkgs/{development/tools/refurb/default.nix => unit/re/refurb/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/reg/default.nix => unit/re/reg/pkg-fun.nix} (100%) rename pkgs/{development/tools/regclient/default.nix => unit/re/regclient/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/regenkfs/default.nix => unit/re/regenkfs/pkg-fun.nix} (100%) rename pkgs/{tools/security/regexploit/default.nix => unit/re/regexploit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/regextester/default.nix => unit/re/regextester/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/regina/default.nix => unit/re/regina/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/regionset/default.nix => unit/re/regionset/pkg-fun.nix} (100%) rename pkgs/{tools/security/regpg/default.nix => unit/re/regpg/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/reiser4progs/default.nix => unit/re/reiser4progs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/reiserfsprogs/default.nix => unit/re/reiserfsprogs/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/re}/reiserfsprogs/reiserfsprogs-ar-fix.patch (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/binary-tarball.nix (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/debian-build.nix (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/functions.sh (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/maven-build.nix (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/nix-build.nix (100%) rename pkgs/{build-support/release/default.nix => unit/re/releaseTools/pkg-fun.nix} (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/rpm-build.nix (100%) rename pkgs/{build-support/release => unit/re/releaseTools}/source-tarball.nix (100%) rename pkgs/{development/libraries/relibc/default.nix => unit/re/relibc/pkg-fun.nix} (100%) rename pkgs/{development/tools/relic/default.nix => unit/re/relic/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/re}/remake/glibc-2.27-glob.patch (100%) rename pkgs/{development/tools/build-managers/remake/default.nix => unit/re/remake/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/remarkable/remarkable-toolchain/default.nix => unit/re/remarkable-toolchain/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/remarkable/remarkable2-toolchain/default.nix => unit/re/remarkable2-toolchain/pkg-fun.nix} (100%) rename pkgs/{tools/misc/remind/default.nix => unit/re/remind/pkg-fun.nix} (100%) rename pkgs/{development/tools/knightos/remkrom/default.nix => unit/re/remkrom/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/remmina/default.nix => unit/re/remmina/pkg-fun.nix} (100%) rename pkgs/{applications/misc/remnote/default.nix => unit/re/remnote/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/remote-touchpad/default.nix => unit/re/remote-touchpad/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/remotebox/default.nix => unit/re/remotebox/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rename/default.nix => unit/re/rename/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/re}/renameutils/install-exec.patch (100%) rename pkgs/{tools/misc/renameutils/default.nix => unit/re/renameutils/pkg-fun.nix} (100%) rename pkgs/{development/tools/renderizer/default.nix => unit/re/renderizer/pkg-fun.nix} (100%) rename pkgs/{development/tools/reno/default.nix => unit/re/reno/pkg-fun.nix} (100%) rename pkgs/{applications/audio/renoise/default.nix => unit/re/renoise/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/renpy/default.nix => unit/re/renpy/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/re}/renpy/renpy-system-fribidi.diff (100%) rename pkgs/{development/interpreters => unit/re}/renpy/shutup-erofs-errors.patch (100%) rename pkgs/{development/libraries/rep-gtk/default.nix => unit/re/rep-gtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/re}/rep-gtk/setup-hook.sh (100%) rename pkgs/{development/tools/rep/default.nix => unit/re/rep/pkg-fun.nix} (100%) rename pkgs/{build-support/replace-secret/replace-secret.nix => unit/re/replace-secret/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/re}/replace-secret/replace-secret.py (100%) rename pkgs/{build-support => unit/re}/replace-secret/test/expected_long_output (100%) rename pkgs/{build-support => unit/re}/replace-secret/test/expected_short_output (100%) rename pkgs/{build-support => unit/re}/replace-secret/test/input_file (100%) rename pkgs/{build-support => unit/re}/replace-secret/test/passwd (100%) rename pkgs/{build-support => unit/re}/replace-secret/test/rsa (100%) rename pkgs/{tools/text => unit/re}/replace/malloc.patch (100%) rename pkgs/{tools/text/replace/default.nix => unit/re/replace/pkg-fun.nix} (100%) rename pkgs/{build-support/replace-dependency.nix => unit/re/replaceDependency/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/replacement/default.nix => unit/re/replacement/pkg-fun.nix} (100%) rename pkgs/{tools/video => unit/re}/replay-sorcery/fix-global-config.patch (100%) rename pkgs/{tools/video => unit/re}/replay-sorcery/hardcode-libnotify.patch (100%) rename pkgs/{tools/video/replay-sorcery/default.nix => unit/re/replay-sorcery/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/re}/reposurgeon/fix-makefile.patch (100%) rename pkgs/{applications/version-management/reposurgeon/default.nix => unit/re/reposurgeon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/reproc/default.nix => unit/re/reproc/pkg-fun.nix} (100%) rename pkgs/{servers/reproxy/default.nix => unit/re/reproxy/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/repseek/default.nix => unit/re/repseek/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/reptyr/default.nix => unit/re/reptyr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/reredirect/default.nix => unit/re/reredirect/pkg-fun.nix} (100%) rename pkgs/{servers/resgate/default.nix => unit/re/resgate/pkg-fun.nix} (100%) rename pkgs/{applications/networking/resilio-sync/default.nix => unit/re/resilio-sync/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/resim/default.nix => unit/re/resim/pkg-fun.nix} (100%) rename pkgs/{development/libraries/resolv_wrapper/default.nix => unit/re/resolv_wrapper/pkg-fun.nix} (100%) rename pkgs/{development/tools/resolve-march-native/default.nix => unit/re/resolve-march-native/pkg-fun.nix} (100%) rename pkgs/{tools/backup/restic/rest-server.nix => unit/re/restic-rest-server/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/re}/restic/0001-Skip-testing-restore-with-permission-failure.patch (100%) rename pkgs/{tools/backup/restic/default.nix => unit/re/restic/pkg-fun.nix} (100%) rename pkgs/{development/libraries/restinio/default.nix => unit/re/restinio/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/restool/default.nix => unit/re/restool/pkg-fun.nix} (100%) rename pkgs/{applications/misc/remarkable/restream/default.nix => unit/re/restream/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/re}/restya-board/fix_request-uri.patch (100%) rename pkgs/{servers/web-apps/restya-board/default.nix => unit/re/restya-board/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/resvg/default.nix => unit/re/resvg/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/re}/retro-gtk/gio-unix.patch (100%) rename pkgs/{development/libraries/retro-gtk/default.nix => unit/re/retro-gtk/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/retroarch/retroarch-assets.nix => unit/re/retroarch-assets/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/retrofe/default.nix => unit/re/retrofe/pkg-fun.nix} (100%) rename pkgs/{tools/system/retry/default.nix => unit/re/retry/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/reuse/default.nix => unit/re/reuse/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/reviewdog/default.nix => unit/re/reviewdog/pkg-fun.nix} (100%) rename pkgs/{development/tools/revive/default.nix => unit/re/revive/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rewritefs/default.nix => unit/re/rewritefs/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/re}/rewrk/Cargo.lock (100%) rename pkgs/{tools/networking/rewrk/default.nix => unit/re/rewrk/pkg-fun.nix} (100%) rename pkgs/{tools/system/rex/default.nix => unit/re/rex/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/rfc-bibtex/default.nix => unit/rf/rfc-bibtex/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rfc/default.nix => unit/rf/rfc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rfkill/udev.nix => unit/rf/rfkill_udev/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rfkill => unit/rf/rfkill_udev}/rfkill-hook.sh (100%) rename pkgs/{games/rftg/default.nix => unit/rf/rftg/pkg-fun.nix} (100%) rename pkgs/{development/compilers/rgbds/default.nix => unit/rg/rgbds/pkg-fun.nix} (100%) rename pkgs/{tools/text/rgxg/default.nix => unit/rg/rgxg/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/rhack/default.nix => unit/rh/rhack/pkg-fun.nix} (100%) rename pkgs/{tools/security/rhash/default.nix => unit/rh/rhash/pkg-fun.nix} (100%) rename pkgs/{tools/admin/rhoas/default.nix => unit/rh/rhoas/pkg-fun.nix} (100%) rename pkgs/{data/fonts/rhodium-libre/default.nix => unit/rh/rhodium-libre/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/rh}/rhvoice/honor_nix_environment.patch (100%) rename pkgs/{applications/audio/rhvoice/default.nix => unit/rh/rhvoice/pkg-fun.nix} (100%) rename pkgs/{applications/audio/rhythmbox/default.nix => unit/rh/rhythmbox/pkg-fun.nix} (100%) rename pkgs/{misc/rich-cli/default.nix => unit/ri/rich-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/richgo/default.nix => unit/ri/richgo/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ricty/default.nix => unit/ri/ricty/pkg-fun.nix} (100%) rename pkgs/{data/fonts/rictydiminished-with-firacode/default.nix => unit/ri/rictydiminished-with-firacode/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/ri}/riemann-dash/Gemfile (100%) rename pkgs/{servers/monitoring => unit/ri}/riemann-dash/Gemfile.lock (100%) rename pkgs/{servers/monitoring => unit/ri}/riemann-dash/gemset.nix (100%) rename pkgs/{servers/monitoring/riemann-dash/default.nix => unit/ri/riemann-dash/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ri}/riemann-tools/Gemfile (100%) rename pkgs/{tools/misc => unit/ri}/riemann-tools/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/ri}/riemann-tools/gemset.nix (100%) rename pkgs/{tools/misc/riemann-tools/default.nix => unit/ri/riemann-tools/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/riemann/default.nix => unit/ri/riemann/pkg-fun.nix} (100%) rename pkgs/{tools/misc/riemann-c-client/default.nix => unit/ri/riemann_c_client/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/ries/default.nix => unit/ri/ries/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/riff/default.nix => unit/ri/riff/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rig/default.nix => unit/ri/rig/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ri}/rig/rig_1.11-1.diff (100%) rename pkgs/{games/riko4/default.nix => unit/ri/riko4/pkg-fun.nix} (100%) rename pkgs/{games => unit/ri}/rili/moderinze_cpp.patch (100%) rename pkgs/{games/rili/default.nix => unit/ri/rili/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/ri}/rime-data/fetchSchema.nix (100%) rename pkgs/{data/misc => unit/ri}/rime-data/generateFetchSchema.sh (100%) rename pkgs/{data/misc/rime-data/default.nix => unit/ri/rime-data/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rinutils/default.nix => unit/ri/rinutils/pkg-fun.nix} (100%) rename pkgs/{development/tools/riot-redis/default.nix => unit/ri/riot-redis/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ripdrag/default.nix => unit/ri/ripdrag/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ripe-atlas-tools/default.nix => unit/ri/ripe-atlas-tools/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ripmime/default.nix => unit/ri/ripmime/pkg-fun.nix} (100%) rename pkgs/{servers/rippled/validator-keys-tool.nix => unit/ri/rippled-validator-keys-tool/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/ripser/default.nix => unit/ri/ripser/pkg-fun.nix} (100%) rename pkgs/{misc/riscv-pk/default.nix => unit/ri/riscv-pk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ristate/default.nix => unit/ri/ristate/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/river/default.nix => unit/ri/river/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rivercarro/default.nix => unit/ri/rivercarro/pkg-fun.nix} (100%) rename pkgs/{misc/rkdeveloptool-pine64/default.nix => unit/rk/rkdeveloptool-pine64/pkg-fun.nix} (100%) rename pkgs/{misc/rkdeveloptool/default.nix => unit/rk/rkdeveloptool/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/rke/default.nix => unit/rk/rke/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rkflashtool/default.nix => unit/rk/rkflashtool/pkg-fun.nix} (100%) rename pkgs/{applications/audio/rkrlv2/default.nix => unit/rk/rkrlv2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rlaunch/default.nix => unit/rl/rlaunch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rlog/default.nix => unit/rl/rlog/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rlottie/default.nix => unit/rl/rlottie/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rlwrap/default.nix => unit/rl/rlwrap/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rm-improved/default.nix => unit/rm/rm-improved/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/rman/default.nix => unit/rm/rman/pkg-fun.nix} (100%) rename pkgs/{applications/misc/remarkable/rmapi/default.nix => unit/rm/rmapi/pkg-fun.nix} (100%) rename pkgs/{servers/rmfakecloud/default.nix => unit/rm/rmfakecloud/pkg-fun.nix} (100%) rename pkgs/{servers => unit/rm}/rmfakecloud/webui.nix (100%) rename pkgs/{tools/filesystems/rmfuse/default.nix => unit/rm/rmfuse/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/rm}/rmfuse/poetry-git-overlay.nix (100%) rename pkgs/{tools/filesystems => unit/rm}/rmfuse/poetry.lock (100%) rename pkgs/{tools/filesystems => unit/rm}/rmfuse/pyproject.toml (100%) rename pkgs/{tools/filesystems => unit/rm}/rmfuse/update (100%) rename pkgs/{development/compilers/rml/default.nix => unit/rm/rml/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/rmount/default.nix => unit/rm/rmount/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rmtrash/default.nix => unit/rm/rmtrash/pkg-fun.nix} (100%) rename pkgs/{tools/security/rng-tools/default.nix => unit/rn/rng-tools/pkg-fun.nix} (100%) rename pkgs/{tools/nix/rnix-hashes/default.nix => unit/rn/rnix-hashes/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/rnix-lsp/default.nix => unit/rn/rnix-lsp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rnnoise/default.nix => unit/rn/rnnoise/pkg-fun.nix} (100%) rename pkgs/{tools/security/rnp/default.nix => unit/rn/rnp/pkg-fun.nix} (100%) rename pkgs/{tools/text/rnr/default.nix => unit/rn/rnr/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml/rnv/default.nix => unit/rn/rnv/pkg-fun.nix} (100%) rename pkgs/{servers/roapi/http.nix => unit/ro/roapi-http/pkg-fun.nix} (100%) rename pkgs/{development/libraries/robin-map/default.nix => unit/ro/robin-map/pkg-fun.nix} (100%) rename pkgs/{applications/misc/robo3t/default.nix => unit/ro/robo3t/pkg-fun.nix} (100%) rename pkgs/{tools/text/robodoc/default.nix => unit/ro/robodoc/pkg-fun.nix} (100%) rename pkgs/{games/robotfindskitten/default.nix => unit/ro/robotfindskitten/pkg-fun.nix} (100%) rename pkgs/{data/fonts/roboto-mono/default.nix => unit/ro/roboto-mono/pkg-fun.nix} (100%) rename pkgs/{data/fonts/roboto-slab/default.nix => unit/ro/roboto-slab/pkg-fun.nix} (100%) rename pkgs/{data/fonts/roboto/default.nix => unit/ro/roboto/pkg-fun.nix} (100%) rename pkgs/{servers/irc/robustirc-bridge/default.nix => unit/ro/robustirc-bridge/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio => unit/ro}/roc-toolkit/fix-pkgconfig-installation.patch (100%) rename pkgs/{development/libraries/audio/roc-toolkit/default.nix => unit/ro/roc-toolkit/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/roccat-tools/default.nix => unit/ro/roccat-tools/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/rocketchat-desktop/default.nix => unit/ro/rocketchat-desktop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rocksdb/default.nix => unit/ro/rocksdb/pkg-fun.nix} (100%) rename pkgs/{games/rocksndiamonds/default.nix => unit/ro/rocksndiamonds/pkg-fun.nix} (100%) rename pkgs/{development/rocm-modules/update-script/default.nix => unit/ro/rocmUpdateScript/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rofi-bluetooth/default.nix => unit/ro/rofi-bluetooth/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/ro}/rofi-calc/0001-Patch-plugindir-to-output.patch (100%) rename pkgs/{applications/science/math/rofi-calc/default.nix => unit/ro/rofi-calc/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ro}/rofi-emoji/0001-Patch-plugindir-to-output.patch (100%) rename pkgs/{applications/misc/rofi-emoji/default.nix => unit/ro/rofi-emoji/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rofi-file-browser/default.nix => unit/ro/rofi-file-browser/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rofi-menugen/default.nix => unit/ro/rofi-menugen/pkg-fun.nix} (100%) rename pkgs/{applications/audio/rofi-mpd/default.nix => unit/ro/rofi-mpd/pkg-fun.nix} (100%) rename pkgs/{tools/security/pass/rofi-pass.nix => unit/ro/rofi-pass/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rofi-power-menu/default.nix => unit/ro/rofi-power-menu/pkg-fun.nix} (100%) rename pkgs/{applications/audio/rofi-pulse-select/default.nix => unit/ro/rofi-pulse-select/pkg-fun.nix} (100%) rename pkgs/{tools/system/rofi-systemd/default.nix => unit/ro/rofi-systemd/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ro}/rofi-top/0001-Patch-plugindir-to-output.patch (100%) rename pkgs/{applications/misc => unit/ro}/rofi-top/0002-Patch-add-cairo.patch (100%) rename pkgs/{applications/misc/rofi-top/default.nix => unit/ro/rofi-top/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rofi/default.nix => unit/ro/rofi-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/networking/rofi-vpn/default.nix => unit/ro/rofi-vpn/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rofi/wayland.nix => unit/ro/rofi-wayland-unwrapped/pkg-fun.nix} (100%) rename pkgs/{development/tools/rojo/default.nix => unit/ro/rojo/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/rolespec/default.nix => unit/ro/rolespec/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ro}/ronn/Gemfile (100%) rename pkgs/{development/tools => unit/ro}/ronn/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ro}/ronn/gemset.nix (100%) rename pkgs/{development/tools/ronn/default.nix => unit/ro/ronn/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ro}/ronn/test-reproducible-html.nix (100%) rename pkgs/{development/tools/rust/roogle/default.nix => unit/ro/roogle/pkg-fun.nix} (100%) rename pkgs/{applications/audio/roomeqwizard/default.nix => unit/ro/roomeqwizard/pkg-fun.nix} (100%) rename pkgs/{servers/roon-bridge/default.nix => unit/ro/roon-bridge/pkg-fun.nix} (100%) rename pkgs/{servers/roon-server/default.nix => unit/ro/roon-server/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rootbar/default.nix => unit/ro/rootbar/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/rootlesskit/default.nix => unit/ro/rootlesskit/pkg-fun.nix} (100%) rename pkgs/{data/themes/rose-pine-gtk/default.nix => unit/ro/rose-pine-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{data/icons/rose-pine/default.nix => unit/ro/rose-pine-icon-theme/pkg-fun.nix} (100%) rename pkgs/{tools/text/rosie/default.nix => unit/ro/rosie/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/ro}/roslyn/deps.nix (100%) rename pkgs/{development/compilers => unit/ro}/roslyn/extended-deps.nix (100%) rename pkgs/{development/compilers/roslyn/default.nix => unit/ro/roslyn/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ro}/roswell/0001-get-image-from-environment.patch (100%) rename pkgs/{development/tools/roswell/default.nix => unit/ro/roswell/pkg-fun.nix} (100%) rename pkgs/{tools/backup/rotate-backups/default.nix => unit/ro/rotate-backups/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rote/default.nix => unit/ro/rote/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/round/default.nix => unit/ro/round/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ro}/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch (100%) rename pkgs/{servers/roundcube/default.nix => unit/ro/roundcube/pkg-fun.nix} (100%) rename pkgs/{data/fonts/rounded-mgenplus/default.nix => unit/ro/rounded-mgenplus/pkg-fun.nix} (100%) rename pkgs/{tools/misc/roundup/default.nix => unit/ro/roundup/pkg-fun.nix} (100%) rename pkgs/{data/fonts/route159/default.nix => unit/ro/route159/pkg-fun.nix} (100%) rename pkgs/{tools/security/routersploit/default.nix => unit/ro/routersploit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/routino/default.nix => unit/ro/routino/pkg-fun.nix} (100%) rename pkgs/{development/tools/rover/default.nix => unit/ro/rover/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ro}/rover/schema/etag.id (100%) rename pkgs/{development/tools => unit/ro}/rover/schema/schema.graphql (100%) rename pkgs/{development/tools => unit/ro}/rover/update.sh (100%) rename pkgs/{tools/system/rowhammer-test/default.nix => unit/ro/rowhammer-test/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/roxctl/default.nix => unit/ro/roxctl/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/roxterm/default.nix => unit/ro/roxterm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rp-pppoe/default.nix => unit/rp/rpPPPoE/pkg-fun.nix} (100%) rename pkgs/{servers/rpcbind/default.nix => unit/rp/rpcbind/pkg-fun.nix} (100%) rename pkgs/{servers => unit/rp}/rpcbind/sunrpc.patch (100%) rename pkgs/{tools/misc/rpcsvc-proto/default.nix => unit/rp/rpcsvc-proto/pkg-fun.nix} (100%) rename pkgs/{games/rpg-cli/default.nix => unit/rp/rpg-cli/pkg-fun.nix} (100%) rename pkgs/{development/misc/rpiboot/default.nix => unit/rp/rpiboot/pkg-fun.nix} (100%) rename pkgs/{servers/rpiplay/default.nix => unit/rp/rpiplay/pkg-fun.nix} (100%) rename pkgs/{tools/text/rpl/default.nix => unit/rp/rpl/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/rp}/rpl/remove-argparse-manpage.diff (100%) rename pkgs/{tools/archivers/rpm2targz/default.nix => unit/rp/rpm2targz/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/rpmextract/default.nix => unit/rp/rpmextract/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/rp}/rpmextract/rpmextract.sh (100%) rename pkgs/{development/tools/rq/default.nix => unit/rq/rq/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/rr/default.nix => unit/rr/rr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rrdtool/default.nix => unit/rr/rrdtool/pkg-fun.nix} (100%) rename pkgs/{games/rrootage/default.nix => unit/rr/rrootage/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sync/rsync/rrsync.nix => unit/rr/rrsync/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/rs-git-fsmonitor/default.nix => unit/rs/rs-git-fsmonitor/pkg-fun.nix} (100%) rename pkgs/{tools/text/rs/default.nix => unit/rs/rs/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/rsass/default.nix => unit/rs/rsass/pkg-fun.nix} (100%) rename pkgs/{tools/backup/rsbep/default.nix => unit/rs/rsbep/pkg-fun.nix} (100%) rename pkgs/{tools/text/rsbkb/default.nix => unit/rs/rsbkb/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rsclock/default.nix => unit/rs/rsclock/pkg-fun.nix} (100%) rename pkgs/{applications/radio/rscw/default.nix => unit/rs/rscw/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/rs}/rset/paths.patch (100%) rename pkgs/{tools/admin/rset/default.nix => unit/rs/rset/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rshijack/default.nix => unit/rs/rshijack/pkg-fun.nix} (100%) rename pkgs/{development/tools/rslint/default.nix => unit/rs/rslint/pkg-fun.nix} (100%) rename pkgs/{tools/backup/rsnapshot/default.nix => unit/rs/rsnapshot/pkg-fun.nix} (100%) rename pkgs/{servers/mail/rspamd/default.nix => unit/rs/rspamd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rss-bridge-cli/default.nix => unit/rs/rss-bridge-cli/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/rss-bridge/default.nix => unit/rs/rss-bridge/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers => unit/rs}/rss-glx/cstddef.patch (100%) rename pkgs/{misc/screensavers/rss-glx/default.nix => unit/rs/rss-glx/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/rsstail/default.nix => unit/rs/rsstail/pkg-fun.nix} (100%) rename pkgs/{tools/text/rst2html5/default.nix => unit/rs/rst2html5/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rt-tests/default.nix => unit/rt/rt-tests/pkg-fun.nix} (100%) rename pkgs/{servers => unit/rt}/rt/dont-check-users_groups.patch (100%) rename pkgs/{servers => unit/rt}/rt/override-generated.patch (100%) rename pkgs/{servers/rt/default.nix => unit/rt/rt/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/rt5677/default.nix => unit/rt/rt5677-firmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/rtkit/default.nix => unit/rt/rtkit/pkg-fun.nix} (100%) rename pkgs/{applications/radio/rtl-ais/default.nix => unit/rt/rtl-ais/pkg-fun.nix} (100%) rename pkgs/{applications/radio/rtl-sdr/default.nix => unit/rt/rtl-sdr/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/rtl8192su-firmware/default.nix => unit/rt/rtl8192su-firmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/rtl8723bs-firmware/default.nix => unit/rt/rtl8723bs-firmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/rtl8761b-firmware/default.nix => unit/rt/rtl8761b-firmware/pkg-fun.nix} (100%) rename pkgs/{applications/radio/rtl_433/default.nix => unit/rt/rtl_433/pkg-fun.nix} (100%) rename pkgs/{tools/video/rtmpdump/default.nix => unit/rt/rtmpdump/pkg-fun.nix} (100%) rename pkgs/{tools/networking/rtptools/default.nix => unit/rt/rtptools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rtrlib/default.nix => unit/rt/rtrlib/pkg-fun.nix} (100%) rename pkgs/{servers/rtsp-simple-server/default.nix => unit/rt/rtsp-simple-server/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/rtss/default.nix => unit/rt/rtss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rttr/default.nix => unit/rt/rttr/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/rtw88-firmware/default.nix => unit/rt/rtw88-firmware/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/rtw89-firmware/default.nix => unit/rt/rtw89-firmware/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/rubber/default.nix => unit/ru/rubber/pkg-fun.nix} (100%) rename pkgs/{development/libraries/rubberband/default.nix => unit/ru/rubberband/pkg-fun.nix} (100%) rename pkgs/{data/fonts/rubik/default.nix => unit/ru/rubik/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/rubiks/default.nix => unit/ru/rubiks/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/ru}/ruby-zoom/Gemfile (100%) rename pkgs/{tools/text => unit/ru}/ruby-zoom/Gemfile.lock (100%) rename pkgs/{tools/text => unit/ru}/ruby-zoom/gemset.nix (100%) rename pkgs/{tools/text/ruby-zoom/default.nix => unit/ru/ruby-zoom/pkg-fun.nix} (100%) rename pkgs/{applications/audio/rubyripper/default.nix => unit/ru/rubyripper/pkg-fun.nix} (100%) rename pkgs/{development/tools/rucksack/default.nix => unit/ru/rucksack/pkg-fun.nix} (100%) rename pkgs/{development/tools/ruff/default.nix => unit/ru/ruff/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/ruffle/default.nix => unit/ru/ruffle/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ru}/rufo/Gemfile (100%) rename pkgs/{development/tools => unit/ru}/rufo/Gemfile.lock (100%) rename pkgs/{development/tools => unit/ru}/rufo/gemset.nix (100%) rename pkgs/{development/tools/rufo/default.nix => unit/ru/rufo/pkg-fun.nix} (100%) rename pkgs/{tools/security/ruler/default.nix => unit/ru/ruler/pkg-fun.nix} (100%) rename pkgs/{games/npush/run.nix => unit/ru/run-npush/pkg-fun.nix} (100%) rename pkgs/{tools/X11/run-scaled/default.nix => unit/ru/run-scaled/pkg-fun.nix} (100%) rename pkgs/{development/tools/run/default.nix => unit/ru/run/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/runc/default.nix => unit/ru/runc/pkg-fun.nix} (100%) rename pkgs/{development/tools/rund/default.nix => unit/ru/rund/pkg-fun.nix} (100%) rename pkgs/{games/runelite/default.nix => unit/ru/runelite/pkg-fun.nix} (100%) rename pkgs/{games/runescape-launcher/default.nix => unit/ru/runescape/pkg-fun.nix} (100%) rename pkgs/{tools/text/runiq/default.nix => unit/ru/runiq/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/ru}/runit/fix-ar-ranlib.patch (100%) rename pkgs/{tools/system/runit/default.nix => unit/ru/runit/pkg-fun.nix} (100%) rename pkgs/{tools/system/runitor/default.nix => unit/ru/runitor/pkg-fun.nix} (100%) rename pkgs/{tools/X11/runningx/default.nix => unit/ru/runningx/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/runzip/default.nix => unit/ru/runzip/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ru}/rure/Cargo.lock (100%) rename pkgs/{development/libraries => unit/ru}/rure/pin.json (100%) rename pkgs/{development/libraries/rure/default.nix => unit/ru/rure/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ru}/rure/update.sh (100%) rename pkgs/{shells/rush/default.nix => unit/ru/rush/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/rust-analyzer/wrapper.nix => unit/ru/rust-analyzer/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/rust-audit-info/default.nix => unit/ru/rust-audit-info/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/bindgen/unwrapped.nix => unit/ru/rust-bindgen-unwrapped/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/bindgen/default.nix => unit/ru/rust-bindgen/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/bindgen => unit/ru/rust-bindgen}/wrapper.sh (100%) rename pkgs/{development/tools/rust-code-analysis/default.nix => unit/ru/rust-code-analysis/pkg-fun.nix} (100%) rename pkgs/{tools/text/rust-petname/default.nix => unit/ru/rust-petname/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/rust-script/default.nix => unit/ru/rust-script/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ru}/rustc-demangle/add-Cargo.lock.patch (100%) rename pkgs/{development/libraries/rustc-demangle/default.nix => unit/ru/rustc-demangle/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote => unit/ru}/rustdesk/cargo.patch (100%) rename pkgs/{applications/networking/remote => unit/ru}/rustdesk/fix-for-rust-1.65.diff (100%) rename pkgs/{applications/networking/remote/rustdesk/default.nix => unit/ru/rustdesk/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/rusty-man/default.nix => unit/ru/rusty-man/pkg-fun.nix} (100%) rename pkgs/{applications/misc/rusty-psn/default.nix => unit/ru/rusty-psn/pkg-fun.nix} (100%) rename pkgs/{servers/rustypaste/default.nix => unit/ru/rustypaste/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ruwudu/default.nix => unit/ru/ruwudu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/rw/default.nix => unit/rw/rw/pkg-fun.nix} (100%) rename pkgs/{tools/system/rwc/default.nix => unit/rw/rwc/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/rx/default.nix => unit/rx/rx/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml/rxp/default.nix => unit/rx/rxp/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode => unit/rx/rxvt-unicode-unwrapped}/patches/256-color-resources.patch (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode => unit/rx/rxvt-unicode-unwrapped}/patches/9.06-font-width.patch (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode => unit/rx/rxvt-unicode-unwrapped}/patches/makefile-phony.patch (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode/default.nix => unit/rx/rxvt-unicode-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/rxvt-unicode/wrapper.nix => unit/rx/rxvt-unicode/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/rxvt/default.nix => unit/rx/rxvt/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/ry}/ryujinx/appdir.patch (100%) rename pkgs/{applications/emulators => unit/ry}/ryujinx/deps.nix (100%) rename pkgs/{applications/emulators/ryujinx/default.nix => unit/ry/ryujinx/pkg-fun.nix} (100%) rename pkgs/{applications/emulators => unit/ry}/ryujinx/updater.sh (100%) rename pkgs/{os-specific/linux/ryzenadj/default.nix => unit/ry/ryzenadj/pkg-fun.nix} (100%) rename pkgs/{tools/compression/rzip/default.nix => unit/rz/rzip/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/s-tar/default.nix => unit/s-/s-tar/pkg-fun.nix} (100%) rename pkgs/{tools/system/s-tui/default.nix => unit/s-/s-tui/pkg-fun.nix} (100%) rename pkgs/{development/libraries/s2geometry/default.nix => unit/s2/s2geometry/pkg-fun.nix} (100%) rename pkgs/{development/libraries/s2n-tls/default.nix => unit/s2/s2n-tls/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/s2png/default.nix => unit/s2/s2png/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/s3backer/default.nix => unit/s3/s3backer/pkg-fun.nix} (100%) rename pkgs/{tools/admin/s3bro/default.nix => unit/s3/s3bro/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/s3fs/default.nix => unit/s3/s3fs/pkg-fun.nix} (100%) rename pkgs/{tools/backup/s3ql/default.nix => unit/s3/s3ql/pkg-fun.nix} (100%) rename pkgs/{tools/networking/s4cmd/default.nix => unit/s4/s4cmd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/s5cmd/default.nix => unit/s5/s5cmd/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/s9fes/default.nix => unit/s9/s9fes/pkg-fun.nix} (100%) rename pkgs/{servers/sabnzbd/default.nix => unit/sa/sabnzbd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sacad/default.nix => unit/sa/sacad/pkg-fun.nix} (100%) rename pkgs/{applications/networking/gopher/sacc/default.nix => unit/sa/sacc/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/sacd/default.nix => unit/sa/sacd/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics => unit/sa}/sacrifice/compat.patch (100%) rename pkgs/{applications/science/physics/sacrifice/default.nix => unit/sa/sacrifice/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics => unit/sa}/sacrifice/pythia83xx.patch (100%) rename pkgs/{tools/text/sad/default.nix => unit/sa/sad/pkg-fun.nix} (100%) rename pkgs/{tools/system/safe-rm/default.nix => unit/sa/safe-rm/pkg-fun.nix} (100%) rename pkgs/{tools/security/safe/default.nix => unit/sa/safe/pkg-fun.nix} (100%) rename pkgs/{tools/system/safecopy/default.nix => unit/sa/safecopy/pkg-fun.nix} (100%) rename pkgs/{applications/misc/safeeyes/default.nix => unit/sa/safeeyes/pkg-fun.nix} (100%) rename pkgs/{development/libraries/safefile/default.nix => unit/sa/safefile/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/sa}/sage/env-locations.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/configurationpy-error-verbose.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/disable-slow-glpk-test.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/do-not-test-find-library.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/fix-ecl-race.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/ipywidgets-on_submit-deprecationwarning.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/linbox-1.7-upgrade.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/pari-2.15.1-upgrade-rebased.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/sphinx-docbuild-subprocesses.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/sympow-cache.patch (100%) rename pkgs/{applications/science/math => unit/sa}/sage/patches/tachyon-renamed-focallength.patch (100%) rename pkgs/{applications/science/math/sage/default.nix => unit/sa/sage/pkg-fun.nix} (100%) rename pkgs/{applications/science/math => unit/sa}/sage/python-modules/sage-docbuild.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/python-modules/sage-setup.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sage-env.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sage-src.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sage-tests.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sage-with-env.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sage.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sagedoc.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/sagelib.nix (100%) rename pkgs/{applications/science/math => unit/sa}/sage/threejs-sage.nix (100%) rename pkgs/{misc/sagetex/default.nix => unit/sa/sagetex/pkg-fun.nix} (100%) rename pkgs/{development/compilers/sagittarius-scheme/default.nix => unit/sa/sagittarius-scheme/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sagoin/default.nix => unit/sa/sagoin/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sahel-fonts/default.nix => unit/sa/sahel-fonts/pkg-fun.nix} (100%) rename pkgs/{misc/sailsd/default.nix => unit/sa/sailsd/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/sakura/default.nix => unit/sa/sakura/pkg-fun.nix} (100%) rename pkgs/{tools/networking/saldl/default.nix => unit/sa/saldl/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/saleae-logic-2/default.nix => unit/sa/saleae-logic-2/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/saleae-logic/default.nix => unit/sa/saleae-logic/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/sa}/saleae-logic/preload.c (100%) rename pkgs/{tools/admin => unit/sa}/salt/fix-libcrypto-loading.patch (100%) rename pkgs/{tools/admin/salt/default.nix => unit/sa/salt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sam-ba/default.nix => unit/sa/sam-ba/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/sambamba/default.nix => unit/sa/sambamba/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/samblaster/default.nix => unit/sa/samblaster/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/sameboy/default.nix => unit/sa/sameboy/pkg-fun.nix} (100%) rename pkgs/{data/fonts/samim-fonts/default.nix => unit/sa/samim-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/security/sammler/default.nix => unit/sa/sammler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sampler/default.nix => unit/sa/sampler/pkg-fun.nix} (100%) rename pkgs/{tools/networking/samplicator/default.nix => unit/sa/samplicator/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sampradaya/default.nix => unit/sa/sampradaya/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/samsung/1.00.36 => unit/sa/samsung-unified-linux-driver_1_00_36}/module.nix (100%) rename pkgs/{misc/cups/drivers/samsung/1.00.36/default.nix => unit/sa/samsung-unified-linux-driver_1_00_36/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/samsung/1.00.37.nix => unit/sa/samsung-unified-linux-driver_1_00_37/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/samsung/4.01.17.nix => unit/sa/samsung-unified-linux-driver_4_01_17/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/samtools/default.nix => unit/sa/samtools/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/samurai/default.nix => unit/sa/samurai/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sanctity/default.nix => unit/sa/sanctity/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/sandboxfs/default.nix => unit/sa/sandboxfs/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/backends/airscan/default.nix => unit/sa/sane-airscan/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/drivers.nix => unit/sa/sane-drivers/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/sane/frontends.nix => unit/sa/sane-frontends/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/sanjuuni/default.nix => unit/sa/sanjuuni/pkg-fun.nix} (100%) rename pkgs/{tools/backup/sanoid/default.nix => unit/sa/sanoid/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sarasa-gothic/default.nix => unit/sa/sarasa-gothic/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/sasquatch/default.nix => unit/sa/sasquatch/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/sa}/sass/Gemfile (100%) rename pkgs/{development/tools => unit/sa}/sass/Gemfile.lock (100%) rename pkgs/{development/tools => unit/sa}/sass/gemset.nix (100%) rename pkgs/{development/tools/sass/default.nix => unit/sa/sass/pkg-fun.nix} (100%) rename pkgs/{development/tools/sassc/default.nix => unit/sa/sassc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sasutils/default.nix => unit/sa/sasutils/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/satysfi/default.nix => unit/sa/satysfi/pkg-fun.nix} (100%) rename pkgs/{development/tools/sauce-connect/default.nix => unit/sa/sauce-connect/pkg-fun.nix} (100%) rename pkgs/{games/sauerbraten/default.nix => unit/sa/sauerbraten/pkg-fun.nix} (100%) rename pkgs/{tools/misc/savepagenow/default.nix => unit/sa/savepagenow/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/saw-tools/default.nix => unit/sa/saw-tools/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sawfish/default.nix => unit/sa/sawfish/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/sawjap/default.nix => unit/sa/sawjap/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sbagen/default.nix => unit/sb/sbagen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sbc/default.nix => unit/sb/sbc/pkg-fun.nix} (100%) rename pkgs/{development/compilers/sbcl/bootstrap.nix => unit/sb/sbclBootstrap/pkg-fun.nix} (100%) rename pkgs/{tools/security/sbctl/default.nix => unit/sb/sbctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sblim-sfcc/default.nix => unit/sb/sblim-sfcc/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/sbt-extras/default.nix => unit/sb/sbt-extras/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/sbt/scala-native.nix => unit/sb/sbt-with-scala-native/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/sbt/default.nix => unit/sb/sbt/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sc-im/default.nix => unit/sc/sc-im/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning => unit/sc}/sc2-headless/maps.nix (100%) rename pkgs/{applications/science/machine-learning/sc2-headless/default.nix => unit/sc/sc2-headless/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sc68/default.nix => unit/sc/sc68/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/scala-cli/default.nix => unit/sc/scala-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/sc}/scala-cli/sources.json (100%) rename pkgs/{development/tools/build-managers => unit/sc}/scala-cli/update.nix (100%) rename pkgs/{development/compilers/scala => unit/sc/scala_3}/bare.nix (100%) rename pkgs/{development/compilers/scala/default.nix => unit/sc/scala_3/pkg-fun.nix} (100%) rename pkgs/{development/tools/scalafmt/default.nix => unit/sc/scalafmt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/scalapack/default.nix => unit/sc/scalapack/pkg-fun.nix} (100%) rename pkgs/{applications/networking/scaleft/default.nix => unit/sc/scaleft/pkg-fun.nix} (100%) rename pkgs/{tools/admin/scaleway-cli/default.nix => unit/sc/scaleway-cli/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/scalp/default.nix => unit/sc/scalp/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/scanbd/default.nix => unit/sc/scanbd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/scanmem/default.nix => unit/sc/scanmem/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/scantailor/default.nix => unit/sc/scantailor/pkg-fun.nix} (100%) rename pkgs/{tools/games => unit/sc}/scarab/deps.nix (100%) rename pkgs/{tools/games/scarab/default.nix => unit/sc/scarab/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/scc/default.nix => unit/sc/scc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/scdl/default.nix => unit/sc/scdl/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/scdoc/default.nix => unit/sc/scdoc/pkg-fun.nix} (100%) rename pkgs/{development/tools/scenebuilder/default.nix => unit/sc/scenebuilder/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/schedtool/default.nix => unit/sc/schedtool/pkg-fun.nix} (100%) rename pkgs/{tools/text/schema2ldif/default.nix => unit/sc/schema2ldif/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/schemaspy/default.nix => unit/sc/schemaspy/pkg-fun.nix} (100%) rename pkgs/{development/scheme-modules/scheme-bytestructures/default.nix => unit/sc/scheme-bytestructures/pkg-fun.nix} (100%) rename pkgs/{data/documentation/scheme-manpages/default.nix => unit/sc/scheme-manpages/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/scheme48/default.nix => unit/sc/scheme48/pkg-fun.nix} (100%) rename pkgs/{applications/audio/schismtracker/default.nix => unit/sc/schismtracker/pkg-fun.nix} (100%) rename pkgs/{tools/security/schleuder/cli => unit/sc/schleuder-cli}/Gemfile (100%) rename pkgs/{tools/security/schleuder/cli => unit/sc/schleuder-cli}/Gemfile.lock (100%) rename pkgs/{tools/security/schleuder/cli => unit/sc/schleuder-cli}/gemset.nix (100%) rename pkgs/{tools/security/schleuder/cli/default.nix => unit/sc/schleuder-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/schleuder/default.nix => unit/sc/schleuder/pkg-fun.nix} (100%) rename pkgs/{data/fonts/scientifica/default.nix => unit/sc/scientifica/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/scilab-bin/default.nix => unit/sc/scilab-bin/pkg-fun.nix} (100%) rename pkgs/{tools/security/scilla/default.nix => unit/sc/scilla/pkg-fun.nix} (100%) rename pkgs/{misc/scimark/default.nix => unit/sc/scimark/pkg-fun.nix} (100%) rename pkgs/{applications/editors/scite/default.nix => unit/sc/scite/pkg-fun.nix} (100%) rename pkgs/{applications/misc/scli/default.nix => unit/sc/scli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/scmccid/default.nix => unit/sc/scmccid/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/scmpuff/default.nix => unit/sc/scmpuff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/scope-lite/default.nix => unit/sc/scope-lite/pkg-fun.nix} (100%) rename pkgs/{games => unit/sc}/scorched3d/file-existence.patch (100%) rename pkgs/{games/scorched3d/default.nix => unit/sc/scorched3d/pkg-fun.nix} (100%) rename pkgs/{tools/security/scorecard/default.nix => unit/sc/scorecard/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/scotch/default.nix => unit/sc/scotch/pkg-fun.nix} (100%) rename pkgs/{data/misc/scowl/default.nix => unit/sc/scowl/pkg-fun.nix} (100%) rename pkgs/{shells/scponly/default.nix => unit/sc/scponly/pkg-fun.nix} (100%) rename pkgs/{shells => unit/sc}/scponly/scponly-fix-make.patch (100%) rename pkgs/{tools/text/scraper/default.nix => unit/sc/scraper/pkg-fun.nix} (100%) rename pkgs/{applications/audio/scream/default.nix => unit/sc/scream/pkg-fun.nix} (100%) rename pkgs/{tools/X11/screen-message/default.nix => unit/sc/screen-message/pkg-fun.nix} (100%) rename pkgs/{tools/misc/screenfetch/default.nix => unit/sc/screenfetch/pkg-fun.nix} (100%) rename pkgs/{applications/video/screenkey/default.nix => unit/sc/screenkey/pkg-fun.nix} (100%) rename pkgs/{development/libraries/scriptaculous/default.nix => unit/sc/scriptaculous/pkg-fun.nix} (100%) rename pkgs/{games/scrolls/default.nix => unit/sc/scrolls/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/scrot/default.nix => unit/sc/scrot/pkg-fun.nix} (100%) rename pkgs/{tools/misc/scrub/default.nix => unit/sc/scrub/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/sc}/scryer-prolog/cargo.patch (100%) rename pkgs/{development/compilers/scryer-prolog/default.nix => unit/sc/scryer-prolog/pkg-fun.nix} (100%) rename pkgs/{tools/security/scrypt/default.nix => unit/sc/scrypt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/scs/default.nix => unit/sc/scs/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/scsh/default.nix => unit/sc/scsh/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/sc}/scss-lint/Gemfile (100%) rename pkgs/{development/tools => unit/sc}/scss-lint/Gemfile.lock (100%) rename pkgs/{development/tools => unit/sc}/scss-lint/gemset.nix (100%) rename pkgs/{development/tools/scss-lint/default.nix => unit/sc/scss-lint/pkg-fun.nix} (100%) rename pkgs/{tools/X11/sct/default.nix => unit/sc/sct/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/scudcloud/default.nix => unit/sc/scudcloud/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL2_gfx/default.nix => unit/sd/SDL2_gfx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL2_net/default.nix => unit/sd/SDL2_net/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL2_ttf/default.nix => unit/sd/SDL2_ttf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL2_ttf/2.0.15.nix => unit/sd/SDL2_ttf_2_0_15/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sd}/SDL_Pango/fixes.patch (100%) rename pkgs/{development/libraries/SDL_Pango/default.nix => unit/sd/SDL_Pango/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_audiolib/default.nix => unit/sd/SDL_audiolib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_gfx/default.nix => unit/sd/SDL_gfx/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_gpu/default.nix => unit/sd/SDL_gpu/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_image/default.nix => unit/sd/SDL_image/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_mixer/default.nix => unit/sd/SDL_mixer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_net/default.nix => unit/sd/SDL_net/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_sixel/default.nix => unit/sd/SDL_sixel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_sound/default.nix => unit/sd/SDL_sound/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_stretch/default.nix => unit/sd/SDL_stretch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/SDL_ttf/default.nix => unit/sd/SDL_ttf/pkg-fun.nix} (100%) rename pkgs/{development/tools/sd-local/default.nix => unit/sd/sd-local/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sd-mux-ctrl/default.nix => unit/sd/sd-mux-ctrl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sd-switch/default.nix => unit/sd/sd-switch/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/sdat2img/default.nix => unit/sd/sdat2img/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sdate/default.nix => unit/sd/sdate/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sdbus-cpp/default.nix => unit/sd/sdbus-cpp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sdcv/default.nix => unit/sd/sdcv/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sdl-jstest/default.nix => unit/sd/sdl-jstest/pkg-fun.nix} (100%) rename pkgs/{tools/security/sdlookup/default.nix => unit/sd/sdlookup/pkg-fun.nix} (100%) rename pkgs/{games/sdlpop/default.nix => unit/sd/sdlpop/pkg-fun.nix} (100%) rename pkgs/{games => unit/sd}/sdlpop/prince.sh (100%) rename pkgs/{os-specific/linux/sdparm/default.nix => unit/sd/sdparm/pkg-fun.nix} (100%) rename pkgs/{applications/radio/sdrplay/default.nix => unit/sd/sdrplay/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/seabios/default.nix => unit/se/seabios/pkg-fun.nix} (100%) rename pkgs/{servers => unit/se}/seafile-server/libevhtp.nix (100%) rename pkgs/{servers/seafile-server/default.nix => unit/se/seafile-server/pkg-fun.nix} (100%) rename pkgs/{misc/seafile-shared/default.nix => unit/se/seafile-shared/pkg-fun.nix} (100%) rename pkgs/{applications/networking/seahub/default.nix => unit/se/seahub/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sealcurses/default.nix => unit/se/sealcurses/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/searx/default.nix => unit/se/searx/pkg-fun.nix} (100%) rename pkgs/{applications/misc/seashells/default.nix => unit/se/seashells/pkg-fun.nix} (100%) rename pkgs/{development/libraries/seasocks/default.nix => unit/se/seasocks/pkg-fun.nix} (100%) rename pkgs/{applications/misc/seatd/default.nix => unit/se/seatd/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/seaview/default.nix => unit/se/seaview/pkg-fun.nix} (100%) rename pkgs/{applications/networking/seaweedfs/default.nix => unit/se/seaweedfs/pkg-fun.nix} (100%) rename pkgs/{tools/admin/sec/default.nix => unit/se/sec/pkg-fun.nix} (100%) rename pkgs/{tools/security/seccure/default.nix => unit/se/seccure/pkg-fun.nix} (100%) rename pkgs/{tools/security/secp256k1/default.nix => unit/se/secp256k1/pkg-fun.nix} (100%) rename pkgs/{tools/security/secrets-extractor/default.nix => unit/se/secrets-extractor/pkg-fun.nix} (100%) rename pkgs/{tools/security/secretscanner/default.nix => unit/se/secretscanner/pkg-fun.nix} (100%) rename pkgs/{tools/security/sedutil/default.nix => unit/se/sedutil/pkg-fun.nix} (100%) rename pkgs/{tools/text/seehecht/default.nix => unit/se/seehecht/pkg-fun.nix} (100%) rename pkgs/{development/compilers/seexpr/default.nix => unit/se/seexpr/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/segger-jlink/default.nix => unit/se/segger-jlink/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/segger-ozone/default.nix => unit/se/segger-ozone/pkg-fun.nix} (100%) rename pkgs/{development/tools/selenium/selendroid/default.nix => unit/se/selendroid/pkg-fun.nix} (100%) rename pkgs/{development/tools/selene/default.nix => unit/se/selene/pkg-fun.nix} (100%) rename pkgs/{development/tools/selenium/server/default.nix => unit/se/selenium-server-standalone/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/selfoss/default.nix => unit/se/selfoss/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/selinux-python/default.nix => unit/se/selinux-python/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/selinux-sandbox/default.nix => unit/se/selinux-sandbox/pkg-fun.nix} (100%) rename pkgs/{tools/misc/semiphemeral/default.nix => unit/se/semiphemeral/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/semodule-utils/default.nix => unit/se/semodule-utils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/semver-cpp/default.nix => unit/se/semver-cpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/semver-tool/default.nix => unit/se/semver-tool/pkg-fun.nix} (100%) rename pkgs/{applications/misc/semver/default.nix => unit/se/semver/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/senpai/default.nix => unit/se/senpai/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/se}/sensu/Gemfile (100%) rename pkgs/{servers/monitoring => unit/se}/sensu/Gemfile.lock (100%) rename pkgs/{servers/monitoring => unit/se}/sensu/gemset.nix (100%) rename pkgs/{servers/monitoring/sensu/default.nix => unit/se/sensu/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sent/default.nix => unit/se/sent/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sentencepiece/default.nix => unit/se/sentencepiece/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sentry-native/default.nix => unit/se/sentry-native/pkg-fun.nix} (100%) rename pkgs/{applications/misc/senv/default.nix => unit/se/senv/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/se}/seq24/mutex_no_nameclash.patch (100%) rename pkgs/{applications/audio/seq24/default.nix => unit/se/seq24/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/seqkit/default.nix => unit/se/seqkit/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/seqtk/default.nix => unit/se/seqtk/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sequeler/default.nix => unit/se/sequeler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sequelpro/default.nix => unit/se/sequelpro/pkg-fun.nix} (100%) rename pkgs/{tools/security/sequoia-chameleon-gnupg/default.nix => unit/se/sequoia-chameleon-gnupg/pkg-fun.nix} (100%) rename pkgs/{servers/ser2net/default.nix => unit/se/ser2net/pkg-fun.nix} (100%) rename pkgs/{development/libraries/serd/default.nix => unit/se/serd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/seren/default.nix => unit/se/seren/pkg-fun.nix} (100%) rename pkgs/{servers/serf/default.nix => unit/se/serfdom/pkg-fun.nix} (100%) rename pkgs/{development/libraries/serialdv/default.nix => unit/se/serialdv/pkg-fun.nix} (100%) rename pkgs/{development/compilers/serpent/default.nix => unit/se/serpent/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/service-wrapper/default.nix => unit/se/service-wrapper/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/se}/service-wrapper/service-wrapper.sh (100%) rename pkgs/{servers/serviio/default.nix => unit/se/serviio/pkg-fun.nix} (100%) rename pkgs/{data/fonts/seshat/default.nix => unit/se/seshat/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/session-desktop/default.nix => unit/se/session-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/audio/setbfree/default.nix => unit/se/setbfree/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/setools/default.nix => unit/se/setools/pkg-fun.nix} (100%) rename pkgs/{tools/X11/setroot/default.nix => unit/se/setroot/pkg-fun.nix} (100%) rename pkgs/{tools/system/setserial/default.nix => unit/se/setserial/pkg-fun.nix} (100%) rename pkgs/{build-support/setup-systemd-units.nix => unit/se/setupSystemdUnits/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/seturgent/default.nix => unit/se/seturgent/pkg-fun.nix} (100%) rename pkgs/{applications/editors/setzer/default.nix => unit/se/setzer/pkg-fun.nix} (100%) rename pkgs/{tools/admin/sewer/default.nix => unit/se/sewer/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/seyren/default.nix => unit/se/seyren/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sfeed/default.nix => unit/sf/sfeed/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sfizz/default.nix => unit/sf/sfizz/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/sfm/default.nix => unit/sf/sfm/pkg-fun.nix} (100%) rename pkgs/{games/sfrotz/default.nix => unit/sf/sfrotz/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sfsexp/default.nix => unit/sf/sfsexp/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/sftpman/default.nix => unit/sf/sftpman/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sfxr/default.nix => unit/sf/sfxr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sfz/default.nix => unit/sf/sfz/pkg-fun.nix} (100%) rename pkgs/{tools/system/sg3_utils/default.nix => unit/sg/sg3_utils/pkg-fun.nix} (100%) rename pkgs/{tools/security/sget/default.nix => unit/sg/sget/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sgp4/default.nix => unit/sg/sgp4/pkg-fun.nix} (100%) rename pkgs/{tools/text/sgrep/default.nix => unit/sg/sgrep/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sgx/azure-dcap-client/default.nix => unit/sg/sgx-azure-dcap-client/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sgx/azure-dcap-client => unit/sg/sgx-azure-dcap-client}/test-suite.nix (100%) rename pkgs/{os-specific/linux/sgx/psw/default.nix => unit/sg/sgx-psw/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sgx/ssl => unit/sg/sgx-ssl}/intel-sgx-ssl-pr-111.patch (100%) rename pkgs/{os-specific/linux/sgx/ssl/default.nix => unit/sg/sgx-ssl/pkg-fun.nix} (100%) rename pkgs/{tools/security/sha1collisiondetection/default.nix => unit/sh/sha1collisiondetection/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/shaarli/default.nix => unit/sh/shaarli/pkg-fun.nix} (100%) rename pkgs/{tools/text/shab/default.nix => unit/sh/shab/pkg-fun.nix} (100%) rename pkgs/{data/fonts/shabnam-fonts/default.nix => unit/sh/shabnam-fonts/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/sh}/shadered/install_path_fix.patch (100%) rename pkgs/{development/tools/shadered/default.nix => unit/sh/shadered/pkg-fun.nix} (100%) rename pkgs/{data/themes/shades-of-gray/default.nix => unit/sh/shades-of-gray-theme/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/sh}/shadow/fix-install-with-tcb.patch (100%) rename pkgs/{os-specific/linux => unit/sh}/shadow/keep-path.patch (100%) rename pkgs/{os-specific/linux/shadow/default.nix => unit/sh/shadow/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/sh}/shadow/respect-xml-catalog-files-var.patch (100%) rename pkgs/{os-specific/linux => unit/sh}/shadow/runtime-shell.patch (100%) rename pkgs/{tools/networking/shadowfox/default.nix => unit/sh/shadowfox/pkg-fun.nix} (100%) rename pkgs/{tools/networking/shadowsocks-libev/default.nix => unit/sh/shadowsocks-libev/pkg-fun.nix} (100%) rename pkgs/{tools/networking/shadowsocks-v2ray-plugin/default.nix => unit/sh/shadowsocks-v2ray-plugin/pkg-fun.nix} (100%) rename pkgs/{servers/shairport-sync/default.nix => unit/sh/shairport-sync/pkg-fun.nix} (100%) rename pkgs/{tools/misc/shallot/default.nix => unit/sh/shallot/pkg-fun.nix} (100%) rename pkgs/{development/libraries/shapelib/default.nix => unit/sh/shapelib/pkg-fun.nix} (100%) rename pkgs/{data/misc/shared-mime-info/default.nix => unit/sh/shared-mime-info/pkg-fun.nix} (100%) rename pkgs/{data/misc/shared-desktop-ontologies/default.nix => unit/sh/shared_desktop_ontologies/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sharedown/default.nix => unit/sh/sharedown/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/sh}/sharedown/update.sh (100%) rename pkgs/{tools/misc => unit/sh}/sharedown/yarn.lock (100%) rename pkgs/{tools/misc => unit/sh}/sharedown/yarndeps.nix (100%) rename pkgs/{development/libraries/sharness/default.nix => unit/sh/sharness/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/sharutils/default.nix => unit/sh/sharutils/pkg-fun.nix} (100%) rename pkgs/{games/shattered-pixel-dungeon/default.nix => unit/sh/shattered-pixel-dungeon/pkg-fun.nix} (100%) rename pkgs/{tools/security/shc/default.nix => unit/sh/shc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/shell-hist/default.nix => unit/sh/shell-hist/pkg-fun.nix} (100%) rename pkgs/{tools/misc/shelldap/default.nix => unit/sh/shelldap/pkg-fun.nix} (100%) rename pkgs/{development/tools/shellharden/default.nix => unit/sh/shellharden/pkg-fun.nix} (100%) rename pkgs/{applications/networking/shellhub-agent/default.nix => unit/sh/shellhub-agent/pkg-fun.nix} (100%) rename pkgs/{tools/security/shellnoob/default.nix => unit/sh/shellnoob/pkg-fun.nix} (100%) rename pkgs/{tools/misc/shellspec/default.nix => unit/sh/shellspec/pkg-fun.nix} (100%) rename pkgs/{tools/security/shellz/default.nix => unit/sh/shellz/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/shen-sbcl/default.nix => unit/sh/shen-sbcl/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/shen-sources/default.nix => unit/sh/shen-sources/pkg-fun.nix} (100%) rename pkgs/{tools/security/sherlock/default.nix => unit/sh/sherlock/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/sherpa/default.nix => unit/sh/sherpa/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/shfm/default.nix => unit/sh/shfm/pkg-fun.nix} (100%) rename pkgs/{tools/text/shfmt/default.nix => unit/sh/shfmt/pkg-fun.nix} (100%) rename pkgs/{tools/security/shhgit/default.nix => unit/sh/shhgit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/shhmsg/default.nix => unit/sh/shhmsg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/shhopt/default.nix => unit/sh/shhopt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/shibboleth-sp/default.nix => unit/sh/shibboleth-sp/pkg-fun.nix} (100%) rename pkgs/{tools/misc/shim/default.nix => unit/sh/shim-unsigned/pkg-fun.nix} (100%) rename pkgs/{development/libraries/shine/default.nix => unit/sh/shine/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/shiori/default.nix => unit/sh/shiori/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/shipyard/default.nix => unit/sh/shipyard/pkg-fun.nix} (100%) rename pkgs/{tools/security/shisho/default.nix => unit/sh/shisho/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/shmig/default.nix => unit/sh/shmig/pkg-fun.nix} (100%) rename pkgs/{tools/networking/shncpd/default.nix => unit/sh/shncpd/pkg-fun.nix} (100%) rename pkgs/{applications/audio/shntool/default.nix => unit/sh/shntool/pkg-fun.nix} (100%) rename pkgs/{tools/text/shocco/default.nix => unit/sh/shocco/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/shod/default.nix => unit/sh/shod/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/sh}/shopify-cli/Gemfile (100%) rename pkgs/{development/web => unit/sh}/shopify-cli/Gemfile.lock (100%) rename pkgs/{development/web => unit/sh}/shopify-cli/gemset.nix (100%) rename pkgs/{development/web/shopify-cli/default.nix => unit/sh/shopify-cli/pkg-fun.nix} (100%) rename pkgs/{development/web/shopify-themekit/default.nix => unit/sh/shopify-themekit/pkg-fun.nix} (100%) rename pkgs/{tools/networking/shorewall/default.nix => unit/sh/shorewall/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/shortcat/default.nix => unit/sh/shortcat/pkg-fun.nix} (100%) rename pkgs/{applications/audio/shortwave/default.nix => unit/sh/shortwave/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/shotgun/default.nix => unit/sh/shotgun/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/shotman/default.nix => unit/sh/shotman/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/shotwell/default.nix => unit/sh/shotwell/pkg-fun.nix} (100%) rename pkgs/{applications/video/showmethekey/default.nix => unit/sh/showmethekey/pkg-fun.nix} (100%) rename pkgs/{servers/http => unit/sh}/showoff/Gemfile (100%) rename pkgs/{servers/http => unit/sh}/showoff/Gemfile.lock (100%) rename pkgs/{servers/http => unit/sh}/showoff/gemset.nix (100%) rename pkgs/{servers/http/showoff/default.nix => unit/sh/showoff/pkg-fun.nix} (100%) rename pkgs/{data/fonts/shrikhand/default.nix => unit/sh/shrikhand/pkg-fun.nix} (100%) rename pkgs/{games/shticker-book-unwritten/default.nix => unit/sh/shticker-book-unwritten/pkg-fun.nix} (100%) rename pkgs/{games => unit/sh}/shticker-book-unwritten/unwrapped.nix (100%) rename pkgs/{applications/science/physics/shtns/default.nix => unit/sh/shtns/pkg-fun.nix} (100%) rename pkgs/{tools/misc/shunit2/default.nix => unit/sh/shunit2/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/shutter/default.nix => unit/sh/shutter/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/sic-image-cli/default.nix => unit/si/sic-image-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/sic/default.nix => unit/si/sic/pkg-fun.nix} (100%) rename pkgs/{servers/sickbeard => unit/si/sickgear}/patches/override-python-version-check.patch (100%) rename pkgs/{servers/sickbeard/sickgear.nix => unit/si/sickgear/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sidequest/default.nix => unit/si/sidequest/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sidplayfp/default.nix => unit/si/sidplayfp/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/st/siduck76-st.nix => unit/si/siduck76-st/pkg-fun.nix} (100%) rename pkgs/{tools/networking/siege/default.nix => unit/si/siege/pkg-fun.nix} (100%) rename pkgs/{games/sienna/default.nix => unit/si/sienna/pkg-fun.nix} (100%) rename pkgs/{data/themes/sierra/default.nix => unit/si/sierra-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sieve-connect/default.nix => unit/si/sieve-connect/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/si}/sift/deps.nix (100%) rename pkgs/{tools/text/sift/default.nix => unit/si/sift/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/si}/sigal/copytree-permissions.patch (100%) rename pkgs/{applications/misc/sigal/default.nix => unit/si/sigal/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sigi/default.nix => unit/si/sigi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/siglo/default.nix => unit/si/siglo/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/si}/siglo/siglo-no-user-install.patch (100%) rename pkgs/{tools/security/sigma-cli/default.nix => unit/si/sigma-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/signal-cli/default.nix => unit/si/signal-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/si}/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch (100%) rename pkgs/{applications/networking/instant-messengers => unit/si}/signald/0002-buildconfig-local-deps-fixes.patch (100%) rename pkgs/{applications/networking/instant-messengers/signald/default.nix => unit/si/signald/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/signaldctl/default.nix => unit/si/signaldctl/pkg-fun.nix} (100%) rename pkgs/{tools/security/signify/default.nix => unit/si/signify/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/si}/signing-party/gpgwrap_makefile.patch (100%) rename pkgs/{tools/security/signing-party/default.nix => unit/si/signing-party/pkg-fun.nix} (100%) rename pkgs/{applications/misc/signumone-ks/default.nix => unit/si/signumone-ks/pkg-fun.nix} (100%) rename pkgs/{data/fonts/signwriting/default.nix => unit/si/signwriting/pkg-fun.nix} (100%) rename pkgs/{development/tools/sigrok-cli/default.nix => unit/si/sigrok-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/sigrok-firmware-fx2lafw/default.nix => unit/si/sigrok-firmware-fx2lafw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sigslot/default.nix => unit/si/sigslot/pkg-fun.nix} (100%) rename pkgs/{applications/radio/sigutils/default.nix => unit/si/sigutils/pkg-fun.nix} (100%) rename pkgs/{data/fonts/siji/default.nix => unit/si/siji/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sil-abyssinica/default.nix => unit/si/sil-abyssinica/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sil-padauk/default.nix => unit/si/sil-padauk/pkg-fun.nix} (100%) rename pkgs/{games/sil-q/default.nix => unit/si/sil-q/pkg-fun.nix} (100%) rename pkgs/{games/sil/default.nix => unit/si/sil/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/silc-client/default.nix => unit/si/silc_client/pkg-fun.nix} (100%) rename pkgs/{servers/silc-server/default.nix => unit/si/silc_server/pkg-fun.nix} (100%) rename pkgs/{tools/security/silenthound/default.nix => unit/si/silenthound/pkg-fun.nix} (100%) rename pkgs/{development/compilers/silice/default.nix => unit/si/silice/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/si}/silver-searcher/bash-completion.patch (100%) rename pkgs/{tools/text/silver-searcher/default.nix => unit/si/silver-searcher/pkg-fun.nix} (100%) rename pkgs/{development/libraries/simdjson/default.nix => unit/si/simdjson/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/simg2img/default.nix => unit/si/simg2img/pkg-fun.nix} (100%) rename pkgs/{development/libraries/simgear/default.nix => unit/si/simgear/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/simgrid/default.nix => unit/si/simgrid/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/simh/default.nix => unit/si/simh/pkg-fun.nix} (100%) rename pkgs/{data/icons/simp1e-cursors/default.nix => unit/si/simp1e-cursors/pkg-fun.nix} (100%) rename pkgs/{tools/admin/simp_le/default.nix => unit/si/simp_le/pkg-fun.nix} (100%) rename pkgs/{tools/networking/simple-dlna-browser/default.nix => unit/si/simple-dlna-browser/pkg-fun.nix} (100%) rename pkgs/{tools/security/simple-tpm-pk11/default.nix => unit/si/simpleTpmPk11/pkg-fun.nix} (100%) rename pkgs/{servers => unit/si}/simplehttp2server/deps.nix (100%) rename pkgs/{servers/simplehttp2server/default.nix => unit/si/simplehttp2server/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/simplenes/default.nix => unit/si/simplenes/pkg-fun.nix} (100%) rename pkgs/{applications/misc/simplenote/default.nix => unit/si/simplenote/pkg-fun.nix} (100%) rename pkgs/{tools/networking/simpleproxy/default.nix => unit/si/simpleproxy/pkg-fun.nix} (100%) rename pkgs/{games/simutrans/default.nix => unit/si/simutrans/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sing-box/default.nix => unit/si/sing-box/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/singular/default.nix => unit/si/singular/pkg-fun.nix} (100%) rename pkgs/{build-support/singularity-tools/default.nix => unit/si/singularity-tools/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/singularity/default.nix => unit/si/singularity/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sipcalc/default.nix => unit/si/sipcalc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sipexer/default.nix => unit/si/sipexer/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/sipp/default.nix => unit/si/sipp/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/si}/siproxd/cheaders.patch (100%) rename pkgs/{applications/networking/siproxd/default.nix => unit/si/siproxd/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sipsak/default.nix => unit/si/sipsak/pkg-fun.nix} (100%) rename pkgs/{servers/sip/sipwitch/default.nix => unit/si/sipwitch/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/siril/default.nix => unit/si/siril/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/sirula/default.nix => unit/si/sirula/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sish/default.nix => unit/si/sish/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sitelen-seli-kiwen/default.nix => unit/si/sitelen-seli-kiwen/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/si}/sixpair/hcitool.patch (100%) rename pkgs/{tools/misc/sixpair/default.nix => unit/si/sixpair/pkg-fun.nix} (100%) rename pkgs/{development/compilers/sjasmplus/default.nix => unit/sj/sjasmplus/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/SkypeExport/default.nix => unit/sk/SkypeExport/pkg-fun.nix} (100%) rename pkgs/{development/tools/skaffold/default.nix => unit/sk/skaffold/pkg-fun.nix} (100%) rename pkgs/{applications/misc/skate/default.nix => unit/sk/skate/pkg-fun.nix} (100%) rename pkgs/{tools/system/skeema/default.nix => unit/sk/skeema/pkg-fun.nix} (100%) rename pkgs/{data/themes/skeu/default.nix => unit/sk/skeu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/skim/default.nix => unit/sk/skim/pkg-fun.nix} (100%) rename pkgs/{tools/X11/skippy-xd/default.nix => unit/sk/skippy-xd/pkg-fun.nix} (100%) rename pkgs/{development/tools/skjold/default.nix => unit/sk/skjold/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/skk/skk-dicts/default.nix => unit/sk/skk-dicts/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/skk/skktools/default.nix => unit/sk/skktools/pkg-fun.nix} (100%) rename pkgs/{development/tools/skopeo/default.nix => unit/sk/skopeo/pkg-fun.nix} (100%) rename pkgs/{servers => unit/sk}/skydns/deps.nix (100%) rename pkgs/{servers/skydns/default.nix => unit/sk/skydns/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/skypeforlinux/default.nix => unit/sk/skypeforlinux/pkg-fun.nix} (100%) rename pkgs/{applications/misc/skytemple/default.nix => unit/sk/skytemple/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sl/default.nix => unit/sl/sl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/slack-cli/default.nix => unit/sl/slack-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/slack-term/default.nix => unit/sl/slack-term/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/slack/default.nix => unit/sl/slack/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/sl}/slack/update.sh (100%) rename pkgs/{development/libraries/slang/default.nix => unit/sl/slang/pkg-fun.nix} (100%) rename pkgs/{tools/system/sleuthkit/default.nix => unit/sl/sleuthkit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/slides/default.nix => unit/sl/slides/pkg-fun.nix} (100%) rename pkgs/{development/tools/slimerjs/default.nix => unit/sl/slimerjs/pkg-fun.nix} (100%) rename pkgs/{servers/slimserver/default.nix => unit/sl/slimserver/pkg-fun.nix} (100%) rename pkgs/{tools/networking/slirp4netns/default.nix => unit/sl/slirp4netns/pkg-fun.nix} (100%) rename pkgs/{applications/misc/slmenu/default.nix => unit/sl/slmenu/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/sloccount/default.nix => unit/sl/sloccount/pkg-fun.nix} (100%) rename pkgs/{tools/misc/slop/default.nix => unit/sl/slop/pkg-fun.nix} (100%) rename pkgs/{tools/security/slowhttptest/default.nix => unit/sl/slowhttptest/pkg-fun.nix} (100%) rename pkgs/{tools/networking/slowlorust/default.nix => unit/sl/slowlorust/pkg-fun.nix} (100%) rename pkgs/{applications/networking/newsreaders/slrn/default.nix => unit/sl/slrn/pkg-fun.nix} (100%) rename pkgs/{tools/misc/slsnif/default.nix => unit/sl/slsnif/pkg-fun.nix} (100%) rename pkgs/{servers/computing/slurm-spank-stunnel/default.nix => unit/sl/slurm-spank-stunnel/pkg-fun.nix} (100%) rename pkgs/{servers/computing/slurm-spank-x11/default.nix => unit/sl/slurm-spank-x11/pkg-fun.nix} (100%) rename pkgs/{servers/computing => unit/sl}/slurm/common-env-echo.patch (100%) rename pkgs/{servers/computing/slurm/default.nix => unit/sl/slurm/pkg-fun.nix} (100%) rename pkgs/{servers/computing => unit/sl}/slurm/pmix-configure.patch (100%) rename pkgs/{tools/wayland/slurp/default.nix => unit/sl/slurp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/slweb/default.nix => unit/sl/slweb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/java/smack/default.nix => unit/sm/smack/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/smallwm/default.nix => unit/sm/smallwm/pkg-fun.nix} (100%) rename pkgs/{tools/X11/smart-wallpaper/default.nix => unit/sm/smart-wallpaper/pkg-fun.nix} (100%) rename pkgs/{tools/networking/smartdns/default.nix => unit/sm/smartdns/pkg-fun.nix} (100%) rename pkgs/{development/libraries/smarty3-i18n/default.nix => unit/sm/smarty3-i18n/pkg-fun.nix} (100%) rename pkgs/{development/libraries/smarty3/default.nix => unit/sm/smarty3/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/smatch/default.nix => unit/sm/smatch/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/smbnetfs/default.nix => unit/sm/smbnetfs/pkg-fun.nix} (100%) rename pkgs/{tools/security/smbscan/default.nix => unit/sm/smbscan/pkg-fun.nix} (100%) rename pkgs/{tools/misc/smc/default.nix => unit/sm/smc/pkg-fun.nix} (100%) rename pkgs/{servers/smcroute/default.nix => unit/sm/smcroute/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/smem/default.nix => unit/sm/smem/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/smemstat/default.nix => unit/sm/smemstat/pkg-fun.nix} (100%) rename pkgs/{tools/misc/smenu/default.nix => unit/sm/smenu/pkg-fun.nix} (100%) rename pkgs/{data/fonts/smiley-sans/default.nix => unit/sm/smiley-sans/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/smimesign/default.nix => unit/sm/smimesign/pkg-fun.nix} (100%) rename pkgs/{development/tools/smlfmt/default.nix => unit/sm/smlfmt/pkg-fun.nix} (100%) rename pkgs/{development/compilers/smlnj/bootstrap.nix => unit/sm/smlnjBootstrap/pkg-fun.nix} (100%) rename pkgs/{tools/package-management/smlpkg/default.nix => unit/sm/smlpkg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/smokegen/default.nix => unit/sm/smokegen/pkg-fun.nix} (100%) rename pkgs/{tools/networking/smokeping/default.nix => unit/sm/smokeping/pkg-fun.nix} (100%) rename pkgs/{development/libraries/smokeqt/default.nix => unit/sm/smokeqt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/smooth/default.nix => unit/sm/smooth/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sm}/smpeg/format.patch (100%) rename pkgs/{development/libraries => unit/sm}/smpeg/gcc6.patch (100%) rename pkgs/{development/libraries => unit/sm}/smpeg/gtk.patch (100%) rename pkgs/{development/libraries => unit/sm}/smpeg/libx11.patch (100%) rename pkgs/{development/libraries/smpeg/default.nix => unit/sm/smpeg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/smpeg2/default.nix => unit/sm/smpeg2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/smpq/default.nix => unit/sm/smpq/pkg-fun.nix} (100%) rename pkgs/{tools/text/smu/default.nix => unit/sm/smu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/smug/default.nix => unit/sm/smug/pkg-fun.nix} (100%) rename pkgs/{tools/security/sn0int/default.nix => unit/sn/sn0int/pkg-fun.nix} (100%) rename pkgs/{tools/networking/snabb/default.nix => unit/sn/snabb/pkg-fun.nix} (100%) rename pkgs/{servers/snac2/default.nix => unit/sn/snac2/pkg-fun.nix} (100%) rename pkgs/{games/snake4/default.nix => unit/sn/snake4/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/snakemake/default.nix => unit/sn/snakemake/pkg-fun.nix} (100%) rename pkgs/{tools/security/snallygaster/default.nix => unit/sn/snallygaster/pkg-fun.nix} (100%) rename pkgs/{development/libraries/snap7/default.nix => unit/sn/snap7/pkg-fun.nix} (100%) rename pkgs/{build-support/snap => unit/sn/snapTools}/make-snap.nix (100%) rename pkgs/{build-support/snap/default.nix => unit/sn/snapTools/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/snapdragon-profiler/default.nix => unit/sn/snapdragon-profiler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/snapmaker-luban/default.nix => unit/sn/snapmaker-luban/pkg-fun.nix} (100%) rename pkgs/{applications/misc/snapper-gui/default.nix => unit/sn/snapper-gui/pkg-fun.nix} (100%) rename pkgs/{tools/misc/snapper/default.nix => unit/sn/snapper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/snappy/default.nix => unit/sn/snappy/pkg-fun.nix} (100%) rename pkgs/{servers/snappymail/default.nix => unit/sn/snappymail/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/snapraid/default.nix => unit/sn/snapraid/pkg-fun.nix} (100%) rename pkgs/{development/tools/snazy/default.nix => unit/sn/snazy/pkg-fun.nix} (100%) rename pkgs/{misc/sndio/default.nix => unit/sn/sndio/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sndpeek/default.nix => unit/sn/sndpeek/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/sn}/sndpeek/pthread.patch (100%) rename pkgs/{tools/networking/snet/default.nix => unit/sn/snet/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniffers/sngrep/default.nix => unit/sn/sngrep/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sniffglue/default.nix => unit/sn/sniffglue/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniffnet/default.nix => unit/sn/sniffnet/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/sn}/snipe-it/composer-env.nix (100%) rename pkgs/{servers/web-apps => unit/sn}/snipe-it/composition.nix (100%) rename pkgs/{servers/web-apps => unit/sn}/snipe-it/php-packages.nix (100%) rename pkgs/{servers/web-apps/snipe-it/default.nix => unit/sn/snipe-it/pkg-fun.nix} (100%) rename pkgs/{games/snipes/default.nix => unit/sn/snipes/pkg-fun.nix} (100%) rename pkgs/{tools/text/snippetpixie/default.nix => unit/sn/snippetpixie/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniproxy/default.nix => unit/sn/sniproxy/pkg-fun.nix} (100%) rename pkgs/{games/snis/default.nix => unit/sn/snis/pkg-fun.nix} (100%) rename pkgs/{applications/misc/snixembed/default.nix => unit/sn/snixembed/pkg-fun.nix} (100%) rename pkgs/{tools/networking/snmpcheck/default.nix => unit/sn/snmpcheck/pkg-fun.nix} (100%) rename pkgs/{tools/system/snooze/default.nix => unit/sn/snooze/pkg-fun.nix} (100%) rename pkgs/{tools/misc/snore/default.nix => unit/sn/snore/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ids/snort/default.nix => unit/sn/snort/pkg-fun.nix} (100%) rename pkgs/{tools/security/snow/default.nix => unit/sn/snow/pkg-fun.nix} (100%) rename pkgs/{data/themes/snowblind/default.nix => unit/sn/snowblind/pkg-fun.nix} (100%) rename pkgs/{tools/security/snowcat/default.nix => unit/sn/snowcat/pkg-fun.nix} (100%) rename pkgs/{tools/security/snowcrash/default.nix => unit/sn/snowcrash/pkg-fun.nix} (100%) rename pkgs/{tools/networking/snowflake/default.nix => unit/sn/snowflake/pkg-fun.nix} (100%) rename pkgs/{applications/misc/snowsql/default.nix => unit/sn/snowsql/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/snpeff/default.nix => unit/sn/snpeff/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/snzip/default.nix => unit/sn/snzip/pkg-fun.nix} (100%) rename pkgs/{applications/radio/soapyremote/default.nix => unit/so/soapyremote/pkg-fun.nix} (100%) rename pkgs/{applications/radio/soapysdrplay/default.nix => unit/so/soapysdrplay/pkg-fun.nix} (100%) rename pkgs/{tools/networking/socat/default.nix => unit/so/socat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/soci/default.nix => unit/so/soci/pkg-fun.nix} (100%) rename pkgs/{tools/security/social-engineer-toolkit/default.nix => unit/so/social-engineer-toolkit/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sockdump/default.nix => unit/so/sockdump/pkg-fun.nix} (100%) rename pkgs/{development/libraries/socket_wrapper/default.nix => unit/so/socket_wrapper/pkg-fun.nix} (100%) rename pkgs/{tools/system/socklog/default.nix => unit/so/socklog/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sockperf/default.nix => unit/so/sockperf/pkg-fun.nix} (100%) rename pkgs/{tools/audio/soco-cli/default.nix => unit/so/soco-cli/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/sof-firmware/default.nix => unit/so/sof-firmware/pkg-fun.nix} (100%) rename pkgs/{servers/soft-serve/default.nix => unit/so/soft-serve/pkg-fun.nix} (100%) rename pkgs/{servers/softether/default.nix => unit/so/softether/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/so}/sogo/enable-activesync.patch (100%) rename pkgs/{servers/web-apps/sogo/default.nix => unit/so/sogo/pkg-fun.nix} (100%) rename pkgs/{applications/networking/soju/default.nix => unit/so/soju/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sokol/default.nix => unit/so/sokol/pkg-fun.nix} (100%) rename pkgs/{applications/misc/solaar/default.nix => unit/so/solaar/pkg-fun.nix} (100%) rename pkgs/{data/themes/solarc/default.nix => unit/so/solarc-gtk-theme/pkg-fun.nix} (100%) rename pkgs/{games/solicurses/default.nix => unit/so/solicurses/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/sollya/default.nix => unit/so/sollya/pkg-fun.nix} (100%) rename pkgs/{os-specific/solo5/default.nix => unit/so/solo5/pkg-fun.nix} (100%) rename pkgs/{servers/search/solr/default.nix => unit/so/solr/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/solvespace/default.nix => unit/so/solvespace/pkg-fun.nix} (100%) rename pkgs/{tools/misc/somafm-cli/default.nix => unit/so/somafm-cli/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/somatic-sniper/default.nix => unit/so/somatic-sniper/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology => unit/so}/somatic-sniper/somatic-sniper.patch (100%) rename pkgs/{applications/misc/somebar/default.nix => unit/so/somebar/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sommelier/default.nix => unit/so/sommelier/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers => unit/so}/sommelier/update.py (100%) rename pkgs/{tools/security/sonar-scanner-cli/default.nix => unit/so/sonar-scanner-cli/pkg-fun.nix} (100%) rename pkgs/{servers/sonarr/default.nix => unit/so/sonarr/pkg-fun.nix} (100%) rename pkgs/{servers => unit/so}/sonarr/update.sh (100%) rename pkgs/{applications/audio/sonata/default.nix => unit/so/sonata/pkg-fun.nix} (100%) rename pkgs/{applications/audio/songrec/default.nix => unit/so/songrec/pkg-fun.nix} (100%) rename pkgs/{servers/search/sonic-server/default.nix => unit/so/sonic-server/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sonic/default.nix => unit/so/sonic/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sonixd/default.nix => unit/so/sonixd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/sonobuoy/default.nix => unit/so/sonobuoy/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sonota/default.nix => unit/so/sonota/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/so}/sonota/set_resource_path.patch (100%) rename pkgs/{applications/audio/sony-headphones-client/default.nix => unit/so/sony-headphones-client/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sooperlooper/default.nix => unit/so/sooperlooper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sope/default.nix => unit/so/sope/pkg-fun.nix} (100%) rename pkgs/{tools/security/sops/default.nix => unit/so/sops/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sorcer/default.nix => unit/so/sorcer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sord/default.nix => unit/so/sord/pkg-fun.nix} (100%) rename pkgs/{tools/text/sorted-grep/default.nix => unit/so/sorted-grep/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/sortmerna/default.nix => unit/so/sortmerna/pkg-fun.nix} (100%) rename pkgs/{development/compilers/souffle/default.nix => unit/so/souffle/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/so}/souffle/threads.patch (100%) rename pkgs/{applications/audio/sound-juicer/default.nix => unit/so/sound-juicer/pkg-fun.nix} (100%) rename pkgs/{data/misc/sound-theme-freedesktop/default.nix => unit/so/sound-theme-freedesktop/pkg-fun.nix} (100%) rename pkgs/{misc/sound-of-sorting/default.nix => unit/so/soundOfSorting/pkg-fun.nix} (100%) rename pkgs/{applications/audio/soundconverter/default.nix => unit/so/soundconverter/pkg-fun.nix} (100%) rename pkgs/{data/soundfonts/fluid/default.nix => unit/so/soundfont-fluid/pkg-fun.nix} (100%) rename pkgs/{data/soundfonts/generaluser/default.nix => unit/so/soundfont-generaluser/pkg-fun.nix} (100%) rename pkgs/{data/soundfonts/ydp-grand/default.nix => unit/so/soundfont-ydp-grand/pkg-fun.nix} (100%) rename pkgs/{applications/radio => unit/so}/soundmodem/matFix.patch (100%) rename pkgs/{applications/radio/soundmodem/default.nix => unit/so/soundmodem/pkg-fun.nix} (100%) rename pkgs/{development/libraries/soundtouch/default.nix => unit/so/soundtouch/pkg-fun.nix} (100%) rename pkgs/{applications/audio/soundtracker/default.nix => unit/so/soundtracker/pkg-fun.nix} (100%) rename pkgs/{applications/audio/soundwireserver/default.nix => unit/so/soundwireserver/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/soupault/default.nix => unit/so/soupault/pkg-fun.nix} (100%) rename pkgs/{data/fonts/source-code-pro/default.nix => unit/so/source-code-pro/pkg-fun.nix} (100%) rename pkgs/{data/fonts/source-han-code-jp/default.nix => unit/so/source-han-code-jp/pkg-fun.nix} (100%) rename pkgs/{data/fonts/source-sans-pro/default.nix => unit/so/source-sans-pro/pkg-fun.nix} (100%) rename pkgs/{data/fonts/source-sans/default.nix => unit/so/source-sans/pkg-fun.nix} (100%) rename pkgs/{data/fonts/source-serif-pro/default.nix => unit/so/source-serif-pro/pkg-fun.nix} (100%) rename pkgs/{data/fonts/source-serif/default.nix => unit/so/source-serif/pkg-fun.nix} (100%) rename pkgs/{build-support/source-from-head-fun.nix => unit/so/sourceFromHead/pkg-fun.nix} (100%) rename pkgs/{tools/text/source-highlight/default.nix => unit/so/sourceHighlight/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/builds.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/core.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/disable-npm-install.patch (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/fetchNodeModules.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/fix-gqlgen-trimpath.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/git.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/hg.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/hub.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/lists.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/man.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/meta.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/pages.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/paste.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch (100%) rename pkgs/{applications/version-management/sourcehut/default.nix => unit/so/sourcehut/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/scm.nix (100%) rename pkgs/{applications/version-management => unit/so}/sourcehut/todo.nix (100%) rename pkgs/{tools/wayland/sov/default.nix => unit/so/sov/pkg-fun.nix} (100%) rename pkgs/{applications/misc/audio => unit/so}/soxr/arm64-check.patch (100%) rename pkgs/{applications/misc/audio/soxr/default.nix => unit/so/soxr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/soxt/default.nix => unit/so/soxt/pkg-fun.nix} (100%) rename pkgs/{servers/sozu/default.nix => unit/so/sozu/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/spades/default.nix => unit/sp/SPAdes/pkg-fun.nix} (100%) rename pkgs/{games/space-orbit/default.nix => unit/sp/space-orbit/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/spacefm => unit/sp/spaceFM}/glibc-fix.patch (100%) rename pkgs/{applications/file-managers/spacefm/default.nix => unit/sp/spaceFM/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/spacefm => unit/sp/spaceFM}/x11-only.patch (100%) rename pkgs/{applications/misc/spacenav-cube-example/default.nix => unit/sp/spacenav-cube-example/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/spaceship-prompt/default.nix => unit/sp/spaceship-prompt/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/sp}/spacevim/helptags.patch (100%) rename pkgs/{applications/editors => unit/sp}/spacevim/init.nix (100%) rename pkgs/{applications/editors/spacevim/default.nix => unit/sp/spacevim/pkg-fun.nix} (100%) rename pkgs/{development/tools/purescript/spago/default.nix => unit/sp/spago/pkg-fun.nix} (100%) rename pkgs/{development/tools/purescript => unit/sp}/spago/update.sh (100%) rename pkgs/{servers/mail/spamassassin/default.nix => unit/sp/spamassassin/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/sp}/spamassassin/sa-update_add--siteconfigpath.patch (100%) rename pkgs/{development/libraries/spandsp/default.nix => unit/sp/spandsp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/spandsp/3.nix => unit/sp/spandsp3/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ada/spark2014/default.nix => unit/sp/spark2014/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/sparkleshare/default.nix => unit/sp/sparkleshare/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/sparse/default.nix => unit/sp/sparse/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis => unit/sp}/sparse/tests.nix (100%) rename pkgs/{development/libraries/sparsehash/default.nix => unit/sp/sparsehash/pkg-fun.nix} (100%) rename pkgs/{development/compilers/spasm-ng/default.nix => unit/sp/spasm-ng/pkg-fun.nix} (100%) rename pkgs/{applications/gis/spatialite-tools/default.nix => unit/sp/spatialite_tools/pkg-fun.nix} (100%) rename pkgs/{servers/http/spawn-fcgi/default.nix => unit/sp/spawn_fcgi/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sp}/spdk/ncurses-6.3.patch (100%) rename pkgs/{development/libraries/spdk/default.nix => unit/sp/spdk/pkg-fun.nix} (100%) rename pkgs/{data/misc/spdx-license-list-data/default.nix => unit/sp/spdx-license-list-data/pkg-fun.nix} (100%) rename pkgs/{applications/audio/spectmorph/default.nix => unit/sp/spectmorph/pkg-fun.nix} (100%) rename pkgs/{development/libraries/spectra/default.nix => unit/sp/spectra/pkg-fun.nix} (100%) rename pkgs/{tools/security/spectre-cli/default.nix => unit/sp/spectre-cli/pkg-fun.nix} (100%) rename pkgs/{tools/security/spectre-meltdown-checker/default.nix => unit/sp/spectre-meltdown-checker/pkg-fun.nix} (100%) rename pkgs/{applications/audio/spectrojack/default.nix => unit/sp/spectrojack/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/spectrwm/default.nix => unit/sp/spectrwm/pkg-fun.nix} (100%) rename pkgs/{applications/audio/speech-denoiser/default.nix => unit/sp/speech-denoiser/pkg-fun.nix} (100%) rename pkgs/{development/libraries/speech-tools/default.nix => unit/sp/speech-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sp}/speechd/fix-mbrola-paths.patch (100%) rename pkgs/{development/libraries => unit/sp}/speechd/fix-paths.patch (100%) rename pkgs/{development/libraries/speechd/default.nix => unit/sp/speechd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/speedread/default.nix => unit/sp/speedread/pkg-fun.nix} (100%) rename pkgs/{development/libraries/speedtest-exporter/default.nix => unit/sp/speedtest-exporter/pkg-fun.nix} (100%) rename pkgs/{servers/search/sphinxsearch/default.nix => unit/sp/sphinxsearch/pkg-fun.nix} (100%) rename pkgs/{development/libraries/spice-gtk/default.nix => unit/sp/spice-gtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/spice-protocol/default.nix => unit/sp/spice-protocol/pkg-fun.nix} (100%) rename pkgs/{applications/office/spice-up/default.nix => unit/sp/spice-up/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/spice-vdagent/default.nix => unit/sp/spice-vdagent/pkg-fun.nix} (100%) rename pkgs/{development/libraries/spice/default.nix => unit/sp/spice/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sp}/spice/remove-rt-on-darwin.patch (100%) rename pkgs/{servers/spicedb/zed.nix => unit/sp/spicedb-zed/pkg-fun.nix} (100%) rename pkgs/{servers/spicedb/default.nix => unit/sp/spicedb/pkg-fun.nix} (100%) rename pkgs/{applications/misc/spicetify-cli/default.nix => unit/sp/spicetify-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/spicy/default.nix => unit/sp/spicy/pkg-fun.nix} (100%) rename pkgs/{applications/networking/spideroak/default.nix => unit/sp/spideroak/pkg-fun.nix} (100%) rename pkgs/{tools/misc/spigot/default.nix => unit/sp/spigot/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/spike/default.nix => unit/sp/spike/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/spin/default.nix => unit/sp/spin/pkg-fun.nix} (100%) rename pkgs/{tools/networking/spiped/default.nix => unit/sp/spiped/pkg-fun.nix} (100%) rename pkgs/{tools/security/spire/default.nix => unit/sp/spire/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/spirv-cross/default.nix => unit/sp/spirv-cross/pkg-fun.nix} (100%) rename pkgs/{development/libraries/spirv-headers/default.nix => unit/sp/spirv-headers/pkg-fun.nix} (100%) rename pkgs/{development/tools/spirv-tools/default.nix => unit/sp/spirv-tools/pkg-fun.nix} (100%) rename pkgs/{applications/radio/splat/default.nix => unit/sp/splat/pkg-fun.nix} (100%) rename pkgs/{data/fonts/spleen/default.nix => unit/sp/spleen/pkg-fun.nix} (100%) rename pkgs/{misc/cups/drivers/splix/default.nix => unit/sp/splix/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/sp}/spnavcfg/configure-cfgfile-path.patch (100%) rename pkgs/{applications/misc => unit/sp}/spnavcfg/configure-pidfile-path.patch (100%) rename pkgs/{applications/misc/spnavcfg/default.nix => unit/sp/spnavcfg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/spooles/default.nix => unit/sp/spooles/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/sp}/spooles/spooles.patch (100%) rename pkgs/{applications/audio/spot/default.nix => unit/sp/spot/pkg-fun.nix} (100%) rename pkgs/{tools/audio/spotdl/default.nix => unit/sp/spotdl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/spotify-cli-linux/default.nix => unit/sp/spotify-cli-linux/pkg-fun.nix} (100%) rename pkgs/{applications/misc/spotify-tray/default.nix => unit/sp/spotify-tray/pkg-fun.nix} (100%) rename pkgs/{applications/audio/spotify/default.nix => unit/sp/spotify/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/sp}/spotify/update.sh (100%) rename pkgs/{applications/audio/spotifywm/default.nix => unit/sp/spotifywm/pkg-fun.nix} (100%) rename pkgs/{development/tools/spring-boot-cli/default.nix => unit/sp/spring-boot-cli/pkg-fun.nix} (100%) rename pkgs/{games/spring => unit/sp/springLobby}/fix-certs.patch (100%) rename pkgs/{games/spring/springlobby.nix => unit/sp/springLobby/pkg-fun.nix} (100%) rename pkgs/{games/spring => unit/sp/springLobby}/revert_58b423e.patch (100%) rename pkgs/{development/tools/misc/spruce/default.nix => unit/sp/spruce/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sptk/default.nix => unit/sp/sptk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sptlrx/default.nix => unit/sp/sptlrx/pkg-fun.nix} (100%) rename pkgs/{tools/security/spyre/default.nix => unit/sp/spyre/pkg-fun.nix} (100%) rename pkgs/{development/tools/sq/default.nix => unit/sq/sq/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sqlite/sqlar.nix => unit/sq/sqlar/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/sqlc/default.nix => unit/sq/sqlc/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/sqlcheck/default.nix => unit/sq/sqlcheck/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sqlcipher/default.nix => unit/sq/sqlcipher/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/sqlcl/default.nix => unit/sq/sqlcl/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/sqlfluff/default.nix => unit/sq/sqlfluff/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/sq}/sqlint/Gemfile (100%) rename pkgs/{development/tools => unit/sq}/sqlint/Gemfile.lock (100%) rename pkgs/{development/tools => unit/sq}/sqlint/gemset.nix (100%) rename pkgs/{development/tools/sqlint/default.nix => unit/sq/sqlint/pkg-fun.nix} (100%) rename pkgs/{servers/sql/sqlite/jdbc/default.nix => unit/sq/sqlite-jdbc/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/sqlite-web/default.nix => unit/sq/sqlite-web/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sqlite3-to-mysql/default.nix => unit/sq/sqlite3-to-mysql/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sqlitecpp/default.nix => unit/sq/sqlitecpp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sqliteman/default.nix => unit/sq/sqliteman/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sqls/default.nix => unit/sq/sqls/pkg-fun.nix} (100%) rename pkgs/{development/tools/sqsh/default.nix => unit/sq/sqsh/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/squashfs => unit/sq/squashfsTools}/4k-align.patch (100%) rename pkgs/{tools/filesystems/squashfs => unit/sq/squashfsTools}/darwin.patch (100%) rename pkgs/{tools/filesystems/squashfs/default.nix => unit/sq/squashfsTools/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/squashfuse/default.nix => unit/sq/squashfuse/pkg-fun.nix} (100%) rename pkgs/{development/compilers/squeak/default.nix => unit/sq/squeak/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/sq}/squeak/squeak-configure-version.patch (100%) rename pkgs/{development/compilers => unit/sq}/squeak/squeak-plugins-discovery.patch (100%) rename pkgs/{development/compilers => unit/sq}/squeak/squeak-squeaksh-nixpkgs.patch (100%) rename pkgs/{applications/accessibility/squeekboard/default.nix => unit/sq/squeekboard/pkg-fun.nix} (100%) rename pkgs/{servers/squid/default.nix => unit/sq/squid/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/srain/default.nix => unit/sr/srain/pkg-fun.nix} (100%) rename pkgs/{tools/X11/srandrd/default.nix => unit/sr/srandrd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/sratom/default.nix => unit/sr/sratom/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/sratoolkit/default.nix => unit/sr/sratoolkit/pkg-fun.nix} (100%) rename pkgs/{games/srb2/default.nix => unit/sr/srb2/pkg-fun.nix} (100%) rename pkgs/{games => unit/sr}/srb2/wadlocation.patch (100%) rename pkgs/{games/srb2kart/default.nix => unit/sr/srb2kart/pkg-fun.nix} (100%) rename pkgs/{games => unit/sr}/srb2kart/wadlocation.patch (100%) rename pkgs/{build-support/src-only/default.nix => unit/sr/srcOnly/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/srecord/default.nix => unit/sr/srecord/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/sr}/srelay/arm.patch (100%) rename pkgs/{tools/networking/srelay/default.nix => unit/sr/srelay/pkg-fun.nix} (100%) rename pkgs/{tools/security/srm/default.nix => unit/sr/srm/pkg-fun.nix} (100%) rename pkgs/{applications/radio/srsran/default.nix => unit/sr/srsran/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/sr}/srt-live-server/fix-insecure-printfs.patch (100%) rename pkgs/{applications/video/srt-live-server/default.nix => unit/sr/srt-live-server/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/sr}/srt-to-vtt-cl/fix-validation.patch (100%) rename pkgs/{tools/cd-dvd/srt-to-vtt-cl/default.nix => unit/sr/srt-to-vtt-cl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/srt/default.nix => unit/sr/srt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/srtp/default.nix => unit/sr/srtp/pkg-fun.nix} (100%) rename pkgs/{applications/video/srtrelay/default.nix => unit/sr/srtrelay/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ssb-patchwork/default.nix => unit/ss/ssb-patchwork/pkg-fun.nix} (100%) rename pkgs/{tools/security/ssb/default.nix => unit/ss/ssb/pkg-fun.nix} (100%) rename pkgs/{tools/security/ssdeep/default.nix => unit/ss/ssdeep/pkg-fun.nix} (100%) rename pkgs/{tools/X11/sselp/default.nix => unit/ss/sselp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ssh-agents/default.nix => unit/ss/ssh-agents/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ssh-askpass-fullscreen/default.nix => unit/ss/ssh-askpass-fullscreen/pkg-fun.nix} (100%) rename pkgs/{tools/security/ssh-audit/default.nix => unit/ss/ssh-audit/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/ssh-chat/default.nix => unit/ss/ssh-chat/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openssh/copyid.nix => unit/ss/ssh-copy-id/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ssh-ident/default.nix => unit/ss/ssh-ident/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ssh-key-confirmer/default.nix => unit/ss/ssh-key-confirmer/pkg-fun.nix} (100%) rename pkgs/{tools/security/ssh-to-age/default.nix => unit/ss/ssh-to-age/pkg-fun.nix} (100%) rename pkgs/{tools/security/ssh-to-pgp/default.nix => unit/ss/ssh-to-pgp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ssh-tools/default.nix => unit/ss/ssh-tools/pkg-fun.nix} (100%) rename pkgs/{tools/security/sshchecker/default.nix => unit/ss/sshchecker/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/ss}/sshfs-fuse/common.nix (100%) rename pkgs/{tools/filesystems => unit/ss}/sshfs-fuse/fix-fuse-darwin-h.patch (100%) rename pkgs/{tools/filesystems/sshfs-fuse/default.nix => unit/ss/sshfs-fuse/pkg-fun.nix} (100%) rename pkgs/{tools/security/sshguard/default.nix => unit/ss/sshguard/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/sshlatex/default.nix => unit/ss/sshlatex/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sshoogr/default.nix => unit/ss/sshoogr/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sshpass/default.nix => unit/ss/sshpass/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sshping/default.nix => unit/ss/sshping/pkg-fun.nix} (100%) rename pkgs/{servers/sshportal/default.nix => unit/ss/sshportal/pkg-fun.nix} (100%) rename pkgs/{development/tools/sshs/default.nix => unit/ss/sshs/pkg-fun.nix} (100%) rename pkgs/{tools/security/sshuttle/default.nix => unit/ss/sshuttle/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/ss}/sshuttle/sudo.patch (100%) rename pkgs/{tools/admin/ssl-cert-check/default.nix => unit/ss/ssl-cert-check/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ssldump/default.nix => unit/ss/ssldump/pkg-fun.nix} (100%) rename pkgs/{servers/sslh/default.nix => unit/ss/sslh/pkg-fun.nix} (100%) rename pkgs/{development/tools/sslmate-agent/default.nix => unit/ss/sslmate-agent/pkg-fun.nix} (100%) rename pkgs/{development/tools/sslmate/default.nix => unit/ss/sslmate/pkg-fun.nix} (100%) rename pkgs/{tools/security/sslscan/default.nix => unit/ss/sslscan/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/ss}/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch (100%) rename pkgs/{applications/networking/cluster => unit/ss}/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch (100%) rename pkgs/{applications/networking/cluster/ssm-agent/default.nix => unit/ss/ssm-agent/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/ssm-session-manager-plugin/default.nix => unit/ss/ssm-session-manager-plugin/pkg-fun.nix} (100%) rename pkgs/{tools/admin/ssmsh/default.nix => unit/ss/ssmsh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ssocr/default.nix => unit/ss/ssocr/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ssrc/default.nix => unit/ss/ssrc/pkg-fun.nix} (100%) rename pkgs/{tools/security/ssss/default.nix => unit/ss/ssss/pkg-fun.nix} (100%) rename pkgs/{tools/networking/sstp/default.nix => unit/ss/sstp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ssw/default.nix => unit/ss/ssw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/StormLib/default.nix => unit/st/StormLib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sta/default.nix => unit/st/sta/pkg-fun.nix} (100%) rename pkgs/{misc/stabber/default.nix => unit/st/stabber/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/stacks/default.nix => unit/st/stacks/pkg-fun.nix} (100%) rename pkgs/{tools/security/stacs/default.nix => unit/st/stacs/pkg-fun.nix} (100%) rename pkgs/{development/tools/stagit/default.nix => unit/st/stagit/pkg-fun.nix} (100%) rename pkgs/{development/compilers/stalin/default.nix => unit/st/stalin/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/stalonetray/default.nix => unit/st/stalonetray/pkg-fun.nix} (100%) rename pkgs/{development/compilers/stanc/default.nix => unit/st/stanc/pkg-fun.nix} (100%) rename pkgs/{applications/editors/standardnotes/default.nix => unit/st/standardnotes/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/st}/standardnotes/src.json (100%) rename pkgs/{applications/editors => unit/st}/standardnotes/update.nix (100%) rename pkgs/{applications/science/biology/star/default.nix => unit/st/star/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix => unit/st/starboard-octant-plugin/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/starboard/default.nix => unit/st/starboard/pkg-fun.nix} (100%) rename pkgs/{games/stardust/default.nix => unit/st/stardust/pkg-fun.nix} (100%) rename pkgs/{tools/misc/starfetch/default.nix => unit/st/starfetch/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/st}/stargate-libcds/Makefile.patch (100%) rename pkgs/{development/libraries/stargate-libcds/default.nix => unit/st/stargate-libcds/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/starlark/default.nix => unit/st/starlark/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning/starspace/default.nix => unit/st/starspace/pkg-fun.nix} (100%) rename pkgs/{tools/misc/staruml/default.nix => unit/st/staruml/pkg-fun.nix} (100%) rename pkgs/{servers/static-web-server/default.nix => unit/st/static-web-server/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/statifier/default.nix => unit/st/statifier/pkg-fun.nix} (100%) rename pkgs/{development/tools/statik/default.nix => unit/st/statik/pkg-fun.nix} (100%) rename pkgs/{applications/networking/station/default.nix => unit/st/station/pkg-fun.nix} (100%) rename pkgs/{tools/nix/statix/default.nix => unit/st/statix/pkg-fun.nix} (100%) rename pkgs/{tools/misc/statserial/default.nix => unit/st/statserial/pkg-fun.nix} (100%) rename pkgs/{servers/stayrtr/default.nix => unit/st/stayrtr/pkg-fun.nix} (100%) rename pkgs/{development/libraries/stb/default.nix => unit/st/stb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/stderred/default.nix => unit/st/stderred/pkg-fun.nix} (100%) rename pkgs/{data/documentation/stdman/default.nix => unit/st/stdman/pkg-fun.nix} (100%) rename pkgs/{data/documentation/std-man-pages/default.nix => unit/st/stdmanpages/pkg-fun.nix} (100%) rename pkgs/{development/libraries/stduuid/default.nix => unit/st/stduuid/pkg-fun.nix} (100%) rename pkgs/{tools/games/steam-acf/default.nix => unit/st/steam-acf/pkg-fun.nix} (100%) rename pkgs/{tools/games/steam-rom-manager/default.nix => unit/st/steam-rom-manager/pkg-fun.nix} (100%) rename pkgs/{games/steam-tui/default.nix => unit/st/steam-tui/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/steamcontroller/default.nix => unit/st/steamcontroller/pkg-fun.nix} (100%) rename pkgs/{development/tools/steamos-devkit/default.nix => unit/st/steamos-devkit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/steampipe/default.nix => unit/st/steampipe/pkg-fun.nix} (100%) rename pkgs/{tools/games/steamtinkerlaunch/default.nix => unit/st/steamtinkerlaunch/pkg-fun.nix} (100%) rename pkgs/{servers/pinnwand/steck.nix => unit/st/steck/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/steghide/default.nix => unit/st/steghide/pkg-fun.nix} (100%) rename pkgs/{tools/security/stegseek/default.nix => unit/st/stegseek/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/stegsolve/default.nix => unit/st/stegsolve/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/stella/default.nix => unit/st/stella/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/stellar-core/default.nix => unit/st/stellar-core/pkg-fun.nix} (100%) rename pkgs/{tools/backup/stenc/default.nix => unit/st/stenc/pkg-fun.nix} (100%) rename pkgs/{tools/security/step-cli/default.nix => unit/st/step-cli/pkg-fun.nix} (100%) rename pkgs/{games => unit/st}/stepmania/0001-fix-build-with-ffmpeg-4.patch (100%) rename pkgs/{games/stepmania/default.nix => unit/st/stepmania/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/stern/default.nix => unit/st/stern/pkg-fun.nix} (100%) rename pkgs/{tools/networking/stevenblack-blocklist/default.nix => unit/st/stevenblack-blocklist/pkg-fun.nix} (100%) rename pkgs/{development/libraries/stfl/default.nix => unit/st/stfl/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/stgit/default.nix => unit/st/stgit/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sticky/default.nix => unit/st/sticky/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/stig/default.nix => unit/st/stig/pkg-fun.nix} (100%) rename pkgs/{data/themes/stilo/default.nix => unit/st/stilo-themes/pkg-fun.nix} (100%) rename pkgs/{data/fonts/stix-otf/default.nix => unit/st/stix-otf/pkg-fun.nix} (100%) rename pkgs/{data/fonts/stix-two/default.nix => unit/st/stix-two/pkg-fun.nix} (100%) rename pkgs/{development/embedded/stm32/stm32cubemx/default.nix => unit/st/stm32cubemx/pkg-fun.nix} (100%) rename pkgs/{development/embedded/stm32/stm32flash/default.nix => unit/st/stm32flash/pkg-fun.nix} (100%) rename pkgs/{development/embedded/stm8/stm8flash/default.nix => unit/st/stm8flash/pkg-fun.nix} (100%) rename pkgs/{applications/audio/stochas/default.nix => unit/st/stochas/pkg-fun.nix} (100%) rename pkgs/{games/stockfish/default.nix => unit/st/stockfish/pkg-fun.nix} (100%) rename pkgs/{applications/audio/stone-phaser/default.nix => unit/st/stone-phaser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/storcli/default.nix => unit/st/storcli/pkg-fun.nix} (100%) rename pkgs/{tools/backup/store-backup/default.nix => unit/st/storeBackup/pkg-fun.nix} (100%) rename pkgs/{servers/computing/storm/default.nix => unit/st/storm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/storrent/default.nix => unit/st/storrent/pkg-fun.nix} (100%) rename pkgs/{tools/misc/stow/default.nix => unit/st/stow/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/stp/default.nix => unit/st/stp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/strace-analyzer/default.nix => unit/st/strace-analyzer/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/strace/default.nix => unit/st/strace/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/stratis-cli/default.nix => unit/st/stratis-cli/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/stratisd/default.nix => unit/st/stratisd/pkg-fun.nix} (100%) rename pkgs/{applications/video/streamlink-twitch-gui/bin.nix => unit/st/streamlink-twitch-gui-bin/pkg-fun.nix} (100%) rename pkgs/{applications/video/streamlink/default.nix => unit/st/streamlink/pkg-fun.nix} (100%) rename pkgs/{applications/audio/streamripper/default.nix => unit/st/streamripper/pkg-fun.nix} (100%) rename pkgs/{tools/system/stress-ng/default.nix => unit/st/stress-ng/pkg-fun.nix} (100%) rename pkgs/{tools/system/stress/default.nix => unit/st/stress/pkg-fun.nix} (100%) rename pkgs/{tools/system/stressapptest/default.nix => unit/st/stressapptest/pkg-fun.nix} (100%) rename pkgs/{applications/misc/stretchly/default.nix => unit/st/stretchly/pkg-fun.nix} (100%) rename pkgs/{tools/security/stricat/default.nix => unit/st/stricat/pkg-fun.nix} (100%) rename pkgs/{applications/audio/string-machine/default.nix => unit/st/string-machine/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/st}/strongswan/ext_auth-path.patch (100%) rename pkgs/{tools/networking => unit/st}/strongswan/firewall_defaults.patch (100%) rename pkgs/{tools/networking/strongswan/default.nix => unit/st/strongswan/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/st}/strongswan/updown-path.patch (100%) rename pkgs/{tools/graphics => unit/st}/structure-synth/gcc47.patch (100%) rename pkgs/{tools/graphics/structure-synth/default.nix => unit/st/structure-synth/pkg-fun.nix} (100%) rename pkgs/{tools/audio/stt/default.nix => unit/st/stt/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/stuffbin/default.nix => unit/st/stuffbin/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers => unit/st}/stumpish/paths.patch (100%) rename pkgs/{applications/window-managers/stumpish/default.nix => unit/st/stumpish/pkg-fun.nix} (100%) rename pkgs/{tools/networking/stun/default.nix => unit/st/stun/pkg-fun.nix} (100%) rename pkgs/{tools/networking/stunnel/default.nix => unit/st/stunnel/pkg-fun.nix} (100%) rename pkgs/{tools/networking/stuntman/default.nix => unit/st/stuntman/pkg-fun.nix} (100%) rename pkgs/{applications/misc/stw/default.nix => unit/st/stw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/stxxl/default.nix => unit/st/stxxl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/stylish/default.nix => unit/st/stylish/pkg-fun.nix} (100%) rename pkgs/{development/tools/stylua/default.nix => unit/st/stylua/pkg-fun.nix} (100%) rename pkgs/{applications/misc/styx/default.nix => unit/st/styx/pkg-fun.nix} (100%) rename pkgs/{tools/security/su-exec/default.nix => unit/su/su-exec/pkg-fun.nix} (100%) rename pkgs/{applications/video/sub-batch/default.nix => unit/su/sub-batch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/subberthehut/default.nix => unit/su/subberthehut/pkg-fun.nix} (100%) rename pkgs/{applications/video/subdl/default.nix => unit/su/subdl/pkg-fun.nix} (100%) rename pkgs/{tools/text/subedit/default.nix => unit/su/subedit/pkg-fun.nix} (100%) rename pkgs/{tools/networking/subfinder/default.nix => unit/su/subfinder/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/subgit/default.nix => unit/su/subgit/pkg-fun.nix} (100%) rename pkgs/{tools/security/subjs/default.nix => unit/su/subjs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sublime-music/default.nix => unit/su/sublime-music/pkg-fun.nix} (100%) rename pkgs/{applications/editors/sublime/2/default.nix => unit/su/sublime/pkg-fun.nix} (100%) rename pkgs/{tools/networking/subnetcalc/default.nix => unit/su/subnetcalc/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/subread/default.nix => unit/su/subread/pkg-fun.nix} (100%) rename pkgs/{servers/misc/subsonic/default.nix => unit/su/subsonic/pkg-fun.nix} (100%) rename pkgs/{build-support/substitute/substitute.nix => unit/su/substitute/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/su}/substitute/substitute.sh (100%) rename pkgs/{build-support/substitute/substitute-all.nix => unit/su/substituteAll/pkg-fun.nix} (100%) rename pkgs/{build-support/substitute => unit/su/substituteAll}/substitute-all.sh (100%) rename pkgs/{build-support/substitute-files/substitute-all-files.nix => unit/su/substituteAllFiles/pkg-fun.nix} (100%) rename pkgs/{applications/video/subtitleeditor/default.nix => unit/su/subtitleeditor/pkg-fun.nix} (100%) rename pkgs/{development/libraries/subunit/default.nix => unit/su/subunit/pkg-fun.nix} (100%) rename pkgs/{data/fonts/sudo/default.nix => unit/su/sudo-font/pkg-fun.nix} (100%) rename pkgs/{tools/security/sudo/default.nix => unit/su/sudo/pkg-fun.nix} (100%) rename pkgs/{tools/system/suid-chroot/default.nix => unit/su/suidChroot/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/suil/default.nix => unit/su/suil/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/suitesparse-graphblas/default.nix => unit/su/suitesparse-graphblas/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/suitesparse/4.2.nix => unit/su/suitesparse_4_2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/suitesparse/4.4.nix => unit/su/suitesparse_4_4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/suitesparse/default.nix => unit/su/suitesparse_5_3/pkg-fun.nix} (100%) rename pkgs/{development/tools/summon/default.nix => unit/su/summon/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/su}/summon/resolve-paths.patch (100%) rename pkgs/{applications/science/networking/sumo/default.nix => unit/su/sumo/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/sundtek/default.nix => unit/su/sundtek/pkg-fun.nix} (100%) rename pkgs/{tools/X11/sunpaper/default.nix => unit/su/sunpaper/pkg-fun.nix} (100%) rename pkgs/{servers => unit/su}/sunshine/ffmpeg.diff (100%) rename pkgs/{servers => unit/su}/sunshine/package-lock.json (100%) rename pkgs/{servers/sunshine/default.nix => unit/su/sunshine/pkg-fun.nix} (100%) rename pkgs/{applications/audio/sunvox/default.nix => unit/su/sunvox/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sunwait/default.nix => unit/su/sunwait/pkg-fun.nix} (100%) rename pkgs/{development/tools/sunxi-tools/default.nix => unit/su/sunxi-tools/pkg-fun.nix} (100%) rename pkgs/{development/tools/supabase-cli/default.nix => unit/su/supabase-cli/pkg-fun.nix} (100%) rename pkgs/{applications/office/super-productivity/default.nix => unit/su/super-productivity/pkg-fun.nix} (100%) rename pkgs/{data/icons/super-tiny-icons/default.nix => unit/su/super-tiny-icons/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/su}/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch (100%) rename pkgs/{tools/security/super/default.nix => unit/su/super/pkg-fun.nix} (100%) rename pkgs/{games/supertux/default.nix => unit/su/superTux/pkg-fun.nix} (100%) rename pkgs/{misc/superd/default.nix => unit/su/superd/pkg-fun.nix} (100%) rename pkgs/{applications/system/supergfxctl/default.nix => unit/su/supergfxctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/su}/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch (100%) rename pkgs/{development/libraries/science/math/superlu/default.nix => unit/su/superlu/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/supermin/default.nix => unit/su/supermin/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/su}/supertag/cargo-lock-update-lexical-core.patch (100%) rename pkgs/{tools/filesystems/supertag/default.nix => unit/su/supertag/pkg-fun.nix} (100%) rename pkgs/{applications/editors/supertux-editor/default.nix => unit/su/supertux-editor/pkg-fun.nix} (100%) rename pkgs/{tools/system/supervise/default.nix => unit/su/supervise/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/surelog/default.nix => unit/su/surelog/pkg-fun.nix} (100%) rename pkgs/{desktops => unit/su}/surf-display/pdf-makefile.patch (100%) rename pkgs/{desktops/surf-display/default.nix => unit/su/surf-display/pkg-fun.nix} (100%) rename pkgs/{applications/misc/surface-control/default.nix => unit/su/surface-control/pkg-fun.nix} (100%) rename pkgs/{tools/networking/surfraw/default.nix => unit/su/surfraw/pkg-fun.nix} (100%) rename pkgs/{applications/audio/surge-XT/default.nix => unit/su/surge-XT/pkg-fun.nix} (100%) rename pkgs/{applications/radio/suscan/default.nix => unit/su/suscan/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sutils/default.nix => unit/su/sutils/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/svaba/default.nix => unit/sv/svaba/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/svd2rust/default.nix => unit/sv/svd2rust/pkg-fun.nix} (100%) rename pkgs/{development/embedded/svdtools/default.nix => unit/sv/svdtools/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/svg2pdf/default.nix => unit/sv/svg2pdf/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/svgbob/default.nix => unit/sv/svgbob/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/svgcleaner/default.nix => unit/sv/svgcleaner/pkg-fun.nix} (100%) rename pkgs/{applications/accessibility/svkbd/default.nix => unit/sv/svkbd/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/svlint/default.nix => unit/sv/svlint/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/svls/default.nix => unit/sv/svls/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/svnfs/default.nix => unit/sv/svnfs/pkg-fun.nix} (100%) rename pkgs/{applications/audio/svox/default.nix => unit/sv/svox/pkg-fun.nix} (100%) rename pkgs/{development/libraries/svrcore/default.nix => unit/sv/svrcore/pkg-fun.nix} (100%) rename pkgs/{tools/video/svt-av1/default.nix => unit/sv/svt-av1/pkg-fun.nix} (100%) rename pkgs/{tools/misc/svtplay-dl/default.nix => unit/sv/svtplay-dl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/swagger-codegen/default.nix => unit/sw/swagger-codegen/pkg-fun.nix} (100%) rename pkgs/{tools/networking/swagger-codegen3/default.nix => unit/sw/swagger-codegen3/pkg-fun.nix} (100%) rename pkgs/{tools/security/swaggerhole/default.nix => unit/sw/swaggerhole/pkg-fun.nix} (100%) rename pkgs/{tools/misc/swaglyrics/default.nix => unit/sw/swaglyrics/pkg-fun.nix} (100%) rename pkgs/{tools/networking/swaks/default.nix => unit/sw/swaks/pkg-fun.nix} (100%) rename pkgs/{tools/admin/swapspace/default.nix => unit/sw/swapspace/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/swapview/default.nix => unit/sw/swapview/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/swarm/default.nix => unit/sw/swarm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/sway-launcher-desktop/default.nix => unit/sw/sway-launcher-desktop/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway => unit/sw/sway-unwrapped}/fix-paths.patch (100%) rename pkgs/{applications/window-managers/sway => unit/sw/sway-unwrapped}/load-configuration-from-etc.patch (100%) rename pkgs/{applications/window-managers/sway/default.nix => unit/sw/sway-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway => unit/sw/sway-unwrapped}/sway-config-nixos-paths.patch (100%) rename pkgs/{applications/window-managers/sway => unit/sw/sway-unwrapped}/sway-config-no-nix-store-references.patch (100%) rename pkgs/{applications/window-managers/sway/wrapper.nix => unit/sw/sway/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/bg.nix => unit/sw/swaybg/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/swaycons.nix => unit/sw/swaycons/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/swaycwd/default.nix => unit/sw/swaycwd/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/swayest-workstyle/default.nix => unit/sw/swayest-workstyle/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/idle.nix => unit/sw/swayidle/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/swayimg/default.nix => unit/sw/swayimg/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/swaykbdd/default.nix => unit/sw/swaykbdd/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/lock-effects.nix => unit/sw/swaylock-effects/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/lock-fancy.nix => unit/sw/swaylock-fancy/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/lock.nix => unit/sw/swaylock/pkg-fun.nix} (100%) rename pkgs/{applications/misc/swaynag-battery/default.nix => unit/sw/swaynag-battery/pkg-fun.nix} (100%) rename pkgs/{applications/misc/swaynotificationcenter/default.nix => unit/sw/swaynotificationcenter/pkg-fun.nix} (100%) rename pkgs/{tools/wayland => unit/sw}/swayr/icon-paths.patch (100%) rename pkgs/{tools/wayland/swayr/default.nix => unit/sw/swayr/pkg-fun.nix} (100%) rename pkgs/{applications/misc/swaysettings/default.nix => unit/sw/swaysettings/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/swaysome/default.nix => unit/sw/swaysome/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/ws.nix => unit/sw/swayws/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/sway/wsr.nix => unit/sw/swaywsr/pkg-fun.nix} (100%) rename pkgs/{data/themes/sweet/default.nix => unit/sw/sweet/pkg-fun.nix} (100%) rename pkgs/{servers/swego/default.nix => unit/sw/swego/pkg-fun.nix} (100%) rename pkgs/{applications/audio/swh-lv2/default.nix => unit/sw/swh_lv2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/swift-corelibs-libdispatch/default.nix => unit/sw/swift-corelibs-libdispatch/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0005-clang-toolchain-dir.patch (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0006-clang-purity.patch (100%) rename pkgs/{development/compilers => unit/sw}/swift/patches/0007-build-presets-linux-os-stdlib.patch (100%) rename pkgs/{development/compilers/swift/default.nix => unit/sw/swift/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/swiftbar/default.nix => unit/sw/swiftbar/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/swiftdefaultapps/default.nix => unit/sw/swiftdefaultapps/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sw}/swiften/build-fix.patch (100%) rename pkgs/{development/libraries/swiften/default.nix => unit/sw/swiften/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/sw}/swiften/scons.patch (100%) rename pkgs/{development/tools/swiftformat/default.nix => unit/sw/swiftformat/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/swig/default.nix => unit/sw/swig1/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/swig/2.x.nix => unit/sw/swig2/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/swig/3.x.nix => unit/sw/swig3/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/swig/4.nix => unit/sw/swig4/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/swingsane/default.nix => unit/sw/swingsane/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/switcheroo-control/default.nix => unit/sw/switcheroo-control/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sword/default.nix => unit/sw/sword/pkg-fun.nix} (100%) rename pkgs/{tools/security/swtpm/default.nix => unit/sw/swtpm/pkg-fun.nix} (100%) rename pkgs/{tools/security/sx-go/default.nix => unit/sx/sx-go/pkg-fun.nix} (100%) rename pkgs/{tools/X11/sx/default.nix => unit/sx/sx/pkg-fun.nix} (100%) rename pkgs/{tools/X11/sxhkd/default.nix => unit/sx/sxhkd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/Sylk/default.nix => unit/sy/Sylk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/sycl-info/default.nix => unit/sy/sycl-info/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sydbox/default.nix => unit/sy/sydbox/pkg-fun.nix} (100%) rename pkgs/{tools/admin/syft/default.nix => unit/sy/syft/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/symbiyosys/default.nix => unit/sy/symbiyosys/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/symbolic-preview/default.nix => unit/sy/symbolic-preview/pkg-fun.nix} (100%) rename pkgs/{development/libraries/symengine/default.nix => unit/sy/symengine/pkg-fun.nix} (100%) rename pkgs/{development/tools/symfony-cli/default.nix => unit/sy/symfony-cli/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/symfpu/default.nix => unit/sy/symfpu/pkg-fun.nix} (100%) rename pkgs/{tools/system/symlinks/default.nix => unit/sy/symlinks/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/symmetrica/default.nix => unit/sy/symmetrica/pkg-fun.nix} (100%) rename pkgs/{servers/mail => unit/sy}/sympa/make-docs.patch (100%) rename pkgs/{servers/mail/sympa/default.nix => unit/sy/sympa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/sy}/sympow/clean-extra-logfile-output-from-pari.patch (100%) rename pkgs/{development/libraries/science/math/sympow/default.nix => unit/sy/sympow/pkg-fun.nix} (100%) rename pkgs/{applications/audio/synaesthesia/default.nix => unit/sy/synaesthesia/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/sy}/synapse-admin/package.json (100%) rename pkgs/{tools/admin/synapse-admin/default.nix => unit/sy/synapse-admin/pkg-fun.nix} (100%) rename pkgs/{tools/admin => unit/sy}/synapse-admin/yarn.lock (100%) rename pkgs/{tools/admin => unit/sy}/synapse-admin/yarn.nix (100%) rename pkgs/{applications/misc/synapse/default.nix => unit/sy/synapse/pkg-fun.nix} (100%) rename pkgs/{servers/syncstorage-rs/default.nix => unit/sy/syncstorage-rs/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/syncterm/default.nix => unit/sy/syncterm/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/sy}/syncthing-tray/deps.nix (100%) rename pkgs/{applications/misc/syncthing-tray/default.nix => unit/sy/syncthing-tray/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/synfigstudio/default.nix => unit/sy/synfigstudio/pkg-fun.nix} (100%) rename pkgs/{applications/networking/synology-cloud-sync-decryption-tool/default.nix => unit/sy/synology-cloud-sync-decryption-tool/pkg-fun.nix} (100%) rename pkgs/{applications/networking/synology-drive-client/default.nix => unit/sy/synology-drive-client/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/syntex/default.nix => unit/sy/syntex/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/sysbench/default.nix => unit/sy/sysbench/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/syscall_limiter/default.nix => unit/sy/syscall_limiter/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sysfsutils/default.nix => unit/sy/sysfsutils/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/sy}/sysklogd/fix-includes-for-musl.patch (100%) rename pkgs/{os-specific/linux/sysklogd/default.nix => unit/sy/sysklogd/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/sy}/sysklogd/systemd.patch (100%) rename pkgs/{os-specific/linux => unit/sy}/sysklogd/union-wait.patch (100%) rename pkgs/{os-specific/linux => unit/sy}/syslinux/gcc10.patch (100%) rename pkgs/{os-specific/linux/syslinux/default.nix => unit/sy/syslinux/pkg-fun.nix} (100%) rename pkgs/{tools/system/syslog-ng/default.nix => unit/sy/syslogng/pkg-fun.nix} (100%) rename pkgs/{development/tools/profiling/sysprof/default.nix => unit/sy/sysprof/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/sy}/sysstat/install.patch (100%) rename pkgs/{os-specific/linux/sysstat/default.nix => unit/sy/sysstat/pkg-fun.nix} (100%) rename pkgs/{games/system-syzygy/default.nix => unit/sy/system-syzygy/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/system76-firmware/default.nix => unit/sy/system76-firmware/pkg-fun.nix} (100%) rename pkgs/{applications/misc/system76-keyboard-configurator/default.nix => unit/sy/system76-keyboard-configurator/pkg-fun.nix} (100%) rename pkgs/{applications/misc/systembus-notify/default.nix => unit/sy/systembus-notify/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/systemc/default.nix => unit/sy/systemc/pkg-fun.nix} (100%) rename pkgs/{tools/system/systemd-journal2gelf/default.nix => unit/sy/systemd-journal2gelf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/systemd-wait/default.nix => unit/sy/systemd-wait/pkg-fun.nix} (100%) rename pkgs/{development/tools/systemfd/default.nix => unit/sy/systemfd/pkg-fun.nix} (100%) rename pkgs/{tools/system/systeroid/default.nix => unit/sy/systeroid/pkg-fun.nix} (100%) rename pkgs/{tools/misc/systrayhelper/default.nix => unit/sy/systrayhelper/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/sysvinit/default.nix => unit/sy/sysvinit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/sysz/default.nix => unit/sy/sysz/pkg-fun.nix} (100%) rename pkgs/{development/libraries/szip/default.nix => unit/sz/szip/pkg-fun.nix} (100%) rename pkgs/{tools/misc/szyszka/default.nix => unit/sz/szyszka/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/t}/t/Gemfile (100%) rename pkgs/{tools/misc => unit/t}/t/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/t}/t/gemset.nix (100%) rename pkgs/{tools/misc/t/default.nix => unit/t/t/pkg-fun.nix} (100%) rename pkgs/{development/libraries/t1lib/default.nix => unit/t1/t1lib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/t1utils/default.nix => unit/t1/t1utils/pkg-fun.nix} (100%) rename pkgs/{games/t4kcommon/default.nix => unit/t4/t4kcommon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ta-lib/default.nix => unit/ta/ta-lib/pkg-fun.nix} (100%) rename pkgs/{tools/text/tab/default.nix => unit/ta/tab/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/tabbed/default.nix => unit/ta/tabbed/pkg-fun.nix} (100%) rename pkgs/{development/tools/tabnine/default.nix => unit/ta/tabnine/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ta}/tabnine/sources.json (100%) rename pkgs/{development/tools => unit/ta}/tabnine/update.sh (100%) rename pkgs/{applications/misc/tabula-java/default.nix => unit/ta/tabula-java/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tabula/default.nix => unit/ta/tabula/pkg-fun.nix} (100%) rename pkgs/{servers/tacacsplus/default.nix => unit/ta/tacacsplus/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tagger/default.nix => unit/ta/tagger/pkg-fun.nix} (100%) rename pkgs/{development/libraries/taglib-sharp/default.nix => unit/ta/taglib-sharp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/taglib/default.nix => unit/ta/taglib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/taglib-extras/default.nix => unit/ta/taglib_extras/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tagparser/default.nix => unit/ta/tagparser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tagref/default.nix => unit/ta/tagref/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tagtime/default.nix => unit/ta/tagtime/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tagutil/default.nix => unit/ta/tagutil/pkg-fun.nix} (100%) rename pkgs/{tools/networking/p2p/tahoe-lafs/default.nix => unit/ta/tahoe-lafs/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/tailor/default.nix => unit/ta/tailor/pkg-fun.nix} (100%) rename pkgs/{servers/tailscale/default.nix => unit/ta/tailscale/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tailspin/default.nix => unit/ta/tailspin/pkg-fun.nix} (100%) rename pkgs/{games => unit/ta}/taisei/0001-lto-fix.patch (100%) rename pkgs/{games/taisei/default.nix => unit/ta/taisei/pkg-fun.nix} (100%) rename pkgs/{data/fonts/takao/default.nix => unit/ta/takao/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/taktuk/default.nix => unit/ta/taktuk/pkg-fun.nix} (100%) rename pkgs/{applications/audio/talentedhack/default.nix => unit/ta/talentedhack/pkg-fun.nix} (100%) rename pkgs/{misc/talkfilters/default.nix => unit/ta/talkfilters/pkg-fun.nix} (100%) rename pkgs/{development/libraries/talloc/default.nix => unit/ta/talloc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/talosctl/default.nix => unit/ta/talosctl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tambura/default.nix => unit/ta/tambura/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tamsyn/default.nix => unit/ta/tamsyn/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tamzen/default.nix => unit/ta/tamzen/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/tandem-aligner/default.nix => unit/ta/tandem-aligner/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ta}/tandoor-recipes/common.nix (100%) rename pkgs/{applications/misc => unit/ta}/tandoor-recipes/frontend.nix (100%) rename pkgs/{applications/misc => unit/ta}/tandoor-recipes/media-root.patch (100%) rename pkgs/{applications/misc/tandoor-recipes/default.nix => unit/ta/tandoor-recipes/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ta}/tandoor-recipes/update.sh (100%) rename pkgs/{applications/networking/instant-messengers/tangram/default.nix => unit/ta/tangram/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tanka/default.nix => unit/ta/tanka/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ta}/taoup/cachefile.patch (100%) rename pkgs/{tools/misc => unit/ta}/taoup/help.patch (100%) rename pkgs/{tools/misc/taoup/default.nix => unit/ta/taoup/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/ta}/taoup/tput.patch (100%) rename pkgs/{applications/audio/tap-plugins/default.nix => unit/ta/tap-plugins/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/ta}/tapview/dont_check_echo.patch (100%) rename pkgs/{development/tools/tapview/default.nix => unit/ta/tapview/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/tar2ext4/default.nix => unit/ta/tar2ext4/pkg-fun.nix} (100%) rename pkgs/{servers/tarantool/default.nix => unit/ta/tarantool/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ta}/target-isns/install_prefix_path.patch (100%) rename pkgs/{os-specific/linux/target-isns/default.nix => unit/ta/target-isns/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/targetcli/default.nix => unit/ta/targetcli/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/tarlz/default.nix => unit/ta/tarlz/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/taro/default.nix => unit/ta/taro/pkg-fun.nix} (100%) rename pkgs/{tools/backup/tarsnap/default.nix => unit/ta/tarsnap/pkg-fun.nix} (100%) rename pkgs/{tools/backup/tarsnapper/default.nix => unit/ta/tarsnapper/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/ta}/tarsnapper/remove-argparse.patch (100%) rename pkgs/{servers/tarssh/default.nix => unit/ta/tarssh/pkg-fun.nix} (100%) rename pkgs/{build-support/docker/tarsum.nix => unit/ta/tarsum/pkg-fun.nix} (100%) rename pkgs/{build-support/docker => unit/ta/tarsum}/tarsum.go (100%) rename pkgs/{development/tools/analysis/tartan/default.nix => unit/ta/tartan/pkg-fun.nix} (100%) rename pkgs/{development/libraries/taskflow/default.nix => unit/ta/taskflow/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ta}/taskflow/unvendor-doctest.patch (100%) rename pkgs/{applications/misc => unit/ta}/taskjuggler/3.x/Gemfile (100%) rename pkgs/{applications/misc => unit/ta}/taskjuggler/3.x/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/ta}/taskjuggler/3.x/gemset.nix (100%) rename pkgs/{applications/misc => unit/ta}/taskjuggler/Gemfile (100%) rename pkgs/{applications/misc => unit/ta}/taskjuggler/Gemfile.lock (100%) rename pkgs/{applications/misc => unit/ta}/taskjuggler/gemset.nix (100%) rename pkgs/{applications/misc/taskjuggler/default.nix => unit/ta/taskjuggler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tasknc/default.nix => unit/ta/tasknc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/taskopen/default.nix => unit/ta/taskopen/pkg-fun.nix} (100%) rename pkgs/{servers/misc/taskserver/default.nix => unit/ta/taskserver/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tasksh/default.nix => unit/ta/tasksh/pkg-fun.nix} (100%) rename pkgs/{tools/system/taskspooler/default.nix => unit/ta/taskspooler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tasktimer/default.nix => unit/ta/tasktimer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/taskwarrior-tui/default.nix => unit/ta/taskwarrior-tui/pkg-fun.nix} (100%) rename pkgs/{applications/misc/taskwarrior/default.nix => unit/ta/taskwarrior/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tauon/default.nix => unit/ta/tauon/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ftp/taxi/default.nix => unit/ta/taxi/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tayga/default.nix => unit/ta/tayga/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tbb/default.nix => unit/tb/tbb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tbls/default.nix => unit/tb/tbls/pkg-fun.nix} (100%) rename pkgs/{tools/security/tboot/default.nix => unit/tb/tboot/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tcat/default.nix => unit/tc/tcat/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/tc}/tcb/fix-makefiles.patch (100%) rename pkgs/{tools/security/tcb/default.nix => unit/tc/tcb/pkg-fun.nix} (100%) rename pkgs/{games/tcl2048/default.nix => unit/tc/tcl2048/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tclap/default.nix => unit/tc/tclap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tcllib/default.nix => unit/tc/tcllib/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/tclreadline/default.nix => unit/tc/tclreadline/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tcltls/default.nix => unit/tc/tcltls/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tclx/default.nix => unit/tc/tclx/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tcp-cutter/default.nix => unit/tc/tcp-cutter/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tcp-wrappers => unit/tc/tcp_wrappers}/cdecls.patch (100%) rename pkgs/{os-specific/linux/tcp-wrappers/default.nix => unit/tc/tcp_wrappers/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tcp-wrappers => unit/tc/tcp_wrappers}/tcp-wrappers-7.6-headers.patch (100%) rename pkgs/{tools/security/tcpcrypt/default.nix => unit/tc/tcpcrypt/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tcpdump/default.nix => unit/tc/tcpdump/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tcpflow/default.nix => unit/tc/tcpflow/pkg-fun.nix} (100%) rename pkgs/{applications/networking/tcping-go/default.nix => unit/tc/tcping-go/pkg-fun.nix} (100%) rename pkgs/{applications/networking/tcpkali/default.nix => unit/tc/tcpkali/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tcptraceroute/default.nix => unit/tc/tcptraceroute/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/tcptrack/default.nix => unit/tc/tcptrack/pkg-fun.nix} (100%) rename pkgs/{shells/tcsh/default.nix => unit/tc/tcsh/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/td}/td/Gemfile (100%) rename pkgs/{tools/misc => unit/td}/td/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/td}/td/gemset.nix (100%) rename pkgs/{tools/misc/td/default.nix => unit/td/td/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tdb/default.nix => unit/td/tdb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tdfgo/default.nix => unit/td/tdfgo/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix => unit/td/tdlib-purple/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tdlib/default.nix => unit/td/tdlib/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tdns-cli/default.nix => unit/td/tdns-cli/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tdrop/default.nix => unit/td/tdrop/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tea/default.nix => unit/te/tea/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/te}/teamocil/Gemfile (100%) rename pkgs/{tools/misc => unit/te}/teamocil/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/te}/teamocil/gemset.nix (100%) rename pkgs/{tools/misc/teamocil/default.nix => unit/te/teamocil/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/teams/default.nix => unit/te/teams/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/teamspeak/client5.nix => unit/te/teamspeak5_client/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/teamspeak/server.nix => unit/te/teamspeak_server/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/te}/teapot/001-fix-warning.patch (100%) rename pkgs/{applications/office => unit/te}/teapot/002-remove-help.patch (100%) rename pkgs/{applications/office/teapot/default.nix => unit/te/teapot/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/tebreak/default.nix => unit/te/tebreak/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/teck-udev-rules/default.nix => unit/te/teck-udev-rules/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tecla/default.nix => unit/te/tecla/pkg-fun.nix} (100%) rename pkgs/{games/tecnoballz/default.nix => unit/te/tecnoballz/pkg-fun.nix} (100%) rename pkgs/{applications/editors/tecoc/default.nix => unit/te/tecoc/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/ted/default.nix => unit/te/ted/pkg-fun.nix} (100%) rename pkgs/{development/embedded/teensy-loader-cli/default.nix => unit/te/teensy-loader-cli/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/teensy-udev-rules/default.nix => unit/te/teensy-udev-rules/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/te}/teensy-udev-rules/teensy.rules (100%) rename pkgs/{games/teetertorture/default.nix => unit/te/teetertorture/pkg-fun.nix} (100%) rename pkgs/{games/teeworlds/default.nix => unit/te/teeworlds/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/tegaki-zinnia-japanese/default.nix => unit/te/tegaki-zinnia-japanese/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/tegola/default.nix => unit/te/tegola/pkg-fun.nix} (100%) rename pkgs/{tools/text/teip/default.nix => unit/te/teip/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tektoncd-cli/default.nix => unit/te/tektoncd-cli/pkg-fun.nix} (100%) rename pkgs/{data/icons/tela-icon-theme/default.nix => unit/te/tela-icon-theme/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/telegraf/default.nix => unit/te/telegraf/pkg-fun.nix} (100%) rename pkgs/{servers/telegram-bot-api/default.nix => unit/te/telegram-bot-api/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telegram/telegram-cli/default.nix => unit/te/telegram-cli/pkg-fun.nix} (100%) rename pkgs/{development/libraries/telepathy/farstream/default.nix => unit/te/telepathy-farstream/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telepathy/gabble/default.nix => unit/te/telepathy-gabble/pkg-fun.nix} (100%) rename pkgs/{development/libraries/telepathy/glib/default.nix => unit/te/telepathy-glib/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telepathy/haze/default.nix => unit/te/telepathy-haze/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telepathy/idle/default.nix => unit/te/telepathy-idle/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telepathy/logger/default.nix => unit/te/telepathy-logger/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/telepathy/mission-control/default.nix => unit/te/telepathy-mission-control/pkg-fun.nix} (100%) rename pkgs/{tools/networking/telepresence2/default.nix => unit/te/telepresence2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/teleprompter/default.nix => unit/te/teleprompter/pkg-fun.nix} (100%) rename pkgs/{tools/security/teler/default.nix => unit/te/teler/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/telescope/default.nix => unit/te/telescope/pkg-fun.nix} (100%) rename pkgs/{development/libraries/template-glib/default.nix => unit/te/template-glib/pkg-fun.nix} (100%) rename pkgs/{servers/tracing/tempo/default.nix => unit/te/tempo/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tempora-lgc/default.nix => unit/te/tempora_lgc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/temporal-cli/default.nix => unit/te/temporal-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/temporal/default.nix => unit/te/temporal/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/temporalite/default.nix => unit/te/temporalite/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tenacity/default.nix => unit/te/tenacity/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tendermint/default.nix => unit/te/tendermint/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tenderness/default.nix => unit/te/tenderness/pkg-fun.nix} (100%) rename pkgs/{games => unit/te}/tennix/fix_FTBFS.patch (100%) rename pkgs/{games/tennix/default.nix => unit/te/tennix/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math => unit/te}/tensorflow-lite/eigen_include_dir.patch (100%) rename pkgs/{development/libraries/science/math/tensorflow-lite/default.nix => unit/te/tensorflow-lite/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tepl/default.nix => unit/te/tepl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tere/default.nix => unit/te/tere/pkg-fun.nix} (100%) rename pkgs/{development/libraries/termbox/default.nix => unit/te/termbox/pkg-fun.nix} (100%) rename pkgs/{development/libraries/termcolor/default.nix => unit/te/termcolor/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/termdbms/default.nix => unit/te/termdbms/pkg-fun.nix} (100%) rename pkgs/{development/tools/database => unit/te}/termdbms/viewer.patch (100%) rename pkgs/{applications/misc/terminal-colors/default.nix => unit/te/terminal-colors/pkg-fun.nix} (100%) rename pkgs/{applications/misc/terminal-notifier/default.nix => unit/te/terminal-notifier/pkg-fun.nix} (100%) rename pkgs/{applications/misc/terminal-parrot/default.nix => unit/te/terminal-parrot/pkg-fun.nix} (100%) rename pkgs/{applications/misc/terminal-stocks/default.nix => unit/te/terminal-stocks/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/terminator/default.nix => unit/te/terminator/pkg-fun.nix} (100%) rename pkgs/{data/fonts/terminus-font => unit/te/terminus_font}/SOURCE_DATE_EPOCH-for-otb.patch (100%) rename pkgs/{data/fonts/terminus-font/default.nix => unit/te/terminus_font/pkg-fun.nix} (100%) rename pkgs/{data/fonts/terminus-font-ttf/default.nix => unit/te/terminus_font_ttf/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/termite => unit/te/termite-unwrapped}/add_errno_header.patch (100%) rename pkgs/{applications/terminal-emulators/termite/default.nix => unit/te/termite-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/termite => unit/te/termite-unwrapped}/remove_ldflags_macos.patch (100%) rename pkgs/{applications/terminal-emulators/termite => unit/te/termite-unwrapped}/url_regexp_trailing.patch (100%) rename pkgs/{applications/terminal-emulators/termite => unit/te/termite-unwrapped}/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch (100%) rename pkgs/{applications/terminal-emulators/termite => unit/te/termite-unwrapped}/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch (100%) rename pkgs/{applications/terminal-emulators/termite => unit/te/termite-unwrapped}/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch (100%) rename pkgs/{applications/networking/termius/default.nix => unit/te/termius/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/termonad/default.nix => unit/te/termonad/pkg-fun.nix} (100%) rename pkgs/{tools/misc/termplay/default.nix => unit/te/termplay/pkg-fun.nix} (100%) rename pkgs/{tools/networking/termshark/default.nix => unit/te/termshark/pkg-fun.nix} (100%) rename pkgs/{data/fonts/termsyn/default.nix => unit/te/termsyn/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/termtekst/default.nix => unit/te/termtekst/pkg-fun.nix} (100%) rename pkgs/{tools/misc/termtosvg/default.nix => unit/te/termtosvg/pkg-fun.nix} (100%) rename pkgs/{applications/audio/termusic/default.nix => unit/te/termusic/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/terra-station/default.nix => unit/te/terra-station/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/terracognita/default.nix => unit/te/terracognita/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/terraform-docs/default.nix => unit/te/terraform-docs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/terraform-inventory/default.nix => unit/te/terraform-inventory/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraform-landscape/Gemfile (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraform-landscape/Gemfile.lock (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraform-landscape/gemset.nix (100%) rename pkgs/{applications/networking/cluster/terraform-landscape/default.nix => unit/te/terraform-landscape/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/terraform-ls/default.nix => unit/te/terraform-ls/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/terraform-lsp/default.nix => unit/te/terraform-lsp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/terraformer/default.nix => unit/te/terraformer/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraforming/Gemfile (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraforming/Gemfile.lock (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraforming/gemset.nix (100%) rename pkgs/{applications/networking/cluster/terraforming/default.nix => unit/te/terraforming/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/terragrunt/default.nix => unit/te/terragrunt/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/terranix/default.nix => unit/te/terranix/pkg-fun.nix} (100%) rename pkgs/{games/terraria-server/default.nix => unit/te/terraria-server/pkg-fun.nix} (100%) rename pkgs/{tools/security/terrascan/default.nix => unit/te/terrascan/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraspace/Gemfile (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraspace/Gemfile.lock (100%) rename pkgs/{applications/networking/cluster => unit/te}/terraspace/gemset.nix (100%) rename pkgs/{applications/networking/cluster/terraspace/default.nix => unit/te/terraspace/pkg-fun.nix} (100%) rename pkgs/{games/tes3cmd/default.nix => unit/te/tes3cmd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/teseq/default.nix => unit/te/teseq/pkg-fun.nix} (100%) rename pkgs/{tools/security/tessen/default.nix => unit/te/tessen/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/tessera/default.nix => unit/te/tessera/pkg-fun.nix} (100%) rename pkgs/{applications/networking/testssl/default.nix => unit/te/testssl/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/tet/default.nix => unit/te/tet/pkg-fun.nix} (100%) rename pkgs/{applications/science/geometry/tetgen/default.nix => unit/te/tetgen/pkg-fun.nix} (100%) rename pkgs/{applications/science/geometry/tetgen/1.4.nix => unit/te/tetgen_1_4/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tetraproc/default.nix => unit/te/tetraproc/pkg-fun.nix} (100%) rename pkgs/{applications/networking/tetrd/default.nix => unit/te/tetrd/pkg-fun.nix} (100%) rename pkgs/{games/tetrio-desktop/default.nix => unit/te/tetrio-desktop/pkg-fun.nix} (100%) rename pkgs/{games => unit/te}/tetrio-desktop/tetrio-plus.nix (100%) rename pkgs/{applications/graphics/tev/default.nix => unit/te/tev/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tevent/default.nix => unit/te/tevent/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tewi/default.nix => unit/te/tewi-font/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tewisay/default.nix => unit/te/tewisay/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/tex/tex-match/default.nix => unit/te/tex-match/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/texi2html/default.nix => unit/te/texi2html/pkg-fun.nix} (100%) rename pkgs/{tools/misc/texi2mdoc/default.nix => unit/te/texi2mdoc/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/texinfo/4.13a.nix => unit/te/texinfo413/pkg-fun.nix} (100%) rename pkgs/{development/libraries/text-engine/default.nix => unit/te/text-engine/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/te}/textadept/deps.nix (100%) rename pkgs/{applications/editors/textadept/default.nix => unit/te/textadept/pkg-fun.nix} (100%) rename pkgs/{tools/text/textpieces/default.nix => unit/te/textpieces/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/textplots/default.nix => unit/te/textplots/pkg-fun.nix} (100%) rename pkgs/{development/tools/textql/default.nix => unit/te/textql/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/texture-synthesis/default.nix => unit/te/texture-synthesis/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/te}/teyjus/fix-lex-to-flex.patch (100%) rename pkgs/{development/compilers/teyjus/default.nix => unit/te/teyjus/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tezos-rust-libs/default.nix => unit/te/tezos-rust-libs/pkg-fun.nix} (100%) rename pkgs/{development/tools/tf2pulumi/default.nix => unit/tf/tf2pulumi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tfk8s/default.nix => unit/tf/tfk8s/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/tf}/tfk8s/tests/sample1/default.nix (100%) rename pkgs/{tools/misc => unit/tf}/tfk8s/tests/sample1/input.yaml (100%) rename pkgs/{tools/misc => unit/tf}/tfk8s/tests/sample1/output.tf (100%) rename pkgs/{development/tools/analysis/tflint/default.nix => unit/tf/tflint/pkg-fun.nix} (100%) rename pkgs/{development/tools/tfplugindocs/default.nix => unit/tf/tfplugindocs/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/tfsec/default.nix => unit/tf/tfsec/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tfswitch/default.nix => unit/tf/tfswitch/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tftp-hpa/default.nix => unit/tf/tftp-hpa/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tgswitch/default.nix => unit/tg/tgswitch/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tgt/default.nix => unit/tg/tgt/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/thanos/default.nix => unit/th/thanos/pkg-fun.nix} (100%) rename pkgs/{tools/security/thc-hydra/default.nix => unit/th/thc-hydra/pkg-fun.nix} (100%) rename pkgs/{tools/security/thc-ipv6/default.nix => unit/th/thc-ipv6/pkg-fun.nix} (100%) rename pkgs/{development/libraries/the-foundation/default.nix => unit/th/the-foundation/pkg-fun.nix} (100%) rename pkgs/{games/the-legend-of-edgar/default.nix => unit/th/the-legend-of-edgar/pkg-fun.nix} (100%) rename pkgs/{development/tools/the-way/default.nix => unit/th/the-way/pkg-fun.nix} (100%) rename pkgs/{data/fonts/theano/default.nix => unit/th/theano/pkg-fun.nix} (100%) rename pkgs/{applications/misc/thedesk/default.nix => unit/th/thedesk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/theft/default.nix => unit/th/theft/pkg-fun.nix} (100%) rename pkgs/{tools/security/theharvester/default.nix => unit/th/theharvester/pkg-fun.nix} (100%) rename pkgs/{data/themes/jade1/default.nix => unit/th/theme-jade1/pkg-fun.nix} (100%) rename pkgs/{data/themes/obsidian2/default.nix => unit/th/theme-obsidian2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/theme-sh/default.nix => unit/th/theme-sh/pkg-fun.nix} (100%) rename pkgs/{data/themes/vertex/default.nix => unit/th/theme-vertex/pkg-fun.nix} (100%) rename pkgs/{applications/misc/themechanger/default.nix => unit/th/themechanger/pkg-fun.nix} (100%) rename pkgs/{development/libraries/physics/thepeg/default.nix => unit/th/thepeg/pkg-fun.nix} (100%) rename pkgs/{tools/system/thermald/default.nix => unit/th/thermald/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/thicket/default.nix => unit/th/thicket/pkg-fun.nix} (100%) rename pkgs/{applications/editors/thiefmd/default.nix => unit/th/thiefmd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/thin-provisioning-tools/default.nix => unit/th/thin-provisioning-tools/pkg-fun.nix} (100%) rename pkgs/{tools/system/thinkfan/default.nix => unit/th/thinkfan/pkg-fun.nix} (100%) rename pkgs/{applications/misc/thinking-rock/default.nix => unit/th/thinkingRock/pkg-fun.nix} (100%) rename pkgs/{applications/misc/thokr/default.nix => unit/th/thokr/pkg-fun.nix} (100%) rename pkgs/{applications/editors/thonny/default.nix => unit/th/thonny/pkg-fun.nix} (100%) rename pkgs/{tools/security/threatest/default.nix => unit/th/threatest/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/threema-desktop/default.nix => unit/th/threema-desktop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/thrift/0.10.nix => unit/th/thrift-0_10/pkg-fun.nix} (100%) rename pkgs/{tools/system/throttled/default.nix => unit/th/throttled/pkg-fun.nix} (100%) rename pkgs/{servers/http/thttpd/default.nix => unit/th/thttpd/pkg-fun.nix} (100%) rename pkgs/{applications/system/thumbdrives/default.nix => unit/th/thumbdrives/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/th}/thumbs/fix.patch (100%) rename pkgs/{tools/misc/thumbs/default.nix => unit/th/thumbs/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/thunderbolt/default.nix => unit/th/thunderbolt/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tibetan-machine/default.nix => unit/ti/tibetan-machine/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ticker/default.nix => unit/ti/ticker/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ticpp/default.nix => unit/ti/ticpp/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tidal-hifi/default.nix => unit/ti/tidal-hifi/pkg-fun.nix} (100%) rename pkgs/{servers/tidb/default.nix => unit/ti/tidb/pkg-fun.nix} (100%) rename pkgs/{tools/text/tidy-viewer/default.nix => unit/ti/tidy-viewer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tidyp/default.nix => unit/ti/tidyp/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/tie/default.nix => unit/ti/tie/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/tig/default.nix => unit/ti/tig/pkg-fun.nix} (100%) rename pkgs/{tools/admin/tigervnc/default.nix => unit/ti/tigervnc/pkg-fun.nix} (100%) rename pkgs/{servers/geospatial/tile38/default.nix => unit/ti/tile38/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tiledb/default.nix => unit/ti/tiledb/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/tilem/default.nix => unit/ti/tilem/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tilemaker/default.nix => unit/ti/tilemaker/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/tilix/default.nix => unit/ti/tilix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tilt/default.nix => unit/ti/tilt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/time-decode/default.nix => unit/ti/time-decode/pkg-fun.nix} (100%) rename pkgs/{development/tools/time-ghc-modules/default.nix => unit/ti/time-ghc-modules/pkg-fun.nix} (100%) rename pkgs/{tools/misc/time/default.nix => unit/ti/time/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/timelapse-deflicker/default.nix => unit/ti/timelapse-deflicker/pkg-fun.nix} (100%) rename pkgs/{tools/misc/timelimit/default.nix => unit/ti/timelimit/pkg-fun.nix} (100%) rename pkgs/{applications/office/timeline/default.nix => unit/ti/timeline/pkg-fun.nix} (100%) rename pkgs/{applications/audio/timemachine/default.nix => unit/ti/timemachine/pkg-fun.nix} (100%) rename pkgs/{data/fonts/times-newer-roman/default.nix => unit/ti/times-newer-roman/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/timescaledb-parallel-copy/default.nix => unit/ti/timescaledb-parallel-copy/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/timescaledb-tune/default.nix => unit/ti/timescaledb-tune/pkg-fun.nix} (100%) rename pkgs/{servers/timetagger/default.nix => unit/ti/timetagger/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/ti}/timetrap/Gemfile (100%) rename pkgs/{applications/office => unit/ti}/timetrap/Gemfile.lock (100%) rename pkgs/{applications/office => unit/ti}/timetrap/gemset.nix (100%) rename pkgs/{applications/office/timetrap/default.nix => unit/ti/timetrap/pkg-fun.nix} (100%) rename pkgs/{applications/office/timeular/default.nix => unit/ti/timeular/pkg-fun.nix} (100%) rename pkgs/{applications/misc/timew-sync-server/default.nix => unit/ti/timew-sync-server/pkg-fun.nix} (100%) rename pkgs/{applications/misc/timewarrior/default.nix => unit/ti/timewarrior/pkg-fun.nix} (100%) rename pkgs/{development/libraries/timezonemap/default.nix => unit/ti/timezonemap/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/timg/default.nix => unit/ti/timg/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tinc/default.nix => unit/ti/tinc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tinc/pre.nix => unit/ti/tinc_pre/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/tini/default.nix => unit/ti/tini/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tint2/default.nix => unit/ti/tint2/pkg-fun.nix} (100%) rename pkgs/{games/tintin/default.nix => unit/ti/tintin/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/tiny8086/default.nix => unit/ti/tiny8086/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tinyalsa/default.nix => unit/ti/tinyalsa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tinycbor/default.nix => unit/ti/tinycbor/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tinycdb/default.nix => unit/ti/tinycdb/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/tinyemu/default.nix => unit/ti/tinyemu/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tinyfecvpn/default.nix => unit/ti/tinyfecvpn/pkg-fun.nix} (100%) rename pkgs/{games/tinyfugue/default.nix => unit/ti/tinyfugue/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tinygltf/default.nix => unit/ti/tinygltf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tinyobjloader/default.nix => unit/ti/tinyobjloader/pkg-fun.nix} (100%) rename pkgs/{development/embedded/fpga/tinyprog/default.nix => unit/ti/tinyprog/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tinyproxy/default.nix => unit/ti/tinyproxy/pkg-fun.nix} (100%) rename pkgs/{development/interpreters => unit/ti}/tinyscheme/01-remove-macOS-main.patch (100%) rename pkgs/{development/interpreters => unit/ti}/tinyscheme/02-use-toolchain-env-vars.patch (100%) rename pkgs/{development/interpreters => unit/ti}/tinyscheme/03-macOS-SOsuf.patch (100%) rename pkgs/{development/interpreters/tinyscheme/default.nix => unit/ti/tinyscheme/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tinyssh/default.nix => unit/ti/tinyssh/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tinystatus/default.nix => unit/ti/tinystatus/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/tinywl/default.nix => unit/ti/tinywl/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/tinywm/default.nix => unit/ti/tinywm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tinyxml-2/default.nix => unit/ti/tinyxml-2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tinyxml => unit/ti/tinyxml2}/2.6.2-add-pkgconfig.patch (100%) rename pkgs/{development/libraries/tinyxml => unit/ti/tinyxml2}/2.6.2-cxx.patch (100%) rename pkgs/{development/libraries/tinyxml => unit/ti/tinyxml2}/2.6.2-entity.patch (100%) rename pkgs/{development/libraries/tinyxml/2.6.2.nix => unit/ti/tinyxml2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tio/default.nix => unit/ti/tio/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tipa/default.nix => unit/ti/tipa/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tippecanoe/default.nix => unit/ti/tippecanoe/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tiptop/default.nix => unit/ti/tiptop/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tiramisu/default.nix => unit/ti/tiramisu/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/ti}/tiscamera/0001-cmake-find-aravis-fix-pkg-cfg-include-dirs.patch (100%) rename pkgs/{os-specific/linux => unit/ti}/tiscamera/0001-tcamconvert-tcamsrc-add-missing-include-lib-dirs.patch (100%) rename pkgs/{os-specific/linux => unit/ti}/tiscamera/0001-udev-rules-fix-install-location.patch (100%) rename pkgs/{os-specific/linux/tiscamera/default.nix => unit/ti/tiscamera/pkg-fun.nix} (100%) rename pkgs/{games/titanion/default.nix => unit/ti/titanion/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tiv/default.nix => unit/ti/tiv/pkg-fun.nix} (100%) rename pkgs/{applications/video/tivodecode/default.nix => unit/ti/tivodecode/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ti}/tix/duplicated-xlowerwindow.patch (100%) rename pkgs/{development/libraries/tix/default.nix => unit/ti/tix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/tixati/default.nix => unit/ti/tixati/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/tkgate/1.x.nix => unit/tk/tkgate/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/tkrev/default.nix => unit/tk/tkrev/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tkrzw/default.nix => unit/tk/tkrzw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tl-expected/default.nix => unit/tl/tl-expected/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/arch => unit/tl/tla}/configure-tmpdir.patch (100%) rename pkgs/{applications/version-management/arch/default.nix => unit/tl/tla/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/tlaplus/toolbox.nix => unit/tl/tlaplusToolbox/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tldr/default.nix => unit/tl/tldr/pkg-fun.nix} (100%) rename pkgs/{applications/radio/tlf/default.nix => unit/tl/tlf/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tllist/default.nix => unit/tl/tllist/pkg-fun.nix} (100%) rename pkgs/{tools/security/tlsx/default.nix => unit/tl/tlsx/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tlwg/default.nix => unit/tl/tlwg/pkg-fun.nix} (100%) rename pkgs/{tools/system/tm/default.nix => unit/tm/tm/pkg-fun.nix} (100%) rename pkgs/{servers/tmate-ssh-server/default.nix => unit/tm/tmate-ssh-server/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmate/default.nix => unit/tm/tmate/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tmatrix/default.nix => unit/tm/tmatrix/pkg-fun.nix} (100%) rename pkgs/{applications/networking/tmpmail/default.nix => unit/tm/tmpmail/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmpwatch/default.nix => unit/tm/tmpwatch/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/tm}/tmsu/deps.nix (100%) rename pkgs/{tools/filesystems/tmsu/default.nix => unit/tm/tmsu/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmux-cssh/default.nix => unit/tm/tmux-cssh/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmux-mem-cpu-load/default.nix => unit/tm/tmux-mem-cpu-load/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmux-xpanes/default.nix => unit/tm/tmux-xpanes/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmux/default.nix => unit/tm/tmux/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmuxinator/default.nix => unit/tm/tmuxinator/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tmuxp/default.nix => unit/tm/tmuxp/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tnat64/default.nix => unit/tn/tnat64/pkg-fun.nix} (100%) rename pkgs/{applications/radio/tncattach/default.nix => unit/tn/tncattach/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tnef/default.nix => unit/tn/tnef/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tnt/default.nix => unit/tn/tnt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tntdb/default.nix => unit/tn/tntdb/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tntnet/default.nix => unit/tn/tntnet/pkg-fun.nix} (100%) rename pkgs/{development/tools/toast/default.nix => unit/to/toast/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/tockloader/default.nix => unit/to/tockloader/pkg-fun.nix} (100%) rename pkgs/{applications/misc/todiff/default.nix => unit/to/todiff/pkg-fun.nix} (100%) rename pkgs/{applications/office/todo.txt-cli/default.nix => unit/to/todo-txt-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/todo/default.nix => unit/to/todo/pkg-fun.nix} (100%) rename pkgs/{applications/office/todofi.sh/default.nix => unit/to/todofi-sh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/todoist-electron/default.nix => unit/to/todoist-electron/pkg-fun.nix} (100%) rename pkgs/{applications/misc/todoist/default.nix => unit/to/todoist/pkg-fun.nix} (100%) rename pkgs/{applications/office/todoman/default.nix => unit/to/todoman/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tofi/default.nix => unit/to/tofi/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/toil/default.nix => unit/to/toil/pkg-fun.nix} (100%) rename pkgs/{tools/misc/toilet/default.nix => unit/to/toilet/pkg-fun.nix} (100%) rename pkgs/{applications/misc/toipe/default.nix => unit/to/toipe/pkg-fun.nix} (100%) rename pkgs/{development/tools/tokio-console/default.nix => unit/to/tokio-console/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tokyo-cabinet/default.nix => unit/to/tokyocabinet/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tokyo-tyrant/default.nix => unit/to/tokyotyrant/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tomb/default.nix => unit/to/tomb/pkg-fun.nix} (100%) rename pkgs/{servers/http/tomcat/tomcat-native.nix => unit/to/tomcat-native/pkg-fun.nix} (100%) rename pkgs/{servers/http/apache-modules/tomcat-connectors/default.nix => unit/to/tomcat_connectors/pkg-fun.nix} (100%) rename pkgs/{servers/http/tomcat/jdbc/mysql/default.nix => unit/to/tomcat_mysql_jdbc/pkg-fun.nix} (100%) rename pkgs/{games/tome2/default.nix => unit/to/tome2/pkg-fun.nix} (100%) rename pkgs/{games/tome4/default.nix => unit/to/tome4/pkg-fun.nix} (100%) rename pkgs/{development/libraries/toml11/default.nix => unit/to/toml11/pkg-fun.nix} (100%) rename pkgs/{development/tools/toml2json/default.nix => unit/to/toml2json/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/to}/toml2nix/Cargo.lock (100%) rename pkgs/{development/tools/toml2nix/default.nix => unit/to/toml2nix/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tomlc99/default.nix => unit/to/tomlc99/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tomlcpp/default.nix => unit/to/tomlcpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tomlplusplus/default.nix => unit/to/tomlplusplus/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tonelib-gfx/default.nix => unit/to/tonelib-gfx/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tonelib-jam/default.nix => unit/to/tonelib-jam/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tonelib-metal/default.nix => unit/to/tonelib-metal/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tonelib-zoom/default.nix => unit/to/tonelib-zoom/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization => unit/to}/toolbox/glibc.patch (100%) rename pkgs/{applications/virtualization/toolbox/default.nix => unit/to/toolbox/pkg-fun.nix} (100%) rename pkgs/{applications/misc/toot/default.nix => unit/to/toot/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tootle/default.nix => unit/to/tootle/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/topgit/default.nix => unit/to/top-git/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/topiary/default.nix => unit/to/topiary/pkg-fun.nix} (100%) rename pkgs/{tools/misc/topicctl/default.nix => unit/to/topicctl/pkg-fun.nix} (100%) rename pkgs/{games/toppler/default.nix => unit/to/toppler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/topydo/default.nix => unit/to/topydo/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/tor-browser-bundle-bin/default.nix => unit/to/tor-browser-bundle-bin/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/to}/tor/disable-monotonic-timer-tests.patch (100%) rename pkgs/{tools/security/tor/default.nix => unit/to/tor/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/to}/tor/update.nix (100%) rename pkgs/{games/torcs/default.nix => unit/to/torcs/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/torq/default.nix => unit/to/torq/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/torrent7z/default.nix => unit/to/torrent7z/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/torrential/default.nix => unit/to/torrential/pkg-fun.nix} (100%) rename pkgs/{tools/security/tor/torsocks.nix => unit/to/torsocks/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/tortoisehg/default.nix => unit/to/tortoisehg/pkg-fun.nix} (100%) rename pkgs/{games/torus-trooper/default.nix => unit/to/torus-trooper/pkg-fun.nix} (100%) rename pkgs/{tools/networking/toss/default.nix => unit/to/toss/pkg-fun.nix} (100%) rename pkgs/{development/libraries/totem-pl-parser/default.nix => unit/to/totem-pl-parser/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/touchegg/default.nix => unit/to/touchegg/pkg-fun.nix} (100%) rename pkgs/{applications/audio/touchosc/default.nix => unit/to/touchosc/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/to}/touchosc/update.sh (100%) rename pkgs/{tools/networking/tox-node/default.nix => unit/to/tox-node/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/toxic/default.nix => unit/to/toxic/pkg-fun.nix} (100%) rename pkgs/{development/tools/toxiproxy/default.nix => unit/to/toxiproxy/pkg-fun.nix} (100%) rename pkgs/{tools/networking/toxvpn/default.nix => unit/to/toxvpn/pkg-fun.nix} (100%) rename pkgs/{tools/system/tp-auto-kbbl/default.nix => unit/tp/tp-auto-kbbl/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tpacpi-bat/default.nix => unit/tp/tpacpi-bat/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/tp}/tpm-luks/openssl-1.1.patch (100%) rename pkgs/{tools/security/tpm-luks/default.nix => unit/tp/tpm-luks/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/tp}/tpm-luks/signed-ptr.patch (100%) rename pkgs/{tools/security/tpm-quote-tools/default.nix => unit/tp/tpm-quote-tools/pkg-fun.nix} (100%) rename pkgs/{tools/security/tpm-tools/default.nix => unit/tp/tpm-tools/pkg-fun.nix} (100%) rename pkgs/{tools/security/tpm2-abrmd/default.nix => unit/tp/tpm2-abrmd/pkg-fun.nix} (100%) rename pkgs/{misc => unit/tp}/tpm2-pkcs11/0001-configure-ac-version.patch (100%) rename pkgs/{misc/tpm2-pkcs11/default.nix => unit/tp/tpm2-pkcs11/pkg-fun.nix} (100%) rename pkgs/{tools/security/tpm2-tools/default.nix => unit/tp/tpm2-tools/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/tptp/default.nix => unit/tp/tptp/pkg-fun.nix} (100%) rename pkgs/{games/tr-patcher/default.nix => unit/tr/tr-patcher/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/trace-cmd/default.nix => unit/tr/trace-cmd/pkg-fun.nix} (100%) rename pkgs/{tools/security/tracee/default.nix => unit/tr/tracee/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/tr}/tracee/use-our-libbpf.patch (100%) rename pkgs/{development/tools/analysis/garcosim => unit/tr}/tracefilegen/gcc7.patch (100%) rename pkgs/{development/tools/analysis/garcosim/tracefilegen/default.nix => unit/tr/tracefilegen/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/garcosim/tracefilesim/default.nix => unit/tr/tracefilesim/pkg-fun.nix} (100%) rename pkgs/{tools/networking/traceroute/default.nix => unit/tr/traceroute/pkg-fun.nix} (100%) rename pkgs/{games/trackballs/default.nix => unit/tr/trackballs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tracker-miners/default.nix => unit/tr/tracker-miners/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tracker/default.nix => unit/tr/tracker/pkg-fun.nix} (100%) rename pkgs/{tools/misc/trackma/default.nix => unit/tr/trackma/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/tr}/trackma/update.sh (100%) rename pkgs/{development/tools => unit/tr}/tradcpp/aarch64.patch (100%) rename pkgs/{development/tools/tradcpp/default.nix => unit/tr/tradcpp/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/tr}/tradcpp/tradcpp-configure.patch (100%) rename pkgs/{tools/misc/traefik-certs-dumper/default.nix => unit/tr/traefik-certs-dumper/pkg-fun.nix} (100%) rename pkgs/{servers/traefik/default.nix => unit/tr/traefik/pkg-fun.nix} (100%) rename pkgs/{servers/http/trafficserver/default.nix => unit/tr/trafficserver/pkg-fun.nix} (100%) rename pkgs/{tools/security/traitor/default.nix => unit/tr/traitor/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tran/default.nix => unit/tr/tran/pkg-fun.nix} (100%) rename pkgs/{applications/audio/transcode/default.nix => unit/tr/transcode/pkg-fun.nix} (100%) rename pkgs/{applications/audio/transcribe/default.nix => unit/tr/transcribe/pkg-fun.nix} (100%) rename pkgs/{applications/version-management => unit/tr}/transcrypt/helper-scripts_depspathprefix.patch (100%) rename pkgs/{applications/version-management/transcrypt/default.nix => unit/tr/transcrypt/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/transgui/default.nix => unit/tr/transgui/pkg-fun.nix} (100%) rename pkgs/{applications/misc/translate-shell/default.nix => unit/tr/translate-shell/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/transmission-remote-gtk/default.nix => unit/tr/transmission-remote-gtk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/trash-cli/default.nix => unit/tr/trash-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/trashy/default.nix => unit/tr/trashy/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/tr}/travis/Gemfile (100%) rename pkgs/{development/tools/misc => unit/tr}/travis/Gemfile.lock (100%) rename pkgs/{development/tools/misc => unit/tr}/travis/gemset.nix (100%) rename pkgs/{development/tools/misc/travis/default.nix => unit/tr/travis/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/tr}/travis/shell.nix (100%) rename pkgs/{applications/window-managers/trayer/default.nix => unit/tr/trayer/pkg-fun.nix} (100%) rename pkgs/{tools/misc/trdl-client/default.nix => unit/tr/trdl-client/pkg-fun.nix} (100%) rename pkgs/{tools/system/tre-command/default.nix => unit/tr/tre-command/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tre/default.nix => unit/tr/tre/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/trealla/default.nix => unit/tr/trealla/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/tr}/tree-from-tags/Gemfile (100%) rename pkgs/{applications/audio => unit/tr}/tree-from-tags/Gemfile.lock (100%) rename pkgs/{applications/audio => unit/tr}/tree-from-tags/gemset.nix (100%) rename pkgs/{applications/audio/tree-from-tags/default.nix => unit/tr/tree-from-tags/pkg-fun.nix} (100%) rename pkgs/{tools/system/tree/default.nix => unit/tr/tree/pkg-fun.nix} (100%) rename pkgs/{development/tools/treefmt/default.nix => unit/tr/treefmt/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/treemix/default.nix => unit/tr/treemix/pkg-fun.nix} (100%) rename pkgs/{development/embedded/fpga/trellis/default.nix => unit/tr/trellis/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/tremc/default.nix => unit/tr/tremc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tremor-rs/ls.nix => unit/tr/tremor-language-server/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tremor/default.nix => unit/tr/tremor/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/trezor-suite/default.nix => unit/tr/trezor-suite/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/trezor-udev-rules/default.nix => unit/tr/trezor-udev-rules/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/tribler/default.nix => unit/tr/tribler/pkg-fun.nix} (100%) rename pkgs/{tools/networking/trickle/default.nix => unit/tr/trickle/pkg-fun.nix} (100%) rename pkgs/{servers/trickster/trickster.nix => unit/tr/trickster/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tridactyl-native/default.nix => unit/tr/tridactyl-native/pkg-fun.nix} (100%) rename pkgs/{tools/misc/triehash/default.nix => unit/tr/triehash/pkg-fun.nix} (100%) rename pkgs/{games/trigger/default.nix => unit/tr/trigger/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/triggerhappy/default.nix => unit/tr/triggerhappy/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/trillian-im/default.nix => unit/tr/trillian-im/pkg-fun.nix} (100%) rename pkgs/{tools/misc/trillian/default.nix => unit/tr/trillian/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/trimal/default.nix => unit/tr/trimal/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/trinity/default.nix => unit/tr/trinity/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/trino-cli/default.nix => unit/tr/trino-cli/pkg-fun.nix} (100%) rename pkgs/{tools/admin/trivy/default.nix => unit/tr/trivy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/trompeloeil/default.nix => unit/tr/trompeloeil/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/tr}/trousers/allow-non-tss-config-file-owner.patch (100%) rename pkgs/{tools/security/trousers/default.nix => unit/tr/trousers/pkg-fun.nix} (100%) rename pkgs/{tools/security/truecrack/default.nix => unit/tr/truecrack/pkg-fun.nix} (100%) rename pkgs/{tools/security/trueseeing/default.nix => unit/tr/trueseeing/pkg-fun.nix} (100%) rename pkgs/{tools/security/trufflehog/default.nix => unit/tr/trufflehog/pkg-fun.nix} (100%) rename pkgs/{development/tools/trunk-io/default.nix => unit/tr/trunk-io/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/tr}/trunk-io/update.sh (100%) rename pkgs/{applications/science/biology/truvari/default.nix => unit/tr/truvari/pkg-fun.nix} (100%) rename pkgs/{tools/audio => unit/tr}/trx/add_bctoolbox_ldlib.patch (100%) rename pkgs/{tools/audio/trx/default.nix => unit/tr/trx/pkg-fun.nix} (100%) rename pkgs/{applications/office/tryton/default.nix => unit/tr/tryton/pkg-fun.nix} (100%) rename pkgs/{tools/system/ts/default.nix => unit/ts/ts/pkg-fun.nix} (100%) rename pkgs/{tools/video/tsduck/default.nix => unit/ts/tsduck/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tsocks/default.nix => unit/ts/tsocks/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/ts}/tsocks/poll.patch (100%) rename pkgs/{applications/misc/tsukae/default.nix => unit/ts/tsukae/pkg-fun.nix} (100%) rename pkgs/{applications/networking/tsung/default.nix => unit/ts/tsung/pkg-fun.nix} (100%) rename pkgs/{servers/tt-rss/plugin-auth-ldap/default.nix => unit/tt/tt-rss-plugin-auth-ldap/pkg-fun.nix} (100%) rename pkgs/{servers/tt-rss/plugin-feediron/default.nix => unit/tt/tt-rss-plugin-feediron/pkg-fun.nix} (100%) rename pkgs/{servers/tt-rss/plugin-ff-instagram/default.nix => unit/tt/tt-rss-plugin-ff-instagram/pkg-fun.nix} (100%) rename pkgs/{servers/tt-rss/theme-feedly/default.nix => unit/tt/tt-rss-theme-feedly/pkg-fun.nix} (100%) rename pkgs/{servers/tt-rss/default.nix => unit/tt/tt-rss/pkg-fun.nix} (100%) rename pkgs/{data/fonts/tt2020/default.nix => unit/tt/tt2020/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ttchat/default.nix => unit/tt/ttchat/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ttf-envy-code-r/default.nix => unit/tt/ttf-envy-code-r/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ttf-tw-moe/default.nix => unit/tt/ttf-tw-moe/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/tt}/ttf2pt1/gentoo-makefile.patch (100%) rename pkgs/{tools/misc/ttf2pt1/default.nix => unit/tt/ttf2pt1/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ttf-bitstream-vera/default.nix => unit/tt/ttf_bitstream_vera/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tthsum/default.nix => unit/tt/tthsum/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/tt}/ttmkfdir/cstring.patch (100%) rename pkgs/{tools/misc/ttmkfdir/default.nix => unit/tt/ttmkfdir/pkg-fun.nix} (100%) rename pkgs/{tools/audio/tts/default.nix => unit/tt/tts/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ttwatch/default.nix => unit/tt/ttwatch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tty-clock/default.nix => unit/tt/tty-clock/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tty-share/default.nix => unit/tt/tty-share/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tty-solitaire/default.nix => unit/tt/tty-solitaire/pkg-fun.nix} (100%) rename pkgs/{servers/ttyd/default.nix => unit/tt/ttyd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ttygif/default.nix => unit/tt/ttygif/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ttylog/default.nix => unit/tt/ttylog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ttyper/default.nix => unit/tt/ttyper/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ttyplot/default.nix => unit/tt/ttyplot/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tubekit/default.nix => unit/tu/tubekit-unwrapped/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/tubekit/wrapper.nix => unit/tu/tubekit/pkg-fun.nix} (100%) rename pkgs/{tools/text/tuc/default.nix => unit/tu/tuc/pkg-fun.nix} (100%) rename pkgs/{applications/office/tudu/default.nix => unit/tu/tudu/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tuhi/default.nix => unit/tu/tuhi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tuir/default.nix => unit/tu/tuir/pkg-fun.nix} (100%) rename pkgs/{games/tumiki-fighters/default.nix => unit/tu/tumiki-fighters/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tun2socks/default.nix => unit/tu/tun2socks/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/tunctl/default.nix => unit/tu/tunctl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/tuner/default.nix => unit/tu/tuner/pkg-fun.nix} (100%) rename pkgs/{tools/networking/tuntox/default.nix => unit/tu/tuntox/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/tu}/tup/fusermount-setuid.patch (100%) rename pkgs/{development/tools/build-managers/tup/default.nix => unit/tu/tup/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/tu}/tup/setup-hook.sh (100%) rename pkgs/{tools/system/tuptime/default.nix => unit/tu/tuptime/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/turses/default.nix => unit/tu/turses/pkg-fun.nix} (100%) rename pkgs/{applications/office/tusk/default.nix => unit/tu/tusk/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tut/default.nix => unit/tu/tut/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/tutanota-desktop/default.nix => unit/tu/tutanota-desktop/pkg-fun.nix} (100%) rename pkgs/{games/tuxpaint/default.nix => unit/tu/tuxpaint/pkg-fun.nix} (100%) rename pkgs/{games => unit/tu}/tuxpaint/tuxpaint-completion.diff (100%) rename pkgs/{games/tuxtype/default.nix => unit/tu/tuxtype/pkg-fun.nix} (100%) rename pkgs/{tools/text/tv/default.nix => unit/tv/tv/pkg-fun.nix} (100%) rename pkgs/{applications/misc/tvbrowser/bin.nix => unit/tv/tvbrowser-bin/pkg-fun.nix} (100%) rename pkgs/{development/compilers/tvm/default.nix => unit/tv/tvm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tvnamer/default.nix => unit/tv/tvnamer/pkg-fun.nix} (100%) rename pkgs/{tools/networking/twa/default.nix => unit/tw/twa/pkg-fun.nix} (100%) rename pkgs/{applications/editors/tweak/default.nix => unit/tw/tweak/pkg-fun.nix} (100%) rename pkgs/{development/libraries/tweeny/default.nix => unit/tw/tweeny/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/twelf/default.nix => unit/tw/twelf/pkg-fun.nix} (100%) rename pkgs/{data/fonts/twemoji-color-font/default.nix => unit/tw/twemoji-color-font/pkg-fun.nix} (100%) rename pkgs/{development/tools/twiggy/default.nix => unit/tw/twiggy/pkg-fun.nix} (100%) rename pkgs/{development/tools/twilio-cli/default.nix => unit/tw/twilio-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/twingate/default.nix => unit/tw/twingate/pkg-fun.nix} (100%) rename pkgs/{data/fonts/twitter-color-emoji/default.nix => unit/tw/twitter-color-emoji/pkg-fun.nix} (100%) rename pkgs/{development/web/twitter-bootstrap/default.nix => unit/tw/twitterBootstrap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/twolame/default.nix => unit/tw/twolame/pkg-fun.nix} (100%) rename pkgs/{games/tworld2/default.nix => unit/tw/tworld2/pkg-fun.nix} (100%) rename pkgs/{tools/misc/twspace-dl/default.nix => unit/tw/twspace-dl/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/tw}/twurl/Gemfile (100%) rename pkgs/{tools/misc => unit/tw}/twurl/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/tw}/twurl/gemset.nix (100%) rename pkgs/{tools/misc/twurl/default.nix => unit/tw/twurl/pkg-fun.nix} (100%) rename pkgs/{tools/text/txr/default.nix => unit/tx/txr/pkg-fun.nix} (100%) rename pkgs/{tools/misc/txt2man/default.nix => unit/tx/txt2man/pkg-fun.nix} (100%) rename pkgs/{tools/text/txt2tags/default.nix => unit/tx/txt2tags/pkg-fun.nix} (100%) rename pkgs/{development/tools/txtpbfmt/default.nix => unit/tx/txtpbfmt/pkg-fun.nix} (100%) rename pkgs/{tools/misc/txtw/default.nix => unit/tx/txtw/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tydra/default.nix => unit/ty/tydra/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/tym/default.nix => unit/ty/tym/pkg-fun.nix} (100%) rename pkgs/{development/tools/rust/typeshare/default.nix => unit/ty/typeshare/pkg-fun.nix} (100%) rename pkgs/{games/typespeed/default.nix => unit/ty/typespeed/pkg-fun.nix} (100%) rename pkgs/{games => unit/ty}/typespeed/typespeed-config-in-home.patch (100%) rename pkgs/{development/tools/typos/default.nix => unit/ty/typos/pkg-fun.nix} (100%) rename pkgs/{tools/misc/tz/default.nix => unit/tz/tz/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/tz}/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch (100%) rename pkgs/{data/misc/tzdata/default.nix => unit/tz/tzdata/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/tz}/tzdata/tzdata-setup-hook.sh (100%) rename pkgs/{applications/misc/tzupdate/default.nix => unit/tz/tzupdate/pkg-fun.nix} (100%) rename pkgs/{data/fonts/u001/default.nix => unit/u0/u001-font/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/u3-tool/default.nix => unit/u3/u3-tool/pkg-fun.nix} (100%) rename pkgs/{servers/u9fs/default.nix => unit/u9/u9fs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ua/default.nix => unit/ua/ua/pkg-fun.nix} (100%) rename pkgs/{tools/admin/uacme/default.nix => unit/ua/uacme/pkg-fun.nix} (100%) rename pkgs/{applications/audio/uade/default.nix => unit/ua/uade/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/uae/default.nix => unit/ua/uae/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning/uarmsolver/default.nix => unit/ua/uarmsolver/pkg-fun.nix} (100%) rename pkgs/{development/compilers/uasm/default.nix => unit/ua/uasm/pkg-fun.nix} (100%) rename pkgs/{applications/radio/ubertooth/default.nix => unit/ub/ubertooth/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ubridge/default.nix => unit/ub/ubridge/pkg-fun.nix} (100%) rename pkgs/{data/themes/ubuntu-themes/default.nix => unit/ub/ubuntu-themes/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ubuntu-font-family/default.nix => unit/ub/ubuntu_font_family/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ubus/default.nix => unit/ub/ubus/pkg-fun.nix} (100%) rename pkgs/{servers/ucarp/default.nix => unit/uc/ucarp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ucc/default.nix => unit/uc/ucc/pkg-fun.nix} (100%) rename pkgs/{games/uchess/default.nix => unit/uc/uchess/pkg-fun.nix} (100%) rename pkgs/{development/libraries/uci/default.nix => unit/uc/uci/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ucl/default.nix => unit/uc/ucl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ucommon/default.nix => unit/uc/ucommon/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ucs-fonts/default.nix => unit/uc/ucs-fonts/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ucspi-tcp/default.nix => unit/uc/ucspi-tcp/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/uc}/ucspi-tcp/remove-setuid.patch (100%) rename pkgs/{development/libraries/ucx/default.nix => unit/uc/ucx/pkg-fun.nix} (100%) rename pkgs/{tools/security/uddup/default.nix => unit/ud/uddup/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ud}/udevil/device-info-sys-stat.patch (100%) rename pkgs/{applications/misc/udevil/default.nix => unit/ud/udevil/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/udftools/default.nix => unit/ud/udftools/pkg-fun.nix} (100%) rename pkgs/{applications/gis/udig/default.nix => unit/ud/udig/pkg-fun.nix} (100%) rename pkgs/{development/tools/udis86/default.nix => unit/ud/udis86/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/ud}/udiskie/locale-path.patch (100%) rename pkgs/{applications/misc/udiskie/default.nix => unit/ud/udiskie/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/udisks => unit/ud/udisks2}/fix-paths.patch (100%) rename pkgs/{os-specific/linux/udisks => unit/ud/udisks2}/force-path.patch (100%) rename pkgs/{os-specific/linux/udisks/2-default.nix => unit/ud/udisks2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/udns/default.nix => unit/ud/udns/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/udocker/default.nix => unit/ud/udocker/pkg-fun.nix} (100%) rename pkgs/{tools/networking/udp2raw/default.nix => unit/ud/udp2raw/pkg-fun.nix} (100%) rename pkgs/{tools/networking/udpreplay/default.nix => unit/ud/udpreplay/pkg-fun.nix} (100%) rename pkgs/{servers/udpt/default.nix => unit/ud/udpt/pkg-fun.nix} (100%) rename pkgs/{tools/networking/udptunnel/default.nix => unit/ud/udptunnel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/udunits/default.nix => unit/ud/udunits/pkg-fun.nix} (100%) rename pkgs/{games => unit/ue}/ue4/cdn-deps.nix (100%) rename pkgs/{games => unit/ue}/ue4/generate-expr-from-cdn.sh (100%) rename pkgs/{games/ue4/default.nix => unit/ue/ue4/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/uefi-firmware-parser/default.nix => unit/ue/uefi-firmware-parser/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/uefi-run/default.nix => unit/ue/uefi-run/pkg-fun.nix} (100%) rename pkgs/{tools/system/ufiformat/default.nix => unit/uf/ufiformat/pkg-fun.nix} (100%) rename pkgs/{games/ufoai/default.nix => unit/uf/ufoai/pkg-fun.nix} (100%) rename pkgs/{servers/uftp/default.nix => unit/uf/uftp/pkg-fun.nix} (100%) rename pkgs/{development/tools/uftrace/default.nix => unit/uf/uftrace/pkg-fun.nix} (100%) rename pkgs/{tools/networking/uget-integrator/default.nix => unit/ug/uget-integrator/pkg-fun.nix} (100%) rename pkgs/{tools/networking/uget/default.nix => unit/ug/uget/pkg-fun.nix} (100%) rename pkgs/{tools/text/ugrep/default.nix => unit/ug/ugrep/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ugtrain/default.nix => unit/ug/ugtrain/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/uhdm/default.nix => unit/uh/uhdm/pkg-fun.nix} (100%) rename pkgs/{games/uhexen2/default.nix => unit/uh/uhexen2/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/uhk-agent/default.nix => unit/uh/uhk-agent/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/uhk-udev-rules/default.nix => unit/uh/uhk-udev-rules/pkg-fun.nix} (100%) rename pkgs/{development/libraries/uhttpmock/default.nix => unit/uh/uhttpmock/pkg-fun.nix} (100%) rename pkgs/{servers/uhub/default.nix => unit/uh/uhub/pkg-fun.nix} (100%) rename pkgs/{tools/misc/uhubctl/default.nix => unit/uh/uhubctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/uid_wrapper/default.nix => unit/ui/uid_wrapper/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/uif2iso/default.nix => unit/ui/uif2iso/pkg-fun.nix} (100%) rename pkgs/{development/embedded/uisp/default.nix => unit/ui/uisp/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/ui}/uivonim/package.json (100%) rename pkgs/{applications/editors/uivonim/default.nix => unit/ui/uivonim/pkg-fun.nix} (100%) rename pkgs/{applications/editors => unit/ui}/uivonim/yarn.lock (100%) rename pkgs/{applications/editors => unit/ui}/uivonim/yarn.nix (100%) rename pkgs/{applications/misc => unit/ul}/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch (100%) rename pkgs/{applications/misc => unit/ul}/ulauncher/fix-extensions.patch (100%) rename pkgs/{applications/misc => unit/ul}/ulauncher/fix-path.patch (100%) rename pkgs/{applications/misc/ulauncher/default.nix => unit/ul/ulauncher/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/ulogd/default.nix => unit/ul/ulogd/pkg-fun.nix} (100%) rename pkgs/{data/fonts/ultimate-oldschool-pc-font-pack/default.nix => unit/ul/ultimate-oldschool-pc-font-pack/pkg-fun.nix} (100%) rename pkgs/{games/ultimatestunts/default.nix => unit/ul/ultimatestunts/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ultralist/default.nix => unit/ul/ultralist/pkg-fun.nix} (100%) rename pkgs/{games/ultrastardx/default.nix => unit/ul/ultrastardx/pkg-fun.nix} (100%) rename pkgs/{tools/misc/umlet/default.nix => unit/um/umlet/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/umoci/default.nix => unit/um/umoci/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/um}/umockdev/hardcode-paths.patch (100%) rename pkgs/{development/libraries/umockdev/default.nix => unit/um/umockdev/pkg-fun.nix} (100%) rename pkgs/{games/umoria/default.nix => unit/um/umoria/pkg-fun.nix} (100%) rename pkgs/{servers/ums/default.nix => unit/um/ums/pkg-fun.nix} (100%) rename pkgs/{applications/networking/umurmur/default.nix => unit/um/umurmur/pkg-fun.nix} (100%) rename pkgs/{tools/networking/unbound/default.nix => unit/un/unbound/pkg-fun.nix} (100%) rename pkgs/{games/unciv/default.nix => unit/un/unciv/pkg-fun.nix} (100%) rename pkgs/{tools/misc/unclutter-xfixes/default.nix => unit/un/unclutter-xfixes/pkg-fun.nix} (100%) rename pkgs/{tools/misc/unclutter/default.nix => unit/un/unclutter/pkg-fun.nix} (100%) rename pkgs/{development/tools/unconvert/default.nix => unit/un/unconvert/pkg-fun.nix} (100%) rename pkgs/{tools/security/uncover/default.nix => unit/un/uncover/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/uncrustify/default.nix => unit/un/uncrustify/pkg-fun.nix} (100%) rename pkgs/{tools/system/undaemonize/default.nix => unit/un/undaemonize/pkg-fun.nix} (100%) rename pkgs/{data/fonts/undefined-medium/default.nix => unit/un/undefined-medium/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/undervolt/default.nix => unit/un/undervolt/pkg-fun.nix} (100%) rename pkgs/{shells/bash/undistract-me/default.nix => unit/un/undistract-me/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/undmg/default.nix => unit/un/undmg/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/un}/undmg/setup-hook.sh (100%) rename pkgs/{tools/misc/undocker/default.nix => unit/un/undocker/pkg-fun.nix} (100%) rename pkgs/{tools/audio/unflac/default.nix => unit/un/unflac/pkg-fun.nix} (100%) rename pkgs/{data/fonts/unfonts-core/default.nix => unit/un/unfonts-core/pkg-fun.nix} (100%) rename pkgs/{servers/unfs3/default.nix => unit/un/unfs3/pkg-fun.nix} (100%) rename pkgs/{data/fonts/uni-vga/default.nix => unit/un/uni-vga/pkg-fun.nix} (100%) rename pkgs/{applications/misc/uni/default.nix => unit/un/uni/pkg-fun.nix} (100%) rename pkgs/{tools/text/uni2ascii/default.nix => unit/un/uni2ascii/pkg-fun.nix} (100%) rename pkgs/{development/libraries/unibilium/default.nix => unit/un/unibilium/pkg-fun.nix} (100%) rename pkgs/{development/libraries/unicap/default.nix => unit/un/unicap/pkg-fun.nix} (100%) rename pkgs/{data/misc/unicode-character-database/default.nix => unit/un/unicode-character-database/pkg-fun.nix} (100%) rename pkgs/{data/misc/unicode-emoji/default.nix => unit/un/unicode-emoji/pkg-fun.nix} (100%) rename pkgs/{tools/misc/unicode/default.nix => unit/un/unicode-paracode/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/unicon-lang/default.nix => unit/un/unicon-lang/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/unifdef/default.nix => unit/un/unifdef/pkg-fun.nix} (100%) rename pkgs/{development/tools/uniffi-bindgen/default.nix => unit/un/uniffi-bindgen/pkg-fun.nix} (100%) rename pkgs/{applications/backup/unifi-protect-backup/default.nix => unit/un/unifi-protect-backup/pkg-fun.nix} (100%) rename pkgs/{servers/unifi-video/default.nix => unit/un/unifi-video/pkg-fun.nix} (100%) rename pkgs/{servers/unifiedpush-common-proxies/default.nix => unit/un/unifiedpush-common-proxies/pkg-fun.nix} (100%) rename pkgs/{data/fonts/unifont/default.nix => unit/un/unifont/pkg-fun.nix} (100%) rename pkgs/{data/fonts/unifont_upper/default.nix => unit/un/unifont_upper/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/unigine-heaven/default.nix => unit/un/unigine-heaven/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/unigine-valley/default.nix => unit/un/unigine-valley/pkg-fun.nix} (100%) rename pkgs/{data/misc/unihan-database/default.nix => unit/un/unihan-database/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/unionfs-fuse/default.nix => unit/un/unionfs-fuse/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/un}/unionfs-fuse/prevent-kill-on-shutdown.patch (100%) rename pkgs/{applications/misc/unipicker/default.nix => unit/un/unipicker/pkg-fun.nix} (100%) rename pkgs/{tools/text => unit/un}/uniscribe/Gemfile (100%) rename pkgs/{tools/text => unit/un}/uniscribe/Gemfile.lock (100%) rename pkgs/{tools/text => unit/un}/uniscribe/gemset.nix (100%) rename pkgs/{tools/text/uniscribe/default.nix => unit/un/uniscribe/pkg-fun.nix} (100%) rename pkgs/{development/compilers/unison/default.nix => unit/un/unison-ucm/pkg-fun.nix} (100%) rename pkgs/{servers/http/unit/default.nix => unit/un/unit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/unittest-cpp/default.nix => unit/un/unittest-cpp/pkg-fun.nix} (100%) rename pkgs/{development/tools/unityhub/default.nix => unit/un/unityhub/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/un}/universal-ctags/000-nixos-specific.patch (100%) rename pkgs/{development/tools/misc/universal-ctags/default.nix => unit/un/universal-ctags/pkg-fun.nix} (100%) rename pkgs/{development/libraries/unixODBC/default.nix => unit/un/unixODBC/pkg-fun.nix} (100%) rename pkgs/{games/unnethack/default.nix => unit/un/unnethack/pkg-fun.nix} (100%) rename pkgs/{tools/text/unoconv/default.nix => unit/un/unoconv/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/unp/default.nix => unit/un/unp/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/unpaper/default.nix => unit/un/unpaper/pkg-fun.nix} (100%) rename pkgs/{tools/misc/unparam/default.nix => unit/un/unparam/pkg-fun.nix} (100%) rename pkgs/{servers/unpfs/default.nix => unit/un/unpfs/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/unpoller/default.nix => unit/un/unpoller/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/unrar/default.nix => unit/un/unrar/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/un}/unrar/setup-hook.sh (100%) rename pkgs/{tools/text/unrtf/default.nix => unit/un/unrtf/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/un}/unscd/0001-adjust-socket-paths-for-nixos.patch (100%) rename pkgs/{os-specific/linux/unscd/default.nix => unit/un/unscd/pkg-fun.nix} (100%) rename pkgs/{data/fonts/unscii/default.nix => unit/un/unscii/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/unshield/default.nix => unit/un/unshield/pkg-fun.nix} (100%) rename pkgs/{common-updater/unstable-updater.nix => unit/un/unstableGitUpdater/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/unstick/default.nix => unit/un/unstick/pkg-fun.nix} (100%) rename pkgs/{tools/text/untex/default.nix => unit/un/untex/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/untie/default.nix => unit/un/untie/pkg-fun.nix} (100%) rename pkgs/{tools/video/untrunc-anthwlock/default.nix => unit/un/untrunc-anthwlock/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/unused/default.nix => unit/un/unused/pkg-fun.nix} (100%) rename pkgs/{games/unvanquished/default.nix => unit/un/unvanquished/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2014-8139.diff (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2014-8140.diff (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2014-8141.diff (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2014-9636.diff (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2014-9913.patch (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2015-7696.diff (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2015-7697.diff (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2016-9844.patch (100%) rename pkgs/{tools/archivers => unit/un}/unzip/CVE-2018-18384.patch (100%) rename pkgs/{tools/archivers => unit/un}/unzip/dont-hardcode-cc.patch (100%) rename pkgs/{tools/archivers/unzip/default.nix => unit/un/unzip/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/un}/unzip/setup-hook.sh (100%) rename pkgs/{tools/archivers/unzoo/default.nix => unit/un/unzoo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/up/default.nix => unit/up/up/pkg-fun.nix} (100%) rename pkgs/{development/tools/upbound/default.nix => unit/up/upbound/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/python/update-python-libraries/default.nix => unit/up/update-python-libraries/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/python => unit/up}/update-python-libraries/update-python-libraries.py (100%) rename pkgs/{tools/networking/openvpn/update-resolv-conf.nix => unit/up/update-resolv-conf/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openvpn/update-systemd-resolved.nix => unit/up/update-systemd-resolved/pkg-fun.nix} (100%) rename pkgs/{tools/networking/openvpn => unit/up/update-systemd-resolved}/update-systemd-resolved.patch (100%) rename pkgs/{tools/networking/updog/default.nix => unit/up/updog/pkg-fun.nix} (100%) rename pkgs/{applications/networking/upnp-router-control/default.nix => unit/up/upnp-router-control/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/up}/upower/i686-test-remove-battery-check.patch (100%) rename pkgs/{os-specific/linux/upower/default.nix => unit/up/upower/pkg-fun.nix} (100%) rename pkgs/{tools/misc/upterm/default.nix => unit/up/upterm/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/up}/uptime-kuma/composition.nix (100%) rename pkgs/{servers/monitoring => unit/up}/uptime-kuma/fix-database-permissions.patch (100%) rename pkgs/{tools/misc/fx_cast => unit/up/uptime-kuma}/node-env.nix (100%) rename pkgs/{servers/monitoring => unit/up}/uptime-kuma/node-packages.nix (100%) rename pkgs/{servers/monitoring/uptime-kuma/default.nix => unit/up/uptime-kuma/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring => unit/up}/uptime-kuma/update.sh (100%) rename pkgs/{tools/system => unit/up}/uptimed/no-var-spool-install.patch (100%) rename pkgs/{tools/system/uptimed/default.nix => unit/up/uptimed/pkg-fun.nix} (100%) rename pkgs/{applications/misc/upwork/default.nix => unit/up/upwork/pkg-fun.nix} (100%) rename pkgs/{tools/compression/upx/default.nix => unit/up/upx/pkg-fun.nix} (100%) rename pkgs/{misc/uq/default.nix => unit/uq/uq/pkg-fun.nix} (100%) rename pkgs/{games => unit/uq}/uqm/3dovideo.nix (100%) rename pkgs/{games/uqm/default.nix => unit/uq/uqm/pkg-fun.nix} (100%) rename pkgs/{tools/networking/uqmi/default.nix => unit/uq/uqmi/pkg-fun.nix} (100%) rename pkgs/{applications/backup/urbackup-client/default.nix => unit/ur/urbackup-client/pkg-fun.nix} (100%) rename pkgs/{games/urbanterror/default.nix => unit/ur/urbanterror/pkg-fun.nix} (100%) rename pkgs/{misc/urbit/default.nix => unit/ur/urbit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/urdfdom-headers/default.nix => unit/ur/urdfdom-headers/pkg-fun.nix} (100%) rename pkgs/{development/libraries/urdfdom/default.nix => unit/ur/urdfdom/pkg-fun.nix} (100%) rename pkgs/{applications/radio/urh/default.nix => unit/ur/urh/pkg-fun.nix} (100%) rename pkgs/{development/libraries/uriparser/default.nix => unit/ur/uriparser/pkg-fun.nix} (100%) rename pkgs/{tools/misc/urjtag/default.nix => unit/ur/urjtag/pkg-fun.nix} (100%) rename pkgs/{tools/security/urlhunter/default.nix => unit/ur/urlhunter/pkg-fun.nix} (100%) rename pkgs/{applications/misc/urlscan/default.nix => unit/ur/urlscan/pkg-fun.nix} (100%) rename pkgs/{applications/misc/urlview/default.nix => unit/ur/urlview/pkg-fun.nix} (100%) rename pkgs/{tools/networking/urlwatch/default.nix => unit/ur/urlwatch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/urn-timer/default.nix => unit/ur/urn-timer/pkg-fun.nix} (100%) rename pkgs/{development/compilers/urn/default.nix => unit/ur/urn/pkg-fun.nix} (100%) rename pkgs/{tools/system/uroboros/default.nix => unit/ur/uroboros/pkg-fun.nix} (100%) rename pkgs/{servers/ursadb/default.nix => unit/ur/ursadb/pkg-fun.nix} (100%) rename pkgs/{servers/urserver/default.nix => unit/ur/urserver/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/usb-blaster-udev-rules/default.nix => unit/us/usb-blaster-udev-rules/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/us}/usb-blaster-udev-rules/usb-blaster.rules (100%) rename pkgs/{development/tools/misc/usb-modeswitch/data.nix => unit/us/usb-modeswitch-data/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/us}/usb-modeswitch/configurable-usb-modeswitch.patch (100%) rename pkgs/{development/tools/misc/usb-modeswitch/default.nix => unit/us/usb-modeswitch/pkg-fun.nix} (100%) rename pkgs/{applications/misc/usb-reset/default.nix => unit/us/usb-reset/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/usbguard/default.nix => unit/us/usbguard/pkg-fun.nix} (100%) rename pkgs/{tools/misc/usbimager/default.nix => unit/us/usbimager/pkg-fun.nix} (100%) rename pkgs/{tools/misc/usbmuxd/default.nix => unit/us/usbmuxd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/usbmuxd2/default.nix => unit/us/usbmuxd2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/usbredir/default.nix => unit/us/usbredir/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/usbrelay/default.nix => unit/us/usbrelay/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/usbrelay/daemon.nix => unit/us/usbrelayd/pkg-fun.nix} (100%) rename pkgs/{tools/security/usbrip/default.nix => unit/us/usbrip/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/usbsdmux/default.nix => unit/us/usbsdmux/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/usbtop/default.nix => unit/us/usbtop/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/us}/usbutils/fix-paths.patch (100%) rename pkgs/{os-specific/linux/usbutils/default.nix => unit/us/usbutils/pkg-fun.nix} (100%) rename pkgs/{tools/misc/usbview/default.nix => unit/us/usbview/pkg-fun.nix} (100%) rename pkgs/{tools/networking/userhosts/default.nix => unit/us/userhosts/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/usermount/default.nix => unit/us/usermount/pkg-fun.nix} (100%) rename pkgs/{applications/misc/usql/default.nix => unit/us/usql/pkg-fun.nix} (100%) rename pkgs/{development/libraries/usrsctp/default.nix => unit/us/usrsctp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ustr/default.nix => unit/us/ustr/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/us}/ustr/va_args.patch (100%) rename pkgs/{applications/video/ustreamer/default.nix => unit/us/ustreamer/pkg-fun.nix} (100%) rename pkgs/{applications/misc/usync/default.nix => unit/us/usync/pkg-fun.nix} (100%) rename pkgs/{applications/networking/utahfs/default.nix => unit/ut/utahfs/pkg-fun.nix} (100%) rename pkgs/{development/libraries/utf8cpp/default.nix => unit/ut/utf8cpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/utf8proc/default.nix => unit/ut/utf8proc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/uthash/default.nix => unit/ut/uthash/pkg-fun.nix} (100%) rename pkgs/{development/libraries/uthenticode/default.nix => unit/ut/uthenticode/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/utm/default.nix => unit/ut/utm/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/utox/default.nix => unit/ut/utox/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/utsushi/networkscan.nix => unit/ut/utsushi-networkscan/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/utsushi/default.nix => unit/ut/utsushi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/uucp/default.nix => unit/uu/uucp/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/uu}/uudeview/matherr.patch (100%) rename pkgs/{tools/misc/uudeview/default.nix => unit/uu/uudeview/pkg-fun.nix} (100%) rename pkgs/{applications/video/uvccapture/default.nix => unit/uv/uvccapture/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/uvcdynctrl/default.nix => unit/uv/uvcdynctrl/pkg-fun.nix} (100%) rename pkgs/{data/fonts => unit/uw}/uw-ttyp0/determinism.patch (100%) rename pkgs/{data/fonts/uw-ttyp0/default.nix => unit/uw/uw-ttyp0/pkg-fun.nix} (100%) rename pkgs/{tools/text/uwc/default.nix => unit/uw/uwc/pkg-fun.nix} (100%) rename pkgs/{tools/networking/uwimap/default.nix => unit/uw/uwimap/pkg-fun.nix} (100%) rename pkgs/{servers => unit/uw}/uwsgi/additional-php-ldflags.patch (100%) rename pkgs/{servers => unit/uw}/uwsgi/nixos.ini (100%) rename pkgs/{servers => unit/uw}/uwsgi/no-ext-session-php_session.h-on-NixOS.patch (100%) rename pkgs/{servers/uwsgi/default.nix => unit/uw/uwsgi/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/uw}/uwufetch/fix-paths.patch (100%) rename pkgs/{tools/misc/uwufetch/default.nix => unit/uw/uwufetch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/uwuify/default.nix => unit/uw/uwuify/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/uxn/default.nix => unit/ux/uxn/pkg-fun.nix} (100%) rename pkgs/{servers/uxplay/default.nix => unit/ux/uxplay/pkg-fun.nix} (100%) rename pkgs/{data/misc/v2ray-domain-list-community/default.nix => unit/v2/v2ray-domain-list-community/pkg-fun.nix} (100%) rename pkgs/{data/misc/v2ray-geoip/default.nix => unit/v2/v2ray-geoip/pkg-fun.nix} (100%) rename pkgs/{data/misc => unit/v2}/v2ray-geoip/update.sh (100%) rename pkgs/{tools/networking/v2ray/default.nix => unit/v2/v2ray/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/v2}/v2raya/package.json (100%) rename pkgs/{tools/networking/v2raya/default.nix => unit/v2/v2raya/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/v2}/v2raya/yarn.lock (100%) rename pkgs/{tools/networking => unit/v2}/v2raya/yarn.nix (100%) rename pkgs/{development/libraries/vaapi-intel-hybrid/default.nix => unit/va/vaapi-intel-hybrid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vaapi-intel/default.nix => unit/va/vaapiIntel/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vaapi-vdpau/default.nix => unit/va/vaapiVdpau/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/vacuum/default.nix => unit/va/vacuum/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/va}/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch (100%) rename pkgs/{development/tools => unit/va}/vagrant/0004-Support-system-installed-plugins.patch (100%) rename pkgs/{development/tools => unit/va}/vagrant/gemset.nix (100%) rename pkgs/{development/tools => unit/va}/vagrant/gemset_libvirt.nix (100%) rename pkgs/{development/tools/vagrant/default.nix => unit/va/vagrant/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/va}/vagrant/unofficial-installation-nowarn.patch (100%) rename pkgs/{development/tools => unit/va}/vagrant/use-system-bundler-version.patch (100%) rename pkgs/{development/tools => unit/va}/vagrant/vagrant-libvirt.json.in (100%) rename pkgs/{development/tools/language-servers/vala-language-server/default.nix => unit/va/vala-language-server/pkg-fun.nix} (100%) rename pkgs/{development/tools/vala-lint/default.nix => unit/va/vala-lint/pkg-fun.nix} (100%) rename pkgs/{tools/text/vale/default.nix => unit/va/vale/pkg-fun.nix} (100%) rename pkgs/{tools/text/validator-nu/default.nix => unit/va/validator-nu/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/valkyrie/default.nix => unit/va/valkyrie/pkg-fun.nix} (100%) rename pkgs/{tools/security/vals/default.nix => unit/va/vals/pkg-fun.nix} (100%) rename pkgs/{development/web/valum/default.nix => unit/va/valum/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/vamp-plugin-sdk/default.nix => unit/va/vamp-plugin-sdk/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/vampire/default.nix => unit/va/vampire/pkg-fun.nix} (100%) rename pkgs/{data/icons/vanilla-dmz/default.nix => unit/va/vanilla-dmz/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vapoursynth-mvtools/default.nix => unit/va/vapoursynth-mvtools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/variety/default.nix => unit/va/variety/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/varscan/default.nix => unit/va/varscan/pkg-fun.nix} (100%) rename pkgs/{games/vassal/default.nix => unit/va/vassal/pkg-fun.nix} (100%) rename pkgs/{tools/security/vault/vault-bin.nix => unit/va/vault-bin/pkg-fun.nix} (100%) rename pkgs/{tools/security/vault => unit/va/vault-bin}/update-bin.sh (100%) rename pkgs/{tools/security/vault-medusa/default.nix => unit/va/vault-medusa/pkg-fun.nix} (100%) rename pkgs/{tools/security/vault/default.nix => unit/va/vault/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vazir-code-font/default.nix => unit/va/vazir-code-font/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vazir-fonts/default.nix => unit/va/vazir-fonts/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/vbam/default.nix => unit/vb/vbam/pkg-fun.nix} (100%) rename pkgs/{tools/system/vbetool/default.nix => unit/vb/vbetool/pkg-fun.nix} (100%) rename pkgs/{applications/editors/vbindiff/default.nix => unit/vb/vbindiff/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/vb}/vboot_reference/dont_static_link.patch (100%) rename pkgs/{tools/system/vboot_reference/default.nix => unit/vb/vboot_reference/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vc/default.nix => unit/vc/vc/pkg-fun.nix} (100%) rename pkgs/{development/misc/vc4/newlib.nix => unit/vc/vc4-newlib/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vc/0.7.nix => unit/vc/vc_0_7/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vc => unit/vc/vc_0_7}/vc_0_7_clang_fix.patch (100%) rename pkgs/{applications/misc/vcal/default.nix => unit/vc/vcal/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vcdimager/default.nix => unit/vc/vcdimager/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/vcftools/default.nix => unit/vc/vcftools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vcg/default.nix => unit/vc/vcg/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/vcluster/default.nix => unit/vc/vcluster/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/vc}/vcs/fonts.patch (100%) rename pkgs/{applications/video/vcs/default.nix => unit/vc/vcs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vcs_query/default.nix => unit/vc/vcs_query/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/vcsh/default.nix => unit/vc/vcsh/pkg-fun.nix} (100%) rename pkgs/{tools/video/vcsi/default.nix => unit/vc/vcsi/pkg-fun.nix} (100%) rename pkgs/{development/tools/vcstool/default.nix => unit/vc/vcstool/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vcv-rack/default.nix => unit/vc/vcv-rack/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/vc}/vcv-rack/rack-minimize-vendoring.patch (100%) rename pkgs/{tools/networking/vde2/default.nix => unit/vd/vde2/pkg-fun.nix} (100%) rename pkgs/{applications/backup/vdmfec/default.nix => unit/vd/vdmfec/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/vdo/default.nix => unit/vd/vdo/pkg-fun.nix} (100%) rename pkgs/{tools/X11/vdpauinfo/default.nix => unit/vd/vdpauinfo/pkg-fun.nix} (100%) rename pkgs/{applications/video/vdr/default.nix => unit/vd/vdr/pkg-fun.nix} (100%) rename pkgs/{games => unit/vd}/vdrift/0001-Ignore-missing-data-for-installation.patch (100%) rename pkgs/{games/vdrift/default.nix => unit/vd/vdrift/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vdrsymbols/default.nix => unit/vd/vdrsymbols/pkg-fun.nix} (100%) rename pkgs/{games/vectoroids/default.nix => unit/ve/vectoroids/pkg-fun.nix} (100%) rename pkgs/{tools/networking/vegeta/default.nix => unit/ve/vegeta/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vegur/default.nix => unit/ve/vegur/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/velero/default.nix => unit/ve/velero/pkg-fun.nix} (100%) rename pkgs/{development/tools/vendir/default.nix => unit/ve/vendir/pkg-fun.nix} (100%) rename pkgs/{data/themes/venta/default.nix => unit/ve/venta/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd => unit/ve}/ventoy-bin/000-nixos-sanitization.patch (100%) rename pkgs/{tools/cd-dvd/ventoy-bin/default.nix => unit/ve/ventoy-bin/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/verco/default.nix => unit/ve/verco/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers/verible/default.nix => unit/ve/verible/pkg-fun.nix} (100%) rename pkgs/{development/tools/language-servers => unit/ve}/verible/remove-unused-deps.patch (100%) rename pkgs/{applications/science/logic/verifast/default.nix => unit/ve/verifast/pkg-fun.nix} (100%) rename pkgs/{tools/security/verifpal/default.nix => unit/ve/verifpal/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/verilator/default.nix => unit/ve/verilator/pkg-fun.nix} (100%) rename pkgs/{applications/networking/versus/default.nix => unit/ve/versus/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/veryfasttree/default.nix => unit/ve/veryfasttree/pkg-fun.nix} (100%) rename pkgs/{tools/security/vexctl/default.nix => unit/ve/vexctl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vgmplay-libvgm/default.nix => unit/vg/vgmplay-libvgm/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vgmstream/default.nix => unit/vg/vgmstream/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/vg}/vgmstream/update.sh (100%) rename pkgs/{tools/audio/vgmtools/default.nix => unit/vg/vgmtools/pkg-fun.nix} (100%) rename pkgs/{tools/text/vgrep/default.nix => unit/vg/vgrep/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/vhd2vl/default.nix => unit/vh/vhd2vl/pkg-fun.nix} (100%) rename pkgs/{applications/misc/vhs/default.nix => unit/vh/vhs/pkg-fun.nix} (100%) rename pkgs/{applications/science/molecular-dynamics/viennarna/default.nix => unit/vi/ViennaRNA/pkg-fun.nix} (100%) rename pkgs/{tools/misc/via/default.nix => unit/vi/via/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vial/default.nix => unit/vi/vial/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/viber/default.nix => unit/vi/viber/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/vice/default.nix => unit/vi/vice/pkg-fun.nix} (100%) rename pkgs/{data/fonts/victor-mono/default.nix => unit/vi/victor-mono/pkg-fun.nix} (100%) rename pkgs/{servers/nosql/victoriametrics/default.nix => unit/vi/victoriametrics/pkg-fun.nix} (100%) rename pkgs/{tools/misc/viddy/default.nix => unit/vi/viddy/pkg-fun.nix} (100%) rename pkgs/{applications/video/video-trimmer/default.nix => unit/vi/video-trimmer/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers => unit/vi}/vieb/package.json (100%) rename pkgs/{applications/networking/browsers/vieb/default.nix => unit/vi/vieb/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers => unit/vi}/vieb/yarn.lock (100%) rename pkgs/{applications/networking/browsers => unit/vi}/vieb/yarn.nix (100%) rename pkgs/{applications/graphics/viewnior/default.nix => unit/vi/viewnior/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/vifm/default.nix => unit/vi/vifm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/viking/default.nix => unit/vi/viking/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/vikunja/api.nix => unit/vi/vikunja-api/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/vikunja/frontend.nix => unit/vi/vikunja-frontend/pkg-fun.nix} (100%) rename pkgs/{development/tools/vim-vint/default.nix => unit/vi/vim-vint/pkg-fun.nix} (100%) rename pkgs/{applications/editors/vim/plugins => unit/vi/vimUtils}/build-vim-plugin.nix (100%) rename pkgs/{applications/editors/vim/plugins => unit/vi/vimUtils}/neovim-require-check-hook.sh (100%) rename pkgs/{applications/editors/vim/plugins/vim-utils.nix => unit/vi/vimUtils/pkg-fun.nix} (100%) rename pkgs/{applications/editors/vim/plugins => unit/vi/vimUtils}/vim-command-check-hook.sh (100%) rename pkgs/{applications/editors/vim/plugins => unit/vi/vimUtils}/vim-gen-doc-hook.sh (100%) rename pkgs/{applications/editors/vim/vimacs.nix => unit/vi/vimacs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/vimb/default.nix => unit/vi/vimb-unwrapped/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vimer/default.nix => unit/vi/vimer/pkg-fun.nix} (100%) rename pkgs/{games => unit/vi}/vimgolf/Gemfile (100%) rename pkgs/{games => unit/vi}/vimgolf/Gemfile.lock (100%) rename pkgs/{games => unit/vi}/vimgolf/gemset.nix (100%) rename pkgs/{games/vimgolf/default.nix => unit/vi/vimgolf/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/vimiv-qt/default.nix => unit/vi/vimiv-qt/pkg-fun.nix} (100%) rename pkgs/{data/icons/vimix-icon-theme/default.nix => unit/vi/vimix-icon-theme/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vimpc/default.nix => unit/vi/vimpc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vimv/default.nix => unit/vi/vimv/pkg-fun.nix} (100%) rename pkgs/{games/vintagestory/default.nix => unit/vi/vintagestory/pkg-fun.nix} (100%) rename pkgs/{applications/audio/viper4linux/default.nix => unit/vi/viper4linux/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/vipsdisp/default.nix => unit/vi/vipsdisp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/virglrenderer/default.nix => unit/vi/virglrenderer/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/virt-top/default.nix => unit/vi/virt-top/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/virt-viewer/default.nix => unit/vi/virt-viewer/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/virt-what/default.nix => unit/vi/virt-what/pkg-fun.nix} (100%) rename pkgs/{servers/misc/virtiofsd/default.nix => unit/vi/virtiofsd/pkg-fun.nix} (100%) rename pkgs/{tools/admin/virtscreen/default.nix => unit/vi/virtscreen/pkg-fun.nix} (100%) rename pkgs/{applications/audio/virtual-ans/default.nix => unit/vi/virtual-ans/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/virtualbox/extpack.nix => unit/vi/virtualboxExtpack/pkg-fun.nix} (100%) rename pkgs/{development/libraries/virtualpg/default.nix => unit/vi/virtualpg/pkg-fun.nix} (100%) rename pkgs/{applications/editors/vis/default.nix => unit/vi/vis/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vista-fonts-chs => unit/vi/vistafonts-chs}/no-op.conf (100%) rename pkgs/{data/fonts/vista-fonts-chs/default.nix => unit/vi/vistafonts-chs/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vista-fonts-cht => unit/vi/vistafonts-cht}/no-op.conf (100%) rename pkgs/{data/fonts/vista-fonts-cht/default.nix => unit/vi/vistafonts-cht/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vista-fonts => unit/vi/vistafonts}/no-op.conf (100%) rename pkgs/{data/fonts/vista-fonts/default.nix => unit/vi/vistafonts/pkg-fun.nix} (100%) rename pkgs/{development/tools/java/visualvm/default.nix => unit/vi/visualvm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/vit/default.nix => unit/vi/vit/pkg-fun.nix} (100%) rename pkgs/{applications/science/misc/vite/default.nix => unit/vi/vite/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/vitess/default.nix => unit/vi/vitess/pkg-fun.nix} (100%) rename pkgs/{games/vitetris/default.nix => unit/vi/vitetris/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/viu/default.nix => unit/vi/viu/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/vivaldi/ffmpeg-codecs.nix => unit/vi/vivaldi-ffmpeg-codecs/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/vivaldi/widevine.nix => unit/vi/vivaldi-widevine/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/vivaldi/default.nix => unit/vi/vivaldi/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vivid/default.nix => unit/vi/vivid/pkg-fun.nix} (100%) rename pkgs/{applications/editors/viw/default.nix => unit/vi/viw/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vix/default.nix => unit/vi/vix/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vk-bootstrap/default.nix => unit/vk/vk-bootstrap/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/vk-cli/default.nix => unit/vk/vk-cli/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/vk-messenger/default.nix => unit/vk/vk-messenger/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/vkbasalt-cli/default.nix => unit/vk/vkbasalt-cli/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/vkdisplayinfo/default.nix => unit/vk/vkdisplayinfo/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/vkdt/default.nix => unit/vk/vkdt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vkeybd/default.nix => unit/vk/vkeybd/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/vkmark/default.nix => unit/vk/vkmark/pkg-fun.nix} (100%) rename pkgs/{tools/networking/vlan/default.nix => unit/vl/vlan/pkg-fun.nix} (100%) rename pkgs/{development/compilers/vlang/default.nix => unit/vl/vlang/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers => unit/vl}/vlock/eintr.patch (100%) rename pkgs/{misc/screensavers/vlock/default.nix => unit/vl/vlock/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/vmagent/default.nix => unit/vm/vmagent/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/vmfs-tools/default.nix => unit/vm/vmfs-tools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vmime/default.nix => unit/vm/vmime/pkg-fun.nix} (100%) rename pkgs/{games/vms-empire/default.nix => unit/vm/vms-empire/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vmtouch/default.nix => unit/vm/vmtouch/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/vmware-horizon-client/default.nix => unit/vm/vmware-horizon-client/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote => unit/vm}/vmware-horizon-client/update.sh (100%) rename pkgs/{applications/virtualization/vmware-workstation/default.nix => unit/vm/vmware-workstation/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization => unit/vm}/vmware-workstation/vmware-bootstrap (100%) rename pkgs/{applications/virtualization => unit/vm}/vmware-workstation/vmware-config (100%) rename pkgs/{applications/virtualization => unit/vm}/vmware-workstation/vmware-installer-bootstrap (100%) rename pkgs/{applications/virtualization => unit/vm}/vmware-workstation/vmware-modconfig (100%) rename pkgs/{tools/video/vncrec/default.nix => unit/vn/vncrec/pkg-fun.nix} (100%) rename pkgs/{development/tools/vndr/default.nix => unit/vn/vndr/pkg-fun.nix} (100%) rename pkgs/{applications/networking/vnstat/default.nix => unit/vn/vnstat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vo-aacenc/default.nix => unit/vo/vo-aacenc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vo-amrwbenc/default.nix => unit/vo/vo-amrwbenc/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/vobcopy/default.nix => unit/vo/vobcopy/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/vobsub2srt/default.nix => unit/vo/vobsub2srt/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vocal/default.nix => unit/vo/vocal/pkg-fun.nix} (100%) rename pkgs/{applications/audio/vocproc/default.nix => unit/vo/vocproc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/void/default.nix => unit/vo/void/pkg-fun.nix} (100%) rename pkgs/{tools/security/volatility/default.nix => unit/vo/volatility/pkg-fun.nix} (100%) rename pkgs/{tools/security/volatility3/default.nix => unit/vo/volatility3/pkg-fun.nix} (100%) rename pkgs/{tools/audio/volctl/default.nix => unit/vo/volctl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/volk/default.nix => unit/vo/volk/pkg-fun.nix} (100%) rename pkgs/{data/fonts/vollkorn/default.nix => unit/vo/vollkorn/pkg-fun.nix} (100%) rename pkgs/{applications/misc/volnoti/default.nix => unit/vo/volnoti/pkg-fun.nix} (100%) rename pkgs/{development/libraries/volume-key/default.nix => unit/vo/volume_key/pkg-fun.nix} (100%) rename pkgs/{tools/audio/volumeicon/default.nix => unit/vo/volumeicon/pkg-fun.nix} (100%) rename pkgs/{tools/networking/voms/default.nix => unit/vo/voms/pkg-fun.nix} (100%) rename pkgs/{tools/networking/vopono/default.nix => unit/vo/vopono/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vorbisgain/default.nix => unit/vo/vorbisgain/pkg-fun.nix} (100%) rename pkgs/{servers/vouch-proxy/default.nix => unit/vo/vouch-proxy/pkg-fun.nix} (100%) rename pkgs/{applications/science/machine-learning/vowpal-wabbit/default.nix => unit/vo/vowpal-wabbit/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/vpcs/default.nix => unit/vp/vpcs/pkg-fun.nix} (100%) rename pkgs/{tools/networking/vpnc-scripts/default.nix => unit/vp/vpnc-scripts/pkg-fun.nix} (100%) rename pkgs/{tools/networking/vpnc/default.nix => unit/vp/vpnc/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization => unit/vp}/vpsfree-client/Gemfile (100%) rename pkgs/{tools/virtualization => unit/vp}/vpsfree-client/Gemfile.lock (100%) rename pkgs/{tools/virtualization => unit/vp}/vpsfree-client/gemset.nix (100%) rename pkgs/{tools/virtualization/vpsfree-client/default.nix => unit/vp/vpsfree-client/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vrb/default.nix => unit/vr/vrb/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/vr}/vrb/removed_options.patch (100%) rename pkgs/{development/libraries => unit/vr}/vrb/unused-but-set-variable.patch (100%) rename pkgs/{development/libraries/vrpn/default.nix => unit/vr/vrpn/pkg-fun.nix} (100%) rename pkgs/{development/tools/vsce/default.nix => unit/vs/vsce/pkg-fun.nix} (100%) rename pkgs/{applications/editors/vscode/with-extensions.nix => unit/vs/vscode-with-extensions/pkg-fun.nix} (100%) rename pkgs/{servers/ftp => unit/vs}/vsftpd/CVE-2015-1419.patch (100%) rename pkgs/{servers/ftp/vsftpd/default.nix => unit/vs/vsftpd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vsh/default.nix => unit/vs/vsh/pkg-fun.nix} (100%) rename pkgs/{servers/mail/vsmtp/default.nix => unit/vs/vsmtp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vsqlite/default.nix => unit/vs/vsqlite/pkg-fun.nix} (100%) rename pkgs/{tools/security/vt-cli/default.nix => unit/vt/vt-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/vtable-dumper/default.nix => unit/vt/vtable-dumper/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vtm/default.nix => unit/vt/vtm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/vttest/default.nix => unit/vt/vttest/pkg-fun.nix} (100%) rename pkgs/{applications/misc/vue/default.nix => unit/vu/vue/pkg-fun.nix} (100%) rename pkgs/{applications/misc/vul/default.nix => unit/vu/vul/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/vulkan-cts/default.nix => unit/vu/vulkan-cts/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/vulkan-extension-layer/default.nix => unit/vu/vulkan-extension-layer/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vulkan-headers/default.nix => unit/vu/vulkan-headers/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/vu}/vulkan-tools-lunarg/gtest.patch (100%) rename pkgs/{tools/graphics/vulkan-tools-lunarg/default.nix => unit/vu/vulkan-tools-lunarg/pkg-fun.nix} (100%) rename pkgs/{development/tools/vulkan-validation-layers/default.nix => unit/vu/vulkan-validation-layers/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/vu}/vulkan-validation-layers/robin-hood-hashing.nix (100%) rename pkgs/{tools/security/vulnix/default.nix => unit/vu/vulnix/pkg-fun.nix} (100%) rename pkgs/{development/tools/vultr-cli/default.nix => unit/vu/vultr-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/vultr/default.nix => unit/vu/vultr/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/vwm/default.nix => unit/vw/vwm/pkg-fun.nix} (100%) rename pkgs/{development/libraries/vxl/default.nix => unit/vx/vxl/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers => unit/w3}/w3m/RAND_egd.libressl.patch (100%) rename pkgs/{applications/networking/browsers/w3m/default.nix => unit/w3/w3m/pkg-fun.nix} (100%) rename pkgs/{applications/video/w_scan/default.nix => unit/w_/w_scan/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/waagent/default.nix => unit/wa/waagent/pkg-fun.nix} (100%) rename pkgs/{development/tools/wabt/default.nix => unit/wa/wabt/pkg-fun.nix} (100%) rename pkgs/{tools/security/wad/default.nix => unit/wa/wad/pkg-fun.nix} (100%) rename pkgs/{tools/security/waf-tester/default.nix => unit/wa/waf-tester/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/waf/default.nix => unit/wa/waf/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers/wafHook/default.nix => unit/wa/wafHook/pkg-fun.nix} (100%) rename pkgs/{development/tools/build-managers => unit/wa}/wafHook/setup-hook.sh (100%) rename pkgs/{development/libraries/waffle/default.nix => unit/wa/waffle/pkg-fun.nix} (100%) rename pkgs/{tools/security/wafw00f/default.nix => unit/wa/wafw00f/pkg-fun.nix} (100%) rename pkgs/{development/tools/wails/default.nix => unit/wa/wails/pkg-fun.nix} (100%) rename pkgs/{tools/networking/waitron/default.nix => unit/wa/waitron/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/wa}/waitron/staticfiles-directory.patch (100%) rename pkgs/{tools/networking/wakelan/default.nix => unit/wa/wakelan/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wakeonlan/default.nix => unit/wa/wakeonlan/pkg-fun.nix} (100%) rename pkgs/{tools/backup/wal-g/default.nix => unit/wa/wal-g/pkg-fun.nix} (100%) rename pkgs/{tools/backup/wal-e/default.nix => unit/wa/wal_e/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/wallabag/default.nix => unit/wa/wallabag/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/wa}/wallabag/wallabag-data.patch (100%) rename pkgs/{tools/graphics => unit/wa}/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch (100%) rename pkgs/{tools/graphics/wallutils/default.nix => unit/wa/wallutils/pkg-fun.nix} (100%) rename pkgs/{development/tools/wally-cli/default.nix => unit/wa/wally-cli/pkg-fun.nix} (100%) rename pkgs/{tools/admin/wander/default.nix => unit/wa/wander/pkg-fun.nix} (100%) rename pkgs/{applications/audio/waon/default.nix => unit/wa/waon/pkg-fun.nix} (100%) rename pkgs/{tools/security/wapiti/default.nix => unit/wa/wapiti/pkg-fun.nix} (100%) rename pkgs/{games/wargus/default.nix => unit/wa/wargus/pkg-fun.nix} (100%) rename pkgs/{games => unit/wa}/wargus/stratagus.nix (100%) rename pkgs/{games/warmux/default.nix => unit/wa/warmux/pkg-fun.nix} (100%) rename pkgs/{applications/networking/warp/default.nix => unit/wa/warp/pkg-fun.nix} (100%) rename pkgs/{applications/misc/warpd/default.nix => unit/wa/warpd/pkg-fun.nix} (100%) rename pkgs/{games/warsow => unit/wa/warsow-engine}/libpath.patch (100%) rename pkgs/{games/warsow/engine.nix => unit/wa/warsow-engine/pkg-fun.nix} (100%) rename pkgs/{games/warsow/default.nix => unit/wa/warsow/pkg-fun.nix} (100%) rename pkgs/{games/warzone2100/default.nix => unit/wa/warzone2100/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains => unit/wa}/wasabibackend/deps.nix (100%) rename pkgs/{applications/blockchains/wasabibackend/default.nix => unit/wa/wasabibackend/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/wasabiwallet/default.nix => unit/wa/wasabiwallet/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/wasm3/default.nix => unit/wa/wasm3/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/wasmtime/default.nix => unit/wa/wasmtime/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/wa}/wasynth/Cargo.lock (100%) rename pkgs/{development/tools/wasynth/default.nix => unit/wa/wasynth/pkg-fun.nix} (100%) rename pkgs/{tools/misc/watchlog/default.nix => unit/wa/watchlog/pkg-fun.nix} (100%) rename pkgs/{applications/misc/watchmate/default.nix => unit/wa/watchmate/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/wa}/watson-ruby/Gemfile (100%) rename pkgs/{development/tools/misc => unit/wa}/watson-ruby/Gemfile.lock (100%) rename pkgs/{development/tools/misc => unit/wa}/watson-ruby/gemset.nix (100%) rename pkgs/{development/tools/misc/watson-ruby/default.nix => unit/wa/watson-ruby/pkg-fun.nix} (100%) rename pkgs/{applications/office/watson/default.nix => unit/wa/watson/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/wavebox/default.nix => unit/wa/wavebox/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/wavefunctioncollapse/default.nix => unit/wa/wavefunctioncollapse/pkg-fun.nix} (100%) rename pkgs/{applications/audio/wavegain/default.nix => unit/wa/wavegain/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wavemon/default.nix => unit/wa/wavemon/pkg-fun.nix} (100%) rename pkgs/{development/libraries/wavpack/default.nix => unit/wa/wavpack/pkg-fun.nix} (100%) rename pkgs/{applications/misc/audio/wavrsocvt/default.nix => unit/wa/wavrsocvt/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/way-displays/default.nix => unit/wa/way-displays/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wayback-machine-archiver/default.nix => unit/wa/wayback-machine-archiver/pkg-fun.nix} (100%) rename pkgs/{applications/networking => unit/wa}/wayback_machine_downloader/Gemfile (100%) rename pkgs/{applications/networking => unit/wa}/wayback_machine_downloader/Gemfile.lock (100%) rename pkgs/{applications/networking => unit/wa}/wayback_machine_downloader/gemset.nix (100%) rename pkgs/{applications/networking/wayback_machine_downloader/default.nix => unit/wa/wayback_machine_downloader/pkg-fun.nix} (100%) rename pkgs/{applications/misc/waybar/default.nix => unit/wa/waybar/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/waydroid/default.nix => unit/wa/waydroid/pkg-fun.nix} (100%) rename pkgs/{development/libraries/wayland/protocols.nix => unit/wa/wayland-protocols/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wayland-proxy-virtwl/default.nix => unit/wa/wayland-proxy-virtwl/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wayland-utils/default.nix => unit/wa/wayland-utils/pkg-fun.nix} (100%) rename pkgs/{development/libraries/wayland/default.nix => unit/wa/wayland/pkg-fun.nix} (100%) rename pkgs/{tools/misc/waylevel/default.nix => unit/wa/waylevel/pkg-fun.nix} (100%) rename pkgs/{applications/misc/waylock/default.nix => unit/wa/waylock/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/waynergy/default.nix => unit/wa/waynergy/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wayout/default.nix => unit/wa/wayout/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/waypipe/default.nix => unit/wa/waypipe/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/waypoint/default.nix => unit/wa/waypoint/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wayshot/default.nix => unit/wa/wayshot/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/wayst/default.nix => unit/wa/wayst/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators => unit/wa}/wayst/utf8proc.patch (100%) rename pkgs/{tools/X11/wayv/default.nix => unit/wa/wayv/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/wayvnc/default.nix => unit/wa/wayvnc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wbg/default.nix => unit/wb/wbg/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wbox/default.nix => unit/wb/wbox/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wcalc/default.nix => unit/wc/wcalc/pkg-fun.nix} (100%) rename pkgs/{development/compilers/wcc/default.nix => unit/wc/wcc/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/wcpg/default.nix => unit/wc/wcpg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/astronomy/wcslib/default.nix => unit/wc/wcslib/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/wdfs/default.nix => unit/wd/wdfs/pkg-fun.nix} (100%) rename pkgs/{tools/text/wdiff/default.nix => unit/wd/wdiff/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/wdisplays/default.nix => unit/wd/wdisplays/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wdomirror/default.nix => unit/wd/wdomirror/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sync/wdt/default.nix => unit/wd/wdt/pkg-fun.nix} (100%) rename pkgs/{data/fonts/weather-icons/default.nix => unit/we/weather-icons/pkg-fun.nix} (100%) rename pkgs/{applications/misc/weather/default.nix => unit/we/weather/pkg-fun.nix} (100%) rename pkgs/{tools/networking/webalizer/default.nix => unit/we/webalizer/pkg-fun.nix} (100%) rename pkgs/{tools/security/webanalyze/default.nix => unit/we/webanalyze/pkg-fun.nix} (100%) rename pkgs/{tools/misc/webcat/default.nix => unit/we/webcat/pkg-fun.nix} (100%) rename pkgs/{servers/webdav-server-rs/default.nix => unit/we/webdav-server-rs/pkg-fun.nix} (100%) rename pkgs/{servers/webdav/default.nix => unit/we/webdav/pkg-fun.nix} (100%) rename pkgs/{development/tools/database/webdis/default.nix => unit/we/webdis/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/webex/default.nix => unit/we/webex/pkg-fun.nix} (100%) rename pkgs/{servers/http => unit/we}/webfs/ls.c.patch (100%) rename pkgs/{servers/http/webfs/default.nix => unit/we/webfs/pkg-fun.nix} (100%) rename pkgs/{servers/http/webhook/default.nix => unit/we/webhook/pkg-fun.nix} (100%) rename pkgs/{development/libraries/webkit2-sharp/default.nix => unit/we/webkit2-sharp/pkg-fun.nix} (100%) rename pkgs/{servers/webmetro/default.nix => unit/we/webmetro/pkg-fun.nix} (100%) rename pkgs/{development/libraries/webp-pixbuf-loader/default.nix => unit/we/webp-pixbuf-loader/pkg-fun.nix} (100%) rename pkgs/{development/libraries/webrtc-audio-processing => unit/we/webrtc-audio-processing_0_3}/enable-powerpc.patch (100%) rename pkgs/{development/libraries/webrtc-audio-processing => unit/we/webrtc-audio-processing_0_3}/enable-riscv.patch (100%) rename pkgs/{development/libraries/webrtc-audio-processing/0.3.nix => unit/we/webrtc-audio-processing_0_3/pkg-fun.nix} (100%) rename pkgs/{applications/networking/websocketd/default.nix => unit/we/websocketd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/websocket++/default.nix => unit/we/websocketpp/pkg-fun.nix} (100%) rename pkgs/{applications/video/webtorrent_desktop/default.nix => unit/we/webtorrent_desktop/pkg-fun.nix} (100%) rename pkgs/{tools/networking/webwormhole/default.nix => unit/we/webwormhole/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wego/default.nix => unit/we/wego/pkg-fun.nix} (100%) rename pkgs/{tools/games/weidu/default.nix => unit/we/weidu/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/welkin/default.nix => unit/we/welkin/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wemux/default.nix => unit/we/wemux/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/werf/default.nix => unit/we/werf/pkg-fun.nix} (100%) rename pkgs/{servers/wesher/default.nix => unit/we/wesher/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/weston/default.nix => unit/we/weston/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wev/default.nix => unit/we/wev/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/wayfire/wf-config.nix => unit/wf/wf-config/pkg-fun.nix} (100%) rename pkgs/{applications/video/wf-recorder/default.nix => unit/wf/wf-recorder/pkg-fun.nix} (100%) rename pkgs/{applications/networking/wg-bond/default.nix => unit/wg/wg-bond/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wg-friendly-peer-names/default.nix => unit/wg/wg-friendly-peer-names/pkg-fun.nix} (100%) rename pkgs/{applications/networking/wgcf/default.nix => unit/wg/wgcf/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wget/default.nix => unit/wg/wget/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/wg}/wget/remove-runtime-dep-on-openssl-headers.patch (100%) rename pkgs/{tools/text/wgetpaste/default.nix => unit/wg/wgetpaste/pkg-fun.nix} (100%) rename pkgs/{tools/networking/whatip/default.nix => unit/wh/whatip/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/whatsapp-for-linux/default.nix => unit/wh/whatsapp-for-linux/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/wh}/whatweb/Gemfile (100%) rename pkgs/{tools/security => unit/wh}/whatweb/Gemfile.lock (100%) rename pkgs/{tools/security => unit/wh}/whatweb/gemset.nix (100%) rename pkgs/{tools/security/whatweb/default.nix => unit/wh/whatweb/pkg-fun.nix} (100%) rename pkgs/{tools/system/which/default.nix => unit/wh/which/pkg-fun.nix} (100%) rename pkgs/{applications/audio/whipper/default.nix => unit/wh/whipper/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/whisper/default.nix => unit/wh/whisper/pkg-fun.nix} (100%) rename pkgs/{data/icons/whitesur-icon-theme/default.nix => unit/wh/whitesur-icon-theme/pkg-fun.nix} (100%) rename pkgs/{tools/networking/whois/default.nix => unit/wh/whois/pkg-fun.nix} (100%) rename pkgs/{applications/networking/sniffers/whsniff/default.nix => unit/wh/whsniff/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/why3/default.nix => unit/wh/why3/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/wh}/why3/with-provers.nix (100%) rename pkgs/{games/widelands/default.nix => unit/wi/widelands/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/misc/widevine-cdm.nix => unit/wi/widevine-cdm/pkg-fun.nix} (100%) rename pkgs/{os-specific/darwin/wifi-password/default.nix => unit/wi/wifi-password/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wifish/default.nix => unit/wi/wifish/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wifite2/default.nix => unit/wi/wifite2/pkg-fun.nix} (100%) rename pkgs/{development/tools/wiggle/default.nix => unit/wi/wiggle/pkg-fun.nix} (100%) rename pkgs/{development/tools/wiiload/default.nix => unit/wi/wiiload/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems => unit/wi}/wiimms-iso-tools/fix-paths.diff (100%) rename pkgs/{tools/filesystems/wiimms-iso-tools/default.nix => unit/wi/wiimms-iso-tools/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wike/default.nix => unit/wi/wike/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps/wiki-js/default.nix => unit/wi/wiki-js/pkg-fun.nix} (100%) rename pkgs/{servers/web-apps => unit/wi}/wiki-js/update.sh (100%) rename pkgs/{development/libraries/wildmidi/default.nix => unit/wi/wildmidi/pkg-fun.nix} (100%) rename pkgs/{applications/editors/wily/default.nix => unit/wi/wily/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wimboot/default.nix => unit/wi/wimboot/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/wimlib/default.nix => unit/wi/wimlib/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/driver/win-pvdrivers/default.nix => unit/wi/win-pvdrivers/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/driver/win-qemu/default.nix => unit/wi/win-qemu/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/driver/win-signed-gplpv-drivers/default.nix => unit/wi/win-signed-gplpv-drivers/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/driver/win-spice/default.nix => unit/wi/win-spice/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/driver/win-virtio/default.nix => unit/wi/win-virtio/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/windowchef/default.nix => unit/wi/windowchef/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/windowlab/default.nix => unit/wi/windowlab/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/windowmaker/default.nix => unit/wi/windowmaker/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/wineasio/default.nix => unit/wi/wineasio/pkg-fun.nix} (100%) rename pkgs/{desktops/pantheon/third-party => unit/wi}/wingpanel-indicator-ayatana/fix-libapplication-dir.patch (100%) rename pkgs/{desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix => unit/wi/wingpanel-indicator-ayatana/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/wi}/wipe/fix-install.patch (100%) rename pkgs/{tools/security/wipe/default.nix => unit/wi/wipe/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/wipefreespace/default.nix => unit/wi/wipefreespace/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/wire-desktop/default.nix => unit/wi/wire-desktop/pkg-fun.nix} (100%) rename pkgs/{development/tools/wire/default.nix => unit/wi/wire/pkg-fun.nix} (100%) rename pkgs/{development/libraries/wiredtiger/default.nix => unit/wi/wiredtiger/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wireguard-go/default.nix => unit/wi/wireguard-go/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wireguard-tools/default.nix => unit/wi/wireguard-tools/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/wi}/wireguard-tools/update.sh (100%) rename pkgs/{data/misc/wireless-regdb/default.nix => unit/wi/wireless-regdb/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/wireless-tools/default.nix => unit/wi/wirelesstools/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wiremock/default.nix => unit/wi/wiremock/pkg-fun.nix} (100%) rename pkgs/{development/libraries/pipewire/wireplumber.nix => unit/wi/wireplumber/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wireproxy/default.nix => unit/wi/wireproxy/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/wiringpi/default.nix => unit/wi/wiringpi/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/wishbone-tool/default.nix => unit/wi/wishbone-tool/pkg-fun.nix} (100%) rename pkgs/{servers/wishlist/default.nix => unit/wi/wishlist/pkg-fun.nix} (100%) rename pkgs/{applications/misc/with-shell/default.nix => unit/wi/with-shell/pkg-fun.nix} (100%) rename pkgs/{tools/security/witness/default.nix => unit/wi/witness/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wl-clipboard-x11/default.nix => unit/wl/wl-clipboard-x11/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wl-clipboard/default.nix => unit/wl/wl-clipboard/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wl-color-picker/default.nix => unit/wl/wl-color-picker/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wl-gammactl/default.nix => unit/wl/wl-gammactl/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wl-mirror/default.nix => unit/wl/wl-mirror/pkg-fun.nix} (100%) rename pkgs/{development/compilers/wla-dx/default.nix => unit/wl/wla-dx/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wlc/default.nix => unit/wl/wlc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wlclock/default.nix => unit/wl/wlclock/pkg-fun.nix} (100%) rename pkgs/{development/tools/wlcs/default.nix => unit/wl/wlcs/pkg-fun.nix} (100%) rename pkgs/{development/tools/wllvm/default.nix => unit/wl/wllvm/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wlogout/default.nix => unit/wl/wlogout/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wlopm/default.nix => unit/wl/wlopm/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wlprop/default.nix => unit/wl/wlprop/pkg-fun.nix} (100%) rename pkgs/{development/libraries/wlroots/protocols.nix => unit/wl/wlr-protocols/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wlr-randr/default.nix => unit/wl/wlr-randr/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wlrctl/default.nix => unit/wl/wlrctl/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wlsunset/default.nix => unit/wl/wlsunset/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wluma/default.nix => unit/wl/wluma/pkg-fun.nix} (100%) rename pkgs/{tools/X11 => unit/wm}/wmctrl/64-bit-data.patch (100%) rename pkgs/{tools/X11/wmctrl/default.nix => unit/wm/wmctrl/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers => unit/wm}/wmderland/0001-remove-flto.patch (100%) rename pkgs/{applications/window-managers/wmderland/default.nix => unit/wm/wmderland/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/wmderlandc/default.nix => unit/wm/wmderlandc/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/wmfocus.nix => unit/wm/wmfocus/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/wmfs/default.nix => unit/wm/wmfs/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/plugins/wmic-bin.nix => unit/wm/wmic-bin/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/wmii/default.nix => unit/wm/wmii/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/wm}/wml/dynaloader.patch (100%) rename pkgs/{development/web => unit/wm}/wml/no_bitvector.patch (100%) rename pkgs/{development/web/wml/default.nix => unit/wm/wml/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/wm}/wml/redhat-with-thr.patch (100%) rename pkgs/{applications/misc/wmname/default.nix => unit/wm/wmname/pkg-fun.nix} (100%) rename pkgs/{tools/X11/wmutils-core/default.nix => unit/wm/wmutils-core/pkg-fun.nix} (100%) rename pkgs/{tools/X11/wmutils-libwm/default.nix => unit/wm/wmutils-libwm/pkg-fun.nix} (100%) rename pkgs/{tools/X11/wmutils-opt/default.nix => unit/wm/wmutils-opt/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wob/default.nix => unit/wo/wob/pkg-fun.nix} (100%) rename pkgs/{tools/misc/woeusb-ng/default.nix => unit/wo/woeusb-ng/pkg-fun.nix} (100%) rename pkgs/{tools/misc/woeusb/default.nix => unit/wo/woeusb/pkg-fun.nix} (100%) rename pkgs/{development/web => unit/wo}/woff2/brotli-static.patch (100%) rename pkgs/{development/web/woff2/default.nix => unit/wo/woff2/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wofi-emoji/default.nix => unit/wo/wofi-emoji/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/wo}/wofi/do_not_follow_symlinks.patch (100%) rename pkgs/{applications/misc/wofi/default.nix => unit/wo/wofi/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wol/default.nix => unit/wo/wol/pkg-fun.nix} (100%) rename pkgs/{applications/audio/wolf-shaper/default.nix => unit/wo/wolf-shaper/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wolfebin/default.nix => unit/wo/wolfebin/pkg-fun.nix} (100%) rename pkgs/{applications/editors/jupyter-kernels/wolfram => unit/wo/wolfram-for-jupyter-kernel}/kernel.nix (100%) rename pkgs/{applications/editors/jupyter-kernels/wolfram/default.nix => unit/wo/wolfram-for-jupyter-kernel/pkg-fun.nix} (100%) rename pkgs/{applications/science/math/wolfram-engine/notebook.nix => unit/wo/wolfram-notebook/pkg-fun.nix} (100%) rename pkgs/{tools/misc/woof/default.nix => unit/wo/woof/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wootility/default.nix => unit/wo/wootility/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/wooting-udev-rules/default.nix => unit/wo/wooting-udev-rules/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/wo}/wooting-udev-rules/wooting.rules (100%) rename pkgs/{applications/misc/wordbook/default.nix => unit/wo/wordbook/pkg-fun.nix} (100%) rename pkgs/{applications/office/wordgrinder/default.nix => unit/wo/wordgrinder/pkg-fun.nix} (100%) rename pkgs/{data/fonts/work-sans/default.nix => unit/wo/work-sans/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/workcraft/default.nix => unit/wo/workcraft/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/worker/default.nix => unit/wo/worker/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/i3/workstyle.nix => unit/wo/workstyle/pkg-fun.nix} (100%) rename pkgs/{games/worldofgoo/default.nix => unit/wo/worldofgoo/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wormhole-william/default.nix => unit/wo/wormhole-william/pkg-fun.nix} (100%) rename pkgs/{development/tools/wp-cli/default.nix => unit/wp/wp-cli/pkg-fun.nix} (100%) rename pkgs/{development/tools/wp4nix/default.nix => unit/wp/wp4nix/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/wp}/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch (100%) rename pkgs/{os-specific/linux => unit/wp}/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch (100%) rename pkgs/{os-specific/linux/wpa_supplicant/default.nix => unit/wp/wpa_supplicant/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wpaperd/default.nix => unit/wp/wpaperd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/wpgtk/default.nix => unit/wp/wpgtk/pkg-fun.nix} (100%) rename pkgs/{tools/security/wprecon/default.nix => unit/wp/wprecon/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/wp}/wpscan/Gemfile (100%) rename pkgs/{tools/security => unit/wp}/wpscan/Gemfile.lock (100%) rename pkgs/{tools/security => unit/wp}/wpscan/gemset.nix (100%) rename pkgs/{tools/security/wpscan/default.nix => unit/wp/wpscan/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/wp}/wpscan/update.sh (100%) rename pkgs/{data/fonts/wqy-microhei/default.nix => unit/wq/wqy_microhei/pkg-fun.nix} (100%) rename pkgs/{data/fonts/wqy-zenhei/default.nix => unit/wq/wqy_zenhei/pkg-fun.nix} (100%) rename pkgs/{tools/text/wrap/default.nix => unit/wr/wrap/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/firefox/wrapper.nix => unit/wr/wrapFirefox/pkg-fun.nix} (100%) rename pkgs/{shells/fish/wrapper.nix => unit/wr/wrapFish/pkg-fun.nix} (100%) rename pkgs/{applications/networking/cluster/helm/wrapper.nix => unit/wr/wrapHelm/pkg-fun.nix} (100%) rename pkgs/{applications/video/mpv/wrapper.nix => unit/wr/wrapMpv/pkg-fun.nix} (100%) rename pkgs/{applications/editors/neovim/wrapper.nix => unit/wr/wrapNeovimUnstable/pkg-fun.nix} (100%) rename pkgs/{applications/editors/neovim => unit/wr/wrapNeovimUnstable}/tests/default.nix (100%) rename pkgs/{applications/editors/neovim => unit/wr/wrapNeovimUnstable}/tests/init-override.vim (100%) rename pkgs/{applications/editors/neovim => unit/wr/wrapNeovimUnstable}/tests/init-single-lines.vim (100%) rename pkgs/{applications/video/obs-studio/wrapper.nix => unit/wr/wrapOBS/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/qemu => unit/wr/wrapQemuBinfmtP}/binfmt-p-wrapper.c (100%) rename pkgs/{applications/virtualization/qemu/binfmt-p-wrapper.nix => unit/wr/wrapQemuBinfmtP/pkg-fun.nix} (100%) rename pkgs/{applications/networking/mailreaders/thunderbird/wrapper.nix => unit/wr/wrapThunderbird/pkg-fun.nix} (100%) rename pkgs/{applications/video/vdr/wrapper.nix => unit/wr/wrapVdr/pkg-fun.nix} (100%) rename pkgs/{development/compilers/open-watcom/wrapper.nix => unit/wr/wrapWatcom/pkg-fun.nix} (100%) rename pkgs/{applications/networking/irc/weechat/wrapper.nix => unit/wr/wrapWeechat/pkg-fun.nix} (100%) rename pkgs/{development/tools/cue/validator.nix => unit/wr/writeCueValidator/pkg-fun.nix} (100%) rename pkgs/{build-support/make-darwin-bundle/write-darwin-bundle.nix => unit/wr/writeDarwinBundle/pkg-fun.nix} (100%) rename pkgs/{tools/misc/writedisk/default.nix => unit/wr/writedisk/pkg-fun.nix} (100%) rename pkgs/{applications/misc/writefreely/default.nix => unit/wr/writefreely/pkg-fun.nix} (100%) rename pkgs/{build-support => unit/wr}/writers/aliases.nix (100%) rename pkgs/{build-support/writers/default.nix => unit/wr/writers/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wrk/default.nix => unit/wr/wrk/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wrk2/default.nix => unit/wr/wrk2/pkg-fun.nix} (100%) rename pkgs/{servers => unit/ws}/wsdd/increase_timeout.patch (100%) rename pkgs/{servers/wsdd/default.nix => unit/ws/wsdd/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wshowkeys/default.nix => unit/ws/wshowkeys/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wsl-open/default.nix => unit/ws/wsl-open/pkg-fun.nix} (100%) rename pkgs/{tools/system/wslu/default.nix => unit/ws/wslu/pkg-fun.nix} (100%) rename pkgs/{tools/system/wsmancli/default.nix => unit/ws/wsmancli/pkg-fun.nix} (100%) rename pkgs/{tools/system => unit/ws}/wsysmon/dependencies.patch (100%) rename pkgs/{tools/system => unit/ws}/wsysmon/install.patch (100%) rename pkgs/{tools/system/wsysmon/default.nix => unit/ws/wsysmon/pkg-fun.nix} (100%) rename pkgs/{applications/misc/wtf/default.nix => unit/wt/wtf/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/wt}/wtk/builder.sh (100%) rename pkgs/{development/libraries/wtk/default.nix => unit/wt/wtk/pkg-fun.nix} (100%) rename pkgs/{tools/video/wtwitch/default.nix => unit/wt/wtwitch/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/wtype/default.nix => unit/wt/wtype/pkg-fun.nix} (100%) rename pkgs/{tools/networking/wuzz/default.nix => unit/wu/wuzz/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wv/default.nix => unit/wv/wv/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/wv}/wv2/fix-include.patch (100%) rename pkgs/{tools/misc/wv2/default.nix => unit/wv/wv2/pkg-fun.nix} (100%) rename pkgs/{applications/accessibility/wvkbd/default.nix => unit/wv/wvkbd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/wwcd/default.nix => unit/ww/wwcd/pkg-fun.nix} (100%) rename pkgs/{games/wyvern/default.nix => unit/wy/wyvern/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/x-create-mouse-void/default.nix => unit/x-/x-create-mouse-void/pkg-fun.nix} (100%) rename pkgs/{tools/networking/x11-ssh-askpass/default.nix => unit/x1/x11_ssh_askpass/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/x11docker/default.nix => unit/x1/x11docker/pkg-fun.nix} (100%) rename pkgs/{tools/misc/x11idle/default.nix => unit/x1/x11idle/pkg-fun.nix} (100%) rename pkgs/{tools/X11/x11spice/default.nix => unit/x1/x11spice/pkg-fun.nix} (100%) rename pkgs/{tools/X11/x11vnc/default.nix => unit/x1/x11vnc/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/commanderx16/emulator.nix => unit/x1/x16-emulator/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/commanderx16/rom.nix => unit/x1/x16-rom/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/x2}/x264/disable-arm-neon-default.patch (100%) rename pkgs/{development/libraries/x264/default.nix => unit/x2/x264/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/x2}/x265/fix-neon-detection.patch (100%) rename pkgs/{development/libraries/x265/default.nix => unit/x2/x265/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote/x2goserver/default.nix => unit/x2/x2goserver/pkg-fun.nix} (100%) rename pkgs/{tools/X11/x2vnc/default.nix => unit/x2/x2vnc/pkg-fun.nix} (100%) rename pkgs/{tools/X11/x2x/default.nix => unit/x2/x2x/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/x3270/default.nix => unit/x3/x3270/pkg-fun.nix} (100%) rename pkgs/{applications/audio/x42-avldrums/default.nix => unit/x4/x42-avldrums/pkg-fun.nix} (100%) rename pkgs/{applications/audio/x42-gmsynth/default.nix => unit/x4/x42-gmsynth/pkg-fun.nix} (100%) rename pkgs/{applications/audio/x42-plugins/default.nix => unit/x4/x42-plugins/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/x86info/default.nix => unit/x8/x86info/pkg-fun.nix} (100%) rename pkgs/{development/libraries/Xaw3d/default.nix => unit/xa/Xaw3d/pkg-fun.nix} (100%) rename pkgs/{development/compilers/xa/xa.nix => unit/xa/xa/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xalanc/default.nix => unit/xa/xalanc/pkg-fun.nix} (100%) rename pkgs/{servers/xandikos/default.nix => unit/xa/xandikos/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xannotate/default.nix => unit/xa/xannotate/pkg-fun.nix} (100%) rename pkgs/{tools/compression => unit/xa}/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch (100%) rename pkgs/{tools/compression => unit/xa}/xar/0002-Use-pkg-config-for-libxml2.patch (100%) rename pkgs/{tools/compression/xar/default.nix => unit/xa/xar/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/xarchive/default.nix => unit/xa/xarchive/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/xarchiver/default.nix => unit/xa/xarchiver/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xautoclick/default.nix => unit/xa/xautoclick/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/xautolock/default.nix => unit/xa/xautolock/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xautomation/default.nix => unit/xa/xautomation/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xavs/default.nix => unit/xa/xavs/pkg-fun.nix} (100%) rename pkgs/{applications/video => unit/xa}/xawtv/0001-Fix-build-for-glibc-2.32.patch (100%) rename pkgs/{applications/video/xawtv/default.nix => unit/xa/xawtv/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xbanish/default.nix => unit/xb/xbanish/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xbase/default.nix => unit/xb/xbase/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/xb}/xbase/xbase-fixes.patch (100%) rename pkgs/{applications/misc/xbattbar/default.nix => unit/xb/xbattbar/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/xb}/xbattbar/sys-by-default.patch (100%) rename pkgs/{games/xbill/default.nix => unit/xb/xbill/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xbindkeys/default.nix => unit/xb/xbindkeys/pkg-fun.nix} (100%) rename pkgs/{games/xboard/default.nix => unit/xb/xboard/pkg-fun.nix} (100%) rename pkgs/{games/xbomb/default.nix => unit/xb/xbomb/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/xb}/xboxdrv/fix-60-sec-delay.patch (100%) rename pkgs/{misc/drivers/xboxdrv/default.nix => unit/xb/xboxdrv/pkg-fun.nix} (100%) rename pkgs/{misc/drivers => unit/xb}/xboxdrv/scons-py3.patch (100%) rename pkgs/{misc/drivers => unit/xb}/xboxdrv/scons-v4.2.0.patch (100%) rename pkgs/{misc/drivers => unit/xb}/xboxdrv/xboxdrvctl-py3.patch (100%) rename pkgs/{tools/X11/xbrightness/default.nix => unit/xb/xbrightness/pkg-fun.nix} (100%) rename pkgs/{servers/caddy/xcaddy/default.nix => unit/xc/xcaddy/pkg-fun.nix} (100%) rename pkgs/{servers/caddy => unit/xc}/xcaddy/use_tmpdir_on_darwin.diff (100%) rename pkgs/{tools/X11/xcalib/default.nix => unit/xc/xcalib/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xcape/default.nix => unit/xc/xcape/pkg-fun.nix} (100%) rename pkgs/{tools/security/xcat/default.nix => unit/xc/xcat/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xcb-imdkit/default.nix => unit/xc/xcb-imdkit/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xcb-util-cursor => unit/xc/xcb-util-cursor-HEAD}/m4/ax_compare_version.m4 (100%) rename pkgs/{development/libraries/xcb-util-cursor => unit/xc/xcb-util-cursor-HEAD}/m4/xcb_util_common.m4 (100%) rename pkgs/{development/libraries/xcb-util-cursor => unit/xc/xcb-util-cursor-HEAD}/m4/xcb_util_m4_with_include_path.m4 (100%) rename pkgs/{development/libraries/xcb-util-cursor/HEAD.nix => unit/xc/xcb-util-cursor-HEAD/pkg-fun.nix} (100%) rename pkgs/{servers/x11/xorg/xcb-util-xrm.nix => unit/xc/xcbutilxrm/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xcd/default.nix => unit/xc/xcd/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/xcftools/default.nix => unit/xc/xcftools/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/chemistry/xcfun/default.nix => unit/xc/xcfun/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xchainkeys/default.nix => unit/xc/xchainkeys/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xchm/default.nix => unit/xc/xchm/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/xcircuit/default.nix => unit/xc/xcircuit/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xclip/default.nix => unit/xc/xclip/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/xc}/xcode-install/Gemfile (100%) rename pkgs/{development/tools => unit/xc}/xcode-install/Gemfile.lock (100%) rename pkgs/{development/tools => unit/xc}/xcode-install/gemset.nix (100%) rename pkgs/{development/tools/xcode-install/default.nix => unit/xc/xcode-install/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/xcolor/default.nix => unit/xc/xcolor/pkg-fun.nix} (100%) rename pkgs/{games/xcowsay/default.nix => unit/xc/xcowsay/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xcp/default.nix => unit/xc/xcp/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/xcpc/default.nix => unit/xc/xcpc/pkg-fun.nix} (100%) rename pkgs/{development/tools => unit/xc}/xcpretty/Gemfile (100%) rename pkgs/{development/tools => unit/xc}/xcpretty/Gemfile.lock (100%) rename pkgs/{development/tools => unit/xc}/xcpretty/gemset.nix (100%) rename pkgs/{development/tools/xcpretty/default.nix => unit/xc/xcpretty/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xcruiser/default.nix => unit/xc/xcruiser/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/xcur2png/default.nix => unit/xc/xcur2png/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xcwd/default.nix => unit/xc/xcwd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/xd/default.nix => unit/xd/xd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xdaliclock/default.nix => unit/xd/xdaliclock/pkg-fun.nix} (100%) rename pkgs/{tools/compression/xdelta/default.nix => unit/xd/xdelta/pkg-fun.nix} (100%) rename pkgs/{tools/compression/xdelta/unstable.nix => unit/xd/xdeltaUnstable/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xdg-dbus-proxy/default.nix => unit/xd/xdg-dbus-proxy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xdg-desktop-portal-gnome/default.nix => unit/xd/xdg-desktop-portal-gnome/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xdg-desktop-portal-gtk/default.nix => unit/xd/xdg-desktop-portal-gtk/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xdg-desktop-portal-wlr/default.nix => unit/xd/xdg-desktop-portal-wlr/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xdg-launch/default.nix => unit/xd/xdg-launch/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xdg-ninja/default.nix => unit/xd/xdg-ninja/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xdg-user-dirs/default.nix => unit/xd/xdg-user-dirs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xdgmenumaker/default.nix => unit/xd/xdgmenumaker/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xdo/default.nix => unit/xd/xdo/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xdotool/default.nix => unit/xd/xdotool/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xdummy/default.nix => unit/xd/xdummy/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xdxf2slob/default.nix => unit/xd/xdxf2slob/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/xe-guest-utilities/default.nix => unit/xe/xe-guest-utilities/pkg-fun.nix} (100%) rename pkgs/{tools/system/xe/default.nix => unit/xe/xe/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/xearth/default.nix => unit/xe/xearth/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xed/default.nix => unit/xe/xed/pkg-fun.nix} (100%) rename pkgs/{applications/editors/xedit/default.nix => unit/xe/xedit/pkg-fun.nix} (100%) rename pkgs/{applications/science/biology/xenomapper/default.nix => unit/xe/xenomapper/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xercesc/default.nix => unit/xe/xercesc/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/xf86-input-cmt/default.nix => unit/xf/xf86_input_cmt/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/xf86-input-wacom/default.nix => unit/xf/xf86_input_wacom/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/xf86-video-nested/default.nix => unit/xf/xf86_video_nested/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/xfig/default.nix => unit/xf/xfig/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics => unit/xf}/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch (100%) rename pkgs/{applications/science/physics/xfitter/default.nix => unit/xf/xfitter/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xflux/default.nix => unit/xf/xflux/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xfontsel/default.nix => unit/xf/xfontsel/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/xfractint/default.nix => unit/xf/xfractint/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/xfsdump/default.nix => unit/xf/xfsdump/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/xfsprogs/default.nix => unit/xf/xfsprogs/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xfstests/default.nix => unit/xf/xfstests/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xgboost/default.nix => unit/xg/xgboost/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xgeometry-select/default.nix => unit/xg/xgeometry-select/pkg-fun.nix} (100%) rename pkgs/{data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix => unit/xh/xhtml1/pkg-fun.nix} (100%) rename pkgs/{development/tools/xib2nib/default.nix => unit/xi/xib2nib/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xiccd/default.nix => unit/xi/xiccd/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xilinx-bootgen/default.nix => unit/xi/xilinx-bootgen/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xine-lib/default.nix => unit/xi/xine-lib/pkg-fun.nix} (100%) rename pkgs/{applications/video/xine-ui/default.nix => unit/xi/xine-ui/pkg-fun.nix} (100%) rename pkgs/{servers/xinetd/default.nix => unit/xi/xinetd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xinput_calibrator/default.nix => unit/xi/xinput_calibrator/pkg-fun.nix} (100%) rename pkgs/{data/fonts/xits-math/default.nix => unit/xi/xits-math/pkg-fun.nix} (100%) rename pkgs/{games => unit/xi}/xivlauncher/deps.nix (100%) rename pkgs/{games/xivlauncher/default.nix => unit/xi/xivlauncher/pkg-fun.nix} (100%) rename pkgs/{tools/video/xjadeo/default.nix => unit/xj/xjadeo/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xjobs/default.nix => unit/xj/xjobs/pkg-fun.nix} (100%) rename pkgs/{games => unit/xj}/xjump/darwin.patch (100%) rename pkgs/{games/xjump/default.nix => unit/xj/xjump/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xkb-switch-i3/default.nix => unit/xk/xkb-switch-i3/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xkb-switch/default.nix => unit/xk/xkb-switch/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xkbd/default.nix => unit/xk/xkbd/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xkblayout-state/default.nix => unit/xk/xkblayout-state/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xkbmon/default.nix => unit/xk/xkbmon/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xkbset/default.nix => unit/xk/xkbset/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xkbvalidate/default.nix => unit/xk/xkbvalidate/pkg-fun.nix} (100%) rename pkgs/{tools/X11 => unit/xk}/xkbvalidate/xkbvalidate.c (100%) rename pkgs/{data/fonts/xkcd-font/default.nix => unit/xk/xkcd-font/pkg-fun.nix} (100%) rename pkgs/{tools/X11 => unit/xk}/xkeysnail/browser-emacs-bindings.py (100%) rename pkgs/{tools/X11/xkeysnail/default.nix => unit/xk/xkeysnail/pkg-fun.nix} (100%) rename pkgs/{tools/networking/xl2tpd/default.nix => unit/xl/xl2tpd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xlayoutdisplay/default.nix => unit/xl/xlayoutdisplay/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/xlife/default.nix => unit/xl/xlife/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xloadimage/default.nix => unit/xl/xloadimage/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/xlockmore/default.nix => unit/xl/xlockmore/pkg-fun.nix} (100%) rename pkgs/{applications/radio/xlog/default.nix => unit/xl/xlog/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xlogo/default.nix => unit/xl/xlogo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xlslib/default.nix => unit/xl/xlslib/pkg-fun.nix} (100%) rename pkgs/{applications/search/xlsxgrep/default.nix => unit/xl/xlsxgrep/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xmacro/default.nix => unit/xm/xmacro/pkg-fun.nix} (100%) rename pkgs/{games/xmage/default.nix => unit/xm/xmage/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xmagnify/default.nix => unit/xm/xmagnify/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xmcp/default.nix => unit/xm/xmcp/pkg-fun.nix} (100%) rename pkgs/{applications/science/medicine/xmedcon/default.nix => unit/xm/xmedcon/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xmenu/default.nix => unit/xm/xmenu/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/xm}/xmind/java-env-config-fixes.patch (100%) rename pkgs/{applications/misc/xmind/default.nix => unit/xm/xmind/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xml-security-c/default.nix => unit/xm/xml-security-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xml-tooling-c/default.nix => unit/xm/xml-tooling-c/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml/xml2/default.nix => unit/xm/xml2/pkg-fun.nix} (100%) rename pkgs/{development/libraries/ada/xmlada/default.nix => unit/xm/xmlada/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xmlbeans/default.nix => unit/xm/xmlbeans/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml/xmlformat/default.nix => unit/xm/xmlformat/pkg-fun.nix} (100%) rename pkgs/{development/web/xmlindent/default.nix => unit/xm/xmlindent/pkg-fun.nix} (100%) rename pkgs/{tools/text/xml/xmloscopy/default.nix => unit/xm/xmloscopy/pkg-fun.nix} (100%) rename pkgs/{tools/typesetting/xmlroff/default.nix => unit/xm/xmlroff/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xmlrpc-c/default.nix => unit/xm/xmlrpc_c/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/xm}/xmlsec/lt_dladdsearchdir.patch (100%) rename pkgs/{development/libraries/xmlsec/default.nix => unit/xm/xmlsec/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/xm}/xmlsec/remove_bsd_base64_decode_flag.patch (100%) rename pkgs/{tools/text/xml/xmlstarlet/default.nix => unit/xm/xmlstarlet/pkg-fun.nix} (100%) rename pkgs/{tools/misc => unit/xm}/xmonad-log/deps.nix (100%) rename pkgs/{tools/misc/xmonad-log/default.nix => unit/xm/xmonad-log/pkg-fun.nix} (100%) rename pkgs/{games/xmoto/default.nix => unit/xm/xmoto/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/xmountains/default.nix => unit/xm/xmountains/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xmousepasteblock/default.nix => unit/xm/xmousepasteblock/pkg-fun.nix} (100%) rename pkgs/{applications/audio/xmp/default.nix => unit/xm/xmp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/xmppc/default.nix => unit/xm/xmppc/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xmr-stak/default.nix => unit/xm/xmr-stak/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xmrig/moneroocean.nix => unit/xm/xmrig-mo/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xmrig/proxy.nix => unit/xm/xmrig-proxy/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/xm}/xmrig/donate-level.patch (100%) rename pkgs/{applications/misc/xmrig/default.nix => unit/xm/xmrig/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/xn}/xnbd/0001-Fix-build-for-glibc-2.28.patch (100%) rename pkgs/{tools/networking/xnbd/default.nix => unit/xn/xnbd/pkg-fun.nix} (100%) rename pkgs/{applications/science/physics/xnec2c/default.nix => unit/xn/xnec2c/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xnee/default.nix => unit/xn/xnee/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xneur/default.nix => unit/xn/xneur/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xnotify/default.nix => unit/xn/xnotify/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xob/default.nix => unit/xo/xob/pkg-fun.nix} (100%) rename pkgs/{shells/xonsh/default.nix => unit/xo/xonsh/pkg-fun.nix} (100%) rename pkgs/{tools/security/xorex/default.nix => unit/xo/xorex/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/xorg-autoconf/default.nix => unit/xo/xorg-autoconf/pkg-fun.nix} (100%) rename pkgs/{data/misc/xorg-rgb/default.nix => unit/xo/xorg-rgb/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/opengl/xorg-sys => unit/xo/xorg_sys_opengl}/builder.sh (100%) rename pkgs/{os-specific/linux/opengl/xorg-sys/default.nix => unit/xo/xorg_sys_opengl/pkg-fun.nix} (100%) rename pkgs/{tools/cd-dvd/xorriso/default.nix => unit/xo/xorriso/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/xoscope/default.nix => unit/xo/xoscope/pkg-fun.nix} (100%) rename pkgs/{misc/xosd/default.nix => unit/xo/xosd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xosview/default.nix => unit/xo/xosview/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xosview2/default.nix => unit/xo/xosview2/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/xow_dongle-firmware/default.nix => unit/xo/xow_dongle-firmware/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xpad/default.nix => unit/xp/xpad/pkg-fun.nix} (100%) rename pkgs/{tools/text/xpaste/default.nix => unit/xp/xpaste/pkg-fun.nix} (100%) rename pkgs/{games/xpilot/default.nix => unit/xp/xpilot-ng/pkg-fun.nix} (100%) rename pkgs/{applications/science/astronomy/xplanet/default.nix => unit/xp/xplanet/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xplr/default.nix => unit/xp/xplr/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xplugd/default.nix => unit/xp/xplugd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xpointerbarrier/default.nix => unit/xp/xpointerbarrier/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xprintidle-ng/default.nix => unit/xp/xprintidle-ng/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xprintidle/default.nix => unit/xp/xprintidle/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xprompt/default.nix => unit/xp/xprompt/pkg-fun.nix} (100%) rename pkgs/{development/mobile/xpwn/default.nix => unit/xp/xpwn/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xq/default.nix => unit/xq/xq/pkg-fun.nix} (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/X11 (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/font_cache (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/org.nixos.xquartz.privileged_startx.plist (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/org.nixos.xquartz.startx.plist (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/patch_plist.rb (100%) rename pkgs/{servers/x11/xquartz/default.nix => unit/xq/xquartz/pkg-fun.nix} (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/privileged (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/startx (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/system-fonts.nix (100%) rename pkgs/{servers/x11 => unit/xq}/xquartz/xinitrc (100%) rename pkgs/{applications/misc/xrandr-invert-colors/default.nix => unit/xr/xrandr-invert-colors/pkg-fun.nix} (100%) rename pkgs/{tools/networking/xray/default.nix => unit/xr/xray/pkg-fun.nix} (100%) rename pkgs/{applications/networking/remote => unit/xr}/xrdp/dynamic_config.patch (100%) rename pkgs/{applications/networking/remote/xrdp/default.nix => unit/xr/xrdp/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xrectsel/default.nix => unit/xr/xrectsel/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xrestop/default.nix => unit/xr/xrestop/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/xrgears/default.nix => unit/xr/xrgears/pkg-fun.nix} (100%) rename pkgs/{tools/networking/xrootd/default.nix => unit/xr/xrootd/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/xr}/xrootd/test-runner.nix (100%) rename pkgs/{applications/misc/xrq/default.nix => unit/xr/xrq/pkg-fun.nix} (100%) rename pkgs/{applications/video/xscast/default.nix => unit/xs/xscast/pkg-fun.nix} (100%) rename pkgs/{applications/science/electronics/xschem/default.nix => unit/xs/xschem/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xscope/default.nix => unit/xs/xscope/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/xscreensaver/default.nix => unit/xs/xscreensaver/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xsecurelock/default.nix => unit/xs/xsecurelock/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xsel/default.nix => unit/xs/xsel/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/xsensors/default.nix => unit/xs/xsensors/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux => unit/xs}/xsensors/remove-unused-variables.patch (100%) rename pkgs/{os-specific/linux => unit/xs}/xsensors/replace-deprecated-gtk.patch (100%) rename pkgs/{tools/X11/xsettingsd/default.nix => unit/xs/xsettingsd/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xsimd/default.nix => unit/xs/xsimd/pkg-fun.nix} (100%) rename pkgs/{games/xskat/default.nix => unit/xs/xskat/pkg-fun.nix} (100%) rename pkgs/{games/xsnow/default.nix => unit/xs/xsnow/pkg-fun.nix} (100%) rename pkgs/{games/xsok/default.nix => unit/xs/xsok/pkg-fun.nix} (100%) rename pkgs/{games/xsokoban/default.nix => unit/xs/xsokoban/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/xsos/default.nix => unit/xs/xsos/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/xspim/default.nix => unit/xs/xspim/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/xss-lock/default.nix => unit/xs/xss-lock/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/xssproxy/default.nix => unit/xs/xssproxy/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/st/xst.nix => unit/xs/xst/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xstow/default.nix => unit/xs/xstow/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xsuspender/default.nix => unit/xs/xsuspender/pkg-fun.nix} (100%) rename pkgs/{applications/audio/xsynth-dssi/default.nix => unit/xs/xsynth_dssi/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xteddy/default.nix => unit/xt/xteddy/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xtensor/default.nix => unit/xt/xtensor/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/xterm/default.nix => unit/xt/xterm/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators => unit/xt}/xterm/sixel-256.support.patch (100%) rename pkgs/{applications/terminal-emulators/xtermcontrol/default.nix => unit/xt/xtermcontrol/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xtitle/default.nix => unit/xt/xtitle/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xtl/default.nix => unit/xt/xtl/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xtrace/default.nix => unit/xt/xtrace/pkg-fun.nix} (100%) rename pkgs/{games/xtris/default.nix => unit/xt/xtris/pkg-fun.nix} (100%) rename pkgs/{misc/screensavers/xtrlock-pam/default.nix => unit/xt/xtrlock-pam/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/xtrt/default.nix => unit/xt/xtrt/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xtruss/default.nix => unit/xt/xtruss/pkg-fun.nix} (100%) rename pkgs/{applications/audio/xtuner/default.nix => unit/xt/xtuner/pkg-fun.nix} (100%) rename pkgs/{tools/text/xurls/default.nix => unit/xu/xurls/pkg-fun.nix} (100%) rename pkgs/{tools/virtualization/xva-img/default.nix => unit/xv/xva-img/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xvidcore/default.nix => unit/xv/xvidcore/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xvkbd/default.nix => unit/xv/xvkbd/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xwallpaper/default.nix => unit/xw/xwallpaper/pkg-fun.nix} (100%) rename pkgs/{servers/x11/xorg/xwayland.nix => unit/xw/xwayland/pkg-fun.nix} (100%) rename pkgs/{misc/drivers/xwiimote/default.nix => unit/xw/xwiimote/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xwinmosaic/default.nix => unit/xw/xwinmosaic/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xwinwrap/default.nix => unit/xw/xwinwrap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xxHash/default.nix => unit/xx/xxHash/pkg-fun.nix} (100%) rename pkgs/{applications/editors/xxe-pe/default.nix => unit/xx/xxe-pe/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/xxgdb/default.nix => unit/xx/xxgdb/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc => unit/xx}/xxgdb/xxgdb-pty.patch (100%) rename pkgs/{tools/networking/xxh/default.nix => unit/xx/xxh/pkg-fun.nix} (100%) rename pkgs/{applications/misc/xxkb/default.nix => unit/xx/xxkb/pkg-fun.nix} (100%) rename pkgs/{tools/misc/xxv/default.nix => unit/xx/xxv/pkg-fun.nix} (100%) rename pkgs/{development/libraries/xylib/default.nix => unit/xy/xylib/pkg-fun.nix} (100%) rename pkgs/{tools/compression/xz/default.nix => unit/xz/xz/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/xzgv/default.nix => unit/xz/xzgv/pkg-fun.nix} (100%) rename pkgs/{tools/X11/xzoom/default.nix => unit/xz/xzoom/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/yabasic/default.nix => unit/ya/yabasic/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yad/default.nix => unit/ya/yad/pkg-fun.nix} (100%) rename pkgs/{applications/version-management/yadm/default.nix => unit/ya/yadm/pkg-fun.nix} (100%) rename pkgs/{applications/terminal-emulators/yaft/default.nix => unit/ya/yaft/pkg-fun.nix} (100%) rename pkgs/{development/libraries/yajl/default.nix => unit/ya/yajl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yajsv/default.nix => unit/ya/yajsv/pkg-fun.nix} (100%) rename pkgs/{development/tools/analysis/yallback/default.nix => unit/ya/yallback/pkg-fun.nix} (100%) rename pkgs/{applications/misc/yambar/default.nix => unit/ya/yambar/pkg-fun.nix} (100%) rename pkgs/{tools/video/yamdi/default.nix => unit/ya/yamdi/pkg-fun.nix} (100%) rename pkgs/{tools/text/yaml-merge/default.nix => unit/ya/yaml-merge/pkg-fun.nix} (100%) rename pkgs/{development/tools/yaml2json/default.nix => unit/ya/yaml2json/pkg-fun.nix} (100%) rename pkgs/{development/tools/yamlpath/default.nix => unit/ya/yamlpath/pkg-fun.nix} (100%) rename pkgs/{applications/audio/yams/default.nix => unit/ya/yams/pkg-fun.nix} (100%) rename pkgs/{applications/networking/browsers/yandex-browser/default.nix => unit/ya/yandex-browser/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/yandex-disk/default.nix => unit/ya/yandex-disk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yank/default.nix => unit/ya/yank/pkg-fun.nix} (100%) rename pkgs/{data/fonts/yanone-kaffeesatz/default.nix => unit/ya/yanone-kaffeesatz/pkg-fun.nix} (100%) rename pkgs/{development/compilers/yap/default.nix => unit/ya/yap/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/yapesdl/default.nix => unit/ya/yapesdl/pkg-fun.nix} (100%) rename pkgs/{tools/security/yarGen/default.nix => unit/ya/yarGen/pkg-fun.nix} (100%) rename pkgs/{tools/security/yara/default.nix => unit/ya/yara/pkg-fun.nix} (100%) rename pkgs/{shells/bash/yarn-completion/default.nix => unit/ya/yarn-bash-completion/pkg-fun.nix} (100%) rename pkgs/{development/tools/yarn/default.nix => unit/ya/yarn/pkg-fun.nix} (100%) rename pkgs/{applications/science/robotics/yarp/default.nix => unit/ya/yarp/pkg-fun.nix} (100%) rename pkgs/{applications/networking/feedreaders/yarr/default.nix => unit/ya/yarr/pkg-fun.nix} (100%) rename pkgs/{data/themes/yaru-remix/default.nix => unit/ya/yaru-remix-theme/pkg-fun.nix} (100%) rename pkgs/{data/themes/yaru/default.nix => unit/ya/yaru-theme/pkg-fun.nix} (100%) rename pkgs/{development/libraries/yascreen/default.nix => unit/ya/yascreen/pkg-fun.nix} (100%) rename pkgs/{shells/yash/default.nix => unit/ya/yash/pkg-fun.nix} (100%) rename pkgs/{development/compilers/yasm/default.nix => unit/ya/yasm/pkg-fun.nix} (100%) rename pkgs/{applications/audio => unit/ya}/yasr/10_fix_openpty_forkpty_declarations.patch (100%) rename pkgs/{applications/audio => unit/ya}/yasr/20_maxpathlen.patch (100%) rename pkgs/{applications/audio => unit/ya}/yasr/30_conf.patch (100%) rename pkgs/{applications/audio => unit/ya}/yasr/40_dectalk_extended_chars.patch (100%) rename pkgs/{applications/audio/yasr/default.nix => unit/ya/yasr/pkg-fun.nix} (100%) rename pkgs/{applications/misc/yate/default.nix => unit/ya/yate/pkg-fun.nix} (100%) rename pkgs/{applications/networking/yaup/default.nix => unit/ya/yaup/pkg-fun.nix} (100%) rename pkgs/{servers/http/yaws/default.nix => unit/ya/yaws/pkg-fun.nix} (100%) rename pkgs/{tools/graphics/yaxg/default.nix => unit/ya/yaxg/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/yd}/yder/fix-pkgconfig.patch (100%) rename pkgs/{development/libraries/yder/default.nix => unit/yd/yder/pkg-fun.nix} (100%) rename pkgs/{applications/misc/ydict/default.nix => unit/yd/ydict/pkg-fun.nix} (100%) rename pkgs/{tools/wayland/ydotool/default.nix => unit/yd/ydotool/pkg-fun.nix} (100%) rename pkgs/{applications/window-managers/yeahwm/default.nix => unit/ye/yeahwm/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/yed/default.nix => unit/ye/yed/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/yeetgif/default.nix => unit/ye/yeetgif/pkg-fun.nix} (100%) rename pkgs/{development/misc/yelp-tools/default.nix => unit/ye/yelp-tools/pkg-fun.nix} (100%) rename pkgs/{tools/security/yersinia/default.nix => unit/ye/yersinia/pkg-fun.nix} (100%) rename pkgs/{tools/system/yeshup/default.nix => unit/ye/yeshup/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/yex-lang/default.nix => unit/ye/yex-lang/pkg-fun.nix} (100%) rename pkgs/{tools/networking => unit/yg}/yggdrasil/change-runtime-dir.patch (100%) rename pkgs/{tools/networking/yggdrasil/default.nix => unit/yg/yggdrasil/pkg-fun.nix} (100%) rename pkgs/{development/tools/yj/default.nix => unit/yj/yj/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yle-dl/default.nix => unit/yl/yle-dl/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ympd/default.nix => unit/ym/ympd/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ymuse/default.nix => unit/ym/ymuse/pkg-fun.nix} (100%) rename pkgs/{development/tools/misc/yodl/default.nix => unit/yo/yodl/pkg-fun.nix} (100%) rename pkgs/{development/libraries/yojimbo/default.nix => unit/yo/yojimbo/pkg-fun.nix} (100%) rename pkgs/{applications/audio/yoshimi/default.nix => unit/yo/yoshimi/pkg-fun.nix} (100%) rename pkgs/{development/compilers/yosys/plugins/bluespec.nix => unit/yo/yosys-bluespec/pkg-fun.nix} (100%) rename pkgs/{development/compilers/yosys/plugins/ghdl.nix => unit/yo/yosys-ghdl/pkg-fun.nix} (100%) rename pkgs/{development/compilers/yosys/plugins/symbiflow.nix => unit/yo/yosys-symbiflow/pkg-fun.nix} (100%) rename pkgs/{development/compilers/yosys/plugins => unit/yo/yosys-symbiflow}/symbiflow-pmgen.patch (100%) rename pkgs/{development/compilers => unit/yo}/yosys/fix-clang-build.patch (100%) rename pkgs/{development/compilers/yosys/default.nix => unit/yo/yosys/pkg-fun.nix} (100%) rename pkgs/{development/compilers => unit/yo}/yosys/plugin-search-dirs.patch (100%) rename pkgs/{development/compilers => unit/yo}/yosys/setup-hook.sh (100%) rename pkgs/{tools/misc => unit/yo}/you-get/ffmpeg-path.patch (100%) rename pkgs/{tools/misc/you-get/default.nix => unit/yo/you-get/pkg-fun.nix} (100%) rename pkgs/{applications/virtualization/youki/default.nix => unit/yo/youki/pkg-fun.nix} (100%) rename pkgs/{servers/jetbrains/youtrack.nix => unit/yo/youtrack/pkg-fun.nix} (100%) rename pkgs/{applications/audio/youtube-music/default.nix => unit/yo/youtube-music/pkg-fun.nix} (100%) rename pkgs/{development/tools/yq-go/default.nix => unit/yq/yq-go/pkg-fun.nix} (100%) rename pkgs/{tools/networking/yrd/default.nix => unit/yr/yrd/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/ytalk/default.nix => unit/yt/ytalk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ytarchive/default.nix => unit/yt/ytarchive/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ytcast/default.nix => unit/yt/ytcast/pkg-fun.nix} (100%) rename pkgs/{tools/networking/ytcc/default.nix => unit/yt/ytcc/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ytfzf/default.nix => unit/yt/ytfzf/pkg-fun.nix} (100%) rename pkgs/{applications/audio/ytmdesktop/default.nix => unit/yt/ytmdesktop/pkg-fun.nix} (100%) rename pkgs/{tools/misc/ytmdl/default.nix => unit/yt/ytmdl/pkg-fun.nix} (100%) rename pkgs/{applications/file-managers/ytree/default.nix => unit/yt/ytree/pkg-fun.nix} (100%) rename pkgs/{development/tools/ytt/default.nix => unit/yt/ytt/pkg-fun.nix} (100%) rename pkgs/{development/libraries/yubico-pam/default.nix => unit/yu/yubico-pam/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/yu}/yubihsm-connector/lockfile-fix.patch (100%) rename pkgs/{tools/security/yubihsm-connector/default.nix => unit/yu/yubihsm-connector/pkg-fun.nix} (100%) rename pkgs/{tools/security/yubihsm-shell/default.nix => unit/yu/yubihsm-shell/pkg-fun.nix} (100%) rename pkgs/{tools/security/yubikey-agent/default.nix => unit/yu/yubikey-agent/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yubikey-manager/default.nix => unit/yu/yubikey-manager/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yubikey-manager/4.nix => unit/yu/yubikey-manager4/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yubikey-manager => unit/yu/yubikey-manager4}/remove-pyopenssl-tests.patch (100%) rename pkgs/{tools/misc/yubikey-personalization/default.nix => unit/yu/yubikey-personalization/pkg-fun.nix} (100%) rename pkgs/{tools/security/yubikey-touch-detector/default.nix => unit/yu/yubikey-touch-detector/pkg-fun.nix} (100%) rename pkgs/{applications/misc => unit/yu}/yubioath-flutter/helper.nix (100%) rename pkgs/{applications/misc/yubioath-flutter/default.nix => unit/yu/yubioath-flutter/pkg-fun.nix} (100%) rename pkgs/{development/tools/yuicompressor/default.nix => unit/yu/yuicompressor/pkg-fun.nix} (100%) rename pkgs/{tools/misc/yutto/default.nix => unit/yu/yutto/pkg-fun.nix} (100%) rename pkgs/{tools/misc/z-lua/default.nix => unit/z-/z-lua/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/z3/tptp.nix => unit/z3/z3-tptp/pkg-fun.nix} (100%) rename pkgs/{development/compilers/z88dk/default.nix => unit/z8/z88dk/pkg-fun.nix} (100%) rename pkgs/{tools/misc/zabbix-cli/default.nix => unit/za/zabbix-cli/pkg-fun.nix} (100%) rename pkgs/{tools/misc/zabbixctl/default.nix => unit/za/zabbixctl/pkg-fun.nix} (100%) rename pkgs/{tools/misc/zalgo/default.nix => unit/za/zalgo/pkg-fun.nix} (100%) rename pkgs/{applications/audio/zam-plugins/default.nix => unit/za/zam-plugins/pkg-fun.nix} (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/0001-nulldb.patch (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/gemset.nix (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/package.json (100%) rename pkgs/{applications/networking/misc/zammad/default.nix => unit/za/zammad/pkg-fun.nix} (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/source.json (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/update.nix (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/update.sh (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/yarn.lock (100%) rename pkgs/{applications/networking/misc => unit/za}/zammad/yarn.nix (100%) rename pkgs/{tools/networking/zap/default.nix => unit/za/zap/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/zarchive/default.nix => unit/za/zarchive/pkg-fun.nix} (100%) rename pkgs/{development/compilers/zasm/default.nix => unit/za/zasm/pkg-fun.nix} (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/cb/default.nix (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/core/default.nix (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/djvu/default.nix (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/pdf-mupdf/default.nix (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/pdf-poppler/default.nix (100%) rename pkgs/{applications/misc/zathura/default.nix => unit/za/zathuraPkgs/pkg-fun.nix} (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/ps/default.nix (100%) rename pkgs/{applications/misc/zathura => unit/za/zathuraPkgs}/wrapper.nix (100%) rename pkgs/{games/zaz/default.nix => unit/za/zaz/pkg-fun.nix} (100%) rename pkgs/{tools/backup/zbackup/default.nix => unit/zb/zbackup/pkg-fun.nix} (100%) rename pkgs/{tools/backup => unit/zb}/zbackup/protobuf-api-change.patch (100%) rename pkgs/{tools/admin/zbctl/default.nix => unit/zb/zbctl/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic/zchaff/default.nix => unit/zc/zchaff/pkg-fun.nix} (100%) rename pkgs/{applications/science/logic => unit/zc}/zchaff/sat_solver.patch (100%) rename pkgs/{development/libraries => unit/zc}/zchunk/0001-meson-fix-argp-standalone.patch (100%) rename pkgs/{development/libraries/zchunk/default.nix => unit/zc/zchunk/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/firmware/zd1211/default.nix => unit/zd/zd1211fw/pkg-fun.nix} (100%) rename pkgs/{games/zdoom/zdbsp.nix => unit/zd/zdbsp/pkg-fun.nix} (100%) rename pkgs/{tools/compression/zdelta/default.nix => unit/zd/zdelta/pkg-fun.nix} (100%) rename pkgs/{tools/security/zdns/default.nix => unit/zd/zdns/pkg-fun.nix} (100%) rename pkgs/{games/zdoom/default.nix => unit/zd/zdoom/pkg-fun.nix} (100%) rename pkgs/{applications/blockchains/zecwallet-lite/default.nix => unit/ze/zecwallet-lite/pkg-fun.nix} (100%) rename pkgs/{development/tools/zed/default.nix => unit/ze/zed/pkg-fun.nix} (100%) rename pkgs/{applications/networking/ids/zeek/default.nix => unit/ze/zeek/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/rakudo/zef.nix => unit/ze/zef/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zeitgeist/default.nix => unit/ze/zeitgeist/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/zenmonitor/default.nix => unit/ze/zenmonitor/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/zenstates/default.nix => unit/ze/zenstates/pkg-fun.nix} (100%) rename pkgs/{applications/networking/zerobin/default.nix => unit/ze/zerobin/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zeroc-ice/default.nix => unit/ze/zeroc-ice/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/zerofree/default.nix => unit/ze/zerofree/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zeromq/4.x.nix => unit/ze/zeromq4/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/zeronet-conservancy/default.nix => unit/ze/zeronet-conservancy/pkg-fun.nix} (100%) rename pkgs/{applications/networking/p2p/zeronet/default.nix => unit/ze/zeronet/pkg-fun.nix} (100%) rename pkgs/{tools/networking/zerotierone/default.nix => unit/ze/zerotierone/pkg-fun.nix} (100%) rename pkgs/{applications/emulators/zesarux/default.nix => unit/ze/zesarux/pkg-fun.nix} (100%) rename pkgs/{tools/compression/zfp/default.nix => unit/zf/zfp/pkg-fun.nix} (100%) rename pkgs/{tools/backup/zfs-autobackup/default.nix => unit/zf/zfs-autobackup/pkg-fun.nix} (100%) rename pkgs/{tools/backup/zfs-prune-snapshots/default.nix => unit/zf/zfs-prune-snapshots/pkg-fun.nix} (100%) rename pkgs/{tools/backup/zfsbackup/default.nix => unit/zf/zfsbackup/pkg-fun.nix} (100%) rename pkgs/{tools/backup/zfsnap/default.nix => unit/zf/zfsnap/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/zfstools/default.nix => unit/zf/zfstools/pkg-fun.nix} (100%) rename pkgs/{tools/security/zgrab2/default.nix => unit/zg/zgrab2/pkg-fun.nix} (100%) rename pkgs/{applications/graphics/zgrviewer/default.nix => unit/zg/zgrviewer/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zi/default.nix => unit/zi/zi/pkg-fun.nix} (100%) rename pkgs/{servers/zigbee2mqtt/default.nix => unit/zi/zigbee2mqtt/pkg-fun.nix} (100%) rename pkgs/{applications/editors/zile/default.nix => unit/zi/zile/pkg-fun.nix} (100%) rename pkgs/{data/fonts/zilla-slab/default.nix => unit/zi/zilla-slab/pkg-fun.nix} (100%) rename pkgs/{tools/text/zim-tools/default.nix => unit/zi/zim-tools/pkg-fun.nix} (100%) rename pkgs/{applications/office/zim/default.nix => unit/zi/zim/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zimfw/default.nix => unit/zi/zimfw/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zimg/default.nix => unit/zi/zimg/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zimlib/default.nix => unit/zi/zimlib/pkg-fun.nix} (100%) rename pkgs/{servers/search/zinc/default.nix => unit/zi/zinc/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zinit/default.nix => unit/zi/zinit/pkg-fun.nix} (100%) rename pkgs/{tools/inputmethods/zinnia/default.nix => unit/zi/zinnia/pkg-fun.nix} (100%) rename pkgs/{tools/archivers => unit/zi}/zip/natspec-gentoo.patch.bz2 (100%) rename pkgs/{tools/archivers/zip/default.nix => unit/zi/zip/pkg-fun.nix} (100%) rename pkgs/{servers/monitoring/zipkin/default.nix => unit/zi/zipkin/pkg-fun.nix} (100%) rename pkgs/{applications/audio/zita-ajbridge/default.nix => unit/zi/zita-ajbridge/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/zita-alsa-pcmi/default.nix => unit/zi/zita-alsa-pcmi/pkg-fun.nix} (100%) rename pkgs/{applications/audio/zita-at1/default.nix => unit/zi/zita-at1/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/zita-convolver/default.nix => unit/zi/zita-convolver/pkg-fun.nix} (100%) rename pkgs/{applications/audio/zita-njbridge/default.nix => unit/zi/zita-njbridge/pkg-fun.nix} (100%) rename pkgs/{development/libraries/audio/zita-resampler/default.nix => unit/zi/zita-resampler/pkg-fun.nix} (100%) rename pkgs/{applications/misc/zk-shell/default.nix => unit/zk/zk-shell/pkg-fun.nix} (100%) rename pkgs/{applications/office/zk/default.nix => unit/zk/zk/pkg-fun.nix} (100%) rename pkgs/{tools/security/zkar/default.nix => unit/zk/zkar/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/zkfuse/default.nix => unit/zk/zkfuse/pkg-fun.nix} (100%) rename pkgs/{applications/misc/zktree/default.nix => unit/zk/zktree/pkg-fun.nix} (100%) rename pkgs/{development/tools/zld/default.nix => unit/zl/zld/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zlib-ng/default.nix => unit/zl/zlib-ng/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zlib/default.nix => unit/zl/zlib/pkg-fun.nix} (100%) rename pkgs/{tools/security/zlint/default.nix => unit/zl/zlint/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zlog/default.nix => unit/zl/zlog/pkg-fun.nix} (100%) rename pkgs/{development/tools/zls/default.nix => unit/zl/zls/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/zm}/zmap/cmake-json-0.14-fix.patch (100%) rename pkgs/{tools/security/zmap/default.nix => unit/zm/zmap/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zmqpp/default.nix => unit/zm/zmqpp/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zmusic/default.nix => unit/zm/zmusic/pkg-fun.nix} (100%) rename pkgs/{development/libraries/science/math/zn_poly/default.nix => unit/zn/zn_poly/pkg-fun.nix} (100%) rename pkgs/{tools/backup/znapzend/default.nix => unit/zn/znapzend/pkg-fun.nix} (100%) rename pkgs/{applications/networking/znc/default.nix => unit/zn/znc/pkg-fun.nix} (100%) rename pkgs/{games => unit/zo}/zod/0002-add-scaling-factor-to-source.patch (100%) rename pkgs/{games/zod/default.nix => unit/zo/zod/pkg-fun.nix} (100%) rename pkgs/{tools/text/zoekt/default.nix => unit/zo/zoekt/pkg-fun.nix} (100%) rename pkgs/{servers => unit/zo}/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch (100%) rename pkgs/{servers => unit/zo}/zoneminder/default-to-http-1dot1.patch (100%) rename pkgs/{servers/zoneminder/default.nix => unit/zo/zoneminder/pkg-fun.nix} (100%) rename pkgs/{servers/zookeeper/default.nix => unit/zo/zookeeper/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/zoom-us/default.nix => unit/zo/zoom-us/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/zo}/zoom-us/update.sh (100%) rename pkgs/{games/zoom/default.nix => unit/zo/zoom/pkg-fun.nix} (100%) rename pkgs/{tools/compression/zopfli/default.nix => unit/zo/zopfli/pkg-fun.nix} (100%) rename pkgs/{applications/office/zotero/default.nix => unit/zo/zotero/pkg-fun.nix} (100%) rename pkgs/{applications/office => unit/zo}/zotero/zotero.sh (100%) rename pkgs/{tools/misc/zoxide/default.nix => unit/zo/zoxide/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/zpaq/default.nix => unit/zp/zpaq/pkg-fun.nix} (100%) rename pkgs/{tools/archivers/zpaq/zpaqd.nix => unit/zp/zpaqd/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zplug/default.nix => unit/zp/zplug/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/zpool-auto-expand-partitions/default.nix => unit/zp/zpool-auto-expand-partitions/pkg-fun.nix} (100%) rename pkgs/{tools/filesystems/zpool-iostat-viz/default.nix => unit/zp/zpool-iostat-viz/pkg-fun.nix} (100%) rename pkgs/{development/tools/zprint/default.nix => unit/zp/zprint/pkg-fun.nix} (100%) rename pkgs/{development/tools/zq/default.nix => unit/zq/zq/pkg-fun.nix} (100%) rename pkgs/{tools/backup/zrepl/default.nix => unit/zr/zrepl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/zs-apc-spdu-ctl/default.nix => unit/zs/zs-apc-spdu-ctl/pkg-fun.nix} (100%) rename pkgs/{tools/networking/zs-wait4host/default.nix => unit/zs/zs-wait4host/pkg-fun.nix} (100%) rename pkgs/{os-specific/linux/zsa-udev-rules/default.nix => unit/zs/zsa-udev-rules/pkg-fun.nix} (100%) rename pkgs/{applications/misc/zscroll/default.nix => unit/zs/zscroll/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-autocomplete/default.nix => unit/zs/zsh-autocomplete/pkg-fun.nix} (100%) rename pkgs/{tools/misc/zsh-autoenv/default.nix => unit/zs/zsh-autoenv/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-autopair/default.nix => unit/zs/zsh-autopair/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-autosuggestions/default.nix => unit/zs/zsh-autosuggestions/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-bd/default.nix => unit/zs/zsh-bd/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-better-npm-completion/default.nix => unit/zs/zsh-better-npm-completion/pkg-fun.nix} (100%) rename pkgs/{shells/zsh => unit/zs}/zsh-clipboard/clipboard.plugin.zsh (100%) rename pkgs/{shells/zsh/zsh-clipboard/default.nix => unit/zs/zsh-clipboard/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-command-time/default.nix => unit/zs/zsh-command-time/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-completions/default.nix => unit/zs/zsh-completions/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-edit/default.nix => unit/zs/zsh-edit/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-fast-syntax-highlighting/default.nix => unit/zs/zsh-fast-syntax-highlighting/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-forgit/default.nix => unit/zs/zsh-forgit/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-fzf-tab/default.nix => unit/zs/zsh-fzf-tab/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-git-prompt/default.nix => unit/zs/zsh-git-prompt/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-history-search-multi-word/default.nix => unit/zs/zsh-history-search-multi-word/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-history-substring-search/default.nix => unit/zs/zsh-history-substring-search/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-history/default.nix => unit/zs/zsh-history/pkg-fun.nix} (100%) rename pkgs/{tools/misc/zsh-navigation-tools/default.nix => unit/zs/zsh-navigation-tools/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-nix-shell/default.nix => unit/zs/zsh-nix-shell/pkg-fun.nix} (100%) rename pkgs/{shells/zsh => unit/zs}/zsh-powerlevel10k/gitstatusd.patch (100%) rename pkgs/{shells/zsh/zsh-powerlevel10k/default.nix => unit/zs/zsh-powerlevel10k/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-powerlevel9k/default.nix => unit/zs/zsh-powerlevel9k/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-prezto/default.nix => unit/zs/zsh-prezto/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-syntax-highlighting/default.nix => unit/zs/zsh-syntax-highlighting/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-system-clipboard/default.nix => unit/zs/zsh-system-clipboard/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-vi-mode/default.nix => unit/zs/zsh-vi-mode/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-you-should-use/default.nix => unit/zs/zsh-you-should-use/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/zsh-z/default.nix => unit/zs/zsh-z/pkg-fun.nix} (100%) rename pkgs/{shells/zsh/default.nix => unit/zs/zsh/pkg-fun.nix} (100%) rename pkgs/{shells => unit/zs}/zsh/tz_completion.patch (100%) rename pkgs/{tools/networking/zssh/default.nix => unit/zs/zssh/pkg-fun.nix} (100%) rename pkgs/{tools/security => unit/zs}/zsteg/Gemfile (100%) rename pkgs/{tools/security => unit/zs}/zsteg/Gemfile.lock (100%) rename pkgs/{tools/security => unit/zs}/zsteg/gemset.nix (100%) rename pkgs/{tools/security/zsteg/default.nix => unit/zs/zsteg/pkg-fun.nix} (100%) rename pkgs/{tools/text/zstxtns-utils/default.nix => unit/zs/zstxtns-utils/pkg-fun.nix} (100%) rename pkgs/{development/tools/zsv/default.nix => unit/zs/zsv/pkg-fun.nix} (100%) rename pkgs/{tools/compression/zsync/default.nix => unit/zs/zsync/pkg-fun.nix} (100%) rename pkgs/{tools/misc/zthrottle/default.nix => unit/zt/zthrottle/pkg-fun.nix} (100%) rename pkgs/{data/themes/zuki/default.nix => unit/zu/zuki-themes/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers/zulip-term/default.nix => unit/zu/zulip-term/pkg-fun.nix} (100%) rename pkgs/{applications/networking/instant-messengers => unit/zu}/zulip-term/pytest-executable-name.patch (100%) rename pkgs/{development/compilers/zulu/default.nix => unit/zu/zulu/pkg-fun.nix} (100%) rename pkgs/{development/compilers/zulu/8.nix => unit/zu/zulu8/pkg-fun.nix} (100%) rename pkgs/{development/interpreters/zuo/default.nix => unit/zu/zuo/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zxcvbn-c/default.nix => unit/zx/zxcvbn-c/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zxing-cpp/default.nix => unit/zx/zxing-cpp/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/zx}/zxing/java-zxing.sh (100%) rename pkgs/{tools/graphics/zxing/default.nix => unit/zx/zxing/pkg-fun.nix} (100%) rename pkgs/{tools/graphics => unit/zx}/zxing/zxing-cmdline-encoder.sh (100%) rename pkgs/{tools/graphics => unit/zx}/zxing/zxing-cmdline-runner.sh (100%) rename pkgs/{tools/graphics => unit/zx}/zxing/zxing.sh (100%) rename pkgs/{development/libraries/zydis/default.nix => unit/zy/zydis/pkg-fun.nix} (100%) rename pkgs/{development/libraries => unit/zy}/zydis/zycore.nix (100%) rename pkgs/{development/compilers/zz/default.nix => unit/zz/zz/pkg-fun.nix} (100%) rename pkgs/{development/libraries/zziplib/default.nix => unit/zz/zziplib/pkg-fun.nix} (100%) rename pkgs/{tools/security/zzuf/default.nix => unit/zz/zzuf/pkg-fun.nix} (100%) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38e73927d10d..0b972fcdb9734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -114,26 +114,6 @@ with pkgs; ### Nixpkgs maintainer tools - nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; - - nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { }; - - common-updater-scripts = callPackage ../common-updater/scripts.nix { }; - - genericUpdater = callPackage ../common-updater/generic-updater.nix { }; - - _experimental-update-script-combinators = callPackage ../common-updater/combinators.nix { }; - - directoryListingUpdater = callPackage ../common-updater/directory-listing-updater.nix { }; - - gitUpdater = callPackage ../common-updater/git-updater.nix { }; - - httpTwoLevelsUpdater = callPackage ../common-updater/http-two-levels-updater.nix { }; - - unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; - - nix-update-script = callPackage ../common-updater/nix-update.nix { }; - ### Push NixOS tests inside the fixed point # See also allTestsForSystem in nixos/release.nix @@ -173,8 +153,6 @@ with pkgs; autoconf = autoconf269; }; - autorestic = callPackage ../tools/backup/autorestic { }; - autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; deps = [ bintools ]; @@ -185,19 +163,14 @@ with pkgs; meta.platforms = lib.platforms.linux; } ../build-support/setup-hooks/auto-patchelf.sh; - appflowy = callPackage ../applications/office/appflowy { }; - appimageTools = callPackage ../build-support/appimage { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; - appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; - bindle = callPackage ../servers/bindle { inherit (darwin.apple_sdk.frameworks) Security; }; - canonicalize-jar = callPackage ../build-support/java/canonicalize-jar.nix { }; canonicalize-jars-hook = makeSetupHook { name = "canonicalize-jars-hook"; substitutions = { canonicalize_jar = canonicalize-jar; }; @@ -212,126 +185,30 @@ with pkgs; } ''); - chkservice = callPackage ../tools/admin/chkservice { }; - - addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; - - quickemu = callPackage ../development/quickemu { }; - - adcli = callPackage ../os-specific/linux/adcli { }; - - aether = callPackage ../applications/networking/aether { }; - - alda = callPackage ../development/interpreters/alda { }; - - align = callPackage ../tools/text/align { }; - - althttpd = callPackage ../servers/althttpd { }; - - anders = callPackage ../applications/science/logic/anders { }; - ankisyncd = callPackage ../servers/ankisyncd { python3 = python39; }; - mov-cli = callPackage ../applications/video/mov-cli { }; - - ani-cli = callPackage ../applications/video/ani-cli { }; - - anime-downloader = callPackage ../applications/video/anime-downloader { }; - aocd = with python3Packages; toPythonApplication aocd; - aesfix = callPackage ../tools/security/aesfix { }; - - aeskeyfind = callPackage ../tools/security/aeskeyfind { }; - - asn = callPackage ../applications/networking/asn { }; - - asnmap = callPackage ../tools/security/asnmap { }; - - astrolog = callPackage ../applications/science/astronomy/astrolog { }; - - atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { }; - - _0x = callPackage ../tools/misc/0x { }; - atuin = callPackage ../tools/misc/atuin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - automatic-timezoned = callPackage ../tools/system/automatic-timezoned { }; - cve = with python3Packages; toPythonApplication cvelib; - fiche = callPackage ../servers/fiche { }; - - fishnet = callPackage ../servers/fishnet { }; - - fission = callPackage ../development/tools/fission { }; - - apko = callPackage ../development/tools/apko { }; - - appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; - - activate-linux = callPackage ../applications/misc/activate-linux { }; - arti = callPackage ../tools/security/arti { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - asn1c = callPackage ../development/compilers/asn1c { }; - - authy = callPackage ../applications/misc/authy { }; - - authz0 = callPackage ../tools/security/authz0 { }; - - auth0-cli = callPackage ../tools/admin/auth0-cli { }; - - atomic-operator = callPackage ../tools/security/atomic-operator { }; - - avro-tools = callPackage ../development/tools/avro-tools { }; - - bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; - - bada-bib = callPackage ../applications/science/misc/bada-bib {}; - - banana-accounting = callPackage ../applications/office/banana-accounting {}; - - bakelite = callPackage ../tools/backup/bakelite { }; - - benthos = callPackage ../development/tools/benthos {}; - - beyond-identity = callPackage ../tools/security/beyond-identity {}; - - binbloom = callPackage ../tools/security/binbloom {}; - - bingo = callPackage ../development/tools/bingo {}; - binserve = callPackage ../servers/binserve { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bootstrap-studio = callPackage ../development/web/bootstrap-studio {}; - - breakpad = callPackage ../development/misc/breakpad { }; - brev-cli = callPackage ../development/misc/brev-cli { buildGoModule = buildGo118Module; # build fails with 1.19 }; - buf = callPackage ../development/tools/buf { }; - - cbfmt = callPackage ../development/tools/cbfmt { }; - - cfn-nag = callPackage ../development/tools/cfn-nag { }; - - circumflex = callPackage ../applications/networking/circumflex { }; - - cxx-rs = callPackage ../development/libraries/cxx-rs { }; - - elfcat = callPackage ../tools/misc/elfcat { }; - # Zip file format only allows times after year 1980, which makes e.g. Python # wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 @@ -346,42 +223,10 @@ with pkgs; deps = [ innoextract file-rename ]; } ../build-support/setup-hooks/gog-unpack.sh; - buildEnv = callPackage ../build-support/buildenv { }; # not actually a package + /* buildEnv = */ # not actually a package # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap buildFHSUserEnv = buildFHSUserEnvChroot; - buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { }; - buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; - - buildMaven = callPackage ../build-support/build-maven.nix {}; - - caroline = callPackage ../development/libraries/caroline { }; - - castget = callPackage ../applications/networking/feedreaders/castget { }; - - castxml = callPackage ../development/tools/castxml { }; - - catatonit = callPackage ../applications/virtualization/catatonit { }; - - catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; - - catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; - - btdu = callPackage ../tools/misc/btdu { }; - - cereal = callPackage ../development/libraries/cereal { }; - - certgraph = callPackage ../tools/security/certgraph { }; - - cewl = callPackage ../tools/security/cewl { }; - - checkov = callPackage ../development/tools/analysis/checkov {}; - - chrysalis = callPackage ../applications/misc/chrysalis { }; - - classicube = callPackage ../games/classicube { }; - - clj-kondo = callPackage ../development/tools/clj-kondo { }; cloak = callPackage ../applications/misc/cloak { inherit (darwin.apple_sdk.frameworks) Security; @@ -391,128 +236,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - cmark = callPackage ../development/libraries/cmark { }; - - cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; - - cm256cc = callPackage ../development/libraries/cm256cc { }; - cocogitto = callPackage ../development/tools/cocogitto { inherit (darwin.apple_sdk.frameworks) Security; }; - conftest = callPackage ../development/tools/conftest { }; - coldsnap = callPackage ../tools/admin/coldsnap { inherit (darwin.apple_sdk.frameworks) Security; }; - colemak-dh = callPackage ../data/misc/colemak-dh { }; - - colmena = callPackage ../tools/admin/colmena { }; - - colorz = callPackage ../tools/misc/colorz { }; - - colorpanes = callPackage ../tools/misc/colorpanes { }; - - colorpicker = callPackage ../tools/misc/colorpicker { }; - - comedilib = callPackage ../development/libraries/comedilib { }; - - commix = callPackage ../tools/security/commix { }; - - conserver = callPackage ../tools/misc/conserver { }; - - containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; - - coost = callPackage ../development/libraries/coost { }; - - crc = callPackage ../applications/networking/cluster/crc { }; - - coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; - - copilot-cli = callPackage ../tools/admin/copilot-cli { }; - - cp437 = callPackage ../tools/misc/cp437 { }; - - cpm-cmake = callPackage ../development/tools/cpm-cmake { }; - - cpu-x = callPackage ../applications/misc/cpu-x { }; - - crackle = callPackage ../tools/networking/crackle { }; - - crackql = callPackage ../tools/security/crackql { }; - crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { }; - cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { }; - databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; - - dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; - - dhallToNix = callPackage ../build-support/dhall/to-nix.nix { }; - dinghy = with python3Packages; toPythonApplication dinghy; - deadcode = callPackage ../development/tools/deadcode { }; - - deadnix = callPackage ../development/tools/deadnix { }; - - dsq = callPackage ../tools/misc/dsq { }; - - dtv-scan-tables_linuxtv = callPackage ../data/misc/dtv-scan-tables/linuxtv.nix { }; - dtv-scan-tables_tvheadend = callPackage ../data/misc/dtv-scan-tables/tvheadend.nix { }; dtv-scan-tables = dtv-scan-tables_linuxtv; dufs = callPackage ../servers/http/dufs { inherit (darwin.apple_sdk.frameworks) Security; }; - ea = callPackage ../tools/misc/ea { }; - - each = callPackage ../tools/text/each { }; - - eclipse-mat = callPackage ../development/tools/eclipse-mat { }; - edgedb = callPackage ../tools/networking/edgedb { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; - - enumer = callPackage ../tools/misc/enumer { }; - - evans = callPackage ../development/tools/evans { }; - - expressvpn = callPackage ../applications/networking/expressvpn { }; - - figma-linux = callPackage ../applications/graphics/figma-linux {}; - - firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; - - frece = callPackage ../development/tools/frece { }; - - frugal = callPackage ../development/tools/frugal { }; - - glade = callPackage ../development/tools/glade { }; - - goda = callPackage ../development/tools/goda { }; - - gojq = callPackage ../development/tools/gojq { }; - - govulncheck = callPackage ../tools/security/govulncheck { }; - - gpick = callPackage ../tools/misc/gpick { }; - - hwatch = callPackage ../tools/misc/hwatch { }; - hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; }; - honeycomb-refinery = callPackage ../servers/tracing/honeycomb/refinery { }; - html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; @@ -526,126 +275,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; - mix2nix = callPackage ../development/tools/mix2nix { }; - prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; }; - pridecat = callPackage ../tools/misc/pridecat { }; - - pridefetch = callPackage ../tools/misc/pridefetch { }; - - proto-contrib = callPackage ../development/tools/proto-contrib { }; - - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { }; - - protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { }; - - protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; - - protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; - - protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; - - protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; - - protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; - - protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { }; - - protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; - - protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; - - protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; - - protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - - protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { }; - - protolint = callPackage ../development/tools/protolint { }; - - ptags = callPackage ../development/tools/misc/ptags { }; - - resolve-march-native = callPackage ../development/tools/resolve-march-native { }; - - riot-redis = callPackage ../development/tools/riot-redis { }; - r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; - ptouch-print = callPackage ../misc/ptouch-print { }; - - demoit = callPackage ../servers/demoit { }; - - deviceTree = callPackage ../os-specific/linux/device-tree {}; - - enum4linux = callPackage ../tools/security/enum4linux {}; - enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; - erosmb = callPackage ../tools/security/erosmb { }; - - octosql = callPackage ../tools/misc/octosql { }; - - onesixtyone = callPackage ../tools/security/onesixtyone {}; - oletools = with python3.pkgs; toPythonApplication oletools; - credential-detector = callPackage ../tools/security/credential-detector { }; - - credslayer = callPackage ../tools/security/credslayer { }; - - device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; - - devour = callPackage ../tools/X11/devour {}; - didyoumean = callPackage ../tools/misc/didyoumean { inherit (darwin.apple_sdk.frameworks) AppKit; }; - didu = callPackage ../tools/misc/didu { }; - diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - archiver = callPackage ../applications/misc/archiver { }; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { autoreconfHook = buildPackages.autoreconfHook269; }; - gretl = callPackage ../applications/science/math/gretl { }; - - grsync = callPackage ../applications/misc/grsync { }; - dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; }; - fakeNss = callPackage ../build-support/fake-nss { }; - - tarsum = callPackage ../build-support/docker/tarsum.nix { }; - - snapTools = callPackage ../build-support/snap { }; - - nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; - - docker-ls = callPackage ../tools/misc/docker-ls { }; - - docker-slim = callPackage ../applications/virtualization/docker-slim { }; - - docker-sync = callPackage ../tools/misc/docker-sync { }; - - undocker = callPackage ../tools/misc/undocker { }; - - dockle = callPackage ../development/tools/dockle { }; - - docui = callPackage ../tools/misc/docui { }; - - dotfiles = callPackage ../applications/misc/dotfiles { }; - # Dotnet dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); @@ -670,68 +325,23 @@ with pkgs; dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; - buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; - nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; - mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = callPackage ../build-support/dotnet/make-nuget-deps { }; - dotnetenv = callPackage ../build-support/dotnet/dotnetenv { dotnetfx = dotnetfx40; }; - buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; - fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; - dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { }; - - dumb-init = callPackage ../applications/virtualization/dumb-init {}; - - umoci = callPackage ../applications/virtualization/umoci {}; - - dippi = callPackage ../tools/graphics/dippi {}; - - dispad = callPackage ../tools/X11/dispad { }; - - diswall = callPackage ../applications/networking/diswall { }; - - dupeguru = callPackage ../applications/misc/dupeguru { }; - - dump1090 = callPackage ../applications/radio/dump1090 { }; - - dwarf2json = callPackage ../tools/misc/dwarf2json { }; - - ebook2cw = callPackage ../applications/radio/ebook2cw { }; - - edwin = callPackage ../data/fonts/edwin { }; - - etBook = callPackage ../data/fonts/et-book { }; - - fntsample = callPackage ../tools/misc/fntsample { }; - - fetchutils = callPackage ../tools/misc/fetchutils { }; - - fet-sh = callPackage ../tools/misc/fet-sh { }; - fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; - fetchbzr = callPackage ../build-support/fetchbzr { }; - fetchcvs = if stdenv.buildPlatform != stdenv.hostPlatform # hack around splicing being crummy with things that (correctly) don't eval. then buildPackages.fetchcvs else callPackage ../build-support/fetchcvs { }; - fetchdarcs = callPackage ../build-support/fetchdarcs { }; - - fetchdocker = callPackage ../build-support/fetchdocker { }; - fetchDockerConfig = callPackage ../build-support/fetchdocker/fetchDockerConfig.nix { }; fetchDockerLayer = callPackage ../build-support/fetchdocker/fetchDockerLayer.nix { }; - fetchfossil = callPackage ../build-support/fetchfossil { }; - fetchgit = (callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; cacert = buildPackages.cacert; @@ -740,64 +350,22 @@ with pkgs; tests = pkgs.tests.fetchgit; }; - fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; - fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); - fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; - inherit (callPackage ../build-support/node/fetch-yarn-deps { }) prefetch-yarn-deps fetchYarnDeps; - find-cursor = callPackage ../tools/X11/find-cursor { }; - - flare-floss = callPackage ../tools/security/flare-floss { }; - prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - global-platform-pro = callPackage ../development/tools/global-platform-pro { }; - - gomi = callPackage ../tools/misc/gomi { }; - - graph-easy = callPackage ../tools/graphics/graph-easy { }; - - mangal = callPackage ../applications/misc/mangal { }; - - graphw00f = callPackage ../tools/security/graphw00f { }; - opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; - owl = callPackage ../tools/networking/owl { }; - - mutmut = callPackage ../development/tools/mutmut { }; - - packcc = callPackage ../development/tools/packcc { }; - - packer = callPackage ../development/tools/packer { }; - - packr = callPackage ../development/libraries/packr { }; - perseus-cli = callPackage ../development/tools/perseus-cli { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - pet = callPackage ../development/tools/pet { }; - pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear {}; - pkger = callPackage ../development/libraries/pkger { }; - - tapview = callPackage ../development/tools/tapview { }; - - run = callPackage ../development/tools/run { }; - - ruler = callPackage ../tools/security/ruler { }; - - mblock-mlink = callPackage ../development/tools/mblock-mlink { }; - - mod = callPackage ../development/tools/mod { }; - mongosh = callPackage ../development/tools/mongosh { }; mysql-shell = callPackage ../development/tools/mysql-shell { @@ -810,8 +378,6 @@ with pkgs; v8 = v8_8_x; }; - broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; - fetchpatch = callPackage ../build-support/fetchpatch { # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 patchutils = buildPackages.patchutils_0_3_3; @@ -827,8 +393,6 @@ with pkgs; version = 2; }; - fetchs3 = callPackage ../build-support/fetchs3 { }; - fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform # hack around splicing being crummy with things that (correctly) don't eval. then buildPackages.fetchsvn @@ -836,17 +400,11 @@ with pkgs; fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; - fetchsvnssh = callPackage ../build-support/fetchsvnssh { }; - - fetchhg = callPackage ../build-support/fetchhg { }; - fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon { } // { tests = pkgs.tests.fetchFirefoxAddon; }; - fetchNextcloudApp = callPackage ../build-support/fetchnextcloudapp {}; - # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform then buildPackages.fetchurl # No need to do special overrides twice, @@ -904,41 +462,15 @@ with pkgs; }); }; - fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; - fetchipfs = import ../build-support/fetchipfs { inherit curl stdenv; }; - fetchit = callPackage ../applications/networking/cluster/fetchit { }; - fetchzip = callPackage ../build-support/fetchzip { } // { tests = pkgs.tests.fetchzip; }; - fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; - - fetchFromGitea = callPackage ../build-support/fetchgitea { }; - - fetchFromGitHub = callPackage ../build-support/fetchgithub {}; - - fetchFromBitbucket = callPackage ../build-support/fetchbitbucket {}; - - fetchFromSavannah = callPackage ../build-support/fetchsavannah {}; - - fetchFromSourcehut = callPackage ../build-support/fetchsourcehut { }; - - fetchFromGitLab = callPackage ../build-support/fetchgitlab {}; - - fetchFromGitiles = callPackage ../build-support/fetchgitiles {}; - - fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; - - fetchgx = callPackage ../build-support/fetchgx { }; - - fetchPypi = callPackage ../build-support/fetchpypi { }; - resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -946,37 +478,18 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; - lazydocker = callPackage ../tools/misc/lazydocker { }; - ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; - libgflow = callPackage ../development/libraries/libgflow { }; - libgtkflow3 = callPackage ../development/libraries/libgtkflow3 { }; - libgtkflow4 = callPackage ../development/libraries/libgtkflow4 { }; - - libredirect = callPackage ../build-support/libredirect { }; - - madonctl = callPackage ../applications/misc/madonctl { }; - copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; - makeDesktopItem = callPackage ../build-support/make-desktopitem { }; - copyPkgconfigItems = makeSetupHook { } ../build-support/setup-hooks/copy-pkgconfig-items.sh; - makePkgconfigItem = callPackage ../build-support/make-pkgconfigitem { }; - - makeDarwinBundle = callPackage ../build-support/make-darwin-bundle { }; - - makeAutostartItem = callPackage ../build-support/make-startupitem { }; - makeImpureTest = callPackage ../build-support/make-impure-test.nix; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out makeInitrdNG = callPackage ../build-support/kernel/make-initrd-ng.nix; - makeInitrdNGTool = callPackage ../build-support/kernel/make-initrd-ng-tool.nix {}; makeWrapper = makeShellWrapper; @@ -992,32 +505,15 @@ with pkgs; } ../build-support/setup-hooks/make-wrapper.sh; - makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; - - compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware-xz.nix { }; - makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { inherit kernel firmware rootModules allowMissing; }; - mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; - mokutil = callPackage ../tools/security/mokutil { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; - nix-gitignore = callPackage ../build-support/nix-gitignore { }; - - numworks-epsilon = callPackage ../applications/science/math/numworks-epsilon { }; - - ociTools = callPackage ../build-support/oci-tools { }; - - octant = callPackage ../applications/networking/cluster/octant { }; - octant-desktop = callPackage ../applications/networking/cluster/octant/desktop.nix { }; - starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { }; - inherit ( callPackages ../build-support/setup-hooks/patch-rc-path-hooks { } ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix; @@ -1027,38 +523,14 @@ with pkgs; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } ../build-support/setup-hooks/prune-libtool-files.sh; - closureInfo = callPackage ../build-support/closure-info.nix { }; - - setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; - shortenPerlShebang = makeSetupHook { deps = [ dieHook ]; } ../build-support/setup-hooks/shorten-perl-shebang.sh; - singularity-tools = callPackage ../build-support/singularity-tools { }; - - sirula = callPackage ../tools/wayland/sirula { }; - - sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen {}; - - srcOnly = callPackage ../build-support/src-only { }; - - subnetcalc = callPackage ../tools/networking/subnetcalc { }; - - substitute = callPackage ../build-support/substitute/substitute.nix { }; - - substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; - - substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { }; - - replaceDependency = callPackage ../build-support/replace-dependency.nix { }; - nukeReferences = callPackage ../build-support/nuke-references { inherit (darwin) signingUtils; }; - referencesByPopularity = callPackage ../build-support/references-by-popularity { }; - removeReferencesTo = callPackage ../build-support/remove-references-to { inherit (darwin) signingUtils; }; @@ -1066,8 +538,6 @@ with pkgs; # No callPackage. In particular, we don't want `img` *package* in parameters. vmTools = makeOverridable (import ../build-support/vm) { inherit pkgs lib; }; - releaseTools = callPackage ../build-support/release { }; - inherit (lib.systems) platforms; setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; @@ -1078,8 +548,6 @@ with pkgs; meta.platforms = lib.platforms.darwin; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; - writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; - desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; @@ -1092,8 +560,6 @@ with pkgs; { deps = [ lcov enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; - makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; - # intended to be used like nix-build -E 'with import {}; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; @@ -1113,16 +579,11 @@ with pkgs; useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; - iconConvTools = callPackage ../build-support/icon-conv-tools {}; - validatePkgConfig = makeSetupHook { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; - patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files {}; - #package writers - writers = callPackage ../build-support/writers {}; # lib functions depending on pkgs inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; @@ -1131,66 +592,16 @@ with pkgs; ### TOOLS - _3llo = callPackage ../tools/misc/3llo { }; - - _3mux = callPackage ../tools/misc/3mux { }; - - _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../applications/misc/1password-gui { }; _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; - _6tunnel = callPackage ../tools/networking/6tunnel { }; - _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; - _9pfs = callPackage ../tools/filesystems/9pfs { }; - - aaa = callPackage ../tools/misc/aaa {}; - - aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; - - a2ps = callPackage ../tools/text/a2ps { }; - - abcm2ps = callPackage ../tools/audio/abcm2ps { }; - - abcmidi = callPackage ../tools/audio/abcmidi { }; - - abduco = callPackage ../tools/misc/abduco { }; - - ablog = callPackage ../applications/misc/ablog { }; - - acct = callPackage ../tools/system/acct { }; - - accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; - - acme-sh = callPackage ../tools/admin/acme-sh { }; - - acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; - - acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { }; - - alsaequal = callPackage ../tools/audio/alsaequal { }; - - acpica-tools = callPackage ../tools/system/acpica-tools { }; - acquire = with python3Packages; toPythonApplication acquire; - act = callPackage ../development/tools/misc/act { }; - actdiag = with python3.pkgs; toPythonApplication actdiag; - actkbd = callPackage ../tools/system/actkbd { }; - - adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { }; - - addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { }; - - addlicense = callPackage ../tools/misc/addlicense { }; - - adenum = callPackage ../tools/security/adenum { }; - adlplug = callPackage ../applications/audio/adlplug { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit; jack = libjack2; @@ -1204,9 +615,6 @@ with pkgs; stdenv = gcc10StdenvCompat; }; - adminer = callPackage ../servers/adminer { }; - - akkoma = callPackage ../servers/akkoma { }; akkoma-frontends = recurseIntoAttrs { pleroma-fe = callPackage ../servers/akkoma/pleroma-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { }; @@ -1215,40 +623,14 @@ with pkgs; blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; }; - advancecomp = callPackage ../tools/compression/advancecomp {}; - - aefs = callPackage ../tools/filesystems/aefs { }; - aegisub = callPackage ../applications/video/aegisub ({ wxGTK = wxGTK32; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; - - aerospike = callPackage ../servers/nosql/aerospike { }; - - aespipe = callPackage ../tools/security/aespipe { }; - - aescrypt = callPackage ../tools/misc/aescrypt { }; - - aether-lv2 = callPackage ../applications/audio/aether-lv2 { }; - acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; - adrgen = callPackage ../tools/misc/adrgen { }; - - adriconf = callPackage ../tools/graphics/adriconf { }; - - amass = callPackage ../tools/networking/amass { }; - - afew = callPackage ../applications/networking/mailreaders/afew { }; - - afetch = callPackage ../tools/misc/afetch { }; - - afio = callPackage ../tools/archivers/afio { }; - afl = callPackage ../tools/security/afl { stdenv = clangStdenv; }; @@ -1265,10 +647,6 @@ with pkgs; wine = null; }; - libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; - - afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; - afsctool = callPackage ../tools/filesystems/afsctool { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -1277,256 +655,55 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - agda-pkg = callPackage ../development/tools/agda-pkg { }; - - agi = callPackage ../tools/graphics/agi { }; - - agola = callPackage ../development/tools/continuous-integration/agola { }; - - agrep = callPackage ../tools/text/agrep { }; - - aha = callPackage ../tools/text/aha { }; - - ahcpd = callPackage ../tools/networking/ahcpd { }; - - aide = callPackage ../tools/security/aide { }; - aioblescan = with python3Packages; toPythonApplication aioblescan; aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; - aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; - airfield = callPackage ../tools/networking/airfield { }; - airgeddon = callPackage ../tools/networking/airgeddon { }; - apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; - airsonic = callPackage ../servers/misc/airsonic { }; - - airspy = callPackage ../applications/radio/airspy { }; - - airspyhf = callPackage ../applications/radio/airspyhf { }; - - airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { }; - - aixlog = callPackage ../development/libraries/aixlog { }; - - aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; - ajour = callPackage ../tools/games/ajour { inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; - akku = callPackage ../tools/package-management/akku { }; - albert = libsForQt5.callPackage ../applications/misc/albert {}; - allure = callPackage ../development/tools/allure {}; - - aquosctl = callPackage ../tools/misc/aquosctl { }; - - arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; - - arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { }; - - audible-cli = callPackage ../tools/misc/audible-cli { }; - - auditwheel = callPackage ../tools/package-management/auditwheel { }; - - amidst = callPackage ../tools/games/minecraft/amidst { }; - - askalono = callPackage ../tools/misc/askalono { }; - - asleap = callPackage ../tools/networking/asleap { }; - butler = callPackage ../games/itch/butler.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - cf-vault = callPackage ../tools/admin/cf-vault { }; - - cfonts = callPackage ../tools/misc/cfonts { }; - bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; - cie-middleware-linux = callPackage ../tools/security/cie-middleware-linux { }; - - cidrgrep = callPackage ../tools/text/cidrgrep { }; - - clematis = callPackage ../tools/misc/clematis { }; - - colorless = callPackage ../tools/misc/colorless { }; - - cope = callPackage ../tools/misc/cope { }; - - ejson2env = callPackage ../tools/admin/ejson2env { }; - - davinci-resolve = callPackage ../applications/video/davinci-resolve { }; - - dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { }; - - dwarfs = callPackage ../tools/filesystems/dwarfs { }; - gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; - gamescope = callPackage ../applications/window-managers/gamescope { }; - - gay = callPackage ../tools/misc/gay { }; - - elkhound = callPackage ../development/tools/elkhound { }; - - weidu = callPackage ../tools/games/weidu { }; - weylus = callPackage ../applications/graphics/weylus { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox; }; - gam = callPackage ../tools/admin/gam { }; - - gen6dns = callPackage ../tools/networking/gen6dns { }; - - gfshare = callPackage ../tools/security/gfshare { }; - gh-cal = callPackage ../tools/misc/gh-cal { inherit (darwin.apple_sdk.frameworks) Security; }; - gh-dash = callPackage ../tools/misc/gh-dash { }; - - gh-eco = callPackage ../tools/misc/gh-eco { }; - - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; - - ghostie = callPackage ../tools/misc/ghostie { }; - - glooctl = callPackage ../applications/networking/cluster/glooctl { }; - - gobgp = callPackage ../tools/networking/gobgp { }; - - gof5 = callPackage ../tools/networking/gof5 { }; - - goflow = callPackage ../tools/networking/goflow { }; - - gofu = callPackage ../applications/misc/gofu { }; - - godns = callPackage ../tools/networking/godns { }; - - godspeed = callPackage ../tools/networking/godspeed { }; - - guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; - fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; - headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; - - headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { }; - - httm = callPackage ../tools/filesystems/httm { }; - inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; - jobber = callPackage ../tools/system/jobber {}; - - kanata = callPackage ../tools/system/kanata { }; - kanata-with-cmd = kanata.override { withCmd = true; }; - ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; - ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; - kubevirt = callPackage ../tools/virtualization/kubevirt { }; - - license-generator = callPackage ../tools/misc/license-generator { }; - - linux-router = callPackage ../tools/networking/linux-router { }; - linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; - mbidled = callPackage ../tools/networking/mbidled { }; - - metapixel = callPackage ../tools/graphics/metapixel { }; - - midimonster = callPackage ../tools/audio/midimonster { }; - - midi-trigger = callPackage ../applications/audio/midi-trigger { }; - - mnc = callPackage ../tools/misc/mnc { }; - - mgmt = callPackage ../applications/system/mgmt {}; - - mprocs = callPackage ../tools/misc/mprocs { }; - - nominatim = callPackage ../servers/nominatim { }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; - pferd = callPackage ../tools/misc/pferd {}; - - proycon-wayout = callPackage ../tools/wayland/proycon-wayout {}; - - q = callPackage ../tools/networking/q {}; - qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; - quich = callPackage ../tools/misc/quich { } ; - - redfang = callPackage ../tools/networking/redfang { }; - - scarab = callPackage ../tools/games/scarab { }; - - sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; - - sdlookup = callPackage ../tools/security/sdlookup { }; - - sgrep = callPackage ../tools/text/sgrep { }; - - simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { }; - - sorted-grep = callPackage ../tools/text/sorted-grep { }; - - smbscan = callPackage ../tools/security/smbscan { }; - - spectre-cli = callPackage ../tools/security/spectre-cli { }; - - steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {}; - - supermin = callPackage ../tools/virtualization/supermin { }; - - sx-go = callPackage ../tools/security/sx-go { }; - - systeroid = callPackage ../tools/system/systeroid { }; - - tauon = callPackage ../applications/audio/tauon { }; - - tere = callPackage ../tools/misc/tere { }; - - termusic = callPackage ../applications/audio/termusic { }; - - tfk8s = callPackage ../tools/misc/tfk8s { }; - - tfplugindocs = callPackage ../development/tools/tfplugindocs { }; - - thumbs = callPackage ../tools/misc/thumbs { }; - - tnat64 = callPackage ../tools/networking/tnat64 { }; - - toast = callPackage ../development/tools/toast { }; - - topicctl = callPackage ../tools/misc/topicctl { }; - - ttchat = callPackage ../tools/misc/ttchat { }; - - unflac = callPackage ../tools/audio/unflac { }; - veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; - ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; ventoy-bin-full = ventoy-bin.override { withCryptsetup = true; withXfs = true; @@ -1534,30 +711,10 @@ with pkgs; withNtfs = true; }; - vitess = callPackage ../development/tools/database/vitess {}; - - voms = callPackage ../tools/networking/voms { }; - - vopono = callPackage ../tools/networking/vopono { }; - winbox = callPackage ../tools/admin/winbox { wine = wineWowPackages.staging; }; - wtwitch = callPackage ../tools/video/wtwitch {}; - - wwcd = callPackage ../tools/misc/wwcd { }; - - writedisk = callPackage ../tools/misc/writedisk { }; - - xcd = callPackage ../tools/misc/xcd { }; - - xpaste = callPackage ../tools/text/xpaste { }; - - xrootd = callPackage ../tools/networking/xrootd { }; - - xtrt = callPackage ../tools/archivers/xtrt { }; - yabridge = callPackage ../tools/audio/yabridge { wine = wineWowPackages.staging; }; @@ -1570,16 +727,8 @@ with pkgs; stdenv = clangStdenv; }; - archi = callPackage ../tools/misc/archi { }; - - breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - - zq = callPackage ../development/tools/zq { }; - ### APPLICATIONS/VERSION-MANAGEMENT - deepgit = callPackage ../applications/version-management/deepgit {}; - git = callPackage ../applications/version-management/git { inherit (darwin.apple_sdk.frameworks) CoreServices Security; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; @@ -1617,36 +766,18 @@ with pkgs; withpcre2 = false; }; - bfg-repo-cleaner = callPackage ../applications/version-management/bfg-repo-cleaner { }; - - bit = callPackage ../applications/version-management/bit { }; - - bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { }; - bump2version = python3Packages.callPackage ../applications/version-management/bump2version { }; cgit = callPackage ../applications/version-management/cgit { }; cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { }; - commit-formatter = callPackage ../applications/version-management/commit-formatter { }; - commitlint = nodePackages."@commitlint/cli"; - conform = callPackage ../applications/version-management/conform { }; - - datalad = callPackage ../applications/version-management/datalad { }; - - darcs-to-git = callPackage ../applications/version-management/darcs-to-git { }; - delta = callPackage ../applications/version-management/delta { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; }; - diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; - - gex = callPackage ../applications/version-management/gex { }; - gfold = callPackage ../applications/version-management/gfold { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1657,23 +788,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - gg-scm = callPackage ../applications/version-management/gg { }; - github-cli = gh; - gh = callPackage ../applications/version-management/gh { }; - - ghorg = callPackage ../applications/version-management/ghorg { }; - - ghq = callPackage ../applications/version-management/ghq { }; - - ghr = callPackage ../applications/version-management/ghr { }; git-absorb = callPackage ../applications/version-management/git-absorb { inherit (darwin.apple_sdk.frameworks) Security; }; - git-aggregator = callPackage ../applications/version-management/git-aggregator { }; - git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui { inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; }; @@ -1698,31 +818,17 @@ with pkgs; humanfriendly; }; - git-annex-remote-rclone = callPackage ../applications/version-management/git-annex-remote-rclone { }; - - git-annex-utils = callPackage ../applications/version-management/git-annex-utils { }; - - git-appraise = callPackage ../applications/version-management/git-appraise { }; - git-backup = callPackage ../applications/version-management/git-backup { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; - git-big-picture = callPackage ../applications/version-management/git-big-picture { }; - git-branchless = callPackage ../applications/version-management/git-branchless { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { }; - git-bug = callPackage ../applications/version-management/git-bug { }; - - git-bug-migration = callPackage ../applications/version-management/git-bug-migration { }; - - git-chglog = callPackage ../applications/version-management/git-chglog { }; - git-cinnabar = callPackage ../applications/version-management/git-cinnabar { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -1731,44 +837,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-codeowners = callPackage ../applications/version-management/git-codeowners { }; - - git-codereview = callPackage ../applications/version-management/git-codereview { }; - - git-cola = callPackage ../applications/version-management/git-cola { }; - - git-crecord = callPackage ../applications/version-management/git-crecord { }; - - git-credential-1password = callPackage ../applications/version-management/git-credential-1password { }; - git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; - git-crypt = callPackage ../applications/version-management/git-crypt { }; - - git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { }; - - git-extras = callPackage ../applications/version-management/git-extras { }; - - git-fame = callPackage ../applications/version-management/git-fame { }; - - git-fast-export = callPackage ../applications/version-management/fast-export { }; - - git-fire = callPackage ../applications/version-management/git-fire { }; - - git-ftp = callPackage ../applications/version-management/git-ftp { }; - git-gone = callPackage ../applications/version-management/git-gone { inherit (darwin.apple_sdk.frameworks) Security; }; - git-hound = callPackage ../applications/version-management/git-hound { }; - - git-hub = callPackage ../applications/version-management/git-hub { }; - - git-ignore = callPackage ../applications/version-management/git-ignore { }; - git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { }; git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool { @@ -1777,28 +853,14 @@ with pkgs; git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); - git-my = callPackage ../applications/version-management/git-my { }; - git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; - git-nomad = callPackage ../applications/version-management/git-nomad { }; - - git-octopus = callPackage ../applications/version-management/git-octopus { }; - - git-open = callPackage ../applications/version-management/git-open { }; - - git-privacy = callPackage ../applications/version-management/git-privacy { }; - git-publish = python3Packages.callPackage ../applications/version-management/git-publish { }; - git-quick-stats = callPackage ../applications/version-management/git-quick-stats { }; - git-quickfix = callPackage ../applications/version-management/git-quickfix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-radar = callPackage ../applications/version-management/git-radar { }; - git-recent = callPackage ../applications/version-management/git-recent { util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; }; @@ -1806,49 +868,20 @@ with pkgs; git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { }; gitRepo = git-repo; - git-repo = callPackage ../applications/version-management/git-repo { }; git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { }; git-review = python3Packages.callPackage ../applications/version-management/git-review { }; - git-remote-gcrypt = callPackage ../applications/version-management/git-remote-gcrypt { }; - - git-remote-hg = callPackage ../applications/version-management/git-remote-hg { }; - - git-reparent = callPackage ../applications/version-management/git-reparent { }; - - git-secret = callPackage ../applications/version-management/git-secret { }; - - git-secrets = callPackage ../applications/version-management/git-secrets { }; - git-series = callPackage ../applications/version-management/git-series { openssl = openssl_1_1; }; - git-sizer = callPackage ../applications/version-management/git-sizer { }; - - git-standup = callPackage ../applications/version-management/git-standup { }; - - git-stree = callPackage ../applications/version-management/git-stree { }; - - git-subrepo = callPackage ../applications/version-management/git-subrepo { }; - git-subset = callPackage ../applications/version-management/git-subset { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; - git-subtrac = callPackage ../applications/version-management/git-subtrac { }; - - git-sync = callPackage ../applications/version-management/git-sync { }; - - git-team = callPackage ../applications/version-management/git-team { }; - - git-test = callPackage ../applications/version-management/git-test { }; - - git-town = callPackage ../applications/version-management/git-town { }; - git-trim = callPackage ../applications/version-management/git-trim { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1857,70 +890,16 @@ with pkgs; pythonPackages = python3Packages; }; - git-vanity-hash = callPackage ../applications/version-management/git-vanity-hash { }; - - git-vendor = callPackage ../applications/version-management/git-vendor { }; - - git-when-merged = callPackage ../applications/version-management/git-when-merged { }; - git-workspace = callPackage ../applications/version-management/git-workspace { inherit (darwin.apple_sdk.frameworks) Security; }; - git2cl = callPackage ../applications/version-management/git2cl { }; - - gitbatch = callPackage ../applications/version-management/gitbatch { }; - - gitflow = callPackage ../applications/version-management/gitflow { }; - - gitfs = callPackage ../tools/filesystems/gitfs { }; - - gitless = callPackage ../applications/version-management/gitless { }; - gitlint = python3Packages.callPackage ../applications/version-management/gitlint { }; - gitls = callPackage ../applications/version-management/gitls { }; - - gitmux = callPackage ../applications/version-management/gitmux { }; - - gitnuro = callPackage ../applications/version-management/gitnuro { }; - - gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { }; - - gitsign = callPackage ../applications/version-management/gitsign { }; - - gitstats = callPackage ../applications/version-management/gitstats { }; - - gitstatus = callPackage ../applications/version-management/gitstatus { }; - - gitty = callPackage ../applications/version-management/gitty { }; - gitui = callPackage ../applications/version-management/gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; - gitweb = callPackage ../applications/version-management/gitweb { }; - - glab = callPackage ../applications/version-management/glab { }; - - glitter = callPackage ../applications/version-management/glitter { }; - - gst = callPackage ../applications/version-management/gst { }; - - hred = callPackage ../development/tools/hred { }; - - hub = callPackage ../applications/version-management/hub { }; - - hut = callPackage ../applications/version-management/hut { }; - - josh = callPackage ../applications/version-management/josh { }; - - lab = callPackage ../applications/version-management/lab { }; - - lefthook = callPackage ../applications/version-management/lefthook { }; - - legit = callPackage ../applications/version-management/legit { }; - lucky-commit = callPackage ../applications/version-management/lucky-commit { inherit (darwin.apple_sdk.frameworks) OpenCL; }; @@ -1934,30 +913,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - radicle-upstream = callPackage ../applications/version-management/radicle-upstream { }; - - rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { }; - - scmpuff = callPackage ../applications/version-management/scmpuff { }; - - stgit = callPackage ../applications/version-management/stgit { }; - - subgit = callPackage ../applications/version-management/subgit { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; svn2git = callPackage ../applications/version-management/svn2git { git = gitSVN; }; - thicket = callPackage ../applications/version-management/thicket { }; - - tig = callPackage ../applications/version-management/tig { }; - - top-git = callPackage ../applications/version-management/topgit { }; - - transcrypt = callPackage ../applications/version-management/transcrypt { }; - inherit (haskellPackages) git-annex; inherit (haskellPackages) git-brunch; @@ -1972,35 +933,15 @@ with pkgs; ### APPLICATIONS/EMULATORS - atari800 = callPackage ../applications/emulators/atari800 { }; - - ataripp = callPackage ../applications/emulators/atari++ { }; - - attract-mode = callPackage ../applications/emulators/attract-mode { }; - - basiliskii = callPackage ../applications/emulators/basiliskii { }; - bochs = callPackage ../applications/emulators/bochs { inherit (darwin) libobjc; wxGTK = wxGTK32; }; - box64 = callPackage ../applications/emulators/box64 { }; - - caprice32 = callPackage ../applications/emulators/caprice32 { }; - - ccemux = callPackage ../applications/emulators/ccemux { }; - cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cemu = callPackage ../applications/emulators/cemu { }; - - cen64 = callPackage ../applications/emulators/cen64 { }; - - citations = callPackage ../applications/misc/citations { }; - citra-canary = callPackage ../applications/emulators/citra { branch = "canary"; }; @@ -2009,32 +950,12 @@ with pkgs; branch = "nightly"; }; - collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; - - craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - - darcnes = callPackage ../applications/emulators/darcnes { }; - - desmume = callPackage ../applications/emulators/desmume { }; - - dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; - - dlx = callPackage ../applications/emulators/dlx { }; - dosbox = callPackage ../applications/emulators/dosbox { SDL = if stdenv.isDarwin then SDL else SDL_compat; }; - dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; - dynamips = callPackage ../applications/emulators/dynamips { }; - - emu2 = callPackage ../applications/emulators/emu2 { }; - - emulationstation = callPackage ../applications/emulators/emulationstation { }; - fceux = callPackage ../applications/emulators/fceux { lua = lua5_1; inherit (libsForQt5) wrapQtAppsHook; @@ -2042,16 +963,8 @@ with pkgs; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - flycast = callPackage ../applications/emulators/flycast { }; - - fsrx = callPackage ../tools/misc/fsrx { }; - - fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; - fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; - fw = callPackage ../tools/misc/fw { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2060,71 +973,24 @@ with pkgs; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; - - gopsuinfo = callPackage ../tools/system/gopsuinfo { }; - - gxemul = callPackage ../applications/emulators/gxemul { }; - - hatari = callPackage ../applications/emulators/hatari { }; - - hercules = callPackage ../applications/emulators/hercules { }; - - hostapd-mana = callPackage ../tools/networking/hostapd-mana { }; - image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; - lambda-delta = callPackage ../applications/emulators/lambda-delta { }; - - libdsk = callPackage ../applications/emulators/libdsk { }; - libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; - ludusavi = callPackage ../applications/backup/ludusavi { }; - - maiko = callPackage ../applications/emulators/maiko { }; - mame = libsForQt5.callPackage ../applications/emulators/mame { }; mame-tools = lib.addMetaAttrs { description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - mednafen = callPackage ../applications/emulators/mednafen { }; - - mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - - mednaffe = callPackage ../applications/emulators/mednaffe { }; - melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - mgba = callPackage ../applications/emulators/mgba { - }; - - mupen64plus = callPackage ../applications/emulators/mupen64plus { }; - - nestopia = callPackage ../applications/emulators/nestopia { }; - - np2kai = callPackage ../applications/emulators/np2kai { }; - - oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - - openmsx = callPackage ../applications/emulators/openmsx { }; - - packwiz = callPackage ../tools/games/minecraft/packwiz { }; - - pcem = callPackage ../applications/emulators/pcem { }; - pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30; }; - pcsxr = callPackage ../applications/emulators/pcsxr { }; - - ppsspp = callPackage ../applications/emulators/ppsspp { }; - ppsspp-sdl = ppsspp; ppsspp-sdl-wayland = ppsspp.override { @@ -2137,64 +1003,24 @@ with pkgs; enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 }; - proton-caller = callPackage ../applications/emulators/proton-caller { }; - punes = libsForQt5.callPackage ../applications/emulators/punes { }; py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - resim = callPackage ../applications/emulators/resim {}; - - retrofe = callPackage ../applications/emulators/retrofe { }; - ripes = libsForQt5.callPackage ../applications/emulators/ripes { }; rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; - ruffle = callPackage ../applications/emulators/ruffle { }; - - ryujinx = callPackage ../applications/emulators/ryujinx { }; - - sameboy = callPackage ../applications/emulators/sameboy { }; - - simh = callPackage ../applications/emulators/simh { }; - - simplenes = callPackage ../applications/emulators/simplenes { }; - snes9x = callPackage ../applications/emulators/snes9x { }; snes9x-gtk = callPackage ../applications/emulators/snes9x { withGtk = true; }; - stella = callPackage ../applications/emulators/stella { }; - - termtekst = callPackage ../applications/emulators/termtekst { }; - - tilem = callPackage ../applications/emulators/tilem { }; - - tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - - tinyemu = callPackage ../applications/emulators/tinyemu { }; - - uae = callPackage ../applications/emulators/uae { }; - - uxn = callPackage ../applications/emulators/uxn { }; - - vbam = callPackage ../applications/emulators/vbam { }; - - vice = callPackage ../applications/emulators/vice { }; - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; - xcpc = callPackage ../applications/emulators/xcpc { }; - - yapesdl = callPackage ../applications/emulators/yapesdl { }; - - zesarux = callPackage ../applications/emulators/zesarux { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; ### APPLICATIONS/EMULATORS/BSNES @@ -2203,12 +1029,8 @@ with pkgs; bsnes-hd = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/bsnes-hd { }; - higan = callPackage ../applications/emulators/bsnes/higan { }; - ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; @@ -2241,15 +1063,11 @@ with pkgs; }; }; - retroarch-assets = callPackage ../applications/emulators/retroarch/retroarch-assets.nix { }; - libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - libretro-core-info = callPackage ../applications/emulators/retroarch/libretro-core-info.nix { }; - kodi-retroarch-advanced-launchers = callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; @@ -2267,8 +1085,6 @@ with pkgs; ### APPLICATIONS/EMULATORS/COMMANDERX16 - x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { emulator = x16-emulator; rom = x16-rom; @@ -2281,101 +1097,39 @@ with pkgs; ### APPLICATIONS/FILE-MANAGERS - cfm = callPackage ../applications/file-managers/cfm { }; - - clex = callPackage ../applications/file-managers/clex { }; - - clifm = callPackage ../applications/file-managers/clifm { }; - doublecmd = callPackage ../applications/file-managers/doublecmd { inherit (qt5) wrapQtAppsHook; }; - felix-fm = callPackage ../applications/file-managers/felix-fm { }; - joshuto = callPackage ../applications/file-managers/joshuto { inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; - lf = callPackage ../applications/file-managers/lf { }; - - llama = callPackage ../applications/file-managers/llama { }; - mc = callPackage ../applications/file-managers/mc { inherit (darwin) autoSignDarwinBinariesHook; }; - mucommander = callPackage ../applications/file-managers/mucommander { }; - - nimmm = callPackage ../applications/file-managers/nimmm { }; - - nnn = callPackage ../applications/file-managers/nnn { }; - - noice = callPackage ../applications/file-managers/noice { }; - - pcmanfm = callPackage ../applications/file-managers/pcmanfm { }; - - portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { }; - - ranger = callPackage ../applications/file-managers/ranger { }; - - sfm = callPackage ../applications/file-managers/sfm { }; - - shfm = callPackage ../applications/file-managers/shfm { }; - - spaceFM = callPackage ../applications/file-managers/spacefm { }; - - vifm = callPackage ../applications/file-managers/vifm { }; - vifm-full = vifm.override { mediaSupport = true; inherit lib udisks2 python3; }; - worker = callPackage ../applications/file-managers/worker { }; - xfe = callPackage ../applications/file-managers/xfe { fox = fox_1_6; }; - ytree = callPackage ../applications/file-managers/ytree { }; - ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { }; - contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - ctx = callPackage ../applications/terminal-emulators/ctx { }; - - darktile = callPackage ../applications/terminal-emulators/darktile { }; - - dterm = callPackage ../applications/terminal-emulators/dterm { }; - - eterm = callPackage ../applications/terminal-emulators/eterm { }; - - foot = callPackage ../applications/terminal-emulators/foot { }; - - germinal = callPackage ../applications/terminal-emulators/germinal { }; - - guake = callPackage ../applications/terminal-emulators/guake { }; - - havoc = callPackage ../applications/terminal-emulators/havoc { }; - - hyper = callPackage ../applications/terminal-emulators/hyper { }; - - iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; - - kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; - kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; @@ -2387,129 +1141,52 @@ with pkgs; ; }; - kitty-themes = callPackage ../misc/kitty-themes {}; - - lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; - - microcom = callPackage ../applications/terminal-emulators/microcom { }; - mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; }; - mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; - - rxvt = callPackage ../applications/terminal-emulators/rxvt { }; - - rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; - rxvt-unicode-emoji = rxvt-unicode.override { rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji; }; rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; - rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; - rxvt-unicode-unwrapped-emoji = rxvt-unicode-unwrapped.override { emojiSupport = true; }; - sakura = callPackage ../applications/terminal-emulators/sakura { }; - st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; extraLibs = config.st.extraLibs or []; }; - xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; - lukesmithxyz-st = callPackage ../applications/terminal-emulators/st/lukesmithxyz-st { }; - mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; - siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; }; - terminator = callPackage ../applications/terminal-emulators/terminator { }; - termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; - termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - - termonad = callPackage ../applications/terminal-emulators/termonad { }; tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; - tilix = callPackage ../applications/terminal-emulators/tilix { }; - - tym = callPackage ../applications/terminal-emulators/tym { }; - - wayst = callPackage ../applications/terminal-emulators/wayst { }; - wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications; }; - x3270 = callPackage ../applications/terminal-emulators/x3270 { }; - - xterm = callPackage ../applications/terminal-emulators/xterm { }; - - xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { }; - - yaft = callPackage ../applications/terminal-emulators/yaft { }; - - writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; }; - lifecycled = callPackage ../tools/misc/lifecycled { }; - - lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { electron = electron_20; }; - natls = callPackage ../tools/misc/natls { }; - - notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; - - pikchr = callPackage ../tools/graphics/pikchr { }; - - popl = callPackage ../development/libraries/popl { }; - - popsicle = callPackage ../tools/misc/popsicle { }; - - terminal-colors = callPackage ../applications/misc/terminal-colors { }; - - termsyn = callPackage ../data/fonts/termsyn { }; - - tvnamer = callPackage ../tools/misc/tvnamer { }; - twine = with python3Packages; toPythonApplication twine; - accelergy = callPackage ../applications/science/computer-architecture/accelergy { }; - - aldo = callPackage ../applications/radio/aldo { }; - - alglib = callPackage ../development/libraries/alglib { }; - - almanah = callPackage ../applications/misc/almanah { }; - - alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; - - amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { }; - - amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; - amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2522,248 +1199,72 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - amberol = callPackage ../applications/audio/amberol {}; - inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; - amp = callPackage ../applications/editors/amp {}; - - ams = callPackage ../applications/audio/ams {}; - - amtterm = callPackage ../tools/system/amtterm {}; - - analog = callPackage ../tools/admin/analog {}; - - android-backup-extractor = callPackage ../tools/backup/android-backup-extractor {}; - android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools (lib.optionalAttrs (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux) { stdenv = gcc10Stdenv; })); - anewer = callPackage ../tools/text/anewer { }; - - angle-grinder = callPackage ../tools/text/angle-grinder {}; - - ansifilter = callPackage ../tools/text/ansifilter {}; - - antora = callPackage ../development/tools/documentation/antora {}; - - apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; - - apfsprogs = callPackage ../tools/filesystems/apfsprogs { }; - apk-tools = callPackage ../tools/package-management/apk-tools { lua = lua5_3; }; - apkid = callPackage ../development/tools/apkid { }; - - apkleaks = callPackage ../tools/security/apkleaks { }; - - apksigcopier = callPackage ../development/tools/apksigcopier { }; - - apksigner = callPackage ../development/tools/apksigner { }; - apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; - appimage-run = callPackage ../tools/package-management/appimage-run { }; appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix { appimage-run = appimage-run.override { appimage-run-tests = null; /* break boostrap cycle for passthru.tests */ }; }; - appimagekit = callPackage ../tools/package-management/appimagekit {}; - - apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { }; - - apt-offline = callPackage ../tools/misc/apt-offline { }; - - aptly = callPackage ../tools/misc/aptly { }; - ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { }; - archivebox = callPackage ../applications/misc/archivebox { }; - - archivemount = callPackage ../tools/filesystems/archivemount { }; - - archivy = callPackage ../applications/misc/archivy { }; - - arandr = callPackage ../tools/X11/arandr { }; - - arangodb = callPackage ../servers/nosql/arangodb { }; - # arcanist currently crashes with some workflows on php8.1, use 8.0 arcanist = callPackage ../development/tools/misc/arcanist { php = php80; }; arduino = arduino-core.override { withGui = true; }; - arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; - - arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - - arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; - arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; - - arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { }; - - arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; - apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; - argagg = callPackage ../development/libraries/argagg { }; - - argtable = callPackage ../development/libraries/argtable { }; - - arguments = callPackage ../development/libraries/arguments { }; - - argus = callPackage ../tools/networking/argus {}; - - argus-clients = callPackage ../tools/networking/argus-clients {}; - - argyllcms = callPackage ../tools/graphics/argyllcms {}; - arj = callPackage ../tools/archivers/arj { stdenv = gccStdenv; }; - arp-scan = callPackage ../tools/misc/arp-scan { }; - inherit (callPackages ../data/fonts/arphic {}) arphic-ukai arphic-uming; - artyFX = callPackage ../applications/audio/artyFX {}; - - oggvideotools = callPackage ../tools/misc/oggvideotools { }; - - owl-lisp = callPackage ../development/compilers/owl-lisp {}; - - ascii = callPackage ../tools/text/ascii { }; - - asciinema = callPackage ../tools/misc/asciinema {}; - asciinema-agg = callPackage ../tools/misc/asciinema-agg { inherit (darwin.apple_sdk.frameworks) Security; }; - asciinema-scenario = callPackage ../tools/misc/asciinema-scenario {}; - - asciiquarium = callPackage ../applications/misc/asciiquarium {}; - - ashuffle = callPackage ../applications/audio/ashuffle {}; - - ashpd-demo = callPackage ../development/tools/ashpd-demo {}; - - asls = callPackage ../development/tools/misc/asls { }; - - astc-encoder = callPackage ../tools/graphics/astc-encoder { }; - asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; }; }; - async = callPackage ../development/tools/async {}; - - async-profiler = callPackage ../development/tools/async-profiler { }; - - atheme = callPackage ../servers/irc/atheme { }; - - atinout = callPackage ../tools/networking/atinout { }; - atomicparsley = callPackage ../tools/video/atomicparsley { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - audiowaveform = callPackage ../tools/audio/audiowaveform { }; - - authenticator = callPackage ../applications/misc/authenticator { }; - autoflake = with python3.pkgs; toPythonApplication autoflake; - autospotting = callPackage ../applications/misc/autospotting { }; - - autosuspend = callPackage ../os-specific/linux/autosuspend { }; - - avfs = callPackage ../tools/filesystems/avfs { }; - - aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; - - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; - - awscli = callPackage ../tools/admin/awscli { }; - - awscli2 = callPackage ../tools/admin/awscli2 { }; - - awsebcli = callPackage ../tools/virtualization/awsebcli {}; - - awslimitchecker = callPackage ../tools/admin/awslimitchecker { }; - - awslogs = callPackage ../tools/admin/awslogs { }; - - aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; - - aws-env = callPackage ../tools/admin/aws-env { }; - aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; - aws-nuke = callPackage ../tools/admin/aws-nuke { }; - - aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; - - aws-sso-cli = callPackage ../tools/admin/aws-sso-cli { }; - - aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { }; - - aws-vault = callPackage ../tools/admin/aws-vault { }; - - aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; - - iamy = callPackage ../tools/admin/iamy { }; - - iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { }; - - azure-cli = callPackage ../tools/admin/azure-cli { }; - - azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { }; - - azure-static-sites-client = callPackage ../development/tools/azure-static-sites-client { }; - - azure-storage-azcopy = callPackage ../development/tools/azcopy { }; - - bashblog = callPackage ../tools/text/bashblog { }; - - berglas = callPackage ../tools/admin/berglas { }; - - betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; - - betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; - binocle = callPackage ../applications/misc/binocle { inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore; }; - bitwise = callPackage ../tools/misc/bitwise { }; - - blanket = callPackage ../applications/audio/blanket { }; - - brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; - bootspec = callPackage ../tools/misc/bootspec { }; - # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build @@ -2777,44 +1278,14 @@ with pkgs; callPackage ../stdenv/linux/make-bootstrap-tools.nix {} else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; - boxes = callPackage ../tools/text/boxes { }; - - boundary = callPackage ../tools/networking/boundary { }; - - chamber = callPackage ../tools/admin/chamber { }; - - chaos = callPackage ../tools/networking/chaos { }; - - charm = callPackage ../applications/misc/charm { }; - chars = callPackage ../tools/text/chars { inherit (darwin.apple_sdk.frameworks) Security; }; - checkip = callPackage ../tools/networking/checkip { }; - crystfel = callPackage ../applications/science/physics/crystfel { }; crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; }; - cyberchef = callPackage ../tools/misc/cyberchef { }; - - cw = callPackage ../tools/admin/cw { }; - - ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; - - ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; - - ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; - - exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; - - altermime = callPackage ../tools/networking/altermime {}; - - alttab = callPackage ../tools/X11/alttab { }; - - amule = callPackage ../tools/networking/p2p/amule { }; - amule-daemon = amule.override { monolithic = false; enableDaemon = true; @@ -2832,74 +1303,30 @@ with pkgs; antennas = nodePackages.antennas; - apg = callPackage ../tools/security/apg { }; - apt-dater = callPackage ../tools/package-management/apt-dater { autoreconfHook = buildPackages.autoreconfHook269; }; - asusctl = callPackage ../applications/system/asusctl { }; - - autorevision = callPackage ../tools/misc/autorevision { }; - - automirror = callPackage ../tools/misc/automirror { }; - - barman = callPackage ../tools/misc/barman { }; - - bartib = callPackage ../tools/misc/bartib { }; - - base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { }; - bashate = python3Packages.callPackage ../development/tools/bashate { }; - bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; - - bashcards = callPackage ../tools/misc/bashcards { }; - - bazarr = callPackage ../servers/bazarr { }; - - bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; - - bic = callPackage ../development/interpreters/bic { }; - binance = callPackage ../applications/misc/binance { electron = electron_13; }; - bitwarden = callPackage ../tools/security/bitwarden { }; - inherit (nodePackages) bitwarden-cli; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; inherit (nodePackages) concurrently; - bklk = callPackage ../applications/misc/bklk { }; - - bkyml = callPackage ../tools/misc/bkyml { }; - - blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - bmap-tools = callPackage ../tools/misc/bmap-tools { }; - - bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; - bonnie = callPackage ../tools/filesystems/bonnie { stdenv = gcc10StdenvCompat; }; - boron = callPackage ../development/interpreters/boron { }; - botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { }; - - btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; - bucklespring = bucklespring-x11; bucklespring-libinput = callPackage ../applications/audio/bucklespring { }; bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; }; @@ -2909,67 +1336,19 @@ with pkgs; buildbot-full = with python3Packages; toPythonApplication buildbot-full; buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; - bunyan-rs = callPackage ../development/tools/bunyan-rs { }; - - callaudiod = callPackage ../applications/audio/callaudiod { }; - - calls = callPackage ../applications/networking/calls { }; - inherit (nodePackages) castnow; - castty = callPackage ../tools/misc/castty { }; - - certigo = callPackage ../tools/admin/certigo { }; - - certipy = callPackage ../tools/security/certipy { }; - catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; - changelogger = callPackage ../tools/misc/changelogger { }; - - chezmoi = callPackage ../tools/misc/chezmoi { }; - chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; }; - chroma = callPackage ../tools/text/chroma { }; - - clair = callPackage ../tools/admin/clair { }; - - clairvoyance = callPackage ../tools/security/clairvoyance { }; - - cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; - - cloudfox = callPackage ../tools/security/cloudfox { }; - - cloudsmith-cli = callPackage ../development/tools/cloudsmith-cli { }; - - codeql = callPackage ../development/tools/analysis/codeql { }; - - fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; - - ccextractor = callPackage ../applications/video/ccextractor { }; - - cconv = callPackage ../tools/text/cconv { }; - - go-check = callPackage ../development/tools/check { }; - - go-cve-search = callPackage ../tools/security/go-cve-search { }; - - chkcrontab = callPackage ../tools/admin/chkcrontab { }; - - claws = callPackage ../tools/misc/claws { }; - cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; coconut = with python3Packages; toPythonApplication coconut; - cod = callPackage ../tools/misc/cod { }; - - codespell = callPackage ../development/tools/codespell { }; - coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; corsair = with python3Packages; toPythonApplication corsair-scan; @@ -2978,168 +1357,52 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) PCSC; }; - cozy = callPackage ../applications/audio/cozy { }; - - cpptoml = callPackage ../development/libraries/cpptoml { }; - - cpuid = callPackage ../os-specific/linux/cpuid { }; - - msr = callPackage ../os-specific/linux/msr { }; - - ctre = callPackage ../development/libraries/ctre { }; - - ctrtool = callPackage ../tools/archivers/ctrtool { }; - - crowbar = callPackage ../tools/security/crowbar { }; - - crumbs = callPackage ../applications/misc/crumbs { }; - - crc32c = callPackage ../development/libraries/crc32c { }; - - crcpp = callPackage ../development/libraries/crcpp { }; - - cudd = callPackage ../development/libraries/cudd { }; - cue = callPackage ../development/tools/cue { buildGoModule = buildGo118Module; # tests fail with 1.19 }; - writeCueValidator = callPackage ../development/tools/cue/validator.nix { }; - - cuelsp = callPackage ../development/tools/cuelsp {}; - - cyclone-scheme = callPackage ../development/interpreters/cyclone { }; - - cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; - - cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; - - dcap = callPackage ../tools/networking/dcap { }; - - deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; - - delayarchitect = callPackage ../applications/audio/delayarchitect { }; - deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - deskew = callPackage ../applications/graphics/deskew { }; - detect-secrets = with python3Packages; toPythonApplication detect-secrets; - deterministic-uname = callPackage ../build-support/deterministic-uname { }; - - dfmt = callPackage ../tools/text/dfmt { }; - diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; }; - diskonaut = callPackage ../tools/misc/diskonaut { }; - diskus = callPackage ../tools/misc/diskus { inherit (darwin.apple_sdk.frameworks) Security; }; - distrobox = callPackage ../applications/virtualization/distrobox { }; - - djmount = callPackage ../tools/filesystems/djmount { }; - - dgsh = callPackage ../shells/dgsh { }; - dkimpy = with python3Packages; toPythonApplication dkimpy; - dontgo403 = callPackage ../tools/security/dontgo403 { }; - - dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; - - doona = callPackage ../tools/security/doona { }; - dotter = callPackage ../tools/misc/dotter { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - droidcam = callPackage ../applications/video/droidcam { }; - - droidmote = callPackage ../tools/inputmethods/droidmote { }; - - eartag = callPackage ../applications/audio/eartag { }; - - ecdsautils = callPackage ../tools/security/ecdsautils { }; - echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); - sedutil = callPackage ../tools/security/sedutil { }; - - elvish = callPackage ../shells/elvish { }; - - emplace = callPackage ../tools/package-management/emplace { }; - - enchive = callPackage ../tools/security/enchive { }; - - enjarify = callPackage ../tools/misc/enjarify { }; - - enpass = callPackage ../tools/security/enpass { }; - - esbuild = callPackage ../development/tools/esbuild { }; - - esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; - - essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; - - esh = callPackage ../tools/text/esh { }; - - ezstream = callPackage ../tools/audio/ezstream { }; - libfx2 = with python3Packages; toPythonApplication fx2; fastmod = callPackage ../tools/text/fastmod { inherit (darwin.apple_sdk.frameworks) Security; }; - fitnesstrax = callPackage ../applications/misc/fitnesstrax { }; - - flavours = callPackage ../applications/misc/flavours { }; - flirc = libsForQt5.callPackage ../applications/video/flirc { }; flood = nodePackages.flood; - font-config-info = callPackage ../tools/misc/font-config-info { }; - foxdot = with python3Packages; toPythonApplication foxdot; - fspy = callPackage ../applications/misc/fspy { }; - - fluffychat = callPackage ../applications/networking/instant-messengers/fluffychat { }; - - fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; - gbl = callPackage ../tools/archivers/gbl { inherit (darwin.apple_sdk.frameworks) Security; }; - genann = callPackage ../development/libraries/genann { }; - genpass = callPackage ../tools/security/genpass { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - genymotion = callPackage ../development/mobile/genymotion { }; - - galene = callPackage ../servers/web-apps/galene { }; - - galaxy-buds-client = callPackage ../applications/audio/galaxy-buds-client { }; - - gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gams = callPackage ../tools/misc/gams (config.gams or {}); - gem = callPackage ../applications/audio/pd-plugins/gem { }; - - github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; - - github-commenter = callPackage ../development/tools/github-commenter { }; - github-desktop = callPackage ../applications/version-management/github-desktop { openssl = openssl_1_1; curl = curl.override { openssl = openssl_1_1; }; @@ -3149,49 +1412,21 @@ with pkgs; gistyc = with python3Packages; toPythonApplication gistyc; - gitter = callPackage ../applications/networking/instant-messengers/gitter { }; - - gjs = callPackage ../development/libraries/gjs { }; - - gjo = callPackage ../tools/text/gjo { }; - glances = python3Packages.callPackage ../applications/system/glances { }; glasgow = with python3Packages; toPythonApplication glasgow; - glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { }; - glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { }; - gmid = callPackage ../servers/gemini/gmid { }; - - gmni = callPackage ../applications/networking/browsers/gmni { }; - gmnisrv = callPackage ../servers/gemini/gmnisrv { openssl = openssl_1_1; }; - gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; - go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa Kernel UserNotifications; }; go2tv-lite = go2tv.override { withGui = false; }; - goimapnotify = callPackage ../tools/networking/goimapnotify { }; - - gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; - - gomatrix = callPackage ../applications/misc/gomatrix { }; - - gomapenum = callPackage ../tools/security/gomapenum { }; - - gopacked = callPackage ../applications/misc/gopacked { }; - - gotktrix = callPackage ../applications/networking/instant-messengers/gotktrix { }; - - gucci = callPackage ../tools/text/gucci { }; - guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; grc = python3Packages.callPackage ../tools/misc/grc { }; @@ -3212,26 +1447,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; - - glyr = callPackage ../tools/audio/glyr { }; - - gtklp = callPackage ../tools/misc/gtklp { }; - google-amber = callPackage ../tools/graphics/amber { inherit (darwin) cctools; }; - hakrawler = callPackage ../tools/security/hakrawler { }; - - harvid = callPackage ../tools/video/harvid { }; - - headset = callPackage ../applications/audio/headset { }; - - hilbish = callPackage ../shells/hilbish { }; - - hime = callPackage ../tools/inputmethods/hime {}; - himitsu = callPackage ../tools/security/himitsu { inherit (harePackages) hare; }; @@ -3242,62 +1461,10 @@ with pkgs; hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; - hostctl = callPackage ../tools/system/hostctl { }; - - hp2p = callPackage ../tools/networking/hp2p { }; - - hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; - - http2tcp = callPackage ../tools/networking/http2tcp { }; - - httperf = callPackage ../tools/networking/httperf { }; - hwi = with python3Packages; toPythonApplication hwi; - ili2c = callPackage ../tools/misc/ili2c { }; - - imagelol = callPackage ../tools/compression/imagelol { }; - - imageworsener = callPackage ../tools/graphics/imageworsener { }; - - imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; - - imgcrypt = callPackage ../applications/virtualization/imgcrypt { }; - - ipgrep = callPackage ../tools/networking/ipgrep { }; - - ipp-usb = callPackage ../os-specific/linux/ipp-usb { }; - - itch = callPackage ../games/itch {}; - - itd = callPackage ../applications/misc/itd { }; - - lastpass-cli = callPackage ../tools/security/lastpass-cli { }; - - leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; - - lesspass-cli = callPackage ../tools/security/lesspass-cli { }; - - lsix = callPackage ../tools/graphics/lsix { }; - - mdr = callPackage ../tools/misc/mdr { }; - - mobilecoin-wallet = callPackage ../applications/misc/mobilecoin-wallet { }; - - mpdevil = callPackage ../applications/audio/mpdevil { }; - - pacparser = callPackage ../tools/networking/pacparser { }; - - opencbm = callPackage ../tools/misc/opencbm { }; - - parquet-tools = callPackage ../tools/misc/parquet-tools { }; - pass = callPackage ../tools/security/pass { }; - passage = callPackage ../tools/security/passage { }; - - passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; - pass-nodmenu = callPackage ../tools/security/pass { dmenuSupport = false; pass = pass-nodmenu; @@ -3310,44 +1477,10 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; - pdepend = callPackage ../development/php-packages/pdepend { }; - - platformsh = callPackage ../misc/platformsh { }; - inherd-quake = callPackage ../applications/misc/inherd-quake { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - xjadeo = callPackage ../tools/video/xjadeo { }; - - asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - - go-audit = callPackage ../tools/system/go-audit { }; - - gopass = callPackage ../tools/security/gopass { }; - - gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; - - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; - - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; - - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; - - gosh = callPackage ../tools/security/gosh { }; - - gospider = callPackage ../tools/security/gospider { }; - - browserpass = callPackage ../tools/security/browserpass { }; - - passff-host = callPackage ../tools/security/passff-host { }; - - oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; - - goku = callPackage ../os-specific/darwin/goku { }; - - grb = callPackage ../applications/misc/grb { }; - kerf = kerf_1; /* kerf2 is WIP */ kerf_1 = callPackage ../development/interpreters/kerf { stdenv = clangStdenv; @@ -3356,32 +1489,10 @@ with pkgs; ; }; - kwakd = callPackage ../servers/kwakd { }; - - kwm = callPackage ../os-specific/darwin/kwm { }; - khd = callPackage ../os-specific/darwin/khd { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - kjv = callPackage ../applications/misc/kjv { }; - - lukesmithxyz-bible-kjv = callPackage ../applications/misc/lukesmithxyz-bible/kjv.nix { }; - - luigi = callPackage ../applications/networking/cluster/luigi { }; - - m-cli = callPackage ../os-specific/darwin/m-cli { }; - - pebble = callPackage ../tools/admin/pebble { }; - - play-with-mpv = callPackage ../tools/video/play-with-mpv { }; - - plausible = callPackage ../servers/web-apps/plausible { }; - - pam-reattach = callPackage ../os-specific/darwin/pam-reattach {}; - - reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; - skhd = callPackage ../os-specific/darwin/skhd { inherit (darwin.apple_sdk.frameworks) Carbon; }; @@ -3390,40 +1501,18 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - waydroid = callPackage ../os-specific/linux/waydroid { }; - - wiiload = callPackage ../development/tools/wiiload { }; - winhelpcgi = callPackage ../development/tools/winhelpcgi { libpng = libpng12; }; - wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; - - waypoint = callPackage ../applications/networking/cluster/waypoint { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; - gomobile = callPackage ../development/mobile/gomobile { }; - - ssh-agents = callPackage ../tools/networking/ssh-agents { }; - ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; - ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { }; - ssh-mitm = with python3Packages; toPythonApplication ssh-mitm; - sshchecker = callPackage ../tools/security/sshchecker { }; - - sshs = callPackage ../development/tools/sshs { }; - - supergfxctl = callPackage ../applications/system/supergfxctl { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { }; - abootimg = callPackage ../development/mobile/abootimg {}; - adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { adb = androidenv.androidPkgs_9_0.platform-tools; }; @@ -3432,10 +1521,6 @@ with pkgs; inherit (androidenv.androidPkgs_9_0) platform-tools; }; - amoco = callPackage ../tools/security/amoco {}; - - anbox = callPackage ../os-specific/linux/anbox { }; - androidenv = callPackage ../development/mobile/androidenv { }; androidndkPkgs = androidndkPkgs_21; @@ -3462,127 +1547,43 @@ with pkgs; apprise = with python3Packages; toPythonApplication apprise; - aptdec = callPackage ../development/libraries/aptdec {}; - - argc = callPackage ../development/tools/argc { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; aria = aria2; - as-tree = callPackage ../tools/misc/as-tree { }; - - asmfmt = callPackage ../development/tools/asmfmt { }; - - asmrepl = callPackage ../development/interpreters/asmrepl { }; - - aspcud = callPackage ../tools/misc/aspcud { }; - - at = callPackage ../tools/system/at { }; - - atftp = callPackage ../tools/networking/atftp { }; - authoscope = callPackage ../tools/security/authoscope { inherit (darwin.apple_sdk.frameworks) Security; }; - autogen = callPackage ../development/tools/misc/autogen { }; - - autojump = callPackage ../tools/misc/autojump { }; - - automysqlbackup = callPackage ../tools/backup/automysqlbackup { }; - - autorandr = callPackage ../tools/misc/autorandr {}; - avahi = callPackage ../development/libraries/avahi (config.avahi or {}); avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // { withLibdnssdCompat = true; }); - avro-c = callPackage ../development/libraries/avro-c { }; - - avro-cpp = callPackage ../development/libraries/avro-c++ { }; - - aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; - - awsls = callPackage ../tools/admin/awsls { }; - - awsrm = callPackage ../tools/admin/awsrm { }; - - awstats = callPackage ../tools/system/awstats { }; - - awsweeper = callPackage ../tools/admin/awsweeper { }; - axel = callPackage ../tools/networking/axel { libssl = openssl; }; - b3sum = callPackage ../tools/security/b3sum {}; - - backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; - bandwhich = callPackage ../tools/networking/bandwhich { inherit (darwin.apple_sdk.frameworks) Security; }; - badrobot = callPackage ../tools/security/badrobot {}; - - bao = callPackage ../tools/security/bao {}; - - bar = callPackage ../tools/system/bar {}; - - base16-shell-preview = callPackage ../misc/base16-shell-preview { }; - base16-builder = callPackage ../misc/base16-builder { }; - basex = callPackage ../tools/text/xml/basex { }; - - bashplotlib = callPackage ../tools/misc/bashplotlib { }; - - babeld = callPackage ../tools/networking/babeld { }; - - babelfish = callPackage ../shells/fish/babelfish.nix { }; - badchars = python3Packages.callPackage ../tools/security/badchars { }; - badvpn = callPackage ../tools/networking/badvpn {}; - - baget = callPackage ../servers/web-apps/baget { }; - - barcode = callPackage ../tools/graphics/barcode {}; - - bashmount = callPackage ../tools/filesystems/bashmount {}; - bat = callPackage ../tools/misc/bat { inherit (darwin.apple_sdk.frameworks) Security; }; bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { }); - beats = callPackage ../tools/misc/beats { }; - - BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; - beautysh = callPackage ../development/tools/beautysh { }; - - bc = callPackage ../tools/misc/bc { }; - - bdf2psf = callPackage ../tools/misc/bdf2psf { }; - - bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; - - bdfresize = callPackage ../tools/misc/bdfresize { }; - - bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; - - bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 @@ -3600,42 +1601,12 @@ with pkgs; metricbeat = metricbeat6; journalbeat = journalbeat6; - bfr = callPackage ../tools/misc/bfr { }; - - bibtool = callPackage ../tools/misc/bibtool { }; - - bibutils = callPackage ../tools/misc/bibutils { }; - - bibtex2html = callPackage ../tools/misc/bibtex2html { }; - - bicon = callPackage ../applications/misc/bicon { }; - biliass = with python3.pkgs; toPythonApplication biliass; - bindfs = callPackage ../tools/filesystems/bindfs { }; - binwalk = with python3Packages; toPythonApplication binwalk; birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - blitz = callPackage ../development/libraries/blitz { }; - - blockbook = callPackage ../servers/blockbook { }; - - blockhash = callPackage ../tools/graphics/blockhash { }; - - bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; - - bluewalker = callPackage ../tools/bluetooth/bluewalker { }; - - blur-effect = callPackage ../tools/graphics/blur-effect { }; - - bootiso = callPackage ../tools/cd-dvd/bootiso { }; - - butane = callPackage ../development/tools/butane { }; - - buttercup-desktop = callPackage ../tools/security/buttercup-desktop { }; - charles = charles4; inherit (callPackage ../applications/networking/charles {}) charles3 @@ -3656,116 +1627,30 @@ with pkgs; cudaSupport = config.cudaSupport or false; }; - tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; - - tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { }; - behave = with python3Packages; toPythonApplication behave; - behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; - - bfetch = callPackage ../tools/misc/bfetch { }; - - bless = callPackage ../applications/editors/bless { }; - - blink1-tool = callPackage ../tools/misc/blink1-tool { }; - - blis = callPackage ../development/libraries/science/math/blis { }; - - bliss = callPackage ../applications/science/math/bliss { }; - - blobfuse = callPackage ../tools/filesystems/blobfuse { }; - blockdiag = with python3Packages; toPythonApplication blockdiag; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; - - bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; - - bmon = callPackage ../tools/misc/bmon { }; + # Upstream recommends qt5.12 and it doesn't build with qt5.15 + boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; - bmake = callPackage ../development/tools/build-managers/bmake { }; + bozohttpd = callPackage ../servers/http/bozohttpd { }; + bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - boca = callPackage ../development/libraries/boca { }; + bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; - bubblewrap = callPackage ../tools/admin/bubblewrap { }; + brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); - borgbackup = callPackage ../tools/backup/borgbackup { }; + broot = callPackage ../tools/misc/broot { + inherit (darwin.apple_sdk.frameworks) Security; + }; - borgmatic = callPackage ../tools/backup/borgmatic { }; + breakpointHook = assert stdenv.buildPlatform.isLinux; + makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - borg-sans-mono = callPackage ../data/fonts/borg-sans-mono { }; + btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - boringtun = callPackage ../tools/networking/boringtun { }; - - book-summary = callPackage ../tools/text/book-summary { }; - - bookstack = callPackage ../servers/web-apps/bookstack { }; - - # Upstream recommends qt5.12 and it doesn't build with qt5.15 - boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; - - boost-build = callPackage ../development/tools/boost-build { }; - - boot = callPackage ../development/tools/build-managers/boot { }; - - bowtie = callPackage ../applications/science/biology/bowtie { }; - - bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; - - boxfs = callPackage ../tools/filesystems/boxfs { }; - - bozohttpd = callPackage ../servers/http/bozohttpd { }; - bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - - bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; - - bpytop = callPackage ../tools/system/bpytop { }; - - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); - - brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; - - brigand = callPackage ../development/libraries/brigand { }; - - brltty = callPackage ../tools/misc/brltty { }; - - brook = callPackage ../tools/networking/brook { }; - - broot = callPackage ../tools/misc/broot { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; - - brutespray = callPackage ../tools/security/brutespray { }; - - breakpointHook = assert stdenv.buildPlatform.isLinux; - makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - - btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; - - btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { }; - - btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - - btrbk = callPackage ../tools/backup/btrbk { }; - - buildpack = callPackage ../development/tools/buildpack { }; - - bottom-rs = callPackage ../tools/misc/bottom-rs { }; - - bsp-layout = callPackage ../tools/misc/bsp-layout {}; - - buildtorrent = callPackage ../tools/misc/buildtorrent { }; - - bundletool = callPackage ../development/tools/bundletool { }; - - bustle = haskellPackages.bustle; - - bwm_ng = callPackage ../tools/networking/bwm-ng { }; - - bwbasic = callPackage ../development/interpreters/bwbasic { }; + bustle = haskellPackages.bustle; byobu = callPackage ../tools/misc/byobu { # Choices: [ tmux screen ]; @@ -3777,19 +1662,6 @@ with pkgs; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; - btfs = callPackage ../os-specific/linux/btfs { }; - - buildah = callPackage ../development/tools/buildah/wrapper.nix { }; - buildah-unwrapped = callPackage ../development/tools/buildah { }; - - buildkit = callPackage ../development/tools/buildkit { }; - - bukubrow = callPackage ../tools/networking/bukubrow { }; - - burpsuite = callPackage ../tools/networking/burpsuite {}; - - bs-platform = callPackage ../development/compilers/bs-platform {}; - ciano = callPackage ../applications/graphics/ciano { inherit (pantheon) granite; python = python3; @@ -3800,8 +1672,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix); @@ -3823,31 +1693,14 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { }; - - xcaddy = callPackage ../servers/caddy/xcaddy { }; - - traefik = callPackage ../servers/traefik { }; - - traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; - calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = boost.override { enablePython = true; python = python3; }; }; calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; }); - calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {}; - - calendar-cli = callPackage ../tools/networking/calendar-cli { }; - - cameradar = callPackage ../tools/security/cameradar { }; candle = libsForQt5.callPackage ../applications/misc/candle { }; - capstone = callPackage ../development/libraries/capstone { }; - - keystone = callPackage ../development/libraries/keystone { }; - casync = callPackage ../applications/networking/sync/casync { sphinx = buildPackages.python3Packages.sphinx; }; @@ -3855,40 +1708,12 @@ with pkgs; cataract = callPackage ../applications/misc/cataract { }; cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; - catch = callPackage ../development/libraries/catch { }; - - catch2 = callPackage ../development/libraries/catch2 { }; - - catch2_3 = callPackage ../development/libraries/catch2/3.nix { }; - - catdoc = callPackage ../tools/text/catdoc { }; - - catdocx = callPackage ../tools/text/catdocx { }; - - catclock = callPackage ../applications/misc/catclock { }; - cardpeek = callPackage ../applications/misc/cardpeek { inherit (darwin.apple_sdk.frameworks) PCSC; }; - cawbird = callPackage ../applications/networking/cawbird { }; - - cde = callPackage ../tools/package-management/cde { }; - - cdxgen = callPackage ../tools/security/cdxgen { }; - ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - cbor-diag = callPackage ../development/tools/cbor-diag { }; - - cassowary = callPackage ../tools/networking/cassowary { }; - - croc = callPackage ../tools/networking/croc { }; - - cbftp = callPackage ../tools/networking/cbftp { }; - - cddl = callPackage ../development/tools/cddl { }; - cedille = callPackage ../applications/science/logic/cedille { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; @@ -3897,92 +1722,26 @@ with pkgs; openssl = openssl_1_1; }; - cf-terraforming = callPackage ../tools/misc/cf-terraforming { }; - - charliecloud = callPackage ../applications/virtualization/charliecloud { }; - - chelf = callPackage ../tools/misc/chelf { }; - - chisel = callPackage ../tools/networking/chisel { }; - - cht-sh = callPackage ../tools/misc/cht.sh { }; - cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; }; cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { openssl = openssl_1_1; }; - ckbcomp = callPackage ../tools/X11/ckbcomp { }; - - clac = callPackage ../tools/misc/clac {}; - - map-cmd = callPackage ../tools/misc/map {}; - - clash = callPackage ../tools/networking/clash { }; - - clash-geoip = callPackage ../data/misc/clash-geoip { }; - clevercsv = with python3Packages; toPythonApplication clevercsv; clevis = callPackage ../tools/security/clevis { asciidoc = asciidoc-full; }; - cli53 = callPackage ../tools/admin/cli53 { }; - - cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; - - cliam = callPackage ../tools/security/cliam { }; - - clickclack = callPackage ../tools/misc/clickclack { }; - clickgen = with python3Packages; toPythonApplication clickgen; - clog-cli = callPackage ../development/tools/clog-cli { }; - cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; }; - cloudbrute = callPackage ../tools/security/cloudbrute { }; - - cloudflared = callPackage ../applications/networking/cloudflared { }; - - cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; - - cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; - - clib = callPackage ../tools/package-management/clib { }; - - clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; - - clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; - - clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; - - clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; - coloredlogs = with python3Packages; toPythonApplication coloredlogs; - colpack = callPackage ../applications/science/math/colpack { }; - - cz-cli = callPackage ../applications/version-management/cz-cli {}; - - comma = callPackage ../tools/package-management/comma { }; - commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; - common-licenses = callPackage ../data/misc/common-licenses {}; - - compactor = callPackage ../applications/networking/compactor { }; - - consul = callPackage ../servers/consul { }; - - consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; - - consul-template = callPackage ../tools/system/consul-template { }; - - copyright-update = callPackage ../tools/text/copyright-update { }; - inherit (callPackage ../tools/misc/coreboot-utils { }) msrtool cbmem @@ -3999,277 +1758,43 @@ with pkgs; coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; - corosync = callPackage ../servers/corosync { }; - - cowsay = callPackage ../tools/misc/cowsay { }; - - czkawka = callPackage ../tools/misc/czkawka { }; - - cherrytree = callPackage ../applications/misc/cherrytree { }; - - chntpw = callPackage ../tools/security/chntpw { }; - - chopchop = callPackage ../tools/security/chopchop { }; - - cliphist = callPackage ../tools/wayland/cliphist { }; - - clipman = callPackage ../tools/wayland/clipman { }; - - kabeljau = callPackage ../games/kabeljau { }; - - kanshi = callPackage ../tools/wayland/kanshi { }; - - oguri = callPackage ../tools/wayland/oguri { }; - - shotman = callPackage ../tools/wayland/shotman { }; - - slurp = callPackage ../tools/wayland/slurp { }; - - sov = callPackage ../tools/wayland/sov { }; - - swaykbdd = callPackage ../tools/wayland/swaykbdd { }; - - swaycwd = callPackage ../tools/wayland/swaycwd { }; - - swayr = callPackage ../tools/wayland/swayr { }; - - swaysome = callPackage ../tools/wayland/swaysome { }; - - swayimg = callPackage ../tools/wayland/swayimg { }; - swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; - - waynergy = callPackage ../tools/wayland/waynergy { }; - - wayout = callPackage ../tools/wayland/wayout { }; - - way-displays = callPackage ../tools/wayland/way-displays { }; - - wev = callPackage ../tools/wayland/wev { }; - - wdomirror = callPackage ../tools/wayland/wdomirror { }; - - wdt = callPackage ../applications/networking/sync/wdt { }; - - wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; - - wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { }; - - wl-color-picker = callPackage ../tools/wayland/wl-color-picker { }; - - wl-mirror = callPackage ../tools/wayland/wl-mirror { }; - - wlogout = callPackage ../tools/wayland/wlogout { }; - - wlopm = callPackage ../tools/wayland/wlopm { }; - - wlprop = callPackage ../tools/wayland/wlprop {}; - - wlr-randr = callPackage ../tools/wayland/wlr-randr { }; - - wlrctl = callPackage ../tools/wayland/wlrctl { }; - - wlsunset = callPackage ../tools/wayland/wlsunset { }; - - wl-gammactl = callPackage ../tools/wayland/wl-gammactl { }; - - wluma = callPackage ../tools/wayland/wluma { }; - - wob = callPackage ../tools/wayland/wob { }; - - wpaperd = callPackage ../tools/wayland/wpaperd { }; - - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; - - wtype = callPackage ../tools/wayland/wtype { }; - - ydotool = callPackage ../tools/wayland/ydotool { }; - - cambalache = callPackage ../development/tools/cambalache { }; - - changedetection-io = callPackage ../servers/web-apps/changedetection-io { }; - - clini = callPackage ../tools/misc/clini { }; - - clipster = callPackage ../tools/misc/clipster { }; - clockify = callPackage ../applications/office/clockify { electron = electron_11; }; - contrast = callPackage ../applications/accessibility/contrast { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); - cpulimit = callPackage ../tools/misc/cpulimit { }; - - code-minimap = callPackage ../tools/misc/code-minimap { }; - - codesearch = callPackage ../tools/text/codesearch { }; - - codec2 = callPackage ../development/libraries/codec2 { }; - contacts = callPackage ../tools/misc/contacts { inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; xcbuildHook = xcbuild6Hook; }; - colorls = callPackage ../tools/system/colorls { }; - coloursum = callPackage ../tools/text/coloursum { inherit (darwin.apple_sdk.frameworks) Security; }; - compsize = callPackage ../os-specific/linux/compsize { }; - - comrak = callPackage ../tools/text/comrak { }; - cot = with python3Packages; toPythonApplication cot; - coturn = callPackage ../servers/coturn { }; - - coursier = callPackage ../development/tools/coursier {}; - - cppclean = callPackage ../development/tools/cppclean {}; - - credhub-cli = callPackage ../tools/admin/credhub-cli {}; - - crex = callPackage ../tools/misc/crex { }; - - cri-tools = callPackage ../tools/virtualization/cri-tools {}; - - crip = callPackage ../applications/audio/crip { }; - - crosvm = callPackage ../applications/virtualization/crosvm { }; - crossplane = with python3Packages; toPythonApplication crossplane; - crowdsec = callPackage ../tools/security/crowdsec { }; - - crunch = callPackage ../tools/security/crunch { }; - - crudini = callPackage ../tools/misc/crudini { }; - - csv2odf = callPackage ../applications/office/csv2odf { }; - - csv2parquet = callPackage ../tools/misc/csv2parquet { }; - - csvdiff = callPackage ../tools/text/csvdiff { }; - - csview = callPackage ../tools/text/csview { }; - - csvkit = callPackage ../tools/text/csvkit { }; - - csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; - - csv2latex = callPackage ../tools/misc/csv2latex { }; - - csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; - - cucumber = callPackage ../development/tools/cucumber {}; - cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; - dab_lib = callPackage ../development/libraries/dab_lib {}; - - dabet = callPackage ../tools/misc/dabet { }; - - dabtools = callPackage ../applications/radio/dabtools { }; - - daemontools = callPackage ../tools/admin/daemontools { }; - - dagger = callPackage ../development/tools/continuous-integration/dagger { }; - - dale = callPackage ../development/compilers/dale { }; - - damon = callPackage ../tools/admin/damon { }; - - dancing-script = callPackage ../data/fonts/dancing-script { }; - - dante = callPackage ../servers/dante { }; - - dapr-cli = callPackage ../development/tools/dapr/cli {}; - - dasel = callPackage ../applications/misc/dasel { }; - - dasher = callPackage ../applications/accessibility/dasher { }; - - datafusion-cli = callPackage ../development/misc/datafusion { }; - - datamash = callPackage ../tools/misc/datamash { }; - datasette = with python3Packages; toPythonApplication datasette; - howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { }; - - datefmt = callPackage ../tools/misc/datefmt { }; - - datefudge = callPackage ../tools/system/datefudge { }; - - dateutils = callPackage ../tools/misc/dateutils { }; - datovka = libsForQt5.callPackage ../applications/networking/datovka { }; - dave = callPackage ../servers/http/dave { }; - - dconf = callPackage ../development/libraries/dconf { }; - - ddate = callPackage ../tools/misc/ddate { }; - - ddosify = callPackage ../development/tools/ddosify { }; - - dduper = callPackage ../tools/filesystems/dduper { }; - - dedup = callPackage ../tools/backup/dedup { }; - - deheader = callPackage ../development/tools/misc/deheader { }; - - dehydrated = callPackage ../tools/admin/dehydrated { }; - - deja-dup = callPackage ../applications/backup/deja-dup { }; - - dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { }; - - desync = callPackage ../applications/networking/sync/desync { }; - - devdocs-desktop = callPackage ../applications/misc/devdocs-desktop { }; - - devmem2 = callPackage ../os-specific/linux/devmem2 { }; - - dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; - - dbx = callPackage ../applications/misc/dbx { }; - - ioport = callPackage ../os-specific/linux/ioport {}; - - dgoss = callPackage ../tools/misc/dgoss { }; - diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; - dialect = callPackage ../applications/misc/dialect { }; - - dialog = callPackage ../tools/misc/dialog { }; - dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; - dibbler = callPackage ../tools/networking/dibbler { }; - - dieharder = callPackage ../tools/security/dieharder { }; - diesel-cli = callPackage ../development/tools/diesel-cli { inherit (darwin.apple_sdk.frameworks) Security; }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; - - digitemp = callPackage ../tools/misc/digitemp { }; - dijo = callPackage ../tools/misc/dijo { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -4279,98 +1804,36 @@ with pkgs; aspellDicts_en = aspellDicts.en; }; - dirb = callPackage ../tools/networking/dirb { }; - - direnv = callPackage ../tools/misc/direnv { }; - - dirstalk = callPackage ../tools/security/dirstalk { }; - - h = callPackage ../tools/misc/h { }; - - discount = callPackage ../tools/text/discount { }; - discourse = callPackage ../servers/web-apps/discourse { }; discourseAllPlugins = discourse.override { plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins); }; - discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { }; - - discocss = callPackage ../tools/misc/discocss { }; - - disfetch = callPackage ../tools/misc/disfetch { }; - - disk-filltest = callPackage ../tools/system/disk-filltest { }; - - diskscan = callPackage ../tools/misc/diskscan { }; - disorderfs = callPackage ../tools/filesystems/disorderfs { asciidoc = asciidoc-full; }; - dislocker = callPackage ../tools/filesystems/dislocker { }; - - distgen = callPackage ../development/tools/distgen {}; - - distrobuilder = callPackage ../tools/virtualization/distrobuilder { }; - - ditaa = callPackage ../tools/graphics/ditaa { }; - dino = callPackage ../applications/networking/instant-messengers/dino { inherit (gst_all_1) gstreamer gst-plugins-base; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - djv = callPackage ../applications/graphics/djv { }; - dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; - doitlive = callPackage ../tools/misc/doitlive { }; - - dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; - - dolibarr = callPackage ../servers/web-apps/dolibarr { }; - - doppler = callPackage ../tools/security/doppler {}; - - dosage = callPackage ../applications/graphics/dosage { }; - dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { inherit (darwin.apple_sdk.frameworks) Security; }; inherit (ocamlPackages) dot-merlin-reader; - dozenal = callPackage ../applications/misc/dozenal { }; - - dpic = callPackage ../tools/graphics/dpic { }; - - dsdcc = callPackage ../development/libraries/dsdcc {}; - - dstp = callPackage ../development/tools/dstp { }; - - dsvpn = callPackage ../applications/networking/dsvpn { }; - - dtools = callPackage ../development/tools/dtools { }; - - dt-shell-color-scripts = callPackage ../tools/misc/dt-shell-color-scripts { }; - - dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { inherit (darwin.apple_sdk.frameworks) Foundation; }; - duf = callPackage ../tools/misc/duf { }; - - dum = callPackage ../development/tools/dum { }; - inherit (ocaml-ng.ocamlPackages_4_10) dune_1; inherit (ocamlPackages) dune_2 dune_3 dune-release; - duperemove = callPackage ../tools/filesystems/duperemove { }; - dvc = callPackage ../applications/version-management/dvc { }; dvc-with-remotes = callPackage ../applications/version-management/dvc { @@ -4380,46 +1843,10 @@ with pkgs; enableSSH = true; }; - dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; - - dynamic-wallpaper = callPackage ../tools/graphics/dynamic-wallpaper { }; - - dyncall = callPackage ../development/libraries/dyncall { }; - - dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; - - earthly = callPackage ../development/tools/earthly { }; - - earlybird = callPackage ../tools/security/earlybird { }; - - earlyoom = callPackage ../os-specific/linux/earlyoom { }; - - easycrypt = callPackage ../applications/science/logic/easycrypt { }; - - easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { }; - - easyocr = with python3.pkgs; toPythonApplication easyocr; - - EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; - - ecasound = callPackage ../applications/audio/ecasound { }; - - edac-utils = callPackage ../os-specific/linux/edac-utils { }; + easyocr = with python3.pkgs; toPythonApplication easyocr; eddy = libsForQt5.callPackage ../applications/graphics/eddy { }; - eggdrop = callPackage ../tools/networking/eggdrop { }; - - ekam = callPackage ../development/tools/build-managers/ekam { }; - - eksctl = callPackage ../tools/admin/eksctl { }; - - electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; - - electron-mail = callPackage ../applications/networking/mailreaders/electron-mail { }; - - element = callPackage ../applications/science/chemistry/element { }; - element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_20; @@ -4435,175 +1862,34 @@ with pkgs; conf = config.element-web.conf or { }; }; - elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; - - ell = callPackage ../os-specific/linux/ell { }; - - elm-github-install = callPackage ../tools/package-management/elm-github-install { }; - - elogind = callPackage ../applications/misc/elogind { }; - - elpa = callPackage ../development/libraries/elpa { }; - - enca = callPackage ../tools/text/enca { }; - - ent = callPackage ../tools/misc/ent { }; - - entwine = callPackage ../applications/graphics/entwine { }; - - envconsul = callPackage ../tools/system/envconsul { }; - - envsubst = callPackage ../tools/misc/envsubst { }; - - envfs = callPackage ../tools/filesystems/envfs { }; - - er-patcher = callPackage ../tools/games/er-patcher { }; - - errcheck = callPackage ../development/tools/errcheck { }; - - eschalot = callPackage ../tools/security/eschalot { }; - espanso = callPackage ../applications/office/espanso { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; openssl = openssl_1_1; }; - esphome = callPackage ../tools/misc/esphome { }; - - esptool = callPackage ../tools/misc/esptool { }; - - esptool_3 = callPackage ../tools/misc/esptool/3.nix { }; - - esptool-ck = callPackage ../tools/misc/esptool-ck { }; - - ephemeralpg = callPackage ../development/tools/database/ephemeralpg {}; - - et = callPackage ../applications/misc/et {}; - - ejson = callPackage ../development/tools/ejson {}; - - eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; - - extism-cli = callPackage ../development/tools/extism-cli {}; - - extrude = callPackage ../tools/security/extrude { }; - - fastly = callPackage ../misc/fastly { - # If buildGoModule is overridden, provide a matching version of the go attribute - }; - - f2 = callPackage ../tools/misc/f2 {}; - - f3 = callPackage ../tools/filesystems/f3 { }; - f3d = callPackage ../applications/graphics/f3d { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; - fac = callPackage ../development/tools/fac { }; - - facedetect = callPackage ../tools/graphics/facedetect { }; - - findimagedupes = callPackage ../tools/graphics/findimagedupes { }; - - facter = callPackage ../tools/system/facter { }; - - faketty = callPackage ../tools/misc/faketty { }; - - fasd = callPackage ../tools/misc/fasd { }; - - fastJson = callPackage ../development/libraries/fastjson { }; - fast-cli = nodePackages.fast-cli; - fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; - fast-ssh = callPackage ../tools/networking/fast-ssh { inherit (darwin.apple_sdk.frameworks) Security; }; - faudio = callPackage ../development/libraries/faudio { }; - - fblog = callPackage ../development/tools/fblog { }; - - fd = callPackage ../tools/misc/fd { }; - fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; - filebench = callPackage ../tools/misc/filebench { }; - - filebot = callPackage ../applications/video/filebot { }; - - fileshare = callPackage ../servers/fileshare {}; - - fileshelter = callPackage ../servers/web-apps/fileshelter { }; - - fioctl = callPackage ../tools/admin/fioctl { }; - - firecracker = callPackage ../applications/virtualization/firecracker { }; - - firectl = callPackage ../applications/virtualization/firectl { }; - - firestarter = callPackage ../applications/misc/firestarter { }; - - fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; - - flitter = callPackage ../tools/misc/flitter { }; - - frangipanni = callPackage ../tools/text/frangipanni { }; - - frawk = callPackage ../tools/text/frawk { }; - - frei = callPackage ../tools/misc/frei { }; - - fselect = callPackage ../tools/misc/fselect { }; - - fsmon = callPackage ../tools/misc/fsmon { }; - - fst = callPackage ../tools/text/fst { }; - - fsql = callPackage ../tools/misc/fsql { }; - ### TOOLS/TYPESETTING/TEX - auctex = callPackage ../tools/typesetting/tex/auctex { }; - - blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; - - dblatex = callPackage ../tools/typesetting/tex/dblatex { }; - dblatexFull = dblatex.override { enableAllFeatures = true; }; - latexrun = callPackage ../tools/typesetting/tex/latexrun { }; - - lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - - mftrace = callPackage ../tools/typesetting/tex/mftrace { }; - # Keep the old PGF since some documents don't render properly with # the new one. - pgf1 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-1.x.nix { }; - - pgf2 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-2.x.nix { }; - - pgf3 = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-3.x.nix { }; pgf = pgf2; - pgf-pie = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-pie.nix { }; - - pgf-umlcd = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix { }; - - pgf-umlsd = callPackage ../tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix { }; - - pgfplots = callPackage ../tools/typesetting/tex/pgf-tikz/pgfplots.nix { }; - - pplatex = callPackage ../tools/typesetting/tex/pplatex { }; - tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tex-match = callPackage ../tools/typesetting/tex/tex-match { }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive @@ -4617,113 +1903,28 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fpp = callPackage ../tools/misc/fpp { }; - - fsmark = callPackage ../tools/misc/fsmark { }; - futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; - fx = callPackage ../development/tools/fx { }; - - tllist = callPackage ../development/libraries/tllist { }; - - fcft = callPackage ../development/libraries/fcft { }; - - fuzzel = callPackage ../applications/misc/fuzzel { }; - - flashfocus = callPackage ../misc/flashfocus { }; - qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; fwup = callPackage ../tools/misc/fwup { inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; - fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; - - fzf = callPackage ../tools/misc/fzf { }; - - fzf-obc = callPackage ../shells/bash/fzf-obc { }; - - fzf-zsh = callPackage ../shells/zsh/fzf-zsh { }; - - fzy = callPackage ../tools/misc/fzy { }; - g2o = libsForQt5.callPackage ../development/libraries/g2o { }; - gb-backup = callPackage ../tools/backup/gamerbackup { }; - - gbsplay = callPackage ../applications/audio/gbsplay { }; - - gdrive = callPackage ../applications/networking/gdrive { }; - - gdu = callPackage ../tools/system/gdu { }; - - gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { }; - - go-chromecast = callPackage ../applications/video/go-chromecast { }; - - go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; - go-rice = callPackage ../tools/misc/go.rice {}; - - go-2fa = callPackage ../tools/security/2fa {}; - - go-dependency-manager = callPackage ../development/tools/gdm { }; - - go-neb = callPackage ../applications/networking/instant-messengers/go-neb { }; - geckodriver = callPackage ../development/tools/geckodriver { inherit (darwin.apple_sdk.frameworks) Security; }; - geekbench4 = callPackage ../tools/misc/geekbench/4.nix { }; - geekbench5 = callPackage ../tools/misc/geekbench { }; geekbench = geekbench5; - gencfsm = callPackage ../tools/security/gencfsm { }; - - genromfs = callPackage ../tools/filesystems/genromfs { }; - - gh-ost = callPackage ../tools/misc/gh-ost { }; - - ghdorker = callPackage ../tools/security/ghdorker { }; - - ghidra = callPackage ../tools/security/ghidra/build.nix { }; - - ghidra-bin = callPackage ../tools/security/ghidra { }; - - gh2md = callPackage ../tools/backup/gh2md { }; - - gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; - - giph = callPackage ../applications/video/giph { }; - - gir-rs = callPackage ../development/tools/gir { }; - - gist = callPackage ../tools/text/gist { }; - - gitjacker = callPackage ../tools/security/gitjacker { }; - - gixy = callPackage ../tools/admin/gixy { }; - - glpaper = callPackage ../development/tools/glpaper { }; - - gllvm = callPackage ../development/tools/gllvm { }; - - glide = callPackage ../development/tools/glide { }; - - globalarrays = callPackage ../development/libraries/globalarrays { }; - - glock = callPackage ../development/tools/glock { }; - glslviewer = callPackage ../development/tools/glslviewer { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; # NOTE: If overriding qt version, krita needs to use the same qt version as @@ -4737,24 +1938,6 @@ with pkgs; inherit (darwin) libobjc libresolv; }; - goa = callPackage ../development/tools/goa { }; - - goawk = callPackage ../tools/text/goawk { }; - - gohai = callPackage ../tools/system/gohai { }; - - gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - - godu = callPackage ../tools/misc/godu { }; - - goss = callPackage ../tools/misc/goss { }; - - gosu = callPackage ../tools/misc/gosu { }; - - gotify-cli = callPackage ../tools/misc/gotify-cli { }; - - gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; - gping = callPackage ../tools/networking/gping { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4769,64 +1952,18 @@ with pkgs; pythonPackages = python3Packages; }; - grim = callPackage ../tools/graphics/grim { }; - - grit = callPackage ../tools/misc/grit { }; - - grobi = callPackage ../tools/X11/grobi { }; - - gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; - - gsctl = callPackage ../applications/misc/gsctl { }; - - gthree = callPackage ../development/libraries/gthree { }; - - gtg = callPackage ../applications/office/gtg { }; - - gti = callPackage ../tools/misc/gti { }; - - hdate = callPackage ../applications/misc/hdate { }; - - heatseeker = callPackage ../tools/misc/heatseeker { }; - - hebcal = callPackage ../tools/misc/hebcal {}; - hebbot = callPackage ../servers/matrix-hebbot { inherit (darwin.apple_sdk.frameworks) Security; }; - hexio = callPackage ../development/tools/hexio { }; - - hexyl = callPackage ../tools/misc/hexyl { }; - - hid-listen = callPackage ../tools/misc/hid-listen { }; - - hid-tools = callPackage ../tools/misc/hid-tools { }; - - hidrd = callPackage ../tools/misc/hidrd { }; - hiksink = callPackage ../tools/misc/hiksink { inherit (darwin.apple_sdk.frameworks) Security; }; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - home-manager = callPackage ../tools/package-management/home-manager {}; - - hostsblock = callPackage ../tools/misc/hostsblock { }; - - hottext = callPackage ../tools/text/hottext { }; - hopper = qt5.callPackage ../development/tools/analysis/hopper {}; - hr = callPackage ../applications/misc/hr { }; - - humioctl = callPackage ../applications/logging/humioctl {}; - - huniq = callPackage ../tools/text/huniq { }; - - hunt = callPackage ../tools/misc/hunt { }; - hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; @@ -4839,44 +1976,12 @@ with pkgs; stdenv = gcc11Stdenv; }; - hysteria = callPackage ../tools/networking/hysteria { }; - - hyx = callPackage ../tools/text/hyx { }; - - icdiff = callPackage ../tools/text/icdiff {}; - - inchi = callPackage ../development/libraries/inchi {}; - - icon-slicer = callPackage ../tools/X11/icon-slicer { }; - - ifm = callPackage ../tools/graphics/ifm {}; - - iina = callPackage ../applications/video/iina { }; - - ink = callPackage ../tools/misc/ink { }; - - inklecate = callPackage ../development/compilers/inklecate {}; - intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; - interactsh = callPackage ../tools/misc/interactsh { }; - - interlock = callPackage ../servers/interlock {}; - - invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; - - iotools = callPackage ../tools/misc/iotools { }; - - irpf = callPackage ../applications/finance/irpf { }; - - jellycli = callPackage ../applications/audio/jellycli { }; - jellyfin = callPackage ../servers/jellyfin { ffmpeg = jellyfin-ffmpeg; }; - jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; - jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; # Disable pipewire to avoid segfault, see https://github.com/jellyfin/jellyfin-media-player/issues/341 @@ -4887,54 +1992,22 @@ with pkgs; jellyfin-web = callPackage ../servers/jellyfin/web.nix { }; - jiten = callPackage ../applications/misc/jiten { }; - - kanjidraw = callPackage ../applications/misc/kanjidraw { }; - - jotta-cli = callPackage ../applications/misc/jotta-cli { }; - - joycond = callPackage ../os-specific/linux/joycond { }; - - joystickwake = callPackage ../tools/games/joystickwake {}; - jwt-cli = callPackage ../tools/security/jwt-cli { inherit (darwin.apple_sdk.frameworks) Security; }; - jwt-hack = callPackage ../tools/security/jwt-hack { } ; - - jwx = callPackage ../tools/security/jwx { } ; - - kapacitor = callPackage ../servers/monitoring/kapacitor { }; - - karma = callPackage ../servers/monitoring/karma { }; - kaldi = callPackage ../tools/audio/kaldi { inherit (darwin.apple_sdk.frameworks) Accelerate; }; - kalker = callPackage ../tools/misc/kalker { }; - - kisslicer = callPackage ../tools/misc/kisslicer { }; - klaus = with python3Packages; toPythonApplication klaus; - klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; - klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { }; - klog = qt5.callPackage ../applications/radio/klog { }; - komga = callPackage ../servers/komga { }; - - krapslog = callPackage ../tools/misc/krapslog { }; - - krelay = callPackage ../applications/networking/cluster/krelay { }; - krill = callPackage ../servers/krill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4944,119 +2017,29 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit; }; - lcdproc = callPackage ../servers/monitoring/lcdproc { }; - - languagetool = callPackage ../tools/text/languagetool { }; - - ldtk = callPackage ../applications/editors/ldtk { }; - - lepton = callPackage ../tools/graphics/lepton { }; - - lepton-eda = callPackage ../applications/science/electronics/lepton-eda { }; - - lexend = callPackage ../data/fonts/lexend { }; - - lexicon = callPackage ../tools/admin/lexicon { }; - lief = callPackage ../development/libraries/lief { python = python3; }; - libnbd = callPackage ../development/libraries/libnbd { }; - - libndtypes = callPackage ../development/libraries/libndtypes { }; - - libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { }; - - libnvme = callPackage ../os-specific/linux/libnvme { }; - - libxnd = callPackage ../development/libraries/libxnd { }; - - libzbc = callPackage ../os-specific/linux/libzbc { }; - - libzbd = callPackage ../os-specific/linux/libzbd { }; - - lifeograph = callPackage ../applications/editors/lifeograph { }; - - limitcpu = callPackage ../tools/misc/limitcpu { }; - - link-grammar = callPackage ../tools/text/link-grammar { }; - - linuxptp = callPackage ../os-specific/linux/linuxptp { }; - - linuxdoc-tools = callPackage ../tools/text/sgml/linuxdoc-tools { }; - - lisgd = callPackage ../tools/inputmethods/lisgd { }; - - lite = callPackage ../applications/editors/lite { }; - lite-xl = callPackage ../applications/editors/lite-xl { inherit (darwin.apple_sdk.frameworks) Foundation; }; - loadwatch = callPackage ../tools/system/loadwatch { }; - - loccount = callPackage ../development/tools/misc/loccount { }; - - long-shebang = callPackage ../misc/long-shebang {}; - - lowdown = callPackage ../tools/typesetting/lowdown { }; - - numatop = callPackage ../os-specific/linux/numatop { }; - - numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; - - num-utils = callPackage ../tools/text/num-utils { }; - - iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; - - ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; - - ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { }; - kaggle = with python3Packages; toPythonApplication kaggle; - lynis = callPackage ../tools/security/lynis { }; - - maigret = callPackage ../tools/security/maigret { }; - maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { }; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; - mandown = callPackage ../tools/misc/mandown { }; - - mapcidr = callPackage ../tools/misc/mapcidr { }; - maple-mono = (callPackage ../data/fonts/maple-font { }).Mono-v5; maple-mono-NF = (callPackage ../data/fonts/maple-font { }).Mono-NF-v5; - marl = callPackage ../development/libraries/marl {}; - - marlin-calc = callPackage ../tools/misc/marlin-calc {}; - - masscan = callPackage ../tools/security/masscan { }; - - massren = callPackage ../tools/misc/massren { }; - mat2 = with python3.pkgs; toPythonApplication mat2; - maxcso = callPackage ../tools/archivers/maxcso {}; - - medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { ffmpeg = ffmpeg-full; }; - megacmd = callPackage ../applications/misc/megacmd { }; - - merriweather = callPackage ../data/fonts/merriweather { }; - - merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - - meson = callPackage ../development/tools/build-managers/meson { }; - # while building documentation meson may want to run binaries for host # which needs an emulator # example of an error which this fixes @@ -5075,8 +2058,6 @@ with pkgs; } ../development/tools/build-managers/meson/emulator-hook.sh else throw "mesonEmulatorHook has to be in a conditional to check if the target binaries can be executed i.e. (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)"; - meson-tools = callPackage ../misc/meson-tools { }; - metabase = callPackage ../servers/metabase { jdk11 = jdk11_headless; }; @@ -5085,140 +2066,38 @@ with pkgs; electron = electron_17; }; - midicsv = callPackage ../tools/audio/midicsv { }; - - miniscript = callPackage ../applications/blockchains/miniscript { }; - miniserve = callPackage ../tools/misc/miniserve { inherit (darwin.apple_sdk.frameworks) Security; }; - mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; - mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); - mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; - - mmctl = callPackage ../tools/misc/mmctl { }; - - moar = callPackage ../tools/misc/moar { }; - - molly-brown = callPackage ../servers/gemini/molly-brown { }; - - monetdb = callPackage ../servers/sql/monetdb { }; - monado = callPackage ../applications/graphics/monado { inherit (gst_all_1) gstreamer gst-plugins-base; }; - mons = callPackage ../tools/misc/mons {}; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { + inherit (darwin.apple_sdk.frameworks) Security; + }; - monsoon = callPackage ../tools/security/monsoon {}; + mrkd = with python3Packages; toPythonApplication mrkd; - moodle-dl = callPackage ../tools/networking/moodle-dl { }; + nix-template = callPackage ../tools/package-management/nix-template { + inherit (darwin.apple_sdk.frameworks) Security; + }; - moonraker = callPackage ../servers/moonraker { }; - - morsel = callPackage ../tools/text/morsel {}; - - mousetweaks = callPackage ../applications/accessibility/mousetweaks { }; - - mp3blaster = callPackage ../applications/audio/mp3blaster { }; - - mp3cat = callPackage ../tools/audio/mp3cat {}; - - mp3fs = callPackage ../tools/filesystems/mp3fs { }; - - mpdas = callPackage ../tools/audio/mpdas { }; - - mpdcron = callPackage ../tools/audio/mpdcron { }; - - mpdris2 = callPackage ../tools/audio/mpdris2 { }; - - mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; - - mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; - - mq-cli = callPackage ../tools/system/mq-cli { }; - - mrkd = with python3Packages; toPythonApplication mrkd; - - naproche = callPackage ../applications/science/logic/naproche { }; - - nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; - - n2n = callPackage ../tools/networking/n2n { }; - - nextdns = callPackage ../applications/networking/nextdns { }; - - ngadmin = callPackage ../applications/networking/ngadmin { }; - - nfdump = callPackage ../tools/networking/nfdump { }; - - nfstrace = callPackage ../tools/networking/nfstrace { }; - - nitch = callPackage ../tools/misc/nitch { }; - - nix-direnv = callPackage ../tools/misc/nix-direnv { }; - - nixel = callPackage ../tools/nix/nixel { }; - - nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; - - nix-template = callPackage ../tools/package-management/nix-template { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; + nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; - notemap = callPackage ../tools/networking/notemap { }; - - noteshrink = callPackage ../tools/misc/noteshrink { }; - noti = callPackage ../tools/misc/noti { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - notify = callPackage ../tools/misc/notify { }; - - notifymuch = callPackage ../applications/misc/notifymuch { }; - - npins = callPackage ../tools/nix/npins { }; - - nrsc5 = callPackage ../applications/misc/nrsc5 { }; - - nsync = callPackage ../development/libraries/nsync { }; - nsz = with python3.pkgs; toPythonApplication nsz; - nwipe = callPackage ../tools/security/nwipe { }; - - nx2elf = callPackage ../tools/compression/nx2elf { }; - - nx-libs = callPackage ../tools/X11/nx-libs { }; - - nyx = callPackage ../tools/networking/nyx { }; - - oci-cli = callPackage ../tools/admin/oci-cli { }; - - oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { }; - ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; - ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; - - onboard = callPackage ../applications/misc/onboard { }; - - oneshot = callPackage ../tools/networking/oneshot { }; - - orjail = callPackage ../tools/security/orjail { }; - online-judge-template-generator = python3Packages.callPackage ../tools/misc/online-judge-template-generator { }; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; @@ -5227,30 +2106,8 @@ with pkgs; protobuf = protobuf3_19; }; - xkbd = callPackage ../applications/misc/xkbd { }; - - libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; - - optar = callPackage ../tools/graphics/optar {}; - - oni2 = callPackage ../applications/editors/oni2 { }; - - obinskit = callPackage ../applications/misc/obinskit {}; - - odoo = callPackage ../applications/finance/odoo {}; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; - oil-buku = callPackage ../applications/misc/oil-buku { }; - - osdlyrics = callPackage ../applications/audio/osdlyrics { }; - - ossutil = callPackage ../tools/admin/ossutil {}; - - osv-detector = callPackage ../tools/security/osv-detector {}; - - osv-scanner = callPackage ../tools/security/osv-scanner {}; - pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5259,64 +2116,16 @@ with pkgs; patool = with python3Packages; toPythonApplication patool; - pbgopy = callPackage ../tools/text/pbgopy { }; - - pbzx = callPackage ../tools/compression/pbzx { }; - - pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; - - pcp = callPackage ../tools/misc/pcp { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { wrapQtAppsHook = qt5.wrapQtAppsHook; }; - pev = callPackage ../development/tools/analysis/pev { }; - - phd2 = callPackage ../applications/science/astronomy/phd2 { }; - - phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { }; - - photon = callPackage ../tools/networking/photon { }; - - photoprism = callPackage ../servers/photoprism { }; - - piglit = callPackage ../tools/graphics/piglit { }; - - pika = callPackage ../applications/graphics/pika { }; - - playerctl = callPackage ../tools/audio/playerctl { }; - - pn = callPackage ../tools/text/pn { }; - - pocket-casts = callPackage ../applications/audio/pocket-casts { }; - - pouf = callPackage ../tools/misc/pouf { }; - - poweralertd = callPackage ../tools/misc/poweralertd { }; - - ps_mem = callPackage ../tools/system/ps_mem { }; - - pscale = callPackage ../development/tools/pscale { }; - - psstop = callPackage ../tools/system/psstop { }; - - precice = callPackage ../development/libraries/precice { }; - - precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { }; - - proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { }; - pueue = callPackage ../applications/misc/pueue { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; pixcat = with python3Packages; toPythonApplication pixcat; - pixiecore = callPackage ../tools/networking/pixiecore {}; - - waitron = callPackage ../tools/networking/waitron { }; - pyCA = python3Packages.callPackage ../applications/video/pyca {}; pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; @@ -5326,138 +2135,44 @@ with pkgs; inherit (darwin.apple_sdk_11_0) Libsystem; }; - procyon = callPackage ../tools/misc/procyon { }; - - profetch = callPackage ../tools/misc/profetch { }; - psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; - r53-ddns = callPackage ../applications/networking/r53-ddns { }; - rare = python3Packages.callPackage ../games/rare { }; - reg = callPackage ../tools/virtualization/reg { }; - - rex = callPackage ../tools/system/rex { }; - - river = callPackage ../applications/window-managers/river { }; - - rivercarro = callPackage ../applications/misc/rivercarro { }; - - rmapi = callPackage ../applications/misc/remarkable/rmapi { }; - rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; - rm-improved = callPackage ../applications/misc/rm-improved { }; - remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; - restream = callPackage ../applications/misc/remarkable/restream { }; - ropgadget = with python3Packages; toPythonApplication ropgadget; scour = with python3Packages; toPythonApplication scour; - s2png = callPackage ../tools/graphics/s2png { }; - - sfz = callPackage ../tools/misc/sfz { }; - - sgp4 = callPackage ../development/libraries/sgp4 {}; - - shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { inherit (darwin.apple_sdk.frameworks) Security; }; - shell-hist = callPackage ../tools/misc/shell-hist { }; - - shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; - - shellnoob = callPackage ../tools/security/shellnoob { }; - sheesy-cli = callPackage ../tools/security/sheesy-cli { inherit (darwin.apple_sdk.frameworks) Security; }; - simdjson = callPackage ../development/libraries/simdjson { }; - - shipyard = callPackage ../tools/virtualization/shipyard { }; - - shisho = callPackage ../tools/security/shisho { }; - - sigslot = callPackage ../development/libraries/sigslot { }; - - siglo = callPackage ../applications/misc/siglo { }; - - simg2img = callPackage ../tools/filesystems/simg2img { }; - - smokegen = callPackage ../development/libraries/smokegen {}; - - smokeqt = callPackage ../development/libraries/smokeqt {}; - - snazy = callPackage ../development/tools/snazy { }; - - snippetpixie = callPackage ../tools/text/snippetpixie { }; - - snowcat = callPackage ../tools/security/snowcat { }; - - socklog = callPackage ../tools/system/socklog { }; - - soju = callPackage ../applications/networking/soju { }; - - spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { inherit (darwin.apple_sdk.frameworks) Security; }; - ssmsh = callPackage ../tools/admin/ssmsh { }; - - stacs = callPackage ../tools/security/stacs { }; - - stagit = callPackage ../development/tools/stagit { }; - - starboard = callPackage ../applications/networking/cluster/starboard { }; - - statserial = callPackage ../tools/misc/statserial { }; - - steampipe = callPackage ../tools/misc/steampipe { }; - step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; }; - step-cli = callPackage ../tools/security/step-cli { }; - - string-machine = callPackage ../applications/audio/string-machine { }; - stripe-cli = callPackage ../tools/admin/stripe-cli { buildGoModule = buildGo118Module; # tests fail with 1.19 }; - bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; - swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; - swapspace = callPackage ../tools/admin/swapspace { }; - - swego = callPackage ../servers/swego { }; - - sydbox = callPackage ../os-specific/linux/sydbox { }; - synth = callPackage ../tools/misc/synth { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; - - skeema = callPackage ../tools/system/skeema {}; - - syslogng = callPackage ../tools/system/syslog-ng { }; - - svt-av1 = callPackage ../tools/video/svt-av1 { }; - inherit (callPackages ../servers/rainloop { }) rainloop-community rainloop-standard; @@ -5466,34 +2181,18 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; - razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; - replay-sorcery = callPackage ../tools/video/replay-sorcery { }; - - tsduck = callPackage ../tools/video/tsduck { }; - ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - ripe-atlas-tools = callPackage ../tools/networking/ripe-atlas-tools { }; - - roundcube = callPackage ../servers/roundcube { }; - roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); - routersploit = callPackage ../tools/security/routersploit { }; - routinator = callPackage ../servers/routinator { inherit (darwin.apple_sdk.frameworks) Security; }; - rsbep = callPackage ../tools/backup/rsbep { }; - - rsbkb = callPackage ../tools/text/rsbkb { }; - rsyslog = callPackage ../tools/system/rsyslog { withHadoop = false; # Currently Broken withKsi = false; # Currently Broken @@ -5530,52 +2229,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xlogo = callPackage ../tools/X11/xlogo { }; - - xmlbeans = callPackage ../tools/misc/xmlbeans { }; - xmlsort = perlPackages.XMLFilterSort; - xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { }; - - mcrypt = callPackage ../tools/misc/mcrypt { }; - - mongoaudit = callPackage ../tools/security/mongoaudit { }; - - mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; - - moosefs = callPackage ../tools/filesystems/moosefs { }; - - mozlz4a = callPackage ../tools/compression/mozlz4a { }; - - msr-tools = callPackage ../os-specific/linux/msr-tools { }; - - mstflint = callPackage ../tools/misc/mstflint { }; - - mslink = callPackage ../tools/misc/mslink { }; - - mceinject = callPackage ../os-specific/linux/mceinject { }; - mcelog = callPackage ../os-specific/linux/mcelog { util-linux = util-linuxMinimal; }; - sqlint = callPackage ../development/tools/sqlint { }; - - antibody = callPackage ../shells/zsh/antibody { }; - - antigen = callPackage ../shells/zsh/antigen { }; - - apparix = callPackage ../tools/misc/apparix { }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; - arping = callPackage ../tools/networking/arping { }; - - arpoison = callPackage ../tools/networking/arpoison { }; - asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (python3.pkgs) pygments matplotlib numpy aafigure recursivePthLoader; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; @@ -5600,16 +2261,6 @@ with pkgs; }; }; - asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { }; - - asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { }; - - asunder = callPackage ../applications/audio/asunder { }; - - autossh = callPackage ../tools/networking/autossh { }; - - assh = callPackage ../tools/networking/assh { }; - b2sum = callPackage ../tools/security/b2sum { inherit (llvmPackages) openmp; }; @@ -5622,16 +2273,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bats = callPackage ../development/interpreters/bats { }; - - bbe = callPackage ../tools/misc/bbe { }; - bkcrack = callPackage ../tools/security/bkcrack { inherit (llvmPackages) openmp; }; - bdsync = callPackage ../tools/backup/bdsync { }; - beamerpresenter = beamerpresenter-mupdf; beamerpresenter-mupdf = qt6Packages.callPackage ../applications/office/beamerpresenter { @@ -5644,8 +2289,6 @@ with pkgs; usePoppler = true; }; - beanstalkd = callPackage ../servers/beanstalkd { }; - bee = callPackage ../applications/networking/bee/bee.nix { version = "release"; }; @@ -5654,98 +2297,19 @@ with pkgs; version = "unstable"; }; - bee-clef = callPackage ../applications/networking/bee/bee-clef.nix { }; - beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; - bento4 = callPackage ../tools/video/bento4 { }; - - bepasty = callPackage ../tools/misc/bepasty { }; - - bettercap = callPackage ../tools/security/bettercap { }; - - bfs = callPackage ../tools/system/bfs { }; - - bevelbar = callPackage ../tools/X11/bevelbar { }; - - bgs = callPackage ../tools/X11/bgs { }; - - bibclean = callPackage ../tools/typesetting/bibclean { }; - - biber = callPackage ../tools/typesetting/biber { }; - - biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; - - binlore = callPackage ../development/tools/analysis/binlore { }; - - birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; - blueberry = callPackage ../tools/bluetooth/blueberry { }; - - blueman = callPackage ../tools/bluetooth/blueman { }; - - bluetuith = callPackage ../tools/bluetooth/bluetuith { }; - - bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; - - bogofilter = callPackage ../tools/misc/bogofilter { }; - - bomber-go = callPackage ../development/tools/bomber-go { }; - - bomutils = callPackage ../tools/archivers/bomutils { }; - - boofuzz= callPackage ../tools/security/boofuzz { }; - - briar-desktop = callPackage ../applications/networking/instant-messengers/briar-desktop { }; - - bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; - - bsdiff = callPackage ../tools/compression/bsdiff { }; - - btar = callPackage ../tools/backup/btar { }; - - bumpver = callPackage ../applications/version-management/bumpver { }; - - bup = callPackage ../tools/backup/bup { }; - - bupstash = callPackage ../tools/backup/bupstash { }; - - burp = callPackage ../tools/backup/burp { }; - - buku = callPackage ../applications/misc/buku { }; - - bukut = callPackage ../applications/misc/bukut { }; - - byzanz = callPackage ../applications/video/byzanz {}; - - anydesk = callPackage ../applications/networking/remote/anydesk { }; - - anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; - - atool = callPackage ../tools/archivers/atool { }; - - bash_unit = callPackage ../tools/misc/bash_unit { }; - - boltbrowser = callPackage ../tools/misc/boltbrowser { }; - bsc = callPackage ../tools/compression/bsc { inherit (llvmPackages) openmp; }; - bzip2 = callPackage ../tools/compression/bzip2 { }; - - bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; - bzip3 = callPackage ../tools/compression/bzip3 { stdenv = clangStdenv; }; - cabextract = callPackage ../tools/archivers/cabextract { }; - - cadaver = callPackage ../tools/networking/cadaver { }; - davix = callPackage ../tools/networking/davix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5754,50 +2318,12 @@ with pkgs; cantata = libsForQt5.callPackage ../applications/audio/cantata { }; - cantoolz = callPackage ../tools/networking/cantoolz { }; - - can-utils = callPackage ../os-specific/linux/can-utils { }; - - caudec = callPackage ../applications/audio/caudec { }; - - ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { }; - - ccid = callPackage ../tools/security/ccid { }; - - ccrypt = callPackage ../tools/security/ccrypt { }; - - ccze = callPackage ../tools/misc/ccze { }; - - cdecl = callPackage ../development/tools/cdecl { }; - - cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; - - cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { }; - - cdpr = callPackage ../tools/networking/cdpr { }; - - cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; - - cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; - cdrtools = callPackage ../tools/cd-dvd/cdrtools { inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; - cider = callPackage ../applications/audio/cider { }; - - isolyzer = callPackage ../tools/cd-dvd/isolyzer { }; - - isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { }; - - mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; - - nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; - - ceph-csi = callPackage ../tools/filesystems/ceph-csi { }; - libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; @@ -5810,41 +2336,10 @@ with pkgs; inherit (callPackages ../tools/security/certmgr { }) certmgr certmgr-selfsigned; - cfdg = callPackage ../tools/graphics/cfdg { }; - - cglm = callPackage ../development/libraries/cglm { }; - - cgreen = callPackage ../development/libraries/cgreen { }; - - chain-bench = callPackage ../tools/security/chain-bench { }; - - checkinstall = callPackage ../tools/package-management/checkinstall { }; - - checkmake = callPackage ../development/tools/checkmake { }; - chit = callPackage ../development/tools/chit { openssl = openssl_1_1; }; - chkrootkit = callPackage ../tools/security/chkrootkit { }; - - chrony = callPackage ../tools/networking/chrony { }; - - chunkfs = callPackage ../tools/filesystems/chunkfs { }; - - chunksync = callPackage ../tools/backup/chunksync { }; - - cicero-tui = callPackage ../tools/misc/cicero-tui { }; - - cilium-cli = callPackage ../applications/networking/cluster/cilium { }; - - cjdns = callPackage ../tools/networking/cjdns { }; - cjdns-tools = callPackage ../tools/admin/cjdns-tools { }; - - cjson = callPackage ../development/libraries/cjson { }; - - cksfv = callPackage ../tools/networking/cksfv { }; - clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; @@ -5853,16 +2348,6 @@ with pkgs; mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; - ciopfs = callPackage ../tools/filesystems/ciopfs { }; - - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; - - circus = callPackage ../tools/networking/circus { }; - - cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; - - cirrusgo = callPackage ../tools/security/cirrusgo { }; - inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_21_09_0 citrix_workspace_21_12_0 @@ -5872,16 +2357,8 @@ with pkgs; ; citrix_workspace = citrix_workspace_22_12_0; - cmigemo = callPackage ../tools/text/cmigemo { }; - cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - cmt = callPackage ../applications/audio/cmt {}; - - crlfsuite = callPackage ../tools/security/crlfsuite {}; - - crlfuzz = callPackage ../tools/security/crlfuzz {}; - hedgedoc = callPackage ../servers/web-apps/hedgedoc { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { nodejs = nodejs-16_x; @@ -5889,18 +2366,8 @@ with pkgs; nodejs = nodejs-16_x; }; - colord = callPackage ../tools/misc/colord { }; - - colord-gtk = callPackage ../tools/misc/colord-gtk { }; - colord-gtk4 = colord-gtk.override { withGtk4 = true; }; - colordiff = callPackage ../tools/text/colordiff { }; - - connect = callPackage ../tools/networking/connect { }; - - conspy = callPackage ../os-specific/linux/conspy {}; - connmanPackages = recurseIntoAttrs (callPackage ../tools/networking/connman { }); inherit (connmanPackages) @@ -5913,73 +2380,26 @@ with pkgs; connman-notify ; - convertlit = callPackage ../tools/text/convertlit { }; - collectd = callPackage ../tools/system/collectd { inherit (darwin.apple_sdk.frameworks) IOKit; }; - collectd-data = callPackage ../tools/system/collectd/data.nix { }; - - colormake = callPackage ../development/tools/build-managers/colormake { }; - - cpuminer = callPackage ../tools/misc/cpuminer { }; - crabz = callPackage ../tools/compression/crabz { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - ethash = callPackage ../development/libraries/ethash { }; - - cuetools = callPackage ../tools/cd-dvd/cuetools { }; - - u3-tool = callPackage ../tools/filesystems/u3-tool { }; - - unifdef = callPackage ../development/tools/misc/unifdef { }; - - uniffi-bindgen = callPackage ../development/tools/uniffi-bindgen { }; - unify = with python3Packages; toPythonApplication unify; - unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - - unparam = callPackage ../tools/misc/unparam { }; - inherit (nodePackages) uppy-companion; - usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; - usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; - - usbsdmux = callPackage ../development/tools/misc/usbsdmux { }; - - usbview = callPackage ../tools/misc/usbview { }; - - usbimager = callPackage ../tools/misc/usbimager { }; - - uwuify = callPackage ../tools/misc/uwuify { }; - - anthy = callPackage ../tools/inputmethods/anthy { }; - - evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; - - eyedropper = callPackage ../applications/graphics/eyedropper { }; - persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; - evscript = callPackage ../tools/inputmethods/evscript { }; - - keyd = callPackage ../tools/inputmethods/keyd { }; - twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { inherit (darwin.apple_sdk.frameworks) Security; }; gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; - kime = callPackage ../tools/inputmethods/kime { }; - - libpinyin = callPackage ../development/libraries/libpinyin { }; - inherit (import ../development/libraries/libsbsms pkgs) libsbsms libsbsms_2_0_2 @@ -5990,14 +2410,6 @@ with pkgs; inherit (gnome) gnome-common; }; - m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; - - m17n_db = callPackage ../tools/inputmethods/m17n-db { }; - - m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; - - libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { }; - netbird = callPackage ../tools/networking/netbird { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; }; @@ -6006,21 +2418,6 @@ with pkgs; ui = true; }; - netevent = callPackage ../tools/inputmethods/netevent { }; - - netplan = callPackage ../tools/admin/netplan { }; - - skktools = callPackage ../tools/inputmethods/skk/skktools { }; - skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; - - libkkc-data = callPackage ../data/misc/libkkc-data { }; - - libkkc = callPackage ../tools/inputmethods/libkkc { }; - - ibus = callPackage ../tools/inputmethods/ibus { }; - - ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; - ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; @@ -6062,39 +2459,20 @@ with pkgs; }; }; - ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { }; - - ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { }; - - interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; - age = callPackage ../tools/security/age { }; - - agebox = callPackage ../tools/security/agebox { }; - age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation PCSC; }; - artim-dark = callPackage ../data/themes/artim-dark {}; - - bbin = callPackage ../development/tools/bbin {}; - bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; - brotli = callPackage ../tools/compression/brotli { }; - - biodiff = callPackage ../development/tools/biodiff { }; - - biosdevname = callPackage ../tools/networking/biosdevname { }; - bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { @@ -6108,36 +2486,16 @@ with pkgs; code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; - certstrap = callPackage ../tools/security/certstrap { }; - - cfssl = callPackage ../tools/security/cfssl { }; - - cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { }; - chafa = callPackage ../tools/misc/chafa { inherit (darwin.apple_sdk.frameworks) Foundation; }; - changetower = callPackage ../tools/networking/changetower { }; - - checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; - - checkmate = callPackage ../development/tools/checkmate { }; - - circup = callPackage ../development/tools/circup { }; - - civetweb = callPackage ../development/libraries/civetweb { }; - ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; clamav = callPackage ../tools/security/clamav { inherit (darwin.apple_sdk.frameworks) Foundation; }; - client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; - - cloc = callPackage ../tools/misc/cloc { }; - cloog = callPackage ../development/libraries/cloog { isl = isl_0_14; }; @@ -6146,12 +2504,6 @@ with pkgs; isl = isl_0_11; }; - cloogppl = callPackage ../development/libraries/cloog-ppl { }; - - cloud-utils = callPackage ../tools/misc/cloud-utils { }; - - cloudlist = callPackage ../tools/security/cloudlist { }; - cmdpack = callPackages ../tools/misc/cmdpack { }; cobalt = callPackage ../applications/misc/cobalt { @@ -6170,64 +2522,19 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - codebraid = callPackage ../tools/misc/codebraid { }; - - compass = callPackage ../development/tools/compass { }; - cone = callPackage ../development/compilers/cone { llvmPackages = llvmPackages_7; }; - conda = callPackage ../tools/package-management/conda { }; - - conduktor = callPackage ../applications/misc/conduktor { }; - - console-bridge = callPackage ../development/libraries/console-bridge { }; - - convbin = callPackage ../tools/misc/convbin { }; - - convimg = callPackage ../tools/misc/convimg { }; - - convfont = callPackage ../tools/misc/convfont { }; - - convmv = callPackage ../tools/misc/convmv { }; - - convoy = callPackage ../tools/filesystems/convoy { }; - - cpcfs = callPackage ../tools/filesystems/cpcfs { }; - - coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; - corkscrew = callPackage ../tools/networking/corkscrew { }; - - cowpatty = callPackage ../tools/security/cowpatty { }; - - cpio = callPackage ../tools/archivers/cpio { }; - - cpufetch = callPackage ../tools/misc/cpufetch { }; - - crackmapexec = callPackage ../tools/security/crackmapexec { }; - - crackxls = callPackage ../tools/security/crackxls { }; - - crd2pulumi = callPackage ../development/tools/crd2pulumi { }; - create-cycle-app = nodePackages.create-cycle-app; - createrepo_c = callPackage ../tools/package-management/createrepo_c { }; - cromfs = callPackage ../tools/archivers/cromfs { stdenv = gcc10StdenvCompat; }; - cron = callPackage ../tools/system/cron { }; - - ctlptl = callPackage ../development/tools/ctlptl { }; - - snooze = callPackage ../tools/system/snooze { }; - cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; }; cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; }; cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; }; @@ -6255,8 +2562,6 @@ with pkgs; cudatoolkit = cudaPackages.cudatoolkit; cudatoolkit_11 = cudaPackages_11.cudatoolkit; - curie = callPackage ../data/fonts/curie { }; - curlFull = curl.override { ldapSupport = true; gsaslSupport = true; @@ -6277,109 +2582,26 @@ with pkgs; brotliSupport = true; }); - curlMinimal = callPackage ../tools/networking/curl { }; - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate-bin = callPackage ../tools/networking/curl-impersonate { }; - - curlie = callPackage ../tools/networking/curlie { }; - - cunit = callPackage ../tools/misc/cunit { }; - bcunit = callPackage ../tools/misc/bcunit { }; - - curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; - - tcp-cutter = callPackage ../tools/networking/tcp-cutter { }; - - cwebbin = callPackage ../development/tools/misc/cwebbin { }; - cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { }; - cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { }; - - dadadodo = callPackage ../tools/text/dadadodo { }; - - daemon = callPackage ../tools/system/daemon { }; - - daemonize = callPackage ../tools/system/daemonize { }; - - danger-gitlab = callPackage ../applications/version-management/danger-gitlab { }; - - daq = callPackage ../applications/networking/ids/daq { }; - dar = callPackage ../tools/backup/dar { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - darkhttpd = callPackage ../servers/http/darkhttpd { }; - - darkstat = callPackage ../tools/networking/darkstat { }; - - dav1d = callPackage ../development/libraries/dav1d { }; - - davfs2 = callPackage ../tools/filesystems/davfs2 { }; - - dbeaver = callPackage ../applications/misc/dbeaver { }; - - dbench = callPackage ../development/tools/misc/dbench { }; - - dclxvi = callPackage ../development/libraries/dclxvi { }; - - dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; - - dcraw = callPackage ../tools/graphics/dcraw { }; - - dcs = callPackage ../tools/text/dcs { }; - - dcfldd = callPackage ../tools/system/dcfldd { }; - - debianutils = callPackage ../tools/misc/debianutils { }; - - debian-devscripts = callPackage ../tools/misc/debian-devscripts { }; - - debian-goodies = callPackage ../applications/misc/debian-goodies { }; - - debootstrap = callPackage ../tools/misc/debootstrap { }; - - debugedit = callPackage ../development/tools/misc/debugedit { }; - - deer = callPackage ../shells/zsh/zsh-deer { }; - deno = callPackage ../development/web/deno { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation QuartzCore; }; - detox = callPackage ../tools/misc/detox { }; - devilspie2 = callPackage ../applications/misc/devilspie2 { gtk = gtk3; }; - dex = callPackage ../tools/X11/dex { }; - - ddccontrol = callPackage ../tools/misc/ddccontrol { }; - - ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; - ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; - ddcutil = callPackage ../tools/misc/ddcutil { }; - - ddclient = callPackage ../tools/networking/ddclient { }; - - dd_rescue = callPackage ../tools/system/dd_rescue { }; - - ddh = callPackage ../tools/system/ddh { }; - - ddrescue = callPackage ../tools/system/ddrescue { }; - - ddrescueview = callPackage ../tools/system/ddrescueview { }; - - ddrutility = callPackage ../tools/system/ddrutility { }; - inherit (callPackages ../applications/networking/p2p/deluge { libtorrent-rasterbar = libtorrent-rasterbar-1_2_x; }) @@ -6389,58 +2611,8 @@ with pkgs; deluge-2_x = deluge; - desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; - - dfc = callPackage ../tools/system/dfc { }; - - dfrs = callPackage ../tools/system/dfrs { }; - - dev86 = callPackage ../development/compilers/dev86 { }; - - diskrsync = callPackage ../tools/backup/diskrsync { }; - - djbdns = callPackage ../tools/networking/djbdns { }; - - dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy2 { }; - - dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; - - dnscontrol = callPackage ../applications/networking/dnscontrol { }; - - dnsenum = callPackage ../tools/security/dnsenum { }; - - dnsmasq = callPackage ../tools/networking/dnsmasq { }; - - dnsmon-go = callPackage ../tools/networking/dnsmon-go { }; - - dnsmonster = callPackage ../tools/networking/dnsmonster { }; - - dnspeep = callPackage ../tools/security/dnspeep { }; - - dnsproxy = callPackage ../tools/networking/dnsproxy { }; - - dnsperf = callPackage ../tools/networking/dnsperf { }; - - dnsrecon = callPackage ../tools/security/dnsrecon { }; - - dnstop = callPackage ../tools/networking/dnstop { }; - dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { }; - dnsx = callPackage ../tools/security/dnsx { }; - - dhcp = callPackage ../tools/networking/dhcp { }; - - dhcpdump = callPackage ../tools/networking/dhcpdump { }; - - dhcpcd = callPackage ../tools/networking/dhcpcd { }; - - dhcping = callPackage ../tools/networking/dhcping { }; - - di = callPackage ../tools/system/di { }; - - diction = callPackage ../tools/text/diction { }; - diffoscopeMinimal = callPackage ../tools/misc/diffoscope { jdk = jdk8; }; @@ -6453,71 +2625,23 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - diffsitter = callPackage ../tools/text/diffsitter { }; - - diffstat = callPackage ../tools/text/diffstat { }; - - difftastic = callPackage ../tools/text/difftastic { }; - - diffutils = callPackage ../tools/text/diffutils { }; - dir2opus = callPackage ../tools/audio/dir2opus { inherit (python2Packages) mutagen python wrapPython; }; - dsp = callPackage ../tools/audio/dsp { }; - dirdiff = callPackage ../tools/text/dirdiff { tcl = tcl-8_5; tk = tk-8_5; }; - dwdiff = callPackage ../applications/misc/dwdiff { }; - - picoscope = callPackage ../applications/science/electronics/picoscope { }; - - picotts = callPackage ../tools/audio/picotts { }; - - wgetpaste = callPackage ../tools/text/wgetpaste { }; - - dismap = callPackage ../tools/security/dismap { }; - - dismember = callPackage ../tools/security/dismember { }; - - dirvish = callPackage ../tools/backup/dirvish { }; - - dleyna-connector-dbus = callPackage ../development/libraries/dleyna-connector-dbus { }; - - dleyna-core = callPackage ../development/libraries/dleyna-core { }; - - dleyna-renderer = callPackage ../development/libraries/dleyna-renderer { }; - - dleyna-server = callPackage ../development/libraries/dleyna-server { }; - dmd = callPackage ../development/compilers/dmd { inherit (darwin.apple_sdk.frameworks) Foundation; }; - dmg2img = callPackage ../tools/misc/dmg2img { }; - - docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; - - doas = callPackage ../tools/security/doas { }; - - docbook2x = callPackage ../tools/typesetting/docbook2x { }; - - docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; - - docear = callPackage ../applications/office/docear { }; - - dockbarx = callPackage ../applications/misc/dockbarx { }; - doctave = callPackage ../applications/misc/doctave { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - dog = callPackage ../tools/system/dog { }; - dogdns = callPackage ../tools/networking/dogdns { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; @@ -6527,20 +2651,8 @@ with pkgs; buildGoModule = buildGo118Module; # build fails with 1.19 }; - dosfstools = callPackage ../tools/filesystems/dosfstools { }; - - dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; - - dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - - domoticz = callPackage ../servers/domoticz { }; - doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; - dorkscout = callPackage ../tools/security/dorkscout { }; - - downonspot = callPackage ../applications/misc/downonspot { }; - sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { @@ -6555,12 +2667,6 @@ with pkgs; }; }; - drive = callPackage ../applications/networking/drive { }; - - driftnet = callPackage ../tools/networking/driftnet {}; - - driftctl = callPackage ../applications/networking/cluster/driftctl { }; - drill = callPackage ../tools/networking/drill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6570,26 +2676,10 @@ with pkgs; enableUnfree = false; }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; - - drone-runner-exec = callPackage ../development/tools/continuous-integration/drone-runner-exec { }; - - drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; - - dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; - dtach = callPackage ../tools/misc/dtach { }; - - dtc = callPackage ../development/compilers/dtc { }; - dt-schema = python3Packages.callPackage ../development/tools/dt-schema { }; - dub = callPackage ../development/tools/build-managers/dub { }; - - duc = callPackage ../tools/misc/duc { }; - duff = callPackage ../tools/filesystems/duff { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -6598,28 +2688,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - dumptorrent = callPackage ../tools/misc/dumptorrent { }; - - duo-unix = callPackage ../tools/security/duo-unix { }; - - dupe-krill = callPackage ../tools/filesystems/dupe-krill { }; - - duplicacy = callPackage ../tools/backup/duplicacy { }; - - duplicati = callPackage ../tools/backup/duplicati { }; - - duplicity = callPackage ../tools/backup/duplicity { }; - - duply = callPackage ../tools/backup/duply { }; - - dvd-vr = callPackage ../tools/cd-dvd/dvd-vr { }; - - dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { }; - - dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { }; - - dvgrab = callPackage ../tools/video/dvgrab { }; - dvtm = callPackage ../tools/misc/dvtm { # if you prefer a custom config, write the config.h in dvtm.config.h # and enable @@ -6628,72 +2696,20 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix {}; - ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; - - e2tools = callPackage ../tools/filesystems/e2tools { }; - - e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; - - easyrsa = callPackage ../tools/networking/easyrsa { }; - - easysnap = callPackage ../tools/backup/easysnap { }; - - ebook_tools = callPackage ../tools/text/ebook-tools { }; - - ecryptfs = callPackage ../tools/security/ecryptfs { }; - - ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { }; - - edgetpu-compiler = callPackage ../development/libraries/science/robotics/edgetpu-compiler { }; - - edid-decode = callPackage ../tools/misc/edid-decode { }; - - edid-generator = callPackage ../tools/misc/edid-generator { }; - - edir = callPackage ../tools/misc/edir { }; - - editres = callPackage ../tools/graphics/editres { }; - - edit = callPackage ../applications/editors/edit { }; - - edk2 = callPackage ../development/compilers/edk2 { }; - - edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; - - eff = callPackage ../development/interpreters/eff { }; - - eflite = callPackage ../applications/audio/eflite {}; - eid-mw = callPackage ../tools/security/eid-mw { autoreconfHook = buildPackages.autoreconfHook269; }; - emote = callPackage ../tools/inputmethods/emote { }; - engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; - epubcheck = callPackage ../tools/text/epubcheck { }; - - evil-winrm = callPackage ../tools/security/evil-winrm { }; - - evtx = callPackage ../tools/security/evtx { }; - luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup { ssh = openssh; }; - kics = callPackage ../tools/admin/kics { }; - - kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - lychee = callPackage ../tools/networking/lychee { inherit (darwin.apple_sdk.frameworks) Security; }; - magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; - - mcrcon = callPackage ../tools/networking/mcrcon {}; - mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { }; mozwire = callPackage ../tools/networking/mozwire { @@ -6708,26 +2724,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - rar2fs = callPackage ../tools/filesystems/rar2fs { }; - - s9fes = callPackage ../development/interpreters/s9fes { }; - - s-tar = callPackage ../tools/archivers/s-tar {}; - solo2-cli = callPackage ../tools/security/solo2-cli { inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit; }; - sonota = callPackage ../tools/misc/sonota { }; - - sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - - soupault = callPackage ../tools/typesetting/soupault { }; - - stratisd = callPackage ../tools/filesystems/stratisd { }; - - stratis-cli = callPackage ../tools/filesystems/stratis-cli { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { @@ -6743,20 +2743,10 @@ with pkgs; conf = config.schildichat-web.conf or {}; }; - schleuder = callPackage ../tools/security/schleuder { }; - - schleuder-cli = callPackage ../tools/security/schleuder/cli { }; - tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; - teamocil = callPackage ../tools/misc/teamocil { }; - - the-way = callPackage ../development/tools/the-way { }; - - timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { openssl = openssl_1_1; }; @@ -6765,24 +2755,10 @@ with pkgs; enableGui = true; }; - tracker = callPackage ../development/libraries/tracker { }; - - tracker-miners = callPackage ../development/libraries/tracker-miners { }; - tracy = callPackage ../development/tools/tracy { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; - tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; - - trivy = callPackage ../tools/admin/trivy { }; - - trompeloeil = callPackage ../development/libraries/trompeloeil { }; - - updog = callPackage ../tools/networking/updog { }; - - uudeview = callPackage ../tools/misc/uudeview { }; - uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -6790,22 +2766,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - volctl = callPackage ../tools/audio/volctl { }; - - volk = callPackage ../development/libraries/volk { }; - vorta = libsForQt5.callPackage ../applications/backup/vorta { }; - vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - - vt-cli = callPackage ../tools/security/vt-cli { }; - - utahfs = callPackage ../applications/networking/utahfs { }; - - wakeonlan = callPackage ../tools/networking/wakeonlan { }; - - wallutils = callPackage ../tools/graphics/wallutils { }; - worker-build = callPackage ../development/tools/worker-build { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6816,50 +2778,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; - snowflake = callPackage ../tools/networking/snowflake { }; - - wsl-open = callPackage ../tools/misc/wsl-open { }; - xkcdpass = with python3Packages; toPythonApplication xkcdpass; - xjobs = callPackage ../tools/misc/xjobs { }; + zee = callPackage ../applications/editors/zee { + inherit (darwin.apple_sdk.frameworks) Security; + }; - xob = callPackage ../tools/X11/xob { }; - - z-lua = callPackage ../tools/misc/z-lua { }; - - zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; - - zabbixctl = callPackage ../tools/misc/zabbixctl { }; - - zee = callPackage ../applications/editors/zee { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - zeek = callPackage ../applications/networking/ids/zeek { }; - - zoekt = callPackage ../tools/text/zoekt { }; - - zonemaster-cli = perlPackages.ZonemasterCLI; - - zoxide = callPackage ../tools/misc/zoxide { }; - - zzuf = callPackage ../tools/security/zzuf { }; + zonemaster-cli = perlPackages.ZonemasterCLI; ### DEVELOPMENT / EMSCRIPTEN - buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; - - carp = callPackage ../development/compilers/carp { }; - - cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - - choose = callPackage ../tools/text/choose { }; - - d2 = callPackage ../tools/text/d2 { }; - - easeprobe = callPackage ../tools/misc/easeprobe { }; - emscripten = callPackage ../development/compilers/emscripten { llvmPackages = llvmPackages_14; }; @@ -6868,14 +2796,6 @@ with pkgs; emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; - efibootmgr = callPackage ../tools/system/efibootmgr { }; - - efivar = callPackage ../tools/system/efivar { }; - - eget = callPackage ../tools/misc/eget { }; - - evemu = callPackage ../tools/system/evemu { }; - # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! elk6Version = "6.8.21"; @@ -6909,139 +2829,46 @@ with pkgs; elasticsearch = elasticsearch7; }; - elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; - - embree = callPackage ../development/libraries/embree { }; - embree2 = callPackage ../development/libraries/embree/2.x.nix { }; - emborg = python3Packages.callPackage ../development/python-modules/emborg { }; - emem = callPackage ../applications/misc/emem { }; - - empty = callPackage ../tools/misc/empty { }; - emulsion = callPackage ../applications/graphics/emulsion { inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; }; - emulsion-palette = callPackage ../applications/graphics/emulsion-palette { }; - - emv = callPackage ../tools/misc/emv { }; - enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { boost = boost172; }; - endlessh = callPackage ../servers/endlessh { }; - - endlessh-go = callPackage ../servers/endlessh-go { }; - - eris-go = callPackage ../servers/eris-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; - cryfs = callPackage ../tools/filesystems/cryfs { }; - encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; }; - enscript = callPackage ../tools/text/enscript { }; - ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; - entr = callPackage ../tools/misc/entr { }; - envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; }; - eot_utilities = callPackage ../tools/misc/eot-utilities { }; - - eplot = callPackage ../tools/graphics/eplot { }; - - epstool = callPackage ../tools/graphics/epstool { }; - - escrotum = callPackage ../tools/graphics/escrotum { }; - - esshader = callPackage ../tools/graphics/esshader { }; - etcher = callPackage ../tools/misc/etcher { electron = electron_12; }; ethercalc = callPackage ../servers/web-apps/ethercalc { }; - ethtool = callPackage ../tools/misc/ethtool { }; - - ets = callPackage ../tools/misc/ets { }; - - ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - - evcc = callPackage ../servers/home-automation/evcc { }; - - eventstat = callPackage ../os-specific/linux/eventstat { }; - evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; - evtest = callPackage ../applications/misc/evtest { }; - evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; - eva = callPackage ../tools/misc/eva { }; - exa = callPackage ../tools/misc/exa { inherit (darwin.apple_sdk.frameworks) Security; }; - exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { }; - - exempi = callPackage ../development/libraries/exempi { }; - executor = with python3Packages; toPythonApplication executor; - exif = callPackage ../tools/graphics/exif { }; - - exifprobe = callPackage ../tools/graphics/exifprobe { }; - - exiftags = callPackage ../tools/graphics/exiftags { }; - exiftool = perlPackages.ImageExifTool; - ext4magic = callPackage ../tools/filesystems/ext4magic { }; - - extract_url = callPackage ../applications/misc/extract_url { }; - - extundelete = callPackage ../tools/filesystems/extundelete { }; - - expect = callPackage ../tools/misc/expect { }; - - expected-lite = callPackage ../development/libraries/expected-lite { }; - - exportarr = callPackage ../servers/monitoring/prometheus/exportarr { }; - - expliot = callPackage ../tools/security/expliot { }; - - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = with python3Packages; toPythonApplication Fabric; - fail2ban = callPackage ../tools/security/fail2ban { }; - - fakeroot = callPackage ../tools/system/fakeroot { }; - - fakeroute = callPackage ../tools/networking/fakeroute { }; - - fakechroot = callPackage ../tools/system/fakechroot { }; - - fancy-motd = callPackage ../tools/system/fancy-motd { }; - - fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { }; - - fanficfare = callPackage ../tools/text/fanficfare { }; - - fastd = callPackage ../tools/networking/fastd { }; - - fatsort = callPackage ../tools/filesystems/fatsort { }; - fcitx = callPackage ../tools/inputmethods/fcitx { plugins = []; }; @@ -7077,8 +2904,6 @@ with pkgs; skk = callPackage ../tools/inputmethods/fcitx-engines/fcitx-skk { }; }; - fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; - chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; @@ -7097,40 +2922,10 @@ with pkgs; fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; - fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { }; - - fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { }; - fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; }; - fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; - - fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; - - fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { }; - - fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; - - fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { }; - - fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { }; - - fcppt = callPackage ../development/libraries/fcppt { }; - - fcrackzip = callPackage ../tools/security/fcrackzip { }; - - fcron = callPackage ../tools/system/fcron { }; - - fdm = callPackage ../tools/networking/fdm {}; - - fdtools = callPackage ../tools/misc/fdtools { }; - featherpad = qt5.callPackage ../applications/editors/featherpad {}; - fend = callPackage ../tools/misc/fend { }; - - ferm = callPackage ../tools/networking/ferm { }; - feroxbuster = callPackage ../tools/security/feroxbuster { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7139,13 +2934,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit; }; - fgallery = callPackage ../tools/graphics/fgallery { }; - - flannel = callPackage ../tools/networking/flannel { }; - cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix {}; - - flashbench = callPackage ../os-specific/linux/flashbench { }; - flatpak = callPackage ../development/libraries/flatpak { }; flatpak-builder = callPackage ../development/tools/flatpak-builder { @@ -7156,69 +2944,20 @@ with pkgs; icu = icu63; }; - fluent-bit = callPackage ../tools/misc/fluent-bit { }; - - fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { }; - - flux = callPackage ../development/compilers/flux { }; - - fido2luks = callPackage ../tools/security/fido2luks {}; - - fierce = callPackage ../tools/security/fierce { }; - - figlet = callPackage ../tools/misc/figlet { }; - file = callPackage ../tools/misc/file { inherit (windows) libgnurx; }; - filegive = callPackage ../tools/networking/filegive { }; - - fileschanged = callPackage ../tools/misc/fileschanged { }; - - filet = callPackage ../applications/misc/filet { }; - findomain = callPackage ../tools/networking/findomain { inherit (darwin.apple_sdk.frameworks) Security; }; - findutils = callPackage ../tools/misc/findutils { }; - - findup = callPackage ../tools/misc/findup { }; - - bsd-finger = callPackage ../tools/networking/bsd-finger { }; bsd-fingerd = bsd-finger.override({ buildClient = false; }); - iprange = callPackage ../applications/networking/firehol/iprange.nix {}; - - firehol = callPackage ../applications/networking/firehol {}; - - fio = callPackage ../tools/system/fio { }; - - flamerobin = callPackage ../applications/misc/flamerobin { }; - - flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; - flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; - - flpsed = callPackage ../applications/editors/flpsed { }; - - fluentd = callPackage ../tools/misc/fluentd { }; - - flvstreamer = callPackage ../tools/networking/flvstreamer { }; - - frr = callPackage ../servers/frr { }; - - gemstash = callPackage ../development/tools/gemstash { }; - hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { }; - libbsd = callPackage ../development/libraries/libbsd { }; - - libbladeRF = callPackage ../development/libraries/libbladeRF { }; - libbtbb = callPackage ../development/libraries/libbtbb { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7227,50 +2966,10 @@ with pkgs; inherit (darwin) cctools autoSignDarwinBinariesHook; }; - fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; - - faraday-agent-dispatcher = callPackage ../tools/security/faraday-agent-dispatcher { }; - - faraday-cli = callPackage ../tools/security/faraday-cli { }; - - fastlane = callPackage ../tools/admin/fastlane { }; - - fatresize = callPackage ../tools/filesystems/fatresize {}; - - fdk_aac = callPackage ../development/libraries/fdk-aac { }; - - fdk-aac-encoder = callPackage ../applications/audio/fdkaac { }; - - feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; - - fbcat = callPackage ../tools/misc/fbcat { }; - - fbv = callPackage ../tools/graphics/fbv { }; - - fbvnc = callPackage ../tools/admin/fbvnc {}; - - fim = callPackage ../tools/graphics/fim { }; - - flac123 = callPackage ../applications/audio/flac123 { }; - - flamegraph = callPackage ../development/tools/flamegraph { }; - - flawfinder = callPackage ../development/tools/flawfinder { }; - - flintlock = callPackage ../applications/virtualization/flintlock { }; - - flip-link = callPackage ../development/tools/flip-link { }; - - flips = callPackage ../tools/compression/flips { }; - - flowblade = callPackage ../applications/video/flowblade { }; - fmbt = callPackage ../development/tools/fmbt { python = python2; }; - fontfor = callPackage ../tools/misc/fontfor { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; python = python3; @@ -7282,18 +2981,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; - fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix {}; - footswitch = callPackage ../tools/inputmethods/footswitch { }; - - foremost = callPackage ../tools/system/foremost { }; - - forktty = callPackage ../os-specific/linux/forktty {}; - - fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7302,16 +2991,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fpart = callPackage ../tools/misc/fpart { }; - - fping = callPackage ../tools/networking/fping {}; - - fpm = callPackage ../tools/package-management/fpm { }; - - fprintd = callPackage ../tools/security/fprintd { }; - - fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { }; - ferdi = callPackage ../applications/networking/instant-messengers/ferdi { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; @@ -7320,28 +2999,14 @@ with pkgs; mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; - fq = callPackage ../development/tools/fq { }; - franz = callPackage ../applications/networking/instant-messengers/franz { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; - freac = callPackage ../applications/audio/freac { }; - - freebind = callPackage ../tools/networking/freebind { }; - - freeipmi = callPackage ../tools/system/freeipmi {}; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { guile = guile_2_0; }; - freetds = callPackage ../development/libraries/freetds { }; - - freetube = callPackage ../applications/video/freetube { }; - - freeze = callPackage ../tools/security/freeze { }; - freqtweak = callPackage ../applications/audio/freqtweak { wxGTK = wxGTK32; }; @@ -7352,27 +3017,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation DiskArbitration Foundation IOKit; }; - frostwire = callPackage ../applications/networking/p2p/frostwire { }; - frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; - - ftgl = callPackage ../development/libraries/ftgl { }; - - ftop = callPackage ../os-specific/linux/ftop { }; - - ftxui = callPackage ../development/libraries/ftxui { }; - - fsarchiver = callPackage ../tools/archivers/fsarchiver { }; - fstl = qt5.callPackage ../applications/graphics/fstl { }; - fswebcam = callPackage ../os-specific/linux/fswebcam { }; - - fulcio = callPackage ../tools/security/fulcio { }; - - fuseiso = callPackage ../tools/filesystems/fuseiso { }; - - fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 libressl = libressl_3_4; @@ -7387,48 +3033,18 @@ with pkgs; foundationdb = foundationdb61; - fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; - - fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {}; - - fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { }; - - fusee-launcher = callPackage ../development/tools/fusee-launcher { }; - - fverb = callPackage ../applications/audio/fverb { }; - fwknop = callPackage ../tools/security/fwknop { texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. }; - exfat = callPackage ../tools/filesystems/exfat { }; - - exfatprogs = callPackage ../tools/filesystems/exfatprogs { }; - - dos2unix = callPackage ../tools/text/dos2unix { }; - - uni2ascii = callPackage ../tools/text/uni2ascii { }; - - uniscribe = callPackage ../tools/text/uniscribe { }; - - calcoo = callPackage ../applications/misc/calcoo { }; - galculator = callPackage ../applications/misc/galculator { gtk = gtk3; }; - fornalder = callPackage ../applications/version-management/fornalder { }; - - free42 = callPackage ../applications/misc/free42 { }; - - galen = callPackage ../development/tools/galen {}; - gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { }; - gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; - gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; inherit (callPackage ../tools/filesystems/garage { @@ -7438,14 +3054,6 @@ with pkgs; garage_0_7 garage_0_8 garage_0_7_3 garage_0_8_0; - garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; - - garmintools = callPackage ../development/libraries/garmintools {}; - - gau = callPackage ../tools/security/gau { }; - - gauge = callPackage ../development/tools/gauge { }; - gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; }; @@ -7453,80 +3061,23 @@ with pkgs; gawk-with-extensions = callPackage ../tools/text/gawk/gawk-with-extensions.nix { extensions = gawkextlib.full; }; - gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {}; gawkInteractive = gawk.override { interactive = true; }; - gatk = callPackage ../applications/science/biology/gatk {} ; - gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2-x11; }; - gdmap = callPackage ../tools/system/gdmap { }; - - gef = callPackage ../development/tools/misc/gef { }; - - gelasio = callPackage ../data/fonts/gelasio { }; - - gemget = callPackage ../tools/networking/gemget {}; - - gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; - - genext2fs = callPackage ../tools/filesystems/genext2fs { }; - - gengetopt = callPackage ../development/tools/misc/gengetopt { }; - - genimage = callPackage ../tools/filesystems/genimage { }; - - genmap = callPackage ../applications/science/biology/genmap { }; - - geonkick = callPackage ../applications/audio/geonkick {}; - - gerrit = callPackage ../applications/version-management/gerrit { }; - - geteltorito = callPackage ../tools/misc/geteltorito { }; - - getmail6 = callPackage ../tools/networking/getmail6 { }; - - getopt = callPackage ../tools/misc/getopt { }; - - getoptions = callPackage ../tools/misc/getoptions { }; - - gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../applications/networking/ftp/gftp { gtk = gtk2; }; - gfs2-utils = callPackage ../tools/filesystems/gfs2-utils { }; - - gfbgraph = callPackage ../development/libraries/gfbgraph { }; - - ggobi = callPackage ../tools/graphics/ggobi { }; - - ghost = callPackage ../tools/security/ghost { }; - - ghostunnel = callPackage ../tools/networking/ghostunnel { }; - - ghz = callPackage ../tools/networking/ghz { }; - gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; - gibo = callPackage ../tools/misc/gibo { }; - - gifsicle = callPackage ../tools/graphics/gifsicle { }; - - gifski = callPackage ../tools/graphics/gifski { }; - - github-backup = callPackage ../tools/misc/github-backup { }; - github-runner = callPackage ../development/tools/continuous-integration/github-runner { inherit (darwin) autoSignDarwinBinariesHook; }; - gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { openssl = openssl_1_1; }; @@ -7535,81 +3086,25 @@ with pkgs; gitlabEnterprise = true; }; - gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { }; - - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; - - gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; - gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; - gitleaks = callPackage ../tools/security/gitleaks { }; - - gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; - gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; - gogs = callPackage ../applications/version-management/gogs { }; - - git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; - gitea = callPackage ../applications/version-management/gitea { }; forgejo = callPackage ../applications/version-management/forgejo {}; - gokart = callPackage ../development/tools/gokart { }; - - gl2ps = callPackage ../development/libraries/gl2ps { }; - - glusterfs = callPackage ../tools/filesystems/glusterfs { }; - - glmark2 = callPackage ../tools/graphics/glmark2 { }; - glogg = libsForQt5.callPackage ../tools/text/glogg { }; - glxinfo = callPackage ../tools/graphics/glxinfo { }; - gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gnirehtet = callPackage ../tools/networking/gnirehtet { }; - - gnome-builder = callPackage ../applications/editors/gnome-builder { }; - - gnome-desktop = callPackage ../development/libraries/gnome-desktop { }; - gnome-decoder = callPackage ../applications/graphics/gnome-decoder { inherit (gst_all_1) gstreamer gst-plugins-base; gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; }; }; - gnome-epub-thumbnailer = callPackage ../applications/misc/gnome-epub-thumbnailer { }; - - gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { }; - - gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; - - gnome-frog = callPackage ../applications/misc/gnome-frog { }; - - gnome-keysign = callPackage ../tools/security/gnome-keysign { }; - - gnome-secrets = callPackage ../applications/misc/gnome-secrets { }; - - gnome-solanum = callPackage ../applications/misc/gnome-solanum { }; - - gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; - - gnome-photos = callPackage ../applications/graphics/gnome-photos { }; - - gnome-randr = callPackage ../tools/wayland/gnome-randr { }; - - gnuapl = callPackage ../development/interpreters/gnu-apl { }; - - gnu-shepherd = callPackage ../misc/gnu-shepherd { }; - dapl = callPackage ../development/interpreters/dzaima-apl { buildNativeImage = false; stdenv = stdenvNoCC; @@ -7620,24 +3115,10 @@ with pkgs; jdk = graalvm11-ce; }; - gnucap = callPackage ../applications/science/electronics/gnucap { }; - - gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; - - gnuclad = callPackage ../applications/graphics/gnuclad { }; - gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; - gnugrep = callPackage ../tools/text/gnugrep { }; - - gnulib = callPackage ../development/tools/gnulib { }; - - gnupatch = callPackage ../tools/text/gnupatch { }; - - gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; - gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg23 = callPackage ../tools/security/gnupg/23.nix { guiSupport = stdenv.isDarwin; @@ -7645,8 +3126,6 @@ with pkgs; }; gnupg = gnupg23; - gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -7656,36 +3135,7 @@ with pkgs; # must have AquaTerm installed separately gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; - gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { }; - - gnused = callPackage ../tools/text/gnused { }; - - gnutar = callPackage ../tools/archivers/gnutar { }; - - goaccess = callPackage ../tools/misc/goaccess { }; - - gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; - - godot_4 = callPackage ../development/tools/godot/4 { }; - - godot = callPackage ../development/tools/godot/3 { }; - - godot-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { }; - - godot-headless = callPackage ../development/tools/godot/3/headless.nix { }; - - godot-server = callPackage ../development/tools/godot/3/server.nix { }; - - goeland = callPackage ../applications/networking/feedreaders/goeland { }; - - go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - - goofys = callPackage ../tools/filesystems/goofys { }; - - go-sct = callPackage ../tools/X11/go-sct { }; - # rename to upower-notify? - go-upower-notify = callPackage ../tools/misc/upower-notify { }; goattracker = callPackage ../applications/audio/goattracker { }; @@ -7693,10 +3143,6 @@ with pkgs; isStereo = true; }; - google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { }; - - google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; - google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { python = python3; }; @@ -7705,76 +3151,25 @@ with pkgs; with-gce = true; }; - google-fonts = callPackage ../data/fonts/google-fonts { }; - google-clasp = nodePackages."@google/clasp"; google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; - google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; - - google-java-format = callPackage ../development/tools/google-java-format { }; - - google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { }; - - google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { }; - gdown = with python3Packages; toPythonApplication gdown; - gopro = callPackage ../tools/video/gopro { }; - - goreleaser = callPackage ../tools/misc/goreleaser { }; - - goreplay = callPackage ../tools/networking/goreplay { }; - - gost = callPackage ../tools/networking/gost { }; - - gource = callPackage ../applications/version-management/gource { }; - - govc = callPackage ../tools/virtualization/govc { }; - goverlay = callPackage ../tools/graphics/goverlay { inherit (qt5) wrapQtAppsHook; inherit (plasma5Packages) breeze-qt5; }; - gpart = callPackage ../tools/filesystems/gpart { }; - - gparted = callPackage ../tools/misc/gparted { }; - - gpt2tc = callPackage ../tools/text/gpt2tc { }; - - gptman = callPackage ../tools/system/gptman { }; - - ldmtool = callPackage ../tools/misc/ldmtool { }; - - gphotos-sync = callPackage ../tools/backup/gphotos-sync { }; - - gpodder = callPackage ../applications/audio/gpodder { }; - - gpp = callPackage ../development/tools/gpp { }; - - gnuastro = callPackage ../applications/science/astronomy/gnuastro { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { hamlib = hamlib_4; }; gprof2dot = with python3Packages; toPythonApplication gprof2dot; - gprojector = callPackage ../applications/science/astronomy/gprojector { }; - - gptfdisk = callPackage ../tools/system/gptfdisk { }; - - grafterm = callPackage ../tools/misc/grafterm { }; - - grafx2 = callPackage ../applications/graphics/grafx2 {}; - grails = callPackage ../development/web/grails { jdk = null; }; - graylog = callPackage ../tools/misc/graylog { }; graylogPlugins = recurseIntoAttrs ( callPackage ../tools/misc/graylog/plugins.nix { } ); @@ -7789,14 +3184,6 @@ with pkgs; libdevil = libdevil-nox; }; - gridtracker = callPackage ../applications/radio/gridtracker { }; - - grig = callPackage ../applications/radio/grig { }; - - grin = callPackage ../tools/text/grin { }; - - gyb = callPackage ../tools/backup/gyb { }; - igrep = callPackage ../tools/text/igrep { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7809,33 +3196,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - robodoc = callPackage ../tools/text/robodoc { }; - ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; }; - grive2 = callPackage ../tools/filesystems/grive2 { }; - - groff = callPackage ../tools/text/groff { }; - gromit-mpx = callPackage ../tools/graphics/gromit-mpx { gtk = gtk3; libappindicator = libappindicator-gtk3; }; - gron = callPackage ../development/tools/gron { }; - - groonga = callPackage ../servers/search/groonga { }; - - grpcurl = callPackage ../tools/networking/grpcurl { }; - - grpc-gateway = callPackage ../development/tools/grpc-gateway { }; - - grpcui = callPackage ../tools/networking/grpcui { }; - - grpc-tools = callPackage ../development/tools/misc/grpc-tools { }; - - grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { }; - grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); @@ -7870,8 +3237,6 @@ with pkgs; xenSupport = true; }; - grub2_pvgrub_image = callPackage ../tools/misc/grub/pvgrub_image { }; - grub4dos = callPackage ../tools/misc/grub4dos { stdenv = stdenv_32bit; }; @@ -7880,175 +3245,44 @@ with pkgs; gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; - gx = callPackage ../tools/package-management/gx { }; - gx-go = callPackage ../tools/package-management/gx/go { }; - - efitools = callPackage ../tools/security/efitools { }; - - sbctl = callPackage ../tools/security/sbctl { }; - sbsigntool = callPackage ../tools/security/sbsigntool { openssl = openssl_1_1; }; - sonic-server = callPackage ../servers/search/sonic-server { }; - - gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; }; - gssdp = callPackage ../development/libraries/gssdp { }; - - gssdp_1_6 = callPackage ../development/libraries/gssdp/1.6.nix { }; - - gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - - grype = callPackage ../tools/security/grype { }; - - gt5 = callPackage ../tools/system/gt5 { }; - - gtest = callPackage ../development/libraries/gtest { }; - - gbenchmark = callPackage ../development/libraries/gbenchmark {}; - - gkraken = callPackage ../tools/system/gkraken { }; - - gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; - - gtdialog = callPackage ../development/libraries/gtdialog {}; - gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; - gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; - - gtkperf = callPackage ../development/tools/misc/gtkperf { }; - - gtkradiant = callPackage ../applications/misc/gtkradiant { }; - - gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; - - gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; - - gup = callPackage ../development/tools/build-managers/gup {}; - - gupnp = callPackage ../development/libraries/gupnp { }; - - gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { }; - - gupnp-av = callPackage ../development/libraries/gupnp-av {}; - - gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; - - gupnp-igd = callPackage ../development/libraries/gupnp-igd {}; - - gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; - gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gvpe = callPackage ../tools/networking/gvpe {}; - - gvolicon = callPackage ../tools/audio/gvolicon {}; - - gvproxy = callPackage ../tools/networking/gvproxy { }; - - gzip = callPackage ../tools/compression/gzip { }; - - gzrt = callPackage ../tools/compression/gzrt { }; - - httplab = callPackage ../tools/networking/httplab { }; - - lucky-cli = callPackage ../development/web/lucky-cli { }; - - mac-fdisk = callPackage ../tools/system/mac-fdisk { }; - - partclone = callPackage ../tools/backup/partclone { }; - - partimage = callPackage ../tools/backup/partimage { }; - pdisk = callPackage ../tools/system/pdisk { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; - pgf_graphics = callPackage ../tools/graphics/pgf { }; - - pgbackrest = callPackage ../tools/backup/pgbackrest { }; - - pgformatter = callPackage ../development/tools/pgformatter { }; - - pgloader = callPackage ../development/tools/pgloader { }; - - pgtop = callPackage ../development/tools/pgtop { }; - - pigz = callPackage ../tools/compression/pigz { }; - - pixz = callPackage ../tools/compression/pixz { }; - plplot = callPackage ../development/libraries/plplot { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - pxattr = callPackage ../tools/archivers/pxattr { }; - - pxz = callPackage ../tools/compression/pxz { }; - - haguichi = callPackage ../tools/networking/haguichi { }; - - hans = callPackage ../tools/networking/hans { }; - - h2 = callPackage ../servers/h2 { }; - h5utils = callPackage ../tools/misc/h5utils { libmatheval = null; hdf4 = null; }; - haproxy = callPackage ../tools/networking/haproxy { }; - - hackertyper = callPackage ../tools/misc/hackertyper { }; - - hackneyed = callPackage ../data/icons/hackneyed { }; - - haveged = callPackage ../tools/security/haveged { }; - habitat = callPackage ../applications/networking/cluster/habitat { openssl = openssl_1_1; }; - hashcash = callPackage ../tools/security/hashcash { }; - - hashcat = callPackage ../tools/security/hashcat { }; - - hashcat-utils = callPackage ../tools/security/hashcat-utils { }; - - hashrat = callPackage ../tools/security/hashrat { }; - hash_extender = callPackage ../tools/security/hash_extender { openssl = openssl_1_1; }; - hash-identifier = callPackage ../tools/security/hash-identifier { }; - - hash-slinger = callPackage ../tools/security/hash-slinger { }; - - haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; - hassil = with python3Packages; toPythonApplication hassil; - hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; - - haste-client = callPackage ../tools/misc/haste-client { }; - - haste-server = callPackage ../servers/haste-server { }; - hatch = python3Packages.callPackage ../development/tools/hatch { }; hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; - half = callPackage ../development/libraries/half { }; - - halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { llvmPackages = llvmPackages_14; }; @@ -8057,31 +3291,11 @@ with pkgs; ham = pkgs.perlPackages.ham; - hardinfo = callPackage ../tools/system/hardinfo { }; - - harmonia = callPackage ../tools/package-management/harmonia { }; - - hcl2json = callPackage ../applications/misc/hcl2json { }; - - hcxtools = callPackage ../tools/security/hcxtools { }; - - hcxdumptool = callPackage ../tools/security/hcxdumptool { }; - - hdapsd = callPackage ../os-specific/linux/hdapsd { }; - - hdaps-gl = callPackage ../tools/misc/hdaps-gl { }; - - hddtemp = callPackage ../tools/misc/hddtemp { }; - - hdf4 = callPackage ../tools/misc/hdf4 { }; - hdf5 = callPackage ../tools/misc/hdf5 { fortranSupport = false; fortran = gfortran; }; - hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; - hdf5-mpi = hdf5.override { mpiSupport = true; }; hdf5-cpp = hdf5.override { cppSupport = true; }; @@ -8090,49 +3304,14 @@ with pkgs; hdf5-threadsafe = hdf5.override { threadsafe = true; }; - hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - - hdfview = callPackage ../tools/misc/hdfview { }; - - hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; - heatshrink = callPackage ../tools/compression/heatshrink { }; - heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { }; - - healthchecks = callPackage ../servers/web-apps/healthchecks { }; - - heisenbridge = callPackage ../servers/heisenbridge { }; - - helio-workstation = callPackage ../applications/audio/helio-workstation { }; - - hevea = callPackage ../tools/typesetting/hevea { }; - - hex = callPackage ../tools/misc/hex { }; - - hexd = callPackage ../tools/misc/hexd { }; - pixd = callPackage ../tools/misc/pixd { }; - - hexgui = callPackage ../games/hexgui { }; - - hey = callPackage ../tools/networking/hey { }; - - hhpc = callPackage ../tools/misc/hhpc { }; - - hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; - - hivemind = callPackage ../applications/misc/hivemind { }; - hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { }; - hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight ({ lua = lua5; }); @@ -8141,132 +3320,50 @@ with pkgs; hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; - holochain-launcher = callPackage ../applications/misc/holochain-launcher { }; - - homesick = callPackage ../tools/misc/homesick { }; - - honcho = callPackage ../tools/system/honcho { }; - - horst = callPackage ../tools/networking/horst { }; - host = bind.host; - hostess = callPackage ../development/tools/hostess {}; - - hostname-debian = callPackage ../tools/networking/hostname-debian { }; - - hotpatch = callPackage ../development/libraries/hotpatch { }; - hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { }; hpccm = with python3Packages; toPythonApplication hpccm; - hping = callPackage ../tools/networking/hping { }; - hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { }; - html-proofer = callPackage ../tools/misc/html-proofer { }; - htmlq = callPackage ../development/tools/htmlq { inherit (darwin.apple_sdk.frameworks) Security; }; - htpdate = callPackage ../tools/networking/htpdate { }; - http-prompt = callPackage ../tools/networking/http-prompt { }; - http-getter = callPackage ../applications/networking/flent/http-getter.nix { }; - - httpdirfs = callPackage ../tools/filesystems/httpdirfs { }; - - httpdump = callPackage ../tools/security/httpdump { }; - httpie = with python3Packages; toPythonApplication httpie; - httping = callPackage ../tools/networking/httping {}; - httplz = callPackage ../tools/networking/httplz { inherit (darwin.apple_sdk.frameworks) Security; }; - httpfs2 = callPackage ../tools/filesystems/httpfs { }; - - httpstat = callPackage ../tools/networking/httpstat { }; - - httptunnel = callPackage ../tools/networking/httptunnel { }; - - httpx = callPackage ../tools/security/httpx { }; - - hurl = callPackage ../tools/networking/hurl { }; - - hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; - humanfriendly = with python3Packages; toPythonApplication humanfriendly; - hwinfo = callPackage ../tools/system/hwinfo { }; - hw-probe = perlPackages.callPackage ../tools/system/hw-probe { }; hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { stdenv = gcc8Stdenv; }; - hylafaxplus = callPackage ../servers/hylafaxplus { }; - - hyphen = callPackage ../development/libraries/hyphen { }; - - i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - - i2p = callPackage ../tools/networking/i2p { }; - - i2pd = callPackage ../tools/networking/i2pd { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; iaito = libsForQt5.callPackage ../tools/security/iaito { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; - ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { }; - - ibniz = callPackage ../tools/graphics/ibniz { }; - - icecast = callPackage ../servers/icecast { }; - icemon = libsForQt5.callPackage ../applications/networking/icemon { }; icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak; - iceshelf = callPackage ../tools/backup/iceshelf { }; - - darkice = callPackage ../tools/audio/darkice { }; - - bc-decaf = callPackage ../development/libraries/bc-decaf { }; - - deckmaster = callPackage ../applications/misc/deckmaster { }; - - deco = callPackage ../applications/misc/deco { }; - - decoder = callPackage ../tools/security/decoder { }; - - icoutils = callPackage ../tools/graphics/icoutils { }; - - idutils = callPackage ../tools/misc/idutils { }; - - idle3tools = callPackage ../tools/system/idle3tools { }; - ifcopenshell = with python3Packages; toPythonApplication ifcopenshell; - iftop = callPackage ../tools/networking/iftop { }; - ifwifi = callPackage ../tools/networking/ifwifi { inherit (darwin.apple_sdk.frameworks) Security; }; - ifuse = callPackage ../tools/filesystems/ifuse { }; - ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; - idevicerestore = callPackage ../tools/misc/idevicerestore { }; - inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; libcxx = llvmPackages.libcxx; @@ -8278,10 +3375,6 @@ with pkgs; irods irods-icommands; - ignite = callPackage ../applications/virtualization/ignite { }; - - igmpproxy = callPackage ../tools/networking/igmpproxy { }; - ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (haskellPackages) ghcWithPackages; @@ -8290,52 +3383,12 @@ with pkgs; packages = config.ihaskell.packages or (_: []); }; - ijq = callPackage ../development/tools/ijq { }; - - iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; - - ike-scan = callPackage ../tools/security/ike-scan { }; - - imapsync = callPackage ../tools/networking/imapsync { }; - - imgur-screenshot = callPackage ../tools/graphics/imgur-screenshot { }; - - imgurbash2 = callPackage ../tools/graphics/imgurbash2 { }; - - in-formant = callPackage ../applications/audio/in-formant { }; - - inadyn = callPackage ../tools/networking/inadyn { }; - - incron = callPackage ../tools/system/incron { }; - - industrializer = callPackage ../applications/audio/industrializer { }; - - inetutils = callPackage ../tools/networking/inetutils { }; - - inferno = callPackage ../development/tools/inferno { }; - - inform6 = callPackage ../development/compilers/inform6 { }; - - inform7 = callPackage ../development/compilers/inform7 { }; - - infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; - innernet = callPackage ../tools/networking/innernet { inherit (darwin.apple_sdk.frameworks) Security; }; - innoextract = callPackage ../tools/archivers/innoextract { }; - input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { }; - input-utils = callPackage ../os-specific/linux/input-utils { }; - - inql = callPackage ../tools/security/inql { }; - - intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; - - intermodal = callPackage ../tools/misc/intermodal { }; - internetarchive = with python3Packages; toPythonApplication internetarchive; invidious = callPackage ../servers/invidious { @@ -8345,72 +3398,14 @@ with pkgs; videojs = callPackage ../servers/invidious/videojs.nix { }; }; - invoice2data = callPackage ../tools/text/invoice2data { }; - - inxi = callPackage ../tools/system/inxi { }; - - iodine = callPackage ../tools/networking/iodine { }; - - ioccheck = callPackage ../tools/security/ioccheck { }; - - ioping = callPackage ../tools/system/ioping { }; - - ior = callPackage ../tools/system/ior { }; - - iouyap = callPackage ../tools/networking/iouyap { }; - - ioztat = callPackage ../tools/filesystems/ioztat { }; - - ip2location = callPackage ../tools/networking/ip2location { }; - - ip2unix = callPackage ../tools/networking/ip2unix { }; - - ipad_charge = callPackage ../tools/misc/ipad_charge { }; - - iperf2 = callPackage ../tools/networking/iperf/2.nix { }; - iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfetch = callPackage ../tools/networking/ipfetch { }; - - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; - - ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; - ipget = callPackage ../applications/networking/ipget { buildGoModule = buildGo118Module; # build fails with 1.19 }; i-pi = with python3Packages; toPythonApplication i-pi; - iptsd = callPackage ../applications/misc/iptsd { }; - - ipmitool = callPackage ../tools/system/ipmitool {}; - - ipmiutil = callPackage ../tools/system/ipmiutil {}; - - ipmicfg = callPackage ../applications/misc/ipmicfg {}; - - ipmiview = callPackage ../applications/misc/ipmiview {}; - - ipcalc = callPackage ../tools/networking/ipcalc {}; - - netmask = callPackage ../tools/networking/netmask {}; - - netifd = callPackage ../tools/networking/netifd {}; - - ipinfo = callPackage ../tools/networking/ipinfo {}; - - ipscan = callPackage ../tools/security/ipscan { }; - - ipv6calc = callPackage ../tools/networking/ipv6calc {}; - - ipxe = callPackage ../tools/misc/ipxe { }; - - irker = callPackage ../servers/irker { }; - - ised = callPackage ../tools/misc/ised {}; - isl = isl_0_20; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; @@ -8428,22 +3423,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - itm-tools = callPackage ../development/tools/misc/itm-tools { }; - - ite-backlight = callPackage ../misc/ite-backlight { }; - - iwgtk = callPackage ../tools/networking/iwgtk { }; - - ix = callPackage ../tools/misc/ix { }; - - jaaa = callPackage ../applications/audio/jaaa { }; - - jackett = callPackage ../servers/jackett { }; - - jade = callPackage ../tools/text/sgml/jade { }; - - jadx = callPackage ../tools/security/jadx { }; - jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; jamesdsp-pulse = libsForQt5.callPackage ../applications/audio/jamesdsp { usePipewire = false; @@ -8454,155 +3433,33 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; - - jazzy = callPackage ../development/tools/jazzy { }; - jc = with python3Packages; toPythonApplication jc; - jd-cli = callPackage ../tools/security/jd-cli { }; - - jd-diff-patch = callPackage ../development/tools/jd-diff-patch { }; - - jd-gui = callPackage ../tools/security/jd-gui { }; - - jdiskreport = callPackage ../tools/misc/jdiskreport { }; - - jekyll = callPackage ../applications/misc/jekyll { }; - - jet = callPackage ../development/tools/jet { }; - - jfmt = callPackage ../development/tools/jfmt { }; - - jfsutils = callPackage ../tools/filesystems/jfsutils { }; - - jhead = callPackage ../tools/graphics/jhead { }; - - jid = callPackage ../development/tools/jid { }; - jing = res.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - jira-cli = callPackage ../development/tools/jira_cli { }; - - jira-cli-go = callPackage ../development/tools/jira-cli-go { }; - - jirafeau = callPackage ../servers/web-apps/jirafeau { }; - - jitterentropy = callPackage ../development/libraries/jitterentropy { }; - jl = haskellPackages.callPackage ../development/tools/jl { }; jless = callPackage ../development/tools/jless { inherit (darwin.apple_sdk.frameworks) AppKit; }; - jmespath = callPackage ../development/tools/jmespath { }; - - juicefs = callPackage ../tools/filesystems/juicefs { }; + joplin = nodePackages.joplin; - jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; + jpylyzer = with python3Packages; toPythonApplication jpylyzer; - jnettop = callPackage ../tools/networking/jnettop { }; + jsbeautifier = with python3Packages; toPythonApplication jsbeautifier; - jsvc = callPackage ../tools/system/jsvc { }; + json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; - junkie = callPackage ../tools/networking/junkie { }; + jsonwatch = callPackage ../tools/misc/jsonwatch { + inherit (darwin.apple_sdk.frameworks) Security; + }; - just = callPackage ../development/tools/just { }; - - go-jira = callPackage ../applications/misc/go-jira { }; - - john = callPackage ../tools/security/john { }; - - joplin = nodePackages.joplin; - - joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; - - jot = callPackage ../applications/misc/jot { }; - - journaldriver = callPackage ../tools/misc/journaldriver { }; - - jp = callPackage ../development/tools/jp { }; - - jp2a = callPackage ../applications/misc/jp2a { }; - - jpeg-archive = callPackage ../applications/graphics/jpeg-archive { }; - - jpegexiforient = callPackage ../tools/graphics/jpegexiforient { }; - - jpeginfo = callPackage ../applications/graphics/jpeginfo { }; - - jpegoptim = callPackage ../applications/graphics/jpegoptim { }; - - jpegrescan = callPackage ../applications/graphics/jpegrescan { }; - - jpylyzer = with python3Packages; toPythonApplication jpylyzer; - - jq = callPackage ../development/tools/jq { }; - - jiq = callPackage ../development/tools/misc/jiq { }; - - jql = callPackage ../development/tools/jql { }; - - jqp = callPackage ../development/tools/jqp { }; - - jo = callPackage ../development/tools/jo { }; - - jrnl = callPackage ../applications/misc/jrnl { }; - - jsawk = callPackage ../tools/text/jsawk { }; - - jsbeautifier = with python3Packages; toPythonApplication jsbeautifier; - - jscoverage = callPackage ../development/tools/misc/jscoverage { }; - - jsduck = callPackage ../development/tools/jsduck { }; - - json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; - - jsonwatch = callPackage ../tools/misc/jsonwatch { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - jsubfinder = callPackage ../tools/security/jsubfinder { }; - - jtag-remote-server = callPackage ../development/embedded/jtag-remote-server { }; - - jtc = callPackage ../development/tools/jtc { }; - - jumpapp = callPackage ../tools/X11/jumpapp {}; - - jove = callPackage ../applications/editors/jove {}; - - jucipp = callPackage ../applications/editors/jucipp { }; - - jugglinglab = callPackage ../tools/misc/jugglinglab { }; - - jupp = callPackage ../applications/editors/jupp { }; - - jupyter = callPackage ../applications/editors/jupyter { }; - - jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { }; - - justify = callPackage ../tools/text/justify { }; - - jwhois = callPackage ../tools/networking/jwhois { }; - - k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; - - kargo = callPackage ../tools/misc/kargo { }; - - kazam = callPackage ../applications/video/kazam { }; - - kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { }; - - kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; - - wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); - kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { }); + wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; }); + kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { }); kakoune-unwrapped = callPackage ../applications/editors/kakoune { # See comments on https://github.com/NixOS/nixpkgs/pull/198836 @@ -8612,7 +3469,6 @@ with pkgs; kakoune = wrapKakoune kakoune-unwrapped { plugins = [ ]; # override with the list of desired plugins }; - kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; @@ -8622,12 +3478,6 @@ with pkgs; kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; }; - katana = callPackage ../tools/security/katana { }; - - katriawm = callPackage ../applications/window-managers/katriawm { }; - - kbdd = callPackage ../applications/window-managers/kbdd { }; - kbs2 = callPackage ../tools/security/kbs2 { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -8638,22 +3488,10 @@ with pkgs; kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kdigger = callPackage ../tools/security/kdigger { }; - kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; - keepalived = callPackage ../tools/networking/keepalived { }; - - kestrel = callPackage ../tools/security/kestrel { }; - - kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; - keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; - keepmenu = callPackage ../applications/misc/keepmenu { }; - - kent = callPackage ../applications/science/biology/kent { }; - keybase = callPackage ../tools/security/keybase { # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox @@ -8663,14 +3501,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; - kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; - - keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; - - keychain = callPackage ../tools/misc/keychain { }; - - keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - keyscope = callPackage ../tools/security/keyscope { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security; }; @@ -8679,41 +3509,18 @@ with pkgs; jdk = jdk11; }; - kfctl = callPackage ../applications/networking/cluster/kfctl { }; - - kluctl = callPackage ../applications/networking/cluster/kluctl { }; - - kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; kibana = kibana7; - kibi = callPackage ../applications/editors/kibi { }; - kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; - kismet = callPackage ../applications/networking/sniffers/kismet { }; - - kiterunner = callPackage ../tools/security/kiterunner { }; - - klick = callPackage ../applications/audio/klick { }; - - klystrack = callPackage ../applications/audio/klystrack { }; - - knockpy = callPackage ../tools/security/knockpy { }; - kore = callPackage ../development/web/kore { openssl = openssl_1_1; }; - krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; - kpcli = callPackage ../tools/security/kpcli { }; - kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { }; - kratos = callPackage ../applications/misc/kratos { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; @@ -8724,22 +3531,8 @@ with pkgs; kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; - krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { }; - - kubepug = callPackage ../development/tools/kubepug { }; - - kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; - - kubo = callPackage ../applications/networking/kubo { }; - - kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; - kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; - kubo-migrator = callPackage ../applications/networking/kubo-migrator { }; - kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; peruse = libsForQt5.callPackage ../tools/misc/peruse { }; @@ -8748,20 +3541,6 @@ with pkgs; kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; - kytea = callPackage ../tools/text/kytea { }; - - kyverno = callPackage ../applications/networking/cluster/kyverno { }; - - k6 = callPackage ../development/tools/k6 { }; - - l2md = callPackage ../tools/text/l2md { }; - - lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; - - last-resort = callPackage ../data/fonts/last-resort {}; - - ldc = callPackage ../development/compilers/ldc { }; - ligo = callPackage ../development/compilers/ligo { coq = coq_8_14; }; @@ -8770,26 +3549,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - lego = callPackage ../tools/admin/lego { }; - leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; - less = callPackage ../tools/misc/less { }; - - lha = callPackage ../tools/archivers/lha { }; - - lhasa = callPackage ../tools/compression/lhasa {}; - - libcpuid = callPackage ../tools/misc/libcpuid { }; - - libcsptr = callPackage ../development/libraries/libcsptr { }; - - libgovirt = callPackage ../applications/virtualization/libgovirt { }; - - libscrypt = callPackage ../development/libraries/libscrypt { }; - - libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; - libcoap = callPackage ../applications/networking/libcoap { autoconf = buildPackages.autoconf269; }; @@ -8799,44 +3560,14 @@ with pkgs; gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }; - libshumate = callPackage ../development/libraries/libshumate { }; - - libsmartcols = callPackage ../development/libraries/libsmartcols { }; - - libsmi = callPackage ../development/libraries/libsmi { }; - - libgen-cli = callPackage ../tools/misc/libgen-cli { }; - - licensor = callPackage ../tools/misc/licensor { }; - - lesspipe = callPackage ../tools/misc/lesspipe { }; - liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg-full; }; - lfs = callPackage ../tools/filesystems/lfs { }; - - littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { }; - - lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; - - lldpd = callPackage ../tools/networking/lldpd { }; - - lnav = callPackage ../tools/misc/lnav { }; - - lnch = callPackage ../tools/misc/lnch { }; - lnx = callPackage ../servers/search/lnx { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; - loadlibrary = callPackage ../tools/misc/loadlibrary { }; - - loc = callPackage ../development/misc/loc { }; - - lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { # https://www.elastic.co/support/matrix#logstash-and-jvm jre = jdk11_headless; @@ -8857,31 +3588,11 @@ with pkgs; }; logstash = logstash6; - logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; - - lolcat = callPackage ../tools/misc/lolcat { }; - - lottieconverter = callPackage ../tools/misc/lottieconverter { }; - - loudgain = callPackage ../tools/audio/loudgain/default.nix { }; - - lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { }; - - lsd = callPackage ../tools/misc/lsd { }; - - lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; - lsyncd = callPackage ../applications/networking/sync/lsyncd { inherit (darwin) xnu; lua = lua5_2_compat; }; - ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; - - lvmsync = callPackage ../tools/backup/lvmsync { }; - - kapp = callPackage ../tools/networking/kapp {}; - kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; @@ -8893,48 +3604,17 @@ with pkgs; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; - ma1sd = callPackage ../servers/ma1sd { }; - - mailcatcher = callPackage ../development/web/mailcatcher { }; - - makebootfat = callPackage ../tools/misc/makebootfat { }; - - mani = callPackage ../development/tools/mani { }; - - mask = callPackage ../development/tools/mask { }; - - mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; - - matrix-conduit = callPackage ../servers/matrix-conduit { }; - /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails (https://github.com/NixOS/nixpkgs/issues/76093) */ - matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins; matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools; - matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { }; - - matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; - - matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; - - matrix-corporal = callPackage ../servers/matrix-corporal { }; - - mautrix-facebook = callPackage ../servers/mautrix-facebook { }; - - mautrix-googlechat = callPackage ../servers/mautrix-googlechat { }; - mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { }); mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); - mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - - mcfly = callPackage ../tools/misc/mcfly { }; - m2r = with python3Packages; toPythonApplication m2r; md2gemini = with python3.pkgs; toPythonApplication md2gemini; @@ -8943,8 +3623,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; - mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8957,10 +3635,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - mdbook-open-on-gh = callPackage ../tools/text/mdbook-open-on-gh { }; - - mdbook-man = callPackage ../tools/text/mdbook-man { }; - mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8990,74 +3664,22 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security DiskArbitration Foundation; }; - memtester = callPackage ../tools/system/memtester { }; - - mesa-demos = callPackage ../tools/graphics/mesa-demos { }; - mhonarc = perlPackages.MHonArc; - minica = callPackage ../tools/security/minica { }; - - minidlna = callPackage ../tools/networking/minidlna { }; - - miniplayer = callPackage ../applications/audio/miniplayer { }; - - minipro = callPackage ../tools/misc/minipro { }; - - minisign = callPackage ../tools/security/minisign { }; - - ministat = callPackage ../tools/misc/ministat { }; - - mjolnir = callPackage ../servers/mjolnir { }; - - mmutils = callPackage ../tools/X11/mmutils { }; - - mmv = callPackage ../tools/misc/mmv { }; - - mmv-go = callPackage ../tools/misc/mmv-go { }; - - mob = callPackage ../applications/misc/mob {}; - - most = callPackage ../tools/misc/most { }; - - motion = callPackage ../applications/video/motion { }; - - mozphab = callPackage ../applications/misc/mozphab { }; - - mtail = callPackage ../servers/monitoring/mtail { }; - mujmap = callPackage ../applications/networking/mujmap { inherit (darwin.apple_sdk.frameworks) Security; }; - multitail = callPackage ../tools/misc/multitail { }; - mx-puppet-discord = callPackage ../servers/mx-puppet-discord { }; - mxt-app = callPackage ../misc/mxt-app { }; - - naabu = callPackage ../tools/security/naabu { }; - nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; }; - nagelfar = callPackage ../development/tools/nagelfar { }; - - nats-top = callPackage ../tools/system/nats-top { }; - - natscli = callPackage ../tools/system/natscli { }; - - nbench = callPackage ../tools/misc/nbench { }; - nbtscanner = callPackage ../tools/security/nbtscanner { inherit (darwin.apple_sdk.frameworks) Security; }; - ncrack = callPackage ../tools/security/ncrack { }; - - nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; - netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -9065,26 +3687,8 @@ with pkgs; netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { }); netsurf-browser = netsurf.browser; - netperf = callPackage ../applications/networking/netperf { }; - - netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; - - nixpacks = callPackage ../applications/virtualization/nixpacks { }; - - nkeys = callPackage ../tools/system/nkeys { }; - - nyxt = callPackage ../applications/networking/browsers/nyxt { }; - - nfpm = callPackage ../tools/package-management/nfpm { }; - - nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; - - ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; - nodenv = callPackage ../development/tools/nodenv { }; - nodejs = hiPrio nodejs-18_x; nodejs-slim = nodejs-slim-18_x; @@ -9115,10 +3719,6 @@ with pkgs; nodejs_latest = nodejs-19_x; nodejs-slim_latest = nodejs-slim-19_x; - buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; - - npmHooks = callPackage ../build-support/node/build-npm-package/hooks { }; - inherit (callPackage ../build-support/node/fetch-npm-deps { inherit (darwin.apple_sdk.frameworks) Security; }) fetchNpmDeps prefetch-npm-deps; @@ -9129,110 +3729,21 @@ with pkgs; node2nix = nodePackages.node2nix; - openipmi = callPackage ../tools/system/openipmi { }; - - ox = callPackage ../applications/editors/ox { }; - - file-rename = callPackage ../tools/filesystems/file-rename { }; - kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; - kea = callPackage ../tools/networking/kea { }; - - iredis = callPackage ../tools/admin/iredis { }; - - ispell = callPackage ../tools/text/ispell {}; - - iodash = callPackage ../development/libraries/iodash { }; - - jbofihe = callPackage ../tools/text/jbofihe {}; - - jumanpp = callPackage ../tools/text/jumanpp {}; - - jump = callPackage ../tools/system/jump {}; - - larynx = callPackage ../tools/audio/larynx { }; - larynx-train = with python3Packages; toPythonApplication larynx-train; - latex2html = callPackage ../tools/misc/latex2html { }; - - lazycli = callPackage ../tools/misc/lazycli { }; - - lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { }; - - ldapmonitor = callPackage ../tools/security/ldapmonitor { }; - - ldapnomnom = callPackage ../tools/security/ldapnomnom { }; - - ldapvi = callPackage ../tools/misc/ldapvi { }; - ldeep = python3Packages.callPackage ../tools/security/ldeep { }; - ldns = callPackage ../development/libraries/ldns { }; - - leafpad = callPackage ../applications/editors/leafpad { }; - - l3afpad = callPackage ../applications/editors/l3afpad { }; - - leatherman = callPackage ../development/libraries/leatherman { }; - ledit = callPackage ../tools/misc/ledit { inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5; }; - ledmon = callPackage ../tools/system/ledmon { }; - - leela = callPackage ../tools/graphics/leela { }; - - lemmeknow = callPackage ../tools/misc/lemmeknow { }; - - lemmy-help = callPackage ../tools/misc/lemmy-help { }; - lethe = callPackage ../tools/security/lethe { inherit (darwin.apple_sdk.frameworks) Security; }; - lftp = callPackage ../tools/networking/lftp { }; - - libck = callPackage ../development/libraries/libck { }; - - libcork = callPackage ../development/libraries/libcork { }; - - libconfig = callPackage ../development/libraries/libconfig { }; - - libcmis = callPackage ../development/libraries/libcmis { }; - - libee = callPackage ../development/libraries/libee { }; - - libepc = callPackage ../development/libraries/libepc { }; - - liberfa = callPackage ../development/libraries/liberfa { }; - - libestr = callPackage ../development/libraries/libestr { }; - - libevdev = callPackage ../development/libraries/libevdev { }; - - liberio = callPackage ../development/libraries/liberio { }; - - libevdevplus = callPackage ../development/libraries/libevdevplus { }; - - libfann = callPackage ../development/libraries/libfann { }; - - libfsm = callPackage ../development/libraries/libfsm { }; - - libgaminggear = callPackage ../development/libraries/libgaminggear { }; - - libhandy = callPackage ../development/libraries/libhandy { }; - # Needed for apps that still depend on the unstable verison of the library (not libhandy-1) - libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { }; - - libgmpris = callPackage ../development/libraries/libgmpris { }; - - libgumath = callPackage ../development/libraries/libgumath { }; - - libinsane = callPackage ../development/libraries/libinsane { }; libint = callPackage ../development/libraries/libint {}; libintPsi4 = callPackage ../development/libraries/libint { @@ -9258,81 +3769,16 @@ with pkgs; eri3PureSh = false; }; - libipfix = callPackage ../development/libraries/libipfix { }; - libirc = libsForQt5.callPackage ../development/libraries/libirc { }; - libircclient = callPackage ../development/libraries/libircclient { }; - - libiscsi = callPackage ../development/libraries/libiscsi { }; - - libisds = callPackage ../development/libraries/libisds { }; - - libite = callPackage ../development/libraries/libite { }; - liblangtag = callPackage ../development/libraries/liblangtag { inherit (gnome) gnome-common; }; - liblouis = callPackage ../development/libraries/liblouis { }; - - liboauth = callPackage ../development/libraries/liboauth { }; - - libr3 = callPackage ../development/libraries/libr3 { }; - - libraspberrypi = callPackage ../development/libraries/libraspberrypi { }; - - libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; - - libspf2 = callPackage ../development/libraries/libspf2 { }; - - libsrs2 = callPackage ../development/libraries/libsrs2 { }; - - libtermkey = callPackage ../development/libraries/libtermkey { }; - - libtelnet = callPackage ../development/libraries/libtelnet { }; - - libtirpc = callPackage ../development/libraries/ti-rpc { }; - - libtins = callPackage ../development/libraries/libtins { }; - - libtree = callPackage ../development/tools/misc/libtree { }; - - libshout = callPackage ../development/libraries/libshout { }; - - libqb = callPackage ../development/libraries/libqb { }; - - libqmi = callPackage ../development/libraries/libqmi { }; - - libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { }; - - libmbim = callPackage ../development/libraries/libmbim { }; - - libmongo-client = callPackage ../development/libraries/libmongo-client { }; - - libmesode = callPackage ../development/libraries/libmesode {}; - - libmsym = callPackage ../development/libraries/science/chemistry/libmsym { }; - - libnabo = callPackage ../development/libraries/libnabo { }; - - libngspice = callPackage ../development/libraries/libngspice { }; - - libnixxml = callPackage ../development/libraries/libnixxml { }; - - libplctag = callPackage ../development/libraries/libplctag { }; - - libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; - - libportal = callPackage ../development/libraries/libportal { }; libportal-gtk3 = libportal.override { variant = "gtk3"; }; libportal-gtk4 = libportal.override { variant = "gtk4"; }; libportal-qt5 = libportal.override { variant = "qt5"; }; - libmicrodns = callPackage ../development/libraries/libmicrodns { }; - - libnids = callPackage ../tools/networking/libnids { }; - rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; }; @@ -9341,163 +3787,39 @@ with pkgs; libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; }; - libmpack = callPackage ../development/libraries/libmpack { }; - - libiberty = callPackage ../development/libraries/libiberty { }; - - libucl = callPackage ../development/libraries/libucl { }; - - libxc = callPackage ../development/libraries/libxc { }; - - libxcomp = callPackage ../development/libraries/libxcomp { }; - - libxl = callPackage ../development/libraries/libxl {}; - - libx86emu = callPackage ../development/libraries/libx86emu { }; - - libzim = callPackage ../development/libraries/libzim {}; - - - libzmf = callPackage ../development/libraries/libzmf {}; libreddit = callPackage ../servers/libreddit { inherit (darwin.apple_sdk.frameworks) Security; }; - librespeed-cli = callPackage ../tools/misc/librespeed-cli { }; - - libreswan = callPackage ../tools/networking/libreswan { }; - - librest = callPackage ../development/libraries/librest { }; - - librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { }; - - libwebsockets = callPackage ../development/libraries/libwebsockets { }; - - libyafaray = callPackage ../tools/graphics/libyafaray { }; - - licensee = callPackage ../tools/package-management/licensee { }; - - lidarr = callPackage ../servers/lidarr { }; - limesuite = callPackage ../applications/radio/limesuite { inherit (darwin.apple_sdk.frameworks) GLUT; }; - limesurvey = callPackage ../servers/limesurvey { }; - - linux-exploit-suggester = callPackage ../tools/security/linux-exploit-suggester { }; - - linuxquota = callPackage ../tools/misc/linuxquota { }; - liquidctl = with python3Packages; toPythonApplication liquidctl; - lmp = callPackage ../tools/security/lmp { }; - localstack = with python3Packages; toPythonApplication localstack; - localtime = callPackage ../tools/system/localtime { }; - - log4j-detect = callPackage ../tools/security/log4j-detect { }; - - log4j-scan = callPackage ../tools/security/log4j-scan { }; - - log4j-sniffer = callPackage ../tools/security/log4j-sniffer { }; - - log4j-vuln-scanner = callPackage ../tools/security/log4j-vuln-scanner { }; - - log4jcheck = callPackage ../tools/security/log4jcheck { }; - - log4shell-detector = callPackage ../tools/security/log4shell-detector { }; - - logcheck = callPackage ../tools/system/logcheck { }; - - logmap = callPackage ../tools/security/logmap { }; - - logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { }; - - logkeys = callPackage ../tools/security/logkeys { }; - - logrotate = callPackage ../tools/system/logrotate { }; - - logstalgia = callPackage ../tools/graphics/logstalgia {}; - - lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; - loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; }; - longview = callPackage ../servers/monitoring/longview { }; - - lorien = callPackage ../applications/graphics/lorien { }; - - lout = callPackage ../tools/typesetting/lout { }; - - lr = callPackage ../tools/system/lr { }; - - lrzip = callPackage ../tools/compression/lrzip { }; - - lsb-release = callPackage ../os-specific/linux/lsb-release { }; - # lsh installs `bin/nettle-lfib-stream' and so does Nettle. Give the # former a lower priority than Nettle. lsh = lowPrio (callPackage ../tools/networking/lsh { }); - lshw = callPackage ../tools/system/lshw { }; - lunatic = callPackage ../development/interpreters/lunatic { inherit (darwin.apple_sdk.frameworks) Security; }; - lux = callPackage ../tools/video/lux { }; - - lv = callPackage ../tools/text/lv { }; - lxc = callPackage ../os-specific/linux/lxc { autoreconfHook = buildPackages.autoreconfHook269; }; - lxcfs = callPackage ../os-specific/linux/lxcfs { }; - lxd = callPackage ../tools/admin/lxd { }; - - lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; - - lzfse = callPackage ../tools/compression/lzfse { }; - - lzham = callPackage ../tools/compression/lzham { }; - - lzip = callPackage ../tools/compression/lzip { }; - - plzip = callPackage ../tools/compression/plzip { }; - - lziprecover = callPackage ../tools/compression/lziprecover { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { openimagedenoise = openimagedenoise_1_2_x; }; - xz = callPackage ../tools/compression/xz { }; - - lz4 = callPackage ../tools/compression/lz4 { }; - - lzbench = callPackage ../tools/compression/lzbench { }; - - lzop = callPackage ../tools/compression/lzop { }; - - lzwolf = callPackage ../games/lzwolf { }; - - macchanger = callPackage ../os-specific/linux/macchanger { }; - - macchina = callPackage ../tools/misc/macchina { }; - madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; - maeparser = callPackage ../development/libraries/maeparser { }; - - mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { }; - - maildrop = callPackage ../tools/networking/maildrop { }; - - mailhog = callPackage ../servers/mail/mailhog {}; - mailnag = callPackage ../applications/networking/mailreaders/mailnag { availablePlugins = { # More are listed here: https://github.com/pulb/mailnag/#desktop-integration @@ -9508,34 +3830,15 @@ with pkgs; mailnagWithPlugins = mailnag.withPlugins( builtins.attrValues mailnag.availablePlugins ); - bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; - - mailsend = callPackage ../tools/networking/mailsend { }; mailutils = callPackage ../tools/networking/mailutils { sasl = gsasl; }; - matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { }; - - email = callPackage ../tools/networking/email { }; - - maim = callPackage ../tools/graphics/maim {}; - - mairix = callPackage ../tools/text/mairix { }; - makemkv = libsForQt5.callPackage ../applications/video/makemkv { }; - makerpm = callPackage ../development/tools/makerpm { }; - - makefile2graph = callPackage ../development/tools/analysis/makefile2graph { }; - man = man-db; - man-db = callPackage ../tools/misc/man-db { }; - - mandoc = callPackage ../tools/misc/mandoc { }; - mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { }; mangohud = callPackage ../tools/graphics/mangohud { @@ -9548,22 +3851,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - marktext = callPackage ../applications/misc/marktext { }; - - mars-mips = callPackage ../development/tools/mars-mips { }; - maui-shell = libsForQt5.callPackage ../applications/window-managers/maui-shell { }; - mawk = callPackage ../tools/text/mawk { }; - - mb2md = callPackage ../tools/text/mb2md { }; - - mbox = callPackage ../tools/security/mbox { }; - - mbuffer = callPackage ../tools/misc/mbuffer { }; - - mdsh = callPackage ../development/tools/documentation/mdsh { }; - mecab = let mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { }; @@ -9574,140 +3863,28 @@ with pkgs; }; }; - mediawiki = callPackage ../servers/web-apps/mediawiki { }; - - memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; - - memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; - - memtest86plus = callPackage ../tools/misc/memtest86+ { }; - mbutil = python3Packages.callPackage ../applications/misc/mbutil { }; - mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; - - mcron = callPackage ../tools/system/mcron { }; - mcstatus = with python3Packages; toPythonApplication mcstatus; - mdbtools = callPackage ../tools/misc/mdbtools { }; - - mdk = callPackage ../development/tools/mdk { }; - - mdk4 = callPackage ../tools/networking/mdk4 { }; - - mdp = callPackage ../applications/misc/mdp { }; - - megacli = callPackage ../tools/misc/megacli { }; - - megatools = callPackage ../tools/networking/megatools { }; - - memo = callPackage ../applications/misc/memo { }; - - mencal = callPackage ../applications/misc/mencal { } ; - - metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; - - metar = callPackage ../applications/misc/metar { }; - - mfcuk = callPackage ../tools/security/mfcuk { }; - - mfoc = callPackage ../tools/security/mfoc { }; - - microbin = callPackage ../servers/microbin { }; - - microdnf = callPackage ../tools/package-management/microdnf { }; - - microplane = callPackage ../tools/misc/microplane { }; - - microserver = callPackage ../servers/microserver { }; - - midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; - - mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; - - mimeo = callPackage ../tools/misc/mimeo { }; - - mimetic = callPackage ../development/libraries/mimetic { }; - - minio-client = callPackage ../tools/networking/minio-client { }; - - minio-certgen = callPackage ../tools/security/minio-certgen { }; - - minissdpd = callPackage ../tools/networking/minissdpd { }; - - miniupnpc = callPackage ../tools/networking/miniupnpc { }; - - miniupnpd = callPackage ../tools/networking/miniupnpd { }; - - miniball = callPackage ../development/libraries/miniball { }; - - minijail = callPackage ../tools/system/minijail { }; - minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { }; - minilibx = callPackage ../development/libraries/minilibx { }; - - minixml = callPackage ../development/libraries/minixml { }; - mir-qualia = callPackage ../tools/text/mir-qualia { pythonPackages = python3Packages; }; mirakurun = callPackage ../applications/video/mirakurun { }; - miredo = callPackage ../tools/networking/miredo { }; - - mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = with python3Packages; toPythonApplication mitmproxy; - mitmproxy2swagger = callPackage ../tools/security/mitmproxy2swagger { }; - - mjpegtools = callPackage ../tools/video/mjpegtools { }; - mjpegtoolsFull = mjpegtools.override { withMinimal = false; }; - mkclean = callPackage ../applications/video/mkclean {}; - mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; }; - mkp224o = callPackage ../tools/security/mkp224o { }; - mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); - mkrand = callPackage ../tools/security/mkrand { }; - - mktemp = callPackage ../tools/security/mktemp { }; - - mktorrent = callPackage ../tools/misc/mktorrent { }; - - mloader = callPackage ../tools/misc/mloader { }; - - mmake = callPackage ../tools/misc/mmake { }; - - mmixware = callPackage ../development/tools/mmixware { }; - - modemmanager = callPackage ../tools/networking/modemmanager {}; - - modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; - - modsecurity_standalone = callPackage ../tools/security/modsecurity { }; - - modsecurity-crs = callPackage ../tools/security/modsecurity-crs { }; - - molly-guard = callPackage ../os-specific/linux/molly-guard { }; - - molotov = callPackage ../applications/video/molotov {}; - - moneyplex = callPackage ../applications/office/moneyplex { }; - - monit = callPackage ../tools/system/monit { }; - - monocraft = callPackage ../data/fonts/monocraft { }; - monolith = callPackage ../tools/backup/monolith { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9716,64 +3893,18 @@ with pkgs; docbook-xsl = docbook_xsl; }; - mole = callPackage ../tools/networking/mole { }; - morgen = callPackage ../applications/office/morgen { electron = electron_15; }; - mosh = callPackage ../tools/networking/mosh { }; - - motrix = callPackage ../tools/networking/motrix { }; - - mpage = callPackage ../tools/text/mpage { }; - - mprime = callPackage ../tools/misc/mprime { }; - - mpw = callPackage ../tools/security/mpw { }; - - mr = callPackage ../applications/version-management/mr { }; - - mrsh = callPackage ../shells/mrsh { }; - - mrtg = callPackage ../tools/misc/mrtg { }; - - mscgen = callPackage ../tools/graphics/mscgen { }; - - msfpc = callPackage ../tools/security/msfpc { }; - - melt = callPackage ../tools/security/melt { }; - - metabigor = callPackage ../tools/security/metabigor { }; - - metasploit = callPackage ../tools/security/metasploit { }; - mhost = callPackage ../applications/networking/mhost { inherit (darwin.apple_sdk.frameworks) Security; }; - ms-sys = callPackage ../tools/misc/ms-sys { }; - - mtdutils = callPackage ../tools/filesystems/mtdutils { }; - - mtools = callPackage ../tools/filesystems/mtools { }; - mtr = callPackage ../tools/networking/mtr {}; - mtr-exporter = callPackage ../tools/networking/mtr-exporter {}; - mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; - mtx = callPackage ../tools/backup/mtx {}; - - mt-st = callPackage ../tools/backup/mt-st {}; - - mubeng = callPackage ../tools/networking/mubeng { }; - - multitime = callPackage ../tools/misc/multitime { }; - - sta = callPackage ../tools/misc/sta {}; - multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; @@ -9788,65 +3919,10 @@ with pkgs; mtutils = callPackage ../tools/text/multitran/mtutils { }; }); - munge = callPackage ../tools/security/munge { }; - - mutagen = callPackage ../tools/misc/mutagen { }; - - mutagen-compose = callPackage ../tools/misc/mutagen-compose { }; - - mycli = callPackage ../tools/admin/mycli { }; - - mycrypto = callPackage ../applications/blockchains/mycrypto { }; - - mydumper = callPackage ../tools/backup/mydumper { }; - - mylvmbackup = callPackage ../tools/backup/mylvmbackup { }; - - mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; - - mysqltuner = callPackage ../tools/misc/mysqltuner { }; - mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; - nabi = callPackage ../tools/inputmethods/nabi { }; - - nahid-fonts = callPackage ../data/fonts/nahid-fonts { }; - - namazu = callPackage ../tools/text/namazu { }; - - nasty = callPackage ../tools/security/nasty { }; - - nat-traverse = callPackage ../tools/networking/nat-traverse { }; - - navi = callPackage ../applications/misc/navi { }; - navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; - nawk = callPackage ../tools/text/nawk { }; - - nbd = callPackage ../tools/networking/nbd { }; - xnbd = callPackage ../tools/networking/xnbd { }; - - ndjbdns = callPackage ../tools/networking/ndjbdns { }; - - ndppd = callPackage ../applications/networking/ndppd { }; - - nearcore = callPackage ../applications/blockchains/nearcore { }; - - nebula = callPackage ../tools/networking/nebula { }; - - nemiver = callPackage ../development/tools/nemiver { }; - - neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; - - neofetch = callPackage ../tools/misc/neofetch { }; - - nerdfonts = callPackage ../data/fonts/nerdfonts { }; - - netatalk = callPackage ../tools/filesystems/netatalk { }; - - netavark = callPackage ../tools/networking/netavark { }; - netcdf = callPackage ../development/libraries/netcdf { hdf5 = hdf5.override { usev110Api = true; }; }; @@ -9855,88 +3931,20 @@ with pkgs; hdf5 = hdf5-mpi.override { usev110Api = true; }; }; - netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; - netcdffortran = callPackage ../development/libraries/netcdf-fortran { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; - - nco = callPackage ../development/libraries/nco { }; - - ncftp = callPackage ../tools/networking/ncftp { }; - - ncgopher = callPackage ../applications/networking/ncgopher { }; - - ncompress = callPackage ../tools/compression/ncompress { }; - - ndisc6 = callPackage ../tools/networking/ndisc6 { }; - - netboot = callPackage ../tools/networking/netboot {}; - - netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; - - netbox = callPackage ../servers/web-apps/netbox { }; - netcat = libressl.nc; - netcat-gnu = callPackage ../tools/networking/netcat { }; - - netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; - - netdiscover = callPackage ../tools/networking/netdiscover { }; - - nethogs = callPackage ../tools/networking/nethogs { }; - - nethoscope = callPackage ../tools/networking/nethoscope { }; - - netkittftp = callPackage ../tools/networking/netkit/tftp { }; - - netlify-cli = callPackage ../development/web/netlify-cli { }; - - netpbm = callPackage ../tools/graphics/netpbm { }; - - netproc = callPackage ../tools/networking/netproc { }; - - netrw = callPackage ../tools/networking/netrw { }; - - netselect = callPackage ../tools/networking/netselect { }; - - networkmanager = callPackage ../tools/networking/networkmanager { }; - - networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { }; - - networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { }; - - networkmanager-l2tp = callPackage ../tools/networking/networkmanager/l2tp { }; - - networkmanager-vpnc = callPackage ../tools/networking/networkmanager/vpnc { }; - - networkmanager-openconnect = callPackage ../tools/networking/networkmanager/openconnect { }; - - networkmanager-fortisslvpn = callPackage ../tools/networking/networkmanager/fortisslvpn { }; - - networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { }; - - networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { }; - - networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { }; - - libnma = callPackage ../tools/networking/networkmanager/libnma { }; - libnma-gtk4 = libnma.override { withGtk4 = true; }; - networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { }; - nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - grocy = callPackage ../servers/grocy { }; - inherit (callPackage ../servers/nextcloud {}) nextcloud23 nextcloud24 nextcloud25; @@ -9952,22 +3960,6 @@ with pkgs; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; - nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; - - ndstool = callPackage ../tools/archivers/ndstool { }; - - nfs-ganesha = callPackage ../servers/nfs-ganesha { }; - - ngrep = callPackage ../tools/networking/ngrep { }; - - ngrok = callPackage ../tools/networking/ngrok { }; - - nifi = callPackage ../servers/web-apps/nifi { }; - - nitter = callPackage ../servers/nitter { }; - - noip = callPackage ../tools/networking/noip { }; - inherit (callPackage ../applications/networking/cluster/nomad { }) nomad nomad_1_2 @@ -9975,42 +3967,16 @@ with pkgs; nomad_1_4 ; - nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; - - nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; - - nomad-pack = callPackage ../applications/networking/cluster/nomad-pack { }; - - nomino = callPackage ../tools/misc/nomino { }; - - nb = callPackage ../tools/misc/nb { }; - - notable = callPackage ../applications/misc/notable { }; - nth = with python3Packages; toPythonApplication name-that-hash; - ntlmrecon = callPackage ../tools/security/ntlmrecon { }; - - numberstation = callPackage ../applications/misc/numberstation { }; - nvchecker = with python3Packages; toPythonApplication nvchecker; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - miller = callPackage ../tools/text/miller { }; - - milu = callPackage ../applications/misc/milu { }; - mkgmap = callPackage ../applications/misc/mkgmap { }; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; - mpack = callPackage ../tools/networking/mpack { }; - - mtm = callPackage ../tools/misc/mtm { }; - - pa_applet = callPackage ../tools/audio/pa-applet { }; - pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { }; pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; @@ -10019,8 +3985,6 @@ with pkgs; pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { }; - pandoc-katex = callPackage ../tools/misc/pandoc-katex { }; - pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality @@ -10029,134 +3993,32 @@ with pkgs; pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { }; pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { }; - panoply = callPackage ../tools/misc/panoply { }; - - patray = callPackage ../tools/audio/patray { }; + pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; - pathvector = callPackage ../tools/networking/pathvector { }; + nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; - pasystray = callPackage ../tools/audio/pasystray { }; + nlopt = callPackage ../development/libraries/nlopt { octave = null; }; - pcmsolver = callPackage ../development/libraries/pcmsolver { }; + nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; + ntfs3g = callPackage ../tools/filesystems/ntfs-3g { + inherit (darwin.apple_sdk.frameworks) DiskArbitration; + }; - pffft = callPackage ../development/libraries/pffft { }; + # ntfsprogs are merged into ntfs-3g + ntfsprogs = pkgs.ntfs3g; - phash = callPackage ../development/libraries/phash { }; + ntfy = callPackage ../tools/misc/ntfy { python = python39; }; - pnmixer = callPackage ../tools/audio/pnmixer { }; + ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; - pulsemixer = callPackage ../tools/audio/pulsemixer { }; + nvfancontrol = callPackage ../tools/misc/nvfancontrol { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; - pwsafe = callPackage ../applications/misc/pwsafe { }; + nwdiag = with python3Packages; toPythonApplication nwdiag; - pw-viz = callPackage ../applications/misc/pw-viz { }; - - napi-rs-cli = callPackage ../development/tools/napi-rs-cli { }; - - neil = callPackage ../development/tools/neil { }; - - niff = callPackage ../tools/package-management/niff { }; - - nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; - - nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - - nitrogen = callPackage ../tools/X11/nitrogen {}; - - smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { }; - - nms = callPackage ../tools/misc/nms { }; - - nomachine-client = callPackage ../tools/admin/nomachine-client { }; - - notify-desktop = callPackage ../tools/misc/notify-desktop {}; - - nkf = callPackage ../tools/text/nkf {}; - - nlopt = callPackage ../development/libraries/nlopt { octave = null; }; - - npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; - - nickel = callPackage ../development/interpreters/nickel { }; - - npiet = callPackage ../development/interpreters/npiet { }; - - npth = callPackage ../development/libraries/npth {}; - - nmap = callPackage ../tools/security/nmap { }; - - nmap-formatter = callPackage ../tools/security/nmap-formatter { }; - - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - - noise-repellent = callPackage ../applications/audio/noise-repellent { }; - - noisetorch = callPackage ../applications/audio/noisetorch { }; - - notary = callPackage ../tools/security/notary { }; - - notify-osd = callPackage ../applications/misc/notify-osd { }; - - notes-up = callPackage ../applications/office/notes-up { }; - - notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; - - nox = callPackage ../tools/package-management/nox { }; - - nq = callPackage ../tools/system/nq { }; - - nsjail = callPackage ../tools/security/nsjail {}; - - nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; - - ntfs3g = callPackage ../tools/filesystems/ntfs-3g { - inherit (darwin.apple_sdk.frameworks) DiskArbitration; - }; - - # ntfsprogs are merged into ntfs-3g - ntfsprogs = pkgs.ntfs3g; - - ntfy = callPackage ../tools/misc/ntfy { python = python39; }; - - ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; - - ntirpc = callPackage ../development/libraries/ntirpc { }; - - ntopng = callPackage ../tools/networking/ntopng { }; - - ntp = callPackage ../tools/networking/ntp { }; - - numdiff = callPackage ../tools/text/numdiff { }; - - numlockx = callPackage ../tools/X11/numlockx { }; - - nurl = callPackage ../tools/misc/nurl { }; - - nttcp = callPackage ../tools/networking/nttcp { }; - - ntttcp = callPackage ../tools/networking/ntttcp { }; - - nuttcp = callPackage ../tools/networking/nuttcp { }; - - nssmdns = callPackage ../tools/networking/nss-mdns { }; - - nvfancontrol = callPackage ../tools/misc/nvfancontrol { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; - - nvimpager = callPackage ../tools/misc/nvimpager { }; - - nwdiag = with python3Packages; toPythonApplication nwdiag; - - nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; - - nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { }; - - nyancat = callPackage ../tools/misc/nyancat { }; - - nylon = callPackage ../tools/networking/nylon { }; + nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; nym = callPackage ../applications/networking/nym { inherit (darwin.apple_sdk.frameworks) Security; @@ -10173,22 +4035,6 @@ with pkgs; jre = openjdk11; }; - oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; - - oath-toolkit = callPackage ../tools/security/oath-toolkit { }; - - oatpp = callPackage ../development/libraries/oatpp { }; - - obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; - - obexd = callPackage ../tools/bluetooth/obexd { }; - - obfs4 = callPackage ../tools/networking/obfs4 { }; - - ocproxy = callPackage ../tools/networking/ocproxy { }; - - ocserv = callPackage ../tools/networking/ocserv { }; - octofetch = callPackage ../tools/misc/octofetch { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10201,65 +4047,21 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; - - openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; - - openfortivpn = callPackage ../tools/networking/openfortivpn { }; - - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; - opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; - obexfs = callPackage ../tools/bluetooth/obexfs { }; - - obexftp = callPackage ../tools/bluetooth/obexftp { }; - - objconv = callPackage ../development/tools/misc/objconv {}; - - odpic = callPackage ../development/libraries/odpic { }; - - odt2txt = callPackage ../tools/text/odt2txt { }; - - odyssey = callPackage ../tools/misc/odyssey { }; - - offensive-azure = callPackage ../tools/security/offensive-azure { }; - - offlineimap = callPackage ../tools/networking/offlineimap { }; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; - ogdf = callPackage ../development/libraries/ogdf { }; - - oh-my-posh = callPackage ../development/tools/oh-my-posh {}; - - oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; - - ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - ombi = callPackage ../servers/ombi { }; - - omping = callPackage ../applications/networking/omping { }; - onefetch = callPackage ../tools/misc/onefetch { inherit (darwin) libresolv; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - onioncircuits = callPackage ../tools/security/onioncircuits { }; - - onlykey-agent = callPackage ../tools/security/onlykey-agent { }; - - onlykey-cli = callPackage ../tools/security/onlykey-cli { }; - onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; - openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -10267,77 +4069,35 @@ with pkgs; openboard = libsForQt5.callPackage ../applications/graphics/openboard { }; - opencc = callPackage ../tools/text/opencc { }; - - opencl-info = callPackage ../tools/system/opencl-info { }; - - opencryptoki = callPackage ../tools/security/opencryptoki { }; - opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; }; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; }; - opendkim = callPackage ../development/libraries/opendkim { }; - opendylan = callPackage ../development/compilers/opendylan { opendylan-bootstrap = opendylan_bin; }; - openfec = callPackage ../development/libraries/openfec { }; - ophis = python3Packages.callPackage ../development/compilers/ophis { }; - opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; - - open-ecard = callPackage ../tools/security/open-ecard { }; - - openjade = callPackage ../tools/text/sgml/openjade { }; - openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; - openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; - - openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { }; - - openmvg = callPackage ../applications/science/misc/openmvg { }; - - openmvs = callPackage ../applications/science/misc/openmvs { }; - - openntpd = callPackage ../tools/networking/openntpd { }; - openntpd_nixos = openntpd.override { privsepUser = "ntp"; privsepPath = "/var/empty"; }; - openobex = callPackage ../tools/bluetooth/openobex { }; - - openresolv = callPackage ../tools/networking/openresolv { }; - openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; openrussian-cli = callPackage ../misc/openrussian-cli { lua = lua5_3; }; - opensbi = callPackage ../misc/opensbi { }; - opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; - openseachest = callPackage ../tools/system/openseachest { }; - - opensm = callPackage ../tools/networking/opensm { }; - - tinyssh = callPackage ../tools/networking/tinyssh { }; - - tinystatus = callPackage ../tools/networking/tinystatus { }; - - tuc = callPackage ../tools/text/tuc { }; - opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); openssh = opensshPackages.openssh.override { @@ -10352,75 +4112,30 @@ with pkgs; etcDir = "/etc/ssh"; }; - ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { }; - - opensp = callPackage ../tools/text/sgml/opensp { }; - opentrack = libsForQt5.callPackage ../applications/misc/opentrack { }; - opentracker = callPackage ../applications/networking/p2p/opentracker { }; - - alttpr-opentracker = callPackage ../tools/games/opentracker { }; - - opentsdb = callPackage ../tools/misc/opentsdb {}; - inherit (callPackages ../tools/networking/openvpn {}) openvpn_24 openvpn; - openvpn3 = callPackage ../tools/networking/openvpn3 { }; - - openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; - openvpn-auth-ldap = callPackage ../tools/networking/openvpn/openvpn-auth-ldap.nix { stdenv = clangStdenv; }; - oq = callPackage ../development/tools/oq { }; - - out-of-tree = callPackage ../development/tools/out-of-tree { }; - - oppai-ng = callPackage ../tools/misc/oppai-ng { }; - - operator-sdk = callPackage ../development/tools/operator-sdk { }; - - oscclip = callPackage ../tools/misc/oscclip { }; - - owncast = callPackage ../servers/owncast { }; - update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit; - update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; - - update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; - - opae = callPackage ../development/libraries/opae { }; - - open-pdf-sign = callPackage ../tools/misc/open-pdf-sign { }; - - opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; - - opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; - optifinePackages = callPackage ../tools/games/minecraft/optifine { }; - optifine = optifinePackages.optifine-latest; optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; }; - olsrd = callPackage ../tools/networking/olsrd { }; - - oonf-olsrd2 = callPackage ../tools/networking/oonf-olsrd2 { }; - opl3bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor { }; opn2bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; @@ -10428,104 +4143,30 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - os-prober = callPackage ../tools/misc/os-prober {}; - - oshka = callPackage ../development/tools/oshka {}; - osl = libsForQt5.callPackage ../development/compilers/osl { boost = boost17x; }; - osqp = callPackage ../development/libraries/science/math/osqp { }; - - ossec = callPackage ../tools/security/ossec {}; - - osslsigncode = callPackage ../development/tools/osslsigncode {}; - - ostree = callPackage ../tools/misc/ostree { }; - - otel-cli = callPackage ../tools/misc/otel-cli {}; - - otfcc = callPackage ../tools/misc/otfcc { }; - - otpclient = callPackage ../applications/misc/otpclient { }; - - otpw = callPackage ../os-specific/linux/otpw { }; - ovftool = callPackage ../tools/virtualization/ovftool { libressl = libressl_3_4; }; - overcommit = callPackage ../development/tools/overcommit { }; - - overmind = callPackage ../applications/misc/overmind { }; - - oxker = callPackage ../applications/misc/oxker { }; - - ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; - oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; - - oxidized = callPackage ../tools/admin/oxidized { }; - - oxipng = callPackage ../tools/graphics/oxipng { }; - - payload_dumper = callPackage ../tools/archivers/payload_dumper { }; - - p2pvc = callPackage ../applications/video/p2pvc {}; - - p3x-onenote = callPackage ../applications/office/p3x-onenote { }; - - p4c = callPackage ../development/compilers/p4c { }; - - p7zip = callPackage ../tools/archivers/p7zip { }; - - packagekit = callPackage ../tools/package-management/packagekit { }; - - packetdrill = callPackage ../tools/networking/packetdrill { }; - - pacman = callPackage ../tools/package-management/pacman { }; - - paco = callPackage ../development/compilers/paco { }; - padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; - padbuster = callPackage ../tools/security/padbuster { }; - - page = callPackage ../tools/misc/page { }; - PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; - pagmo2 = callPackage ../development/libraries/pagmo2 { }; - - paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; - - paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { }; - pakcs = callPackage ../development/compilers/pakcs { # Doesn't compile with GHC 9.0 due to whitespace syntax changes # see also https://github.com/NixOS/nixpkgs/issues/166108 haskellPackages = haskell.packages.ghc810; }; - pal = callPackage ../tools/misc/pal { }; - - pandoc = callPackage ../development/tools/pandoc { }; - - pandoc-lua-filters = callPackage ../tools/misc/pandoc-lua-filters { }; - - pamtester = callPackage ../tools/security/pamtester { }; - - paper-note = callPackage ../applications/office/paper-note { }; - - paperless-ngx = callPackage ../applications/office/paperless-ngx { }; - paperoni = callPackage ../tools/text/paperoni { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; @@ -10533,18 +4174,6 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; - papertrail = callPackage ../tools/text/papertrail { }; - - pappl = callPackage ../applications/printing/pappl { }; - - par2cmdline = callPackage ../tools/networking/par2cmdline { }; - - parallel = callPackage ../tools/misc/parallel { }; - - parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { }; - - parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; - parcellite = callPackage ../tools/misc/parcellite { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -10555,72 +4184,24 @@ with pkgs; patchutils_0_4_2 = callPackage ../tools/text/patchutils/0.4.2.nix { }; - parted = callPackage ../tools/misc/parted { }; - - passh = callPackage ../tools/networking/passh { }; - - paulstretch = callPackage ../applications/audio/paulstretch { }; - - pazi = callPackage ../tools/misc/pazi { }; - - peep = callPackage ../tools/misc/peep { }; - - pell = callPackage ../applications/misc/pell { }; - - perccli = callPackage ../tools/misc/perccli { }; - - perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost177; openssl = openssl_1_1; }; - pick = callPackage ../tools/misc/pick { }; - - pipe-rename = callPackage ../tools/misc/pipe-rename { }; - pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { }; - pipectl = callPackage ../tools/misc/pipectl { }; - - pitivi = callPackage ../applications/video/pitivi { }; - - prism = callPackage ../applications/video/prism { }; - - pulumi = callPackage ../tools/admin/pulumi { }; - pulumiPackages = recurseIntoAttrs ( callPackage ../tools/admin/pulumi-packages { } ); - pulumi-bin = callPackage ../tools/admin/pulumi-bin { }; - - p0f = callPackage ../tools/security/p0f { }; - - pngloss = callPackage ../tools/graphics/pngloss { }; - - pngout = callPackage ../tools/graphics/pngout { }; - patch = gnupatch; - patchage = callPackage ../applications/audio/patchage { }; - - patatt = callPackage ../development/tools/patatt { }; - - pcapfix = callPackage ../tools/networking/pcapfix { }; - - pbzip2 = callPackage ../tools/compression/pbzip2 { }; - - pcimem = callPackage ../os-specific/linux/pcimem { }; - pciutils = callPackage ../tools/system/pciutils { inherit (darwin.apple_sdk.frameworks) IOKit; }; - otpauth = callPackage ../tools/security/otpauth { }; - pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -10630,92 +4211,17 @@ with pkgs; polkitSupport = true; }; - pcsctools = callPackage ../tools/security/pcsctools { }; - - pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; - - pcsc-safenet = callPackage ../tools/security/pcsc-safenet { }; - - pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; - ifdnfc = callPackage ../tools/security/ifdnfc { }; - pdd = python3Packages.callPackage ../tools/misc/pdd { }; - pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; - - pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; - - pdfcrack = callPackage ../tools/security/pdfcrack { }; - - pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { }; - - pdftag = callPackage ../tools/graphics/pdftag { }; - - pdf2svg = callPackage ../tools/graphics/pdf2svg { }; - - pdftoipe = callPackage ../tools/graphics/pdftoipe { }; - pdfminer = with python3Packages; toPythonApplication pdfminer-six; - pdf-quench = callPackage ../applications/misc/pdf-quench { }; - - jbig2enc = callPackage ../tools/graphics/jbig2enc { }; - - pdfarranger = callPackage ../applications/misc/pdfarranger { }; - - briss = callPackage ../tools/graphics/briss { }; - - brickd = callPackage ../servers/brickd { }; - - bully = callPackage ../tools/networking/bully { }; - - pcapc = callPackage ../tools/networking/pcapc { }; - - pdm = callPackage ../tools/package-management/pdm { }; - - pdnsd = callPackage ../tools/networking/pdnsd { }; - - peco = callPackage ../tools/text/peco { }; - - pg_activity = callPackage ../development/tools/database/pg_activity { }; - - pg_checksums = callPackage ../development/tools/database/pg_checksums { }; - - pg_flame = callPackage ../tools/misc/pg_flame { }; - - pg_top = callPackage ../tools/misc/pg_top { }; - - pgcenter = callPackage ../tools/misc/pgcenter { }; - - pgmetrics = callPackage ../tools/misc/pgmetrics { }; - - pgsync = callPackage ../development/tools/database/pgsync { }; - pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation ssh = openssh; }; - pfetch = callPackage ../tools/misc/pfetch { }; - pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - phoc = callPackage ../applications/misc/phoc { }; - - phockup = callPackage ../applications/misc/phockup { }; - - phodav = callPackage ../tools/networking/phodav { }; - - phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; - - photon-rss = callPackage ../applications/networking/feedreaders/photon { }; - - pim6sd = callPackage ../servers/pim6sd { }; - - phosh = callPackage ../applications/window-managers/phosh { }; - - phosh-mobile-settings = callPackage ../applications/window-managers/phosh/phosh-mobile-settings.nix { }; - pinentry = libsForQt5.callPackage ../tools/security/pinentry { }; pinentry-curses = (lib.getOutput "curses" pinentry); @@ -10728,44 +4234,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; - - pinentry-rofi = callPackage ../tools/security/pinentry-rofi { }; - - pingtcp = callPackage ../tools/networking/pingtcp { }; - - pingu = callPackage ../tools/networking/pingu { }; - - pinnwand = callPackage ../servers/pinnwand { }; - - pinsel = callPackage ../tools/misc/pinsel { }; - piping-server-rust = callPackage ../servers/piping-server-rust { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - pirate-get = callPackage ../tools/networking/pirate-get { }; - - pipr = callPackage ../applications/misc/pipr { }; - - pipreqs = callPackage ../tools/misc/pipreqs { }; - - pius = callPackage ../tools/security/pius { }; - - pixiewps = callPackage ../tools/networking/pixiewps {}; - pinyin-tool = callPackage ../tools/text/pinyin-tool { inherit (darwin.apple_sdk.frameworks) Security; }; - pk2cmd = callPackage ../tools/misc/pk2cmd { }; - - plantuml = callPackage ../tools/misc/plantuml { }; - - plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { }; - - plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore; inherit (darwin) DarwinTools; @@ -10774,35 +4250,19 @@ with pkgs; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; - platinum-searcher = callPackage ../tools/text/platinum-searcher { }; - playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; playwright = with python3Packages; toPythonApplication playwright; - please = callPackage ../tools/security/please { }; - - plecost = callPackage ../tools/security/plecost { }; - - plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; - inherit (callPackage ../servers/plik { }) plik plikd; - plex = callPackage ../servers/plex { }; - - plexRaw = callPackage ../servers/plex/raw.nix { }; - psitransfer = callPackage ../servers/psitransfer { }; - tab = callPackage ../tools/text/tab { }; - tabview = with python3Packages; toPythonApplication tabview; tautulli = python3Packages.callPackage ../servers/tautulli { }; - pleroma = callPackage ../servers/pleroma { }; - plfit = callPackage ../tools/misc/plfit { python = null; }; @@ -10811,26 +4271,8 @@ with pkgs; libpng = libpng12; }; - plotinus = callPackage ../tools/misc/plotinus { }; - - plotutils = callPackage ../tools/graphics/plotutils { }; - - plowshare = callPackage ../tools/misc/plowshare { }; - - pls = callPackage ../tools/misc/pls { }; - pm2 = nodePackages.pm2; - pmenu = callPackage ../tools/X11/pmenu { }; - - pngcheck = callPackage ../tools/graphics/pngcheck { }; - - pngcrush = callPackage ../tools/graphics/pngcrush { }; - - pngnq = callPackage ../tools/graphics/pngnq { }; - - pngoptimizer = callPackage ../tools/graphics/pngoptimizer { }; - pngtoico = callPackage ../tools/graphics/pngtoico { libpng = libpng12; }; @@ -10839,93 +4281,28 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; - pngtools = callPackage ../tools/graphics/pngtools { }; - - pngpp = callPackage ../development/libraries/png++ { }; - - pngquant = callPackage ../tools/graphics/pngquant { }; - po4a = perlPackages.Po4a; poac = callPackage ../development/tools/poac { inherit (llvmPackages_14) stdenv; }; - podiff = callPackage ../tools/text/podiff { }; - - pocketbase = callPackage ../servers/pocketbase { }; - - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; - podman-unwrapped = callPackage ../applications/virtualization/podman { }; - podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; - podman-tui = callPackage ../applications/virtualization/podman-tui { }; - - pods = callPackage ../applications/virtualization/pods { }; - - pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; - poedit = callPackage ../tools/text/poedit { wxGTK32 = wxGTK32.override { withWebKit = true; }; }; - polaris = callPackage ../servers/polaris { }; - polaris-web = callPackage ../servers/polaris/web.nix { }; - polipo = callPackage ../servers/polipo { }; - - polkit_gnome = callPackage ../tools/security/polkit-gnome { }; - - poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; - - polypane = callPackage ../applications/networking/browsers/polypane { }; - - pomsky = callPackage ../tools/text/pomsky { }; - - ponysay = callPackage ../tools/misc/ponysay { }; - - popfile = callPackage ../tools/text/popfile { }; - - poretools = callPackage ../applications/science/biology/poretools { }; - pantum-driver = callPackage ../misc/drivers/pantum-driver { libjpeg8 = libjpeg.override { enableJpeg8 = true; }; }; - postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { boost = boost175; }; - power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; - - ppl = callPackage ../development/libraries/ppl { }; - - ppp = callPackage ../tools/networking/ppp { }; - - pptp = callPackage ../tools/networking/pptp {}; - - pptpd = callPackage ../tools/networking/pptpd {}; - - pre-commit = callPackage ../tools/misc/pre-commit { }; - - pretender = callPackage ../tools/security/pretender { }; - - pretty-simple = callPackage ../development/tools/pretty-simple { }; - - prettyping = callPackage ../tools/networking/prettyping { }; - - pritunl-client = callPackage ../tools/networking/pritunl-client { }; - - pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { }; - - profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; - - profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; - projectlibre = callPackage ../applications/misc/projectlibre { jre = jre8; jdk = jdk8; @@ -10933,123 +4310,41 @@ with pkgs; projectm = libsForQt5.callPackage ../applications/audio/projectm { }; - proot = callPackage ../tools/system/proot { }; - - protoscope = callPackage ../development/tools/protoscope { }; - - prototypejs = callPackage ../development/libraries/prototypejs { }; - inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) proxmark3 proxmark3-unstable; proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { }; - proxychains = callPackage ../tools/networking/proxychains { }; - - proxychains-ng = callPackage ../tools/networking/proxychains-ng { }; - - proxify = callPackage ../tools/networking/proxify { }; - - proxysql = callPackage ../servers/sql/proxysql { }; - - prs = callPackage ../tools/security/prs { }; - - psw = callPackage ../tools/misc/psw { }; - - pws = callPackage ../tools/misc/pws { }; - - cntlm = callPackage ../tools/networking/cntlm { }; - - cnping = callPackage ../tools/networking/cnping { }; - past-time = python3Packages.callPackage ../tools/misc/past-time { }; - pastebinit = callPackage ../tools/misc/pastebinit { }; - - pmacct = callPackage ../tools/networking/pmacct { }; - - pmix = callPackage ../development/libraries/pmix { }; - - polygraph = callPackage ../tools/networking/polygraph { }; - - pr-tracker = callPackage ../servers/pr-tracker { }; - - progress = callPackage ../tools/misc/progress { }; - - ps3-disc-dumper = callPackage ../tools/games/ps3-disc-dumper { }; - - ps3netsrv = callPackage ../servers/ps3netsrv { }; - - pscircle = callPackage ../os-specific/linux/pscircle { }; - - psmisc = callPackage ../os-specific/linux/psmisc { }; - - pssh = callPackage ../tools/networking/pssh { }; - - pspg = callPackage ../tools/misc/pspg { }; - - pstoedit = callPackage ../tools/graphics/pstoedit { }; - - psutils = callPackage ../tools/typesetting/psutils { }; - psensor = callPackage ../tools/system/psensor { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; - pubs = callPackage ../tools/misc/pubs {}; - - pulumictl = callPackage ../development/tools/pulumictl { }; - - pure-prompt = callPackage ../shells/zsh/pure-prompt { }; - - pv = callPackage ../tools/misc/pv { }; - - pwgen = callPackage ../tools/security/pwgen { }; - - pwgen-secure = callPackage ../tools/security/pwgen-secure { }; - - pwnat = callPackage ../tools/networking/pwnat { }; - - pwndbg = callPackage ../development/tools/misc/pwndbg { }; - pwninit = callPackage ../development/tools/misc/pwninit { inherit (darwin.apple_sdk.frameworks) Security; }; pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; - pydf = callPackage ../applications/misc/pydf { }; - pyinfra = with python3Packages; toPythonApplication pyinfra; pylint = with python3Packages; toPythonApplication pylint; - pympress = callPackage ../applications/office/pympress { }; - pyocd = with python3Packages; toPythonApplication pyocd; pypass = with python3Packages; toPythonApplication pypass; pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; - teapot = callPackage ../applications/office/teapot { }; - pyditz = callPackage ../applications/misc/pyditz { pythonPackages = python27Packages; }; - py-spy = callPackage ../development/tools/py-spy { }; - pydeps = with python3Packages; toPythonApplication pydeps; - python-launcher = callPackage ../development/tools/misc/python-launcher { }; - - pytrainer = callPackage ../applications/misc/pytrainer { }; - pywal = with python3Packages; toPythonApplication pywal; - pystring = callPackage ../development/libraries/pystring {}; - rbw = callPackage ../tools/security/rbw { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11060,10 +4355,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit; }; - rig = callPackage ../tools/misc/rig { }; - - ripdrag = callPackage ../tools/misc/ripdrag { }; - riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { provider = "riseup"; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -11085,36 +4376,18 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices; }; - openmpi = callPackage ../development/libraries/openmpi { }; - - ouch = callPackage ../tools/compression/ouch { }; - - outils = callPackage ../tools/misc/outils {}; - mpi = openmpi; # this attribute should used to build MPI applications - ucc = callPackage ../development/libraries/ucc {}; - - ucx = callPackage ../development/libraries/ucx {}; - openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); - prowlarr = callPackage ../servers/prowlarr { }; - qarte = libsForQt5.callPackage ../applications/video/qarte { }; qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; - qnial = callPackage ../development/interpreters/qnial { }; - quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; - - qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; - qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { }; qastools = libsForQt5.callPackage ../tools/audio/qastools { }; @@ -11125,255 +4398,65 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; }; - qhull = callPackage ../development/libraries/qhull { }; - qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { }; - qmk = callPackage ../tools/misc/qmk { }; - qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; - qodem = callPackage ../tools/networking/qodem { }; - qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; - qovery-cli = callPackage ../tools/admin/qovery-cli { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; - qpdf = callPackage ../development/libraries/qpdf { }; - - qprint = callPackage ../tools/text/qprint { }; - qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { }; - qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; - - qrcp = callPackage ../tools/networking/qrcp { }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; - quadrafuzz = callPackage ../applications/audio/quadrafuzz { }; - - quickfix = callPackage ../development/libraries/quickfix { }; - - quickjs = callPackage ../development/interpreters/quickjs { }; - - quickserve = callPackage ../tools/networking/quickserve { }; - quictls = callPackage ../development/libraries/quictls { }; - quicktun = callPackage ../tools/networking/quicktun { }; - - quilt = callPackage ../development/tools/quilt { }; - - raider = callPackage ../applications/misc/raider { }; - - railway = callPackage ../development/tools/railway { }; - quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; qview = libsForQt5.callPackage ../applications/graphics/qview {}; - wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { }; - - wiggle = callPackage ../development/tools/wiggle { }; - - radamsa = callPackage ../tools/security/radamsa { }; - - radarr = callPackage ../servers/radarr { }; - radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; - radsecproxy = callPackage ../tools/networking/radsecproxy { }; - - radvd = callPackage ../tools/networking/radvd { }; - - rain = callPackage ../development/tools/rain { }; - rainbowstream = with python3.pkgs; toPythonApplication rainbowstream; - rambox = callPackage ../applications/networking/instant-messengers/rambox { }; - - rar = callPackage ../tools/archivers/rar { }; - - rarcrack = callPackage ../tools/security/rarcrack { }; - - rarian = callPackage ../development/libraries/rarian { }; - - ratman = callPackage ../tools/networking/ratman { }; - - ratools = callPackage ../tools/networking/ratools { }; - - ratt = callPackage ../applications/misc/ratt { }; - - rc = callPackage ../shells/rc { }; - - rcon = callPackage ../tools/networking/rcon { }; - - rconc = callPackage ../tools/networking/rconc { }; - - rdap = callPackage ../tools/networking/rdap { }; - rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; - rdma-core = callPackage ../os-specific/linux/rdma-core { }; - - rdrview = callPackage ../tools/networking/rdrview {}; - - real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; - - realesrgan-ncnn-vulkan = callPackage ../tools/graphics/realesrgan-ncnn-vulkan { }; - - react-native-debugger = callPackage ../development/tools/react-native-debugger { }; - - read-edid = callPackage ../os-specific/linux/read-edid { }; - - readstat = callPackage ../applications/science/math/readstat { }; - - redir = callPackage ../tools/networking/redir { }; - - redmine = callPackage ../applications/version-management/redmine { }; - - redpanda = callPackage ../servers/redpanda { }; - - redsocks = callPackage ../tools/networking/redsocks { }; - - renpy = callPackage ../development/interpreters/renpy { }; - - rep = callPackage ../development/tools/rep { }; - - repseek = callPackage ../applications/science/biology/repseek { }; - - reredirect = callPackage ../tools/misc/reredirect { }; - retext = qt6Packages.callPackage ../applications/editors/retext { }; - rewrk = callPackage ../tools/networking/rewrk { }; - inherit (callPackage ../tools/security/rekor { }) rekor-cli rekor-server; - rich-cli = callPackage ../misc/rich-cli { }; - - richgo = callPackage ../development/tools/richgo { }; - - rs = callPackage ../tools/text/rs { }; - - rst2html5 = callPackage ../tools/text/rst2html5 { }; - rstcheck = with python3Packages; toPythonApplication rstcheck; - rt = callPackage ../servers/rt { }; - - rtmpdump = callPackage ../tools/video/rtmpdump { }; rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; - rtptools = callPackage ../tools/networking/rtptools { }; - - rtss = callPackage ../development/tools/misc/rtss { }; - - realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer {}; - - re-isearch = callPackage ../applications/search/re-isearch { }; - - reaverwps = callPackage ../tools/networking/reaver-wps {}; - - reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; - - rx = callPackage ../applications/graphics/rx { }; - qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; - recutils = callPackage ../tools/misc/recutils { }; - recoll = libsForQt5.callPackage ../applications/search/recoll { }; redoc-cli = nodePackages.redoc-cli; - reflex = callPackage ../development/tools/reflex { }; - - reiser4progs = callPackage ../tools/filesystems/reiser4progs { }; - - reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; - - relic = callPackage ../development/tools/relic { }; - - remind = callPackage ../tools/misc/remind { }; - - remmina = callPackage ../applications/networking/remote/remmina { }; - - rename = callPackage ../tools/misc/rename { }; - - renameutils = callPackage ../tools/misc/renameutils { }; - renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { }; - replace = callPackage ../tools/text/replace { }; - - resvg = callPackage ../tools/graphics/resvg { }; - - reckon = callPackage ../tools/text/reckon { }; - - recoverjpeg = callPackage ../tools/misc/recoverjpeg { }; - - reftools = callPackage ../development/tools/reftools { }; - - redwax-tool = callPackage ../tools/security/redwax-tool { }; - - regpg = callPackage ../tools/security/regpg { }; - - remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { }; - - reposurgeon = callPackage ../applications/version-management/reposurgeon { }; - - reptyr = callPackage ../os-specific/linux/reptyr {}; - rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; inherit (callPackage ../development/misc/resholve { }) resholve; - restool = callPackage ../os-specific/linux/restool {}; - - reuse = callPackage ../tools/package-management/reuse { }; - inherit (nodePackages) reveal-md; - rewritefs = callPackage ../os-specific/linux/rewritefs { }; - - rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; - - rdfind = callPackage ../tools/filesystems/rdfind { }; - - rhash = callPackage ../tools/security/rhash { }; - - rhoas = callPackage ../tools/admin/rhoas { }; - - riemann_c_client = callPackage ../tools/misc/riemann-c-client { }; - riemann-tools = callPackage ../tools/misc/riemann-tools { }; - - ripmime = callPackage ../tools/networking/ripmime {}; - - rkflashtool = callPackage ../tools/misc/rkflashtool { }; - - rkrlv2 = callPackage ../applications/audio/rkrlv2 {}; - rmlint = callPackage ../tools/misc/rmlint { inherit (python3Packages) sphinx; }; - rng-tools = callPackage ../tools/security/rng-tools { }; - - rnnoise = callPackage ../development/libraries/rnnoise { }; - # Use `apple_sdk_11_0` because `apple_sdk.libs` does not provide `simd` rnnoise-plugin = darwin.apple_sdk_11_0.callPackage ../development/libraries/rnnoise-plugin { inherit (darwin.apple_sdk_11_0.frameworks) WebKit MetalKit CoreAudioKit; @@ -11384,42 +4467,12 @@ with pkgs; inherit (gst_all_1) gstreamer; }; - rnp = callPackage ../tools/security/rnp { }; - - rnr = callPackage ../tools/text/rnr { }; - - rnv = callPackage ../tools/text/xml/rnv { }; - - rosie = callPackage ../tools/text/rosie { }; - - rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { }; - - roundup = callPackage ../tools/misc/roundup { }; - - routino = callPackage ../tools/misc/routino { }; - - rq = callPackage ../development/tools/rq { }; - - rsnapshot = callPackage ../tools/backup/rsnapshot { }; - - rlwrap = callPackage ../tools/misc/rlwrap { }; - - rmtrash = callPackage ../tools/misc/rmtrash { }; - - roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { }; - rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; - rowhammer-test = callPackage ../tools/system/rowhammer-test { }; - - rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; - rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { }; - rpiboot = callPackage ../development/misc/rpiboot { }; - rpm = callPackage ../tools/package-management/rpm { python = python3; lua = lua5_4; @@ -11429,82 +4482,30 @@ with pkgs; gperf = gperf_3_0; }; - rpm2targz = callPackage ../tools/archivers/rpm2targz { }; - - rpmextract = callPackage ../tools/archivers/rpmextract { }; - - rrdtool = callPackage ../tools/misc/rrdtool { }; - - rscw = callPackage ../applications/radio/rscw { }; - - rset = callPackage ../tools/admin/rset { }; - - rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; - rslint = callPackage ../development/tools/rslint { }; - - rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { }; - rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; }; - rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; - - rubber = callPackage ../tools/typesetting/rubber { }; - rubocop = rubyPackages.rubocop; - runningx = callPackage ../tools/X11/runningx { }; - - rund = callPackage ../development/tools/rund { }; - - runzip = callPackage ../tools/archivers/runzip { }; - - unzoo = callPackage ../tools/archivers/unzoo { }; - ruplacer = callPackage ../tools/text/ruplacer { inherit (darwin.apple_sdk.frameworks) Security; }; - rust-code-analysis = callPackage ../development/tools/rust-code-analysis { }; - rust-motd = callPackage ../tools/misc/rust-motd { inherit (darwin.apple_sdk.frameworks) Security; }; - rust-petname = callPackage ../tools/text/rust-petname { }; - rustcat = callPackage ../tools/networking/rustcat { inherit (darwin.apple_sdk.frameworks) Security; }; - rustdesk = callPackage ../applications/networking/remote/rustdesk { }; - rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; - rustypaste = callPackage ../servers/rustypaste { }; - - rw = callPackage ../tools/misc/rw { }; - - rwc = callPackage ../tools/system/rwc { }; - - rxp = callPackage ../tools/text/xml/rxp { }; - - rzip = callPackage ../tools/compression/rzip { }; - - s-tui = callPackage ../tools/system/s-tui { }; - - s3backer = callPackage ../tools/filesystems/s3backer { }; - - s3bro = callPackage ../tools/admin/s3bro { }; - - s3fs = callPackage ../tools/filesystems/s3fs { }; - s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; s3rs = callPackage ../tools/networking/s3rs { @@ -11513,364 +4514,108 @@ with pkgs; s3-credentials = with python3Packages; toPythonApplication s3-credentials; - s4cmd = callPackage ../tools/networking/s4cmd { }; - - s5cmd = callPackage ../tools/networking/s5cmd { }; - - sacad = callPackage ../tools/misc/sacad { }; - - sad = callPackage ../tools/text/sad { }; - - safecopy = callPackage ../tools/system/safecopy { }; - - sacd = callPackage ../tools/cd-dvd/sacd { }; - - safe = callPackage ../tools/security/safe { }; - safety-cli = with python3.pkgs; toPythonApplication safety; - safe-rm = callPackage ../tools/system/safe-rm { }; - - safeeyes = callPackage ../applications/misc/safeeyes { }; - - sagoin = callPackage ../tools/misc/sagoin { }; - - sahel-fonts = callPackage ../data/fonts/sahel-fonts { }; - - saldl = callPackage ../tools/networking/saldl { }; - - salt = callPackage ../tools/admin/salt {}; - - samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws { inherit (darwin.apple_sdk.frameworks) AppKit; }; - sammler = callPackage ../tools/security/sammler {}; - - samplicator = callPackage ../tools/networking/samplicator { }; + sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; - sanctity = callPackage ../tools/misc/sanctity { }; - - sandboxfs = callPackage ../tools/filesystems/sandboxfs { }; - - sanjuuni = callPackage ../tools/graphics/sanjuuni { }; - - sasquatch = callPackage ../tools/filesystems/sasquatch { }; - - sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; - - scanbd = callPackage ../tools/graphics/scanbd { }; - - scdl = callPackage ../tools/misc/scdl { }; - - scdoc = callPackage ../tools/typesetting/scdoc { }; - - scorecard = callPackage ../tools/security/scorecard { }; - - scream = callPackage ../applications/audio/scream { }; - - scimark = callPackage ../misc/scimark { }; - - screen = callPackage ../tools/misc/screen { - inherit (darwin.apple_sdk.libs) utmp; - }; + screen = callPackage ../tools/misc/screen { + inherit (darwin.apple_sdk.libs) utmp; + }; scrcpy = callPackage ../misc/scrcpy { inherit (androidenv.androidPkgs_9_0) platform-tools; }; - screen-message = callPackage ../tools/X11/screen-message { }; - - screenkey = callPackage ../applications/video/screenkey { }; - - scrub = callPackage ../tools/misc/scrub { }; - scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; - scraper = callPackage ../tools/text/scraper { }; - - scriptaculous = callPackage ../development/libraries/scriptaculous { }; - - scrot = callPackage ../tools/graphics/scrot { }; - - scrypt = callPackage ../tools/security/scrypt { }; - sd = callPackage ../tools/text/sd { inherit (darwin.apple_sdk.frameworks) Security; }; - sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; - - sd-switch = callPackage ../os-specific/linux/sd-switch { }; - - sdate = callPackage ../tools/misc/sdate { }; - - sdat2img = callPackage ../tools/filesystems/sdat2img { }; - - sdcv = callPackage ../applications/misc/sdcv { }; - - sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; - - senpai = callPackage ../applications/networking/irc/senpai { }; - - skim = callPackage ../tools/misc/skim { }; - - seashells = callPackage ../applications/misc/seashells { }; - - seaweedfs = callPackage ../applications/networking/seaweedfs { }; - - sec = callPackage ../tools/admin/sec { }; - - seccure = callPackage ../tools/security/seccure { }; - - secp256k1 = callPackage ../tools/security/secp256k1 { }; - securefs = callPackage ../tools/filesystems/securefs { stdenv = clangStdenv; }; - seehecht = callPackage ../tools/text/seehecht { }; - - seexpr = callPackage ../development/compilers/seexpr { }; - selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { }; semgrep = python3.pkgs.callPackage ../tools/security/semgrep { }; semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { }; - setroot = callPackage ../tools/X11/setroot { }; - - setserial = callPackage ../tools/system/setserial { }; - - setzer = callPackage ../applications/editors/setzer { }; - seqdiag = with python3Packages; toPythonApplication seqdiag; sequoia = callPackage ../tools/security/sequoia { pythonPackages = python3Packages; }; - sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { }; - - sewer = callPackage ../tools/admin/sewer { }; - - sfeed = callPackage ../tools/misc/sfeed { }; - - sftpman = callPackage ../tools/filesystems/sftpman { }; - sftpgo = callPackage ../servers/sftpgo { buildGoModule = buildGo119Module; }; - screenfetch = callPackage ../tools/misc/screenfetch { }; - - sg3_utils = callPackage ../tools/system/sg3_utils { }; - - sget = callPackage ../tools/security/sget { }; - - sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { }; - - shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; - - shadered = callPackage ../development/tools/shadered { }; - - go-shadowsocks2 = callPackage ../tools/networking/go-shadowsocks2 { }; - - shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; - shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; - shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; - - sharutils = callPackage ../tools/archivers/sharutils { }; - - shelldap = callPackage ../tools/misc/shelldap { }; - - shellspec = callPackage ../tools/misc/shellspec { }; - - schema2ldif = callPackage ../tools/text/schema2ldif { }; - - sharedown = callPackage ../tools/misc/sharedown { }; - - shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; - - shen-sources = callPackage ../development/interpreters/shen-sources { }; - shiv = with python3Packages; toPythonApplication shiv; - shim-unsigned = callPackage ../tools/misc/shim { }; - - shocco = callPackage ../tools/text/shocco { }; - - shopify-cli = callPackage ../development/web/shopify-cli { }; - - shopify-themekit = callPackage ../development/web/shopify-themekit { }; - - shorewall = callPackage ../tools/networking/shorewall { }; - - shotwell = callPackage ../applications/graphics/shotwell { }; - shout = nodePackages.shout; - showmethekey = callPackage ../applications/video/showmethekey { }; - - shrikhand = callPackage ../data/fonts/shrikhand { }; - - shunit2 = callPackage ../tools/misc/shunit2 { }; - - sic = callPackage ../applications/networking/irc/sic { }; - - siege = callPackage ../tools/networking/siege {}; - - sieve-connect = callPackage ../applications/networking/sieve-connect {}; - - sigal = callPackage ../applications/misc/sigal { }; - - sigi = callPackage ../applications/misc/sigi { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signalbackup-tools = darwin.apple_sdk_11_0.callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; - signald = callPackage ../applications/networking/instant-messengers/signald { }; - - signaldctl = callPackage ../applications/networking/instant-messengers/signaldctl { }; - - signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; - inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop signal-desktop-beta; slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; - sigma-cli = callPackage ../tools/security/sigma-cli { }; - - signify = callPackage ../tools/security/signify { }; - # aka., pgp-tools - signing-party = callPackage ../tools/security/signing-party { }; - - signumone-ks = callPackage ../applications/misc/signumone-ks { }; - - silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; - - silc_server = callPackage ../servers/silc-server { }; sile = callPackage ../tools/typesetting/sile { lua = lua5_3; }; - silenthound = callPackage ../tools/security/silenthound { }; - - silice = callPackage ../development/compilers/silice { }; - - silver-searcher = callPackage ../tools/text/silver-searcher { }; - - simpleproxy = callPackage ../tools/networking/simpleproxy { }; - simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; - sipexer = callPackage ../tools/networking/sipexer { }; - - sipsak = callPackage ../tools/networking/sipsak { }; - sipvicious = python3Packages.callPackage ../tools/security/sipvicious { }; - siril = callPackage ../applications/science/astronomy/siril { }; - sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; - sixpair = callPackage ../tools/misc/sixpair {}; - sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa DisplayServices SkyLight; }; - skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; - skydns = callPackage ../servers/skydns { }; - - sing-box = callPackage ../tools/networking/sing-box { }; - - sipcalc = callPackage ../tools/networking/sipcalc { }; - skribilo = callPackage ../tools/typesetting/skribilo { tex = texlive.combined.scheme-small; }; - skytemple = callPackage ../applications/misc/skytemple {}; - - sleuthkit = callPackage ../tools/system/sleuthkit {}; - - slides = callPackage ../applications/misc/slides { }; - - slirp4netns = callPackage ../tools/networking/slirp4netns { }; - - slowlorust = callPackage ../tools/networking/slowlorust { }; - - slsnif = callPackage ../tools/misc/slsnif { }; - slstatus = callPackage ../applications/misc/slstatus { conf = config.slstatus.conf or null; }; - smartdns = callPackage ../tools/networking/smartdns { }; - smartmontools = callPackage ../tools/system/smartmontools { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; - smarty3 = callPackage ../development/libraries/smarty3 { }; - smarty3-i18n = callPackage ../development/libraries/smarty3-i18n { }; - - smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; - - smenu = callPackage ../tools/misc/smenu { }; - smesh = callPackage ../development/libraries/smesh { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - boost-sml = callPackage ../development/libraries/boost-ext/boost-sml {}; - - smu = callPackage ../tools/text/smu { }; - - smug = callPackage ../tools/misc/smug { }; - - smpq = callPackage ../applications/misc/smpq { }; - - sn0int = callPackage ../tools/security/sn0int { }; - - snabb = callPackage ../tools/networking/snabb { }; - - snallygaster = callPackage ../tools/security/snallygaster { }; - snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast { inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; }; - snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; - - snet = callPackage ../tools/networking/snet { }; - sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; - snmpcheck = callPackage ../tools/networking/snmpcheck {}; - - sniffglue = callPackage ../tools/networking/sniffglue { }; - - snort = callPackage ../applications/networking/ids/snort { }; - so = callPackage ../development/tools/so { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11879,413 +4624,113 @@ with pkgs; jdk = jdk11; }; - sockdump = callPackage ../tools/networking/sockdump { }; - spglib = callPackage ../development/libraries/spglib { inherit (llvmPackages) openmp; }; - spicy = callPackage ../development/tools/spicy { }; - - spire = callPackage ../tools/security/spire { }; # to match naming of other package repositories spire-agent = spire.agent; spire-server = spire.server; spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; - ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; - - sshguard = callPackage ../tools/security/sshguard {}; - - sshping = callPackage ../tools/networking/sshping {}; - - ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; - - ssh-to-age = callPackage ../tools/security/ssh-to-age { }; - - ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { }; - suricata = callPackage ../applications/networking/ids/suricata { python = python3; libbpf = libbpf_0; }; - sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; - softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; }; - sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { }; - - solr = callPackage ../servers/search/solr { }; - - solvespace = callPackage ../applications/graphics/solvespace { }; - - sonarr = callPackage ../servers/sonarr { }; - - sonata = callPackage ../applications/audio/sonata { }; - - sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { }; - - soundconverter = callPackage ../applications/audio/soundconverter { }; - soundkonverter = libsForQt5.soundkonverter; - soundwireserver = callPackage ../applications/audio/soundwireserver { }; - - sozu = callPackage ../servers/sozu { }; - sparrow = callPackage ../applications/blockchains/sparrow { openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {}; }; - sparsehash = callPackage ../development/libraries/sparsehash { }; - - spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; - - spigot = callPackage ../tools/misc/spigot { }; - - spiped = callPackage ../tools/networking/spiped { }; - - sqliteman = callPackage ../applications/misc/sqliteman { }; - - sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { }; - - sqls = callPackage ../applications/misc/sqls { }; - - stdman = callPackage ../data/documentation/stdman { }; - - stderred = callPackage ../tools/misc/stderred { }; - - steck = callPackage ../servers/pinnwand/steck.nix { }; - - stenc = callPackage ../tools/backup/stenc { }; - stm32loader = with python3Packages; toPythonApplication stm32loader; - storcli = callPackage ../tools/misc/storcli { }; - stremio = qt5.callPackage ../applications/video/stremio { }; - sunwait = callPackage ../applications/misc/sunwait { }; - - sunpaper = callPackage ../tools/X11/sunpaper { }; - - surface-control = callPackage ../applications/misc/surface-control { }; - - syntex = callPackage ../tools/graphics/syntex {}; - - synapse-admin = callPackage ../tools/admin/synapse-admin {}; - - sl = callPackage ../tools/misc/sl { }; - - socat = callPackage ../tools/networking/socat { }; - - sockperf = callPackage ../tools/networking/sockperf { }; - - solaar = callPackage ../applications/misc/solaar {}; - solanum = callPackage ../servers/irc/solanum { autoreconfHook = buildPackages.autoreconfHook269; }; solc-select = with python3Packages; toPythonApplication solc-select; - sourceHighlight = callPackage ../tools/text/source-highlight { }; - - somebar = callPackage ../applications/misc/somebar { }; - spacebar = callPackage ../os-specific/darwin/spacebar { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge SkyLight; }; - speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; - splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; - spotdl = callPackage ../tools/audio/spotdl { }; - - squashfsTools = callPackage ../tools/filesystems/squashfs { }; - squashfs-tools-ng = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/squashfs-tools-ng { }; - squashfuse = callPackage ../tools/filesystems/squashfuse { }; - - srt-live-server = callPackage ../applications/video/srt-live-server { }; - - srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; - - srtrelay = callPackage ../applications/video/srtrelay { }; - - srsran = callPackage ../applications/radio/srsran { }; - - sourcehut = callPackage ../applications/version-management/sourcehut { }; - - sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshfs = sshfs-fuse; # added 2017-08-14 - sshlatex = callPackage ../tools/typesetting/sshlatex { }; - - sshuttle = callPackage ../tools/security/sshuttle { }; - - ssldump = callPackage ../tools/networking/ssldump { }; - sslsplit = callPackage ../tools/networking/sslsplit { openssl = openssl_1_1; }; - sstp = callPackage ../tools/networking/sstp {}; - strip-nondeterminism = perlPackages.strip-nondeterminism; - structure-synth = callPackage ../tools/graphics/structure-synth { }; - - su-exec = callPackage ../tools/security/su-exec {}; - - subberthehut = callPackage ../tools/misc/subberthehut { }; - - subedit = callPackage ../tools/text/subedit { }; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; - sudo = callPackage ../tools/security/sudo { }; - - suidChroot = callPackage ../tools/system/suid-chroot { }; - - sundtek = callPackage ../misc/drivers/sundtek { }; - - sunxi-tools = callPackage ../development/tools/sunxi-tools { }; - sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { }; - super = callPackage ../tools/security/super { }; - - supertag = callPackage ../tools/filesystems/supertag { }; - - supertux-editor = callPackage ../applications/editors/supertux-editor { }; - - svgbob = callPackage ../tools/graphics/svgbob { }; - - svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - - ssb = callPackage ../tools/security/ssb { }; - - ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; - - ssdeep = callPackage ../tools/security/ssdeep { }; - - ssh-ident = callPackage ../tools/networking/ssh-ident { }; - - sshpass = callPackage ../tools/networking/sshpass { }; - - sslscan = callPackage ../tools/security/sslscan { }; - - sslmate = callPackage ../development/tools/sslmate { }; - - sslmate-agent = callPackage ../development/tools/sslmate-agent { }; - - sshoogr = callPackage ../tools/networking/sshoogr { }; - - ssocr = callPackage ../applications/misc/ssocr { }; - - ssss = callPackage ../tools/security/ssss { }; - - stabber = callPackage ../misc/stabber { }; - staticjinja = with python3.pkgs; toPythonApplication staticjinja; - stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; - - stress = callPackage ../tools/system/stress { }; - - stress-ng = callPackage ../tools/system/stress-ng { }; - - stressapptest = callPackage ../tools/system/stressapptest { }; - stoken = callPackage ../tools/security/stoken (config.stoken or {}); - storeBackup = callPackage ../tools/backup/store-backup { }; - - stow = callPackage ../tools/misc/stow { }; - xstow = callPackage ../tools/misc/xstow { }; - - stun = callPackage ../tools/networking/stun { }; - - stunnel = callPackage ../tools/networking/stunnel { }; - - stuntman = callPackage ../tools/networking/stuntman { }; - stutter = haskell.lib.compose.justStaticExecutables haskellPackages.stutter; - strongswan = callPackage ../tools/networking/strongswan { }; strongswanTNC = strongswan.override { enableTNC = true; }; strongswanNM = strongswan.override { enableNetworkManager = true; }; - stylish = callPackage ../applications/misc/stylish { }; - stylish-haskell = haskell.lib.compose.justStaticExecutables haskellPackages.stylish-haskell; su = shadow.su; - subjs = callPackage ../tools/security/subjs { }; - - subsonic = callPackage ../servers/misc/subsonic { }; - - subfinder = callPackage ../tools/networking/subfinder { }; - subzerod = with python3Packages; toPythonApplication subzerod; suckit = callPackage ../tools/networking/suckit { inherit (darwin.apple_sdk.frameworks) Security; }; - surfraw = callPackage ../tools/networking/surfraw { }; - - swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; - - swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; - - swaggerhole = callPackage ../tools/security/swaggerhole { }; - - swapview = callPackage ../os-specific/linux/swapview { }; - - swtpm = callPackage ../tools/security/swtpm { }; - - svnfs = callPackage ../tools/filesystems/svnfs { }; - - svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; - - sycl-info = callPackage ../development/libraries/sycl-info { }; - - symengine = callPackage ../development/libraries/symengine { }; - - synaesthesia = callPackage ../applications/audio/synaesthesia { }; - - sysbench = callPackage ../development/tools/misc/sysbench {}; - - systemc = callPackage ../applications/science/electronics/systemc { }; - system-config-printer = callPackage ../tools/misc/system-config-printer { autoreconfHook = buildPackages.autoreconfHook269; libxml2 = libxml2Python; }; - systembus-notify = callPackage ../applications/misc/systembus-notify { }; - - stricat = callPackage ../tools/security/stricat { }; - - staruml = callPackage ../tools/misc/staruml { }; - - stone-phaser = callPackage ../applications/audio/stone-phaser { }; - - systrayhelper = callPackage ../tools/misc/systrayhelper {}; - - syft = callPackage ../tools/admin/syft { }; - - Sylk = callPackage ../applications/networking/Sylk {}; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; - swaks = callPackage ../tools/networking/swaks { }; - - swiftbar = callPackage ../os-specific/darwin/swiftbar { }; - - swiften = callPackage ../development/libraries/swiften { }; - - squeekboard = callPackage ../applications/accessibility/squeekboard { }; - - sx = callPackage ../tools/X11/sx { }; - systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; - t = callPackage ../tools/misc/t { }; - - tabnine = callPackage ../development/tools/tabnine { }; - tab-rs = callPackage ../tools/misc/tab-rs { inherit (darwin.apple_sdk.frameworks) IOKit; }; - tagtime = callPackage ../applications/misc/tagtime { }; - inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; - tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; - - tangram = callPackage ../applications/networking/instant-messengers/tangram { }; - - t1utils = callPackage ../tools/misc/t1utils { }; - - talkfilters = callPackage ../misc/talkfilters {}; - - znapzend = callPackage ../tools/backup/znapzend { }; - - tar2ext4 = callPackage ../tools/filesystems/tar2ext4 { }; - - targetcli = callPackage ../os-specific/linux/targetcli { }; - - target-isns = callPackage ../os-specific/linux/target-isns { }; - - tarlz = callPackage ../tools/archivers/tarlz { }; - - tarsnap = callPackage ../tools/backup/tarsnap { }; - - tarsnapper = callPackage ../tools/backup/tarsnapper { }; - - tarantool = callPackage ../servers/tarantool { }; - - tarssh = callPackage ../servers/tarssh { }; - - tartan = callPackage ../development/tools/analysis/tartan {}; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { youtube-dl = yt-dlp; }; - tayga = callPackage ../tools/networking/tayga { }; - - tcb = callPackage ../tools/security/tcb { }; + tcpreplay = callPackage ../tools/networking/tcpreplay { + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; + }; - tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + inherit (nodePackages) teck-programmer; - tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; - - tboot = callPackage ../tools/security/tboot { }; - - tagutil = callPackage ../applications/audio/tagutil { }; - - tcpdump = callPackage ../tools/networking/tcpdump { }; - - tcpflow = callPackage ../tools/networking/tcpflow { }; - - tcpkali = callPackage ../applications/networking/tcpkali { }; - - tcpreplay = callPackage ../tools/networking/tcpreplay { - inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; - }; - - tdns-cli = callPackage ../tools/networking/tdns-cli { }; - - tea = callPackage ../tools/misc/tea { }; - - inherit (nodePackages) teck-programmer; - - ted = callPackage ../tools/typesetting/ted { }; - - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; - - teip = callPackage ../tools/text/teip { }; - - telegraf = callPackage ../servers/monitoring/telegraf { }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; teleport = callPackage ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; @@ -12295,26 +4740,10 @@ with pkgs; pythonPackages = python3Packages; }; - telepresence2 = callPackage ../tools/networking/telepresence2 { }; - - teler = callPackage ../tools/security/teler { }; - - telescope = callPackage ../applications/networking/browsers/telescope { }; - - termcolor = callPackage ../development/libraries/termcolor { }; - termscp = callPackage ../tools/networking/termscp { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security; }; - termius = callPackage ../applications/networking/termius { }; - - termplay = callPackage ../tools/misc/termplay { }; - - tetrd = callPackage ../applications/networking/tetrd { }; - - tewisay = callPackage ../tools/misc/tewisay { }; - texmacs = if stdenv.isDarwin then callPackage ../applications/editors/texmacs/darwin.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; @@ -12329,20 +4758,8 @@ with pkgs; texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept { }; - texworks = libsForQt5.callPackage ../applications/editors/texworks { }; - tf2pulumi = callPackage ../development/tools/tf2pulumi { }; - - thc-hydra = callPackage ../tools/security/thc-hydra { }; - - thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; - - thedesk = callPackage ../applications/misc/thedesk { }; - - theharvester = callPackage ../tools/security/theharvester { }; - inherit (nodePackages) thelounge; theLoungePlugins = with lib; let @@ -12357,164 +4774,34 @@ with pkgs; thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; - theme-sh = callPackage ../tools/misc/theme-sh { }; - - thiefmd = callPackage ../applications/editors/thiefmd { }; - - thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; - thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; - threatest = callPackage ../tools/security/threatest { }; - - threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { }; - - thumbdrives = callPackage ../applications/system/thumbdrives { }; - - tidy-viewer = callPackage ../tools/text/tidy-viewer { }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; - tiledb = callPackage ../development/libraries/tiledb { }; - - timemachine = callPackage ../applications/audio/timemachine { }; - - timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; - - timetrap = callPackage ../applications/office/timetrap { }; - - timetagger = callPackage ../servers/timetagger { }; - - timezonemap = callPackage ../development/libraries/timezonemap { }; - - tzupdate = callPackage ../applications/misc/tzupdate { }; - - tinc = callPackage ../tools/networking/tinc { }; - - tie = callPackage ../development/tools/misc/tie { }; - - tidb = callPackage ../servers/tidb { }; - tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; - - tinycbor = callPackage ../development/libraries/tinycbor { }; - - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; - - tinygltf = callPackage ../development/libraries/tinygltf { }; - - tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; - - tinyprog = callPackage ../development/embedded/fpga/tinyprog { }; - - tinyproxy = callPackage ../tools/networking/tinyproxy { }; - - time-decode = callPackage ../tools/misc/time-decode { }; - - tio = callPackage ../tools/misc/tio { }; - - tiv = callPackage ../applications/misc/tiv { }; - - tldr = callPackage ../tools/misc/tldr { }; - tldr-hs = haskellPackages.tldr; - tlsx = callPackage ../tools/security/tlsx { }; - - tmate = callPackage ../tools/misc/tmate { }; - - tmate-ssh-server = callPackage ../servers/tmate-ssh-server { }; - - tmpwatch = callPackage ../tools/misc/tmpwatch { }; - - tmpmail = callPackage ../applications/networking/tmpmail { }; - - tmux = callPackage ../tools/misc/tmux { }; - - tmux-cssh = callPackage ../tools/misc/tmux-cssh { }; - - tmuxp = callPackage ../tools/misc/tmuxp { }; - - tmuxinator = callPackage ../tools/misc/tmuxinator { }; - - tmux-mem-cpu-load = callPackage ../tools/misc/tmux-mem-cpu-load { }; - - tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; - tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); - tmsu = callPackage ../tools/filesystems/tmsu { }; - - tncattach = callPackage ../applications/radio/tncattach { }; - - toilet = callPackage ../tools/misc/toilet { }; - tokei = callPackage ../development/tools/misc/tokei { inherit (darwin.apple_sdk.frameworks) Security; }; - tokio-console = callPackage ../development/tools/tokio-console { }; - - toml2json = callPackage ../development/tools/toml2json { }; - - toml2nix = callPackage ../development/tools/toml2nix { }; - topgrade = callPackage ../tools/misc/topgrade { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - topiary = callPackage ../development/tools/misc/topiary { }; - - todo = callPackage ../tools/misc/todo { }; - - toolbox = callPackage ../applications/virtualization/toolbox { }; - - tor = callPackage ../tools/security/tor { }; - - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; - - touchegg = callPackage ../tools/inputmethods/touchegg { }; - - torrent7z = callPackage ../tools/archivers/torrent7z { }; - - torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - - toss = callPackage ../tools/networking/toss { }; - - tox-node = callPackage ../tools/networking/tox-node { }; - - toxvpn = callPackage ../tools/networking/toxvpn { }; - toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { }; - trackma = callPackage ../tools/misc/trackma { }; - trackma-curses = trackma.override { withCurses = true; }; trackma-gtk = trackma.override { withGTK = true; }; trackma-qt = trackma.override { withQT = true; }; - tran = callPackage ../tools/networking/tran { }; - tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { }; - tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; - - tpm-tools = callPackage ../tools/security/tpm-tools { }; - - tpm-luks = callPackage ../tools/security/tpm-luks { }; - - tpm2-abrmd = callPackage ../tools/security/tpm2-abrmd { }; - - tpm2-pkcs11 = callPackage ../misc/tpm2-pkcs11 { }; - - tpm2-tools = callPackage ../tools/security/tpm2-tools { }; - - trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; - trezorctl = with python3Packages; toPythonApplication trezor; trezord = callPackage ../servers/trezord { @@ -12523,98 +4810,36 @@ with pkgs; trezor_agent = with python3Packages; toPythonApplication trezor_agent; - trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; - trunk = callPackage ../development/tools/trunk { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - trunk-io = callPackage ../development/tools/trunk-io { }; - - tthsum = callPackage ../applications/misc/tthsum { }; - ttp = with python3.pkgs; toPythonApplication ttp; - trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; - kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; - traceroute = callPackage ../tools/networking/traceroute { }; - tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; - tracee = callPackage ../tools/security/tracee { }; - - tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { }; - - tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { }; - transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { }; - translate-shell = callPackage ../applications/misc/translate-shell { }; - translatepy = with python3.pkgs; toPythonApplication translatepy; - trash-cli = callPackage ../tools/misc/trash-cli { }; - - trashy = callPackage ../tools/misc/trashy { }; - - trdl-client = callPackage ../tools/misc/trdl-client { }; - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { }; - trickle = callPackage ../tools/networking/trickle {}; - inherit (nodePackages) triton; - triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; - inherit (callPackage ../applications/office/trilium {}) trilium-desktop trilium-server ; - trousers = callPackage ../tools/security/trousers { }; - - trueseeing = callPackage ../tools/security/trueseeing { }; - - trx = callPackage ../tools/audio/trx { }; - - tryton = callPackage ../applications/office/tryton { }; - trytond = with python3Packages; toPythonApplication trytond; - tun2socks = callPackage ../tools/networking/tun2socks { }; - - tuntox = callPackage ../tools/networking/tuntox { }; - - omapd = callPackage ../tools/security/omapd { }; - - ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { autoreconfHook = buildPackages.autoreconfHook269; }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; - tty-clock = callPackage ../tools/misc/tty-clock { }; - - tty-share = callPackage ../applications/misc/tty-share { }; - - ttyplot = callPackage ../tools/misc/ttyplot { }; - - ttygif = callPackage ../tools/misc/ttygif { }; - - ttylog = callPackage ../tools/misc/ttylog { }; - - txtpbfmt = callPackage ../development/tools/txtpbfmt { }; - - ipbt = callPackage ../tools/misc/ipbt { }; - - tuhi = callPackage ../applications/misc/tuhi { }; - - tuir = callPackage ../applications/misc/tuir { }; - tuifeed = callPackage ../applications/networking/feedreaders/tuifeed { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12624,222 +4849,30 @@ with pkgs; openssl = openssl_1_1; }; - tuptime = callPackage ../tools/system/tuptime { }; - - turses = callPackage ../applications/networking/instant-messengers/turses { }; - - tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { }; - - tv = callPackage ../tools/text/tv { }; - - tvm = callPackage ../development/compilers/tvm { }; - - oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; - twilight = callPackage ../tools/graphics/twilight { libX11 = xorg.libX11; }; twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; - twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; - - twspace-dl = callPackage ../tools/misc/twspace-dl { }; - twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; - twurl = callPackage ../tools/misc/twurl { }; - - txr = callPackage ../tools/text/txr { }; - - txt2man = callPackage ../tools/misc/txt2man { }; - - txt2tags = callPackage ../tools/text/txt2tags { }; - - txtw = callPackage ../tools/misc/txtw { }; - - tydra = callPackage ../tools/misc/tydra { }; - - typos = callPackage ../development/tools/typos { }; - - tz = callPackage ../tools/misc/tz { }; - - u9fs = callPackage ../servers/u9fs { }; - - ua = callPackage ../tools/networking/ua { }; - ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; - ubridge = callPackage ../tools/networking/ubridge { }; - - ubertooth = callPackage ../applications/radio/ubertooth { }; - - ucarp = callPackage ../servers/ucarp { }; - - ucl = callPackage ../development/libraries/ucl { }; - - ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; - - udftools = callPackage ../tools/filesystems/udftools {}; - - udp2raw = callPackage ../tools/networking/udp2raw { }; - - udpreplay = callPackage ../tools/networking/udpreplay { }; - - udpt = callPackage ../servers/udpt { }; - - udptunnel = callPackage ../tools/networking/udptunnel { }; - - uftrace = callPackage ../development/tools/uftrace { }; - - uget = callPackage ../tools/networking/uget { }; - - uget-integrator = callPackage ../tools/networking/uget-integrator { }; - - ugrep = callPackage ../tools/text/ugrep { }; - - uhk-agent = callPackage ../os-specific/linux/uhk-agent { }; - - uhk-udev-rules = callPackage ../os-specific/linux/uhk-udev-rules { }; - - uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; - - uivonim = callPackage ../applications/editors/uivonim { }; - - umlet = callPackage ../tools/misc/umlet { }; - unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; - unfs3 = callPackage ../servers/unfs3 { }; - - unoconv = callPackage ../tools/text/unoconv { }; - - unrtf = callPackage ../tools/text/unrtf { }; - unrpa = with python38Packages; toPythonApplication unrpa; - untex = callPackage ../tools/text/untex { }; - - untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; - - up = callPackage ../tools/misc/up { }; - - upbound = callPackage ../development/tools/upbound { }; - - upterm = callPackage ../tools/misc/upterm { }; - - upx = callPackage ../tools/compression/upx { }; - - uq = callPackage ../misc/uq { }; - - uqmi = callPackage ../tools/networking/uqmi { }; - - urdfdom = callPackage ../development/libraries/urdfdom {}; - - urdfdom-headers = callPackage ../development/libraries/urdfdom-headers {}; - - uriparser = callPackage ../development/libraries/uriparser {}; - - urlscan = callPackage ../applications/misc/urlscan { }; - - urlview = callPackage ../applications/misc/urlview {}; - - urn-timer = callPackage ../tools/misc/urn-timer { }; - - ursadb = callPackage ../servers/ursadb {}; - - usbmuxd = callPackage ../tools/misc/usbmuxd {}; - - usbmuxd2 = callPackage ../tools/misc/usbmuxd2 {}; - - ustreamer = callPackage ../applications/video/ustreamer { }; - - usync = callPackage ../applications/misc/usync { }; - - uwc = callPackage ../tools/text/uwc { }; - - uwsgi = callPackage ../servers/uwsgi { }; - - uwufetch = callPackage ../tools/misc/uwufetch { }; - - v2ray = callPackage ../tools/networking/v2ray { }; - - v2raya = callPackage ../tools/networking/v2raya { }; - - v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; - - v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; - - vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; - - validator-nu = callPackage ../tools/text/validator-nu { }; - - vampire = callPackage ../applications/science/logic/vampire {}; - - variety = callPackage ../applications/misc/variety {}; - - vdmfec = callPackage ../applications/backup/vdmfec {}; - - vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { }; - - vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { }; - - vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; - - volatility = callPackage ../tools/security/volatility { }; - - volatility3 = callPackage ../tools/security/volatility3 { }; - - vbetool = callPackage ../tools/system/vbetool { }; - - vcsi = callPackage ../tools/video/vcsi { }; - - vde2 = callPackage ../tools/networking/vde2 { }; - - vboot_reference = callPackage ../tools/system/vboot_reference {}; - - vcftools = callPackage ../applications/science/biology/vcftools { }; - vcmi = libsForQt5.callPackage ../games/vcmi { }; - vcsh = callPackage ../applications/version-management/vcsh { }; - - vcs_query = callPackage ../tools/misc/vcs_query { }; - - vcstool = callPackage ../development/tools/vcstool { }; - - verco = callPackage ../applications/version-management/verco { }; - - verilator = callPackage ../applications/science/electronics/verilator {}; - verilog = callPackage ../applications/science/electronics/verilog { autoconf = buildPackages.autoconf269; }; - versus = callPackage ../applications/networking/versus { }; - - vexctl = callPackage ../tools/security/vexctl { }; - - vgrep = callPackage ../tools/text/vgrep { }; - - vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; - video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; - video-trimmer = callPackage ../applications/video/video-trimmer { }; - - via = callPackage ../tools/misc/via {}; - - vial = callPackage ../tools/misc/vial {}; - - viking = callPackage ../applications/misc/viking { }; - - vim-vint = callPackage ../development/tools/vim-vint { }; - - vimer = callPackage ../tools/misc/vimer { }; - vimpager = callPackage ../tools/misc/vimpager { }; vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { }; @@ -12848,40 +4881,10 @@ with pkgs; visidata = (newScope python3Packages) ../applications/misc/visidata { }; - vit = callPackage ../applications/misc/vit { }; - - viu = callPackage ../tools/graphics/viu { }; - - vix = callPackage ../tools/misc/vix { }; - vkbasalt = callPackage ../tools/graphics/vkbasalt { vkbasalt32 = pkgsi686Linux.vkbasalt; }; - vkbasalt-cli = callPackage ../tools/graphics/vkbasalt-cli { }; - - vkmark = callPackage ../tools/graphics/vkmark { }; - - vncrec = callPackage ../tools/video/vncrec { }; - - vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { }; - - vo-aacenc = callPackage ../development/libraries/vo-aacenc { }; - - vobcopy = callPackage ../tools/cd-dvd/vobcopy { }; - - vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; - - void = callPackage ../tools/misc/void { }; - - volume_key = callPackage ../development/libraries/volume-key { }; - - vorbisgain = callPackage ../tools/misc/vorbisgain { }; - - vpnc = callPackage ../tools/networking/vpnc { }; - - vpnc-scripts = callPackage ../tools/networking/vpnc-scripts { }; - vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; vp = callPackage ../applications/misc/vp { @@ -12891,18 +4894,10 @@ with pkgs; SDL = SDL_sixel; }; - vtm = callPackage ../tools/misc/vtm { }; - - witness = callPackage ../tools/security/witness { }; - - openconnectPackages = callPackage ../tools/networking/openconnect { }; - inherit (openconnectPackages) openconnect openconnect_unstable openconnect_openssl; globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { }; - ding-libs = callPackage ../tools/misc/ding-libs { }; - sssd = callPackage ../os-specific/linux/sssd { inherit (perlPackages) Po4a; }; @@ -12911,39 +4906,21 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - sentry-native = callPackage ../development/libraries/sentry-native { }; - - twilio-cli = callPackage ../development/tools/twilio-cli { }; - waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { inherit (darwin.apple_sdk.frameworks) OpenCL; }; wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; - weather = callPackage ../applications/misc/weather { }; - - wego = callPackage ../applications/misc/wego { }; - - wal_e = callPackage ../tools/backup/wal-e { }; - - wander = callPackage ../tools/admin/wander { }; - watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) Cocoa AppKit; }; - watchlog = callPackage ../tools/misc/watchlog { }; - watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; autoconf = buildPackages.autoconf269; }; - wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; - - wbox = callPackage ../tools/networking/wbox {}; - webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1"; webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1"; wasm-strip = nodePackages."@webassemblyjs/wasm-strip"; @@ -12959,43 +4936,11 @@ with pkgs; llvmPackages = llvmPackages_12; }; - welkin = callPackage ../tools/graphics/welkin {}; + whitebophir = callPackage ../servers/web-apps/whitebophir { }; - wemux = callPackage ../tools/misc/wemux { }; - - wf-recorder = callPackage ../applications/video/wf-recorder { }; - - whatip = callPackage ../tools/networking/whatip {}; - - whatweb = callPackage ../tools/security/whatweb { }; - - whipper = callPackage ../applications/audio/whipper { }; - - whitebophir = callPackage ../servers/web-apps/whitebophir { }; - - whois = callPackage ../tools/networking/whois { }; - - wifish = callPackage ../tools/networking/wifish { }; - - wifite2 = callPackage ../tools/networking/wifite2 { }; - - wimboot = callPackage ../tools/misc/wimboot { }; - - wire = callPackage ../development/tools/wire { }; - - wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; - - wireproxy = callPackage ../tools/networking/wireproxy { }; - - wiringpi = callPackage ../os-specific/linux/wiringpi { }; - - wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { }; - - wg-netmanager = callPackage ../tools/networking/wg-netmanager { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - woff2 = callPackage ../development/web/woff2 { }; + wg-netmanager = callPackage ../tools/networking/wg-netmanager { + inherit (darwin.apple_sdk.frameworks) Security; + }; woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { }; @@ -13005,120 +4950,39 @@ with pkgs; woodpecker-frontend = callPackage ../development/tools/continuous-integration/woodpecker/frontend.nix { }; }; - woof = callPackage ../tools/misc/woof { }; - - wootility = callPackage ../tools/misc/wootility { }; - - wormhole-william = callPackage ../tools/networking/wormhole-william { }; - - wpscan = callPackage ../tools/security/wpscan { }; - - wsmancli = callPackage ../tools/system/wsmancli {}; - wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; - wolfebin = callPackage ../tools/networking/wolfebin { }; - - xautoclick = callPackage ../applications/misc/xautoclick {}; - - xl2tpd = callPackage ../tools/networking/xl2tpd { }; - - xe = callPackage ../tools/system/xe { }; - - xplr = callPackage ../applications/misc/xplr {}; - - xray = callPackage ../tools/networking/xray { }; - testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { }; - - html2text = callPackage ../tools/text/html2text { }; - - html-tidy = callPackage ../tools/text/html-tidy { }; - - html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; - htmldoc = callPackage ../tools/typesetting/htmldoc { inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; - htmltest = callPackage ../development/tools/htmltest { }; - - rcm = callPackage ../tools/misc/rcm {}; - - td = callPackage ../tools/misc/td { }; - - tdfgo = callPackage ../tools/misc/tdfgo { }; - - tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; - - tigervnc = callPackage ../tools/admin/tigervnc {}; - tightvnc = callPackage ../tools/admin/tightvnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; }; - time = callPackage ../tools/misc/time { }; - tweet-hs = haskell.lib.compose.justStaticExecutables haskellPackages.tweet-hs; - tweeny = callPackage ../development/libraries/tweeny { }; - - qfsm = callPackage ../applications/science/electronics/qfsm { }; - - tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; - - tm = callPackage ../tools/system/tm { }; - - tradcpp = callPackage ../development/tools/tradcpp { }; - - traitor = callPackage ../tools/security/traitor { }; - - tre = callPackage ../development/libraries/tre { }; - tremor-rs = callPackage ../tools/misc/tremor-rs { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { }; - - truecrack = callPackage ../tools/security/truecrack { }; truecrack-cuda = truecrack.override { cudaSupport = true; }; - ts = callPackage ../tools/system/ts { }; - - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; - - ttwatch = callPackage ../tools/misc/ttwatch { }; - turbovnc = callPackage ../tools/admin/turbovnc { # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; }; - udunits = callPackage ../development/libraries/udunits { }; - - uftp = callPackage ../servers/uftp {}; - - uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { autoconf = buildPackages.autoconf269; }; - uhub = callPackage ../servers/uhub { }; - - unclutter = callPackage ../tools/misc/unclutter { }; - - unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - - unbound = callPackage ../tools/networking/unbound {}; - unbound-with-systemd = unbound.override { withSystemd = true; }; @@ -13145,60 +5009,12 @@ with pkgs; pythonPackages = python3Packages; }; - unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; - - unrar = callPackage ../tools/archivers/unrar { }; - unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; - uptime-kuma = callPackage ../servers/monitoring/uptime-kuma { }; - - vul = callPackage ../applications/misc/vul { }; - - xar = callPackage ../tools/compression/xar { }; - - xarchive = callPackage ../tools/archivers/xarchive { }; - - xarchiver = callPackage ../tools/archivers/xarchiver { }; - - xbanish = callPackage ../tools/X11/xbanish { }; - - xbrightness = callPackage ../tools/X11/xbrightness { }; - - xdg-launch = callPackage ../applications/misc/xdg-launch { }; - xdp-tools = callPackage ../tools/networking/xdp-tools { llvmPackages = llvmPackages_14; }; - xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; - - xkeysnail = callPackage ../tools/X11/xkeysnail { }; - - xfstests = callPackage ../tools/misc/xfstests { }; - - xprompt = callPackage ../tools/X11/xprompt { }; - - xprintidle = callPackage ../tools/X11/xprintidle {}; - - xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; - - xscast = callPackage ../applications/video/xscast { }; - - xsettingsd = callPackage ../tools/X11/xsettingsd { }; - - xsensors = callPackage ../os-specific/linux/xsensors { }; - - xspim = callPackage ../development/tools/misc/xspim { }; - - xcruiser = callPackage ../applications/misc/xcruiser { }; - - xwallpaper = callPackage ../tools/X11/xwallpaper { }; - - gxkb = callPackage ../applications/misc/gxkb { }; - - xxkb = callPackage ../applications/misc/xxkb { }; - ugarit = callPackage ../tools/backup/ugarit { inherit (chickenPackages_4) eggDerivation fetchegg; }; @@ -13207,37 +5023,13 @@ with pkgs; inherit (chickenPackages_4) eggDerivation fetchegg; }; - ulogd = callPackage ../os-specific/linux/ulogd { }; - unar = callPackage ../tools/archivers/unar { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; stdenv = clangStdenv; }; - unp = callPackage ../tools/archivers/unp { }; - - unshield = callPackage ../tools/archivers/unshield { }; - - unzip = callPackage ../tools/archivers/unzip { }; - unzipNLS = lowPrio (unzip.override { enableNLS = true; }); - undmg = callPackage ../tools/archivers/undmg { }; - - uptimed = callPackage ../tools/system/uptimed { }; - - upwork = callPackage ../applications/misc/upwork { }; - - urjtag = callPackage ../tools/misc/urjtag { }; - - urlhunter = callPackage ../tools/security/urlhunter { }; - - urlwatch = callPackage ../tools/networking/urlwatch { }; - - vals = callPackage ../tools/security/vals { }; - - valum = callPackage ../development/web/valum { }; - inherit (callPackages ../servers/varnish { }) varnish60 varnish72; inherit (callPackages ../servers/varnish/packages.nix { }) @@ -13246,45 +5038,16 @@ with pkgs; varnishPackages = varnish72Packages; varnish = varnishPackages.varnish; - hitch = callPackage ../servers/hitch { }; - veracrypt = callPackage ../applications/misc/veracrypt { wxGTK = wxGTK32; }; - veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; - - vlan = callPackage ../tools/networking/vlan { }; - - vmtouch = callPackage ../tools/misc/vmtouch { }; - vncdo = with python3Packages; toPythonApplication vncdo; - volumeicon = callPackage ../tools/audio/volumeicon { }; - - waf = callPackage ../development/tools/build-managers/waf { }; - wafHook = callPackage ../development/tools/build-managers/wafHook { }; - - waf-tester = callPackage ../tools/security/waf-tester { }; - wagyu = callPackage ../tools/misc/wagyu { inherit (darwin.apple_sdk.frameworks) Security; }; - wakelan = callPackage ../tools/networking/wakelan { }; - - wavemon = callPackage ../tools/networking/wavemon { }; - - wdfs = callPackage ../tools/filesystems/wdfs { }; - - wdiff = callPackage ../tools/text/wdiff { }; - - wdisplays = callPackage ../tools/graphics/wdisplays { }; - - webalizer = callPackage ../tools/networking/webalizer { }; - - wget = callPackage ../tools/networking/wget { }; - wget2 = callPackage ../tools/networking/wget2 { # update breaks grub2 gnulib = pkgs.gnulib.overrideAttrs (_: rec { @@ -13301,35 +5064,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) QuartzCore; }; - wg-bond = callPackage ../applications/networking/wg-bond { }; - - wgcf = callPackage ../applications/networking/wgcf { }; - - which = callPackage ../tools/system/which { }; - - whsniff = callPackage ../applications/networking/sniffers/whsniff { }; - wiiuse = callPackage ../development/libraries/wiiuse { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; }; - wipefreespace = callPackage ../tools/filesystems/wipefreespace {}; - - woeusb = callPackage ../tools/misc/woeusb { }; - - woeusb-ng = callPackage ../tools/misc/woeusb-ng { }; - - wslu = callPackage ../tools/system/wslu { }; - - chase = callPackage ../tools/system/chase { }; - - wimlib = callPackage ../tools/archivers/wimlib { }; - - wipe = callPackage ../tools/security/wipe { }; - - wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { @@ -13337,40 +5076,12 @@ with pkgs; openssl = openssl_1_1; }; - wml = callPackage ../development/web/wml { }; - - wol = callPackage ../tools/networking/wol { }; - - wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; - - wpgtk = callPackage ../tools/X11/wpgtk { }; - - wrap = callPackage ../tools/text/wrap { }; - wring = nodePackages.wring; - wrk = callPackage ../tools/networking/wrk { }; - - wrk2 = callPackage ../tools/networking/wrk2 { }; - - wsysmon = callPackage ../tools/system/wsysmon { }; - - wuzz = callPackage ../tools/networking/wuzz { }; - - wv = callPackage ../tools/misc/wv { }; - - wv2 = callPackage ../tools/misc/wv2 { }; - - wvkbd = callPackage ../applications/accessibility/wvkbd { }; - wyrd = callPackage ../tools/misc/wyrd { ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; - x86info = callPackage ../os-specific/linux/x86info { }; - - x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; - xbursttools = callPackage ../tools/misc/xburst-tools { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote @@ -13378,71 +5089,26 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - clipnotify = callPackage ../tools/misc/clipnotify { }; - - clipbuzz = callPackage ../tools/misc/clipbuzz { }; - - xclip = callPackage ../tools/misc/xclip { }; - - xcur2png = callPackage ../tools/graphics/xcur2png { }; - - xcwd = callPackage ../tools/X11/xcwd { }; - - xtitle = callPackage ../tools/misc/xtitle { }; - - xdelta = callPackage ../tools/compression/xdelta { }; - xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { }; - xdot = with python3Packages; toPythonApplication xdot; - xdummy = callPackage ../tools/misc/xdummy { }; - - xdg-ninja = callPackage ../tools/misc/xdg-ninja { }; - - xdxf2slob = callPackage ../tools/misc/xdxf2slob { }; - - xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; - - xflux = callPackage ../tools/misc/xflux { }; xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; - xfsdump = callPackage ../tools/filesystems/xfsdump { }; - - xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; libxfs = xfsprogs.dev; - xml2 = callPackage ../tools/text/xml/xml2 { }; - xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { }; - xmlformat = callPackage ../tools/text/xml/xmlformat { }; - - xmlroff = callPackage ../tools/typesetting/xmlroff { }; - - xmloscopy = callPackage ../tools/text/xml/xmloscopy { }; - - xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; - xmlto = callPackage ../tools/typesetting/xmlto { w3m = w3m-batch; }; - xiccd = callPackage ../tools/misc/xiccd { }; - xidlehook = callPackage ../tools/X11/xidlehook { inherit (darwin.apple_sdk.frameworks) Security; }; - xorriso = callPackage ../tools/cd-dvd/xorriso { }; - xprite-editor = callPackage ../tools/misc/xprite-editor { inherit (darwin.apple_sdk.frameworks) AppKit; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { }; - - xsel = callPackage ../tools/misc/xsel { }; - xsv = callPackage ../tools/text/xsv { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -13451,26 +5117,10 @@ with pkgs; boost = boost17x; }; - xurls = callPackage ../tools/text/xurls {}; - - xxv = callPackage ../tools/misc/xxv {}; - xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - xvkbd = callPackage ../tools/X11/xvkbd {}; - - xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; - - xwinwrap = callPackage ../tools/X11/xwinwrap {}; - - yajsv = callPackage ../tools/misc/yajsv { }; - - yallback = callPackage ../development/tools/analysis/yallback { }; - yapf = with python3Packages; toPythonApplication yapf; - yarn = callPackage ../development/tools/yarn { }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; @@ -13483,56 +5133,20 @@ with pkgs; mkYarnModules fixup_yarn_lock; - yarr = callPackage ../applications/networking/feedreaders/yarr { }; - - yascreen = callPackage ../development/libraries/yascreen { }; - - yasr = callPackage ../applications/audio/yasr { }; - - yank = callPackage ../tools/misc/yank { }; - yamlfix = with python3Packages; toPythonApplication yamlfix; yamllint = with python3Packages; toPythonApplication yamllint; - yamlpath = callPackage ../development/tools/yamlpath { }; - - yaml-merge = callPackage ../tools/text/yaml-merge { }; - - yeshup = callPackage ../tools/system/yeshup { }; - - ytfzf = callPackage ../tools/misc/ytfzf { }; - # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { haskellPackages = haskell.packages.ghc810; }; - yj = callPackage ../development/tools/yj { }; - - zarchive = callPackage ../tools/archivers/zarchive { }; - - zprint = callPackage ../development/tools/zprint { }; - - yle-dl = callPackage ../tools/misc/yle-dl {}; - - you-get = callPackage ../tools/misc/you-get { }; - - zasm = callPackage ../development/compilers/zasm {}; - - zbackup = callPackage ../tools/backup/zbackup {}; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { inherit (darwin.apple_sdk.frameworks) Foundation; autoreconfHook = buildPackages.autoreconfHook269; }; - zbctl = callPackage ../tools/admin/zbctl { }; - - zdelta = callPackage ../tools/compression/zdelta { }; - - zed = callPackage ../development/tools/zed { }; - zellij = callPackage ../tools/misc/zellij { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; @@ -13548,138 +5162,18 @@ with pkgs; nvidiaSupport = true; }; - zerotierone = callPackage ../tools/networking/zerotierone { }; - - zerofree = callPackage ../tools/filesystems/zerofree { }; - - zfp = callPackage ../tools/compression/zfp {}; - - zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; - - zfsbackup = callPackage ../tools/backup/zfsbackup { }; - - zfstools = callPackage ../tools/filesystems/zfstools { }; - - zfsnap = callPackage ../tools/backup/zfsnap { }; - - zpool-auto-expand-partitions = callPackage ../tools/filesystems/zpool-auto-expand-partitions { }; - - zile = callPackage ../applications/editors/zile { }; - - zinnia = callPackage ../tools/inputmethods/zinnia { }; - tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { }; - - zim-tools = callPackage ../tools/text/zim-tools { }; - - zimfw = callPackage ../shells/zsh/zimfw { }; - - zld = callPackage ../development/tools/zld { }; - - par = callPackage ../tools/text/par { }; - - zip = callPackage ../tools/archivers/zip { }; - - zinc = callPackage ../servers/search/zinc { }; - - zkfuse = callPackage ../tools/filesystems/zkfuse { }; - - zpaq = callPackage ../tools/archivers/zpaq { }; - zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; - - zplug = callPackage ../shells/zsh/zplug { }; - - zi = callPackage ../shells/zsh/zi {}; - - zinit = callPackage ../shells/zsh/zinit {} ; - zint = qt6Packages.callPackage ../development/libraries/zint { }; - zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { }; - - zs-wait4host = callPackage ../tools/networking/zs-wait4host { }; - - zstxtns-utils = callPackage ../tools/text/zstxtns-utils { }; - - zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; - - zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; - - zsh-bd = callPackage ../shells/zsh/zsh-bd { }; - - zsh-better-npm-completion = callPackage ../shells/zsh/zsh-better-npm-completion { }; - - zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { }; - - zsh-edit = callPackage ../shells/zsh/zsh-edit { }; - - zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - - zsh-history = callPackage ../shells/zsh/zsh-history { }; - - zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { }; - - zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; - - zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; - - zsh-nix-shell = callPackage ../shells/zsh/zsh-nix-shell { }; - - zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; - - zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { }; - - zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; - - zsh-forgit = callPackage ../shells/zsh/zsh-forgit { }; - - zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; - - zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { }; - - zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; - - zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { }; - - zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { }; - - zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; - - zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode {}; - - zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; - - zsh-z = callPackage ../shells/zsh/zsh-z { }; - - zssh = callPackage ../tools/networking/zssh { }; - zstd = callPackage ../tools/compression/zstd { cmake = buildPackages.cmakeMinimal; }; - zsv = callPackage ../development/tools/zsv { }; - - zsync = callPackage ../tools/compression/zsync { }; - - zxing = callPackage ../tools/graphics/zxing {}; - - zkar = callPackage ../tools/security/zkar { }; - - zlint = callPackage ../tools/security/zlint { }; - - zmap = callPackage ../tools/security/zmap { }; - - zmusic = callPackage ../development/libraries/zmusic { }; - - zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; - ### SHELLS runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; - any-nix-shell = callPackage ../shells/any-nix-shell { }; - bash = lowPrio (callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; }); @@ -13696,102 +5190,26 @@ with pkgs; forFHSEnv = true; }; - bash-completion = callPackage ../shells/bash/bash-completion { }; + fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); - gradle-completion = callPackage ../shells/zsh/gradle-completion { }; + powerline = with python3Packages; toPythonApplication powerline; - nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; + ### DEVELOPMENT / COMPILERS - yarn-bash-completion = callPackage ../shells/bash/yarn-completion { }; + temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; + temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; - blesh = callPackage ../shells/bash/blesh { }; + temurin-bin-18 = javaPackages.compiler.temurin-bin.jdk-18; + temurin-jre-bin-18 = javaPackages.compiler.temurin-bin.jre-18; - undistract-me = callPackage ../shells/bash/undistract-me { }; + temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; + temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; - carapace = callPackage ../shells/carapace { }; - - dash = callPackage ../shells/dash { }; - - dasht = callPackage ../tools/misc/dasht { }; - - dashing = callPackage ../tools/misc/dashing { }; - - es = callPackage ../shells/es { }; - - fish = callPackage ../shells/fish { }; - - oh-my-fish = callPackage ../shells/fish/oh-my-fish { }; - - wrapFish = callPackage ../shells/fish/wrapper.nix { }; - - fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); - - fzf-git-sh = callPackage ../shells/fzf-git-sh {}; - - ion = callPackage ../shells/ion { }; - - jush = callPackage ../shells/jush { }; - - ksh = callPackage ../shells/ksh { }; - - liquidprompt = callPackage ../shells/liquidprompt { }; - - mksh = callPackage ../shells/mksh { }; - - murex = callPackage ../shells/murex { }; - - oh = callPackage ../shells/oh { }; - - oil = callPackage ../shells/oil { }; - - oksh = callPackage ../shells/oksh { }; - - loksh = callPackage ../shells/loksh { }; - - pash = callPackage ../shells/pash { }; - - scponly = callPackage ../shells/scponly { }; - - tcsh = callPackage ../shells/tcsh { }; - - rush = callPackage ../shells/rush { }; - - xonsh = callPackage ../shells/xonsh { }; - - zsh = callPackage ../shells/zsh { }; - - nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { }; - - zsh-completions = callPackage ../shells/zsh/zsh-completions { }; - - zsh-prezto = callPackage ../shells/zsh/zsh-prezto { }; - - yash = callPackage ../shells/yash { }; - - grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { }; - - powerline = with python3Packages; toPythonApplication powerline; - - ### DEVELOPMENT / COMPILERS - - _4th = callPackage ../development/compilers/4th { }; - - abcl = callPackage ../development/compilers/abcl { }; - - temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; - temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; - - temurin-bin-18 = javaPackages.compiler.temurin-bin.jdk-18; - temurin-jre-bin-18 = javaPackages.compiler.temurin-bin.jre-18; - - temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; - temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; - - temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; - temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; - temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; - temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; - temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; + temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; + temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; + temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; + temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; + temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; temurin-bin = temurin-bin-19; temurin-jre-bin = temurin-jre-bin-19; @@ -13838,72 +5256,31 @@ with pkgs; jdk = jdk8; }; - alan = callPackage ../development/compilers/alan { }; - - alan_2 = callPackage ../development/compilers/alan/2.nix { }; - - algol68g = callPackage ../development/compilers/algol68g { }; - - ante = callPackage ../development/compilers/ante { }; - armips = callPackage ../development/compilers/armips { stdenv = gcc10Stdenv; }; - arachne-pnr = callPackage ../development/compilers/arachne-pnr { }; - - asciigraph = callPackage ../tools/text/asciigraph { }; - - as31 = callPackage ../development/compilers/as31 { }; - asl = callPackage ../development/compilers/asl { tex = texlive.combined.scheme-medium; }; - aspectj = callPackage ../development/compilers/aspectj { }; - - atasm = callPackage ../development/compilers/atasm { }; - - ats = callPackage ../development/compilers/ats { }; - ats2 = callPackage ../development/compilers/ats2 { }; - - ats-acc = callPackage ../development/tools/ats-acc { }; - - avra = callPackage ../development/compilers/avra { }; - ballerina = callPackage ../development/compilers/ballerina { openjdk = openjdk11_headless; }; - beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { }; - - bigloo = callPackage ../development/compilers/bigloo { }; - binaryen = callPackage ../development/compilers/binaryen { nodejs = nodejs-slim; inherit (python3Packages) filecheck; }; - blueprint-compiler = callPackage ../development/compilers/blueprint { }; - bluespec = callPackage ../development/compilers/bluespec { gmp-static = gmp.override { withStatic = true; }; tex = texlive.combined.scheme-full; }; - bun = callPackage ../development/web/bun { }; - - cakelisp = callPackage ../development/compilers/cakelisp { }; - - ciao = callPackage ../development/compilers/ciao { }; - - colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { cudaSupport = config.cudaSupport or false; }; colmapWithCuda = colmap.override { cudaSupport = true; }; - chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; - chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; chickenPackages = chickenPackages_5; inherit (chickenPackages) @@ -13912,8 +5289,6 @@ with pkgs; chicken egg2nix; - cc65 = callPackage ../development/compilers/cc65 { }; - ccl = callPackage ../development/compilers/ccl { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -13926,16 +5301,6 @@ with pkgs; inherit (darwin) cctools; }; - chez-racket = callPackage ../development/compilers/chez-racket {}; - - chez-srfi = callPackage ../development/chez-modules/chez-srfi { }; - - chez-mit = callPackage ../development/chez-modules/chez-mit { }; - - chez-scmutils = callPackage ../development/chez-modules/chez-scmutils { }; - - chez-matchable = callPackage ../development/chez-modules/chez-matchable { }; - libclang = llvmPackages.libclang; clang-manpages = llvmPackages.clang-manpages; @@ -14018,21 +5383,12 @@ with pkgs; stdenv = llvmPackages_6.stdenv; }; - clean = callPackage ../development/compilers/clean { }; - clickable = python3Packages.callPackage ../development/tools/clickable { }; - closurecompiler = callPackage ../development/compilers/closure { }; - - cmdstan = callPackage ../development/compilers/cmdstan { }; - cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; - comby = callPackage ../development/tools/comby { }; - inherit (coqPackages) compcert; - computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { cc = computecpp-unwrapped; extraPackages = [ @@ -14051,8 +5407,6 @@ with pkgs; ''; }; - copper = callPackage ../development/compilers/copper {}; - cotton = callPackage ../development/tools/cotton { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -14065,43 +5419,19 @@ with pkgs; crystal_1_7 crystal; - crystal2nix = callPackage ../development/compilers/crystal2nix { }; - - icr = callPackage ../development/tools/icr { }; - scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; - dasm = callPackage ../development/compilers/dasm { }; - - dbmate = callPackage ../development/tools/database/dbmate { }; - - dbmonster = callPackage ../tools/security/dbmonster { }; - devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; devpi-server = python3Packages.callPackage ../development/tools/devpi-server {}; - dictu = callPackage ../development/compilers/dictu { }; - - ecl = callPackage ../development/compilers/ecl { }; - ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; - - eli = callPackage ../development/compilers/eli { }; - - eql = callPackage ../development/compilers/eql {}; - elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix; elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); - apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { }; - fasm = pkgsi686Linux.callPackage ../development/compilers/fasm { inherit (stdenv) isx86_64; }; - fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - - fasmg = callPackage ../development/compilers/fasmg { }; fbc = if stdenv.hostPlatform.isDarwin then callPackage ../development/compilers/fbc/mac-bin.nix { } @@ -14110,14 +5440,6 @@ with pkgs; filecheck = with python3Packages; toPythonApplication filecheck; - firrtl = callPackage ../development/compilers/firrtl { }; - - flasm = callPackage ../development/compilers/flasm { }; - - flyctl = callPackage ../development/web/flyctl { }; - - fluidd = callPackage ../applications/misc/fluidd { }; - flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; @@ -14127,18 +5449,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; }; - fnlfmt = callPackage ../development/tools/fnlfmt { }; - - fpc = callPackage ../development/compilers/fpc { }; - - g203-led = callPackage ../tools/misc/g203-led { }; - gambit = callPackage ../development/compilers/gambit { }; gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; gerbil = callPackage ../development/compilers/gerbil { }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; - gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries inherit (let @@ -14548,8 +5862,6 @@ with pkgs; bintools = bintoolsDualAs; }); - gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; - gccgo = wrapCC ((if stdenv.hostPlatform.isMusl then gcc_latest else gcc).cc.override { name = "gccgo"; langCC = true; #required for go. @@ -14573,15 +5885,6 @@ with pkgs; gmp = gmp4; }; - gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; - gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; - gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; - gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; - gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 {}; - gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 {}; gcc-arm-embedded = gcc-arm-embedded-12; # Has to match the default gcc so that there are no linking errors when @@ -14594,16 +5897,10 @@ with pkgs; profiledCompiler = false; }); - gforth = callPackage ../development/compilers/gforth {}; - gleam = callPackage ../development/compilers/gleam { inherit (darwin.apple_sdk.frameworks) Security; }; - gmqcc = callPackage ../development/compilers/gmqcc {}; - - gtk-server = callPackage ../development/interpreters/gtk-server {}; - # Haskell and GHC haskell = callPackage ./haskell-packages.nix { }; @@ -14645,31 +5942,16 @@ with pkgs; all-cabal-hashes = callPackage ../data/misc/hackage { }; - purescript = callPackage ../development/compilers/purescript/purescript { }; - - psc-package = callPackage ../development/compilers/purescript/psc-package { }; - purescript-psa = nodePackages.purescript-psa; purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix; - spago = callPackage ../development/tools/purescript/spago { }; - pulp = nodePackages.pulp; pscid = nodePackages.pscid; coreboot-toolchain = recurseIntoAttrs (callPackage ../development/tools/misc/coreboot-toolchain { }); - remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; - - remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; - - spicedb = callPackage ../servers/spicedb { }; - spicedb-zed = callPackage ../servers/spicedb/zed.nix { }; - - tacacsplus = callPackage ../servers/tacacsplus { }; - tamarin-prover = (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { # NOTE: do not use the haskell packages 'graphviz' and 'maude' @@ -14691,14 +5973,10 @@ with pkgs; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; - hop = callPackage ../development/compilers/hop { }; - falcon = callPackage ../development/interpreters/falcon { stdenv = gcc10Stdenv; }; - fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { # Work around while compatibility with ppxlib >= 0.26 is unavailable # Should be removed when a fix is available @@ -14733,30 +6011,14 @@ with pkgs; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); - glslang = callPackage ../development/compilers/glslang { }; - - gnostic = callPackage ../development/compilers/gnostic {}; - - go-junit-report = callPackage ../development/tools/go-junit-report { }; - gobang = callPackage ../development/tools/database/gobang { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; - gogetdoc = callPackage ../development/tools/gogetdoc { }; - - gox = callPackage ../development/tools/gox { }; - - gprolog = callPackage ../development/compilers/gprolog { }; - gwe = callPackage ../tools/misc/gwe { nvidia_x11 = linuxPackages.nvidia_x11; }; - gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - - hvm = callPackage ../development/compilers/hvm { }; - iay = callPackage ../tools/misc/iay { inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; }; @@ -14767,16 +6029,10 @@ with pkgs; idris = idrisPackages.with-packages [ idrisPackages.base ] ; - idris2 = callPackage ../development/compilers/idris2 { }; - inherit (callPackage ../development/tools/database/indradb { }) indradb-server indradb-client; - intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; - - intercal = callPackage ../development/compilers/intercal { }; - irony-server = callPackage ../development/tools/irony-server { # The repository of irony to use -- must match the version of the employed emacs # package. Wishing we could merge it into one irony package, to avoid this issue, @@ -14785,12 +6041,6 @@ with pkgs; inherit (emacs.pkgs.melpaStablePackages) irony; }; - heptagon = callPackage ../development/compilers/heptagon { }; - - holo-build = callPackage ../tools/package-management/holo-build { }; - - hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17; openjfx = openjfx17; @@ -14855,10 +6105,6 @@ with pkgs; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; - lingua-franca = callPackage ../development/compilers/lingua-franca { }; - - openspin = callPackage ../development/compilers/openspin { }; - oraclejdk = jdkdistro true false; oraclejdk8 = oraclejdk8distro true false; @@ -14878,27 +6124,16 @@ with pkgs; inherit installjdk pluginSupport; }); - oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; - - jasmin = callPackage ../development/compilers/jasmin { }; - java-service-wrapper = callPackage ../tools/system/java-service-wrapper { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - jna = callPackage ../development/java-modules/jna { }; - javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper { }; - julia-lts = julia_16-bin; julia-stable = julia_18; julia = julia-stable; - julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; - julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { }; - julia_18 = callPackage ../development/compilers/julia/1.8.nix { }; julia_19 = callPackage ../development/compilers/julia/1.9.nix { }; @@ -14906,39 +6141,12 @@ with pkgs; julia-stable-bin = julia_18-bin; julia-bin = julia-stable-bin; - jwasm = callPackage ../development/compilers/jwasm { }; - kind2 = callPackage ../development/compilers/kind2 { inherit (darwin.apple_sdk.frameworks) Security; }; - knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; - - regenkfs = callPackage ../development/tools/knightos/regenkfs { }; - - knightos-kcc = callPackage ../development/tools/knightos/kcc { }; - - knightos-kimg = callPackage ../development/tools/knightos/kimg { }; - - knightos-kpack = callPackage ../development/tools/knightos/kpack { }; - - knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; - - remkrom = callPackage ../development/tools/knightos/remkrom { }; - - knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; - - knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; - - knightos-scas = callPackage ../development/tools/knightos/scas { }; - - knightos-z80e = callPackage ../development/tools/knightos/z80e { }; - koka = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { }); - kotlin = callPackage ../development/compilers/kotlin { }; - kotlin-native = callPackage ../development/compilers/kotlin/native.nix { }; - lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -14950,10 +6158,6 @@ with pkgs; lessc = nodePackages.less; - liquibase = callPackage ../development/tools/database/liquibase { }; - - lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lobster = callPackage ../development/compilers/lobster { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) @@ -15097,18 +6301,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - manticore = callPackage ../development/compilers/manticore { }; - - marst = callPackage ../development/compilers/marst { }; - - mercury = callPackage ../development/compilers/mercury { }; - - microscheme = callPackage ../development/compilers/microscheme { }; - mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; }; - mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { }; - mitscheme = callPackage ../development/compilers/mit-scheme { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; @@ -15116,12 +6310,6 @@ with pkgs; enableX11 = true; }; - miranda = callPackage ../development/compilers/miranda {}; - - mkcl = callPackage ../development/compilers/mkcl {}; - - mlkit = callPackage ../development/compilers/mlkit {}; - inherit (callPackage ../development/compilers/mlton {}) mlton20130715 mlton20180207Binary @@ -15148,33 +6336,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; - - roslyn = callPackage ../development/compilers/roslyn { }; - - msbuild = callPackage ../development/tools/build-managers/msbuild { }; - - mosml = callPackage ../development/compilers/mosml { }; - mozart2 = callPackage ../development/compilers/mozart { emacs = emacs-nox; jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; - - muonlang = callPackage ../development/compilers/muonlang { }; - inherit (callPackages ../development/compilers/nim { }) nim-unwrapped nimble-unwrapped nim; nimPackages = recurseIntoAttrs nim.pkgs; - nrpl = callPackage ../development/tools/nrpl { }; - - nimlsp = callPackage ../development/tools/misc/nimlsp { }; - - neko = callPackage ../development/compilers/neko { }; - nextpnr = callPackage ../development/compilers/nextpnr { }; nextpnrWithGui = libsForQt5.callPackage ../development/compilers/nextpnr { @@ -15182,16 +6352,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenGL; }; - acme = callPackage ../development/compilers/acme { }; - - nasm = callPackage ../development/compilers/nasm { }; - - nasmfmt = callPackage ../development/tools/nasmfmt { }; - - nqc = callPackage ../development/compilers/nqc { }; - - nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - obliv-c = callPackage ../development/compilers/obliv-c { stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; @@ -15207,24 +6367,10 @@ with pkgs; ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1; - orc = callPackage ../development/compilers/orc { }; - - orocos-kdl = callPackage ../development/libraries/orocos-kdl { }; - - ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { }; - - ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - - ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - - ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; - opa = callPackage ../development/compilers/opa { ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; - opaline = callPackage ../development/tools/ocaml/opaline { }; - opam = callPackage ../development/tools/ocaml/opam { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -15232,43 +6378,18 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; - opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { }; - - opam2json = callPackage ../development/tools/ocaml/opam2json { }; - - wrapWatcom = callPackage ../development/compilers/open-watcom/wrapper.nix { }; - open-watcom-v2-unwrapped = callPackage ../development/compilers/open-watcom/v2.nix { }; open-watcom-v2 = wrapWatcom open-watcom-v2-unwrapped { }; - open-watcom-bin-unwrapped = callPackage ../development/compilers/open-watcom/bin.nix { }; open-watcom-bin = wrapWatcom open-watcom-bin-unwrapped { }; - passerine = callPackage ../development/compilers/passerine { }; - - pforth = callPackage ../development/compilers/pforth {}; - - picat = callPackage ../development/compilers/picat { }; - ponyc = callPackage ../development/compilers/ponyc { # Upstream pony has dropped support for versions compiled with gcc. stdenv = llvmPackages_9.stdenv; }; - blaze = callPackage ../development/libraries/blaze { }; - - pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { }; - - qbe = callPackage ../development/compilers/qbe { }; - - rasm = callPackage ../development/compilers/rasm { }; - replibyte = callPackage ../development/tools/database/replibyte { inherit (darwin.apple_sdk.frameworks) Security; }; - rgbds = callPackage ../development/compilers/rgbds { }; - - rml = callPackage ../development/compilers/rml { }; - composable_kernel = callPackage ../development/libraries/composable_kernel { inherit (llvmPackages_rocm) openmp clang-tools-extra; stdenv = rocmClangStdenv; @@ -15282,8 +6403,6 @@ with pkgs; stdenv = rocmClangStdenv; }; - rgxg = callPackage ../tools/text/rgxg { }; - rocclr = callPackage ../development/libraries/rocclr { stdenv = rocmClangStdenv; }; @@ -15402,7 +6521,6 @@ with pkgs; }; # Best just use GCC here - rdc = callPackage ../development/tools/misc/rdc { }; # Best just use GCC here rocgdb = callPackage ../development/tools/misc/rocgdb { @@ -15479,8 +6597,6 @@ with pkgs; useOpenCL = true; }; - rocmUpdateScript = callPackage ../development/rocm-modules/update-script { }; - # Requires GCC roctracer = callPackage ../development/libraries/roctracer { inherit (llvmPackages_rocm) clang; @@ -15498,8 +6614,6 @@ with pkgs; }; rust = rust_1_66; - mrustc = callPackage ../development/compilers/mrustc { }; - mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; openssl = openssl_1_1; @@ -15512,11 +6626,6 @@ with pkgs; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {}; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; - buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - - cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; - cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15530,52 +6639,33 @@ with pkgs; inherit (linuxPackages) perf; }; - defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; - - cargo-about = callPackage ../development/tools/rust/cargo-about { }; - cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; - cargo-apk = callPackage ../development/tools/rust/cargo-apk { }; cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-clone = callPackage ../development/tools/rust/cargo-clone { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; }; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deb = callPackage ../development/tools/rust/cargo-deb { }; - cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; - cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; - cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { }; - cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; - cargo-license = callPackage ../development/tools/rust/cargo-license { }; - cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { }; - cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; - cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-release = callPackage ../development/tools/rust/cargo-release { }; - cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15586,41 +6676,28 @@ with pkgs; cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { }; - cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; - cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { }; cargo-cache = callPackage ../development/tools/rust/cargo-cache { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-careful = callPackage ../development/tools/rust/cargo-careful { }; - cargo-chef = callPackage ../development/tools/rust/cargo-chef { }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; }; - cargo-cross = callPackage ../development/tools/rust/cargo-cross { }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { }; cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; }; - cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; - cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; - cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { }; - cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { inherit (darwin.apple_sdk.frameworks) AppKit; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; @@ -15631,52 +6708,33 @@ with pkgs; cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; - cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-play = callPackage ../development/tools/rust/cargo-play { }; - cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; - cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { }; - - cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { }; - cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; - cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; - cargo-tally = callPackage ../development/tools/rust/cargo-tally { }; - cargo-temp = callPackage ../development/tools/rust/cargo-temp { }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-ui = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-ui { }; - cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; - cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; - - cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-vet = callPackage ../development/tools/rust/cargo-vet { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15686,26 +6744,14 @@ with pkgs; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; }; - cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System; }; - cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; - cargo-generate = callPackage ../development/tools/rust/cargo-generate { }; - cargo-bootimage = callPackage ../development/tools/rust/bootimage { }; cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; - - cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { }; - - cauwugo = callPackage ../development/tools/rust/cauwugo { }; - - crate2nix = callPackage ../development/tools/rust/crate2nix { }; - convco = callPackage ../development/tools/convco { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15715,8 +6761,6 @@ with pkgs; openssl = openssl_1_1; }; - devspace = callPackage ../development/tools/misc/devspace { }; - maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15724,22 +6768,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - ograc = callPackage ../development/tools/rust/ograc { }; - - rhack = callPackage ../development/tools/rust/rhack { }; - roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { }; - rust-audit-info = callPackage ../development/tools/rust/rust-audit-info { }; - rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; - rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; }; - rust-script = callPackage ../development/tools/rust/rust-script { }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -15747,12 +6782,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - rusty-man = callPackage ../development/tools/rust/rusty-man { }; - typeshare = callPackage ../development/tools/rust/typeshare { }; - - sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; - sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl_2_0_8 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.8"; }; sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.9"; }; sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.1"; }; @@ -15768,13 +6798,10 @@ with pkgs; sbcl_2_3_0 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.0"; }; sbcl = sbcl_2_3_0; - roswell = callPackage ../development/tools/roswell { }; - scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; - scala_3 = callPackage ../development/compilers/scala { }; # deprecated dotty = scala_3; @@ -15786,40 +6813,20 @@ with pkgs; scalafix = callPackage ../development/tools/scalafix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - scalafmt = callPackage ../development/tools/scalafmt { }; - - scryer-prolog = callPackage ../development/compilers/scryer-prolog { }; sdcc = callPackage ../development/compilers/sdcc { gputils = null; }; - seren = callPackage ../applications/networking/instant-messengers/seren { }; - - serialdv = callPackage ../development/libraries/serialdv { }; - - serpent = callPackage ../development/compilers/serpent { }; - - shmig = callPackage ../development/tools/database/shmig { }; - - smlfmt = callPackage ../development/tools/smlfmt { }; - # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively - smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { inherit (darwin) Libsystem; }; - smlpkg = callPackage ../tools/package-management/smlpkg { }; - solc = callPackage ../development/compilers/solc { boost = boost172; }; - souffle = callPackage ../development/compilers/souffle { }; - - spasm-ng = callPackage ../development/compilers/spasm-ng { }; - spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; @@ -15828,30 +6835,14 @@ with pkgs; jdk = oraclejdk; }; - sqlfluff = callPackage ../development/tools/database/sqlfluff { }; - sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; }; - squeak = callPackage ../development/compilers/squeak { }; - squirrel-sql = callPackage ../development/tools/database/squirrel-sql { drivers = [ jtds_jdbc mssql_jdbc mysql_jdbc postgresql_jdbc ]; }; - stalin = callPackage ../development/compilers/stalin { }; - - stanc = callPackage ../development/compilers/stanc { }; - - metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; - - svd2rust = callPackage ../development/tools/rust/svd2rust { }; - - svdtools = callPackage ../development/embedded/svdtools { }; - - swift = callPackage ../development/compilers/swift { }; - swiProlog = callPackage ../development/compilers/swi-prolog { openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; @@ -15859,16 +6850,12 @@ with pkgs; }; swiPrologWithGui = swiProlog.override { withGui = true; }; - tbb = callPackage ../development/libraries/tbb { }; - terra = callPackage ../development/compilers/terra { llvmPackages = llvmPackages_11; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; - teyjus = callPackage ../development/compilers/teyjus { }; - thrust = callPackage ../development/tools/thrust { gconf = gnome2.GConf; }; @@ -15881,26 +6868,12 @@ with pkgs; wasi-libc = pkgsCross.wasi32.wasilibc; }; - tinyscheme = callPackage ../development/interpreters/tinyscheme { }; - inherit (nodePackages) typescript; - bupc = callPackage ../development/compilers/bupc { }; - - uasm = callPackage ../development/compilers/uasm { }; - - urn = callPackage ../development/compilers/urn { }; - urweb = callPackage ../development/compilers/urweb { icu = icu67; }; - urbackup-client = callPackage ../applications/backup/urbackup-client { }; - - vlang = callPackage ../development/compilers/vlang { }; - - vala-lint = callPackage ../development/tools/vala-lint { }; - inherit (callPackage ../development/compilers/vala { }) vala_0_48 vala_0_54 @@ -15909,10 +6882,6 @@ with pkgs; vyper = with python3Packages; toPythonApplication vyper; - wcc = callPackage ../development/compilers/wcc { }; - - wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = { cc , # This should be the only bintools runtime dep with this sort of logic. The @@ -15968,16 +6937,6 @@ with pkgs; yaml-language-server = nodePackages.yaml-language-server; # prolog - yap = callPackage ../development/compilers/yap { }; - - yasm = callPackage ../development/compilers/yasm { }; - - yosys = callPackage ../development/compilers/yosys { }; - yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { }; - yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { }; - yosys-symbiflow = callPackage ../development/compilers/yosys/plugins/symbiflow.nix { }; - - z88dk = callPackage ../development/compilers/z88dk { }; zulip = callPackage ../applications/networking/instant-messengers/zulip { # Bubblewrap breaks zulip, see https://github.com/NixOS/nixpkgs/pull/97264#issuecomment-704454645 @@ -15986,26 +6945,13 @@ with pkgs; }; }; - zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { }; - - zulu8 = callPackage ../development/compilers/zulu/8.nix { }; - zulu = callPackage ../development/compilers/zulu { }; - ### DEVELOPMENT / INTERPRETERS acl2 = callPackage ../development/interpreters/acl2 { }; acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; - angelscript = callPackage ../development/interpreters/angelscript {}; - - angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {}; - - babashka = callPackage ../development/interpreters/clojure/babashka.nix { }; - # BQN interpreters and compilers - mbqn = callPackage ../development/interpreters/bqn/mlochbaum-bqn { }; - cbqn = cbqn-bootstrap.phase2; cbqn-replxx = cbqn-bootstrap.phase2-replxx; cbqn-standalone = cbqn-bootstrap.phase0; @@ -16072,16 +7018,6 @@ with pkgs; jdk = graalvm11-ce; }; - chibi = callPackage ../development/interpreters/chibi { }; - - ceptre = callPackage ../development/interpreters/ceptre { }; - - cg3 = callPackage ../development/interpreters/cg3 { }; - - cling = callPackage ../development/interpreters/cling { }; - - clips = callPackage ../development/interpreters/clips { }; - cliscord = callPackage ../misc/cliscord { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -16093,8 +7029,6 @@ with pkgs; readline = readline63; }; - clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; - clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { jre = jre8; }; @@ -16104,10 +7038,6 @@ with pkgs; jdk = jdk17; }; - clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; - - clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall; dhall-bash = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-bash; @@ -16124,8 +7054,6 @@ with pkgs; dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); - duktape = callPackage ../development/interpreters/duktape { }; - duckscript = callPackage ../development/tools/rust/duckscript { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -16168,10 +7096,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - graphqlmap = callPackage ../tools/security/graphqlmap { }; - - groovy = callPackage ../development/interpreters/groovy { }; - inherit (callPackages ../applications/networking/cluster/hadoop { openssl = openssl_1_1; }) @@ -16181,10 +7105,6 @@ with pkgs; hadoop3 = hadoop_3_3; hadoop = hadoop3; - hashlink = callPackage ../development/interpreters/hashlink { }; - - io = callPackage ../development/interpreters/io { }; - ivy = callPackage ../development/interpreters/ivy { buildGoModule = buildGo118Module; # tests fail with 1.19 }; @@ -16195,35 +7115,7 @@ with pkgs; jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda; - janet = callPackage ../development/interpreters/janet {}; - - jpm = callPackage ../development/interpreters/janet/jpm.nix {}; - - jelly = callPackage ../development/interpreters/jelly {}; - - jimtcl = callPackage ../development/interpreters/jimtcl {}; - - jmeter = callPackage ../applications/networking/jmeter {}; - - joker = callPackage ../development/interpreters/joker {}; - - davmail = callPackage ../applications/networking/davmail {}; - - kanif = callPackage ../applications/networking/cluster/kanif { }; - - kona = callPackage ../development/interpreters/kona {}; - - konf = callPackage ../development/tools/konf { }; - - lolcode = callPackage ../development/interpreters/lolcode { }; - - love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love_11 = callPackage ../development/interpreters/love/11.nix { }; - love = love_0_10; - - wabt = callPackage ../development/tools/wabt { }; - - zuo = callPackage ../development/interpreters/zuo { }; + love = love_0_10; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; @@ -16245,8 +7137,6 @@ with pkgs; luarocks = luaPackages.luarocks; luarocks-nix = luaPackages.luarocks-nix; - luau = callPackage ../development/interpreters/luau { }; - toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( }; @@ -16264,26 +7154,6 @@ with pkgs; stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; - me_cleaner = callPackage ../tools/misc/me_cleaner { }; - - mesos-dns = callPackage ../servers/mesos-dns { }; - - metamath = callPackage ../development/interpreters/metamath { }; - - minder = callPackage ../applications/misc/minder { }; - - mujs = callPackage ../development/interpreters/mujs { }; - - nelua = callPackage ../development/interpreters/nelua { }; - - nextflow = callPackage ../development/interpreters/nextflow { }; - - ngn-k = callPackage ../development/interpreters/ngn-k { }; - - oak = callPackage ../development/interpreters/oak { }; - - obb = callPackage ../development/interpreters/clojure/obb.nix { }; - octave = callPackage ../development/interpreters/octave { python = python3; mkDerivation = stdenv.mkDerivation; @@ -16294,12 +7164,8 @@ with pkgs; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; }; - octave-kernel = callPackage ../applications/editors/jupyter-kernels/octave { }; - octavePackages = recurseIntoAttrs octave.pkgs; - pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - # PHP interpreters, packages and extensions. # @@ -16339,14 +7205,6 @@ with pkgs; php80Packages = recurseIntoAttrs php80.packages; - picoc = callPackage ../development/interpreters/picoc {}; - - picolisp = callPackage ../development/interpreters/picolisp {}; - - polyml = callPackage ../development/compilers/polyml { }; - polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; - polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; - # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md @@ -16424,50 +7282,22 @@ with pkgs; pypy38Packages = pypy38.pkgs; pypy39Packages = pypy39.pkgs; - py3c = callPackage ../development/libraries/py3c { }; - - pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { }; - - pythonCondaPackages = callPackage ./../development/interpreters/python/conda { }; - - update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; - # Should eventually be moved inside Python interpreters. python-setup-hook = buildPackages.callPackage ../development/interpreters/python/setup-hook.nix { }; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); - check-jsonschema = callPackage ../development/tools/check-jsonschema {}; - - pypi2nix = callPackage ../development/tools/pypi2nix {}; - - pypi-mirror = callPackage ../development/tools/pypi-mirror {}; - setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; # These pyside tools do not provide any Python modules and are meant to be here. # See ../development/python-modules/pyside for details. - pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; - pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; svg2tikz = with python3.pkgs; toPythonApplication svg2tikz; - svg2pdf = callPackage ../tools/graphics/svg2pdf { }; - - pew = callPackage ../development/tools/pew {}; - - poetry = callPackage ../tools/package-management/poetry { }; - poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { inherit pkgs lib; }; - poetry2conda = callPackage ../tools/package-management/poetry2conda { }; - - pip-audit = callPackage ../development/tools/pip-audit {}; - - pipenv = callPackage ../development/tools/pipenv {}; - pipx = with python3.pkgs; toPythonApplication pipx; pipewire = callPackage ../development/libraries/pipewire { @@ -16480,11 +7310,6 @@ with pkgs; pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; - pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; - wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; - - pyradio = callPackage ../applications/audio/pyradio {}; - racket = callPackage ../development/interpreters/racket { # racket 6.11 doesn't build with gcc6 + recent glibc: # https://github.com/racket/racket/pull/1886 @@ -16496,24 +7321,10 @@ with pkgs; stdenv = if stdenv.isDarwin then stdenv else gcc7Stdenv; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; - rakudo = callPackage ../development/interpreters/rakudo {}; moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; - nqp = callPackage ../development/interpreters/rakudo/nqp.nix { }; - zef = callPackage ../development/interpreters/rakudo/zef.nix { }; - - rascal = callPackage ../development/interpreters/rascal { }; - - red = callPackage ../development/interpreters/red { }; - - regexploit = callPackage ../tools/security/regexploit { }; - - regextester = callPackage ../applications/misc/regextester { }; - - regina = callPackage ../development/interpreters/regina { }; inherit (ocamlPackages) reason; @@ -16524,18 +7335,11 @@ with pkgs; inherit (darwin) DarwinTools cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bundix = callPackage ../development/ruby-modules/bundix { }; - bundler = callPackage ../development/ruby-modules/bundler { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - bundlerUpdateScript = callPackage ../development/ruby-modules/bundler-update-script { }; - - bundler-audit = callPackage ../tools/security/bundler-audit { }; solargraph = rubyPackages.solargraph; - rbenv = callPackage ../development/ruby-modules/rbenv { }; - inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -16553,18 +7357,8 @@ with pkgs; rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; - mruby = callPackage ../development/compilers/mruby { }; - - scsh = callPackage ../development/interpreters/scsh { }; - - scheme48 = callPackage ../development/interpreters/scheme48 { }; - - scheme-bytestructures = callPackage ../development/scheme-modules/scheme-bytestructures { }; - self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - smiley-sans = callPackage ../data/fonts/smiley-sans { }; - inherit (callPackages ../applications/networking/cluster/spark { }) spark_3_2 spark_3_1 @@ -16573,10 +7367,6 @@ with pkgs; spark2 = spark_2_4; spark = spark3; - sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - - spark2014 = callPackage ../development/libraries/ada/spark2014 { }; - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { inherit (darwin) libobjc; }; @@ -16587,11 +7377,6 @@ with pkgs; inherit (darwin) libobjc; }; - ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; - ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - - starlark = callPackage ../development/interpreters/starlark { }; - supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -16612,55 +7397,25 @@ with pkgs; plugins = with supercolliderPlugins; [ sc3-plugins ]; }; - taktuk = callPackage ../applications/networking/cluster/taktuk { }; - tcl = tcl-8_6; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - tclreadline = callPackage ../development/interpreters/tclreadline { }; - - eltclsh = callPackage ../development/tools/eltclsh { }; - - trealla = callPackage ../development/interpreters/trealla { }; - - waagent = callPackage ../applications/networking/cluster/waagent { }; - wapm-cli = callPackage ../tools/package-management/wapm/cli { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; wasm = ocamlPackages.wasm; - wasm3 = callPackage ../development/interpreters/wasm3 { }; - - yex-lang = callPackage ../development/interpreters/yex-lang { }; - ### DEVELOPMENT / MISC - h3 = callPackage ../development/misc/h3 { }; - - amtk = callPackage ../development/libraries/amtk { }; - avrlibc = callPackage ../development/misc/avr/libc {}; avrlibcCross = callPackage ../development/misc/avr/libc { stdenv = crossLibcStdenv; }; - avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - - cppreference-doc = callPackage ../development/misc/cppreference-doc { }; - - sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; - jruby = callPackage ../development/interpreters/jruby { }; - jython = callPackage ../development/interpreters/jython {}; - - gImageReader = callPackage ../applications/misc/gImageReader { }; - - guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - # Needed for autogen guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; @@ -16670,105 +7425,31 @@ with pkgs; guile = guile_2_2; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; - - guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; - - guile-config = callPackage ../development/guile-modules/guile-config { }; - - guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; - - guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { }; - - guile-git = callPackage ../development/guile-modules/guile-git { }; - - guile-json = callPackage ../development/guile-modules/guile-json { }; - - guile-lib = callPackage ../development/guile-modules/guile-lib { }; - - guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; - - guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; - - guile-reader = callPackage ../development/guile-modules/guile-reader { }; - - guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; - - guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; - - guile-sqlite3 = callPackage ../development/guile-modules/guile-sqlite3 { }; - - guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; - guile-xcb = callPackage ../development/guile-modules/guile-xcb { guile = guile_2_0; }; - inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { }; - - infracost = callPackage ../tools/misc/infracost { }; - - msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; - msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { newlib = newlibCross; }; - mspds = callPackage ../development/misc/msp430/mspds { }; - mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { }; - - mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; - - vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - - or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; - - rappel = callPackage ../development/misc/rappel { }; - pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; pharo-spur32 = pharo-vms.spur32; pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; - pharo-launcher = callPackage ../development/pharo/launcher { }; - - protege-distribution = callPackage ../development/web/protege-distribution { }; umr = callPackage ../development/misc/umr { llvmPackages = llvmPackages_latest; }; - refurb = callPackage ../development/tools/refurb { }; - - srandrd = callPackage ../tools/X11/srandrd { }; - - sratoolkit = callPackage ../applications/science/biology/sratoolkit { }; - - srecord = callPackage ../development/tools/misc/srecord { }; - - srelay = callPackage ../tools/networking/srelay { }; - xidel = callPackage ../tools/text/xidel { openssl = openssl_1_1; }; - asdf-vm = callPackage ../tools/misc/asdf-vm { }; - ### DEVELOPMENT / TOOLS - abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { }; - - abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; - - abuild = callPackage ../development/tools/abuild { }; - - actionlint = callPackage ../development/tools/analysis/actionlint { }; - - adreaper = callPackage ../tools/security/adreaper { }; - - adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }) @@ -16776,20 +7457,8 @@ with pkgs; alloy6 alloy; - altair = callPackage ../development/tools/altair-graphql-client { }; - - ameba = callPackage ../development/tools/ameba { }; - anybadge = with python3Packages; toPythonApplication anybadge; - apgdiff = callPackage ../development/tools/database/apgdiff { }; - - apkg = callPackage ../tools/package-management/apkg { }; - - augeas = callPackage ../tools/system/augeas { }; - - autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_14; ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core; ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { @@ -16812,12 +7481,6 @@ with pkgs; ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS - ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { }; - - beancount-language-server = callPackage ../development/tools/language-servers/beancount-language-server { }; - - buf-language-server = callPackage ../development/tools/language-servers/buf-language-server { }; - ccls = callPackage ../development/tools/language-servers/ccls { llvmPackages = llvmPackages_latest; }; @@ -16826,39 +7489,14 @@ with pkgs; fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { }; - gopls = callPackage ../development/tools/language-servers/gopls { }; - - jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { }; - - jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { }; - - kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { }; - - metals = callPackage ../development/tools/language-servers/metals { }; - - millet = callPackage ../development/tools/language-servers/millet { }; - - nil = callPackage ../development/tools/language-servers/nil { }; - - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; - sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/sumneko-lua-language-server { inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; }; - svls = callPackage ../development/tools/language-servers/svls { }; - - vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { }; - - verible = callPackage ../development/tools/language-servers/verible { }; - ansible-later = with python3.pkgs; toPythonApplication ansible-later; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; antlr3 = antlr3_5; inherit (callPackages ../development/tools/parsing/antlr/4.nix { }) @@ -16871,8 +7509,6 @@ with pkgs; antlr = antlr4; - apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; apacheKafka = apacheKafka_3_3; @@ -16882,24 +7518,8 @@ with pkgs; apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; - kt = callPackage ../tools/misc/kt {}; - - argbash = callPackage ../development/tools/misc/argbash {}; - - arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; - - arpa2common = callPackage ../development/libraries/arpa2common { }; - asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder {}; - astyle = callPackage ../development/tools/misc/astyle { }; - - automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { }; - - aviator = callPackage ../development/tools/misc/aviator { }; - - awf = callPackage ../development/tools/misc/awf { }; - aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) @@ -16919,21 +7539,8 @@ with pkgs; electron_21 electron_22; - autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = autoconf271; - autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; - - autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; - autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; - autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; - autoconf271 = callPackage ../development/tools/misc/autoconf { }; - - acr = callPackage ../development/tools/misc/acr { }; - - autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = automake116x; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -16942,14 +7549,6 @@ with pkgs; automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; - avrdude = callPackage ../development/embedded/avrdude { }; - - b4 = callPackage ../development/tools/b4 { }; - - babeltrace = callPackage ../development/tools/misc/babeltrace { }; - - bam = callPackage ../development/tools/build-managers/bam {}; - bazel = bazel_3; bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { @@ -16992,33 +7591,20 @@ with pkgs; bazel_self = bazel_6; }; - bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { go = go_1_18; }; - bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; - - bazel-kazel = callPackage ../development/tools/bazel-kazel { }; - - bazelisk = callPackage ../development/tools/bazelisk { }; - rebazel = callPackage ../development/tools/rebazel { inherit (darwin.apple_sdk.frameworks) CoreServices; }; buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { }; - - bingrep = callPackage ../development/tools/analysis/bingrep { }; - binutils-unwrapped = callPackage ../development/tools/misc/binutils { autoreconfHook = autoreconfHook269; # FHS sys dirs presumably only have stuff for the build platform @@ -17102,34 +7688,14 @@ with pkgs; wrapGas = true; }; - bison = callPackage ../development/tools/parsing/bison { }; - - bisoncpp = callPackage ../development/tools/parsing/bisonc++ { }; - black = with python3Packages; toPythonApplication black; - blackfire = callPackage ../development/tools/misc/blackfire { }; - black-macchiato = with python3Packages; toPythonApplication black-macchiato; - blackmagic = callPackage ../development/embedded/blackmagic { }; - - bloaty = callPackage ../development/tools/bloaty { }; - - bloomrpc = callPackage ../development/web/bloomrpc { }; - - bloop = callPackage ../development/tools/build-managers/bloop { }; - bossa = callPackage ../development/embedded/bossa { wxGTK = wxGTK30; }; - bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { }; - - bob = callPackage ../development/tools/build-managers/bob { }; - - buck = callPackage ../development/tools/build-managers/buck { }; - build2 = callPackage ../development/tools/build-managers/build2 { # Break cycle by using self-contained toolchain for bootstrapping build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { }; @@ -17140,36 +7706,16 @@ with pkgs; build2 = build2.bootstrap; }; - libbpkg = callPackage ../development/libraries/libbpkg { }; - libodb = callPackage ../development/libraries/libodb { }; - libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { }; - bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - bore-cli = callPackage ../tools/networking/bore-cli/default.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; - - buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; - - buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; - buildkite-test-collector-rust = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust { inherit (darwin.apple_sdk.frameworks) Security; }; - bump = callPackage ../development/tools/github/bump { }; - - libbpf = callPackage ../os-specific/linux/libbpf { }; - libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { }; - bundlewrap = with python3.pkgs; toPythonApplication bundlewrap; - bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../os-specific/linux/bcc { python = python3; llvmPackages = llvmPackages_14; @@ -17179,18 +7725,6 @@ with pkgs; llvmPackages = llvmPackages_14; }; - bpm-tools = callPackage ../tools/audio/bpm-tools { }; - - byacc = callPackage ../development/tools/parsing/byacc { }; - - cadre = callPackage ../development/tools/cadre { }; - - cbrowser = callPackage ../development/tools/misc/cbrowser { }; - - cc-tool = callPackage ../development/embedded/cc-tool { }; - - ccache = callPackage ../development/tools/misc/ccache { }; - # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: # replaceStdenv = { pkgs }: pkgs.ccacheStdenv; @@ -17231,76 +7765,16 @@ with pkgs; inherit stdenv; }); - cccc = callPackage ../development/tools/analysis/cccc { }; - - cgdb = callPackage ../development/tools/misc/cgdb { }; - - cheat = callPackage ../applications/misc/cheat { }; - - chefdk = callPackage ../development/tools/chefdk { }; - - matter-compiler = callPackage ../development/compilers/matter-compiler {}; - - cfr = callPackage ../development/tools/java/cfr { }; - - cfripper = callPackage ../tools/security/cfripper { }; - - checkra1n = callPackage ../development/mobile/checkra1n { }; - - checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { }; - chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { }; - - chrpath = callPackage ../development/tools/misc/chrpath { }; - chruby = callPackage ../development/tools/misc/chruby { rubies = null; }; - chruby-fish = callPackage ../development/tools/misc/chruby-fish { }; - - cl-launch = callPackage ../development/tools/misc/cl-launch {}; - - cloud-nuke = callPackage ../development/tools/cloud-nuke { }; - cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; - cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { }; - - cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; - - clpm = callPackage ../development/tools/clpm {}; - - coan = callPackage ../development/tools/analysis/coan { }; - - coder = callPackage ../development/tools/coder { }; - - compile-daemon = callPackage ../development/tools/compile-daemon { }; - - complexity = callPackage ../development/tools/misc/complexity { }; - - conan = callPackage ../development/tools/build-managers/conan { }; - cookiecutter = with python3Packages; toPythonApplication cookiecutter; - corrosion = callPackage ../development/tools/build-managers/corrosion { }; - - corundum = callPackage ../development/tools/corundum { }; - - confluencepot = callPackage ../servers/confluencepot {}; - - confluent-platform = callPackage ../servers/confluent-platform {}; - - ctags = callPackage ../development/tools/misc/ctags { }; - - ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; - - ctodo = callPackage ../applications/misc/ctodo { }; - cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { }; - ctmg = callPackage ../tools/security/ctmg { }; - cmake = callPackage ../development/tools/build-managers/cmake { }; # can't use override - it triggers infinite recursion @@ -17318,8 +7792,6 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cobra-cli = callPackage ../development/tools/cobra-cli { }; - cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server { inherit cmake cmake-format; }; @@ -17327,56 +7799,26 @@ with pkgs; # Does not actually depend on Qt 5 inherit (plasma5Packages) extra-cmake-modules; - coccinelle = callPackage ../development/tools/misc/coccinelle { }; - - cpptest = callPackage ../development/libraries/cpptest { }; - - cppi = callPackage ../development/tools/misc/cppi { }; - - cproto = callPackage ../development/tools/misc/cproto { }; - - cflow = callPackage ../development/tools/misc/cflow { }; - - cov-build = callPackage ../development/tools/analysis/cov-build {}; - - cppcheck = callPackage ../development/tools/analysis/cppcheck { }; - - cpplint = callPackage ../development/tools/analysis/cpplint { }; - credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { inherit (llvmPackages_8) llvm libclang; }; - cscope = callPackage ../development/tools/misc/cscope { }; - - csmith = callPackage ../development/tools/misc/csmith { }; - - csslint = callPackage ../development/web/csslint { }; - css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; - cvehound = callPackage ../development/tools/analysis/cvehound { }; - cvise = python3Packages.callPackage ../development/tools/misc/cvise { # cvise keeps up with fresh llvm releases and supports wide version range inherit (llvmPackages_latest) llvm libclang; }; - cwltool = callPackage ../applications/science/misc/cwltool { }; - dprint = callPackage ../development/tools/dprint { inherit (darwin.apple_sdk.frameworks) Security; }; - devbox = callPackage ../development/tools/devbox { }; - libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; - librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = callPackage ../development/libraries/gcc/libgcc { stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems }; @@ -17389,44 +7831,10 @@ with pkgs; then targetPackages.stdenv.cc.cc else gcc.cc; - libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; - libsigrok = callPackage ../development/tools/libsigrok { python = python3; }; - libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; - - sqlcl = callPackage ../development/tools/database/sqlcl { }; - - sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; - - cli11 = callPackage ../development/tools/misc/cli11 { }; - - datree = callPackage ../development/tools/datree { }; - - dcadec = callPackage ../development/tools/dcadec { }; - - dejagnu = callPackage ../development/tools/misc/dejagnu { }; - - devd = callPackage ../development/tools/devd { }; - - devtodo = callPackage ../development/tools/devtodo { }; - - dfeet = callPackage ../development/tools/misc/d-feet { }; - - d-spy = callPackage ../development/tools/misc/d-spy { }; - - dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; - - dfu-util = callPackage ../development/tools/misc/dfu-util { }; - - ddd = callPackage ../development/tools/misc/ddd { }; - - lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { }; - - direvent = callPackage ../development/tools/misc/direvent { }; - distcc = callPackage ../development/tools/misc/distcc { libiberty_static = libiberty.override { staticBuild = true; }; }; @@ -17455,22 +7863,14 @@ with pkgs; binutils = binutils; }; - dive = callPackage ../development/tools/dive { }; - dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = with python3Packages; toPythonApplication docutils; - doctl = callPackage ../development/tools/doctl { }; - doit = with python3Packages; toPythonApplication doit; - dolt = callPackage ../servers/sql/dolt { }; - dot2tex = with python3.pkgs; toPythonApplication dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { @@ -17480,133 +7880,33 @@ with pkgs; doxygen_gui = lowPrio (doxygen.override { inherit qt5; }); - drake = callPackage ../development/tools/build-managers/drake { }; - - drip = callPackage ../development/tools/drip { }; - - drm_info = callPackage ../development/tools/drm_info { }; - - drush = callPackage ../development/tools/misc/drush { }; - dura = callPackage ../development/tools/misc/dura { inherit (darwin.apple_sdk.frameworks) Security; }; - dwfv = callPackage ../applications/science/electronics/dwfv { }; + edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - dwz = callPackage ../development/tools/misc/dwz { }; + # NOTE: Override and set useIcon = false to use Awk instead of Icon. - easypdkprog = callPackage ../development/embedded/easypdkprog { }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { + tex = texlive.combined.scheme-medium; + }; - eclint = callPackage ../development/tools/eclint { }; - - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; - - editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; - - edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - - eggdbus = callPackage ../development/tools/misc/eggdbus { }; - - effitask = callPackage ../applications/misc/effitask { }; - - efm-langserver = callPackage ../development/tools/efm-langserver { }; - - egypt = callPackage ../development/tools/analysis/egypt { }; - - electron-fiddle = callPackage ../development/tools/electron-fiddle { }; - - elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs { }; - - elfinfo = callPackage ../development/tools/misc/elfinfo { }; - - elfkickers = callPackage ../development/tools/misc/elfkickers { }; - - elfutils = callPackage ../development/tools/misc/elfutils { }; - - eliot-tree = callPackage ../development/tools/eliot-tree { }; - - emma = callPackage ../development/tools/analysis/emma { }; - - ent-go = callPackage ../development/tools/ent { }; - - epm = callPackage ../development/tools/misc/epm { }; - - eresi = callPackage ../development/tools/analysis/eresi { }; - - evmdis = callPackage ../development/tools/analysis/evmdis { }; - - eweb = callPackage ../development/tools/literate-programming/eweb { }; - - explain = callPackage ../development/tools/explain { }; - - func = callPackage ../applications/networking/cluster/func { }; - - funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - - license_finder = callPackage ../development/tools/license_finder { }; - - Literate = callPackage ../development/tools/literate-programming/Literate { }; - - md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; - - # NOTE: Override and set useIcon = false to use Awk instead of Icon. - noweb = callPackage ../development/tools/literate-programming/noweb { }; - - nuweb = callPackage ../development/tools/literate-programming/nuweb { - tex = texlive.combined.scheme-medium; - }; - - eztrace = callPackage ../development/tools/profiling/EZTrace { }; - - faas-cli = callPackage ../development/tools/faas-cli { }; - - fastddsgen = callPackage ../development/tools/fastddsgen { }; - - findbugs = callPackage ../development/tools/analysis/findbugs { }; - - findnewest = callPackage ../development/tools/misc/findnewest { }; - - flootty = callPackage ../development/tools/flootty { }; - - fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); - - ffuf = callPackage ../tools/security/ffuf { }; + fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fly = callPackage ../development/tools/continuous-integration/fly { }; - - foreman = callPackage ../tools/system/foreman { }; - goreman = callPackage ../tools/system/goreman { }; - - fprettify = callPackage ../development/tools/fprettify { }; - - framac = callPackage ../development/tools/analysis/frama-c { }; - - frame = callPackage ../development/libraries/frame { }; - - framesh = callPackage ../applications/blockchains/framesh { }; - - frp = callPackage ../tools/networking/frp { }; - - fsatrace = callPackage ../development/tools/misc/fsatrace { }; - fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; autoreconfHook = buildPackages.autoreconfHook269; }; - fsearch = callPackage ../tools/misc/fsearch { }; - fujprog = callPackage ../development/embedded/fpga/fujprog { inherit (darwin.apple_sdk.frameworks) IOKit; }; - fundoc = callPackage ../development/tools/fundoc { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -17615,29 +7915,10 @@ with pkgs; openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - pmdk = callPackage ../development/libraries/pmdk { }; - jdepend = callPackage ../development/tools/analysis/jdepend { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; - flex = callPackage ../development/tools/parsing/flex { }; - - flexibee = callPackage ../applications/office/flexibee { }; - - flexcpp = callPackage ../development/tools/parsing/flexc++ { }; - - geis = callPackage ../development/libraries/geis { }; - - gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; - - git2-cpp = callPackage ../development/libraries/git2-cpp { }; - - github-release = callPackage ../development/tools/github/github-release { }; - - global = callPackage ../development/tools/misc/global { }; - gnatcoll-db2ada = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "gnatcoll_db2ada"; }; @@ -17646,54 +7927,8 @@ with pkgs; component = "gnatinspect"; }; - gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; - - gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; - - gnome-firmware = callPackage ../applications/misc/gnome-firmware {}; - - gnome-usage = callPackage ../applications/misc/gnome-usage {}; - - gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; - - gnome-latex = callPackage ../applications/editors/gnome-latex { }; - - gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; - - gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; - - gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; - - gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { }; - - gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = gnum4; - om4 = callPackage ../development/tools/misc/om4 { }; - - gnumake = callPackage ../development/tools/build-managers/gnumake { }; - gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - - gob2 = callPackage ../development/tools/misc/gob2 { }; - - gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { }; - - gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - - goredo = callPackage ../development/tools/build-managers/goredo { }; - - gotify-server = callPackage ../servers/gotify { }; - - gotty = callPackage ../servers/gotty { }; - - gprbuild-boot = callPackage ../development/tools/build-managers/gprbuild/boot.nix { }; - - gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; - - gputils = callPackage ../development/embedded/gputils { }; - - gpuvis = callPackage ../development/tools/misc/gpuvis { }; - gradle-packages = import ../development/tools/build-managers/gradle { inherit jdk8 jdk11 jdk17; }; @@ -17702,32 +7937,10 @@ with pkgs; gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle = gradle_7; - grcov = callPackage ../development/tools/misc/grcov { }; - - gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. - gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { }; - - grail = callPackage ../development/libraries/grail { }; - - graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; - - graphene = callPackage ../development/libraries/graphene { }; griffe = with python3Packages; toPythonApplication griffe; - gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; - - gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; - - crowdin-cli = callPackage ../tools/text/crowdin-cli { }; - - gtranslator = callPackage ../tools/text/gtranslator { }; - - guff = callPackage ../tools/graphics/guff { }; - - guile-hall = callPackage ../development/tools/guile/guile-hall { }; - guile-lint = callPackage ../development/tools/guile/guile-lint { guile = guile_1_8; }; @@ -17738,62 +7951,16 @@ with pkgs; hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; - halfempty = callPackage ../development/tools/halfempty {}; - - hcloud = callPackage ../development/tools/hcloud { }; - - hclfmt = callPackage ../development/tools/hclfmt { }; - - help2man = callPackage ../development/tools/misc/help2man { }; - - heroku = callPackage ../development/tools/heroku { }; - - highlight-assertions = callPackage ../development/tools/misc/highlight-assertions { }; - - ccloud-cli = callPackage ../development/tools/ccloud-cli { }; - - confluent-cli = callPackage ../development/tools/confluent-cli { }; - - htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; - - hyenae = callPackage ../tools/networking/hyenae { }; - - iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { }; - iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { }; iaca = iaca_3_0; - icestorm = callPackage ../development/embedded/fpga/icestorm { }; - - icmake = callPackage ../development/tools/build-managers/icmake { }; - - iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { }; - ikos = callPackage ../development/tools/analysis/ikos { inherit (llvmPackages_9) stdenv clang llvm; }; - img = callPackage ../development/tools/img { }; - include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { llvmPackages = llvmPackages_14; }; - indent = callPackage ../development/tools/misc/indent { }; - - inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; - - intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { }; - - insomnia = callPackage ../development/web/insomnia { }; - - ihp-new = callPackage ../development/web/ihp-new { }; - - iozone = callPackage ../development/tools/misc/iozone { }; - - itstool = callPackage ../development/tools/misc/itstool { }; - - jacoco = callPackage ../development/tools/analysis/jacoco { }; - inherit (callPackage ../development/tools/build-managers/jam { }) jam ftjam; @@ -17805,191 +7972,45 @@ with pkgs; jre = jre8; }; - jbake = callPackage ../development/tools/jbake { }; - - jbang = callPackage ../development/tools/jbang { }; - - jikespg = callPackage ../development/tools/parsing/jikespg { }; - - jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; - jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; - jpexs = callPackage ../development/tools/jpexs { }; - - k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; - - k2tf = callPackage ../development/tools/misc/k2tf { }; - - kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { }; - - kamid = callPackage ../servers/ftp/kamid { }; - - karate = callPackage ../development/tools/karate { }; - - kati = callPackage ../development/tools/build-managers/kati { }; - - kafkactl = callPackage ../development/tools/kafkactl { }; - - kcat = callPackage ../development/tools/kcat { }; - kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; }; - kcgi = callPackage ../development/web/kcgi { }; - - kcov = callPackage ../development/tools/analysis/kcov { }; - - kind = callPackage ../development/tools/kind { }; - - khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; - - ko = callPackage ../development/tools/ko { }; - - konstraint = callPackage ../development/tools/konstraint { }; - - krankerl = callPackage ../development/tools/krankerl { }; - - krew = callPackage ../development/tools/krew { }; - - kube-bench = callPackage ../tools/security/kube-bench { }; - - kube-hunter = callPackage ../tools/security/kube-hunter { }; - - kubeaudit = callPackage ../tools/security/kubeaudit { }; - - kubectx = callPackage ../development/tools/kubectx { }; - - kube-linter = callPackage ../development/tools/kube-linter { }; - - kube-prompt = callPackage ../development/tools/kube-prompt { }; - - kubei = callPackage ../tools/security/kubei { }; - - kubemq-community = callPackage ../servers/kubemq-community { }; - - kubeone = callPackage ../applications/networking/cluster/kubeone { }; - - kubeprompt = callPackage ../development/tools/kubeprompt { }; - - kubescape = callPackage ../tools/security/kubescape { }; - - kubesec = callPackage ../tools/security/kubesec { }; - - kubespy = callPackage ../applications/networking/cluster/kubespy { }; - - kubeswitch = callPackage ../development/tools/kubeswitch { }; - kubie = callPackage ../development/tools/kubie { inherit (darwin.apple_sdk.frameworks) Security; }; - kustomize = callPackage ../development/tools/kustomize { }; - - kustomize_3 = callPackage ../development/tools/kustomize/3.nix { }; - - kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { }; - - ktlint = callPackage ../development/tools/ktlint { }; - - kythe = callPackage ../development/tools/kythe { }; - - lazygit = callPackage ../development/tools/lazygit { }; - - laminar = callPackage ../development/tools/continuous-integration/laminar { }; - - lcov = callPackage ../development/tools/analysis/lcov { }; - - leiningen = callPackage ../development/tools/build-managers/leiningen { }; - - lemon = callPackage ../development/tools/parsing/lemon { }; - - lenmus = callPackage ../applications/misc/lenmus { }; - - lightningcss = callPackage ../development/tools/lightningcss { }; - libtool = libtool_2; - libtool_1_5 = callPackage ../development/tools/misc/libtool { }; - - libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; - - libwhich = callPackage ../development/tools/misc/libwhich { }; - linuxkit = callPackage ../development/tools/misc/linuxkit { inherit (darwin.apple_sdk_11_0.frameworks) Virtualization; }; - lit = callPackage ../development/tools/misc/lit { }; - - litecli = callPackage ../development/tools/database/litecli {}; - - litefs = callPackage ../development/tools/database/litefs {}; - - litestream = callPackage ../development/tools/database/litestream {}; - - lsof = callPackage ../development/tools/misc/lsof { }; - - ltrace = callPackage ../development/tools/misc/ltrace { }; - - lttng-tools = callPackage ../development/tools/misc/lttng-tools { }; - lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { }; - lttv = callPackage ../development/tools/misc/lttv { }; - luaformatter = callPackage ../development/tools/luaformatter (lib.optionalAttrs (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "9") { stdenv = overrideCC stdenv llvmPackages_9.clang; }); - lurk = callPackage ../development/tools/lurk { }; - - malt = callPackage ../development/tools/profiling/malt {}; - - marksman = callPackage ../development/tools/marksman { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; - mastodon-archive = callPackage ../tools/backup/mastodon-archive { }; - maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; - go-md2man = callPackage ../development/tools/misc/go-md2man {}; - - mage = callPackage ../development/tools/build-managers/mage { }; - - mbed-cli = callPackage ../development/tools/mbed-cli { }; - - mdl = callPackage ../development/tools/misc/mdl { }; - - python-language-server = callPackage ../development/dotnet-modules/python-language-server { }; - python-matter-server = with python3Packages; toPythonApplication python-matter-server; - minify = callPackage ../development/web/minify { }; - - minizinc = callPackage ../development/tools/minizinc { }; minizincide = libsForQt5.callPackage ../development/tools/minizinc/ide.nix { }; - mkcert = callPackage ../development/tools/misc/mkcert { }; - mkdocs = with python3Packages; toPythonApplication mkdocs; - mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; - - mockgen = callPackage ../development/tools/mockgen { }; - - modd = callPackage ../development/tools/modd { }; - mold = callPackage ../development/tools/mold { # C++20 is required, aarch64-linux has gcc 9 by default stdenv = if stdenv.isLinux && stdenv.isAarch64 @@ -17997,12 +8018,6 @@ with pkgs; else llvmPackages.stdenv; }; - msgpack-tools = callPackage ../development/tools/msgpack-tools { }; - - msgpuck = callPackage ../development/libraries/msgpuck { }; - - msitools = callPackage ../development/tools/misc/msitools { }; - haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; neoload = callPackage ../development/tools/neoload { @@ -18014,14 +8029,6 @@ with pkgs; }; }; - nailgun = callPackage ../development/tools/nailgun { }; - - nap = callPackage ../development/tools/nap { }; - - nex = callPackage ../development/tools/parsing/nex {}; - - ninja = callPackage ../development/tools/build-managers/ninja { }; - nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; gn = callPackage ../development/tools/build-managers/gn { }; @@ -18031,40 +8038,18 @@ with pkgs; pythonPackages = python3Packages; }; - nix-bisect = callPackage ../development/tools/misc/nix-bisect { }; - - nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { jre_headless = jre8_headless; }; - nmrpflash = callPackage ../development/embedded/nmrpflash { }; - - norminette = callPackage ../development/tools/norminette { }; - nwjs = callPackage ../development/tools/nwjs { }; nwjs-sdk = callPackage ../development/tools/nwjs { sdk = true; }; - nrf-command-line-tools = callPackage ../development/tools/misc/nrf-command-line-tools { }; - - nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { }; - - nrfconnect = callPackage ../tools/bluetooth/nrfconnect { }; - - nrfutil = callPackage ../development/tools/misc/nrfutil { }; - obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; }; - obuild = callPackage ../development/tools/ocaml/obuild { }; - - omake = callPackage ../development/tools/ocaml/omake { }; - - omniorb = callPackage ../development/tools/omniorb { }; - openai = with python3Packages; toPythonApplication openai; openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; @@ -18073,28 +8058,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; - opengrok = callPackage ../development/tools/misc/opengrok { }; - - openocd = callPackage ../development/embedded/openocd { }; - oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; }; - package-project-cmake = callPackage ../development/tools/package-project-cmake { }; - pactorio = callPackage ../development/tools/pactorio { inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole { }; - - panopticon = callPackage ../development/tools/analysis/panopticon {}; - - parinfer-rust = callPackage ../development/tools/parinfer-rust {}; - - parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; - patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then patchelf_0_13 else @@ -18106,28 +8077,14 @@ with pkgs; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); - patsh = callPackage ../development/tools/misc/patsh { }; - - pax-rs = callPackage ../development/tools/pax-rs { }; - - perfect-hash = callPackage ../development/tools/misc/perfect-hash { }; - - peg = callPackage ../development/tools/parsing/peg { }; - pgcli = with pkgs.python3Packages; toPythonApplication pgcli; - picotool = callPackage ../development/tools/picotool { }; - - pmccabe = callPackage ../development/tools/misc/pmccabe { }; - - pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf { }; pkgconf = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkgconf-unwrapped; baseBinName = "pkgconf"; }; libpkgconf = pkgconf-unwrapped; - pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { }; pkg-config = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkg-config-unwrapped; }; @@ -18138,24 +8095,10 @@ with pkgs; }; })); - portableService = callPackage ../build-support/portable-service { }; - - polar = callPackage ../tools/misc/polar { }; - inherit (nodePackages) postcss-cli; - postiats-utilities = callPackage ../development/tools/postiats-utilities {}; - - postman = callPackage ../development/web/postman {}; - - pprof = callPackage ../development/tools/profiling/pprof { }; - - pqrs = callPackage ../development/tools/pqrs { }; - pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; - prelink = callPackage ../development/tools/misc/prelink { }; - premake3 = callPackage ../development/tools/misc/premake/3.nix { }; premake4 = callPackage ../development/tools/misc/premake { }; @@ -18166,91 +8109,34 @@ with pkgs; premake = premake4; - privacyidea = callPackage ../applications/misc/privacyidea { }; - - process-compose = callPackage ../applications/misc/process-compose { }; - - process-viewer = callPackage ../applications/misc/process-viewer { }; - - procodile = callPackage ../tools/system/procodile { }; - - pry = callPackage ../development/tools/pry { }; - - pup = callPackage ../development/tools/pup { }; - - puppet-bolt = callPackage ../tools/admin/puppet/puppet-bolt { }; - - puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; - - puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli {}; - - pyrseas = callPackage ../development/tools/database/pyrseas { }; - pycritty = with python3Packages; toPythonApplication pycritty; - pylint-exit = callPackage ../development/tools/pylint-exit { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; - r10k = callPackage ../tools/system/r10k { }; - radare2 = callPackage ../development/tools/analysis/radare2 ({ lua = lua5; } // (config.radare or {})); - ran = callPackage ../servers/http/ran { }; - rathole = callPackage ../tools/networking/rathole { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - retry = callPackage ../tools/system/retry { }; - rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; cutter = libsForQt5.callPackage ../development/tools/analysis/rizin/cutter.nix { }; ragel = ragelStable; - randoop = callPackage ../development/tools/analysis/randoop { }; - inherit (callPackages ../development/tools/parsing/ragel { tex = texlive.combined.scheme-small; }) ragelStable ragelDev; - hammer = callPackage ../development/tools/parsing/hammer { }; - - rdocker = callPackage ../development/tools/rdocker { }; - - redis-dump = callPackage ../development/tools/redis-dump { }; - - redis-plus-plus = callPackage ../development/libraries/redis-plus-plus { }; - - redo = callPackage ../development/tools/build-managers/redo { }; - - redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; - - redo-c = callPackage ../development/tools/build-managers/redo-c { }; - - redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; - - regclient = callPackage ../development/tools/regclient { }; inherit (regclient) regbot regctl regsync; - reno = callPackage ../development/tools/reno { }; - - re2c = callPackage ../development/tools/parsing/re2c { }; - - remake = callPackage ../development/tools/build-managers/remake { }; - - replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { }; - - replacement = callPackage ../development/tools/misc/replacement { }; - inherit (callPackage ../development/tools/replay-io { }) replay-io replay-node-cli; @@ -18261,83 +8147,28 @@ with pkgs; withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { }; - - revive = callPackage ../development/tools/revive { }; - - riff = callPackage ../development/tools/misc/riff { }; - - rman = callPackage ../development/tools/misc/rman { }; - rnginline = with python3Packages; toPythonApplication rnginline; - rolespec = callPackage ../development/tools/misc/rolespec { }; - - rr = callPackage ../development/tools/analysis/rr { }; - - rsass = callPackage ../development/tools/misc/rsass { }; - - rufo = callPackage ../development/tools/rufo { }; - - samurai = callPackage ../development/tools/build-managers/samurai { }; - - muon = callPackage ../development/tools/build-managers/muon { }; muonStandalone = muon.override { embedSamurai = true; buildDocs = false; }; - saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; - - saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; - - sauce-connect = callPackage ../development/tools/sauce-connect { }; - - sawjap = callPackage ../development/tools/java/sawjap { }; - - sd-local = callPackage ../development/tools/sd-local { }; - seer = libsForQt5.callPackage ../development/tools/misc/seer { }; - selenium-server-standalone = callPackage ../development/tools/selenium/server { }; - - selendroid = callPackage ../development/tools/selenium/selendroid { }; - - semver-tool = callPackage ../development/tools/misc/semver-tool { }; - semantik = libsForQt5.callPackage ../applications/office/semantik { }; sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; - mill = callPackage ../development/tools/build-managers/mill {}; - - sbt = callPackage ../development/tools/build-managers/sbt { }; - sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; - sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { }; - - scala-cli = callPackage ../development/tools/build-managers/scala-cli {}; - - scc = callPackage ../development/tools/misc/scc { }; - - scss-lint = callPackage ../development/tools/scss-lint { }; - - segger-jlink = callPackage ../development/tools/misc/segger-jlink { }; - - segger-ozone = callPackage ../development/tools/misc/segger-ozone { }; - - selene = callPackage ../development/tools/selene { }; - shadowenv = callPackage ../tools/misc/shadowenv { inherit (darwin.apple_sdk.frameworks) Security; }; shake = haskell.lib.compose.justStaticExecutables haskellPackages.shake; - shallot = callPackage ../tools/misc/shallot { }; - inherit (callPackage ../development/tools/build-managers/shards { }) shards_0_17 shards; @@ -18346,55 +8177,22 @@ with pkgs; inherit (__splicedPackages.haskellPackages) ShellCheck; }; - shellharden = callPackage ../development/tools/shellharden {}; - - schemaspy = callPackage ../development/tools/database/schemaspy { }; - - scenebuilder = callPackage ../development/tools/scenebuilder { }; - scenic-view = callPackage ../development/tools/scenic-view { jdk = jdk11; }; - shncpd = callPackage ../tools/networking/shncpd { }; - - sigrok-cli = callPackage ../development/tools/sigrok-cli { }; - silicon = callPackage ../tools/misc/silicon { inherit (darwin.apple_sdk.frameworks) AppKit CoreText Security; }; - simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; - - slimerjs = callPackage ../development/tools/slimerjs {}; - slint-lsp = callPackage ../development/tools/misc/slint-lsp { inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; - sloccount = callPackage ../development/tools/misc/sloccount { }; - sloc = nodePackages.sloc; - smatch = callPackage ../development/tools/analysis/smatch { }; - - smc = callPackage ../tools/misc/smc { }; - - snakemake = callPackage ../applications/science/misc/snakemake { }; - - snore = callPackage ../tools/misc/snore { }; - - snzip = callPackage ../tools/archivers/snzip { }; - snowman = qt5.callPackage ../development/tools/analysis/snowman { }; - sparse = callPackage ../development/tools/analysis/sparse { }; - speedtest-cli = with python3Packages; toPythonApplication speedtest-cli; - spin = callPackage ../development/tools/analysis/spin { }; - - spirv-headers = callPackage ../development/libraries/spirv-headers { }; - spirv-tools = callPackage ../development/tools/spirv-tools { }; - splint = callPackage ../development/tools/analysis/splint { flex = flex_2_5_35; }; @@ -18403,105 +8201,39 @@ with pkgs; spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; - spooles = callPackage ../development/libraries/science/math/spooles {}; - spr = callPackage ../development/tools/spr { inherit (darwin.apple_sdk.frameworks) Security; }; - spruce = callPackage ../development/tools/misc/spruce {}; - - sqlc = callPackage ../development/tools/database/sqlc { }; - - sqlcheck = callPackage ../development/tools/database/sqlcheck { }; - sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; - sqlite-web = callPackage ../development/tools/database/sqlite-web { }; - sqlmap = with python3Packages; toPythonApplication sqlmap; - sselp = callPackage ../tools/X11/sselp{ }; - - statix = callPackage ../tools/nix/statix { }; - - stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; - - stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; - - stm8flash = callPackage ../development/embedded/stm8/stm8flash { }; - - strace = callPackage ../development/tools/misc/strace { }; - - strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { }; - - stylua = callPackage ../development/tools/stylua { }; - - summon = callPackage ../development/tools/summon { }; - - supabase-cli = callPackage ../development/tools/supabase-cli { }; - - svlint = callPackage ../development/tools/analysis/svlint { }; - - swarm = callPackage ../development/tools/analysis/swarm { }; - - swiftformat = callPackage ../development/tools/swiftformat { }; - - symfony-cli = callPackage ../development/tools/symfony-cli { }; - swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; }; - systemfd = callPackage ../development/tools/systemfd { }; - - swig1 = callPackage ../development/tools/misc/swig { }; - swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; - swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; - swig4 = callPackage ../development/tools/misc/swig/4.nix { }; swig = swig3; swigWithJava = swig; - c2ffi = callPackage ../development/tools/misc/c2ffi { }; - - c3c = callPackage ../development/compilers/c3c { }; - swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; }; swftools = callPackage ../tools/video/swftools { stdenv = gccStdenv; }; - szyszka = callPackage ../tools/misc/szyszka { }; - taplo = callPackage ../development/tools/taplo { inherit (darwin.apple_sdk.frameworks) Security; }; - taoup = callPackage ../tools/misc/taoup { }; - tarmac = callPackage ../development/tools/tarmac { inherit (darwin.apple_sdk.frameworks) Security; }; - tcptrack = callPackage ../development/tools/misc/tcptrack { }; - teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; - teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; - tytools = libsForQt5.callPackage ../development/embedded/tytools { }; - terracognita = callPackage ../development/tools/misc/terracognita { }; - - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; - terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; - - terraformer = callPackage ../development/tools/misc/terraformer { }; - - terrascan = callPackage ../tools/security/terrascan { }; - - texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro @@ -18510,120 +8242,48 @@ with pkgs; texinfo = texinfo6; texinfoInteractive = texinfo.override { interactive = true; }; - texi2html = callPackage ../development/tools/misc/texi2html { }; - - texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; - texlab = callPackage ../development/tools/misc/texlab { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; - time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - - tflint = callPackage ../development/tools/analysis/tflint { }; - tflint-plugins = recurseIntoAttrs ( callPackage ../development/tools/analysis/tflint-plugins { } ); - tfsec = callPackage ../development/tools/analysis/tfsec { }; - - todoist = callPackage ../applications/misc/todoist { }; - - todoist-electron = callPackage ../applications/misc/todoist-electron { }; - - toil = callPackage ../applications/science/misc/toil { }; - - travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { inherit (darwin.apple_sdk.frameworks) Security; }; tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars; - trellis = callPackage ../development/embedded/fpga/trellis { }; - - ttyd = callPackage ../servers/ttyd { }; - turbogit = callPackage ../development/tools/turbogit { libgit2 = libgit2_1_3_0; }; - tweak = callPackage ../applications/editors/tweak { }; - - uddup = callPackage ../tools/security/uddup { }; - - udis86 = callPackage ../development/tools/udis86 { }; - - uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; - uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; uhd = callPackage ../applications/radio/uhd { }; - uisp = callPackage ../development/embedded/uisp { }; - - uncrustify = callPackage ../development/tools/misc/uncrustify { }; - - universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; - - unused = callPackage ../development/tools/misc/unused { }; - - vagrant = callPackage ../development/tools/vagrant {}; - - bashdb = callPackage ../development/tools/misc/bashdb { }; - gdb = callPackage ../development/tools/misc/gdb { guile = null; }; - gf = callPackage ../development/tools/misc/gf { }; - - java-language-server = callPackage ../development/tools/java/java-language-server { }; - jprofiler = callPackage ../development/tools/java/jprofiler { jdk = jdk11; }; - jhiccup = callPackage ../development/tools/java/jhiccup { }; - valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; }; valgrind-light = res.valgrind.override { gdb = null; }; - valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; - visualvm = callPackage ../development/tools/java/visualvm { }; - - vultr = callPackage ../development/tools/vultr { }; - - vultr-cli = callPackage ../development/tools/vultr-cli { }; - - vulnix = callPackage ../tools/security/vulnix { }; - - vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; - - wails = callPackage ../development/tools/wails { }; - - whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; - whatstyle = callPackage ../development/tools/misc/whatstyle { inherit (llvmPackages) clang-unwrapped; }; - watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; - - webdis = callPackage ../development/tools/database/webdis { }; - xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; }; - xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; - - xcode-install = callPackage ../development/tools/xcode-install { }; - xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; @@ -18638,241 +8298,78 @@ with pkgs; deps = [ xcodebuild6 ]; } ../development/tools/xcbuild/setup-hook.sh ; - xcpretty = callPackage ../development/tools/xcpretty { }; - - xmlindent = callPackage ../development/web/xmlindent {}; - - xpwn = callPackage ../development/mobile/xpwn {}; - xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; - xxe-pe = callPackage ../applications/editors/xxe-pe { }; - xxdiff-tip = xxdiff; - xxgdb = callPackage ../development/tools/misc/xxgdb { }; - - yaml2json = callPackage ../development/tools/yaml2json { }; - - yams = callPackage ../applications/audio/yams { }; - ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; boost = boost174; }; - yodl = callPackage ../development/tools/misc/yodl { }; - yq = python3.pkgs.toPythonApplication python3.pkgs.yq; - yq-go = callPackage ../development/tools/yq-go { }; - - ytt = callPackage ../development/tools/ytt {}; - - zls = callPackage ../development/tools/zls { }; - - zydis = callPackage ../development/libraries/zydis { }; - - grabserial = callPackage ../development/tools/grabserial { }; - mypy = with python3Packages; toPythonApplication mypy; mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf; - nsis = callPackage ../development/tools/nsis { }; - - tockloader = callPackage ../development/tools/misc/tockloader { }; - ### DEVELOPMENT / LIBRARIES - a52dec = callPackage ../development/libraries/a52dec { }; - - aalib = callPackage ../development/libraries/aalib { }; - - abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; - abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; - abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; abseil-cpp = abseil-cpp_202103; - accountsservice = callPackage ../development/libraries/accountsservice { }; - - acl = callPackage ../development/libraries/acl { }; - - acsccid = callPackage ../tools/security/acsccid { }; - - activemq = callPackage ../development/libraries/apache-activemq { }; - - adns = callPackage ../development/libraries/adns { }; - - adslib = callPackage ../development/libraries/adslib { }; - - afflib = callPackage ../development/libraries/afflib { }; - - aften = callPackage ../development/libraries/aften { }; - - alure = callPackage ../development/libraries/alure { }; - - alure2 = callPackage ../development/libraries/alure2 { }; - - agg = callPackage ../development/libraries/agg { }; - - agkozak-zsh-prompt = callPackage ../shells/zsh/agkozak-zsh-prompt { }; - - alass = callPackage ../applications/video/alass { }; - allegro = allegro4; - allegro4 = callPackage ../development/libraries/allegro {}; - allegro5 = callPackage ../development/libraries/allegro/5.nix {}; - - amdvlk = callPackage ../development/libraries/amdvlk {}; - - aml = callPackage ../development/libraries/aml { }; - - amrnb = callPackage ../development/libraries/amrnb { }; - - amrwb = callPackage ../development/libraries/amrwb { }; ansi2html = with python3.pkgs; toPythonApplication ansi2html; - antic = callPackage ../development/libraries/antic {}; - - anttweakbar = callPackage ../development/libraries/AntTweakBar { }; - - appstream = callPackage ../development/libraries/appstream { }; - - appstream-glib = callPackage ../development/libraries/appstream-glib { }; - apr = callPackage ../development/libraries/apr { autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { }; - - aravis = callPackage ../development/libraries/aravis { }; - - arb = callPackage ../development/libraries/arb {}; - - argparse = callPackage ../development/libraries/argparse { }; - - argp-standalone = callPackage ../development/libraries/argp-standalone {}; - aribb25 = callPackage ../development/libraries/aribb25 { inherit (darwin.apple_sdk.frameworks) PCSC; }; - armadillo = callPackage ../development/libraries/armadillo {}; - - arrayfire = callPackage ../development/libraries/arrayfire {}; - - arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; - - arrow-glib = callPackage ../development/libraries/arrow-glib {}; - - arsenal = callPackage ../tools/security/arsenal { }; - - assimp = callPackage ../development/libraries/assimp { }; - asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; asio = callPackage ../development/libraries/asio { }; - asmjit = callPackage ../development/libraries/asmjit { }; - - aspell = callPackage ../development/libraries/aspell { }; - aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {}); aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { aspell = aspell.override { searchNixProfiles = false; }; }; - attr = callPackage ../development/libraries/attr { }; - - at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; - # Not moved to aliases while we decide if we should split the package again. at-spi2-atk = at-spi2-core; aqbanking = callPackage ../development/libraries/aqbanking { }; - aubio = callPackage ../development/libraries/aubio { }; - - audiality2 = callPackage ../development/libraries/audiality2 { }; - audiofile = callPackage ../development/libraries/audiofile { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; - aws-c-auth = callPackage ../development/libraries/aws-c-auth { }; - aws-c-cal = callPackage ../development/libraries/aws-c-cal { inherit (darwin.apple_sdk.frameworks) Security; }; - aws-c-common = callPackage ../development/libraries/aws-c-common { }; - - aws-c-compression = callPackage ../development/libraries/aws-c-compression { }; - - aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; - - aws-c-http = callPackage ../development/libraries/aws-c-http { }; - aws-c-io = callPackage ../development/libraries/aws-c-io { inherit (darwin.apple_sdk.frameworks) Security; }; - aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { }; - - aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { }; - - aws-c-sdkutils = callPackage ../development/libraries/aws-c-sdkutils { }; - - aws-checksums = callPackage ../development/libraries/aws-checksums { }; - - aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { }; - aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; - ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; - - babl = callPackage ../development/libraries/babl { }; - - backward-cpp = callPackage ../development/libraries/backward-cpp { }; - - bamf = callPackage ../development/libraries/bamf { }; - inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44; - bcg729 = callPackage ../development/libraries/bcg729 { }; - - bctoolbox = callPackage ../development/libraries/bctoolbox { }; - - bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { }; - - bearssl = callPackage ../development/libraries/bearssl { }; - - beecrypt = callPackage ../development/libraries/beecrypt { }; - - belcard = callPackage ../development/libraries/belcard { }; - - belr = callPackage ../development/libraries/belr { }; - bencode = callPackage ../development/libraries/bencode { stdenv = gcc10StdenvCompat; }; - bencodetools = callPackage ../development/libraries/bencodetools { }; - beignet = callPackage ../development/libraries/beignet { inherit (llvmPackages_6) libllvm libclang; }; - belle-sip = callPackage ../development/libraries/belle-sip { }; - - - bicpl = callPackage ../development/libraries/science/biology/bicpl { }; bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; }; @@ -18888,10 +8385,6 @@ with pkgs; stdenv = gcc10Stdenv; }); - boehmgc = callPackage ../development/libraries/boehm-gc { }; - - boolstuff = callPackage ../development/libraries/boolstuff { }; - inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) boost165 boost166 @@ -18914,38 +8407,16 @@ with pkgs; boost18x = boost181; boost = boost17x; - boost_process = callPackage ../development/libraries/boost-process { }; - - bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { }; - botan2 = callPackage ../development/libraries/botan/2.0.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - box2d = callPackage ../development/libraries/box2d { }; - - boxfort = callPackage ../development/libraries/boxfort { }; - - brunsli = callPackage ../development/libraries/brunsli { }; - - buddy = callPackage ../development/libraries/buddy { }; - - buildkit-nix = callPackage ../applications/virtualization/buildkit-nix { }; - - bulletml = callPackage ../development/libraries/bulletml { }; - - bwidget = callPackage ../development/libraries/bwidget { }; - - bzrtp = callPackage ../development/libraries/bzrtp { }; - c-ares = callPackage ../development/libraries/c-ares { }; c-aresMinimal = callPackage ../development/libraries/c-ares { withCMake = false; }; - c-blosc = callPackage ../development/libraries/c-blosc { }; - # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 cachix = (haskell.lib.compose.justStaticExecutables haskellPackages.cachix).overrideAttrs(o: { passthru = o.passthru or {} // { @@ -18955,28 +8426,14 @@ with pkgs; }; }); - calcium = callPackage ../development/libraries/calcium {}; - cubeb = callPackage ../development/libraries/audio/cubeb { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices; }; - hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; - - hci = callPackage ../development/tools/continuous-integration/hci { }; - - isa-l = callPackage ../development/libraries/isa-l { }; - niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; - capnproto = callPackage ../development/libraries/capnproto { }; - - capnproto-java = callPackage ../development/tools/capnproto-java { }; - - captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { openssl = openssl_1_1; }; @@ -18985,24 +8442,6 @@ with pkgs; openssl = openssl_1_1; }; - nfd = callPackage ../servers/nfd { }; - - cddlib = callPackage ../development/libraries/cddlib {}; - - cdk = callPackage ../development/libraries/cdk {}; - - cdk-go = callPackage ../tools/security/cdk-go {}; - - cdo = callPackage ../development/libraries/cdo { }; - - cimg = callPackage ../development/libraries/cimg { }; - - cjose = callPackage ../development/libraries/cjose { }; - - scmccid = callPackage ../development/libraries/scmccid { }; - - ccrtp = callPackage ../development/libraries/ccrtp { }; - cctz = callPackage ../development/libraries/cctz { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -19023,43 +8462,19 @@ with pkgs; certbot-dns-route53 ]); - caf = callPackage ../development/libraries/caf {}; - # CGAL 5 has API changes cgal_4 = callPackage ../development/libraries/CGAL/4.nix {}; cgal_5 = callPackage ../development/libraries/CGAL {}; cgal = cgal_4; - cgui = callPackage ../development/libraries/cgui {}; - - charls = callPackage ../development/libraries/charls { }; - check = callPackage ../development/libraries/check { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - chipmunk = callPackage ../development/libraries/chipmunk {}; - - chmlib = callPackage ../development/libraries/chmlib { }; - - chromaprint = callPackage ../development/libraries/chromaprint { }; - cl = callPackage ../development/libraries/cl { erlang = erlangR23; }; - clanlib = callPackage ../development/libraries/clanlib { }; - - classads = callPackage ../development/libraries/classads { }; - - clfft = callPackage ../development/libraries/clfft { }; - - clipp = callPackage ../development/libraries/clipp { }; - - clipper = callPackage ../development/libraries/clipper { }; - - cln = callPackage ../development/libraries/cln { }; - clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; @@ -19070,117 +8485,26 @@ with pkgs; clucene_core = clucene_core_1; - clutter = callPackage ../development/libraries/clutter { }; - - clutter-gst = callPackage ../development/libraries/clutter-gst { - }; - - clutter-gtk = callPackage ../development/libraries/clutter-gtk { }; - - cminpack = callPackage ../development/libraries/cminpack { }; - - cmocka = callPackage ../development/libraries/cmocka { }; - - cmrt = callPackage ../development/libraries/cmrt { }; - - codecserver = callPackage ../applications/audio/codecserver { }; - - coeurl = callPackage ../development/libraries/coeurl { }; - - coercer = callPackage ../tools/security/coercer { }; - cogl = callPackage ../development/libraries/cogl { inherit (darwin.apple_sdk.frameworks) OpenGL; }; - coin3d = callPackage ../development/libraries/coin3d { }; - - soxt = callPackage ../development/libraries/soxt { }; - - CoinMP = callPackage ../development/libraries/CoinMP { }; - coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - cointop = callPackage ../applications/misc/cointop { }; - - collada-dom = callPackage ../development/libraries/collada-dom { }; - - cog = callPackage ../development/web/cog { }; - - cosmoc = callPackage ../development/tools/cosmoc { }; - - cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; - - python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { }; - - ctpp2 = callPackage ../development/libraries/ctpp2 { }; - - ctpl = callPackage ../development/libraries/ctpl { }; - - cppe = callPackage ../development/libraries/science/chemistry/cppe { }; - - cppdb = callPackage ../development/libraries/cppdb { }; - - cpp-utilities = callPackage ../development/libraries/cpp-utilities { }; - - cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; - - cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { }; - cpp-netlib = callPackage ../development/libraries/cpp-netlib { boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found }; - cpp-jwt = callPackage ../development/libraries/cpp-jwt { }; - - ubus = callPackage ../development/libraries/ubus { }; - - uci = callPackage ../development/libraries/uci { }; - uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; }; - cppcms = callPackage ../development/libraries/cppcms { }; + crocoddyl = callPackage ../development/libraries/crocoddyl { }; - cppunit = callPackage ../development/libraries/cppunit { }; + cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; - cpputest = callPackage ../development/libraries/cpputest { }; - - cracklib = callPackage ../development/libraries/cracklib { }; - - cre2 = callPackage ../development/libraries/cre2 { }; - - criterion = callPackage ../development/libraries/criterion { }; - - croaring = callPackage ../development/libraries/croaring { }; - - crocoddyl = callPackage ../development/libraries/crocoddyl { }; - - crossguid = callPackage ../development/libraries/crossguid { }; - - cryptopp = callPackage ../development/libraries/crypto++ { }; - - cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; - - csdr = callPackage ../applications/radio/csdr { }; - - ctypes_sh = callPackage ../development/libraries/ctypes_sh { }; - - curlpp = callPackage ../development/libraries/curlpp { }; - - cutee = callPackage ../development/libraries/cutee { }; - - cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; - - cwiid = callPackage ../development/libraries/cwiid { }; - - cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { }; - - cxxopts = callPackage ../development/libraries/cxxopts { }; - - cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; + cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; @@ -19199,19 +8523,6 @@ with pkgs; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; db62 = callPackage ../development/libraries/db/db-6.2.nix { }; - dbxml = callPackage ../development/libraries/dbxml { }; - - dbus = callPackage ../development/libraries/dbus { }; - dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; - dbus-glib = callPackage ../development/libraries/dbus-glib { }; - dbus_java = callPackage ../development/libraries/java/dbus-java { }; - - dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; - dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; - - dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; - dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; - makeDBusConf = { suidHelper, serviceDirectories, apparmor ? "disabled" }: callPackage ../development/libraries/dbus/make-dbus-conf.nix { inherit suidHelper serviceDirectories apparmor; @@ -19221,42 +8532,14 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - dhex = callPackage ../applications/editors/dhex { }; - - double-conversion = callPackage ../development/libraries/double-conversion { }; - - dclib = callPackage ../development/libraries/dclib { }; - - digiham = callPackage ../applications/radio/digiham { }; - dillo = callPackage ../applications/networking/browsers/dillo { fltk = fltk13; }; - dillong = callPackage ../applications/networking/browsers/dillong { }; - - directfb = callPackage ../development/libraries/directfb { }; - - discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; - discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; - discord-sh = callPackage ../tools/networking/discord-sh { }; - - dlib = callPackage ../development/libraries/dlib { }; - - doctest = callPackage ../development/libraries/doctest { }; - - docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; - - docopts = callPackage ../development/tools/misc/docopts { }; - - dotconf = callPackage ../development/libraries/dotconf { }; - - draco = callPackage ../development/libraries/draco { }; - # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) @@ -19271,87 +8554,39 @@ with pkgs; vdpauinfo; }; - drogon = callPackage ../development/libraries/drogon { }; - - dssi = callPackage ../development/libraries/dssi {}; - - duckdb = callPackage ../development/libraries/duckdb {}; - - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; - eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; }; - eclib = callPackage ../development/libraries/eclib {}; - - editline = callPackage ../development/libraries/editline { }; - - eigen = callPackage ../development/libraries/eigen {}; - - eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; - vapoursynth = callPackage ../development/libraries/vapoursynth { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; - vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; - vmmlib = callPackage ../development/libraries/vmmlib { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }; - egl-wayland = callPackage ../development/libraries/egl-wayland {}; - elastix = callPackage ../development/libraries/science/biology/elastix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - elfio = callPackage ../development/libraries/elfio { }; - emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2; - enet = callPackage ../development/libraries/enet { }; - - entt = callPackage ../development/libraries/entt { }; - libepoxy = callPackage ../development/libraries/libepoxy { inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; }; - libesmtp = callPackage ../development/libraries/libesmtp { }; - - liberasurecode = callPackage ../applications/misc/liberasurecode { }; - - example-robot-data = callPackage ../development/libraries/example-robot-data { }; - - exiv2 = callPackage ../development/libraries/exiv2 { }; - - expat = callPackage ../development/libraries/expat { }; - - eventlog = callPackage ../development/libraries/eventlog { }; - - faac = callPackage ../development/libraries/faac { }; - - faad2 = callPackage ../development/libraries/faad2 { }; - - factor-lang-scope = callPackage ../development/compilers/factor-lang/scope.nix { }; factor-lang = factor-lang-scope.interpreter; - fancypp = callPackage ../development/libraries/fancypp { }; - far2l = callPackage ../applications/misc/far2l { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL; }; - farbfeld = callPackage ../development/libraries/farbfeld { }; - farstream = callPackage ../development/libraries/farstream { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad @@ -19359,22 +8594,10 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - fcgi = callPackage ../development/libraries/fcgi { }; - - fcl = callPackage ../development/libraries/fcl { }; - - febio = callPackage ../development/libraries/febio { }; - - ffcast = callPackage ../tools/X11/ffcast { }; - - fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; - forge = callPackage ../development/libraries/forge { cudatoolkit = buildPackages.cudatoolkit_11; }; - linbox = callPackage ../development/libraries/linbox { }; - ffmpeg_4-headless = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; @@ -19428,30 +8651,13 @@ with pkgs; ffmpeg = ffmpeg_5; }; - ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; - ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { }; - ffms = callPackage ../development/libraries/ffms { }; - - fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; fftwMpi = fftw.override { enableMpi = true; }; - filter-audio = callPackage ../development/libraries/filter-audio {}; - - filtron = callPackage ../servers/filtron { }; - - flann = callPackage ../development/libraries/flann { }; - - flatcc = callPackage ../development/libraries/flatcc { }; - - flint = callPackage ../development/libraries/flint { }; - - flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; @@ -19475,15 +8681,10 @@ with pkgs; fltk = fltk13; fltk-minimal = fltk13-minimal; - flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9; fmt = fmt_9; - fplll = callPackage ../development/libraries/fplll {}; - fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; - freeimage = callPackage ../development/libraries/freeimage { inherit (darwin) autoSignDarwinBinariesHook; libraw = libraw_unstable; @@ -19495,20 +8696,10 @@ with pkgs; frog = res.languageMachines.frog; - fstrcmp = callPackage ../development/libraries/fstrcmp { }; - - fstrm = callPackage ../development/libraries/fstrm { }; - - cfitsio = callPackage ../development/libraries/science/astronomy/cfitsio { }; - fontconfig = callPackage ../development/libraries/fontconfig { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - folly = callPackage ../development/libraries/folly { }; - - folks = callPackage ../development/libraries/folks { }; - makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { inherit fontconfig fontDirectories; @@ -19519,73 +8710,24 @@ with pkgs; inherit fontconfig fontDirectories; }; - f2c = callPackage ../development/tools/f2c { }; - - freealut = callPackage ../development/libraries/freealut { }; - - freeglut = callPackage ../development/libraries/freeglut { }; - freenect = callPackage ../development/libraries/freenect { inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; }; - freetype = callPackage ../development/libraries/freetype { }; - - freexl = callPackage ../development/libraries/freexl { }; - - frei0r = callPackage ../development/libraries/frei0r { }; - - fribidi = callPackage ../development/libraries/fribidi { }; - - funambol = callPackage ../development/libraries/funambol { }; - - galer = callPackage ../tools/security/galer { }; - - gallia = callPackage ../tools/security/gallia { }; - - gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; - - game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; - - gamin = callPackage ../development/libraries/gamin { }; fam = gamin; # added 2018-04-25 - ganv = callPackage ../development/libraries/ganv { }; - - garble = callPackage ../development/tools/garble { }; - - gcab = callPackage ../development/libraries/gcab { }; - gcovr = with python3Packages; toPythonApplication gcovr; - gcr = callPackage ../development/libraries/gcr { }; - - gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; - - gdl = callPackage ../development/libraries/gdl { }; - - gdome2 = callPackage ../development/libraries/gdome2 { }; - - gdbm = callPackage ../development/libraries/gdbm { }; - gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { }; - gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenCL; }; - gensio = callPackage ../development/libraries/gensio {}; - - geoclue2 = callPackage ../development/libraries/geoclue {}; - geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; - geocode-glib = callPackage ../development/libraries/geocode-glib {}; - geocode-glib_2 = geocode-glib.override { libsoup = libsoup_3; }; @@ -19595,61 +8737,27 @@ with pkgs; geoipDatabase = geolite-legacy; }; - geographiclib = callPackage ../development/libraries/geographiclib { }; - geoip = callPackage ../development/libraries/geoip { }; - geoipjava = callPackage ../development/libraries/java/geoipjava { }; - - geomyidae = callPackage ../applications/networking/gopher/geomyidae { }; - - geos = callPackage ../development/libraries/geos { }; - - geos39 = callPackage ../development/libraries/geos/3.9.nix { }; - - getdata = callPackage ../development/libraries/getdata { }; - inherit (callPackages ../development/libraries/getdns { }) getdns stubby; gettext = callPackage ../development/libraries/gettext { }; - gf2x = callPackage ../development/libraries/gf2x {}; - gd = callPackage ../development/libraries/gd { automake = automake115x; }; - gdal = callPackage ../development/libraries/gdal { }; - gdcm = callPackage ../development/libraries/gdcm { inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; - ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; - - gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; - - gio-sharp = callPackage ../development/libraries/gio-sharp { }; - - givaro = callPackage ../development/libraries/givaro {}; - givaro_3 = callPackage ../development/libraries/givaro/3.nix {}; - givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {}; - - ghc_filesystem = callPackage ../development/libraries/ghc_filesystem {}; - ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; - graphinder = callPackage ../tools/security/graphinder { }; - - httplib = callPackage ../development/libraries/httplib { }; - - icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/libgit2 { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -19665,14 +8773,6 @@ with pkgs; patches = []; }); - libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; - - libhsts = callPackage ../development/libraries/libhsts { }; - - glbinding = callPackage ../development/libraries/glbinding { }; - - gle = callPackage ../development/libraries/gle { }; - glew = callPackage ../development/libraries/glew { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -19688,7 +8788,6 @@ with pkgs; glfw-wayland = glfw.override { waylandSupport = true; }; - glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; }; @@ -19697,16 +8796,12 @@ with pkgs; stdenv = gccStdenv; # doesn't compile without gcc }; - mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; - # Provided by libc on Operating Systems that use the Extensible Linker Format. elf-header = if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then null else elf-header-real; - elf-header-real = callPackage ../development/libraries/elf-header { }; - glibc_memusage = callPackage ../development/libraries/glibc { withGd = true; }; @@ -19768,8 +8863,6 @@ with pkgs; stdenv = crossLibcStdenv; }; - relibc = callPackage ../development/libraries/relibc { }; - # Only supported on Linux and only on glibc glibcLocales = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu @@ -19786,47 +8879,19 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm { }; - - glog = callPackage ../development/libraries/glog { }; - - gloox = callPackage ../development/libraries/gloox { }; - - glpk = callPackage ../development/libraries/glpk { }; - glsurf = callPackage ../applications/science/math/glsurf { ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; - glui = callPackage ../development/libraries/glui {}; - - gmime2 = callPackage ../development/libraries/gmime/2.nix { }; - gmime3 = callPackage ../development/libraries/gmime/3.nix { }; gmime = gmime2; - gmm = callPackage ../development/libraries/gmm { }; - - gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions - gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; + /* gmp4 = */ # required by older GHC versions gmp = gmp6; gmpxx = gmp.override { cxx = true; }; #GMP ex-satellite, so better keep it near gmp - mpfr = callPackage ../development/libraries/mpfr { }; - - mpfi = callPackage ../development/libraries/mpfi { }; - - mpdecimal = callPackage ../development/libraries/mpdecimal { }; - - mpfshell = callPackage ../development/tools/mpfshell { }; # A GMP fork - mpir = callPackage ../development/libraries/mpir {}; - - gl3w = callPackage ../development/libraries/gl3w { }; - - gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; # gnatcoll-bindings repository gnatcoll-gmp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "gmp"; }; @@ -19855,21 +8920,6 @@ with pkgs; inherit (darwin) cctools; }; - goocanvas = callPackage ../development/libraries/goocanvas { }; - goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; - goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { }; - goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; - - gflags = callPackage ../development/libraries/gflags { }; - - gperftools = callPackage ../development/libraries/gperftools { }; - - grab-site = callPackage ../tools/backup/grab-site { }; - - grilo = callPackage ../development/libraries/grilo { }; - - grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; - grpc = callPackage ../development/libraries/grpc { # grpc builds with c++17 so abseil must also be built that way abseil-cpp = abseil-cpp_202206.override { @@ -19884,19 +8934,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); - gusb = callPackage ../development/libraries/gusb { }; - - qt-mobility = callPackage ../development/libraries/qt-mobility {}; - - - qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp {}; - gnet = callPackage ../development/libraries/gnet { }; - - gnu-config = callPackage ../development/libraries/gnu-config { }; - gnu-efi = if stdenv.hostPlatform.isEfi then callPackage ../development/libraries/gnu-efi { } else null; @@ -19907,34 +8947,8 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { }; - gpgme = callPackage ../development/libraries/gpgme { }; - pgpdump = callPackage ../tools/security/pgpdump { }; - - pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {}; - - pgweb = callPackage ../development/tools/database/pgweb { }; - - grantlee = callPackage ../development/libraries/grantlee { }; - - gsasl = callPackage ../development/libraries/gsasl { }; - - gsl = callPackage ../development/libraries/gsl { }; - - gsl-lite = callPackage ../development/libraries/gsl-lite { }; - - gsm = callPackage ../development/libraries/gsm {}; - - gsoap = callPackage ../development/libraries/gsoap { }; - - gsound = callPackage ../development/libraries/gsound { }; - - gss = callPackage ../development/libraries/gss { }; - - gtkimageview = callPackage ../development/libraries/gtkimageview { }; - glib = callPackage ../development/libraries/glib (let glib-untested = glib.overrideAttrs (_: { doCheck = false; }); in { @@ -19945,35 +8959,15 @@ with pkgs; dbus = dbus.override { enableSystemd = false; }; }); - glibmm = callPackage ../development/libraries/glibmm { }; - glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - glib-networking = callPackage ../development/libraries/glib-networking {}; - - glib-testing = callPackage ../development/libraries/glib-testing { }; - glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; - gom = callPackage ../development/libraries/gom { }; - - ace = callPackage ../development/libraries/ace { }; - # Not moved to aliases while we decide if we should split the package again. atk = at-spi2-core; - atkmm = callPackage ../development/libraries/atkmm { }; - - atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { }; - - pixman = callPackage ../development/libraries/pixman { }; - - cairo = callPackage ../development/libraries/cairo { }; - - cairomm = callPackage ../development/libraries/cairomm { }; - cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -19998,14 +8992,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - - gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - - gnome-menus = callPackage ../development/libraries/gnome-menus { }; - - elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; - gtk2 = callPackage ../development/libraries/gtk/2.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -20016,8 +9002,6 @@ with pkgs; gdktarget = "x11"; }; - gtkextra = callPackage ../development/libraries/gtkextra { }; - gtk3 = callPackage ../development/libraries/gtk/3.x.nix { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore; }; @@ -20034,22 +9018,10 @@ with pkgs; x11Support = true; }; - gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; - gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; - gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { }; - - gtk_engines = callPackage ../development/libraries/gtk-engines { }; - - gtk-engine-bluecurve = callPackage ../development/libraries/gtk-engine-bluecurve { }; - - gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; - gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; - gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { gtk = gtk3; }; @@ -20060,41 +9032,15 @@ with pkgs; gtk-mac-integration-gtk3 = gtk-mac-integration; - gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; - gtksourceview = gtksourceview3; - gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { }; - gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { }; - gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; - - gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - - gtkspell2 = callPackage ../development/libraries/gtkspell { }; - - gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; - - gtkspellmm = callPackage ../development/libraries/gtkspellmm { }; - - gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { }; - - gts = callPackage ../development/libraries/gts { }; - - gumbo = callPackage ../development/libraries/gumbo { }; - - gvfs = callPackage ../development/libraries/gvfs { }; - - gvm-libs = callPackage ../development/libraries/gvm-libs { }; - gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; hamlib = hamlib_3; - hamlib_3 = callPackage ../development/libraries/hamlib { }; - hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; @@ -20111,14 +9057,6 @@ with pkgs; withIcu = true; }; - hawknl = callPackage ../development/libraries/hawknl { }; - - haxor-news = callPackage ../applications/misc/haxor-news { }; - - hdt = callPackage ../misc/hdt {}; - - hfinger = callPackage ../tools/security/hfinger { }; - herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { @@ -20127,63 +9065,29 @@ with pkgs; udev = systemdMinimal; }; - highfive = callPackage ../development/libraries/highfive { }; - highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; - hiredis = callPackage ../development/libraries/hiredis { }; - - hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; - hivex = callPackage ../development/libraries/hivex { autoreconfHook = buildPackages.autoreconfHook269; }; - hmat-oss = callPackage ../development/libraries/hmat-oss { }; - - hound = callPackage ../development/tools/misc/hound { }; - hpx = callPackage ../development/libraries/hpx { boost = boost17x; asio = asio.override { boost = boost17x; }; }; - hspell = callPackage ../development/libraries/hspell { }; - - hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; - - hsqldb = callPackage ../development/libraries/java/hsqldb { }; - - hstr = callPackage ../applications/misc/hstr { }; - - htmlcxx = callPackage ../development/libraries/htmlcxx { }; - - http-parser = callPackage ../development/libraries/http-parser { }; - - hubble = callPackage ../applications/networking/cluster/hubble { }; - - hunspell = callPackage ../development/libraries/hunspell { }; - hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {}); hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; }; - hwloc = callPackage ../development/libraries/hwloc {}; - hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_11; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { openssl = openssl_1_1; }; - hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hydra-check = with python310.pkgs; toPythonApplication hydra-check; - hyena = callPackage ../development/libraries/hyena { }; - - hyperscan = callPackage ../development/libraries/hyperscan { }; - icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; }); @@ -20220,25 +9124,8 @@ with pkgs; icu = icu72; - id3lib = callPackage ../development/libraries/id3lib { }; - idasen = with python3Packages; toPythonApplication idasen; - ikill = callPackage ../tools/misc/ikill { }; - - ilbc = callPackage ../development/libraries/ilbc { }; - - ilmbase = callPackage ../development/libraries/ilmbase { }; - - imgui = callPackage ../development/libraries/imgui { }; - - imtui = callPackage ../development/libraries/imtui { }; - - imv = callPackage ../applications/graphics/imv { }; - - iml = callPackage ../development/libraries/iml { }; - - imlib2 = callPackage ../development/libraries/imlib2 { }; imlib2Full = imlib2.override { # Compilation error on Darwin with librsvg. For more information see: # https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 @@ -20254,37 +9141,6 @@ with pkgs; imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; - impy = callPackage ../development/libraries/impy { }; - - ineffassign = callPackage ../development/tools/ineffassign { }; - - ijs = callPackage ../development/libraries/ijs { }; - - itktcl = callPackage ../development/libraries/itktcl { }; - incrtcl = callPackage ../development/libraries/incrtcl { }; - - indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { }; - indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; - - indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { }; - - indilib = callPackage ../development/libraries/science/astronomy/indilib { }; - indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; - - inih = callPackage ../development/libraries/inih { }; - - iniparser = callPackage ../development/libraries/iniparser { }; - - intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { }; - - intel-media-driver = callPackage ../development/libraries/intel-media-driver { }; - - intltool = callPackage ../development/tools/misc/intltool { }; - - ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix {}; - - ip2location-c = callPackage ../development/libraries/ip2location-c { }; - irrlicht = if !stdenv.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { @@ -20295,10 +9151,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; }; - isocodes = callPackage ../development/libraries/iso-codes { }; - - iso-flags = callPackage ../data/icons/iso-flags { }; - isort = with python3Packages; toPythonApplication isort; ispc = callPackage ../development/compilers/ispc { @@ -20319,74 +9171,24 @@ with pkgs; itk = itk_5; - jama = callPackage ../development/libraries/jama { }; - - jansson = callPackage ../development/libraries/jansson { }; + json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; - jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { }; + kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { }; - jasper = callPackage ../development/libraries/jasper { }; + keybinder = callPackage ../development/libraries/keybinder { + automake = automake111x; + lua = lua5_1; + }; - jbig2dec = callPackage ../development/libraries/jbig2dec { }; + keybinder3 = callPackage ../development/libraries/keybinder3 { + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; + automake = automake111x; + }; - jcal = callPackage ../development/libraries/jcal { }; - - jbigkit = callPackage ../development/libraries/jbigkit { }; - - jemalloc = callPackage ../development/libraries/jemalloc { }; - - jose = callPackage ../development/libraries/jose { }; - - jshon = callPackage ../development/tools/parsing/jshon { }; - - json2hcl = callPackage ../development/tools/json2hcl { }; - - json2tsv = callPackage ../development/tools/json2tsv { }; - - json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; - - json-glib = callPackage ../development/libraries/json-glib { }; - - json_c = callPackage ../development/libraries/json-c { }; - - jsoncpp = callPackage ../development/libraries/jsoncpp { }; - - jsonnet = callPackage ../development/compilers/jsonnet { }; - - jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { }; - - jrsonnet = callPackage ../development/compilers/jrsonnet { }; - - go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; - - jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; - - jxrlib = callPackage ../development/libraries/jxrlib { }; - - libjson = callPackage ../development/libraries/libjson { }; - - libb64 = callPackage ../development/libraries/libb64 { }; - - judy = callPackage ../development/libraries/judy { }; - - kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { }; - - keybinder = callPackage ../development/libraries/keybinder { - automake = automake111x; - lua = lua5_1; - }; - - keybinder3 = callPackage ../development/libraries/keybinder3 { - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; - automake = automake111x; - }; - - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { - inherit (buildPackages.darwin) bootstrap_cmds; - }; - libkrb5 = krb5.override { type = "lib"; }; - - kronosnet = callPackage ../development/libraries/kronosnet { }; + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { + inherit (buildPackages.darwin) bootstrap_cmds; + }; + libkrb5 = krb5.override { type = "lib"; }; l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; @@ -20396,75 +9198,20 @@ with pkgs; inherit pkgs; }); - lasem = callPackage ../development/libraries/lasem { }; - - lasso = callPackage ../development/libraries/lasso { }; - - LAStools = callPackage ../development/libraries/LAStools { }; - - LASzip = callPackage ../development/libraries/LASzip { }; - LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; - - lcm = callPackage ../development/libraries/lcm {}; - lcms = lcms1; - lcms1 = callPackage ../development/libraries/lcms { }; - - lcms2 = callPackage ../development/libraries/lcms2 { }; - - ldacbt = callPackage ../development/libraries/ldacbt { }; - - ldb = callPackage ../development/libraries/ldb { }; - - lensfun = callPackage ../development/libraries/lensfun {}; - - lesstif = callPackage ../development/libraries/lesstif { }; - - leveldb = callPackage ../development/libraries/leveldb { }; - - lmdb = callPackage ../development/libraries/lmdb { }; - - lmdbxx = callPackage ../development/libraries/lmdbxx { }; - lemon-graph = callPackage ../development/libraries/lemon-graph { stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; }; - levmar = callPackage ../development/libraries/levmar { }; - - leptonica = callPackage ../development/libraries/leptonica { }; - - lerc = callPackage ../development/libraries/lerc { }; - - lib2geom = callPackage ../development/libraries/lib2geom { }; - - lib3ds = callPackage ../development/libraries/lib3ds { }; - - lib3mf = callPackage ../development/libraries/lib3mf { }; - - libAfterImage = callPackage ../development/libraries/libAfterImage { }; - - libaacs = callPackage ../development/libraries/libaacs { }; - - libaal = callPackage ../development/libraries/libaal { }; - - libabigail = callPackage ../development/libraries/libabigail { }; - - libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; - libacr38u = callPackage ../tools/security/libacr38u { inherit (darwin.apple_sdk.frameworks) IOKit; }; - libad9361 = callPackage ../development/libraries/libad9361 { }; - libadwaita = callPackage ../development/libraries/libadwaita { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; }; - libaec = callPackage ../development/libraries/libaec { }; - libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; @@ -20473,14 +9220,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; - libaosd = callPackage ../development/libraries/libaosd { }; - - libabw = callPackage ../development/libraries/libabw { }; - - libamqpcpp = callPackage ../development/libraries/libamqpcpp { }; - - libantlr3c = callPackage ../development/libraries/libantlr3c {}; - libaom = callPackage ../development/libraries/libaom { # Remove circular dependency for libavif libjxl = libjxl.override { buildDocs = false; }; @@ -20488,79 +9227,24 @@ with pkgs; libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; - libappindicator = callPackage ../development/libraries/libappindicator { }; - - libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; - - libargs = callPackage ../development/libraries/libargs { }; - - libarchive = callPackage ../development/libraries/libarchive { }; libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; - libasr = callPackage ../development/libraries/libasr { }; - - libass = callPackage ../development/libraries/libass { }; - - libast = callPackage ../development/libraries/libast { }; - - libassuan = callPackage ../development/libraries/libassuan { }; - - libasyncns = callPackage ../development/libraries/libasyncns { }; - - libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; - - libaudclient = callPackage ../development/libraries/libaudclient { }; - - libaudec = callPackage ../development/libraries/libaudec { }; - libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; - libavc1394 = callPackage ../development/libraries/libavc1394 { }; - - libavif = callPackage ../development/libraries/libavif { }; - - libb2 = callPackage ../development/libraries/libb2 { }; - - libbacktrace = callPackage ../development/libraries/libbacktrace { }; - libbap = callPackage ../development/libraries/libbap { inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; }; - libbaseencode = callPackage ../development/libraries/libbaseencode { }; - libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; - libbde = callPackage ../development/libraries/libbde { }; - - libbdplus = callPackage ../development/libraries/libbdplus { }; - - libblockdev = callPackage ../development/libraries/libblockdev { }; - - libblocksruntime = callPackage ../development/libraries/libblocksruntime { }; - libbluray = callPackage ../development/libraries/libbluray { inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; - libbs2b = callPackage ../development/libraries/audio/libbs2b { }; - - libbson = callPackage ../development/libraries/libbson { }; - - libburn = callPackage ../development/libraries/libburn { }; - - libbytesize = callPackage ../development/libraries/libbytesize { }; - - libcaca = callPackage ../development/libraries/libcaca { }; - - libcacard = callPackage ../development/libraries/libcacard { }; - - libcamera = callPackage ../development/libraries/libcamera { }; - libcanberra = callPackage ../development/libraries/libcanberra { inherit (darwin.apple_sdk.frameworks) Carbon CoreServices AppKit; }; @@ -20575,26 +9259,6 @@ with pkgs; then pkgs.libcanberra else pkgs.libcanberra-gtk2; - libcbor = callPackage ../development/libraries/libcbor { }; - - libccd = callPackage ../development/libraries/libccd { }; - - libcec = callPackage ../development/libraries/libcec { }; - - libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; - - libcef = callPackage ../development/libraries/libcef {}; - - libcello = callPackage ../development/libraries/libcello {}; - - libcerf = callPackage ../development/libraries/libcerf {}; - - libcdada = callPackage ../development/libraries/libcdada { }; - - libcdaudio = callPackage ../development/libraries/libcdaudio { }; - - libcddb = callPackage ../development/libraries/libcddb { }; - libcdio = callPackage ../development/libraries/libcdio { inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; @@ -20605,80 +9269,19 @@ with pkgs; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; - libchamplain = callPackage ../development/libraries/libchamplain { }; - libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; - libchardet = callPackage ../development/libraries/libchardet { }; - - libchewing = callPackage ../development/libraries/libchewing { }; - libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { }; - libcrafter = callPackage ../development/libraries/libcrafter { }; - - libcrossguid = callPackage ../development/libraries/libcrossguid { }; - - libuchardet = callPackage ../development/libraries/libuchardet { }; - - libchop = callPackage ../development/libraries/libchop { }; - - libcifpp = callPackage ../development/libraries/libcifpp { }; - - libcint = callPackage ../development/libraries/libcint { }; - libclc = callPackage ../development/libraries/libclc { llvmPackages = llvmPackages_latest; }; - libcli = callPackage ../development/libraries/libcli { }; - - libclthreads = callPackage ../development/libraries/libclthreads { }; - - libclxclient = callPackage ../development/libraries/libclxclient { }; - - libconfuse = callPackage ../development/libraries/libconfuse { }; - - libcangjie = callPackage ../development/libraries/libcangjie { }; - - libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; - - libcredis = callPackage ../development/libraries/libcredis { }; - - libctb = callPackage ../development/libraries/libctb { }; - - libctemplate = callPackage ../development/libraries/libctemplate { }; - - libctl = callPackage ../development/libraries/libctl { }; - - libcotp = callPackage ../development/libraries/libcotp { }; - - libcouchbase = callPackage ../development/libraries/libcouchbase { }; - - libcue = callPackage ../development/libraries/libcue { }; - - libcutl = callPackage ../development/libraries/libcutl { }; - - libdaemon = callPackage ../development/libraries/libdaemon { }; - - libdatovka = callPackage ../development/libraries/libdatovka { }; - - libdatrie = callPackage ../development/libraries/libdatrie { }; - - libdazzle = callPackage ../development/libraries/libdazzle { }; - - libdbi = callPackage ../development/libraries/libdbi { }; - libdbiDriversBase = libdbiDrivers.override { libmysqlclient = null; sqlite = null; }; - libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; - - libunity = callPackage ../development/libraries/libunity { }; - - libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; @@ -20686,10 +9289,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - libde265 = callPackage ../development/libraries/libde265 {}; - - libdeflate = callPackage ../development/libraries/libdeflate { }; - libdeltachat = callPackage ../development/libraries/libdeltachat { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -20703,78 +9302,26 @@ with pkgs; withXorg = false; }; - libdecor = callPackage ../development/libraries/libdecor { }; - - libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; - - libdiscid = callPackage ../development/libraries/libdiscid { }; - - libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; - - libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; - - libdmtx = callPackage ../development/libraries/libdmtx { }; - - libdmapsharing = callPackage ../development/libraries/libdmapsharing { }; - - libdnet = callPackage ../development/libraries/libdnet { }; - - libdnf = callPackage ../tools/package-management/libdnf { }; - - libdrm = callPackage ../development/libraries/libdrm { }; - - libdv = callPackage ../development/libraries/libdv { }; - - libdvbcsa = callPackage ../development/libraries/libdvbcsa { }; - - libdvbpsi = callPackage ../development/libraries/libdvbpsi { }; - - libdwg = callPackage ../development/libraries/libdwg { }; - libdvdcss = callPackage ../development/libraries/libdvdcss { inherit (darwin) IOKit; }; - libdvdnav = callPackage ../development/libraries/libdvdnav { }; libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { libdvdread = libdvdread_4_9_9; }; - libdvdread = callPackage ../development/libraries/libdvdread { }; - libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; - libdwarf = callPackage ../development/libraries/libdwarf { }; dwarfdump = libdwarf.bin; libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { }; - libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { autoreconfHook = buildPackages.autoreconfHook269; }; - libeb = callPackage ../development/libraries/libeb { }; - - libebml = callPackage ../development/libraries/libebml { }; - - libebur128 = callPackage ../development/libraries/libebur128 { }; - - libedit = callPackage ../development/libraries/libedit { }; - libelf = if stdenv.isFreeBSD then callPackage ../development/libraries/libelf-freebsd { } else callPackage ../development/libraries/libelf { }; - libelfin = callPackage ../development/libraries/libelfin { }; - - libetpan = callPackage ../development/libraries/libetpan { }; - - libexecinfo = callPackage ../development/libraries/libexecinfo { }; - - libfaketime = callPackage ../development/libraries/libfaketime { }; - - libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { udev = systemdMinimal; }; @@ -20783,154 +9330,43 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - libfishsound = callPackage ../development/libraries/libfishsound { }; - - libfm = callPackage ../development/libraries/libfm { }; libfm-extra = libfm.override { extraOnly = true; }; - libfprint = callPackage ../development/libraries/libfprint { }; - - libfprint-tod = callPackage ../development/libraries/libfprint-tod { }; - - libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; - - libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { }; - - libfpx = callPackage ../development/libraries/libfpx { }; - - libgadu = callPackage ../development/libraries/libgadu { }; - - libgbinder = callPackage ../development/libraries/libgbinder { }; - - libgda = callPackage ../development/libraries/libgda { }; - - libgda6 = callPackage ../development/libraries/libgda/6.x.nix { }; - - libgdamm = callPackage ../development/libraries/libgdamm { }; - - libgdata = callPackage ../development/libraries/libgdata { }; - - libgee = callPackage ../development/libraries/libgee { }; - - libgepub = callPackage ../development/libraries/libgepub { }; - - libgig = callPackage ../development/libraries/libgig { }; - - libglibutil = callPackage ../development/libraries/libglibutil { }; - - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; - libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; - - libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; - - libglvnd = callPackage ../development/libraries/libglvnd { }; - - libgnurl = callPackage ../development/libraries/libgnurl { }; - - libgringotts = callPackage ../development/libraries/libgringotts { }; - libgrss = callPackage ../development/libraries/libgrss { inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit; }; - libgweather = callPackage ../development/libraries/libgweather { }; - - libgxps = callPackage ../development/libraries/libgxps { }; - libiio = callPackage ../development/libraries/libiio { inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices; python = python3; }; - libinjection = callPackage ../development/libraries/libinjection { }; - - libinklevel = callPackage ../development/libraries/libinklevel { }; - - libnats-c = callPackage ../development/libraries/libnats-c { }; - - liburing = callPackage ../development/libraries/liburing { }; - - librseq = callPackage ../development/libraries/librseq { }; - - libseccomp = callPackage ../development/libraries/libseccomp { }; - - libsecret = callPackage ../development/libraries/libsecret { }; - - libserdes = callPackage ../development/libraries/libserdes { }; - - libserialport = callPackage ../development/libraries/libserialport { }; - - libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { }; - - libsignon-glib = callPackage ../development/libraries/libsignon-glib { }; - libsoundio = callPackage ../development/libraries/libsoundio { inherit (darwin.apple_sdk.frameworks) AudioUnit; }; - libsystemtap = callPackage ../development/libraries/libsystemtap { }; - - libgtop = callPackage ../development/libraries/libgtop {}; - libLAS = callPackage ../development/libraries/libLAS { boost = boost172; }; - liblaxjson = callPackage ../development/libraries/liblaxjson { }; - - liblo = callPackage ../development/libraries/liblo { }; - - liblscp = callPackage ../development/libraries/liblscp { }; - libe-book = callPackage ../development/libraries/libe-book { icu = icu67; }; - libemf2svg = callPackage ../development/libraries/libemf2svg { }; - - libev = callPackage ../development/libraries/libev { }; - - libevent = callPackage ../development/libraries/libevent { }; - - libewf = callPackage ../development/libraries/libewf { }; - - libexif = callPackage ../development/libraries/libexif { }; - - libexosip = callPackage ../development/libraries/exosip {}; - - libexsid = callPackage ../development/libraries/libexsid { }; - libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; }; - libexttextcat = callPackage ../development/libraries/libexttextcat {}; - - libf2c = callPackage ../development/libraries/libf2c {}; - - libfabric = callPackage ../development/libraries/libfabric {}; - libfive = libsForQt5.callPackage ../development/libraries/libfive { }; - libfixposix = callPackage ../development/libraries/libfixposix {}; - - libff = callPackage ../development/libraries/libff { }; - - libffcall = callPackage ../development/libraries/libffcall { }; - - libffi = callPackage ../development/libraries/libffi { }; - libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { }; libffiBoot = libffi.override { doCheck = false; }; - libfreeaptx = callPackage ../development/libraries/libfreeaptx { }; - libfreefare = callPackage ../development/libraries/libfreefare { inherit (darwin.apple_sdk.frameworks) IOKit Security; inherit (darwin) libobjc; @@ -20941,40 +9377,19 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; - - libfyaml = callPackage ../development/libraries/libfyaml { }; - - libgcrypt = callPackage ../development/libraries/libgcrypt { }; - - libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; - libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; }; - libgnt = callPackage ../development/libraries/libgnt { }; - - libgpg-error = callPackage ../development/libraries/libgpg-error { }; - # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 libgpg-error-gen-posix-lock-obj = libgpg-error.override { genPosixLockObjOnly = true; }; - libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; - - libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { autoreconfHook = buildPackages.autoreconfHook269; }; - libgssglue = callPackage ../development/libraries/libgssglue { }; - - libgudev = callPackage ../development/libraries/libgudev { }; - - libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs = callPackage ../development/libraries/libguestfs { autoreconfHook = buildPackages.autoreconfHook264; }; @@ -20984,165 +9399,42 @@ with pkgs; }; - libhangul = callPackage ../development/libraries/libhangul { }; - - libharu = callPackage ../development/libraries/libharu { }; - - libhdhomerun = callPackage ../development/libraries/libhdhomerun { }; - - libheif = callPackage ../development/libraries/libheif {}; - - libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; - - libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; - libhv = callPackage ../development/libraries/libhv { inherit (darwin.apple_sdk.frameworks) Security; }; - libhwy = callPackage ../development/libraries/libhwy { }; - - libHX = callPackage ../development/libraries/libHX { }; - - libibmad = callPackage ../development/libraries/libibmad { }; - - libibumad = callPackage ../development/libraries/libibumad { }; - - libical = callPackage ../development/libraries/libical { }; - - libicns = callPackage ../development/libraries/libicns { }; - - libieee1284 = callPackage ../development/libraries/libieee1284 { }; - libimobiledevice = callPackage ../development/libraries/libimobiledevice { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation; }; - libimobiledevice-glue = callPackage ../development/libraries/libimobiledevice-glue { }; - libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; - libindicator = callPackage ../development/libraries/libindicator { }; - - libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; - - libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { inherit (darwin.apple_sdk.frameworks) Carbon; }; - libirecovery = callPackage ../development/libraries/libirecovery { }; - - libivykis = callPackage ../development/libraries/libivykis { }; - - libkqueue = callPackage ../development/libraries/libkqueue { }; - - liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - - liblcf = callPackage ../development/libraries/liblcf { }; - - liblc3 = callPackage ../development/libraries/liblc3 { }; - - libliftoff = callPackage ../development/libraries/libliftoff { }; - liblqr1 = callPackage ../development/libraries/liblqr-1 { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; - liblockfile = callPackage ../development/libraries/liblockfile { }; - - liblogging = callPackage ../development/libraries/liblogging { }; + librepo = callPackage ../tools/package-management/librepo { + python = python3; + }; - liblognorm = callPackage ../development/libraries/liblognorm { }; - - libltc = callPackage ../development/libraries/libltc { }; - - liblxi = callPackage ../development/libraries/liblxi { }; - - libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; - - libmcrypt = callPackage ../development/libraries/libmcrypt {}; - - libmediaart = callPackage ../development/libraries/libmediaart { }; - - libmediainfo = callPackage ../development/libraries/libmediainfo { }; - - libmhash = callPackage ../development/libraries/libmhash {}; - - libmodbus = callPackage ../development/libraries/libmodbus {}; - - libmtp = callPackage ../development/libraries/libmtp { }; - - libmypaint = callPackage ../development/libraries/libmypaint { }; - - libmysofa = callPackage ../development/libraries/audio/libmysofa { }; - - libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {}; - - libnatpmp = callPackage ../development/libraries/libnatpmp { }; - - libnatspec = callPackage ../development/libraries/libnatspec { }; - - libndp = callPackage ../development/libraries/libndp { }; - - libnfc = callPackage ../development/libraries/libnfc { }; - - libnfs = callPackage ../development/libraries/libnfs { }; - - libnice = callPackage ../development/libraries/libnice { }; - - libnsl = callPackage ../development/libraries/libnsl { }; - - liboping = callPackage ../development/libraries/liboping { }; - - libplist = callPackage ../development/libraries/libplist { }; - - libre = callPackage ../development/libraries/libre {}; - - libredwg = callPackage ../development/libraries/libredwg {}; - - librem = callPackage ../development/libraries/librem {}; - - librelp = callPackage ../development/libraries/librelp { }; - - librepo = callPackage ../tools/package-management/librepo { - python = python3; - }; - - libresample = callPackage ../development/libraries/libresample {}; - - librevenge = callPackage ../development/libraries/librevenge {}; - - librime = callPackage ../development/libraries/librime { - boost = boost174; - }; + librime = callPackage ../development/libraries/librime { + boost = boost174; + }; librsb = callPackage ../development/libraries/librsb { # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; }; - librtprocess = callPackage ../development/libraries/librtprocess { }; - libsamplerate = callPackage ../development/libraries/libsamplerate { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; }; - libsieve = callPackage ../development/libraries/libsieve { }; - - libsixel = callPackage ../development/libraries/libsixel { }; - - libsolv = callPackage ../development/libraries/libsolv { }; - - libspectre = callPackage ../development/libraries/libspectre { }; - - libspecbleach = callPackage ../development/libraries/audio/libspecbleach { }; - - libspnav = callPackage ../development/libraries/libspnav { }; - - libgsf = callPackage ../development/libraries/libgsf { }; - # GNU libc provides libiconv so systems with glibc don't need to # build libiconv separately. Additionally, Apple forked/repackaged # libiconv so we use that instead of the vanilla version on that OS, @@ -21172,77 +9464,21 @@ with pkgs; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; - libid3tag = callPackage ../development/libraries/libid3tag { }; - - libidn = callPackage ../development/libraries/libidn { }; - - libidn2 = callPackage ../development/libraries/libidn2 { }; - - idnkit = callPackage ../development/libraries/idnkit { }; - - libiec61883 = callPackage ../development/libraries/libiec61883 { }; - - libimagequant = callPackage ../development/libraries/libimagequant {}; - - libime = callPackage ../development/libraries/libime { }; - - libinfinity = callPackage ../development/libraries/libinfinity { }; - libinput = callPackage ../development/libraries/libinput { graphviz = graphviz-nox; }; - libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {}; - - libinstpatch = callPackage ../development/libraries/audio/libinstpatch { }; - - libisofs = callPackage ../development/libraries/libisofs { }; - - libisoburn = callPackage ../development/libraries/libisoburn { }; - - libipt = callPackage ../development/libraries/libipt { }; - - libiptcdata = callPackage ../development/libraries/libiptcdata { }; - - libjcat = callPackage ../development/libraries/libjcat { }; - - libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg - libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg = libjpeg_turbo; - libjreen = callPackage ../development/libraries/libjreen { }; - libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { libmicrohttpd = libmicrohttpd_0_9_72; }; - libjwt = callPackage ../development/libraries/libjwt { }; - - libjxl = callPackage ../development/libraries/libjxl { }; - - libkate = callPackage ../development/libraries/libkate { }; - - libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { }; - - libks = callPackage ../development/libraries/libks { }; - - libksba = callPackage ../development/libraries/libksba { }; - - libksi = callPackage ../development/libraries/libksi { }; - - liblinear = callPackage ../development/libraries/liblinear { }; - - libmad = callPackage ../development/libraries/libmad { }; - malcontent = callPackage ../development/libraries/malcontent { }; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; - libmanette = callPackage ../development/libraries/libmanette { }; - - libmatchbox = callPackage ../development/libraries/libmatchbox { }; - libmatheval = callPackage ../development/libraries/libmatheval { autoconf = buildPackages.autoconf269; guile = guile_2_0; @@ -21252,12 +9488,6 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - libmatroska = callPackage ../development/libraries/libmatroska { }; - - libmd = callPackage ../development/libraries/libmd { }; - - libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { }; libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { }; @@ -21267,146 +9497,22 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio; }; - libmilter = callPackage ../development/libraries/libmilter { }; - - libminc = callPackage ../development/libraries/libminc { }; - - libmkv = callPackage ../development/libraries/libmkv { }; - - libmms = callPackage ../development/libraries/libmms { }; - - libmowgli = callPackage ../development/libraries/libmowgli { }; - - libmng = callPackage ../development/libraries/libmng { }; - - libmnl = callPackage ../development/libraries/libmnl { }; - - libmodplug = callPackage ../development/libraries/libmodplug {}; - - libmodule = callPackage ../development/libraries/libmodule { }; - - libmpcdec = callPackage ../development/libraries/libmpcdec { }; - - libmp3splt = callPackage ../development/libraries/libmp3splt { }; - - libmrss = callPackage ../development/libraries/libmrss { }; - - libmspack = callPackage ../development/libraries/libmspack { }; - - libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { }; - - libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libmusicbrainz = libmusicbrainz3; - libmwaw = callPackage ../development/libraries/libmwaw { }; - - libmx = callPackage ../development/libraries/libmx { }; - - libndctl = callPackage ../development/libraries/libndctl { }; - libnest2d = callPackage ../development/libraries/libnest2d { boost = boost174; }; - libnet = callPackage ../development/libraries/libnet { }; - - libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { }; - - libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; - - libnetfilter_cthelper = callPackage ../development/libraries/libnetfilter_cthelper { }; - - libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { }; - - libnetfilter_log = callPackage ../development/libraries/libnetfilter_log { }; - - libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { }; - - libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; - - libnftnl = callPackage ../development/libraries/libnftnl { }; - - libnova = callPackage ../development/libraries/science/astronomy/libnova { }; - - libnxml = callPackage ../development/libraries/libnxml { }; - - libodfgen = callPackage ../development/libraries/libodfgen { }; - - libofa = callPackage ../development/libraries/libofa { }; - - libofx = callPackage ../development/libraries/libofx { }; - - libogg = callPackage ../development/libraries/libogg { }; - - liboggz = callPackage ../development/libraries/liboggz { }; - - liboil = callPackage ../development/libraries/liboil { }; - - libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { }; - - liboop = callPackage ../development/libraries/liboop { }; - - libopenaptx = callPackage ../development/libraries/libopenaptx { }; - - libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { }; - - libopus = callPackage ../development/libraries/libopus { }; - - libopusenc = callPackage ../development/libraries/libopusenc { }; - - libosinfo = callPackage ../development/libraries/libosinfo { }; - - libosip = callPackage ../development/libraries/osip {}; - - libosmium = callPackage ../development/libraries/libosmium { }; - - libosmocore = callPackage ../applications/misc/libosmocore { }; - libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; - libotr = callPackage ../development/libraries/libotr { }; - - libow = callPackage ../development/libraries/libow { }; - libp11 = callPackage ../development/libraries/libp11 { openssl = openssl_1_1; }; - libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { }; - - libpanel = callPackage ../development/libraries/libpanel { }; - - libpar2 = callPackage ../development/libraries/libpar2 { }; - - libpcap = callPackage ../development/libraries/libpcap { }; - - libpeas = callPackage ../development/libraries/libpeas { }; - - libpg_query = callPackage ../development/libraries/libpg_query { }; - - libpipeline = callPackage ../development/libraries/libpipeline { }; - - libpgf = callPackage ../development/libraries/libpgf { }; - libphonenumber = callPackage ../development/libraries/libphonenumber { inherit (darwin.apple_sdk.frameworks) Foundation; }; - libplacebo = callPackage ../development/libraries/libplacebo { }; - - libpng = callPackage ../development/libraries/libpng { }; - libpng12 = callPackage ../development/libraries/libpng/12.nix { }; - - libpostal = callPackage ../development/libraries/libpostal { }; - - libpaper = callPackage ../development/libraries/libpaper { }; - - libpfm = callPackage ../development/libraries/libpfm { }; - - libpqxx = callPackage ../development/libraries/libpqxx { }; - libpqxx_6 = callPackage ../development/libraries/libpqxx/6.nix { }; - inherit (callPackages ../development/libraries/prometheus-client-c { stdenv = gccStdenv; # Required for darwin }) libprom libpromhttp; @@ -21415,125 +9521,29 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; - libpseudo = callPackage ../development/libraries/libpseudo { }; - - libpsl = callPackage ../development/libraries/libpsl { }; - - libpst = callPackage ../development/libraries/libpst { }; - - libptytty = callPackage ../development/libraries/libptytty { }; - - libpulsar = callPackage ../development/libraries/libpulsar { }; - libpwquality = callPackage ../development/libraries/libpwquality { python = python3; }; - libqalculate = callPackage ../development/libraries/libqalculate { }; - libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; - libroxml = callPackage ../development/libraries/libroxml { }; - librsvg = callPackage ../development/libraries/librsvg { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; - librsync = callPackage ../development/libraries/librsync { }; - - librttopo = callPackage ../development/libraries/librttopo { }; - - libs3 = callPackage ../development/libraries/libs3 { }; - - libschrift = callPackage ../development/libraries/libschrift { }; - - libsciter = callPackage ../development/libraries/libsciter { }; - - libsearpc = callPackage ../development/libraries/libsearpc { }; - - libsigcxx = callPackage ../development/libraries/libsigcxx { }; - - libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; - - libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; - - libsigsegv = callPackage ../development/libraries/libsigsegv { }; - - libslirp = callPackage ../development/libraries/libslirp { }; - libsndfile = callPackage ../development/libraries/libsndfile { inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; - libsnark = callPackage ../development/libraries/libsnark { }; - - libsodium = callPackage ../development/libraries/libsodium { }; - - libsoup = callPackage ../development/libraries/libsoup { }; - - libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; - - libspectrum = callPackage ../development/libraries/libspectrum { }; - - libspiro = callPackage ../development/libraries/libspiro {}; - - libspng = callPackage ../development/libraries/libspng { }; - - libssh = callPackage ../development/libraries/libssh { }; - - libssh2 = callPackage ../development/libraries/libssh2 { }; - - libstartup_notification = callPackage ../development/libraries/startup-notification { }; - - libstemmer = callPackage ../development/libraries/libstemmer { }; - - libstroke = callPackage ../development/libraries/libstroke { }; - - libstrophe = callPackage ../development/libraries/libstrophe { }; - - libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; - - libspatialindex = callPackage ../development/libraries/libspatialindex { }; - - libspatialite = callPackage ../development/libraries/libspatialite { }; - libstatgrab = callPackage ../development/libraries/libstatgrab { inherit (darwin.apple_sdk.frameworks) IOKit; }; - libsvm = callPackage ../development/libraries/libsvm { }; - - libtar = callPackage ../development/libraries/libtar { }; - - libtasn1 = callPackage ../development/libraries/libtasn1 { }; - - libtcod = callPackage ../development/libraries/libtcod { }; - - libthai = callPackage ../development/libraries/libthai { }; - - libtheora = callPackage ../development/libraries/libtheora { }; - - libthreadar = callPackage ../development/libraries/libthreadar { }; - - libticables2 = callPackage ../development/libraries/libticables2 { }; - libticalcs2 = callPackage ../development/libraries/libticalcs2 { inherit (darwin) libobjc; }; - libticonv = callPackage ../development/libraries/libticonv { }; - - libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; - - libtiff = callPackage ../development/libraries/libtiff { }; - - libtiger = callPackage ../development/libraries/libtiger { }; - - libtommath = callPackage ../development/libraries/libtommath { }; - - libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -21547,61 +9557,14 @@ with pkgs; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; - libtoxcore = callPackage ../development/libraries/libtoxcore {}; - - libtpms = callPackage ../tools/security/libtpms { }; - - libtap = callPackage ../development/libraries/libtap { }; - - libtsm = callPackage ../development/libraries/libtsm { }; - - libgeotiff = callPackage ../development/libraries/libgeotiff { }; - - libu2f-host = callPackage ../development/libraries/libu2f-host { }; - - libu2f-server = callPackage ../development/libraries/libu2f-server { }; - - libubox = callPackage ../development/libraries/libubox { }; - - libudev-zero = callPackage ../development/libraries/libudev-zero { }; - - libudfread = callPackage ../development/libraries/libudfread { }; - - libuecc = callPackage ../development/libraries/libuecc { }; - libui = callPackage ../development/libraries/libui { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - libuinputplus = callPackage ../development/libraries/libuinputplus { }; - libuiohook = callPackage ../development/libraries/libuiohook { inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices Carbon; }; - libunistring = callPackage ../development/libraries/libunistring { }; - - libupnp = callPackage ../development/libraries/pupnp { }; - - libwhereami = callPackage ../development/libraries/libwhereami { }; - - giflib = callPackage ../development/libraries/giflib { }; - - libunarr = callPackage ../development/libraries/libunarr { }; - - libunibreak = callPackage ../development/libraries/libunibreak { }; - - libuninameslist = callPackage ../development/libraries/libuninameslist { }; - - libunique = callPackage ../development/libraries/libunique { }; - libunique3 = callPackage ../development/libraries/libunique/3.x.nix { }; - - liburcu = callPackage ../development/libraries/liburcu { }; - - libjaylink = callPackage ../development/libraries/libjaylink { }; - - libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; - libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit Security; @@ -21609,18 +9572,6 @@ with pkgs; udev = systemdMinimal; }; - libusbgx = callPackage ../development/libraries/libusbgx { }; - - libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; - - libusbsio = callPackage ../development/libraries/libusbsio { }; - - libucontext = callPackage ../development/libraries/libucontext { }; - - libutempter = callPackage ../development/libraries/libutempter { }; - - libuldaq = callPackage ../development/libraries/libuldaq { }; - libunwind = if stdenv.isDarwin then darwin.libunwind else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_latest.libunwind @@ -21630,33 +9581,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libuvc = callPackage ../development/libraries/libuvc { }; - libv4l = lowPrio (v4l-utils.override { withUtils = false; }); libva-minimal = callPackage ../development/libraries/libva { minimal = true; }; libva = libva-minimal.override { minimal = false; }; - libva-utils = callPackage ../development/libraries/libva/utils.nix { }; - libva1 = callPackage ../development/libraries/libva/1.nix { }; libva1-minimal = libva1.override { minimal = true; }; - libvarlink = callPackage ../development/libraries/libvarlink { }; - - libvdpau = callPackage ../development/libraries/libvdpau { }; - - libvdwxc = callPackage ../development/libraries/science/chemistry/libvdwxc { }; - - libmodulemd = callPackage ../development/libraries/libmodulemd { }; - - libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; - - libversion = callPackage ../development/libraries/libversion { }; - - libverto = callPackage ../development/libraries/libverto { }; - libvgm = callPackage ../development/libraries/libvgm { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -21665,55 +9598,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; - libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; - - libvisio = callPackage ../development/libraries/libvisio { }; - - libvisio2svg = callPackage ../development/libraries/libvisio2svg { }; - - libvisual = callPackage ../development/libraries/libvisual { }; - - libvmaf = callPackage ../development/libraries/libvmaf { }; - libvncserver = callPackage ../development/libraries/libvncserver { inherit (darwin.apple_sdk.frameworks) Carbon; }; - libviper = callPackage ../development/libraries/libviper { }; - - libviperfx = callPackage ../development/libraries/libviperfx { }; - - libvpx = callPackage ../development/libraries/libvpx { }; - libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; - - libvterm = callPackage ../development/libraries/libvterm { }; - libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { }; - - libvorbis = callPackage ../development/libraries/libvorbis { }; - - libvori = callPackage ../development/libraries/libvori { }; - - libwbxml = callPackage ../development/libraries/libwbxml { }; - - libwebcam = callPackage ../os-specific/linux/libwebcam { }; - - libwebp = callPackage ../development/libraries/libwebp { }; - - libwmf = callPackage ../development/libraries/libwmf { }; - - libwnck = callPackage ../development/libraries/libwnck { }; - libwnck2 = callPackage ../development/libraries/libwnck/2.nix { }; - - libwpd = callPackage ../development/libraries/libwpd { }; - - libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { }; - - libwps = callPackage ../development/libraries/libwps { }; - - libwpg = callPackage ../development/libraries/libwpg { }; - - libx86 = callPackage ../development/libraries/libx86 {}; - libxcrypt = callPackage ../development/libraries/libxcrypt { fetchurl = stdenv.fetchurlBoot; perl = buildPackages.perl.override { @@ -21722,19 +9610,7 @@ with pkgs; }; }; - libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; - libxkbcommon = libxkbcommon_8; - libxkbcommon_8 = callPackage ../development/libraries/libxkbcommon { }; - libxkbcommon_7 = callPackage ../development/libraries/libxkbcommon/libxkbcommon_7.nix { }; - - libxklavier = callPackage ../development/libraries/libxklavier { }; - - libxls = callPackage ../development/libraries/libxls { }; - - libxlsxwriter = callPackage ../development/libraries/libxlsxwriter { }; - - libxmi = callPackage ../development/libraries/libxmi { }; libxml2 = callPackage ../development/libraries/libxml2 { python = python3; @@ -21753,112 +9629,21 @@ with pkgs; ''; }; - libxmlb = callPackage ../development/libraries/libxmlb { }; - - libxmlxx = callPackage ../development/libraries/libxmlxx { }; - libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { }; - - libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { python = python3; }; - libxsmm = callPackage ../development/libraries/libxsmm { }; + liquid-dsp = callPackage ../development/libraries/liquid-dsp { + inherit (darwin) autoSignDarwinBinariesHook cctools; + }; - libixp = callPackage ../development/libraries/libixp { }; + luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; - libwpe = callPackage ../development/libraries/libwpe { }; + luabind_luajit = luabind.override { lua = luajit; }; - libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; - - libyaml = callPackage ../development/libraries/libyaml { }; - - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - - libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; - - libyang = callPackage ../development/libraries/libyang { }; - - libcyaml = callPackage ../development/libraries/libcyaml { }; - - rang = callPackage ../development/libraries/rang { }; - - libykclient = callPackage ../development/libraries/libykclient { }; - - libykneomgr = callPackage ../development/libraries/libykneomgr { }; - - libytnef = callPackage ../development/libraries/libytnef { }; - - libyubikey = callPackage ../development/libraries/libyubikey { }; - - libyuv = callPackage ../development/libraries/libyuv { }; - - libzapojit = callPackage ../development/libraries/libzapojit { }; - - libzen = callPackage ../development/libraries/libzen { }; - - libzip = callPackage ../development/libraries/libzip { }; - - libzdb = callPackage ../development/libraries/libzdb { }; - - libwacom = callPackage ../development/libraries/libwacom { }; - - lightning = callPackage ../development/libraries/lightning { }; - - lightlocker = callPackage ../misc/screensavers/light-locker { }; - - lightspark = callPackage ../misc/lightspark { }; - - lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; - - ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; - - linenoise = callPackage ../development/libraries/linenoise { }; - - linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; - - lirc = callPackage ../development/libraries/lirc { }; - - liquid-dsp = callPackage ../development/libraries/liquid-dsp { - inherit (darwin) autoSignDarwinBinariesHook cctools; - }; - - liquidfun = callPackage ../development/libraries/liquidfun { }; - - litehtml = callPackage ../development/libraries/litehtml { }; - - live555 = callPackage ../development/libraries/live555 { }; - - log4cpp = callPackage ../development/libraries/log4cpp { }; - - log4cxx = callPackage ../development/libraries/log4cxx { }; - - log4cplus = callPackage ../development/libraries/log4cplus { }; - - log4shib = callPackage ../development/libraries/log4shib { }; - - loudmouth = callPackage ../development/libraries/loudmouth { }; - - lrdf = callPackage ../development/libraries/lrdf { }; - - luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; - - luabind_luajit = luabind.override { lua = luajit; }; - - luabridge = callPackage ../development/libraries/luabridge { }; - - luksmeta = callPackage ../development/libraries/luksmeta { - asciidoc = asciidoc-full; - }; - - lyra = callPackage ../development/libraries/lyra { }; - - lzlib = callPackage ../development/libraries/lzlib { }; - - lzo = callPackage ../development/libraries/lzo { }; - - opencl-clang = callPackage ../development/libraries/opencl-clang { }; + luksmeta = callPackage ../development/libraries/luksmeta { + asciidoc = asciidoc-full; + }; mapnik = callPackage ../development/libraries/mapnik { harfbuzz = harfbuzz.override { @@ -21866,47 +9651,21 @@ with pkgs; }; }; - manticoresearch = callPackage ../servers/search/manticoresearch { }; - - marisa = callPackage ../development/libraries/marisa {}; - - matio = callPackage ../development/libraries/matio { }; - matterhorn = haskell.lib.compose.justStaticExecutables haskellPackages.matterhorn; - maxflow = callPackage ../development/libraries/maxflow { }; - mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; - mdctags = callPackage ../development/tools/misc/mdctags { }; - - md4c = callPackage ../development/libraries/md4c { }; - - mdds = callPackage ../development/libraries/mdds { }; - mediastreamer = libsForQt5.callPackage ../development/libraries/mediastreamer { }; - mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - - memorymapping = callPackage ../development/libraries/memorymapping { }; memorymappingHook = makeSetupHook { deps = [ memorymapping ]; } ../development/libraries/memorymapping/setup-hook.sh; - memray = callPackage ../development/tools/memray { }; - - memstream = callPackage ../development/libraries/memstream { }; memstreamHook = makeSetupHook { deps = [ memstream ]; } ../development/libraries/memstream/setup-hook.sh; - menu-cache = callPackage ../development/libraries/menu-cache { }; - - mergerfs = callPackage ../tools/filesystems/mergerfs { }; - - mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; - ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and @@ -21933,95 +9692,41 @@ with pkgs; ## End libGL/libGLU/Mesa stuff - meterbridge = callPackage ../applications/audio/meterbridge { }; - - mhddfs = callPackage ../tools/filesystems/mhddfs { }; - - microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; - microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { }; microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { }; microsoft-edge-dev = callPackage (import ../applications/networking/browsers/microsoft-edge).dev { }; - micronucleus = callPackage ../development/tools/misc/micronucleus { }; - - markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { }; - - micropython = callPackage ../development/interpreters/micropython { }; - MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; - mimalloc = callPackage ../development/libraries/mimalloc { }; - - miniaudio = callPackage ../development/libraries/miniaudio { }; - - miniz = callPackage ../development/libraries/miniz { }; - - minizip = callPackage ../development/libraries/minizip { }; - - minizip-ng = callPackage ../development/libraries/minizip-ng { }; - mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; }; - mlc = callPackage ../tools/system/mlc { }; - - mlt = callPackage ../development/libraries/mlt { }; - - mlib = callPackage ../development/libraries/mlib { }; - mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; - mono-addins = callPackage ../development/libraries/mono-addins { }; - movine = callPackage ../development/tools/database/movine { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - movit = callPackage ../development/libraries/movit { }; - - moserial = callPackage ../tools/misc/moserial { }; - - mosquitto = callPackage ../servers/mqtt/mosquitto { }; - - nanomq = callPackage ../servers/mqtt/nanomq { }; - mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; - libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; - mpeg2dec = libmpeg2; mqttui = callPackage ../tools/networking/mqttui { inherit (darwin.apple_sdk.frameworks) Security; }; - msgpack = callPackage ../development/libraries/msgpack { }; - msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool; - msilbc = callPackage ../development/libraries/msilbc { }; - - mp4v2 = callPackage ../development/libraries/mp4v2 { }; - - libmpc = callPackage ../development/libraries/libmpc { }; - mpich = callPackage ../development/libraries/mpich { ch4backend = libfabric; }; - mstpd = callPackage ../os-specific/linux/mstpd { }; - - mtdev = callPackage ../development/libraries/mtdev { }; - - mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; @@ -22031,20 +9736,10 @@ with pkgs; texinfo = texinfo4; }; - mueval = callPackage ../development/tools/haskell/mueval { }; - - mujoco = callPackage ../applications/science/robotics/mujoco { }; - muparser = callPackage ../development/libraries/muparser { inherit (darwin.stubs) setfile; }; - muparserx = callPackage ../development/libraries/muparserx { }; - - mutest = callPackage ../development/libraries/mutest { }; - - mvapich = callPackage ../development/libraries/mvapich { }; - mygpoclient = with python3.pkgs; toPythonApplication mygpoclient; mygui = callPackage ../development/libraries/mygui { @@ -22052,34 +9747,10 @@ with pkgs; ogre = ogre1_9; }; - mysocketw = callPackage ../development/libraries/mysocketw { }; - - mythes = callPackage ../development/libraries/mythes { }; - - nanodbc = callPackage ../development/libraries/nanodbc { }; - - nanoflann = callPackage ../development/libraries/nanoflann { }; - - nanomsg = callPackage ../development/libraries/nanomsg { }; - nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; - nanotts = callPackage ../tools/audio/nanotts { }; - - ncnn = callPackage ../development/libraries/ncnn { }; - - ndpi = callPackage ../development/libraries/ndpi { }; - nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { }; - netflix = callPackage ../applications/video/netflix { }; - - nifticlib = callPackage ../development/libraries/science/biology/nifticlib { }; - - notify-sharp = callPackage ../development/libraries/notify-sharp { }; - - notcurses = callPackage ../development/libraries/notcurses { }; - ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -22091,44 +9762,14 @@ with pkgs; then null else callPackage ../development/libraries/ncurses { }; - ndi = callPackage ../development/libraries/ndi { }; - - neardal = callPackage ../development/libraries/neardal { }; - - neatvnc = callPackage ../development/libraries/neatvnc { }; - - neon = callPackage ../development/libraries/neon { }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; - newman = callPackage ../development/web/newman {}; - newt = callPackage ../development/libraries/newt { python = python3; }; - nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; - nghttp3 = callPackage ../development/libraries/nghttp3 { }; - - ngtcp2 = callPackage ../development/libraries/ngtcp2 { }; - ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { }; - - nix-plugins = callPackage ../development/libraries/nix-plugins { }; - - nika-fonts = callPackage ../data/fonts/nika-fonts { }; - - nikto = callPackage ../tools/networking/nikto { }; - - nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; - - nng = callPackage ../development/libraries/nng { }; - - nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; - non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; }; - ntl = callPackage ../development/libraries/ntl { }; - nspr = callPackage ../development/libraries/nspr { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -22138,23 +9779,8 @@ with pkgs; nss = nss_esr; nssTools = nss.tools; - nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; - - ntbtls = callPackage ../development/libraries/ntbtls { }; - - ntk = callPackage ../development/libraries/audio/ntk { }; - - ntrack = callPackage ../development/libraries/ntrack { }; - - nuraft = callPackage ../development/libraries/nuraft { }; - - nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; - nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; - nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; - nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; - mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime { @@ -22184,50 +9810,20 @@ with pkgs; configTemplate = ../applications/virtualization/nvidia-podman/config.toml; }; - nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; - nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { }); - nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; - - nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; - - nvitop = callPackage ../tools/system/nvitop { }; - nvtop = callPackage ../tools/system/nvtop { }; nvtop-nvidia = callPackage ../tools/system/nvtop { amd = false; }; nvtop-amd = callPackage ../tools/system/nvtop { nvidia = false; }; - ocl-icd = callPackage ../development/libraries/ocl-icd { }; - - ode = callPackage ../development/libraries/ode { }; - ogre = callPackage ../development/libraries/ogre { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; - ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; ogrepaged = callPackage ../development/libraries/ogrepaged { ogre = ogre1_9; }; - olm = callPackage ../development/libraries/olm { }; - - one_gadget = callPackage ../development/tools/misc/one_gadget { }; - - oneDNN = callPackage ../development/libraries/oneDNN { }; - - onedrive = callPackage ../applications/networking/sync/onedrive { }; - - oneko = callPackage ../applications/misc/oneko { }; - - oniguruma = callPackage ../development/libraries/oniguruma { }; - - oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; - - ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; - openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -22235,8 +9831,6 @@ with pkgs; openbabel = openbabel3; - openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; - openbabel3 = callPackage ../development/libraries/openbabel { python = python3; }; @@ -22244,23 +9838,12 @@ with pkgs; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; - opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; - - opencl-headers = callPackage ../development/libraries/opencl-headers { }; - - opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; - - opencollada = callPackage ../development/libraries/opencollada { }; - - opencore-amr = callPackage ../development/libraries/opencore-amr { }; opencsg = callPackage ../development/libraries/opencsg { inherit (qt5) qmake; inherit (darwin.apple_sdk.frameworks) GLUT; }; - openct = callPackage ../development/libraries/openct { }; - opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; ffmpeg = ffmpeg_4; @@ -22283,13 +9866,7 @@ with pkgs; opencv = opencv4; - imath = callPackage ../development/libraries/imath { }; - openexr = openexr_2; - openexr_2 = callPackage ../development/libraries/openexr { }; - openexr_3 = callPackage ../development/libraries/openexr/3.nix { }; - - openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; openldap = callPackage ../development/libraries/openldap { openssl = openssl_legacy; @@ -22298,42 +9875,25 @@ with pkgs; opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; }; - opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; - - opendmarc = callPackage ../development/libraries/opendmarc { }; ois = callPackage ../development/libraries/ois { inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel; }; - openh264 = callPackage ../development/libraries/openh264 { }; - - openjpeg = callPackage ../development/libraries/openjpeg { }; - - openpa = callPackage ../development/libraries/openpa { }; - openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools { inherit (darwin.apple_sdk.frameworks) PCSC; }; - opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; - openscenegraph = callPackage ../development/libraries/openscenegraph { inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; }; - openslide = callPackage ../development/libraries/openslide { }; - - openslp = callPackage ../development/libraries/openslp {}; - openstackclient = with python3Packages; toPythonApplication python-openstackclient; glanceclient = with python3Packages; toPythonApplication python-glanceclient; heatclient = with python3Packages; toPythonApplication python-heatclient; ironicclient = with python3Packages; toPythonApplication python-ironicclient; manilaclient = with python3Packages; toPythonApplication python-manilaclient; - openvdb = callPackage ../development/libraries/openvdb {}; - inherit (callPackages ../development/libraries/libressl { }) libressl_3_4 libressl_3_5 @@ -22341,8 +9901,6 @@ with pkgs; libressl = libressl_3_6; - boringssl = callPackage ../development/libraries/boringssl { }; - wolfssl = callPackage ../development/libraries/wolfssl { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -22357,100 +9915,36 @@ with pkgs; openssl_1_1 openssl_3; - opensubdiv = callPackage ../development/libraries/opensubdiv { }; - - opensupaplex = callPackage ../games/opensupaplex { }; - openturns = callPackage ../development/libraries/openturns { inherit (darwin.apple_sdk.frameworks) Accelerate; }; - open-wbo = callPackage ../applications/science/logic/open-wbo {}; - - openwsman = callPackage ../development/libraries/openwsman {}; - - ortp = callPackage ../development/libraries/ortp { }; - - openhmd = callPackage ../development/libraries/openhmd { }; - openwebrx = callPackage ../applications/radio/openwebrx { inherit (python3Packages) buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham; }; - optparse-bash = callPackage ../development/libraries/optparse-bash { }; - - oras = callPackage ../development/tools/oras { }; - - orcania = callPackage ../development/libraries/orcania { }; - - osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; - - osmid = callPackage ../applications/audio/osmid {}; - - osinfo-db = callPackage ../data/misc/osinfo-db { }; - osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; - - pacemaker = callPackage ../misc/logging/pacemaker { }; - - p11-kit = callPackage ../development/libraries/p11-kit { }; - - paperkey = callPackage ../tools/security/paperkey { }; - - parsero = callPackage ../tools/security/parsero { }; - - pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; - - pcg_c = callPackage ../development/libraries/pcg-c { }; - pcl = libsForQt5.callPackage ../development/libraries/pcl { inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; - pcre = callPackage ../development/libraries/pcre { }; pcre16 = res.pcre.override { variant = "pcre16"; }; # pcre32 seems unused pcre-cpp = res.pcre.override { variant = "cpp"; }; - pcre2 = callPackage ../development/libraries/pcre2 { }; - - pdal = callPackage ../development/libraries/pdal { } ; - - pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - - pe-parse = callPackage ../development/libraries/pe-parse { }; - inherit (callPackage ../development/libraries/physfs { inherit (darwin.apple_sdk.frameworks) Foundation; }) physfs_2 physfs; - pico-sdk = callPackage ../development/libraries/pico-sdk { }; - - pinocchio = callPackage ../development/libraries/pinocchio { }; - pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; wine-staging = pkgsi686Linux.wine-staging; }; - pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; - - pkgdiff = callPackage ../tools/misc/pkgdiff { }; - place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; - platform-folders = callPackage ../development/libraries/platform-folders { }; - - plib = callPackage ../development/libraries/plib { }; - - poco = callPackage ../development/libraries/poco { }; - - podofo = callPackage ../development/libraries/podofo { }; - - polkit = callPackage ../development/libraries/polkit { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_gi = lowPrio (poppler.override { @@ -22468,8 +9962,6 @@ with pkgs; utils = true; }; - popt = callPackage ../development/libraries/popt { }; - portaudio = callPackage ../development/libraries/portaudio { inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; }; @@ -22478,33 +9970,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; }; - presage = callPackage ../development/libraries/presage { }; - - present = callPackage ../misc/present { }; - - prime-server = callPackage ../development/libraries/prime-server { }; - - primecount = callPackage ../applications/science/math/primecount { }; - - primesieve = callPackage ../applications/science/math/primesieve { }; - - prison = callPackage ../development/libraries/prison { }; - - proj = callPackage ../development/libraries/proj { }; - - proj_7 = callPackage ../development/libraries/proj/7.nix { }; - - proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { }; - proselint = callPackage ../tools/text/proselint { inherit (python3Packages) buildPythonApplication click future six; }; - pru = callPackage ../tools/text/pru { }; - - prospector = callPackage ../development/tools/prospector { }; - # https://github.com/protocolbuffers/protobuf/issues/10418 # protobuf versions have to match between build-time and run-time # Using "targetPlatform" in the check makes sure that the version of @@ -22513,36 +9983,16 @@ with pkgs; protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else protobuf3_21; - protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; - protobufc = callPackage ../development/libraries/protobufc { }; - - protolock = callPackage ../development/libraries/protolock { }; - - protozero = callPackage ../development/libraries/protozero { }; - - flatbuffers = callPackage ../development/libraries/flatbuffers { }; - nanopb = callPackage ../development/libraries/nanopb { }; nanopbMalloc = callPackage ../development/libraries/nanopb { mallocBuild = true; }; - gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - pslib = callPackage ../development/libraries/pslib { }; - - pstreams = callPackage ../development/libraries/pstreams {}; - - pufferpanel = callPackage ../servers/pufferpanel { }; - - pugixml = callPackage ../development/libraries/pugixml { }; - - pylode = callPackage ../misc/pylode {}; - python-qt = callPackage ../development/libraries/python-qt { python = python3; inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; @@ -22550,18 +10000,10 @@ with pkgs; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; - plasma-hud = callPackage ../misc/plasma-hud { }; - - re2 = callPackage ../development/libraries/re2 { }; - qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; - qimageblitz = callPackage ../development/libraries/qimageblitz {}; - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; - quarto = callPackage ../development/libraries/quarto { }; - qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { @@ -22641,16 +10083,6 @@ with pkgs; inherit lib pkgs qt6; }); - quark-engine = callPackage ../tools/security/quark-engine { }; - - quesoglc = callPackage ../development/libraries/quesoglc { }; - - quickder = callPackage ../development/libraries/quickder {}; - - quickmem = callPackage ../development/libraries/quickmem {}; - - quicksynergy = callPackage ../applications/misc/quicksynergy { }; - quill = callPackage ../tools/security/quill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -22661,29 +10093,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL; }; - rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; - - raft-canonical = callPackage ../development/libraries/raft-canonical { }; - - range-v3 = callPackage ../development/libraries/range-v3 {}; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - rapidcheck = callPackage ../development/libraries/rapidcheck {}; - - rapidfuzz-cpp = callPackage ../development/libraries/rapidfuzz-cpp { }; - - rapidjson = callPackage ../development/libraries/rapidjson {}; - - rapidxml = callPackage ../development/libraries/rapidxml {}; - - raul = callPackage ../development/libraries/audio/raul { }; - - raylib = callPackage ../development/libraries/raylib { }; - readline = readline82; readline63 = callPackage ../development/libraries/readline/6.3.nix { }; @@ -22692,15 +10106,6 @@ with pkgs; readline82 = callPackage ../development/libraries/readline/8.2.nix { }; - readosm = callPackage ../development/libraries/readosm { }; - - recastnavigation = callPackage ../development/libraries/recastnavigation { }; - - rinutils = callPackage ../development/libraries/rinutils { }; - - rtrlib = callPackage ../development/libraries/rtrlib { }; - - kissfft = callPackage ../development/libraries/kissfft { }; kissfftFloat = kissfft.override { datatype = "float"; }; @@ -22709,31 +10114,8 @@ with pkgs; haskellLib = haskell.lib.compose; }; - lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; - - librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; - - librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; - - librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { }; - - librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; redland = librdf_redland; # added 2018-04-25 - libsmf = callPackage ../development/libraries/audio/libsmf { }; - - lilv = callPackage ../development/libraries/audio/lilv { }; - - lv2 = callPackage ../development/libraries/audio/lv2 { }; - - lvtk = callPackage ../development/libraries/audio/lvtk { }; - - qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - - qradiolink = callPackage ../applications/radio/qradiolink { }; - - qrupdate = callPackage ../development/libraries/qrupdate { }; - qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; qgnomeplatform-qt6 = qt6Packages.callPackage ../development/libraries/qgnomeplatform { @@ -22746,23 +10128,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - retro-gtk = callPackage ../development/libraries/retro-gtk { }; - - resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; - - restinio = callPackage ../development/libraries/restinio {}; - rhino = callPackage ../development/libraries/java/rhino { javac = jdk8; jvm = jre8; }; - rlog = callPackage ../development/libraries/rlog { }; - - rlottie = callPackage ../development/libraries/rlottie { }; - - rocksdb = callPackage ../development/libraries/rocksdb { }; - rocksdb_lite = rocksdb.override { enableLite = true; }; rocksdb_6_23 = rocksdb.overrideAttrs (_: rec { @@ -22776,46 +10146,20 @@ with pkgs; }; }); - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - - rote = callPackage ../development/libraries/rote { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; - round = callPackage ../applications/graphics/round { }; + /* This package references ghc844, which we no longer have. Unfortunately, I + have been unable to mark it as "broken" in a way that the ofBorg bot + recognizes. Since I don't want to merge code into master that generates + evaluation errors, I have no other idea but to comment it out entirely. - ronn = callPackage ../development/tools/ronn { }; - - rover = callPackage ../development/tools/rover { }; - - rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; - - rttr = callPackage ../development/libraries/rttr { }; - - rubberband = callPackage ../development/libraries/rubberband { }; - - rure = callPackage ../development/libraries/rure { }; - - rustc-demangle = callPackage ../development/libraries/rustc-demangle { }; - - s2geometry = callPackage ../development/libraries/s2geometry { }; - - /* This package references ghc844, which we no longer have. Unfortunately, I - have been unable to mark it as "broken" in a way that the ofBorg bot - recognizes. Since I don't want to merge code into master that generates - evaluation errors, I have no other idea but to comment it out entirely. - - sad = callPackage ../applications/science/logic/sad { }; - */ - - safefile = callPackage ../development/libraries/safefile {}; - - sbc = callPackage ../development/libraries/sbc { }; + sad = callPackage ../applications/science/logic/sad { }; + */ schroedinger = callPackage ../development/libraries/schroedinger { autoreconfHook = buildPackages.autoreconfHook269; }; - scope-lite = callPackage ../development/libraries/scope-lite { }; - SDL_classic = callPackage ../development/libraries/SDL ({ inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { @@ -22829,28 +10173,6 @@ with pkgs; SDL = SDL_classic; - SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { }; - - SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; - - SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; - - SDL_gpu = callPackage ../development/libraries/SDL_gpu { }; - - SDL_image = callPackage ../development/libraries/SDL_image { }; - - SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; - - SDL_net = callPackage ../development/libraries/SDL_net { }; - - SDL_Pango = callPackage ../development/libraries/SDL_Pango {}; - - SDL_sound = callPackage ../development/libraries/SDL_sound { }; - - SDL_stretch= callPackage ../development/libraries/SDL_stretch { }; - - SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; - SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -22863,85 +10185,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; - SDL2_net = callPackage ../development/libraries/SDL2_net { }; - - SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; - SDL2_sound = callPackage ../development/libraries/SDL2_sound { inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; }; - SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; - - SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; - - sdrplay = callPackage ../applications/radio/sdrplay {}; - sdrpp = callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; }; sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; - sigutils = callPackage ../applications/radio/sigutils { }; - - sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; - - selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; - - sealcurses = callPackage ../development/libraries/sealcurses { }; - - seasocks = callPackage ../development/libraries/seasocks { }; - - semver-cpp = callPackage ../development/libraries/semver-cpp { }; - - serd = callPackage ../development/libraries/serd {}; - serf = callPackage ../development/libraries/serf { openssl = openssl_1_1; aprutil = aprutil.override { openssl = openssl_1_1; }; }; - sfsexp = callPackage ../development/libraries/sfsexp {}; - - shhgit = callPackage ../tools/security/shhgit { }; - - shhmsg = callPackage ../development/libraries/shhmsg { }; - - shhopt = callPackage ../development/libraries/shhopt { }; - - shine = callPackage ../development/libraries/shine { }; - - graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - - s2n-tls = callPackage ../development/libraries/s2n-tls { }; - simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; avrlibc = pkgsCross.avr.libcCross; inherit (darwin.apple_sdk.frameworks) GLUT; }; - simgear = callPackage ../development/libraries/simgear { }; - - simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; }; - csfml = callPackage ../development/libraries/csfml { }; - - shapelib = callPackage ../development/libraries/shapelib { }; - - sharness = callPackage ../development/libraries/sharness { }; - - shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; - - skaffold = callPackage ../development/tools/skaffold { }; - - skjold = callPackage ../development/tools/skjold { }; skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { }); @@ -22973,27 +10242,11 @@ with pkgs; inherit (skawarePackages) cleanPackaging; }; - slang = callPackage ../development/libraries/slang { }; - slibGuile = callPackage ../development/libraries/slib { scheme = guile_1_8; texinfo = texinfo4; # otherwise erros: must be after `@defun' to use `@defunx' }; - smpeg = callPackage ../development/libraries/smpeg { }; - - smpeg2 = callPackage ../development/libraries/smpeg2 { }; - - snappy = callPackage ../development/libraries/snappy { }; - - snac2 = callPackage ../servers/snac2 { }; - - snappymail = callPackage ../servers/snappymail { }; - - snow = callPackage ../tools/security/snow { }; - - snowcrash = callPackage ../tools/security/snowcrash { }; - soapyairspy = callPackage ../applications/radio/soapyairspy { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit Security; @@ -23015,10 +10268,6 @@ with pkgs; soapysdr = callPackage ../applications/radio/soapysdr { }; - soapyremote = callPackage ../applications/radio/soapyremote { }; - - soapysdrplay = callPackage ../applications/radio/soapysdrplay { }; - soapysdr-with-plugins = callPackage ../applications/radio/soapysdr { extraPackages = [ limesuite @@ -23042,12 +10291,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - social-engineer-toolkit = callPackage ../tools/security/social-engineer-toolkit { }; - - socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; - - soco-cli = callPackage ../tools/audio/soco-cli { }; - sofia_sip = callPackage ../development/libraries/sofia-sip { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -23056,29 +10299,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - sokol = callPackage ../development/libraries/sokol { }; - - sonic = callPackage ../development/libraries/sonic { }; - - sope = callPackage ../development/libraries/sope { }; - - sord = callPackage ../development/libraries/sord { }; - - soundtouch = callPackage ../development/libraries/soundtouch {}; - - spandsp = callPackage ../development/libraries/spandsp {}; - spandsp3 = callPackage ../development/libraries/spandsp/3.nix {}; - - spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; - - spdk = callPackage ../development/libraries/spdk { }; - - speechd = callPackage ../development/libraries/speechd { }; - - speech-tools = callPackage ../development/libraries/speech-tools {}; - - speedtest-exporter = callPackage ../development/libraries/speedtest-exporter {}; - speex = callPackage ../development/libraries/speex { fftw = fftwFloat; }; @@ -23095,50 +10315,10 @@ with pkgs; inherit (python3Packages) sphinxHook; - sphinxsearch = callPackage ../servers/search/sphinxsearch { }; - - spice = callPackage ../development/libraries/spice { }; - - spice-gtk = callPackage ../development/libraries/spice-gtk { }; - spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; - spice-protocol = callPackage ../development/libraries/spice-protocol { }; - - spice-up = callPackage ../applications/office/spice-up { }; - - spicetify-cli = callPackage ../applications/misc/spicetify-cli { }; - - spirv-cross = callPackage ../tools/graphics/spirv-cross { }; - - splat = callPackage ../applications/radio/splat { }; - - suscan = callPackage ../applications/radio/suscan { }; - suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { }; - sratom = callPackage ../development/libraries/audio/sratom { }; - - srm = callPackage ../tools/security/srm { }; - - srt = callPackage ../development/libraries/srt { }; - - srtp = callPackage ../development/libraries/srtp { }; - - stargate-libcds = callPackage ../development/libraries/stargate-libcds { }; - - stb = callPackage ../development/libraries/stb { }; - - stduuid = callPackage ../development/libraries/stduuid { }; - - steghide = callPackage ../tools/graphics/steghide { }; - - stegsolve = callPackage ../tools/graphics/stegsolve { }; - - StormLib = callPackage ../development/libraries/StormLib { }; - - stxxl = callPackage ../development/libraries/stxxl { }; - sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); unqlite = lowPrio (callPackage ../development/libraries/unqlite { }); @@ -23147,243 +10327,54 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }) sqlite-analyzer sqldiff; - sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; - - sqlitecpp = callPackage ../development/libraries/sqlitecpp { }; - sqlite-interactive = (sqlite.override { interactive = true; }).bin; - sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; - - dqlite = callPackage ../development/libraries/dqlite { }; - - sqlcipher = callPackage ../development/libraries/sqlcipher { }; - - standardnotes = callPackage ../applications/editors/standardnotes { }; - - stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { }; stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; }; - stegseek = callPackage ../tools/security/stegseek {}; - - streamlink = callPackage ../applications/video/streamlink { }; - streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; - - sub-batch = callPackage ../applications/video/sub-batch { }; - - subdl = callPackage ../applications/video/subdl { }; - - subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - - suil = callPackage ../development/libraries/audio/suil { }; - sundials = callPackage ../development/libraries/sundials { python = python3; }; - sutils = callPackage ../tools/misc/sutils { }; - - svrcore = callPackage ../development/libraries/svrcore { }; - svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; swiftclient = with python3Packages; toPythonApplication python-swiftclient; - sword = callPackage ../development/libraries/sword { }; - - biblesync = callPackage ../development/libraries/biblesync { }; - - szip = callPackage ../development/libraries/szip { }; - - t1lib = callPackage ../development/libraries/t1lib { }; - tachyon = callPackage ../development/libraries/tachyon { inherit (darwin.apple_sdk.frameworks) Carbon; }; tageditor = libsForQt5.callPackage ../applications/audio/tageditor { }; - ta-lib = callPackage ../development/libraries/ta-lib { }; - - taglib = callPackage ../development/libraries/taglib { }; - - taglib_extras = callPackage ../development/libraries/taglib-extras { }; - - taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - - talloc = callPackage ../development/libraries/talloc { }; - - tagparser = callPackage ../development/libraries/tagparser { }; - - taskflow = callPackage ../development/libraries/taskflow { }; - - tclap = callPackage ../development/libraries/tclap {}; - - tcllib = callPackage ../development/libraries/tcllib { }; - - tcltls = callPackage ../development/libraries/tcltls { }; - - tclx = callPackage ../development/libraries/tclx { }; - - tdb = callPackage ../development/libraries/tdb {}; - - tdlib = callPackage ../development/libraries/tdlib { }; - - tecla = callPackage ../development/libraries/tecla { }; - tectonic = callPackage ../tools/typesetting/tectonic { harfbuzz = harfbuzzFull; }; - tepl = callPackage ../development/libraries/tepl { }; - - telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; - - telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - - termbox = callPackage ../development/libraries/termbox { }; - - tevent = callPackage ../development/libraries/tevent { }; - - tet = callPackage ../development/tools/misc/tet { }; - - text-engine = callPackage ../development/libraries/text-engine { }; - - the-foundation = callPackage ../development/libraries/the-foundation { }; - - theft = callPackage ../development/libraries/theft { }; - thrift = callPackage ../development/libraries/thrift { openssl = openssl_1_1; }; - thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; - - tidyp = callPackage ../development/libraries/tidyp { }; - - tidal-hifi = callPackage ../applications/audio/tidal-hifi { }; - - tinycdb = callPackage ../development/libraries/tinycdb { }; - tinyxml = tinyxml2; - tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; - - tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; - - tiscamera = callPackage ../os-specific/linux/tiscamera { }; - - tivodecode = callPackage ../applications/video/tivodecode { }; - - tix = callPackage ../development/libraries/tix { }; - tk = tk-8_6; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; - tkrzw = callPackage ../development/libraries/tkrzw { }; - - tl-expected = callPackage ../development/libraries/tl-expected { }; - - tnt = callPackage ../development/libraries/tnt { }; - - tntnet = callPackage ../development/libraries/tntnet { }; - - tntdb = callPackage ../development/libraries/tntdb { }; - - kyotocabinet = callPackage ../development/libraries/kyotocabinet { }; - - tomlc99 = callPackage ../development/libraries/tomlc99 { }; - - tomlcpp = callPackage ../development/libraries/tomlcpp { }; - - toml11 = callPackage ../development/libraries/toml11 { }; - - tomlplusplus = callPackage ../development/libraries/tomlplusplus { }; - - tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; - - tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; - - totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; - tpm2-tss = callPackage ../development/libraries/tpm2-tss { autoreconfHook = buildPackages.autoreconfHook269; }; - tremor = callPackage ../development/libraries/tremor { }; - - triehash = callPackage ../tools/misc/triehash { }; - - trillian = callPackage ../tools/misc/trillian { }; - - twolame = callPackage ../development/libraries/twolame { }; - - udns = callPackage ../development/libraries/udns { }; - - uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; - - umockdev = callPackage ../development/libraries/umockdev { }; - - unconvert = callPackage ../development/tools/unconvert { }; - - uncover = callPackage ../tools/security/uncover { }; - - unibilium = callPackage ../development/libraries/unibilium { }; - - unicap = callPackage ../development/libraries/unicap {}; - - unicon-lang = callPackage ../development/interpreters/unicon-lang {}; - - tsocks = callPackage ../development/libraries/tsocks { }; - - unixODBC = callPackage ../development/libraries/unixODBC { }; - unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); - ustr = callPackage ../development/libraries/ustr { }; - - usrsctp = callPackage ../development/libraries/usrsctp { }; - - usbredir = callPackage ../development/libraries/usbredir { }; - - usbrip = callPackage ../tools/security/usbrip { }; - - uthash = callPackage ../development/libraries/uthash { }; - - uthenticode = callPackage ../development/libraries/uthenticode { }; - - ucommon = callPackage ../development/libraries/ucommon { }; - v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; v8_8_x = callPackage ../development/libraries/v8/8_x.nix { }; - vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; - - vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; - - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; - - vale = callPackage ../tools/text/vale { }; - valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; }; - vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; - - vc = callPackage ../development/libraries/vc { }; - - vc_0_7 = callPackage ../development/libraries/vc/0.7.nix { }; - - vcdimager = callPackage ../development/libraries/vcdimager { }; - - vcg = callPackage ../development/libraries/vcg { }; - vid-stab = callPackage ../development/libraries/vid-stab { inherit (llvmPackages) openmp; }; @@ -23392,24 +10383,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; - - vkdt = callPackage ../applications/graphics/vkdt { }; - - vlock = callPackage ../misc/screensavers/vlock { }; - - virtualpg = callPackage ../development/libraries/virtualpg { }; - - vmime = callPackage ../development/libraries/vmime { }; - - vrb = callPackage ../development/libraries/vrb { }; - - vrpn = callPackage ../development/libraries/vrpn { }; - - vsmtp = callPackage ../servers/mail/vsmtp { }; - - vsqlite = callPackage ../development/libraries/vsqlite { }; - vte = callPackage ../development/libraries/vte { # Needs GCC ≥10 but aarch64 defaults to GCC 9. stdenv = clangStdenv; @@ -23445,38 +10418,18 @@ with pkgs; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; - vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; - - vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; - vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { inherit (darwin) moltenvk; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; - vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; - vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; - - vxl = callPackage ../development/libraries/vxl { }; - - waffle = callPackage ../development/libraries/waffle { }; - - wally-cli = callPackage ../development/tools/wally-cli { }; - zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { }; - - wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { }; wayland-scanner = wayland.bin; - wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; - waylandpp = callPackage ../development/libraries/waylandpp { graphviz = graphviz-nox; }; - wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; - webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; @@ -23492,21 +10445,10 @@ with pkgs; gtk3 = gtk4; }; - webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader {}; - - websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; }; - webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; - wildmidi = callPackage ../development/libraries/wildmidi { }; - - wiredtiger = callPackage ../development/libraries/wiredtiger { }; - - wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; - wt = wt4; inherit (callPackages ../development/libraries/wt { boost = boost175; @@ -23542,14 +10484,6 @@ with pkgs; wxGTK = wxGTK32; }; - wtk = callPackage ../development/libraries/wtk { }; - - x264 = callPackage ../development/libraries/x264 { }; - - x265 = callPackage ../development/libraries/x265 { }; - - xandikos = callPackage ../servers/xandikos { }; - inherit (callPackages ../development/libraries/xapian { }) xapian_1_4; xapian = xapian_1_4; @@ -23558,199 +10492,54 @@ with pkgs; libmagic = file; }; - xavs = callPackage ../development/libraries/xavs { }; - - Xaw3d = callPackage ../development/libraries/Xaw3d { }; - - xbase = callPackage ../development/libraries/xbase { }; - xcb-util-cursor = xorg.xcbutilcursor; - xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; - xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { }; - - xdo = callPackage ../tools/misc/xdo { }; + xgboostWithCuda = xgboost.override { cudaSupport = true; }; - xed = callPackage ../development/libraries/xed { }; + yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; - xedit = callPackage ../applications/editors/xedit { }; + yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; - xine-lib = callPackage ../development/libraries/xine-lib { }; + yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; - xautolock = callPackage ../misc/screensavers/xautolock { }; + libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; }; - xercesc = callPackage ../development/libraries/xercesc {}; + zeromq = zeromq4; - xalanc = callPackage ../development/libraries/xalanc {}; + # requires a newer Apple SDK + zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig { + llvmPackages = llvmPackages_13; + }; - xgboost = callPackage ../development/libraries/xgboost { }; + gsignond = callPackage ../development/libraries/gsignond { + plugins = []; + }; - xgboostWithCuda = xgboost.override { cudaSupport = true; }; + gsignondPlugins = recurseIntoAttrs { + sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; + oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; + lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; + mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { }; + }; - xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; + ### DEVELOPMENT / LIBRARIES / AGDA - xmlada = callPackage ../development/libraries/ada/xmlada { }; + agdaPackages = callPackage ./agda-packages.nix { + inherit (haskellPackages) Agda; + }; + agda = agdaPackages.agda; - xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; + ### DEVELOPMENT / LIBRARIES / BASH - xmlsec = callPackage ../development/libraries/xmlsec { }; + ### DEVELOPMENT / LIBRARIES / JAVA - xml-security-c = callPackage ../development/libraries/xml-security-c { }; + javaCup = callPackage ../development/libraries/java/cup { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; - - xlslib = callPackage ../development/libraries/xlslib { }; - - xsimd = callPackage ../development/libraries/xsimd { }; - - xtensor = callPackage ../development/libraries/xtensor { }; - - xtl = callPackage ../development/libraries/xtl { }; - - xvidcore = callPackage ../development/libraries/xvidcore { }; - - xxHash = callPackage ../development/libraries/xxHash {}; - - xylib = callPackage ../development/libraries/xylib { }; - - yajl = callPackage ../development/libraries/yajl { }; - - yder = callPackage ../development/libraries/yder { }; - - yojimbo = callPackage ../development/libraries/yojimbo { }; - - yubico-pam = callPackage ../development/libraries/yubico-pam { }; - - yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; - - yubihsm-connector = callPackage ../tools/security/yubihsm-connector { }; - - yubikey-manager4 = callPackage ../tools/misc/yubikey-manager/4.nix { }; - yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; - - yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; - - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; - - yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; - - yubikey-agent = callPackage ../tools/security/yubikey-agent { }; - - yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; - - yubihsm-shell = callPackage ../tools/security/yubihsm-shell { }; - - yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { }; - - zchunk = callPackage ../development/libraries/zchunk { }; - - zeitgeist = callPackage ../development/libraries/zeitgeist { }; - - zlib = callPackage ../development/libraries/zlib { }; - - zlib-ng = callPackage ../development/libraries/zlib-ng { }; - - libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; }; - - zlog = callPackage ../development/libraries/zlog { }; - - zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; - zeromq = zeromq4; - - cppzmq = callPackage ../development/libraries/cppzmq {}; - - czmq = callPackage ../development/libraries/czmq {}; - - zmqpp = callPackage ../development/libraries/zmqpp { }; - - libzra = callPackage ../development/libraries/libzra { }; - - # requires a newer Apple SDK - zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_13; - }; - - zimlib = callPackage ../development/libraries/zimlib { }; - - zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; - - zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; - - zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; - - zz = callPackage ../development/compilers/zz { }; - - zziplib = callPackage ../development/libraries/zziplib { }; - - glpng = callPackage ../development/libraries/glpng { }; - - gsignond = callPackage ../development/libraries/gsignond { - plugins = []; - }; - - gsignondPlugins = recurseIntoAttrs { - sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; - oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; - lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; - mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { }; - }; - - ### DEVELOPMENT / LIBRARIES / AGDA - - agdaPackages = callPackage ./agda-packages.nix { - inherit (haskellPackages) Agda; - }; - agda = agdaPackages.agda; - - ### DEVELOPMENT / LIBRARIES / BASH - - bash-preexec = callPackage ../development/libraries/bash/bash-preexec { }; - - ### DEVELOPMENT / LIBRARIES / JAVA - - commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; - - commonsBsf = callPackage ../development/libraries/java/commons/bsf { }; - - commonsCompress = callPackage ../development/libraries/java/commons/compress { }; - - commonsDaemon = callPackage ../development/libraries/java/commons/daemon { }; - - commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { }; - - commonsLang = callPackage ../development/libraries/java/commons/lang { }; - - commonsLogging = callPackage ../development/libraries/java/commons/logging { }; - - commonsIo = callPackage ../development/libraries/java/commons/io { }; - - commonsMath = callPackage ../development/libraries/java/commons/math { }; - - fastjar = callPackage ../development/tools/java/fastjar { }; - - httpunit = callPackage ../development/libraries/java/httpunit { }; - - javaCup = callPackage ../development/libraries/java/cup { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - - jdom = callPackage ../development/libraries/java/jdom { }; - - jffi = callPackage ../development/libraries/java/jffi { }; - - jflex = callPackage ../development/libraries/java/jflex { }; - - lombok = callPackage ../development/libraries/java/lombok { }; - - lucene = callPackage ../development/libraries/java/lucene { }; - - lucenepp = callPackage ../development/libraries/lucene++ { }; - - mockobjects = callPackage ../development/libraries/java/mockobjects { }; - - saxonb = saxonb_8_8; + saxonb = saxonb_8_8; inherit (callPackages ../development/libraries/java/saxon { jre = jre_headless; @@ -23761,8 +10550,6 @@ with pkgs; saxonb_9_1 saxon-he; - smack = callPackage ../development/libraries/java/smack { }; - swt = callPackage ../development/libraries/java/swt { }; swt_jdk8 = callPackage ../development/libraries/java/swt { jdk = jdk8; @@ -23771,12 +10558,8 @@ with pkgs; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT - yuicompressor = callPackage ../development/tools/yuicompressor { }; - ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) - buildBowerComponents = callPackage ../development/bower-modules/generic { }; - ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version @@ -23817,10 +10600,6 @@ with pkgs; go = buildPackages.go_1_20; }; - go2nix = callPackage ../development/tools/go2nix { }; - - leaps = callPackage ../development/tools/leaps { }; - ### DEVELOPMENT / JAVA MODULES javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); @@ -23928,21 +10707,6 @@ with pkgs; ### SERVERS - _389-ds-base = callPackage ../servers/ldap/389 { }; - - adguardhome = callPackage ../servers/adguardhome {}; - - alerta = callPackage ../servers/monitoring/alerta/client.nix { }; - - alerta-server = callPackage ../servers/monitoring/alerta { }; - - allmark = callPackage ../servers/allmark {}; - - alps = callPackage ../servers/alps { }; - - apache-directory-server = callPackage ../servers/ldap/apache-directory-server {}; - - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { @@ -23989,21 +10753,10 @@ with pkgs; apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; - appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - archiveopteryx = callPackage ../servers/mail/archiveopteryx { openssl = openssl_1_1; }; - asouldocs = callPackage ../servers/asouldocs { }; - - atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; - atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; - atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; - atlassian-jira = callPackage ../servers/atlassian/jira.nix { }; - - cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -24017,8 +10770,6 @@ with pkgs; }; cassandra = cassandra_3_11; - cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { }; - apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jre; }; @@ -24027,42 +10778,17 @@ with pkgs; java = jre; }; - apcupsd = callPackage ../servers/apcupsd { }; - inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts asterisk_16 asterisk_18 asterisk_19 asterisk_20; - asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; - - sabnzbd = callPackage ../servers/sabnzbd { }; - - baserow = callPackage ../servers/baserow { }; - - bftpd = callPackage ../servers/ftp/bftpd {}; - - bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; dig = bind.dnsutils; - bird = callPackage ../servers/bird { }; - - bird-lg = callPackage ../servers/bird-lg { }; - - bloat = callPackage ../servers/bloat { }; - - bosun = callPackage ../servers/monitoring/bosun { }; - - cayley = callPackage ../servers/cayley { }; - - cgiserver = callPackage ../servers/http/cgiserver { }; - charybdis = callPackage ../servers/irc/charybdis { autoreconfHook = buildPackages.autoreconfHook269; }; - clamsmtp = callPackage ../servers/mail/clamsmtp { }; - clickhouse = callPackage ../servers/clickhouse { # upstream requires llvm12 as of v22.3.2.2 inherit (llvmPackages_14) clang-unwrapped lld llvm; @@ -24072,58 +10798,26 @@ with pkgs; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; - - codeowners = callPackage ../development/tools/codeowners { }; - - couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; - dcnnt = python3Packages.callPackage ../servers/dcnnt { }; - dendrite = callPackage ../servers/dendrite { }; - - dex-oidc = callPackage ../servers/dex { }; - - dex2jar = callPackage ../development/tools/java/dex2jar { }; - doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust { inherit (darwin.apple_sdk.frameworks) Security; }; - dgraph = callPackage ../servers/dgraph { }; - - dico = callPackage ../servers/dico { }; - dict = callPackage ../servers/dict { libmaa = callPackage ../servers/dict/libmaa.nix {}; }; dictdDBs = recurseIntoAttrs (callPackages ../servers/dict/dictd-db.nix {}); - dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {}; - diod = callPackage ../servers/diod { lua = lua5_1; }; - directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {}; - - dkimproxy = callPackage ../servers/mail/dkimproxy { }; - - dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { }; - dmlive = callPackage ../applications/video/dmlive { inherit (darwin.apple_sdk.frameworks) Security; }; - do-agent = callPackage ../servers/monitoring/do-agent { }; - dodgy = with python3Packages; toPythonApplication dodgy; - dovecot = callPackage ../servers/mail/dovecot { }; - dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; - dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { }; - - dspam = callPackage ../servers/mail/dspam { }; - engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; envoy = callPackage ../servers/http/envoy { @@ -24131,158 +10825,52 @@ with pkgs; gn = gn1924; }; - ergochat = callPackage ../servers/irc/ergochat { }; - etcd = etcd_3_3; - etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; - etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; - etcd_3_5 = callPackage ../servers/etcd/3.5.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR24; }; - exhibitor = callPackage ../servers/exhibitor { }; - - hyp = callPackage ../servers/http/hyp { }; - - peering-manager = callPackage ../servers/web-apps/peering-manager { }; - - podgrab = callPackage ../servers/misc/podgrab { }; - - portunus = callPackage ../servers/portunus { }; - prosody = callPackage ../servers/xmpp/prosody { withExtraLibs = []; withExtraLuaPackages = _: []; }; - prosody-filer = callPackage ../servers/xmpp/prosody-filer { }; - - biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - eventstore = callPackage ../servers/nosql/eventstore { }; - - exim = callPackage ../servers/mail/exim { }; - - fcgiwrap = callPackage ../servers/fcgiwrap { }; - fedigroups = callPackage ../servers/fedigroups { inherit (darwin.apple_sdk.frameworks) Security; }; - ferretdb = callPackage ../servers/nosql/ferretdb { }; - - felix = callPackage ../servers/felix { }; - - felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; - inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; freeradius = callPackage ../servers/freeradius { openssl = openssl_1_1; }; - freshrss = callPackage ../servers/web-apps/freshrss { }; - freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; openssl = openssl_1_1; }; - fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; - - gamehub = callPackage ../games/gamehub { }; - - gatling = callPackage ../servers/http/gatling { }; - - gitlab-pages = callPackage ../servers/http/gitlab-pages { }; - - glabels = callPackage ../applications/graphics/glabels { }; - - nats-server = callPackage ../servers/nats-server { }; - - go-autoconfig = callPackage ../servers/go-autoconfig { }; - - go-camo = callPackage ../servers/http/go-camo { }; - - go-cqhttp = callPackage ../servers/go-cqhttp { }; - - gofish = callPackage ../servers/gopher/gofish { }; - - grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent {}; - - grafana-loki = callPackage ../servers/monitoring/loki { }; - promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; - - mimir = callPackage ../servers/monitoring/mimir { }; - - grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - - grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; - - gerbera = callPackage ../servers/gerbera {}; - - gobetween = callPackage ../servers/gobetween { }; - - gobgpd = callPackage ../servers/misc/gobgpd { }; - - graph-cli = callPackage ../tools/graphics/graph-cli { }; - - h2o = callPackage ../servers/http/h2o { }; - - haka = callPackage ../tools/security/haka { }; - - hashi-ui = callPackage ../servers/hashi-ui {}; - - hashi-up = callPackage ../applications/networking/cluster/hashi-up { }; - hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine; - hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; hbase2 = hbase_2_5; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release - headphones = callPackage ../servers/headphones {}; - - hiawatha = callPackage ../servers/http/hiawatha {}; - hoard = callPackage ../tools/misc/hoard { inherit (darwin) Security; }; - home-assistant = callPackage ../servers/home-assistant { }; - - home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; - home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; - honk = callPackage ../servers/honk { }; - - hqplayerd = callPackage ../servers/hqplayerd { }; - - https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; - - hydron = callPackage ../servers/hydron { }; - hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; - ic-keysmith = callPackage ../tools/security/ic-keysmith { }; - - icecream = callPackage ../servers/icecream { }; - - icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; - icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { }; - icingaweb2 = callPackage ../servers/icingaweb2 { }; icingaweb2Modules = { theme-april = callPackage ../servers/icingaweb2/theme-april { }; theme-lsd = callPackage ../servers/icingaweb2/theme-lsd { }; @@ -24291,55 +10879,12 @@ with pkgs; theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; - inspircd = callPackage ../servers/irc/inspircd { }; - inspircdMinimal = inspircd.override { extraModules = []; }; - imaginary = callPackage ../servers/imaginary {}; - - imgproxy = callPackage ../servers/imgproxy { }; - - irccat = callPackage ../servers/irc/irccat { }; - - ircdog = callPackage ../applications/networking/irc/ircdog { }; - - ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; - - janus-gateway = callPackage ../servers/janus-gateway { }; - - janusgraph = callPackage ../servers/nosql/janusgraph { }; - - jboss = callPackage ../servers/http/jboss { }; - - jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; - - jetty = callPackage ../servers/http/jetty { }; - - jibri = callPackage ../servers/jibri { }; - - jicofo = callPackage ../servers/jicofo { }; - - jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; - - jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; - - jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; - - kanidm = callPackage ../servers/kanidm { }; - - kapowbang = callPackage ../servers/kapowbang { }; - - keycloak = callPackage ../servers/keycloak { }; - - knot-dns = callPackage ../servers/dns/knot-dns { }; knot-resolver = callPackage ../servers/dns/knot-resolver { systemd = systemdMinimal; # in closure already anyway }; - rdkafka = callPackage ../development/libraries/rdkafka { }; - - leafnode = callPackage ../servers/news/leafnode { }; - lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -24348,57 +10893,16 @@ with pkgs; nodejs = nodejs-14_x; }; - lighttpd = callPackage ../servers/http/lighttpd { }; - - listmonk = callPackage ../servers/mail/listmonk { }; - - linx-server = callPackage ../servers/web-apps/linx-server {}; - - livepeer = callPackage ../servers/livepeer { }; - - lwan = callPackage ../servers/http/lwan { }; - - labelImg = callPackage ../applications/science/machine-learning/labelimg { }; - - mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { }; - - mailmanPackages = callPackage ../servers/mail/mailman { }; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; - mailman-rss = callPackage ../tools/misc/mailman-rss { }; - - listadmin = callPackage ../applications/networking/listadmin {}; - - maker-panel = callPackage ../tools/misc/maker-panel { }; - - mastodon = callPackage ../servers/mastodon { }; - materialize = callPackage ../servers/sql/materialize { inherit (buildPackages.darwin) bootstrap_cmds; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; - matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - - mattermost = callPackage ../servers/mattermost { }; - matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { }; - - mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; - - memcached = callPackage ../servers/memcached {}; - - merecat = callPackage ../servers/http/merecat { }; - - meteor = callPackage ../servers/meteor { }; - - micronaut = callPackage ../development/tools/micronaut {}; - - minio = callPackage ../servers/minio { }; # Keep around to allow people to migrate their data from the old legacy fs format # https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z - minio_legacy_fs = callPackage ../servers/minio/legacy_fs.nix { }; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; @@ -24420,33 +10924,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; }) mpd mpd-small mpdWithFeatures; - libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; - - mpdscribble = callPackage ../tools/misc/mpdscribble { }; - mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; - micro-httpd = callPackage ../servers/http/micro-httpd { }; - - miniHttpd = callPackage ../servers/http/mini-httpd {}; - - mlflow-server = callPackage ../servers/mlflow-server { }; - - mlmmj = callPackage ../servers/mail/mlmmj { }; - - moodle = callPackage ../servers/web-apps/moodle { }; - - moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { }; - - morty = callPackage ../servers/web-apps/morty { }; - inherit (callPackage ../applications/networking/mullvad { }) mullvad; - mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - - mycorrhiza = callPackage ../servers/mycorrhiza { }; - napalm = with python3Packages; toPythonApplication ( napalm.overridePythonAttrs (attrs: { # add community frontends that depend on the napalm python package @@ -24456,24 +10938,8 @@ with pkgs; }) ); - nas = callPackage ../servers/nas { }; - - nats-streaming-server = callPackage ../servers/nats-streaming-server { }; - - neard = callPackage ../servers/neard { }; - - networkaudiod = callPackage ../servers/networkaudiod { }; - - unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { }; - - unit = callPackage ../servers/http/unit { }; - - ncdns = callPackage ../servers/dns/ncdns { }; - nginx = nginxStable; - nginx-doc = callPackage ../data/documentation/nginx-doc { }; - nginxQuic = callPackage ../servers/http/nginx/quic.nix { zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; @@ -24512,96 +10978,34 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - ngircd = callPackage ../servers/irc/ngircd { }; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); - nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; + outline = callPackage ../servers/web-apps/outline (lib.fix (super: { + yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; + yarn = yarn.override { inherit (super) nodejs; }; + nodejs = nodejs-16_x; + })); - nix-tour = callPackage ../applications/misc/nix-tour {}; - - nosqli = callPackage ../tools/security/nosqli { }; - - nsd = callPackage ../servers/dns/nsd (config.nsd or {}); - - nsq = callPackage ../servers/nsq { }; - - oauth2-proxy = callPackage ../servers/oauth2-proxy { }; - - olaris-server = callPackage ../servers/olaris {}; - - onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; - - outline = callPackage ../servers/web-apps/outline (lib.fix (super: { - yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; - yarn = yarn.override { inherit (super) nodejs; }; - nodejs = nodejs-16_x; - })); - - openbgpd = callPackage ../servers/openbgpd { }; - - openafs = callPackage ../servers/openafs/1.8 { }; + openafs = callPackage ../servers/openafs/1.8 { }; openresty = callPackage ../servers/http/openresty { withPerl = false; modules = []; }; - opensmtpd = callPackage ../servers/mail/opensmtpd { }; - opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; - opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { }; - opensmtpd-filter-dkimsign = callPackage ../servers/mail/opensmtpd/filter-dkimsign { }; - libopensmtpd = callPackage ../servers/mail/opensmtpd/libopensmtpd { }; - - openxr-loader = callPackage ../development/libraries/openxr-loader { }; - - osrm-backend = callPackage ../servers/osrm-backend { }; - - oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; - - p910nd = callPackage ../servers/p910nd { }; - - petidomo = callPackage ../servers/mail/petidomo { }; - pict-rs = callPackage ../servers/web-apps/pict-rs { inherit (darwin.apple_sdk.frameworks) Security; ffmpeg = ffmpeg_4; }; - popa3d = callPackage ../servers/mail/popa3d { }; - - postfix = callPackage ../servers/mail/postfix { }; - - postfixadmin = callPackage ../servers/postfixadmin { }; - - postsrsd = callPackage ../servers/mail/postsrsd { }; - - rspamd = callPackage ../servers/mail/rspamd { }; - pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { gperf = gperf_3_0; }; - pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; - - pomerium = callPackage ../servers/http/pomerium { }; - pomerium-cli = callPackage ../tools/security/pomerium-cli { }; - - postgrey = callPackage ../servers/mail/postgrey { }; - - pshs = callPackage ../servers/http/pshs { }; - - quark = callPackage ../servers/http/quark { }; - - soft-serve = callPackage ../servers/soft-serve { }; - - sympa = callPackage ../servers/mail/sympa { }; - - syncstorage-rs = callPackage ../servers/syncstorage-rs { }; system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); # PulseAudio daemons - hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { }; - pulseaudio = callPackage ../servers/pulseaudio { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa CoreAudio; }; @@ -24622,14 +11026,6 @@ with pkgs; libOnly = true; }; - apulse = callPackage ../misc/apulse { }; - - libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { }; - - libcardiacarrest = callPackage ../misc/libcardiacarrest { }; - - easyeffects = callPackage ../applications/audio/easyeffects { }; - pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { boost = boost172; }; @@ -24638,16 +11034,6 @@ with pkgs; yt-dlp = yt-dlp.override { withAlias = true; }; }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; - - tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; - - pies = callPackage ../servers/pies { }; - - rpcbind = callPackage ../servers/rpcbind { }; - - rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { }; - libmysqlclient = libmysqlclient_3_2; libmysqlclient_3_1 = mariadb-connector-c_3_1; libmysqlclient_3_2 = mariadb-connector-c_3_2; @@ -24655,8 +11041,6 @@ with pkgs; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; - mariadb-galera = callPackage ../servers/sql/mariadb/galera { }; - inherit (import ../servers/sql/mariadb pkgs) mariadb_104 mariadb_105 @@ -24704,17 +11088,9 @@ with pkgs; if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; - nginx-sso = callPackage ../servers/nginx-sso { }; - - immudb = callPackage ../servers/nosql/immudb { }; - - influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; - influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. - influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds DarwinTools; @@ -24725,17 +11101,6 @@ with pkgs; openssl = openssl_1_1; }; - mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - - mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; - jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { }; - - azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - - miniflux = callPackage ../servers/miniflux { }; - - mir = callPackage ../servers/mir { }; - icinga2 = callPackage ../servers/monitoring/icinga2 { }; icinga2-agent = callPackage ../servers/monitoring/icinga2 { @@ -24745,48 +11110,11 @@ with pkgs; withIcingadb = false; }; - munin = callPackage ../servers/monitoring/munin { }; - - nagios = callPackage ../servers/monitoring/nagios { }; - - monitoring-plugins = callPackage ../servers/monitoring/plugins { }; - inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { }) check-mssql-health check-nwc-health check-ups-health; - check-openvpn = callPackage ../servers/monitoring/plugins/openvpn.nix { }; - - check_smartmon = callPackage ../servers/monitoring/nagios/plugins/smartmon.nix { }; - - checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; - - check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; - - check_zfs = callPackage ../servers/monitoring/nagios/plugins/zfs.nix { }; - - neo4j = callPackage ../servers/nosql/neo4j { }; - - neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { }; - - check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; - - net-snmp = callPackage ../servers/monitoring/net-snmp { }; - - newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; - - nullidentdmod = callPackage ../servers/identd/nullidentdmod {}; - - riemann = callPackage ../servers/monitoring/riemann { }; - riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; - - unpfs = callPackage ../servers/unpfs {}; - - oidentd = callPackage ../servers/identd/oidentd { }; - - softether = callPackage ../servers/softether { }; - qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { }; @@ -24797,28 +11125,12 @@ with pkgs; tpmSupport = true; }; - ops = callPackage ../applications/virtualization/ops { }; - - seabios = callPackage ../applications/virtualization/seabios { }; - - vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; - patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; }; - pgbouncer = callPackage ../servers/sql/pgbouncer { }; - - pgpool = callPackage ../servers/sql/pgpool { }; - tang = callPackage ../servers/tang { asciidoc = asciidoc-full; }; - promscale = callPackage ../servers/monitoring/prometheus/promscale { }; - - timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; - - timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; - inherit (import ../servers/sql/postgresql pkgs) postgresql_11 postgresql_12 @@ -24834,109 +11146,25 @@ with pkgs; postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql14Packages = postgresqlPackages; - postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; - - postgresqlTestHook = callPackage ../build-support/setup-hooks/postgresql-test-hook { }; - - redshift_jdbc = callPackage ../development/java-modules/redshift_jdbc { }; - - liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { }; - - promql-cli = callPackage ../tools/misc/promql-cli { }; - - prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; - prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; - prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; - prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; - prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; - prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; - prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; - prometheus-bitcoin-exporter = callPackage ../servers/monitoring/prometheus/bitcoin-exporter.nix { }; - prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; - prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; - prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; - prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; - prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; - prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; - prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { }; - prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; - prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; - prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; - prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; - prometheus-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { }; - prometheus-ipmi-exporter = callPackage ../servers/monitoring/prometheus/ipmi-exporter.nix { }; - prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; - prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; - prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; - prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { }; - prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; - prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; - prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; - prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; - prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; - prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; - prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; - prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; - prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; - prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; - prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; - prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; - prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19 }; - prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; - prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; - prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; - prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; - prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; - prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; - prometheus-pve-exporter = callPackage ../servers/monitoring/prometheus/pve-exporter.nix { }; - prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; - prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; - prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; - prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; - prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; - prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; - prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; - prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; - prometheus-speedtest-exporter = callPackage ../servers/monitoring/prometheus/speedtest-exporter.nix { }; - prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; - prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; - prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; - prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { }; - prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { }; - prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; - - prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; - - proximity-sort = callPackage ../tools/misc/proximity-sort { }; - - psqlodbc = callPackage ../development/libraries/psqlodbc { }; public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { }; - pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { }; pypiserver = with python3Packages; toPythonApplication pypiserver; - qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; - qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { @@ -24944,29 +11172,8 @@ with pkgs; elixir = elixir_1_14; }; - radicale2 = callPackage ../servers/radicale/2.x.nix { }; - radicale3 = callPackage ../servers/radicale/3.x.nix { }; - radicale = radicale3; - rake = callPackage ../development/tools/build-managers/rake { }; - - rakkess = callPackage ../development/tools/rakkess { }; - - redis = callPackage ../servers/nosql/redis { }; - - redli = callPackage ../tools/networking/redli { }; - - redstore = callPackage ../servers/http/redstore { }; - - reproxy = callPackage ../servers/reproxy { }; - - restic = callPackage ../tools/backup/restic { }; - - restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; - - restya-board = callPackage ../servers/web-apps/restya-board { }; - rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; libtool = darwin.cctools; @@ -24977,22 +11184,8 @@ with pkgs; boost = boost172; }; - rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; - - roon-bridge = callPackage ../servers/roon-bridge { }; - - rpiplay = callPackage ../servers/rpiplay { }; - - roon-server = callPackage ../servers/roon-server { }; - rustic-rs = callPackage ../tools/backup/rustic-rs { inherit (darwin) Security; }; - supervise = callPackage ../tools/system/supervise { }; - - spamassassin = callPackage ../servers/mail/spamassassin { }; - - deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - samba4 = darwin.apple_sdk_11_0.callPackage ../servers/samba/4.x.nix { }; samba = samba4; @@ -25008,121 +11201,39 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; - shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; - shairport-sync = callPackage ../servers/shairport-sync { }; - - showoff = callPackage ../servers/http/showoff {}; - - serfdom = callPackage ../servers/serf { }; - - seyren = callPackage ../servers/monitoring/seyren { }; - - ruby-zoom = callPackage ../tools/text/ruby-zoom { }; - - sensu = callPackage ../servers/monitoring/sensu { }; - inherit (callPackages ../servers/monitoring/sensu-go { }) sensu-go-agent sensu-go-backend sensu-go-cli; - check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { }; - shishi = callPackage ../servers/shishi { pam = if stdenv.isLinux then pam else null; # see also openssl, which has/had this same trick }; - sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; - - sipwitch = callPackage ../servers/sip/sipwitch { }; - - slimserver = callPackage ../servers/slimserver { }; - - smcroute = callPackage ../servers/smcroute { }; - - snipe-it = callPackage ../servers/web-apps/snipe-it { }; - - sogo = callPackage ../servers/web-apps/sogo { }; - spacecookie = haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie; - spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - - spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; - - squid = callPackage ../servers/squid { }; - - duckling-proxy = callPackage ../servers/duckling-proxy { }; - - sslh = callPackage ../servers/sslh { }; - - thttpd = callPackage ../servers/http/thttpd { }; - - static-web-server = callPackage ../servers/static-web-server { }; - - storm = callPackage ../servers/computing/storm { }; - surrealdb = callPackage ../servers/nosql/surrealdb { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; - switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; - - slurm = callPackage ../servers/computing/slurm { }; - - slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { }; - - slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; - - systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - - tailscale = callPackage ../servers/tailscale { }; - - tailspin = callPackage ../tools/misc/tailspin { }; - - thanos = callPackage ../servers/monitoring/thanos { }; - - trafficserver = callPackage ../servers/http/trafficserver { }; - inherit (callPackages ../servers/http/tomcat { }) tomcat9 tomcat10; - tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; - torque = callPackage ../servers/computing/torque { autoreconfHook = buildPackages.autoreconfHook269; }; - tt-rss = callPackage ../servers/tt-rss { }; - tt-rss-plugin-feediron = callPackage ../servers/tt-rss/plugin-feediron { }; - tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { }; - tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { }; - tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { }; - - rss-bridge = callPackage ../servers/web-apps/rss-bridge { }; - - searx = callPackage ../servers/web-apps/searx { }; - searxng = python3Packages.toPythonModule (callPackage ../servers/web-apps/searxng { }); - selfoss = callPackage ../servers/web-apps/selfoss { }; - - shaarli = callPackage ../servers/web-apps/shaarli { }; - - shiori = callPackage ../servers/web-apps/shiori { }; - inherit (callPackages ../servers/web-apps/matomo {}) matomo matomo-beta; - axis2 = callPackage ../servers/http/tomcat/axis2 { }; - inherit (callPackages ../servers/unifi { }) unifiLTS unifi5 @@ -25131,60 +11242,20 @@ with pkgs; unifi = unifi7; - unifi-protect-backup = callPackage ../applications/backup/unifi-protect-backup { }; - - unifi-video = callPackage ../servers/unifi-video { }; - unpackerr = callPackage ../servers/unpackerr { inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; - urserver = callPackage ../servers/urserver { }; - - uxplay = callPackage ../servers/uxplay { }; - - vouch-proxy = callPackage ../servers/vouch-proxy { }; - - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; - - virtiofsd = callPackage ../servers/misc/virtiofsd { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; - vmagent = callPackage ../servers/monitoring/vmagent { }; - - vsftpd = callPackage ../servers/ftp/vsftpd { }; - - wallabag = callPackage ../servers/web-apps/wallabag { }; - - webdav = callPackage ../servers/webdav { }; - - webdav-server-rs = callPackage ../servers/webdav-server-rs { }; - - webmetro = callPackage ../servers/webmetro { }; - - wesher = callPackage ../servers/wesher { }; - - wishlist = callPackage ../servers/wishlist { }; - - wsdd = callPackage ../servers/wsdd { }; - - webhook = callPackage ../servers/http/webhook { }; - - xinetd = callPackage ../servers/xinetd { }; - - zookeeper = callPackage ../servers/zookeeper { }; - zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { openssl = openssl_1_1; }; xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; }; - xquartz = callPackage ../servers/x11/xquartz { }; - quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; @@ -25218,14 +11289,6 @@ with pkgs; in recurseIntoAttrs xorgPackages; - xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { }; - - xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - - yaws = callPackage ../servers/http/yaws { }; - - youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; - zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version}; agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; @@ -25245,68 +11308,20 @@ with pkgs; zabbix = zabbix50; - zipkin = callPackage ../servers/monitoring/zipkin { }; - ### SERVERS / GEOSPATIAL - geoserver = callPackage ../servers/geospatial/geoserver { }; - - mapcache = callPackage ../servers/geospatial/mapcache { }; - - mapproxy = callPackage ../servers/geospatial/mapproxy { }; - - mapserver = callPackage ../servers/geospatial/mapserver { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security; }; - mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; - - pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - t-rex = callPackage ../servers/geospatial/t-rex { inherit (darwin.apple_sdk.frameworks) Security; }; - tegola = callPackage ../servers/geospatial/tegola { }; - - tile38 = callPackage ../servers/geospatial/tile38 { }; - ### OS-SPECIFIC - afuse = callPackage ../os-specific/linux/afuse { }; - - autofs5 = callPackage ../os-specific/linux/autofs { }; - - _915resolution = callPackage ../os-specific/linux/915resolution { }; - - nfs-utils = callPackage ../os-specific/linux/nfs-utils { }; - - acpi = callPackage ../os-specific/linux/acpi { }; - - acpid = callPackage ../os-specific/linux/acpid { }; - - acpitool = callPackage ../os-specific/linux/acpitool { }; - alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; - alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { }; - - alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; - - tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - - alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; - alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; - alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; - alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; - alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; - alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; - alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; @@ -25322,46 +11337,16 @@ with pkgs; armTrustedFirmwareS905 ; - microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; - - microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; - - iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure; - aseq2json = callPackage ../os-specific/linux/aseq2json {}; - - atop = callPackage ../os-specific/linux/atop { }; - - audit = callPackage ../os-specific/linux/audit { }; - ath9k-htc-blobless-firmware = callPackage ../os-specific/linux/firmware/ath9k { }; ath9k-htc-blobless-firmware-unstable = callPackage ../os-specific/linux/firmware/ath9k { enableUnstable = true; }; - b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; - - b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { }; - - b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; - - below = callPackage ../os-specific/linux/below { }; - - bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; - - brillo = callPackage ../os-specific/linux/brillo { }; - - broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { }; - batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; - beefi = callPackage ../os-specific/linux/beefi { }; - - blktrace = callPackage ../os-specific/linux/blktrace { }; - bluez5 = callPackage ../os-specific/linux/bluez { }; bluez5-experimental = callPackage ../os-specific/linux/bluez { @@ -25372,15 +11357,6 @@ with pkgs; inherit (python3Packages) bedup; - bolt = callPackage ../os-specific/linux/bolt { }; - - bpf-linker = callPackage ../development/tools/bpf-linker { }; - - bpfmon = callPackage ../os-specific/linux/bpfmon { }; - - bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; - - busybox = callPackage ../os-specific/linux/busybox { }; busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { # musl roadmap has RISC-V support projected for 1.1.20 busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic" @@ -25388,35 +11364,13 @@ with pkgs; else busybox; }; - cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; - - cariddi = callPackage ../tools/security/cariddi { }; - - checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; - - checksec = callPackage ../os-specific/linux/checksec { }; - - cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cm-rgb = python3Packages.callPackage ../tools/system/cm-rgb { }; - cpustat = callPackage ../os-specific/linux/cpustat { }; - - cockroachdb = callPackage ../servers/sql/cockroachdb { }; - conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl; } // config.conky or {}); - conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; - - coredns = callPackage ../servers/dns/coredns { }; - - corerad = callPackage ../tools/networking/corerad { }; - - cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; - cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui { inherit (pkgs) meson; }; @@ -25425,20 +11379,6 @@ with pkgs; pythonPackages = python3Packages; }; - criu = callPackage ../os-specific/linux/criu { }; - - cryptomator = callPackage ../tools/security/cryptomator { }; - - cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; - - cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; - - cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; - - crda = callPackage ../os-specific/linux/crda { }; - - cshatag = callPackage ../os-specific/linux/cshatag { }; - # Darwin package set # # Even though this is a set of packages not single package, use `callPackage` @@ -25450,89 +11390,29 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; - displaylink = callPackage ../os-specific/linux/displaylink { inherit (linuxPackages) evdi; }; - dmidecode = callPackage ../os-specific/linux/dmidecode { }; - - dmtcp = callPackage ../os-specific/linux/dmtcp { }; - - directvnc = callPackage ../os-specific/linux/directvnc { }; - dmraid = callPackage ../os-specific/linux/dmraid { lvm2 = lvm2_dmeventd; }; - drbd = callPackage ../os-specific/linux/drbd { }; - - dropwatch = callPackage ../os-specific/linux/dropwatch { }; - - dsd = callPackage ../applications/radio/dsd { }; - - dstat = callPackage ../os-specific/linux/dstat { }; - - erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; - - fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release - fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; - - fsverity-utils = callPackage ../os-specific/linux/fsverity-utils { }; - - fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { }; - - fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; - - fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { }; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { openssl = openssl_1_1; }; - firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; - - fwts = callPackage ../os-specific/linux/fwts { }; - - gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; - - libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; - libuuid = if stdenv.isLinux then util-linuxMinimal else null; - light = callPackage ../os-specific/linux/light { }; - - lightum = callPackage ../os-specific/linux/lightum { }; - - ebtables = callPackage ../os-specific/linux/ebtables { }; - error-inject = callPackages ../os-specific/linux/error-inject { }; - extrace = callPackage ../os-specific/linux/extrace { }; - - facetimehd-calibration = callPackage ../os-specific/linux/firmware/facetimehd-calibration { }; - - facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; - - fan2go = callPackage ../os-specific/linux/fan2go { }; - - fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { inherit (linuxPackages) kernel; }; libffado = ffado; - fbterm = callPackage ../os-specific/linux/fbterm { }; - - firejail = callPackage ../os-specific/linux/firejail {}; - - fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; - - forkstat = callPackage ../os-specific/linux/forkstat { }; - freefall = callPackage ../os-specific/linux/freefall { inherit (linuxPackages) kernel; }; @@ -25544,18 +11424,6 @@ with pkgs; fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; - fxload = callPackage ../os-specific/linux/fxload { }; - - gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - - gmailctl = callPackage ../applications/networking/gmailctl { }; - - gometer = callPackage ../applications/misc/gometer { }; - - gomp = callPackage ../applications/version-management/gomp { }; - - gomplate = callPackage ../development/tools/gomplate { }; - gpm = callPackage ../servers/gpm { withNcurses = false; # Keep curses disabled for lack of value @@ -25566,30 +11434,12 @@ with pkgs; gpm-ncurses = gpm.override { withNcurses = true; }; - gpu-switch = callPackage ../os-specific/linux/gpu-switch { }; - - gradm = callPackage ../os-specific/linux/gradm { }; - - gt = callPackage ../os-specific/linux/gt { }; - - inherit (nodePackages) gtop; - - hd-idle = callPackage ../os-specific/linux/hd-idle { }; - - hdparm = callPackage ../os-specific/linux/hdparm { }; - - health-check = callPackage ../os-specific/linux/health-check { }; - - hibernate = callPackage ../os-specific/linux/hibernate { }; - - hostapd = callPackage ../os-specific/linux/hostapd { }; + inherit (nodePackages) gtop; htop = callPackage ../tools/system/htop { inherit (darwin) IOKit; }; - htop-vim = callPackage ../tools/system/htop/htop-vim.nix { }; - humility = callPackage ../development/tools/rust/humility { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -25598,35 +11448,8 @@ with pkgs; stdenv = gcc11Stdenv; }; - nmon = callPackage ../os-specific/linux/nmon { }; - - hwdata = callPackage ../os-specific/linux/hwdata { }; - i7z = qt5.callPackage ../os-specific/linux/i7z { }; - pcm = callPackage ../os-specific/linux/pcm { }; - - ifmetric = callPackage ../os-specific/linux/ifmetric {}; - - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils {}; - - intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; - - intel-cmt-cat = callPackage ../os-specific/linux/intel-cmt-cat { }; - - intel-compute-runtime = callPackage ../os-specific/linux/intel-compute-runtime { }; - - intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; - - level-zero = callPackage ../development/libraries/level-zero { }; - - iomelt = callPackage ../os-specific/linux/iomelt { }; - - iotop = callPackage ../os-specific/linux/iotop { }; - iotop-c = callPackage ../os-specific/linux/iotop-c { }; - - iproute2 = callPackage ../os-specific/linux/iproute { }; - iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping) @@ -25634,18 +11457,6 @@ with pkgs; iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; iptables-nftables-compat = iptables; - iptstate = callPackage ../os-specific/linux/iptstate { } ; - - ipset = callPackage ../os-specific/linux/ipset { }; - - irqbalance = callPackage ../os-specific/linux/irqbalance { }; - - itpp = callPackage ../development/libraries/science/math/itpp { }; - - iw = callPackage ../os-specific/linux/iw { }; - - iwd = callPackage ../os-specific/linux/iwd { }; - jfbview = callPackage ../os-specific/linux/jfbview { imlib2 = imlib2Full; }; @@ -25655,68 +11466,12 @@ with pkgs; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; - juju = callPackage ../applications/networking/juju { }; - - jujuutils = callPackage ../os-specific/linux/jujuutils { }; - - karabiner-elements = callPackage ../os-specific/darwin/karabiner-elements { }; - - kbd = callPackage ../os-specific/linux/kbd { }; - - kbdlight = callPackage ../os-specific/linux/kbdlight { }; - - kinect-audio-setup = callPackage ../os-specific/linux/kinect-audio-setup { }; - - kmscon = callPackage ../os-specific/linux/kmscon { }; - - kmscube = callPackage ../os-specific/linux/kmscube { }; - - kmsxx = callPackage ../development/libraries/kmsxx { }; - - latencytop = callPackage ../os-specific/linux/latencytop { }; - - ldm = callPackage ../os-specific/linux/ldm { }; - - libaio = callPackage ../os-specific/linux/libaio { }; - - libajantv2 = callPackage ../development/libraries/libajantv2 {}; - - libargon2 = callPackage ../development/libraries/libargon2 { }; - - libatasmart = callPackage ../os-specific/linux/libatasmart { }; - - libax25 = callPackage ../development/libraries/libax25 { }; - - libcgroup = callPackage ../os-specific/linux/libcgroup { }; - libkrun = callPackage ../development/libraries/libkrun { inherit (darwin.apple_sdk.frameworks) Hypervisor; }; libkrun-sev = libkrun.override { sevVariant = true; }; - libkrunfw = callPackage ../development/libraries/libkrunfw { }; - - libnl = callPackage ../os-specific/linux/libnl { }; - - libtraceevent = callPackage ../os-specific/linux/libtraceevent {}; - - libtracefs = callPackage ../os-specific/linux/libtracefs {}; - - lieer = callPackage ../applications/networking/lieer {}; - - linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - - linux-wifi-hotspot = callPackage ../os-specific/linux/linux-wifi-hotspot { }; - - linthesia = callPackage ../games/linthesia/default.nix { }; - - libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; - - openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - - open-isns = callPackage ../os-specific/linux/open-isns { }; - osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -25726,22 +11481,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; - osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; - - plistwatch = callPackage ../os-specific/darwin/plistwatch { }; - - power-calibrate = callPackage ../os-specific/linux/power-calibrate { }; - - powercap = callPackage ../os-specific/linux/powercap { }; - - powerstat = callPackage ../os-specific/linux/powerstat { }; - projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { }; - smemstat = callPackage ../os-specific/linux/smemstat { }; - - tgt = callPackage ../tools/networking/tgt { }; - lkl = callPackage ../applications/virtualization/lkl { }; lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; }; @@ -25756,8 +11497,6 @@ with pkgs; }; }); - klibc = callPackage ../os-specific/linux/klibc { }; - klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); linuxKernel = recurseIntoAttrs (callPackage ./linux-kernels.nix { }); @@ -25843,18 +11582,12 @@ with pkgs; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; - linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; - cryptodev = linuxKernel.packages.linux_4_9.cryptodev; dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod }; - keyutils = callPackage ../os-specific/linux/keyutils { }; - - libselinux = callPackage ../os-specific/linux/libselinux { }; - libsemanage = callPackage ../os-specific/linux/libsemanage { python = python3; }; @@ -25863,11 +11596,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - libraw = callPackage ../development/libraries/libraw { }; - libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { }; - - libraw1394 = callPackage ../development/libraries/libraw1394 { }; - librealsense = callPackage ../development/libraries/librealsense { }; librealsenseWithCuda = callPackage ../development/libraries/librealsense { @@ -25885,40 +11613,6 @@ with pkgs; enableGUI = true; }; - libsass = callPackage ../development/libraries/libsass { }; - - libsepol = callPackage ../os-specific/linux/libsepol { }; - - libsmbios = callPackage ../os-specific/linux/libsmbios { }; - - libsurvive = callPackage ../development/libraries/libsurvive { }; - - lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; - - lockdep = callPackage ../os-specific/linux/lockdep { }; - - lsirec = callPackage ../os-specific/linux/lsirec { }; - - lsiutil = callPackage ../os-specific/linux/lsiutil { }; - - kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { }; - - kmod = callPackage ../os-specific/linux/kmod { }; - - kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; - - kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; - - libcap = callPackage ../os-specific/linux/libcap { }; - - libcap_ng = callPackage ../os-specific/linux/libcap-ng { }; - - libnotify = callPackage ../development/libraries/libnotify { }; - - libvolume_id = callPackage ../os-specific/linux/libvolume_id { }; - - lsscsi = callPackage ../os-specific/linux/lsscsi { }; - lvm2-2_03 = callPackage ../os-specific/linux/lvm2/2_03.nix { # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part @@ -25942,26 +11636,7 @@ with pkgs; enableVDO = true; }; - maddy = callPackage ../servers/maddy { }; - - mbelib = callPackage ../development/libraries/audio/mbelib { }; - - mbpfan = callPackage ../os-specific/linux/mbpfan { }; - mdadm = mdadm4; - mdadm4 = callPackage ../os-specific/linux/mdadm { }; - - mdevctl = callPackage ../os-specific/linux/mdevctl { }; - - metastore = callPackage ../os-specific/linux/metastore { }; - - mingetty = callPackage ../os-specific/linux/mingetty { }; - - miraclecast = callPackage ../os-specific/linux/miraclecast { }; - - mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { }; - - mmc-utils = callPackage ../os-specific/linux/mmc-utils { }; aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { @@ -25969,17 +11644,6 @@ with pkgs; inherit modules; }; - multipart-parser-c = callPackage ../development/libraries/multipart-parser-c { }; - - multipath-tools = callPackage ../os-specific/linux/multipath-tools { }; - - musl = callPackage ../os-specific/linux/musl { }; - - musl-fts = callPackage ../os-specific/linux/musl-fts { }; - musl-obstack = callPackage ../os-specific/linux/musl-obstack { }; - - nsh = callPackage ../shells/nsh { }; - nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security; inherit (darwin.apple_sdk) sdk; @@ -25989,245 +11653,38 @@ with pkgs; then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; - nftables = callPackage ../os-specific/linux/nftables { }; - noah = callPackage ../os-specific/darwin/noah { inherit (darwin.apple_sdk.frameworks) Hypervisor; }; - numactl = callPackage ../os-specific/linux/numactl { }; - - numad = callPackage ../os-specific/linux/numad { }; - - nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; - - nvmet-cli = callPackage ../os-specific/linux/nvmet-cli { }; - - system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; - - system76-keyboard-configurator = callPackage ../applications/misc/system76-keyboard-configurator { }; - - ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { }; - - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - oxtools = callPackage ../os-specific/linux/oxtools { }; - - air = callPackage ../development/tools/air { }; - - delve = callPackage ../development/tools/delve { }; - - dep = callPackage ../development/tools/dep { }; - - dep2nix = callPackage ../development/tools/dep2nix { }; - - easyjson = callPackage ../development/tools/easyjson { }; - - iferr = callPackage ../development/tools/iferr { }; - - gci = callPackage ../development/tools/gci { }; - - ginkgo = callPackage ../development/tools/ginkgo { }; - gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { inherit (darwin.apple_sdk_11_0.frameworks) OpenGL AppKit; }; - go-bindata = callPackage ../development/tools/go-bindata { }; - - go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; - - go-minimock = callPackage ../development/tools/go-minimock { }; - - go-protobuf = callPackage ../development/tools/go-protobuf { }; - - go-symbols = callPackage ../development/tools/go-symbols { }; - - go-toml = callPackage ../development/tools/go-toml { }; - - go-outline = callPackage ../development/tools/go-outline { }; - - gocode = callPackage ../development/tools/gocode { }; - - gocode-gomod = callPackage ../development/tools/gocode-gomod { }; - - goconst = callPackage ../development/tools/goconst { }; - - goconvey = callPackage ../development/tools/goconvey { }; - - gofumpt = callPackage ../development/tools/gofumpt { }; - - gotags = callPackage ../development/tools/gotags { }; - - go-task = callPackage ../development/tools/go-task { }; - - golines = callPackage ../development/tools/golines { }; - - golint = callPackage ../development/tools/golint { }; - - golangci-lint = callPackage ../development/tools/golangci-lint { }; - - golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { }; - - gocyclo = callPackage ../development/tools/gocyclo { }; - - godef = callPackage ../development/tools/godef { }; - - gopkgs = callPackage ../development/tools/gopkgs { }; - - gosec = callPackage ../development/tools/gosec { }; - - govers = callPackage ../development/tools/govers { }; - - govendor = callPackage ../development/tools/govendor { }; - - go-tools = callPackage ../development/tools/go-tools { }; - - gotest = callPackage ../development/tools/gotest { }; - - gotestfmt = callPackage ../development/tools/gotestfmt { }; - - gotools = callPackage ../development/tools/gotools { }; - gotop = callPackage ../tools/system/gotop { inherit (darwin.apple_sdk.frameworks) IOKit; }; - go-migrate = callPackage ../development/tools/go-migrate { }; - - go-mockery = callPackage ../development/tools/go-mockery { }; - - gomacro = callPackage ../development/tools/gomacro { }; - - gomodifytags = callPackage ../development/tools/gomodifytags { }; - - gops = callPackage ../development/tools/gops { }; - - gore = callPackage ../development/tools/gore { }; - - goresym = callPackage ../development/tools/goresym { }; - - gotests = callPackage ../development/tools/gotests { }; - - gotestsum = callPackage ../development/tools/gotestsum { }; - - impl = callPackage ../development/tools/impl { }; - - moq = callPackage ../development/tools/moq { }; - - quicktemplate = callPackage ../development/tools/quicktemplate { }; - - linux_logo = callPackage ../tools/misc/linux-logo { }; - - linux-pam = callPackage ../os-specific/linux/pam { }; - - nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; - - octomap = callPackage ../development/libraries/octomap { }; - - odin = callPackage ../development/compilers/odin { }; - odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { openssl = openssl_1_1; }; - odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; - - ofono = callPackage ../tools/networking/ofono { }; - okapi = callPackage ../development/libraries/okapi { inherit (darwin.apple_sdk.frameworks) Security; }; - openpam = callPackage ../development/libraries/openpam { }; - - openbsm = callPackage ../development/libraries/openbsm { }; - - pagemon = callPackage ../os-specific/linux/pagemon { }; - pam = if stdenv.isLinux then linux-pam else openpam; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) - pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; - - pam_gnupg = callPackage ../os-specific/linux/pam_gnupg { }; - - pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; - - pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; - - pam_mount = callPackage ../os-specific/linux/pam_mount { }; - - pam_mysql = callPackage ../os-specific/linux/pam_mysql { }; - - pam_p11 = callPackage ../os-specific/linux/pam_p11 { }; - - pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; - - pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { }; - - pam_tmpdir = callPackage ../os-specific/linux/pam_tmpdir { }; - - pam_u2f = callPackage ../os-specific/linux/pam_u2f { }; - - pam_usb = callPackage ../os-specific/linux/pam_usb { }; - - pam_ussh = callPackage ../os-specific/linux/pam_ussh { }; - - paxctl = callPackage ../os-specific/linux/paxctl { }; - - paxtest = callPackage ../os-specific/linux/paxtest { }; - - pax-utils = callPackage ../os-specific/linux/pax-utils { }; - - pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { }; - - pcstat = callPackage ../tools/system/pcstat { }; - - perf-tools = callPackage ../os-specific/linux/perf-tools { }; - - pipes = callPackage ../misc/screensavers/pipes { }; - - pipes-rs = callPackage ../misc/screensavers/pipes-rs { }; - - pipework = callPackage ../os-specific/linux/pipework { }; - pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; }; - plymouth = callPackage ../os-specific/linux/plymouth { }; - - pmount = callPackage ../os-specific/linux/pmount { }; - - pmutils = callPackage ../os-specific/linux/pm-utils { }; - - policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; - - semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - - pdns = callPackage ../servers/dns/pdns { }; - - powerdns-admin = callPackage ../applications/networking/powerdns-admin { }; - - dnsdist = callPackage ../servers/dns/dnsdist { }; - - pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; - - powertop = callPackage ../os-specific/linux/powertop { }; - - pps-tools = callPackage ../os-specific/linux/pps-tools { }; - - prayer = callPackage ../servers/prayer { }; - procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; - procdump = callPackage ../os-specific/linux/procdump { }; - - prototool = callPackage ../development/tools/prototool { }; - qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; }); @@ -26240,130 +11697,21 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); - quick-lint-js = callPackage ../development/tools/quick-lint-js { }; - - linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; - - qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; - - radeontools = callPackage ../os-specific/linux/radeontools { }; - - radeontop = callPackage ../os-specific/linux/radeontop { }; - - rasdaemon = callPackage ../os-specific/linux/rasdaemon { }; - - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; - raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; - - raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; - - raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix {}; - - reap = callPackage ../os-specific/linux/reap { }; - - rectangle = callPackage ../os-specific/darwin/rectangle { }; - - regionset = callPackage ../os-specific/linux/regionset { }; - - rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; - - riscv-pk = callPackage ../misc/riscv-pk { }; - - ristate = callPackage ../tools/misc/ristate { }; - - roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; - - rojo = callPackage ../development/tools/rojo { }; - - rtsp-simple-server = callPackage ../servers/rtsp-simple-server { }; - - rtkit = callPackage ../os-specific/linux/rtkit { }; - - rt-tests = callPackage ../os-specific/linux/rt-tests { }; - - rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; - - rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { }; - - rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; - - rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; - - rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; - - rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { }; - - s3ql = callPackage ../tools/backup/s3ql { }; - - sasutils = callPackage ../os-specific/linux/sasutils { }; - - sass = callPackage ../development/tools/sass { }; - - sassc = callPackage ../development/tools/sassc { }; - - scanmem = callPackage ../tools/misc/scanmem { }; - - schedtool = callPackage ../os-specific/linux/schedtool { }; - - sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { boost = boost172; }; - setools = callPackage ../os-specific/linux/setools { }; - - seturgent = callPackage ../os-specific/linux/seturgent { }; - - sgx-azure-dcap-client = callPackage ../os-specific/linux/sgx/azure-dcap-client { }; - sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { }; - sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; - - sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; - - shadow = callPackage ../os-specific/linux/shadow { }; - - shortcat = callPackage ../os-specific/darwin/shortcat { }; - sinit = callPackage ../os-specific/linux/sinit { rcinit = "/etc/rc.d/rc.init"; rcshutdown = "/etc/rc.d/rc.shutdown"; }; - skopeo = callPackage ../development/tools/skopeo { }; - - smem = callPackage ../os-specific/linux/smem { }; - - smimesign = callPackage ../os-specific/darwin/smimesign { }; - - solo5 = callPackage ../os-specific/solo5 { }; - - statik = callPackage ../development/tools/statik { }; - - statifier = callPackage ../os-specific/linux/statifier { }; - - steamos-devkit = callPackage ../development/tools/steamos-devkit { }; - - swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; - sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # sysdig is a client, for a driver look at linuxPackagesFor - sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; - - sysprof = callPackage ../development/tools/profiling/sysprof { }; - - libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { }; - - sysklogd = callPackage ../os-specific/linux/sysklogd { }; - - syslinux = callPackage ../os-specific/linux/syslinux { }; - - sysstat = callPackage ../os-specific/linux/sysstat { }; - systemd = callPackage ../os-specific/linux/systemd { # break some cyclic dependencies util-linux = util-linuxMinimal; @@ -26421,39 +11769,16 @@ with pkgs; if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero else systemd; # TODO: change to systemdMinimal - systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; - - sysvinit = callPackage ../os-specific/linux/sysvinit { }; - sysvtools = sysvinit.override { withoutInitTools = true; }; # FIXME: `tcp-wrapper' is actually not OS-specific. - tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { }; - - teck-udev-rules = callPackage ../os-specific/linux/teck-udev-rules { }; - - tiptop = callPackage ../os-specific/linux/tiptop { }; - - tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { }; - - trickster = callPackage ../servers/trickster/trickster.nix {}; - - trinity = callPackage ../os-specific/linux/trinity { }; - - trino-cli = callPackage ../development/tools/database/trino-cli { }; trinsic-cli = callPackage ../tools/admin/trinsic-cli { inherit (darwin.apple_sdk.frameworks) Security; }; - tunctl = callPackage ../os-specific/linux/tunctl { }; - - twa = callPackage ../tools/networking/twa { }; - - twingate = callPackage ../applications/networking/twingate { }; - # Upstream U-Boots: inherit (callPackage ../misc/uboot {}) buildUBoot @@ -26521,32 +11846,8 @@ with pkgs; eudev = callPackage ../os-specific/linux/eudev { util-linux = util-linuxMinimal; }; - libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; - - udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; udisks = udisks2; - ugtrain = callPackage ../tools/misc/ugtrain { }; - - unscd = callPackage ../os-specific/linux/unscd { }; - - untie = callPackage ../os-specific/linux/untie { }; - - upower = callPackage ../os-specific/linux/upower { }; - - usbguard = callPackage ../os-specific/linux/usbguard { }; - - usbrelay = callPackage ../os-specific/linux/usbrelay { }; - usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; - - usbtop = callPackage ../os-specific/linux/usbtop { }; - - usbutils = callPackage ../os-specific/linux/usbutils { }; - - userhosts = callPackage ../tools/networking/userhosts { }; - - usermount = callPackage ../os-specific/linux/usermount { }; - util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } else unixtools.util-linux; @@ -26559,42 +11860,14 @@ with pkgs; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; - vendir = callPackage ../development/tools/vendir { }; - - vndr = callPackage ../development/tools/vndr { }; - - vdo = callPackage ../os-specific/linux/vdo { }; - windows = callPackages ../os-specific/windows {}; - wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; - - wooting-udev-rules = callPackage ../os-specific/linux/wooting-udev-rules { }; - - teensy-udev-rules = callPackage ../os-specific/linux/teensy-udev-rules { }; - - wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - wpa_supplicant_ro_ssids = wpa_supplicant.override { readOnlyModeSSIDs = true; }; wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; - xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; - - xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; - - xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; - - xilinx-bootgen = callPackage ../tools/misc/xilinx-bootgen { }; - - xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; - - zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; - - zenmonitor = callPackage ../os-specific/linux/zenmonitor { }; - inherit (callPackages ../os-specific/linux/zfs { configFile = "user"; }) zfsStable zfsUnstable; @@ -26603,172 +11876,15 @@ with pkgs; ### DATA - _3270font = callPackage ../data/fonts/3270font { }; - - adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; - - adapta-gtk-theme = callPackage ../data/themes/adapta { }; - - adapta-kde-theme = callPackage ../data/themes/adapta-kde { }; - - adementary-theme = callPackage ../data/themes/adementary { }; - adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt { useQt6 = true; }; - adw-gtk3 = callPackage ../data/themes/adw-gtk3 { }; - - agave = callPackage ../data/fonts/agave { }; - - aileron = callPackage ../data/fonts/aileron { }; - - albatross = callPackage ../data/themes/albatross { }; - - alegreya = callPackage ../data/fonts/alegreya { }; - - alegreya-sans = callPackage ../data/fonts/alegreya-sans { }; - - alice = callPackage ../data/fonts/alice { }; - - alkalami = callPackage ../data/fonts/alkalami { }; - - amber-theme = callPackage ../data/themes/amber { }; - - amiri = callPackage ../data/fonts/amiri { }; - - anarchism = callPackage ../data/documentation/anarchism { }; - - ananicy = callPackage ../misc/ananicy { }; - - ananicy-cpp = callPackage ../misc/ananicy-cpp { }; - - andagii = callPackage ../data/fonts/andagii { }; - - andika = callPackage ../data/fonts/andika { }; - androguard = with python3.pkgs; toPythonApplication androguard; - android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; - - ankacoder = callPackage ../data/fonts/ankacoder { }; - ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { }; - - annapurna-sil = callPackage ../data/fonts/annapurna-sil { }; - - anonymousPro = callPackage ../data/fonts/anonymous-pro { }; - - ant-theme = callPackage ../data/themes/ant-theme/ant.nix { }; - - ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { }; - - dracula-theme = callPackage ../data/themes/dracula-theme { }; - - ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { }; - - arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; - - arc-kde-theme = callPackage ../data/themes/arc-kde { }; - - arc-theme = callPackage ../data/themes/arc { }; - - arkpandora_ttf = callPackage ../data/fonts/arkpandora { }; - - aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; - - ayu-theme-gtk = callPackage ../data/themes/ayu-theme-gtk { }; - - b612 = callPackage ../data/fonts/b612 { }; - - babelstone-han = callPackage ../data/fonts/babelstone-han { }; - - baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { }; - - bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; - - barlow = callPackage ../data/fonts/barlow { }; - - bgnet = callPackage ../data/documentation/bgnet { }; - bibata-cursors = callPackage ../data/icons/bibata-cursors { attrs = python3Packages.attrs; }; - bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { }; - bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; - - apple-cursor = callPackage ../data/icons/apple-cursor { }; - - blackbird = callPackage ../data/themes/blackbird { }; - - brise = callPackage ../data/misc/brise { }; - - cacert = callPackage ../data/misc/cacert { }; - - caladea = callPackage ../data/fonts/caladea {}; - - canta-theme = callPackage ../data/themes/canta { }; - - cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { }; - - capitaine-cursors = callPackage ../data/icons/capitaine-cursors { }; - - capitaine-cursors-themed = callPackage ../data/icons/capitaine-cursors-themed { }; - - carlito = callPackage ../data/fonts/carlito {}; - - cascadia-code = callPackage ../data/fonts/cascadia-code { }; - - catppuccin-cursors = callPackage ../data/icons/catppuccin-cursors { }; - - ccsymbols = callPackage ../data/fonts/ccsymbols { }; - - charis-sil = callPackage ../data/fonts/charis-sil { }; - - changie = callPackage ../development/tools/changie { }; - - cherry = callPackage ../data/fonts/cherry { }; - - chonburi-font = callPackage ../data/fonts/chonburi { }; - - cldr-annotations = callPackage ../data/misc/cldr-annotations { }; - - clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - - cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; - - colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { }; - - colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { }; - - comfortaa = callPackage ../data/fonts/comfortaa {}; - - colloid-kde = callPackage ../data/themes/colloid-kde {}; - - comic-mono = callPackage ../data/fonts/comic-mono { }; - - comic-neue = callPackage ../data/fonts/comic-neue { }; - - comic-relief = callPackage ../data/fonts/comic-relief {}; - - comixcursors = callPackage ../data/icons/comixcursors {}; - - corefonts = callPackage ../data/fonts/corefonts { }; - - courier-prime = callPackage ../data/fonts/courier-prime { }; - - cozette = callPackage ../data/fonts/cozette { }; - - culmus = callPackage ../data/fonts/culmus { }; - - clearlyU = callPackage ../data/fonts/clearlyU { }; - - cm_unicode = callPackage ../data/fonts/cm-unicode {}; - - creep = callPackage ../data/fonts/creep { }; - - crimson = callPackage ../data/fonts/crimson {}; - - crimson-pro = callPackage ../data/fonts/crimson-pro {}; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); @@ -26778,17 +11894,6 @@ with pkgs; paths = [ dejavu_fonts.out ]; }; - dina-font = callPackage ../data/fonts/dina { }; - - dm-sans = callPackage ../data/fonts/dm-sans { }; - dns-root-data = callPackage ../data/misc/dns-root-data { }; - - docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; - - docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; - - docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { }; - docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { }; docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { }; @@ -26799,8 +11904,6 @@ with pkgs; docbook_xml_dtd_45 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { }; - docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { }; - inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { }) docbook-xsl-nons docbook-xsl-ns; @@ -26809,140 +11912,21 @@ with pkgs; docbook_xsl = docbook-xsl-nons; docbook_xsl_ns = docbook-xsl-ns; - documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - - mmdoc = callPackage ../tools/text/mmdoc { }; - - documize-community = callPackage ../servers/documize-community { }; - - doge = callPackage ../misc/doge { }; - - doulos-sil = callPackage ../data/fonts/doulos-sil { }; - - cabin = callPackage ../data/fonts/cabin { }; - - camingo-code = callPackage ../data/fonts/camingo-code { }; - - combinatorial_designs = callPackage ../data/misc/combinatorial_designs { }; - - conway_polynomials = callPackage ../data/misc/conway_polynomials { }; - - cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { }; - - d2coding = callPackage ../data/fonts/d2coding { }; - - dosis = callPackage ../data/fonts/dosis { }; - - dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; - - e17gtk = callPackage ../data/themes/e17gtk { }; - - eb-garamond = callPackage ../data/fonts/eb-garamond { }; - - edukai = callPackage ../data/fonts/edukai { }; - - eduli = callPackage ../data/fonts/eduli { }; - moeli = eduli; - edusong = callPackage ../data/fonts/edusong { }; - - efont-unicode = callPackage ../data/fonts/efont-unicode { }; - - elliptic_curves = callPackage ../data/misc/elliptic_curves { }; - - equilux-theme = callPackage ../data/themes/equilux-theme { }; - - eunomia = callPackage ../data/fonts/eunomia { }; - - f5_6 = callPackage ../data/fonts/f5_6 { }; - - faba-icon-theme = callPackage ../data/icons/faba-icon-theme { }; - - faba-mono-icons = callPackage ../data/icons/faba-mono-icons { }; - - ferrum = callPackage ../data/fonts/ferrum { }; - - fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { }; - - graphs = callPackage ../data/misc/graphs { }; - - emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { }; - emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; }; - emojipick = callPackage ../applications/misc/emojipick { }; - - encode-sans = callPackage ../data/fonts/encode-sans { }; - - envypn-font = callPackage ../data/fonts/envypn-font { }; - - ezra-sil = callPackage ../data/fonts/ezra-sil { }; - - fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; - - fira = callPackage ../data/fonts/fira { }; - - fira-code = callPackage ../data/fonts/fira-code { }; - fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; - - fira-go = callPackage ../data/fonts/fira-go { }; - - fira-mono = callPackage ../data/fonts/fira-mono { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; - flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; - flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - - fluent-gtk-theme = callPackage ../data/themes/fluent-gtk-theme { }; - - fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5; font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6; font-awesome = font-awesome_6; - fraunces = callPackage ../data/fonts/fraunces { }; - - freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; - - freepats = callPackage ../data/misc/freepats { }; - - garamond-libre = callPackage ../data/fonts/garamond-libre { }; - - g15daemon = callPackage ../os-specific/linux/g15daemon {}; - - galatia-sil = callPackage ../data/fonts/galatia-sil { }; - - gentium = callPackage ../data/fonts/gentium {}; - - gentium-book-basic = callPackage ../data/fonts/gentium-book-basic {}; - - geolite-legacy = callPackage ../data/misc/geolite-legacy { }; - - gohufont = callPackage ../data/fonts/gohufont { }; - - gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; - - gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; - - gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { }; - - go-font = callPackage ../data/fonts/go-font { }; - - graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; - - graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; - - greybird = callPackage ../data/themes/greybird { }; - - gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; - palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; }; amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; }; @@ -26957,170 +11941,32 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - gruvbox-gtk-theme = callPackage ../data/themes/gruvbox-gtk-theme {}; - - gubbi-font = callPackage ../data/fonts/gubbi { }; - - gyre-fonts = callPackage ../data/fonts/gyre {}; - - hack-font = callPackage ../data/fonts/hack { }; - - hackgen-font = callPackage ../data/fonts/hackgen { }; - - hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { }; - - helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - - helvum = callPackage ../applications/audio/helvum { }; - - hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; - - hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; - - hannom = callPackage ../data/fonts/hannom { }; - - hanazono = callPackage ../data/fonts/hanazono { }; - - hermit = callPackage ../data/fonts/hermit { }; - - hubot-sans = callPackage ../data/fonts/hubot-sans { }; - - humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { }; - - hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; - - ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { }; - - i-dot-ming = callPackage ../data/fonts/i-dot-ming { }; - - ibm-plex = callPackage ../data/fonts/ibm-plex { }; - - iconpack-jade = callPackage ../data/icons/iconpack-jade { }; - - iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; - - inconsolata = callPackage ../data/fonts/inconsolata {}; - - inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; - inconsolata-nerdfont = nerdfonts.override { fonts = [ "Inconsolata" ]; }; - input-fonts = callPackage ../data/fonts/input-fonts { }; - - inriafonts = callPackage ../data/fonts/inriafonts { }; - - iosevka = callPackage ../data/fonts/iosevka {}; - iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {}; - iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); - - ipafont = callPackage ../data/fonts/ipafont {}; - ipaexfont = callPackage ../data/fonts/ipaexfont {}; - - iwona = callPackage ../data/fonts/iwona { }; - - jetbrains-mono = callPackage ../data/fonts/jetbrains-mono { }; - - jost = callPackage ../data/fonts/jost { }; - - joypixels = callPackage ../data/fonts/joypixels { }; - - junicode = callPackage ../data/fonts/junicode { }; - - julia-mono = callPackage ../data/fonts/julia-mono { }; - - juno-theme = callPackage ../data/themes/juno { }; - - kanit-font = callPackage ../data/fonts/kanit { }; - - kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; - - kacst = callPackage ../data/fonts/kacst {}; - - kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - - kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; - - khmeros = callPackage ../data/fonts/khmeros {}; - - kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; - - kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - - kopia = callPackage ../tools/backup/kopia { }; - - kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome) adwaita-icon-theme; - inherit (libsForQt5.kdeFrameworks) breeze-icons; - }; - - koreader = callPackage ../applications/misc/koreader {}; - - kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; - - la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { - inherit (plasma5Packages) breeze-icons; - inherit (pantheon) elementary-icon-theme; - }; - - layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; - - layan-kde = callPackage ../data/themes/layan-kde { }; - - lao = callPackage ../data/fonts/lao {}; - - lato = callPackage ../data/fonts/lato {}; - - league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; - - ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; - - inherit (callPackages ../data/fonts/liberation-fonts { }) - liberation_ttf_v1 - liberation_ttf_v2 - ; - liberation_ttf = liberation_ttf_v2; - - liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; - - libevdevc = callPackage ../os-specific/linux/libevdevc { }; - - libgestures = callPackage ../os-specific/linux/libgestures { }; - - liberastika = callPackage ../data/fonts/liberastika { }; - - libertine = callPackage ../data/fonts/libertine { }; - - libertinus = callPackage ../data/fonts/libertinus { }; - - libratbag = callPackage ../os-specific/linux/libratbag { }; - - librist = callPackage ../development/libraries/librist { }; - - libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; - - libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; - - libre-caslon = callPackage ../data/fonts/libre-caslon { }; - - libre-franklin = callPackage ../data/fonts/libre-franklin { }; - - lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; - - line-awesome = callPackage ../data/fonts/line-awesome { }; - - linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {}; + iosevka = callPackage ../data/fonts/iosevka {}; + iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); - linux-manual = callPackage ../data/documentation/linux-manual { }; + kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; - lklug-sinhala = callPackage ../data/fonts/lklug-sinhala {}; + kora-icon-theme = callPackage ../data/icons/kora-icon-theme { + inherit (gnome) adwaita-icon-theme; + inherit (libsForQt5.kdeFrameworks) breeze-icons; + }; - lmmath = callPackage ../data/fonts/lmmath {}; + la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { + inherit (plasma5Packages) breeze-icons; + inherit (pantheon) elementary-icon-theme; + }; - lmodern = callPackage ../data/fonts/lmodern { }; + inherit (callPackages ../data/fonts/liberation-fonts { }) + liberation_ttf_v1 + liberation_ttf_v2 + ; + liberation_ttf = liberation_ttf_v2; - logiops = callPackage ../misc/drivers/logiops { }; + lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules @@ -27132,122 +11978,24 @@ with pkgs; # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } ); - lounge-gtk-theme = callPackage ../data/themes/lounge { }; - - luculent = callPackage ../data/fonts/luculent { }; - luna-icons = callPackage ../data/icons/luna-icons { inherit (plasma5Packages) breeze-icons; }; - lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { }; - maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; - mailcap = callPackage ../data/misc/mailcap { }; - - marathi-cursive = callPackage ../data/fonts/marathi-cursive { }; - - man-pages = callPackage ../data/documentation/man-pages { }; - - man-pages-posix = callPackage ../data/documentation/man-pages-posix { }; - - manrope = callPackage ../data/fonts/manrope { }; - - martian-mono = callPackage ../data/fonts/martian-mono { }; - - marwaita = callPackage ../data/themes/marwaita { }; - - marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; - - marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; - - marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; - - marwaita-ubuntu = callPackage ../data/themes/marwaita-ubuntu { }; - - matcha-gtk-theme = callPackage ../data/themes/matcha { }; - - materia-theme = callPackage ../data/themes/materia-theme { }; - - materia-kde-theme = callPackage ../data/themes/materia-kde { }; - - material-design-icons = callPackage ../data/fonts/material-design-icons { }; - - material-icons = callPackage ../data/fonts/material-icons { }; - material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { }; - meslo-lg = callPackage ../data/fonts/meslo-lg {}; - - meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf {}; - - migmix = callPackage ../data/fonts/migmix {}; - - migu = callPackage ../data/fonts/migu {}; - - miscfiles = callPackage ../data/misc/miscfiles { }; - - media-player-info = callPackage ../data/misc/media-player-info {}; - - medio = callPackage ../data/fonts/medio { }; - - mno16 = callPackage ../data/fonts/mno16 { }; - - mnist = callPackage ../data/machine-learning/mnist { }; - - mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; - mojave-gtk-theme = callPackage ../data/themes/mojave { inherit (gnome) gnome-shell; }; - moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; - - mona-sans = callPackage ../data/fonts/mona-sans { }; - - monoid = callPackage ../data/fonts/monoid { }; - - mononoki = callPackage ../data/fonts/mononoki { }; - - montserrat = callPackage ../data/fonts/montserrat { }; - - mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; - mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { }); - mro-unicode = callPackage ../data/fonts/mro-unicode { }; - - mustache-spec = callPackage ../data/documentation/mustache-spec { }; - - mustache-go = callPackage ../development/tools/mustache-go { }; - - mustache-hpp = callPackage ../development/libraries/mustache-hpp { }; - - myrddin = callPackage ../development/compilers/myrddin { }; - - myrica = callPackage ../data/fonts/myrica { }; - - nafees = callPackage ../data/fonts/nafees { }; - - nanum = callPackage ../data/fonts/nanum { }; - - nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; - - national-park-typeface = callPackage ../data/fonts/national-park { }; - - netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; - netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration; }; - nordic = callPackage ../data/themes/nordic { }; - - nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; - - nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { }; - inherit (callPackages ../data/fonts/noto-fonts {}) mkNoto noto-fonts @@ -27258,10 +12006,6 @@ with pkgs; noto-fonts-emoji-blob-bin noto-fonts-extra; - nuclear = callPackage ../applications/audio/nuclear { }; - - nuclei = callPackage ../tools/security/nuclei { }; - nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; }; @@ -27271,56 +12015,10 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; - - numix-icon-theme-square = callPackage ../data/icons/numix-icon-theme-square { }; - - numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { }; - - numix-gtk-theme = callPackage ../data/themes/numix { }; - - numix-solarized-gtk-theme = callPackage ../data/themes/numix-solarized { }; - - numix-sx-gtk-theme = callPackage ../data/themes/numix-sx { }; - - office-code-pro = callPackage ../data/fonts/office-code-pro { }; - - oldstandard = callPackage ../data/fonts/oldstandard { }; - - oldsindhi = callPackage ../data/fonts/oldsindhi { }; - - omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { }; - - onestepback = callPackage ../data/themes/onestepback { }; - - open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; - - open-sans = callPackage ../data/fonts/open-sans { }; - openmoji-color = callPackage ../data/fonts/openmoji { variant = "color"; }; openmoji-black = callPackage ../data/fonts/openmoji { variant = "black"; }; - openzone-cursors = callPackage ../data/themes/openzone { }; - - oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { }; - - orbitron = callPackage ../data/fonts/orbitron { }; - - orbuculum = callPackage ../development/embedded/orbuculum { }; - - orchis-theme = callPackage ../data/themes/orchis-theme { }; - - orion = callPackage ../data/themes/orion {}; - - overpass = callPackage ../data/fonts/overpass { }; - - oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; - - paper-gtk-theme = callPackage ../data/themes/paper-gtk { }; - - paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; - papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -27329,274 +12027,65 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - papirus-folders = callPackage ../data/misc/papirus-folders { }; - - plasma-overdose-kde-theme = callPackage ../data/themes/plasma-overdose-kde-theme { }; - papis = with python3Packages; toPythonApplication papis; - paperlike-go = callPackage ../tools/misc/paperlike-go { }; - - paps = callPackage ../tools/misc/paps { }; - - pecita = callPackage ../data/fonts/pecita {}; - - paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; - paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix {}; - paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix {}; - - pari-galdata = callPackage ../data/misc/pari-galdata {}; - - pari-seadata-small = callPackage ../data/misc/pari-seadata-small {}; - - penna = callPackage ../data/fonts/penna { }; - - pitch-black = callPackage ../data/themes/pitch-black {}; - - plano-theme = callPackage ../data/themes/plano { }; - plata-theme = callPackage ../data/themes/plata { inherit (mate) marco; }; - poly = callPackage ../data/fonts/poly { }; - polychromatic = libsForQt5.callPackage ../applications/misc/polychromatic { }; - polytopes_db = callPackage ../data/misc/polytopes_db { }; - - pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { inherit (gnome) adwaita-icon-theme; }; - powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; - - powerline-symbols = callPackage ../data/fonts/powerline-symbols { }; - - powerline-go = callPackage ../tools/misc/powerline-go { }; - powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; }; - profont = callPackage ../data/fonts/profont { }; - - proggyfonts = callPackage ../data/fonts/proggyfonts { }; - - public-sans = callPackage ../data/fonts/public-sans { }; - - publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; - - phinger-cursors = callPackage ../data/icons/phinger-cursors { }; - - qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; - - qogir-kde = callPackage ../data/themes/qogir-kde { }; - - qogir-theme = callPackage ../data/themes/qogir { }; - - quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { }; - - redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; - - rime-data = callPackage ../data/misc/rime-data { }; - - roapi-http = callPackage ../servers/roapi/http.nix { }; - - rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; - rose-pine-icon-theme = callPackage ../data/icons/rose-pine { }; - - route159 = callPackage ../data/fonts/route159 { }; - - ruwudu = callPackage ../data/fonts/ruwudu { }; - - sampradaya = callPackage ../data/fonts/sampradaya { }; - - sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; - - savepagenow = callPackage ../tools/misc/savepagenow { }; - - scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; - - scowl = callPackage ../data/misc/scowl { }; - - seshat = callPackage ../data/fonts/seshat { }; - - session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; - shaderc = callPackage ../development/compilers/shaderc { inherit (darwin) autoSignDarwinBinariesHook cctools; }; - shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; - sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; - simp1e-cursors = callPackage ../data/icons/simp1e-cursors { }; - - sjasmplus = callPackage ../development/compilers/sjasmplus { }; - - skeu = callPackage ../data/themes/skeu { }; - - sweet = callPackage ../data/themes/sweet { }; - - shared-mime-info = callPackage ../data/misc/shared-mime-info { }; - - shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; - scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; }; scheherazade-new = callPackage ../data/fonts/scheherazade { }; - signwriting = callPackage ../data/fonts/signwriting { }; - - sierra-gtk-theme = callPackage ../data/themes/sierra { }; - - sil-abyssinica = callPackage ../data/fonts/sil-abyssinica { }; - - sil-padauk = callPackage ../data/fonts/sil-padauk { }; - - snap7 = callPackage ../development/libraries/snap7 {}; - - snowblind = callPackage ../data/themes/snowblind { }; - - solarc-gtk-theme = callPackage ../data/themes/solarc { }; - - soundfont-fluid = callPackage ../data/soundfonts/fluid { }; - - soundfont-generaluser = callPackage ../data/soundfonts/generaluser { }; - - soundfont-ydp-grand = callPackage ../data/soundfonts/ydp-grand { }; - - spdx-license-list-data = callPackage ../data/misc/spdx-license-list-data { }; - - stdmanpages = callPackage ../data/documentation/std-man-pages { }; - star-history = callPackage ../tools/misc/star-history { inherit (darwin.apple_sdk.frameworks) Security; }; - starfetch = callPackage ../tools/misc/starfetch { }; - starship = callPackage ../tools/misc/starship { inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa; }; - stig = callPackage ../applications/networking/p2p/stig { }; - - stix-otf = callPackage ../data/fonts/stix-otf { }; - - stix-two = callPackage ../data/fonts/stix-two { }; - - super-tiny-icons = callPackage ../data/icons/super-tiny-icons { }; - inherit (callPackages ../data/fonts/gdouros { }) aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings; - iana-etc = callPackage ../data/misc/iana-etc { }; - - poppler_data = callPackage ../data/misc/poppler-data { }; - inherit (callPackages ../data/fonts/pretendard { }) pretendard pretendard-jp pretendard-std; - quattrocento = callPackage ../data/fonts/quattrocento {}; - - quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {}; - - raleway = callPackage ../data/fonts/raleway { }; - - recursive = callPackage ../data/fonts/recursive { }; - - rubik = callPackage ../data/fonts/rubik { }; - - rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; - - rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { }; - - roboto = callPackage ../data/fonts/roboto { }; - - roboto-mono = callPackage ../data/fonts/roboto-mono { }; - - roboto-slab = callPackage ../data/fonts/roboto-slab { }; - - hasklig = callPackage ../data/fonts/hasklig {}; - - maligned = callPackage ../development/tools/maligned { }; - - inter = callPackage ../data/fonts/inter { }; - - open-fonts = callPackage ../data/fonts/open-fonts { }; - - scientifica = callPackage ../data/fonts/scientifica { }; - - siji = callPackage ../data/fonts/siji { }; - - sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; - - source-code-pro = callPackage ../data/fonts/source-code-pro {}; - - source-sans = callPackage ../data/fonts/source-sans { }; - source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; - - source-serif = callPackage ../data/fonts/source-serif { }; - source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; - - source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; - sourceHanPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han { }); source-han-sans = sourceHanPackages.sans; source-han-serif = sourceHanPackages.serif; source-han-mono = sourceHanPackages.mono; - spleen = callPackage ../data/fonts/spleen { }; - - stilo-themes = callPackage ../data/themes/stilo { }; - - sudo-font = callPackage ../data/fonts/sudo { }; - inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - takao = callPackage ../data/fonts/takao { }; - - taskspooler = callPackage ../tools/system/taskspooler { }; - - tamsyn = callPackage ../data/fonts/tamsyn { }; - - tamzen = callPackage ../data/fonts/tamzen { }; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; }; - theme-jade1 = callPackage ../data/themes/jade1 { }; - - theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; - themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; - theano = callPackage ../data/fonts/theano { }; - tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { inherit (gnome) adwaita-icon-theme; }; - tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; - - template-glib = callPackage ../development/libraries/template-glib { }; - - tempora_lgc = callPackage ../data/fonts/tempora-lgc { }; - - tenderness = callPackage ../data/fonts/tenderness { }; - - terminus_font = callPackage ../data/fonts/terminus-font { }; - - terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; - terminus-nerdfont = nerdfonts.override { fonts = [ "Terminus" ]; }; @@ -27605,120 +12094,18 @@ with pkgs; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; - theme-vertex = callPackage ../data/themes/vertex { }; - - tibetan-machine = callPackage ../data/fonts/tibetan-machine { }; - - times-newer-roman = callPackage ../data/fonts/times-newer-roman { }; - - tipa = callPackage ../data/fonts/tipa { }; - - ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; - - ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; - - ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; - - twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { }; - - twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; - - tzdata = callPackage ../data/misc/tzdata { }; - - ubuntu-themes = callPackage ../data/themes/ubuntu-themes { }; - - ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - - ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; - - bront_fonts = callPackage ../data/fonts/bront { }; - - ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; - - ultralist = callPackage ../applications/misc/ultralist { }; - - undefined-medium = callPackage ../data/fonts/undefined-medium { }; - - unfonts-core = callPackage ../data/fonts/unfonts-core { }; - - uni-vga = callPackage ../data/fonts/uni-vga { }; - - unicode-character-database = callPackage ../data/misc/unicode-character-database { }; - - unicode-emoji = callPackage ../data/misc/unicode-emoji { }; - - unihan-database = callPackage ../data/misc/unihan-database { }; - - unifont = callPackage ../data/fonts/unifont { }; - - unifont_upper = callPackage ../data/fonts/unifont_upper { }; - - unscii = callPackage ../data/fonts/unscii { }; - - uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { }; - - u001-font = callPackage ../data/fonts/u001 { }; - - vanilla-dmz = callPackage ../data/icons/vanilla-dmz { }; - - vdrsymbols = callPackage ../data/fonts/vdrsymbols { }; - - vegur = callPackage ../data/fonts/vegur { }; - - vegeta = callPackage ../tools/networking/vegeta { }; - - venta = callPackage ../data/themes/venta { }; - - victor-mono = callPackage ../data/fonts/victor-mono { }; - vimix-gtk-themes = callPackage ../data/themes/vimix { inherit (gnome) gnome-shell; }; - vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { }; - - vistafonts = callPackage ../data/fonts/vista-fonts { }; - - vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; - - vistafonts-cht = callPackage ../data/fonts/vista-fonts-cht { }; - - vollkorn = callPackage ../data/fonts/vollkorn { }; - - weather-icons = callPackage ../data/fonts/weather-icons { }; - whitesur-gtk-theme = callPackage ../data/themes/whitesur { inherit (gnome) gnome-shell; }; - whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; - - wireless-regdb = callPackage ../data/misc/wireless-regdb { }; - - work-sans = callPackage ../data/fonts/work-sans { }; - - wqy_microhei = callPackage ../data/fonts/wqy-microhei { }; - - wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; - - xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; - - xits-math = callPackage ../data/fonts/xits-math { }; - - xkcd-font = callPackage ../data/fonts/xkcd-font { }; - xkeyboard_config = xorg.xkeyboardconfig; xlsx2csv = with python3Packages; toPythonApplication xlsx2csv; - xorg-rgb = callPackage ../data/misc/xorg-rgb {}; - - yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; - - yaru-theme = callPackage ../data/themes/yaru {}; - - yaru-remix-theme = callPackage ../data/themes/yaru-remix {}; - zafiro-icons = callPackage ../data/icons/zafiro-icons { inherit (plasma5Packages) breeze-icons; }; @@ -27727,10 +12114,6 @@ with pkgs; zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { }; zeal = zeal-qt5; - zilla-slab = callPackage ../data/fonts/zilla-slab { }; - - zuki-themes = callPackage ../data/themes/zuki { }; - ### APPLICATIONS / GIS gmt = callPackage ../applications/gis/gmt { @@ -27738,12 +12121,6 @@ with pkgs; Accelerate CoreGraphics CoreVideo; }; - gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; - - dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; - - grass = callPackage ../applications/gis/grass { }; - openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; @@ -27761,10 +12138,6 @@ with pkgs; wxGTK = wxGTK32; }; - spatialite_tools = callPackage ../applications/gis/spatialite-tools { }; - - udig = callPackage ../applications/gis/udig { }; - whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -27777,36 +12150,18 @@ with pkgs; patches = config."2bwm".patches or []; }; - a2jmidid = callPackage ../applications/audio/a2jmidid { }; - - aacgain = callPackage ../applications/audio/aacgain { }; - - aaxtomp3 = callPackage ../applications/audio/aaxtomp3 {}; - abcde = callPackage ../applications/audio/abcde { inherit (python3Packages) eyeD3; }; - abiword = callPackage ../applications/office/abiword { }; - - abook = callPackage ../applications/misc/abook { }; - acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) buildPythonApplication appdirs colorama python-dateutil requests requests-toolbelt setuptools sqlalchemy fusepy; }; - acorn = callPackage ../applications/networking/cluster/acorn {}; - adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; - adl = callPackage ../applications/video/adl { }; - - appvm = callPackage ../applications/virtualization/appvm { }; - - yggdrasil = callPackage ../tools/networking/yggdrasil { }; - masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; @@ -27825,85 +12180,36 @@ with pkgs; program = "pdfstudioviewer"; }; - aeolus = callPackage ../applications/audio/aeolus { }; - - aewan = callPackage ../applications/editors/aewan { }; - afterstep = callPackage ../applications/window-managers/afterstep { fltk = fltk13; gtk = gtk2; }; - agedu = callPackage ../tools/misc/agedu { }; - - agenda = callPackage ../applications/office/agenda { }; - - ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - - airwave = callPackage ../applications/audio/airwave { }; - - akira-unstable = callPackage ../applications/graphics/akira { }; - - alembic = callPackage ../development/libraries/alembic {}; - - alfaview = callPackage ../applications/networking/instant-messengers/alfaview { }; - - alchemy = callPackage ../applications/graphics/alchemy { }; - - alock = callPackage ../misc/screensavers/alock { }; - - alot = callPackage ../applications/networking/mailreaders/alot { }; - alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; }; - msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility - amfora = callPackage ../applications/networking/browsers/amfora { }; - - AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; - - ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; - androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }); android-studio = androidStudioPackages.stable; - animbar = callPackage ../applications/graphics/animbar { }; - - antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; - antiword = callPackage ../applications/office/antiword {}; - anup = callPackage ../applications/misc/anup { inherit (darwin.apple_sdk.frameworks) Security; }; - anytype = callPackage ../applications/misc/anytype { }; - ao = libfive; - apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; - apkeep = callPackage ../tools/misc/apkeep { inherit (darwin.apple_sdk.frameworks) Security; }; - apngasm = callPackage ../applications/graphics/apngasm {}; - apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; - - appeditor = callPackage ../applications/misc/appeditor { }; - - appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; - apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; texlive = texlive.combined.scheme-medium; @@ -27916,51 +12222,20 @@ with pkgs; arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { }; - - argocd = callPackage ../applications/networking/cluster/argocd { }; - - argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { }; - - argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; - - ario = callPackage ../applications/audio/ario { }; - - arion = callPackage ../applications/virtualization/arion { }; - - arkade = callPackage ../applications/networking/cluster/arkade { }; - - artem = callPackage ../applications/graphics/artem { }; - asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; - ascii-image-converter = callPackage ../applications/graphics/ascii-image-converter { }; - - artha = callPackage ../applications/misc/artha { }; - - atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - - atomEnv = callPackage ../applications/editors/atom/env.nix { }; - atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); inherit (atomPackages) atom atom-beta; - asap = callPackage ../tools/audio/asap { }; - - aseprite = callPackage ../applications/editors/aseprite { }; aseprite-unfree = aseprite.override { unfree = true; }; - assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; - astroid = callPackage ../applications/networking/mailreaders/astroid { vim = vim-full.override { features = "normal"; }; }; - aucatctl = callPackage ../applications/audio/aucatctl { }; - audacious = libsForQt5.callPackage ../applications/audio/audacious { }; audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { # Avoid circular dependency @@ -27972,52 +12247,16 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudioKit; }; - audio-recorder = callPackage ../applications/audio/audio-recorder { }; - - auto-multiple-choice = callPackage ../applications/misc/auto-multiple-choice { }; - - autokey = callPackage ../applications/office/autokey { }; - - autotalent = callPackage ../applications/audio/autotalent { }; - - autotrace = callPackage ../applications/graphics/autotrace {}; - - av-98 = callPackage ../applications/networking/browsers/av-98 { }; - avalanchego = callPackage ../applications/networking/avalanchego { inherit (darwin.apple_sdk.frameworks) IOKit; }; - avizo = callPackage ../applications/misc/avizo { }; - - avocode = callPackage ../applications/graphics/avocode {}; - - ax25-apps = callPackage ../applications/radio/ax25-apps {}; - - ax25-tools = callPackage ../applications/radio/ax25-tools {}; - - azpainter = callPackage ../applications/graphics/azpainter { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - blocky = callPackage ../applications/networking/blocky { }; - cadence = libsForQt5.callPackage ../applications/audio/cadence { }; - cheesecutter = callPackage ../applications/audio/cheesecutter { }; - - milkytracker = callPackage ../applications/audio/milkytracker { }; - ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; - schismtracker = callPackage ../applications/audio/schismtracker { }; - - jnetmap = callPackage ../applications/networking/jnetmap {}; - - join-desktop = callPackage ../applications/misc/join-desktop { }; - - json-plot = callPackage ../applications/graphics/json-plot {}; - libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found }; @@ -28035,20 +12274,14 @@ with pkgs; }; - armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; - avrdudess = callPackage ../applications/misc/avrdudess { }; - awesome = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; inherit (texFunctions) fontsConf; @@ -28058,36 +12291,12 @@ with pkgs; inherit (gnome) baobab; - backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; backintime = backintime-qt; - balsa = callPackage ../applications/networking/mailreaders/balsa { }; - - bandwidth = callPackage ../tools/misc/bandwidth { }; - - banking = callPackage ../applications/office/banking { }; - - baresip = callPackage ../applications/networking/instant-messengers/baresip { }; - barrier = libsForQt5.callPackage ../applications/misc/barrier {}; - bashSnippets = callPackage ../applications/misc/bashSnippets { }; - - batik = callPackage ../applications/graphics/batik { }; - - batsignal = callPackage ../applications/misc/batsignal { }; - - baudline = callPackage ../applications/audio/baudline { }; - - bb = callPackage ../applications/misc/bb { }; - - bchoppr = callPackage ../applications/audio/bchoppr { }; - - berry = callPackage ../applications/window-managers/berry { }; - bespokesynth = callPackage ../applications/audio/bespokesynth { inherit (darwin.apple_sdk.frameworks) Cocoa WebKit CoreServices CoreAudioKit; }; @@ -28104,19 +12313,6 @@ with pkgs; glew = glew110; }; - bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; - bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { }; - - bitlbee-discord = callPackage ../applications/networking/instant-messengers/bitlbee-discord { }; - - bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { }; - - bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { }; - - bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { }; - - bitmeter = callPackage ../applications/audio/bitmeter { }; - bitscope = recurseIntoAttrs (callPackage ../applications/science/electronics/bitscope/packages.nix { }); @@ -28127,37 +12323,20 @@ with pkgs; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit bitwig-studio1; }; - bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { libjpeg = libjpeg.override { enableJpeg8 = true; }; }; bitwig-studio = bitwig-studio4; - bgpdump = callPackage ../tools/networking/bgpdump { }; - - bgpq3 = callPackage ../tools/networking/bgpq3 { }; - - bgpq4 = callPackage ../tools/networking/bgpq4 { }; - - blackbox = callPackage ../applications/version-management/blackbox { }; - - bleachbit = callPackage ../applications/misc/bleachbit { }; - blender = callPackage ../applications/misc/blender { # LLVM 11 crashes when compiling GHOST_SystemCocoa.mm stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; - blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix {}; - blender-hip = blender.override { hipSupport = true; }; - blflash = callPackage ../tools/misc/blflash { }; - - blogc = callPackage ../applications/misc/blogc { }; - blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { inherit (haskellPackages) ghcWithPackages; }; @@ -28170,60 +12349,12 @@ with pkgs; jdk = jetbrains.jdk; }; - bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; - - bluemail = callPackage ../applications/networking/mailreaders/bluemail { }; - - blugon = callPackage ../applications/misc/blugon { }; - - bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; - - bombono = callPackage ../applications/video/bombono {}; - - bonzomatic = callPackage ../applications/editors/bonzomatic { }; - - booster = callPackage ../applications/system/booster {}; - - bottles = callPackage ../applications/misc/bottles/fhsenv.nix { }; - - bottles-unwrapped = callPackage ../applications/misc/bottles { }; - - brave = callPackage ../applications/networking/browsers/brave { }; - break-time = callPackage ../applications/misc/break-time { openssl = openssl_1_1; }; breezy = with python3Packages; toPythonApplication breezy; - notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; - - brig = callPackage ../applications/networking/brig { }; - - bristol = callPackage ../applications/audio/bristol { }; - - bjumblr = callPackage ../applications/audio/bjumblr { }; - - bschaffl = callPackage ../applications/audio/bschaffl { }; - - bsequencer = callPackage ../applications/audio/bsequencer { }; - - bslizr = callPackage ../applications/audio/bslizr { }; - - bshapr = callPackage ../applications/audio/bshapr { }; - - bspwm = callPackage ../applications/window-managers/bspwm { }; - - bvi = callPackage ../applications/editors/bvi { }; - - bviplus = callPackage ../applications/editors/bviplus { }; - - caerbannog = callPackage ../applications/misc/caerbannog { }; - - cardboard = callPackage ../applications/window-managers/cardboard { }; - - cardo = callPackage ../data/fonts/cardo { }; - cage = callPackage ../applications/window-managers/cage { wlroots = wlroots_0_14; }; @@ -28234,14 +12365,8 @@ with pkgs; calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { }; - calcurse = callPackage ../applications/misc/calcurse { }; - - calculix = callPackage ../applications/science/math/calculix {}; - calibre = qt6Packages.callPackage ../applications/misc/calibre { }; - calibre-web = callPackage ../servers/calibre-web { }; - # calico-felix and calico-node have not been packaged due to libbpf, linking issues inherit (callPackage ../applications/networking/cluster/calico {}) calico-apiserver @@ -28255,38 +12380,10 @@ with pkgs; calligra = libsForQt5.callPackage ../applications/office/calligra { }; - perkeep = callPackage ../applications/misc/perkeep { }; - - canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; - - canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { }; - - caprine-bin = callPackage ../applications/networking/instant-messengers/caprine-bin { }; - - carddav-util = callPackage ../tools/networking/carddav-util { }; - - cardinal = callPackage ../applications/audio/cardinal { }; - carla = libsForQt5.callPackage ../applications/audio/carla { }; - castor = callPackage ../applications/networking/browsers/castor { }; - - catfs = callPackage ../os-specific/linux/catfs { }; - - catgirl = callPackage ../applications/networking/irc/catgirl { }; - - catimg = callPackage ../tools/misc/catimg { }; - - catt = callPackage ../applications/video/catt { }; - - cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; - cbatticon = callPackage ../applications/misc/cbatticon { }; - - cbc = callPackage ../applications/science/math/cbc { }; - cddiscid = callPackage ../applications/audio/cd-discid { inherit (darwin) IOKit; }; @@ -28298,36 +12395,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - cyan = callPackage ../applications/graphics/cyan {}; - - cyanrip = callPackage ../applications/audio/cyanrip { }; - - centerim = callPackage ../applications/networking/instant-messengers/centerim { }; - - chatty = callPackage ../applications/networking/instant-messengers/chatty { }; - - chirp = callPackage ../applications/radio/chirp { }; - - browsh = callPackage ../applications/networking/browsers/browsh { }; - brotab = callPackage ../tools/misc/brotab { python = python3; }; - bookworm = callPackage ../applications/office/bookworm { }; - - bookletimposer = callPackage ../applications/office/bookletimposer { }; - - boops = callPackage ../applications/audio/boops { }; - - ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; - - ChowKick = callPackage ../applications/audio/ChowKick { }; - - ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; - - CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); @@ -28339,72 +12410,23 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport; }; - cinelerra = callPackage ../applications/video/cinelerra { }; - - cipher = callPackage ../applications/misc/cipher { }; - - clapper = callPackage ../applications/video/clapper { }; - - ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { }; - - ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; - - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; - cligh = python3Packages.callPackage ../development/tools/github/cligh {}; - clight = callPackage ../applications/misc/clight { }; - - clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; - clipcat = callPackage ../applications/misc/clipcat { }; - - clipmenu = callPackage ../applications/misc/clipmenu { }; - - clipit = callPackage ../applications/misc/clipit { }; - - clipqr = callPackage ../applications/misc/clipqr { }; - - cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { }; - - clp = callPackage ../applications/science/math/clp { }; - - cmatrix = callPackage ../applications/misc/cmatrix { }; - - pokemon-colorscripts-mac = callPackage ../applications/misc/pokemon-colorscripts-mac { }; - - cmctl = callPackage ../applications/networking/cluster/cmctl { }; - cmus = callPackage ../applications/audio/cmus { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio VideoToolbox; libjack = libjack2; }; - cmusfm = callPackage ../applications/audio/cmusfm { }; - - cni = callPackage ../applications/networking/cluster/cni {}; - cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; - - dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {}; - - multus-cni = callPackage ../applications/networking/cluster/multus-cni {}; - - cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; - complete-alias = callPackage ../tools/misc/complete-alias { }; - confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; copyq = qt6Packages.callPackage ../applications/misc/copyq { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; - coreth = callPackage ../applications/networking/coreth {}; - coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; }; @@ -28415,111 +12437,53 @@ with pkgs; cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; - csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI; }; - csound-manual = callPackage ../applications/audio/csound/csound-manual { }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python3; }; - codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; cudatext = cudatext-qt; - convos = callPackage ../applications/networking/irc/convos { }; - comical = callPackage ../applications/graphics/comical { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - containerd = callPackage ../applications/virtualization/containerd { }; - - convchain = callPackage ../tools/graphics/convchain {}; - - cordless = callPackage ../applications/networking/instant-messengers/cordless { }; - - coursera-dl = callPackage ../applications/misc/coursera-dl {}; - - coyim = callPackage ../applications/networking/instant-messengers/coyim { }; - - cozy-drive = callPackage ../applications/networking/cozy-drive {}; - - cplay-ng = callPackage ../applications/audio/cplay-ng { }; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; cqrlog = callPackage ../applications/radio/cqrlog { hamlib = hamlib_4; }; - crun = callPackage ../applications/virtualization/crun {}; - - csdp = callPackage ../applications/science/math/csdp { }; - - ctop = callPackage ../tools/system/ctop { }; - cubicsdr = callPackage ../applications/radio/cubicsdr { inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; - cum = callPackage ../applications/misc/cum { }; - - cuneiform = callPackage ../tools/graphics/cuneiform {}; - - curseradio = callPackage ../applications/audio/curseradio { }; - - curtail = callPackage ../applications/graphics/curtail { }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; - cvs = callPackage ../applications/version-management/cvs { }; - - cvsps = callPackage ../applications/version-management/cvsps { }; - - cvsq = callPackage ../applications/version-management/cvsq { }; - - cvs2svn = callPackage ../applications/version-management/cvs2svn { }; - - cwm = callPackage ../applications/window-managers/cwm { }; - - cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - - dablin = callPackage ../applications/radio/dablin { }; - darcs = haskell.lib.compose.overrideCabal (drv: { configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); - darkman = callPackage ../applications/misc/darkman { }; - darktable = callPackage ../applications/graphics/darktable { lua = lua5_4; pugixml = pugixml.override { shared = true; }; }; - das_watchdog = callPackage ../tools/system/das_watchdog { }; - datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix { pythonPackages = datadog-integrations-core {}; }; - datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { python = python3; extraIntegrations = extras; }; - ddgr = callPackage ../applications/misc/ddgr { }; - - deadbeef = callPackage ../applications/audio/deadbeef { }; - deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; @@ -28535,194 +12499,74 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dht = callPackage ../applications/networking/p2p/dht { }; - - dia = callPackage ../applications/graphics/dia { }; - - digital = callPackage ../applications/science/electronics/digital {}; - direwolf = callPackage ../applications/radio/direwolf { hamlib = hamlib_4; }; - dirt = callPackage ../applications/audio/dirt {}; - - distrho = callPackage ../applications/audio/distrho {}; - - dit = callPackage ../applications/editors/dit { }; - - djvulibre = callPackage ../applications/misc/djvulibre { }; - - djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; - djview = libsForQt5.callPackage ../applications/graphics/djview { }; djview4 = djview; - dmenu = callPackage ../applications/misc/dmenu { }; - dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; - - dmenu-rs = callPackage ../applications/misc/dmenu-rs { }; - dmensamenu = callPackage ../applications/misc/dmensamenu { inherit (python3Packages) buildPythonApplication requests; }; - dmrconfig = callPackage ../applications/radio/dmrconfig { }; - dmtx-utils = callPackage ../tools/graphics/dmtx-utils { inherit (darwin.apple_sdk.frameworks) Foundation; }; - dnd-tools = callPackage ../applications/misc/dnd-tools { }; - inherit (callPackage ../applications/virtualization/docker {}) docker_20_10; docker = docker_20_10; docker-client = docker.override { clientOnly = true; }; - docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; - - docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; - - docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; - docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; - docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; - docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin) cctools; }; - docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; - - dockfmt = callPackage ../development/tools/dockfmt { }; - - afterburn = callPackage ../tools/admin/afterburn {}; - - docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix {}; - amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; - - docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; - - docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; - - dockstarter = callPackage ../tools/virtualization/dockstarter {}; - - doodle = callPackage ../applications/search/doodle { }; - - dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; - - dracut = callPackage ../os-specific/linux/dracut { }; - - dragonflydb = callPackage ../servers/nosql/dragonflydb { }; - - dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; - - drawing = callPackage ../applications/graphics/drawing { }; - - drawio = callPackage ../applications/graphics/drawio {}; - drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { }; - drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; - drawterm = callPackage ../tools/admin/drawterm { }; - droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { stdenv = gcc10StdenvCompat; }; - dsf2flac = callPackage ../applications/audio/dsf2flac { }; - - dunst = callPackage ../applications/misc/dunst { }; - du-dust = callPackage ../tools/misc/dust { inherit (darwin.apple_sdk.frameworks) AppKit; }; - dutree = callPackage ../tools/misc/dutree { }; - - devede = callPackage ../applications/video/devede { }; - - denemo = callPackage ../applications/audio/denemo { }; - dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit MetalKit DiscRecording CoreAudioKit; inherit (darwin.apple_sdk_11_0.libs) simd; }; - dvdauthor = callPackage ../applications/video/dvdauthor { }; - - dvdbackup = callPackage ../applications/video/dvdbackup { }; - - dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dvdstyler = callPackage ../applications/video/dvdstyler { inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff { }; - - dwl = callPackage ../applications/window-managers/dwl { }; - dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to # specify patches through nixpkgs.config.dwm.patches patches = config.dwm.patches or []; }; - dwmblocks = callPackage ../applications/misc/dwmblocks { }; - - dwmbar = callPackage ../applications/misc/dwmbar { }; - - dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - - emoji-picker = callPackage ../applications/misc/emoji-picker {}; - - exploitdb = callPackage ../tools/security/exploitdb { }; - evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or []; }; - dzen2 = callPackage ../applications/window-managers/dzen2 { }; - - e16 = callPackage ../applications/window-managers/e16 { }; - - eaglemode = callPackage ../applications/misc/eaglemode { }; - - ebumeter = callPackage ../applications/audio/ebumeter { }; - - echoip = callPackage ../servers/echoip { }; - - eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); - - ecpdap = callPackage ../development/embedded/fpga/ecpdap { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - - ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; - - ed = callPackage ../applications/editors/ed { }; - - edbrowse = callPackage ../applications/editors/edbrowse { }; - - edlin = callPackage ../applications/editors/edlin { }; - - o = callPackage ../applications/editors/o { }; - - oed = callPackage ../applications/editors/oed { }; + eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); - ekho = callPackage ../applications/audio/ekho { }; + ecpdap = callPackage ../development/embedded/fpga/ecpdap { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; @@ -28732,22 +12576,14 @@ with pkgs; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; - elementary-planner = callPackage ../applications/office/elementary-planner { }; - elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { libdwarf = libdwarf_20210528; }; - elfx86exts = callPackage ../applications/misc/elfx86exts { }; - elinks = callPackage ../applications/networking/browsers/elinks { autoreconfHook = buildPackages.autoreconfHook269; }; - elvis = callPackage ../applications/editors/elvis { }; - - em = callPackage ../applications/editors/em { }; - emacs = emacs28; emacs-gtk = emacs28-gtk; emacs-nox = emacs28-nox; @@ -28797,59 +12633,28 @@ with pkgs; # If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too emacsPackages = emacs.pkgs; - emptty = callPackage ../applications/display-managers/emptty {}; - - endeavour = callPackage ../applications/office/endeavour { }; - - enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { }; - entangle = callPackage ../applications/video/entangle { inherit (gst_all_1) gstreamer gst-plugins-base; }; - eolie = callPackage ../applications/networking/browsers/eolie { }; - - eos-installer = callPackage ../applications/misc/eos-installer { }; - - epdfview = callPackage ../applications/misc/epdfview { }; - - epeg = callPackage ../applications/graphics/epeg { }; - epgstation = callPackage ../applications/video/epgstation { nodejs = nodejs-16_x; }; inherit (gnome) epiphany; - ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; - - epic5 = callPackage ../applications/networking/irc/epic5 { }; - epick = callPackage ../applications/graphics/epick { inherit (darwin.apple_sdk.frameworks) AppKit; }; - epr = callPackage ../applications/misc/epr { }; - - eq10q = callPackage ../applications/audio/eq10q { }; - - errbot = callPackage ../applications/networking/errbot { }; - espeak-classic = callPackage ../applications/audio/espeak { }; - espeak-ng = callPackage ../applications/audio/espeak-ng { }; espeak = res.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - espeakup = callPackage ../applications/accessibility/espeakup { }; - etebase-server = with python3Packages; toPythonApplication etebase-server; - etesync-dav = callPackage ../applications/misc/etesync-dav {}; - - etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; eww = callPackage ../applications/window-managers/eww { }; @@ -28857,112 +12662,27 @@ with pkgs; withWayland = true; }; - exaile = callPackage ../applications/audio/exaile { }; - - exercism = callPackage ../applications/misc/exercism { }; - - expenses = callPackage ../applications/misc/expenses { }; - - fnott = callPackage ../applications/misc/fnott { }; - furnace = callPackage ../applications/audio/furnace { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - furtherance = callPackage ../applications/misc/furtherance { }; - - gigalixir = callPackage ../tools/misc/gigalixir { }; - - go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; - - go-motion = callPackage ../development/tools/go-motion { }; - - gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; - greenfoot = callPackage ../applications/editors/greenfoot { jdk = jetbrains.jdk; }; - gspeech = callPackage ../applications/audio/gspeech { }; - - gtkcord4 = callPackage ../applications/audio/gtkcord4 {}; - haruna = libsForQt5.callPackage ../applications/video/haruna { }; hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; - helix = callPackage ../applications/editors/helix { }; - - icesl = callPackage ../applications/misc/icesl { }; - - karlender = callPackage ../applications/office/karlender { }; - - keepassx = callPackage ../applications/misc/keepassx { }; - keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; - keepass-diff = callPackage ../applications/misc/keepass-diff { }; - - keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome) evince; evolution-data-server = gnome.evolution-data-server; evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; - evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; - evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; - keepass = callPackage ../applications/misc/keepass { }; - - keepass-charactercopy = callPackage ../applications/misc/keepass-plugins/charactercopy { }; - - keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; - - keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; - - keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; - - keepass-keetraytotp = callPackage ../applications/misc/keepass-plugins/keetraytotp { }; - - keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { }; - - keepass-qrcodeview = callPackage ../applications/misc/keepass-plugins/qrcodeview { }; - - kerbrute = callPackage ../tools/security/kerbrute { }; - - kvmtool = callPackage ../applications/virtualization/kvmtool { }; - - exrtools = callPackage ../applications/graphics/exrtools { }; - - f1viewer = callPackage ../applications/video/f1viewer {}; - - faircamp = callPackage ../applications/misc/faircamp { }; - - famistudio = callPackage ../applications/audio/famistudio { }; - - fasttext = callPackage ../applications/science/machine-learning/fasttext { }; - - fbmenugen = callPackage ../applications/misc/fbmenugen { }; - - fbpanel = callPackage ../applications/window-managers/fbpanel { }; - fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; - feedbackd = callPackage ../applications/misc/feedbackd { }; - - fehlstart = callPackage ../applications/misc/fehlstart { }; - - fetchmail = callPackage ../applications/misc/fetchmail { }; - fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { }; - - ff2mpv = callPackage ../applications/misc/ff2mpv { }; - - fff = callPackage ../applications/misc/fff { }; - - fig2dev = callPackage ../applications/graphics/fig2dev { }; - - FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; @@ -28972,26 +12692,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - firewalld = callPackage ../applications/networking/firewalld { }; - firewalld-gui = firewalld.override { withGui = true; }; flacon = libsForQt5.callPackage ../applications/audio/flacon { }; - flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { hamlib = hamlib_4; }; - flink = callPackage ../applications/networking/cluster/flink { }; - - fllog = callPackage ../applications/radio/fllog { }; - - flmsg = callPackage ../applications/radio/flmsg { }; - - flrig = callPackage ../applications/radio/flrig { }; - fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; }; @@ -29002,75 +12710,26 @@ with pkgs; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; - fmsynth = callPackage ../applications/audio/fmsynth { }; - - fnc = callPackage ../applications/version-management/fnc { }; - - focus = callPackage ../tools/X11/focus { }; - focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; - foliate = callPackage ../applications/office/foliate { }; - - fondo = callPackage ../applications/graphics/fondo { }; - - font-manager = callPackage ../applications/misc/font-manager { }; - - fontpreview = callPackage ../applications/misc/fontpreview { }; - fossil = callPackage ../applications/version-management/fossil { sqlite = sqlite.override { enableDeserialize = true; }; }; - freebayes = callPackage ../applications/science/biology/freebayes { }; - - freefilesync = callPackage ../applications/networking/freefilesync { }; - - freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles; - fsv = callPackage ../applications/misc/fsv { }; - ft2-clone = callPackage ../applications/audio/ft2-clone { inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; }; fvwm = fvwm2; - fvwm2 = callPackage ../applications/window-managers/fvwm/2.6.nix { }; - fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { }; - - ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; - - gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; - - gauche = callPackage ../development/interpreters/gauche { }; gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { }; - gcal = callPackage ../applications/misc/gcal { }; - - gcstar = callPackage ../applications/misc/gcstar { }; - - geany = callPackage ../applications/editors/geany { }; - geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; - - geek-life = callPackage ../applications/misc/geek-life { }; - - genact = callPackage ../applications/misc/genact { }; - - genxword = callPackage ../applications/misc/genxword { }; - - geoipupdate = callPackage ../applications/misc/geoipupdate { }; - ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; - globe-cli = callPackage ../applications/misc/globe-cli { }; - - gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; - gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -29180,28 +12839,16 @@ with pkgs; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; - gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; - inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse; googler = callPackage ../applications/misc/googler { python = python3; }; - gopher = callPackage ../applications/networking/gopher/gopher { }; - - gophernotes = callPackage ../applications/editors/gophernotes { }; - - goxel = callPackage ../applications/graphics/goxel { }; - - gpa = callPackage ../applications/misc/gpa { }; - gpicview = callPackage ../applications/graphics/gpicview { gtk2 = gtk2-x11; }; - gpx = callPackage ../applications/misc/gpx { }; - gqrx = qt6Packages.callPackage ../applications/radio/gqrx { }; gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx { portaudioSupport = true; @@ -29212,20 +12859,6 @@ with pkgs; pulseaudioSupport = false; }; - gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; - - grepcidr = callPackage ../applications/search/grepcidr { }; - - grepm = callPackage ../applications/search/grepm { }; - - grip-search = callPackage ../tools/text/grip-search { }; - - grip = callPackage ../applications/misc/grip { }; - - gsimplecal = callPackage ../applications/misc/gsimplecal { }; - - gthumb = callPackage ../applications/graphics/gthumb { }; - gtimelog = with python3Packages; toPythonApplication gtimelog; inherit (gnome) gucharmap; @@ -29238,18 +12871,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - gjay = callPackage ../applications/audio/gjay { }; - - sherlock = callPackage ../tools/security/sherlock { }; - - rhythmbox = callPackage ../applications/audio/rhythmbox { }; - puddletag = libsForQt5.callPackage ../applications/audio/puddletag { }; - w_scan = callPackage ../applications/video/w_scan { }; - - wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; - welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { @@ -29264,28 +12887,14 @@ with pkgs; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; }; - sngrep = callPackage ../applications/networking/sniffers/sngrep {}; - - termshark = callPackage ../tools/networking/termshark { }; - - fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { inherit (darwin.apple_sdk.frameworks) AppKit; }; - fcp = callPackage ../tools/misc/fcp { }; - - fdupes = callPackage ../tools/misc/fdupes { }; - feh = callPackage ../applications/graphics/feh { imlib2 = imlib2Full; }; - feishu = callPackage ../applications/networking/instant-messengers/feishu {}; - - filezilla = callPackage ../applications/networking/ftp/filezilla { }; - fire = darwin.apple_sdk_11_0.callPackage ../applications/audio/fire { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit; inherit (darwin.apple_sdk_11_0.libs) simd; @@ -29337,8 +12946,6 @@ with pkgs; desktopName = "Firefox DevEdition"; }; - librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {}; - librewolf = wrapFirefox librewolf-unwrapped { inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; libName = "librewolf"; @@ -29346,26 +12953,8 @@ with pkgs; firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; - fmtoy = callPackage ../tools/audio/fmtoy { }; - - flac = callPackage ../applications/audio/flac { }; - - redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flex-ncat = callPackage ../applications/radio/flex-ncat { }; - - flex-ndax = callPackage ../applications/radio/flex-ndax { }; - - fluxbox = callPackage ../applications/window-managers/fluxbox { }; - - hackedbox = callPackage ../applications/window-managers/hackedbox { }; - - fomp = callPackage ../applications/audio/fomp { }; - - formatter = callPackage ../applications/misc/formatter { }; - formiko = with python3Packages; callPackage ../applications/editors/formiko { inherit buildPythonApplication; }; @@ -29374,8 +12963,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL; }; - foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; - fractal = callPackage ../applications/networking/instant-messengers/fractal { openssl = openssl_1_1; }; @@ -29384,8 +12971,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; }; - fragments = callPackage ../applications/networking/p2p/fragments { }; - freecad = libsForQt5.callPackage ../applications/graphics/freecad { boost = python3Packages.boost; inherit (python3Packages) @@ -29414,19 +12999,10 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freenet = callPackage ../applications/networking/p2p/freenet { }; - freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; - freeplane = callPackage ../applications/misc/freeplane { }; - - freepv = callPackage ../applications/graphics/freepv { }; - - xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; - xrdp = callPackage ../applications/networking/remote/xrdp { }; - freerdp = callPackage ../applications/networking/remote/freerdp { inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; @@ -29438,24 +13014,6 @@ with pkgs; python3Packages = python39Packages; }; - fte = callPackage ../applications/editors/fte { }; - - g933-utils = callPackage ../tools/misc/g933-utils { }; - - gavrasm = callPackage ../development/compilers/gavrasm { }; - - gcalcli = callPackage ../applications/misc/gcalcli { }; - - vcal = callPackage ../applications/misc/vcal { }; - - gcolor2 = callPackage ../applications/graphics/gcolor2 { }; - - gcolor3 = callPackage ../applications/graphics/gcolor3 { }; - - get_iplayer = callPackage ../applications/misc/get_iplayer {}; - - getxbook = callPackage ../applications/misc/getxbook { }; - gimp = callPackage ../applications/graphics/gimp { autoreconfHook = buildPackages.autoreconfHook269; lcms = lcms2; @@ -29472,24 +13030,12 @@ with pkgs; gtk = gtk3; }; - gitolite = callPackage ../applications/version-management/gitolite { }; - inherit (gnome) gitg; - gmrun = callPackage ../applications/misc/gmrun {}; - - gnucash = callPackage ../applications/office/gnucash { }; - - goffice = callPackage ../development/libraries/goffice { }; - got = darwin.apple_sdk_11_0.callPackage ../applications/version-management/got { }; - gtkterm = callPackage ../tools/misc/gtkterm { }; - gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; - gum = callPackage ../applications/misc/gum { }; - hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc swftools; inherit (qt5) wrapQtAppsHook; @@ -29503,264 +13049,88 @@ with pkgs; jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { }; }); - jmusicbot = callPackage ../applications/audio/jmusicbot { }; - - junction = callPackage ../applications/misc/junction { }; - - lemonade = callPackage ../applications/misc/lemonade { }; - - libquvi = callPackage ../applications/video/quvi/library.nix { }; - - LibreArp = callPackage ../applications/audio/LibreArp { }; - - LibreArp-lv2 = callPackage ../applications/audio/LibreArp/lv2.nix { }; - librespot = callPackage ../applications/audio/librespot { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; }; - limesctl = callPackage ../applications/misc/limesctl { }; - linssid = libsForQt5.callPackage ../applications/networking/linssid { }; - deadd-notification-center = callPackage ../applications/misc/deadd-notification-center { }; - - lollypop = callPackage ../applications/audio/lollypop { }; - - losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { }; - m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manim = callPackage ../applications/video/manim { }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; - mi2ly = callPackage ../applications/audio/mi2ly {}; - - moe = callPackage ../applications/editors/moe { }; - molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - pattypan = callPackage ../applications/misc/pattypan {}; - - praat = callPackage ../applications/audio/praat { }; - quvi = callPackage ../applications/video/quvi/tool.nix { lua5_sockets = lua51Packages.luasocket; lua5 = lua5_1; }; - quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; - - rhvoice = callPackage ../applications/audio/rhvoice { }; - - svox = callPackage ../applications/audio/svox { }; - - giada = callPackage ../applications/audio/giada {}; - - giara = callPackage ../applications/networking/giara { }; - - gitit = callPackage ../applications/misc/gitit {}; - gkrellm = callPackage ../applications/misc/gkrellm { inherit (darwin.apple_sdk.frameworks) IOKit; }; - glow = callPackage ../applications/editors/glow { }; - - glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; - - gmtk = callPackage ../development/libraries/gmtk { }; - - gmu = callPackage ../applications/audio/gmu { }; - - gnaural = callPackage ../applications/audio/gnaural { }; - - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; - - gnumeric = callPackage ../applications/office/gnumeric { }; - - gnunet = callPackage ../applications/networking/p2p/gnunet { }; - - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; - - gocr = callPackage ../applications/graphics/gocr { }; - - gobby = callPackage ../applications/editors/gobby { }; - - gphoto2 = callPackage ../applications/misc/gphoto2 { }; - - gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; - gramps = callPackage ../applications/misc/gramps { pythonPackages = python3Packages; }; - graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; - graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { }; - grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; }; - gtkpod = callPackage ../applications/audio/gtkpod { }; - q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; - qrcodegen = callPackage ../development/libraries/qrcodegen { }; - qrencode = callPackage ../development/libraries/qrencode { inherit (darwin) libobjc; - }; - - geeqie = callPackage ../applications/graphics/geeqie { }; - - gigedit = callPackage ../applications/audio/gigedit { }; - - gqview = callPackage ../applications/graphics/gqview { }; - - gmpc = callPackage ../applications/audio/gmpc {}; - - gmtp = callPackage ../applications/misc/gmtp {}; - - gnomecast = callPackage ../applications/video/gnomecast { }; - - celluloid = callPackage ../applications/video/celluloid { }; - - gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome) gnome-autoar; - }; - - gollum = callPackage ../applications/misc/gollum { }; - - gonic = callPackage ../servers/gonic { }; - - goodvibes = callPackage ../applications/audio/goodvibes { }; - - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - - google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - - google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - - google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - - go-graft = callPackage ../applications/networking/go-graft { }; - - gostatic = callPackage ../applications/misc/gostatic {}; - - gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; - - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; - - gpsbabel-gui = gpsbabel.override { - withGUI = true; - withDoc = true; - }; - - gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; - - gpsd = callPackage ../servers/gpsd { }; - - gpsprune = callPackage ../applications/misc/gpsprune { }; - - gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { - # rm me as soon as this package gains the support for cuda 11 - inherit (cudaPackages_10) cudatoolkit; - }; - - gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; - - gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; - - gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; - - gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; - - gpxsee = gpxsee-qt5; - - gspell = callPackage ../development/libraries/gspell { }; - - gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; - - gtklock = callPackage ../tools/wayland/gtklock { }; - - guardian-agent = callPackage ../tools/networking/guardian-agent { }; - - gv = callPackage ../applications/misc/gv { }; - - gvisor = callPackage ../applications/virtualization/gvisor { }; - - guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; - - gwc = callPackage ../applications/audio/gwc { }; - - gxmessage = callPackage ../applications/misc/gxmessage { }; - - gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { }; - - gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; - - hachoir = with python3Packages; toPythonApplication hachoir; - - hackrf = callPackage ../applications/radio/hackrf { }; - - hacksaw = callPackage ../tools/misc/hacksaw {}; - - hakuneko = callPackage ../tools/misc/hakuneko { }; - - manga-cli = callPackage ../tools/misc/manga-cli { }; - - hamster = callPackage ../applications/misc/hamster { }; - - hacpack = callPackage ../tools/compression/hacpack { }; - - hashit = callPackage ../tools/misc/hashit { }; + }; - hactool = callPackage ../tools/compression/hactool { }; + gnome-recipes = callPackage ../applications/misc/gnome-recipes { + inherit (gnome) gnome-autoar; + }; - hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { }; + googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - headlines = callPackage ../applications/networking/headlines { }; + google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { }; + google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - heimer = libsForQt5.callPackage ../applications/misc/heimer { }; + gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; - hello = callPackage ../applications/misc/hello { }; + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; - hello-wayland = callPackage ../applications/graphics/hello-wayland { }; + gpsbabel-gui = gpsbabel.override { + withGUI = true; + withDoc = true; + }; - hello-unfree = callPackage ../applications/misc/hello-unfree { }; + gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { + # rm me as soon as this package gains the support for cuda 11 + inherit (cudaPackages_10) cudatoolkit; + }; - helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; - herbe = callPackage ../applications/misc/herbe { }; + gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; - hexchat = callPackage ../applications/networking/irc/hexchat { }; + gpxsee = gpxsee-qt5; - hexcurse = callPackage ../applications/editors/hexcurse { }; + guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; - hexdino = callPackage ../applications/editors/hexdino { }; + hachoir = with python3Packages; toPythonApplication hachoir; - hexedit = callPackage ../applications/editors/hexedit { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; himalaya = callPackage ../applications/networking/mailreaders/himalaya { inherit (darwin.apple_sdk.frameworks) Security; }; - hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; - - hivelytracker = callPackage ../applications/audio/hivelytracker { }; - hledger = haskell.lib.compose.justStaticExecutables haskellPackages.hledger; - hledger-check-fancyassertions = callPackage ../applications/office/hledger-check-fancyassertions { }; hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd; hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; @@ -29778,54 +13148,28 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - hover = callPackage ../development/tools/hover { }; - hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; - howl = callPackage ../applications/editors/howl { }; - - hdl-dump = callPackage ../tools/misc/hdl-dump { }; - hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg { }; - - hpl = callPackage ../tools/misc/hpl { }; - hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; - ht = callPackage ../applications/editors/ht { }; - xh = callPackage ../tools/networking/xh { inherit (darwin.apple_sdk.frameworks) Security; }; - hubstaff = callPackage ../applications/misc/hubstaff { }; - - hue-cli = callPackage ../tools/networking/hue-cli { }; - inherit (nodePackages) hueadm; hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK32; }; - haunt = callPackage ../applications/misc/haunt { }; - huggle = libsForQt5.callPackage ../applications/misc/huggle {}; - hugo = callPackage ../applications/misc/hugo { }; - - gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; - - go-org = callPackage ../applications/misc/go-org { }; - hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { }; hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; - hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. - - hydroxide = callPackage ../applications/networking/hydroxide { }; + /* hydrogen_0 = */ # Old stable, has GMKit. hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages; @@ -29843,155 +13187,44 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; - - hypnotix = callPackage ../applications/video/hypnotix { }; - - indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; - - jackline = callPackage ../applications/networking/instant-messengers/jackline { }; - - jay = callPackage ../applications/window-managers/jay { }; - - keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { }; - - leftwm = callPackage ../applications/window-managers/leftwm { }; - - levant = callPackage ../applications/networking/cluster/levant { }; - - lwm = callPackage ../applications/window-managers/lwm { }; - - marker = callPackage ../applications/editors/marker { }; - - meerk40t = callPackage ../applications/misc/meerk40t { }; - - meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; - musikcube = callPackage ../applications/audio/musikcube { inherit (darwin.apple_sdk.frameworks) Cocoa SystemConfiguration; }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; - mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; - mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { }; - - offpunk = callPackage ../applications/networking/browsers/offpunk { }; - - p2pool = callPackage ../applications/misc/p2pool { }; - pass2csv = python3Packages.callPackage ../tools/security/pass2csv {}; - pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; - - passky-desktop = callPackage ../applications/misc/passky-desktop { }; - pinboard = with python3Packages; toPythonApplication pinboard; pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup; pixel2svg = python310Packages.callPackage ../tools/graphics/pixel2svg { }; - pixelnuke = callPackage ../applications/graphics/pixelnuke { }; - - pixelorama = callPackage ../applications/editors/pixelorama { }; - - pixeluvo = callPackage ../applications/graphics/pixeluvo { }; - pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; - popura = callPackage ../tools/networking/popura {}; - - pureref = callPackage ../applications/graphics/pureref { }; - shepherd = nodePackages."@nerdwallet/shepherd"; - skate = callPackage ../applications/misc/skate { }; - - slack = callPackage ../applications/networking/instant-messengers/slack { }; - - slack-cli = callPackage ../tools/networking/slack-cli { }; - - slack-term = callPackage ../applications/networking/instant-messengers/slack-term { }; - - slweb = callPackage ../applications/misc/slweb { }; - - singularity = callPackage ../applications/virtualization/singularity { }; - - sonixd = callPackage ../applications/audio/sonixd { }; - sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; - spectmorph = callPackage ../applications/audio/spectmorph { }; - - smallwm = callPackage ../applications/window-managers/smallwm { }; - - smooth = callPackage ../development/libraries/smooth { }; - - spectrwm = callPackage ../applications/window-managers/spectrwm { }; - - spot = callPackage ../applications/audio/spot { }; - - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; - spotifyd = callPackage ../applications/audio/spotifyd { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; }; - srain = callPackage ../applications/networking/irc/srain { }; - streamdeck-ui = libsForQt5.callPackage ../applications/misc/streamdeck-ui { }; - super-productivity = callPackage ../applications/office/super-productivity { }; - inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_14 wlroots_0_15 wlroots_0_16 wlroots; - sway-unwrapped = callPackage ../applications/window-managers/sway { }; - sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; - swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; - swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; - swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; - swayws = callPackage ../applications/window-managers/sway/ws.nix { }; - swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { }; sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); - swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { }; - - swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; - - swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; - - swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; - - swaynag-battery = callPackage ../applications/misc/swaynag-battery {}; - - swayest-workstyle = callPackage ../applications/window-managers/sway/swayest-workstyle { }; - - tiramisu = callPackage ../applications/misc/tiramisu { }; - - rlaunch = callPackage ../applications/misc/rlaunch { }; - - rootbar = callPackage ../applications/misc/rootbar {}; - - waybar = callPackage ../applications/misc/waybar {}; - - waylock = callPackage ../applications/misc/waylock {}; - - wayshot = callPackage ../tools/misc/wayshot { }; - - waylevel = callPackage ../tools/misc/waylevel { }; - - wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { wlroots = wlroots_0_14; }; @@ -30000,86 +13233,22 @@ with pkgs; xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; - i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { }; - - i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { }; - - i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; - i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { }; - i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; - - i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; - - i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { }; - i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { }; - i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; - - i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; - - i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { }; - i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; }; }; - i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { }; - - i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { }; - - i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; - - i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { }; - - i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; - - betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; - - multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; - - i3minator = callPackage ../tools/misc/i3minator { }; - - i3nator = callPackage ../tools/misc/i3nator { }; - - i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; - - i3status = callPackage ../applications/window-managers/i3/status.nix { }; - - i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { }; - - i3wsr = callPackage ../applications/window-managers/i3/wsr.nix { }; - - i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { wlroots = wlroots_0_14; }; - workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; - - windowchef = callPackage ../applications/window-managers/windowchef { }; - - wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; - - wmfs = callPackage ../applications/window-managers/wmfs { }; - - i810switch = callPackage ../os-specific/linux/i810switch { }; - - icewm = callPackage ../applications/window-managers/icewm {}; - - icon-library = callPackage ../applications/graphics/icon-library { }; - - id3v2 = callPackage ../applications/audio/id3v2 { }; - ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; - ifenslave = callPackage ../os-specific/linux/ifenslave { }; - ii = callPackage ../applications/networking/irc/ii { stdenv = gccStdenv; }; @@ -30093,19 +13262,11 @@ with pkgs; texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. }; - avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; - imag = callPackage ../applications/misc/imag { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - image-roll = callPackage ../applications/graphics/image-roll { }; - - imagej = callPackage ../applications/graphics/imagej { }; - - fiji = callPackage ../applications/graphics/fiji { }; - imagemagick6_light = imagemagick6.override { bzip2Support = false; zlibSupport = false; @@ -30167,8 +13328,6 @@ with pkgs; ghostscriptSupport = true; }); - imagination = callPackage ../applications/video/imagination { }; - inherit (nodePackages) imapnotify; img2pdf = with python3Packages; toPythonApplication img2pdf; @@ -30177,26 +13336,14 @@ with pkgs; typescript = nodePackages.typescript; }; - imgcat = callPackage ../applications/graphics/imgcat { }; - - img-cat = callPackage ../applications/graphics/img-cat { }; - imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - imhex = callPackage ../applications/editors/imhex { }; - - inframap = callPackage ../applications/networking/cluster/inframap {}; - inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; - inklingreader = callPackage ../tools/misc/inklingreader { }; - inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; - inkscape-with-extensions = callPackage ../applications/graphics/inkscape/with-extensions.nix { }; - inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); inlyne = callPackage ../applications/misc/inlyne { @@ -30204,10 +13351,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security; }; - inspectrum = callPackage ../applications/radio/inspectrum { }; - - inputplug = callPackage ../tools/X11/inputplug { }; - ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; }; @@ -30218,26 +13361,12 @@ with pkgs; lua5 = lua5_3; }; - iptraf-ng = callPackage ../applications/networking/iptraf-ng { }; - - irccloud = callPackage ../applications/networking/irc/irccloud { }; - - irssi = callPackage ../applications/networking/irc/irssi { }; - - fish-irssi = callPackage ../applications/networking/irc/irssi/fish { }; - - kirc = callPackage ../applications/networking/irc/kirc { }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; - istioctl = callPackage ../applications/networking/cluster/istioctl { }; - bip = callPackage ../applications/networking/irc/bip { openssl = openssl_1_1; }; - j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { }; - jabcode = callPackage ../development/libraries/jabcode { }; jabcode-writer = callPackage ../development/libraries/jabcode { @@ -30252,107 +13381,37 @@ with pkgs; jdk = javaPackages.compiler.openjdk18; }; - jack_capture = callPackage ../applications/audio/jack-capture { }; - - jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { }; - - jack_rack = callPackage ../applications/audio/jack-rack { }; - - jackmeter = callPackage ../applications/audio/jackmeter { }; - jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; - jaeles = callPackage ../tools/security/jaeles { }; - - jalv = callPackage ../applications/audio/jalv { }; - jameica = callPackage ../applications/office/jameica { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - jamin = callPackage ../applications/audio/jamin { }; - - japa = callPackage ../applications/audio/japa { }; - - dupd = callPackage ../tools/misc/dupd { }; - - jconvolver = callPackage ../applications/audio/jconvolver { }; - - jdupes = callPackage ../tools/misc/jdupes { }; - - jed = callPackage ../applications/editors/jed { }; - - jedit = callPackage ../applications/editors/jedit { }; - - jgmenu = callPackage ../applications/misc/jgmenu { }; - jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; }; - jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; - - joe = callPackage ../applications/editors/joe { }; - - josm = callPackage ../applications/misc/josm { }; - js8call = qt5.callPackage ../applications/radio/js8call { }; - jwm = callPackage ../applications/window-managers/jwm { }; - - jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - - k3s = callPackage ../applications/networking/cluster/k3s { }; - - k3sup = callPackage ../applications/networking/cluster/k3sup {}; - - kconf = callPackage ../applications/networking/cluster/kconf { }; - - kail = callPackage ../tools/networking/kail { }; - - kanboard = callPackage ../applications/misc/kanboard { }; - - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; - kapow = libsForQt5.callPackage ../applications/misc/kapow { }; kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { }; - kappanhang = callPackage ../applications/radio/kappanhang { }; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; - kbst = callPackage ../applications/networking/cluster/kbst { }; - kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { }; - kde-gruvbox = callPackage ../data/themes/kde-gruvbox { }; - kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; - keet = callPackage ../applications/networking/instant-messengers/keet { }; - - kepubify = callPackage ../tools/misc/kepubify { }; - - kermit = callPackage ../tools/misc/kermit { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; - khronos = callPackage ../applications/office/khronos { }; - keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; - khal = callPackage ../applications/misc/khal { }; - - khard = callPackage ../applications/misc/khard { }; - kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; kile = libsForQt5.callPackage ../applications/editors/kile { }; @@ -30361,8 +13420,6 @@ with pkgs; kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; - kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; - klayout = libsForQt5.callPackage ../applications/misc/klayout { }; klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; { @@ -30377,12 +13434,6 @@ with pkgs; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; - kn = callPackage ../applications/networking/cluster/kn { }; - - kondo = callPackage ../applications/misc/kondo { }; - - kooha = callPackage ../applications/video/kooha { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration @@ -30405,85 +13456,12 @@ with pkgs; abseil-cpp = abseil-cpp_202111; }; - kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix {}; - - kpt = callPackage ../applications/networking/cluster/kpt { }; - - krane = callPackage ../applications/networking/cluster/krane { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { }; - ksuperkey = callPackage ../tools/X11/ksuperkey { }; - ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; - - kubedog = callPackage ../applications/networking/cluster/kubedog { }; - - kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; - - kube-score = callPackage ../applications/networking/cluster/kube-score { }; - - kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { - }; - - kubeval = callPackage ../applications/networking/cluster/kubeval { }; - - kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; - kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; - kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; - - kubent = callPackage ../applications/networking/cluster/kubent { }; - - kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; - - kubernix = callPackage ../applications/networking/cluster/kubernix { }; - - kubeconform = callPackage ../applications/networking/cluster/kubeconform { }; - - kubecolor = callPackage ../applications/networking/cluster/kubecolor { }; - - kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - - kuttl = callPackage ../applications/networking/cluster/kuttl { }; - - kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; - - kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; - - kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; - - kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; - - kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { }; - - kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; - - kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - - k9s = callPackage ../applications/networking/cluster/k9s { }; - - ktunnel = callPackage ../applications/networking/cluster/ktunnel { }; - - pinniped = callPackage ../applications/networking/cluster/pinniped { }; - - kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { }; - - pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; - - popeye = callPackage ../applications/networking/cluster/popeye { }; - - kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; - - fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - - fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; @@ -30511,83 +13489,23 @@ with pkgs; pname = "kuma-prometheus-sd"; }; - kile-wl = callPackage ../applications/misc/kile-wl { }; - - kiln = callPackage ../applications/misc/kiln { }; - - karmor = callPackage ../applications/networking/cluster/karmor {}; - - kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator {}; - - kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { }; - - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; - - wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; - kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); - chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; - - helm-docs = callPackage ../applications/networking/cluster/helm-docs { }; - - kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kup = libsForQt5.callPackage ../applications/misc/kup { }; - kupfer = callPackage ../applications/misc/kupfer { }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; - lame = callPackage ../development/libraries/lame { }; - - labwc = callPackage ../applications/window-managers/labwc { }; - - larswm = callPackage ../applications/window-managers/larswm { }; - - lash = callPackage ../applications/audio/lash { }; - - ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { }; - - ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { - fftw = fftwSinglePrec; - }; - - ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; - - ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; - }; - - lazpaint = callPackage ../applications/graphics/lazpaint { }; - - caps = callPackage ../applications/audio/caps { }; - - lbdb = callPackage ../tools/misc/lbdb { }; - - lbry = callPackage ../applications/video/lbry { }; - - lbzip2 = callPackage ../tools/compression/lbzip2 { }; - - lci = callPackage ../applications/science/logic/lci {}; - - lemonbar = callPackage ../applications/window-managers/lemonbar { }; - - lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - - legitify = callPackage ../development/tools/legitify { }; - - lens = callPackage ../applications/networking/cluster/lens { }; - - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; - - libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; + ladspaPlugins = callPackage ../applications/audio/ladspa-plugins { + fftw = fftwSinglePrec; + }; - libowfat = callPackage ../development/libraries/libowfat { }; + ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; + }; - libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; librecad = libsForQt5.callPackage ../applications/misc/librecad { boost = boost175; @@ -30645,97 +13563,39 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - libvmi = callPackage ../development/libraries/libvmi { }; - - libutp = callPackage ../applications/networking/p2p/libutp { }; - - lifelines = callPackage ../applications/misc/lifelines { }; - - liferea = callPackage ../applications/networking/newsreaders/liferea { }; - - lightworks = callPackage ../applications/video/lightworks { }; - - lingot = callPackage ../applications/audio/lingot { }; - - litebrowser = callPackage ../applications/networking/browsers/litebrowser { }; - littlegptracker = callPackage ../applications/audio/littlegptracker { inherit (darwin.apple_sdk.frameworks) Foundation; }; - ledger = callPackage ../applications/office/ledger { }; - - ledger-autosync = callPackage ../applications/office/ledger-autosync { }; - - ledger-web = callPackage ../applications/office/ledger-web { }; - - ledger2beancount = callPackage ../tools/text/ledger2beancount { }; - lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; - lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { }; - - liblinphone = callPackage ../development/libraries/liblinphone { }; - - links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { }; - linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = callPackage ../applications/misc/llpp { inherit (ocaml-ng.ocamlPackages_4_09) ocaml; }; - lls = callPackage ../applications/networking/lls { }; - lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; portaudio = null; }; - lokinet = callPackage ../applications/networking/p2p/lokinet { }; - - losslesscut-bin = callPackage ../applications/video/losslesscut-bin { }; - - loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; - lrzsz = callPackage ../tools/misc/lrzsz { }; - lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; }; - ltex-ls = callPackage ../tools/text/ltex-ls { }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; - lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox; inherit (darwin) libobjc; }; - handlr = callPackage ../tools/misc/handlr { }; - - jftui = callPackage ../applications/video/jftui { }; - - lime = callPackage ../development/libraries/lime { }; - luakit = callPackage ../applications/networking/browsers/luakit { inherit (luajitPackages) luafilesystem; }; - looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; - - ltc-tools = callPackage ../applications/audio/ltc-tools { }; - - lscolors = callPackage ../applications/misc/lscolors { }; - - lswt = callPackage ../applications/misc/lswt { }; - luddite = with python3Packages; toPythonApplication luddite; goobook = with python3Packages; toPythonApplication goobook; @@ -30744,8 +13604,6 @@ with pkgs; lua = lua5_1; }; - luppp = callPackage ../applications/audio/luppp { }; - lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { wine = wineWowPackages.staging; }; @@ -30756,25 +13614,11 @@ with pkgs; steamSupport = false; }; - lv2bm = callPackage ../applications/audio/lv2bm { }; - - lv2lint = callPackage ../applications/audio/lv2lint/default.nix { }; - - lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; - lxi-tools = callPackage ../tools/networking/lxi-tools { }; lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; }; - lynx = callPackage ../applications/networking/browsers/lynx { }; - - lyrebird = callPackage ../applications/audio/lyrebird { }; - lyx = libsForQt5.callPackage ../applications/misc/lyx { }; - m4acut = callPackage ../applications/audio/m4acut { }; - - mac = callPackage ../development/libraries/mac { }; - macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; @@ -30796,32 +13640,16 @@ with pkgs; shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; }; - makeself = callPackage ../applications/misc/makeself { }; - - mako = callPackage ../applications/misc/mako { }; - mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; - marathonctl = callPackage ../tools/virtualization/marathonctl { }; - - markdown-pp = callPackage ../tools/text/markdown-pp { }; - - mark = callPackage ../tools/text/mark { }; - - markets = callPackage ../applications/misc/markets { }; - markmind = callPackage ../applications/misc/markmind { electron = electron_9; }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; - mastodon-bot = nodePackages.mastodon-bot; - matchbox = callPackage ../applications/window-managers/matchbox { }; - matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { inherit (python3Packages) buildPythonApplication buildPythonPackage pygobject3 pytest-runner requests responses pytest python-olm @@ -30830,60 +13658,26 @@ with pkgs; matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { }; - matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { }; - - matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; - - mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; - - mbrola = callPackage ../applications/audio/mbrola { }; - - mcomix = callPackage ../applications/graphics/mcomix { }; - - mcpp = callPackage ../development/compilers/mcpp { }; - - mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; - mdzk = callPackage ../applications/misc/mdzk { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - media-downloader = callPackage ../applications/video/media-downloader { }; - mediaelch = mediaelch-qt5; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; - mediainfo = callPackage ../applications/misc/mediainfo { }; - - mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-17; }; - megapixels = callPackage ../applications/graphics/megapixels { }; - - meteo = callPackage ../applications/networking/weather/meteo { }; - - meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { openssl = openssl_1_1; }; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melody = callPackage ../tools/misc/melody { }; - - meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; - - meme-suite = callPackage ../applications/science/biology/meme-suite { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = gnome2.GConf; }; - menumaker = callPackage ../applications/misc/menumaker { }; - menyoki = callPackage ../applications/graphics/menyoki { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -30900,65 +13694,32 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { }; - - meshcentral = callPackage ../tools/admin/meshcentral { }; - meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; - metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { }; - - metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit { autoreconfHook = buildPackages.autoreconfHook269; }; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; - mid2key = callPackage ../applications/audio/mid2key { }; - - midori-unwrapped = callPackage ../applications/networking/browsers/midori { }; midori = wrapFirefox midori-unwrapped { }; - mikmod = callPackage ../applications/audio/mikmod { }; - miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; }; - minicom = callPackage ../tools/misc/minicom { }; - - minigalaxy = callPackage ../applications/misc/minigalaxy { }; - - minimodem = callPackage ../applications/radio/minimodem { }; - - minidjvu = callPackage ../applications/graphics/minidjvu { }; - minikube = callPackage ../applications/networking/cluster/minikube { inherit (darwin.apple_sdk.frameworks) vmnet; }; - minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; - mimic = callPackage ../applications/audio/mimic { }; - - meh = callPackage ../applications/graphics/meh {}; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; - mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_13.ocaml.override { unsafeStringSupport = true; }); }; - mlvwm = callPackage ../applications/window-managers/mlvwm { }; - - MMA = callPackage ../applications/audio/MMA { }; - mmex = callPackage ../applications/office/mmex { inherit (darwin) libobjc; wxGTK = wxGTK32.override { @@ -30977,36 +13738,10 @@ with pkgs; }; }; - mmsd = callPackage ../tools/networking/mmsd { }; - - mmsd-tng = callPackage ../tools/networking/mmsd-tng { }; - - mmtc = callPackage ../applications/audio/mmtc { }; - - mnamer = callPackage ../applications/misc/mnamer { }; - moc = callPackage ../applications/audio/moc { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - mod-arpeggiator-lv2 = callPackage ../applications/audio/mod-arpeggiator-lv2 { }; - - mod-distortion = callPackage ../applications/audio/mod-distortion { }; - - xmr-stak = callPackage ../applications/misc/xmr-stak { }; - - xmrig = callPackage ../applications/misc/xmrig { }; - - xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; - - xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; - - molot-lite = callPackage ../applications/audio/molot-lite { }; - - monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; - - monkeysphere = callPackage ../tools/security/monkeysphere { }; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; boost = boost170; @@ -31022,14 +13757,8 @@ with pkgs; moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; - moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; - moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { }; - mooSpace = callPackage ../applications/audio/mooSpace { }; - - mop = callPackage ../applications/misc/mop { }; - mopidyPackages = callPackages ../applications/audio/mopidy { python = python3; }; @@ -31057,102 +13786,33 @@ with pkgs; mopidy-youtube mopidy-ytmusic; - monocypher = callPackage ../development/libraries/monocypher { }; - - motif = callPackage ../development/libraries/motif { }; - - mousai = callPackage ../applications/audio/mousai { }; - - mozjpeg = callPackage ../applications/graphics/mozjpeg { }; - edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; - easytag = callPackage ../applications/audio/easytag { }; - - mp3gain = callPackage ../applications/audio/mp3gain { }; - - mp3info = callPackage ../applications/audio/mp3info { }; - - mp3splt = callPackage ../applications/audio/mp3splt { }; - - mp3val = callPackage ../applications/audio/mp3val { }; - - mpc123 = callPackage ../applications/audio/mpc123 { }; - mpg123 = callPackage ../applications/audio/mpg123 { inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox; jack = libjack2; }; - mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc-cli = callPackage ../applications/audio/mpc { inherit (python3Packages) sphinx; }; - clerk = callPackage ../applications/audio/clerk { }; - jujutsu = callPackage ../applications/version-management/jujutsu { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; - - ncmpc = callPackage ../applications/audio/ncmpc { }; - - ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; - - pms = callPackage ../applications/audio/pms { }; - pragha = libsForQt5.callPackage ../applications/audio/pragha { }; - rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; - - rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { }; - - rofi-calc = callPackage ../applications/science/math/rofi-calc { }; - - rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; - - rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; - - rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { }; - - rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { }; - rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; - rofi-top = callPackage ../applications/misc/rofi-top { }; - - rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; - - ympd = callPackage ../applications/audio/ympd { }; - # a somewhat more maintained fork of ympd - mympd = callPackage ../applications/audio/mympd { }; - - nload = callPackage ../applications/networking/nload { }; - - nali = callPackage ../applications/networking/nali { }; - - normalize = callPackage ../applications/audio/normalize { }; norouter = callPackage ../tools/networking/norouter { buildGoModule = buildGo118Module; # tests fail with 1.19 }; - nqptp = callPackage ../tools/networking/nqptp { }; - - mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; - - mm = callPackage ../applications/networking/instant-messengers/mm { }; - - mm-common = callPackage ../development/libraries/mm-common { }; - mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; - mps-youtube = callPackage ../applications/misc/mps-youtube { }; - mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); @@ -31162,11 +13822,8 @@ with pkgs; }; # Wraps without trigerring a rebuild - wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; mpv = wrapMpv mpv-unwrapped {}; - mpvpaper = callPackage ../tools/wayland/mpvpaper { }; - mpvScripts = recurseIntoAttrs { autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; @@ -31182,16 +13839,8 @@ with pkgs; cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; }; - mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; - - mtpaint = callPackage ../applications/graphics/mtpaint { }; - mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; - multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; - - multimon-ng = callPackage ../applications/radio/multimon-ng { }; - murmur = (callPackages ../applications/networking/mumble { avahi = avahi-compat; pulseSupport = config.pulseaudio or false; @@ -31224,29 +13873,10 @@ with pkgs; else libsForQt5.callPackage ../applications/audio/musescore { }; - mmh = callPackage ../applications/networking/mailreaders/mmh { }; - mutt = callPackage ../applications/networking/mailreaders/mutt { }; - - mutt-wizard = callPackage ../tools/misc/mutt-wizard { }; - - mutt-ics = callPackage ../tools/networking/mutt-ics { }; - mwic = callPackage ../applications/misc/mwic { pythonPackages = python3Packages; }; - n8n = callPackage ../applications/networking/n8n {}; - - neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; - - natron = callPackage ../applications/video/natron { }; - - natural-docs = callPackage ../applications/misc/natural-docs { }; - - neocomp = callPackage ../applications/window-managers/neocomp { }; - - nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { }; - netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];}; netmaker-full = callPackage ../applications/networking/netmaker {}; @@ -31254,68 +13884,10 @@ with pkgs; webkitgtk = webkitgtk_5_0; }; - nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; - - nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; - - nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; - - nix-ld = callPackage ../os-specific/linux/nix-ld {}; - - noaa-apt = callPackage ../applications/radio/noaa-apt { }; - - node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; - - ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; - notion = callPackage ../applications/window-managers/notion { }; - nootka = qt5.callPackage ../applications/audio/nootka { }; - novnc = callPackage ../applications/networking/novnc { }; - - nwg-bar = callPackage ../applications/misc/nwg-bar { }; - - nwg-dock = callPackage ../applications/misc/nwg-dock { }; - - nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; - - nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; - - nwg-menu = callPackage ../applications/misc/nwg-menu { }; - - nwg-panel = callPackage ../applications/misc/nwg-panel { }; - - nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; - - ocenaudio = callPackage ../applications/audio/ocenaudio { }; - - ocm = callPackage ../applications/networking/cluster/ocm { }; - - odo = callPackage ../applications/networking/cluster/odo { }; - - odin2 = callPackage ../applications/audio/odin2 { }; - - okteto = callPackage ../development/tools/okteto { }; - - onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; - - onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; - - opcr-policy = callPackage ../development/tools/opcr-policy { }; - - open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - - openmm = callPackage ../development/libraries/science/chemistry/openmm { }; - - openshift = callPackage ../applications/networking/cluster/openshift { }; - - opsdroid = callPackage ../applications/networking/opsdroid { }; - - oroborus = callPackage ../applications/window-managers/oroborus {}; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { # fmt_9 is not supported: https://github.com/openstreetmap/osm2pgsql/issues/1859 fmt = fmt_8; @@ -31327,10 +13899,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; openssl = openssl_1_1; }; - p4d = callPackage ../applications/version-management/p4d { }; - p4v = callPackage ../applications/version-management/p4v { }; - - partio = callPackage ../development/libraries/partio {}; pc-ble-driver = callPackage ../development/libraries/pc-ble-driver { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -31338,33 +13906,21 @@ with pkgs; pcmanfm-qt = lxqt.pcmanfm-qt; - pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { }; - pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; - pig = callPackage ../applications/networking/cluster/pig { }; - - pijul = callPackage ../applications/version-management/pijul { }; - pijuice = with python3Packages; toPythonApplication pijuice; pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; }; pinegrow = callPackage ../applications/editors/pinegrow { }; - piper = callPackage ../os-specific/linux/piper { }; - pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer {}; - plank = callPackage ../applications/misc/plank { }; - playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; - pluto = callPackage ../applications/networking/cluster/pluto { }; - polybar = callPackage ../applications/misc/polybar { }; polybarFull = callPackage ../applications/misc/polybar { @@ -31377,41 +13933,20 @@ with pkgs; i3Support = true; }; - yambar = callPackage ../applications/misc/yambar { }; - polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; }; - prevo = callPackage ../applications/misc/prevo { }; - prevo-data = callPackage ../applications/misc/prevo/data.nix { }; - prevo-tools = callPackage ../applications/misc/prevo/tools.nix { }; - - psi-notify = callPackage ../applications/misc/psi-notify { }; - - ptex = callPackage ../development/libraries/ptex {}; - pyright = nodePackages.pyright; - qbec = callPackage ../applications/networking/cluster/qbec { }; - - qemacs = callPackage ../applications/editors/qemacs { }; - - roxctl = callPackage ../applications/networking/cluster/roxctl { - }; - rqbit = callPackage ../applications/networking/p2p/rqbit { inherit (darwin.apple_sdk.frameworks) Security; }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; - scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - - shod = callPackage ../applications/window-managers/shod { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { @@ -31424,49 +13959,15 @@ with pkgs; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; - songrec = callPackage ../applications/audio/songrec {}; - - storrent = callPackage ../applications/networking/p2p/storrent { }; - spacegun = callPackage ../applications/networking/cluster/spacegun {}; - speedread = callPackage ../applications/misc/speedread { }; - - station = callPackage ../applications/networking/station { }; - - stochas = callPackage ../applications/audio/stochas { }; - - synapse = callPackage ../applications/misc/synapse { }; - synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { inherit (darwin.apple_sdk.frameworks) CoreServices Security; openssl = openssl_1_1; }; - synfigstudio = callPackage ../applications/graphics/synfigstudio { }; - - taxi = callPackage ../applications/networking/ftp/taxi { }; - taxi-cli = with python3Packages; toPythonApplication taxi; - tcping-go = callPackage ../applications/networking/tcping-go { }; - - librep = callPackage ../development/libraries/librep { }; - - rep-gtk = callPackage ../development/libraries/rep-gtk { }; - - reproc = callPackage ../development/libraries/reproc { }; - - sawfish = callPackage ../applications/window-managers/sawfish { }; - - sc68 = callPackage ../applications/audio/sc68 { }; - - sidplayfp = callPackage ../applications/audio/sidplayfp { }; - - sndpeek = callPackage ../applications/audio/sndpeek { }; - - sxhkd = callPackage ../tools/X11/sxhkd { }; - mpop = callPackage ../applications/networking/mpop { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -31480,21 +13981,10 @@ with pkgs; lua = lua5; }; - maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; - - pdfdiff = callPackage ../applications/misc/pdfdiff { }; - - pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; - - mupdf = callPackage ../applications/misc/mupdf { }; - mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; - muso = callPackage ../applications/audio/muso { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - mystem = callPackage ../applications/misc/mystem { }; - diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { @@ -31502,45 +13992,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - diffuse = callPackage ../applications/misc/diffuse { }; - - mlocate = callPackage ../tools/misc/mlocate { }; - - plocate = callPackage ../tools/misc/plocate { }; - - mypaint = callPackage ../applications/graphics/mypaint { }; - - mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; - - mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; - micro = callPackage ../applications/editors/micro { }; - - mle = callPackage ../applications/editors/mle { }; - - nano = callPackage ../applications/editors/nano { }; - - nanoblogger = callPackage ../applications/misc/nanoblogger { }; - - nanorc = callPackage ../applications/editors/nano/nanorc { }; - - navipowm = callPackage ../applications/misc/navipowm { }; - - nc4nix = callPackage ../development/tools/nc4nix { }; - netbeans = callPackage ../applications/editors/netbeans { jdk = jdk17; }; - netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - - ncdu = callPackage ../tools/misc/ncdu { }; - ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; - - ncdc = callPackage ../applications/networking/p2p/ncdc { }; - ncspot = callPackage ../applications/audio/ncspot { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; @@ -31548,14 +14005,6 @@ with pkgs; withMPRIS = stdenv.isLinux; }; - ncview = callPackage ../tools/X11/ncview { } ; - - ne = callPackage ../applications/editors/ne { }; - - nedit = callPackage ../applications/editors/nedit { }; - - ngt = callPackage ../development/libraries/ngt { }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; @@ -31572,67 +14021,30 @@ with pkgs; pythonPackages = python3Packages; }; - notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { }; - - notejot = callPackage ../applications/misc/notejot { }; - - notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; - - muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; - nufraw = callPackage ../applications/graphics/nufraw { }; nufraw-thumbnailer = callPackage ../applications/graphics/nufraw { addThumbnailer = true; }; - notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; - nova-filters = callPackage ../applications/audio/nova-filters { boost = boost172; }; - nvi = callPackage ../applications/editors/nvi { }; - - nvpy = callPackage ../applications/editors/nvpy { }; - - obconf = callPackage ../tools/X11/obconf { }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { inherit (darwin.apple_sdk.frameworks) Foundation; }; obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { ffmpeg_4 = ffmpeg-full; - }; - - obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); - wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; - - obsidian = callPackage ../applications/misc/obsidian { }; - - octoprint = callPackage ../applications/misc/octoprint { }; - - oculante = callPackage ../applications/graphics/oculante { }; - - ocr-a = callPackage ../data/fonts/ocr-a {}; - - ocrad = callPackage ../applications/graphics/ocrad { }; - - offrss = callPackage ../applications/networking/offrss { }; - - ogmtools = callPackage ../applications/video/ogmtools { }; - - omegat = callPackage ../applications/misc/omegat.nix { }; + }; - omxplayer = callPackage ../applications/video/omxplayer { }; + obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; openambit = qt5.callPackage ../applications/misc/openambit { }; - openbox = callPackage ../applications/window-managers/openbox { }; - openbox-menu = callPackage ../applications/misc/openbox-menu { stdenv = gccStdenv; }; @@ -31644,8 +14056,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; - openfx = callPackage ../development/libraries/openfx {}; - openimageio_1 = callPackage ../development/libraries/openimageio/1.x.nix { boost = boost175; }; @@ -31654,8 +14064,6 @@ with pkgs; fmt = fmt_8; }; - openjump = callPackage ../applications/misc/openjump { }; - open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; @@ -31674,8 +14082,6 @@ with pkgs; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; - open-stage-control = callPackage ../applications/audio/open-stage-control { }; - opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; opentoonz = let @@ -31685,135 +14091,52 @@ with pkgs; opencv = opencv.override { libtiff = opentoonz-libtiff; }; }; - opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; - opentx = libsForQt5.callPackage ../applications/misc/opentx { }; - opera = callPackage ../applications/networking/browsers/opera {}; - orca = python3Packages.callPackage ../applications/misc/orca { inherit pkg-config; }; - orca-c = callPackage ../applications/audio/orca-c {}; - organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { }; osm2xmap = callPackage ../applications/misc/osm2xmap { libyamlcpp = libyamlcpp_0_3; }; - osmctools = callPackage ../applications/misc/osmctools { }; - - osmium-tool = callPackage ../applications/misc/osmium-tool { }; - - owamp = callPackage ../applications/networking/owamp { }; - owofetch = callPackage ../tools/misc/owofetch { inherit (darwin.apple_sdk.frameworks) Foundation DiskArbitration; }; - vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { }; - - vgmtools = callPackage ../tools/audio/vgmtools { }; - - vieb = callPackage ../applications/networking/browsers/vieb { }; - - vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; - - vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - - vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { }; - - libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; - - libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { }; - openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; - opusfile = callPackage ../applications/audio/opusfile { }; - - opustags = callPackage ../applications/audio/opustags { }; - - opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; - osmo = callPackage ../applications/office/osmo { }; - osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; - palemoon = callPackage ../applications/networking/browsers/palemoon { }; - - pamix = callPackage ../applications/audio/pamix { }; - - pamixer = callPackage ../applications/audio/pamixer { }; - - ncpamixer = callPackage ../applications/audio/ncpamixer { }; - - pan = callPackage ../applications/networking/newsreaders/pan { }; - - panotools = callPackage ../applications/graphics/panotools { }; - - paprefs = callPackage ../applications/audio/paprefs { }; - pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { }; pantalaimon-headless = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { enableDbusUi = false; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; - - pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; - parlatype = callPackage ../applications/audio/parlatype { }; - - packet = callPackage ../development/tools/packet { }; - - packet-sd = callPackage ../development/tools/packet-sd { }; - - metal-cli = callPackage ../development/tools/metal-cli { }; - - pb_cli = callPackage ../tools/misc/pb_cli {}; - - capture = callPackage ../tools/misc/capture {}; - - pbrt = callPackage ../applications/graphics/pbrt { }; - - pcloud = callPackage ../applications/networking/pcloud { }; - jpsxdec = callPackage ../tools/games/jpsxdec { jdk = openjdk8; }; - pdfslicer = callPackage ../applications/misc/pdfslicer { }; - pekwm = callPackage ../applications/window-managers/pekwm { awk = gawk; grep = gnugrep; sed = gnused; }; - pencil = callPackage ../applications/graphics/pencil { - }; - - perseus = callPackage ../applications/science/math/perseus {}; - petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome2) libgnomecanvas; }; - pdfchain = callPackage ../tools/typesetting/pdfchain { }; - - pdfcpu = callPackage ../applications/graphics/pdfcpu { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; - pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; - pdfpc = callPackage ../applications/misc/pdfpc { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; @@ -31822,229 +14145,87 @@ with pkgs; stdenv = gccStdenv; }; - peek = callPackage ../applications/video/peek { }; - peertube = callPackage ../servers/peertube { nodejs = nodejs-16_x; }; - pflask = callPackage ../os-specific/linux/pflask {}; - - pfsshell = callPackage ../tools/misc/pfsshell { }; - photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; - photoflow = callPackage ../applications/graphics/photoflow { }; - phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; - phrasendrescher = callPackage ../tools/security/phrasendrescher { }; - - phrase-cli = callPackage ../tools/misc/phrase-cli { }; - - phylactery = callPackage ../servers/web-apps/phylactery { }; - - pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; - pianoteq = callPackage ../applications/audio/pianoteq { }; - - picard = callPackage ../applications/audio/picard { }; - picocom = callPackage ../tools/misc/picocom { inherit (darwin.apple_sdk.frameworks) IOKit; }; - picoloop = callPackage ../applications/audio/picoloop { }; - pidgin = callPackage ../applications/networking/instant-messengers/pidgin { withOpenssl = config.pidgin.openssl or true; withGnutls = config.pidgin.gnutls or false; plugins = []; }; - pidgin-indicator = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator { }; - pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { texLive = texlive.combined.scheme-basic; }; - pidgin-msn-pecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; - - pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { }; - - pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; - - pidgin-carbons = callPackage ../applications/networking/instant-messengers/pidgin-plugins/carbons { }; - - pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; - - pidgin-otr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; - - pidgin-osd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; - - pidgin-sipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; - - pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; - - pika-backup = callPackage ../applications/backup/pika-backup { }; - - pur = callPackage ../development/tools/pur { }; - - purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; - - purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { }; - - purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; - - purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; - - purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; - - purple-mm-sms = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms { }; - - purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; - - purple-signald = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-signald { }; - - purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; - - purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; - - purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { }; - - tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { }; - - pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; - - purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; - - purpur = callPackage ../games/purpur { }; - - pikopixel = callPackage ../applications/graphics/pikopixel { }; - pithos = callPackage ../applications/audio/pithos { pythonPackages = python3Packages; }; pineapple-pictures = libsForQt5.callPackage ../applications/graphics/pineapple-pictures { }; - pinfo = callPackage ../applications/misc/pinfo { }; - - pinpoint = callPackage ../applications/office/pinpoint { }; - - pinta = callPackage ../applications/graphics/pinta { }; - - pistol = callPackage ../tools/misc/pistol { }; - piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; }; - pizarra = callPackage ../applications/graphics/pizarra { }; - plater = libsForQt5.callPackage ../applications/misc/plater { }; - plexamp = callPackage ../applications/audio/plexamp { }; - plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); - plugin-torture = callPackage ../applications/audio/plugin-torture { }; - - poke = callPackage ../applications/editors/poke { }; - pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; - pokemonsay = callPackage ../tools/misc/pokemonsay { }; - - polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; - poezio = python3Packages.poezio; - pommed_light = callPackage ../os-specific/linux/pommed-light {}; - - polylith = callPackage ../development/tools/misc/polylith { }; - - polymake = callPackage ../applications/science/math/polymake { }; - pomotroid = callPackage ../applications/misc/pomotroid { electron = electron_9; }; - ponymix = callPackage ../applications/audio/ponymix { }; - - popcorntime = callPackage ../applications/video/popcorntime {}; - pothos = libsForQt5.callPackage ../applications/radio/pothos { }; - potrace = callPackage ../applications/graphics/potrace {}; - - posterazor = callPackage ../applications/misc/posterazor { }; - - pqiv = callPackage ../applications/graphics/pqiv { }; - qiv = callPackage ../applications/graphics/qiv { imlib2 = imlib2Full; }; - premid = callPackage ../applications/misc/premid { }; - - process-cpp = callPackage ../development/libraries/process-cpp { }; - processing = callPackage ../applications/graphics/processing { jdk = oraclejdk8; }; # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules - procmail = callPackage ../applications/misc/procmail { }; profanity = callPackage ../applications/networking/instant-messengers/profanity ({ } // (config.profanity or {})); - properties-cpp = callPackage ../development/libraries/properties-cpp { }; - - protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; - protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; - ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; - psol = callPackage ../development/libraries/psol { }; - - pstree = callPackage ../applications/misc/pstree { }; - - pt2-clone = callPackage ../applications/audio/pt2-clone { }; - - ptask = callPackage ../applications/misc/ptask { }; - - pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { }; - - pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; - pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; - puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; - puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; - pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; - pwdsafety = callPackage ../tools/security/pwdsafety { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; qbittorrent-nox = qbittorrent.override { guiSupport = false; @@ -32066,12 +14247,6 @@ with pkgs; inherit (darwin) sigtool; }; - qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - - canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; - - wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; @@ -32087,28 +14262,18 @@ with pkgs; proj = proj_7; }; - garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; - qmetro = callPackage ../applications/misc/qmetro { }; - - qmidiarp = callPackage ../applications/audio/qmidiarp {}; - qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; - qmidiroute = callPackage ../applications/audio/qmidiroute { }; - qmmp = qt6Packages.callPackage ../applications/audio/qmmp { }; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; - qrcode = callPackage ../tools/graphics/qrcode {}; - qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = callPackage ../applications/graphics/qscreenshot { @@ -32145,10 +14310,6 @@ with pkgs; qtractor = libsForQt5.callPackage ../applications/audio/qtractor { }; - qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; - - quantomatic = callPackage ../applications/science/physics/quantomatic { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; quasselClient = quassel.override { @@ -32164,10 +14325,6 @@ with pkgs; tag = "-daemon-qt5"; }; - quill-qr = callPackage ../tools/security/quill-qr { }; - - quirc = callPackage ../tools/graphics/quirc {}; - quisk = python38Packages.callPackage ../applications/radio/quisk { }; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; @@ -32217,76 +14374,36 @@ with pkgs; inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; }; - qxw = callPackage ../applications/editors/qxw {}; - - rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; - rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; - renoise = callPackage ../applications/audio/renoise {}; - - redux = callPackage ../applications/audio/redux { }; - - roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; - - radioboat = callPackage ../applications/audio/radioboat { }; - radiotray-ng = callPackage ../applications/audio/radiotray-ng { wxGTK = wxGTK30; }; - raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; - rapidsvn = callPackage ../applications/version-management/rapidsvn { }; - - ratmen = callPackage ../tools/X11/ratmen {}; - - ratox = callPackage ../applications/networking/instant-messengers/ratox { }; - - ratpoison = callPackage ../applications/window-managers/ratpoison { }; - rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; }; - rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; - rcs = callPackage ../applications/version-management/rcs { }; - - rcshist = callPackage ../applications/version-management/rcshist { }; - - rdesktop = callPackage ../applications/networking/remote/rdesktop { }; - rdedup = callPackage ../tools/backup/rdedup { inherit (darwin.apple_sdk.frameworks) Security; }; - rdup = callPackage ../tools/backup/rdup { }; - reaper = callPackage ../applications/audio/reaper { jackLibrary = libjack2; # Another option is "pipewire.jack". }; - recapp = callPackage ../applications/video/recapp { }; - - recode = callPackage ../tools/text/recode { }; - reddsaver = callPackage ../applications/misc/reddsaver { inherit (darwin.apple_sdk.frameworks) Security; }; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - remnote = callPackage ../applications/misc/remnote { }; - - remotebox = callPackage ../applications/virtualization/remotebox { }; - restique = libsForQt5.callPackage ../applications/backup/restique { }; retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; @@ -32295,44 +14412,20 @@ with pkgs; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; - ries = callPackage ../applications/science/math/ries { }; - ripcord = if stdenv.isLinux then qt5.callPackage ../applications/networking/instant-messengers/ripcord { } else callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; - ripser = callPackage ../applications/science/math/ripser { }; - - rkdeveloptool = callPackage ../misc/rkdeveloptool { }; - - rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { }; - - rke = callPackage ../applications/networking/cluster/rke {}; - - rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; - - rofi-unwrapped = callPackage ../applications/misc/rofi { }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; - rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { }; rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix { rofi-unwrapped = rofi-wayland-unwrapped; }; - rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; - - rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; - - rofi-systemd = callPackage ../tools/system/rofi-systemd { }; - rofimoji = callPackage ../applications/misc/rofimoji { inherit (python3Packages) buildPythonApplication configargparse; }; - rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - - rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt5.callPackage ../applications/editors/rstudio { jdk = jdk8; }; @@ -32340,27 +14433,14 @@ with pkgs; rstudio-server = rstudio.override { server = true; }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); - rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; - - rtl_433 = callPackage ../applications/radio/rtl_433 { }; - - rtl-ais = callPackage ../applications/radio/rtl-ais { }; # librtlsdr is a friendly fork with additional features - rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; - librtlsdr = callPackage ../development/libraries/librtlsdr { }; - - rubyripper = callPackage ../applications/audio/rubyripper {}; rucredstash = callPackage ../tools/security/rucredstash { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - runc = callPackage ../applications/virtualization/runc {}; - - rusty-psn = callPackage ../applications/misc/rusty-psn {}; - rusty-psn-gui = rusty-psn.override { withGui = true; }; rymcast = callPackage ../applications/audio/rymcast { @@ -32371,28 +14451,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - uade = callPackage ../applications/audio/uade {}; - - udevil = callPackage ../applications/misc/udevil {}; - - udiskie = callPackage ../applications/misc/udiskie { }; - - sacc = callPackage ../applications/networking/gopher/sacc { }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; - sbagen = callPackage ../applications/misc/sbagen { }; - - scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; - sc-im = callPackage ../applications/misc/sc-im { }; - - scite = callPackage ../applications/editors/scite { }; - - scli = callPackage ../applications/misc/scli { }; - scribus_1_4 = callPackage ../applications/office/scribus/1_4.nix { inherit (gnome2) libart_lgpl; }; @@ -32402,127 +14464,35 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; - seahub = callPackage ../applications/networking/seahub { }; - - seatd = callPackage ../applications/misc/seatd { }; - - secrets-extractor = callPackage ../tools/security/secrets-extractor { }; - - secretscanner = callPackage ../tools/security/secretscanner { }; - - semiphemeral = callPackage ../tools/misc/semiphemeral { }; - - semver = callPackage ../applications/misc/semver { }; - - sent = callPackage ../applications/misc/sent { }; - - seq24 = callPackage ../applications/audio/seq24 { }; - seq66 = qt5.callPackage ../applications/audio/seq66 { }; - setbfree = callPackage ../applications/audio/setbfree { }; - - sfizz = callPackage ../applications/audio/sfizz { }; - - sfxr = callPackage ../applications/audio/sfxr { }; - sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; - - shfmt = callPackage ../tools/text/shfmt { }; - - shortwave = callPackage ../applications/audio/shortwave { }; - - shotgun = callPackage ../tools/graphics/shotgun {}; - - shutter = callPackage ../applications/graphics/shutter { }; - - sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; - simple-scan = gnome.simple-scan; sioyek = callPackage ../applications/misc/sioyek { inherit (libsForQt5) qmake qt3d qtbase wrapQtAppsHook; }; - siproxd = callPackage ../applications/networking/siproxd { }; - - sish = callPackage ../tools/networking/sish { }; - sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky { libjpeg_turbo = libjpeg_turbo.override { enableJpeg8 = true; }; }; - skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - - slmenu = callPackage ../applications/misc/slmenu {}; - - slop = callPackage ../tools/misc/slop {}; - - slowhttptest = callPackage ../tools/security/slowhttptest { }; - - slrn = callPackage ../applications/networking/newsreaders/slrn { }; - - sniffnet = callPackage ../applications/networking/sniffnet { }; - - sniproxy = callPackage ../applications/networking/sniproxy { }; - - snixembed = callPackage ../applications/misc/snixembed { }; - - sommelier = callPackage ../applications/window-managers/sommelier { }; - - sooperlooper = callPackage ../applications/audio/sooperlooper { }; - - sops = callPackage ../tools/security/sops { }; - - sorcer = callPackage ../applications/audio/sorcer { }; - - sound-juicer = callPackage ../applications/audio/sound-juicer { }; - - soundtracker = callPackage ../applications/audio/soundtracker { }; - - spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { }; - - spike = callPackage ../applications/virtualization/spike { }; - tensorman = callPackage ../tools/misc/tensorman { openssl = openssl_1_1; }; - spideroak = callPackage ../applications/networking/spideroak { }; - spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; - spotify-tray = callPackage ../applications/misc/spotify-tray { }; - spotify-tui = callPackage ../applications/audio/spotify-tui { inherit (darwin.apple_sdk.frameworks) AppKit Security; openssl = openssl_1_1; }; - sptlrx = callPackage ../applications/audio/sptlrx { }; - - sptk = callPackage ../development/libraries/sptk { }; - squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; - stw = callPackage ../applications/misc/stw { }; - - styx = callPackage ../applications/misc/styx { }; - - sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { }; - - tecoc = callPackage ../applications/editors/tecoc { }; - - viber = callPackage ../applications/networking/instant-messengers/viber { }; - - wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; stag = callPackage ../applications/misc/stag { @@ -32538,8 +14508,6 @@ with pkgs; }) ); - swingsane = callPackage ../applications/graphics/swingsane { }; - sxiv = callPackage ../applications/graphics/sxiv { imlib2 = imlib2Full; }; @@ -32548,28 +14516,12 @@ with pkgs; imlib2 = imlib2Full; }; - resilio-sync = callPackage ../applications/networking/resilio-sync { }; - - dropbox = callPackage ../applications/networking/dropbox { }; - - dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; - - synology-drive-client = callPackage ../applications/networking/synology-drive-client { }; - - synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { }; - - litemdview = callPackage ../applications/graphics/litemdview { }; - maestral = with python3Packages; toPythonApplication maestral; maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; - maestro = callPackage ../development/mobile/maestro { }; - myfitnesspal = with python3Packages; toPythonApplication myfitnesspal; - insync = callPackage ../applications/networking/insync { }; - insync-v3 = libsForQt5.callPackage ../applications/networking/insync/v3.nix { }; libstrangle = callPackage ../tools/X11/libstrangle { @@ -32580,54 +14532,30 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { }; - lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) xfce4-dev-tools; }; - lightdm-slick-greeter = callPackage ../applications/display-managers/lightdm-slick-greeter { }; - - lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; - - lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { }; - lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { conf = config.lightdm-tiny-greeter.conf or ""; }; - ly = callPackage ../applications/display-managers/ly { }; - slic3r = callPackage ../applications/misc/slic3r { boost = boost172; # Building fails with Boost >1.72 due to boost/detail/endian.hpp missing }; - curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; cura = libsForQt5.callPackage ../applications/misc/cura { }; - curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - - peru = callPackage ../applications/version-management/peru {}; - petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; - pmidi = callPackage ../applications/audio/pmidi { }; - - printrun = callPackage ../applications/misc/printrun { }; - prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { }; super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; super-slicer-latest = super-slicer.latest; - snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; - - robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - routedns = callPackage ../tools/networking/routedns { buildGoModule = buildGo118Module; # build fails with 1.19 }; @@ -32640,19 +14568,10 @@ with pkgs; smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { }; - snapper-gui = callPackage ../applications/misc/snapper-gui { }; - snd = callPackage ../applications/audio/snd { inherit (darwin.apple_sdk.frameworks) CoreServices CoreMIDI; }; - shntool = callPackage ../applications/audio/shntool { }; - - sipp = callPackage ../development/tools/misc/sipp { }; - - soci = callPackage ../development/libraries/soci { }; - socialscan = with python3.pkgs; toPythonApplication socialscan; sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { @@ -32668,24 +14587,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio; }; - soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { autoreconfHook = buildPackages.autoreconfHook269; }; - spotify = callPackage ../applications/audio/spotify { }; - - spotifywm = callPackage ../applications/audio/spotifywm { }; - - psst = callPackage ../applications/audio/psst { }; - squeezelite = callPackage ../applications/audio/squeezelite { audioBackend = "alsa"; }; squeezelite-pulse = callPackage ../applications/audio/squeezelite { audioBackend = "pulse"; }; - ltunify = callPackage ../tools/misc/ltunify { }; - src = callPackage ../applications/version-management/src { git = gitMinimal; python = python3; @@ -32695,24 +14604,10 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - ssrc = callPackage ../applications/audio/ssrc { }; - - stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocaml-ng.ocamlPackages_4_12) stog; - stp = callPackage ../applications/science/logic/stp { }; - - stretchly = callPackage ../applications/misc/stretchly { }; - - stuffbin = callPackage ../tools/filesystems/stuffbin { }; - - stumpish = callPackage ../applications/window-managers/stumpish {}; - stumpwm = lispPackages.stumpwm; - sublime = callPackage ../applications/editors/sublime/2 { }; - sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); sublime3 = sublime3Packages.sublime3; @@ -32739,10 +14634,6 @@ with pkgs; pythonBindings = true; }; - sublime-music = callPackage ../applications/audio/sublime-music { }; - - subunit = callPackage ../development/libraries/subunit { }; - surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; surge = callPackage ../applications/audio/surge { @@ -32750,41 +14641,23 @@ with pkgs; git = gitMinimal; }; - surge-XT = callPackage ../applications/audio/surge-XT { }; - survex = callPackage ../applications/misc/survex { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - sunvox = callPackage ../applications/audio/sunvox { }; - - svkbd = callPackage ../applications/accessibility/svkbd { }; - - swaglyrics = callPackage ../tools/misc/swaglyrics { }; - - swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { inherit (darwin.apple_sdk.frameworks) Foundation; }; - symbolic-preview = callPackage ../applications/graphics/symbolic-preview { }; - - symlinks = callPackage ../tools/system/symlinks { }; - syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; syncplay-nogui = syncplay.override { enableGUI = false; }; - syncterm = callPackage ../applications/terminal-emulators/syncterm { }; - inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-discovery syncthing-relay; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { }; syncthingtray-minimal = libsForQt5.callPackage ../applications/misc/syncthingtray { webviewSupport = false; @@ -32800,129 +14673,35 @@ with pkgs; synergyWithoutGUI = synergy.override { withGUI = false; }; - tabbed = callPackage ../applications/window-managers/tabbed { - # if you prefer a custom config, write the config.h in tabbed.config.h - # and enable - # customConfig = builtins.readFile ./tabbed.config.h; - }; - taffybar = callPackage ../applications/window-managers/taffybar { inherit (haskellPackages) ghcWithPackages taffybar; }; tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {}; - tagger = callPackage ../applications/audio/tagger {}; - - tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; - - tailor = callPackage ../applications/version-management/tailor {}; - taizen = callPackage ../applications/misc/taizen { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; }; - talosctl = callPackage ../applications/networking/cluster/talosctl { }; - - talentedhack = callPackage ../applications/audio/talentedhack { }; - - tambura = callPackage ../applications/audio/tambura { }; - tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; - tanka = callPackage ../applications/networking/cluster/tanka { }; - - teams = callPackage ../applications/networking/instant-messengers/teams { }; - teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { electron = electron_21; }; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; - teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskell = haskell.lib.compose.justStaticExecutables haskellPackages.taskell; - tap-plugins = callPackage ../applications/audio/tap-plugins { }; - - taskjuggler = callPackage ../applications/misc/taskjuggler { }; - - tabula = callPackage ../applications/misc/tabula { }; - - tabula-java = callPackage ../applications/misc/tabula-java { }; - - tasknc = callPackage ../applications/misc/tasknc { }; - - tasktimer = callPackage ../applications/misc/tasktimer { }; - - taskwarrior = callPackage ../applications/misc/taskwarrior { }; - - taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { }; - - dstask = callPackage ../applications/misc/dstask { }; - - tasksh = callPackage ../applications/misc/tasksh { }; - - taskserver = callPackage ../servers/misc/taskserver { }; - - taskopen = callPackage ../applications/misc/taskopen { }; - tdesktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { abseil-cpp = abseil-cpp_202206; }; - telegram-bot-api = callPackage ../servers/telegram-bot-api { }; - - tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; - - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; - tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; - telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; - - telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; - - telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; - - telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - - telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; - - teleprompter = callPackage ../applications/misc/teleprompter {}; - - tempo = callPackage ../servers/tracing/tempo {}; - - temporal = callPackage ../applications/networking/cluster/temporal { }; - - temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { }; - - temporalite = callPackage ../applications/networking/cluster/temporalite { }; - - tenacity = callPackage ../applications/audio/tenacity { }; - - tendermint = callPackage ../tools/networking/tendermint { }; - - termdbms = callPackage ../development/tools/database/termdbms { }; - termdown = python3Packages.callPackage ../applications/misc/termdown { }; - terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - - textpieces = callPackage ../tools/text/textpieces { }; - - textplots = callPackage ../tools/graphics/textplots { }; - - texture-synthesis = callPackage ../tools/graphics/texture-synthesis { }; - - tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - - termtosvg = callPackage ../tools/misc/termtosvg { }; - - tessen = callPackage ../tools/security/tessen { }; - inherit (callPackage ../applications/graphics/tesseract { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; }) @@ -32931,18 +14710,6 @@ with pkgs; tesseract5; tesseract = tesseract3; - tetraproc = callPackage ../applications/audio/tetraproc { }; - - tev = callPackage ../applications/graphics/tev { }; - - themechanger = callPackage ../applications/misc/themechanger { }; - - thinkingRock = callPackage ../applications/misc/thinking-rock { }; - - thokr = callPackage ../applications/misc/thokr { }; - - thonny = callPackage ../applications/editors/thonny { }; - thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; @@ -32962,115 +14729,45 @@ with pkgs; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; - thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - - ticpp = callPackage ../development/libraries/ticpp { }; - - ticker = callPackage ../applications/misc/ticker { }; - tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; }; - tilemaker = callPackage ../applications/misc/tilemaker { }; - timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; }; - timelimit = callPackage ../tools/misc/timelimit { }; - timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; }; timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; }; timeshift-minimal = callPackage ../applications/backup/timeshift/minimal.nix { }; - timewarrior = callPackage ../applications/misc/timewarrior { }; - - timew-sync-server = callPackage ../applications/misc/timew-sync-server { }; - - timg = callPackage ../tools/graphics/timg { }; - timidity = callPackage ../tools/misc/timidity { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; - tint2 = callPackage ../applications/misc/tint2 { }; - tiny = callPackage ../applications/networking/irc/tiny { inherit (darwin.apple_sdk.frameworks) Foundation; }; tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; - tixati = callPackage ../applications/networking/p2p/tixati { }; - - tkrev = callPackage ../applications/version-management/tkrev { }; - - tla = callPackage ../applications/version-management/arch { }; - - tlf = callPackage ../applications/radio/tlf { }; - tlp = callPackage ../tools/misc/tlp { inherit (linuxPackages) x86_energy_perf_policy; }; - tippecanoe = callPackage ../applications/misc/tippecanoe { }; - - tmatrix = callPackage ../applications/misc/tmatrix { }; - - tnef = callPackage ../applications/misc/tnef { }; - - todiff = callPackage ../applications/misc/todiff { }; - - todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; - - todofi-sh = callPackage ../applications/office/todofi.sh { }; - - todoman = callPackage ../applications/office/todoman { }; - - tofi = callPackage ../applications/misc/tofi { }; - - topydo = callPackage ../applications/misc/topydo {}; - - torrential = callPackage ../applications/networking/p2p/torrential { }; - torrenttools = callPackage ../tools/misc/torrenttools { fmt = fmt_8; }; - tortoisehg = callPackage ../applications/version-management/tortoisehg { }; - - tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { }; - - tonelib-jam = callPackage ../applications/audio/tonelib-jam { }; - - tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { }; - - tonelib-metal = callPackage ../applications/audio/tonelib-metal { }; - tony = libsForQt5.callPackage ../applications/audio/tony { }; - toot = callPackage ../applications/misc/toot { }; - - toipe = callPackage ../applications/misc/toipe { }; - - tootle = callPackage ../applications/misc/tootle { }; - - toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - - toxiproxy = callPackage ../development/tools/toxiproxy { }; - tqsl = callPackage ../applications/radio/tqsl { openssl = openssl_1_1; }; trustedqsl = tqsl; # Alias added 2019-02-10 - transcode = callPackage ../applications/audio/transcode { }; - - transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { # https://github.com/NixOS/nixpkgs/issues/207047 openssl = openssl_legacy; @@ -33083,43 +14780,15 @@ with pkgs; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; - transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; - - transgui = callPackage ../applications/networking/p2p/transgui { }; - traverso = libsForQt5.callPackage ../applications/audio/traverso { }; - trayer = callPackage ../applications/window-managers/trayer { }; - - tinywl = callPackage ../applications/window-managers/tinywl { }; - - tinywm = callPackage ../applications/window-managers/tinywm { }; - - tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; - - tdrop = callPackage ../applications/misc/tdrop { }; - - tre-command = callPackage ../tools/system/tre-command {}; - - tree = callPackage ../tools/system/tree {}; - treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - tremc = callPackage ../applications/networking/p2p/tremc { }; - - tribler = callPackage ../applications/networking/p2p/tribler { }; - - trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; - ttyper = callPackage ../applications/misc/ttyper { }; - - tudu = callPackage ../applications/office/tudu { }; - tumpa = callPackage ../applications/misc/tumpa { inherit (pkgs.libsForQt5) wrapQtAppsHook; }; @@ -33130,8 +14799,6 @@ with pkgs; stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 }; - tut = callPackage ../applications/misc/tut { }; - tuxguitar = callPackage ../applications/editors/music/tuxguitar { jre = jre8; swt = swt_jdk8; @@ -33139,34 +14806,20 @@ with pkgs; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; - testssl = callPackage ../applications/networking/testssl { }; - - lavalauncher = callPackage ../applications/misc/lavalauncher { }; - t-rec = callPackage ../misc/t-rec { inherit (darwin.apple_sdk.frameworks) Foundation; }; - ulauncher = callPackage ../applications/misc/ulauncher { }; - twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; - terminal-stocks = callPackage ../applications/misc/terminal-stocks { }; - terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { inherit (darwin.apple_sdk.frameworks) Security; }; ueberzug = with python3Packages; toPythonApplication ueberzug; - uefi-run = callPackage ../tools/virtualization/uefi-run { }; - uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; - umurmur = callPackage ../applications/networking/umurmur { }; - - udocker = callPackage ../tools/virtualization/udocker { }; - uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; @@ -33175,62 +14828,26 @@ with pkgs; channel = "ungoogled-chromium"; }); - uni = callPackage ../applications/misc/uni { }; - - unigine-valley = callPackage ../applications/graphics/unigine-valley { }; - - unigine-heaven = callPackage ../applications/graphics/unigine-heaven { }; - unigine-tropics = pkgsi686Linux.callPackage ../applications/graphics/unigine-tropics { }; unigine-sanctuary = pkgsi686Linux.callPackage ../applications/graphics/unigine-sanctuary { }; unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { }; - unipicker = callPackage ../applications/misc/unipicker { }; - unison = callPackage ../applications/networking/sync/unison { enableX11 = config.unison.enableX11 or true; }; - unpaper = callPackage ../tools/graphics/unpaper { }; - - unison-ucm = callPackage ../development/compilers/unison { }; - - upnp-router-control = callPackage ../applications/networking/upnp-router-control { }; - - urh = callPackage ../applications/radio/urh { }; - - uroboros = callPackage ../tools/system/uroboros { }; - uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc; - uucp = callPackage ../tools/misc/uucp { }; - - uvccapture = callPackage ../applications/video/uvccapture { }; - - uwimap = callPackage ../tools/networking/uwimap { }; - - utm = callPackage ../os-specific/darwin/utm { }; - - utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt5.callPackage ../applications/misc/valentina { }; - vbindiff = callPackage ../applications/editors/vbindiff { }; - vcprompt = callPackage ../applications/version-management/vcprompt { autoconf = buildPackages.autoconf269; }; - vcs = callPackage ../applications/video/vcs { }; - - vcv-rack = callPackage ../applications/audio/vcv-rack { }; - vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; - vengi-tools = darwin.apple_sdk_11_0.callPackage ../applications/graphics/vengi-tools { inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; }; @@ -33245,8 +14862,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }); - vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; - macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { @@ -33268,26 +14883,15 @@ with pkgs; }; }); - vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - - vimv = callPackage ../tools/misc/vimv { }; - vimv-rs = callPackage ../tools/misc/vimv-rs { inherit (darwin.apple_sdk.frameworks) Foundation; }; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; - qtile = callPackage ../applications/window-managers/qtile { }; - - vimgolf = callPackage ../games/vimgolf { }; - - vimpc = callPackage ../applications/audio/vimpc { }; - # this is a lower-level alternative to wrapNeovim conceived to handle # more usecases when wrapping neovim. The interface is being actively worked on # so expect breakage. use wrapNeovim instead if you want a stable alternative - wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { CoreServices = darwin.apple_sdk.frameworks.CoreServices; @@ -33306,22 +14910,6 @@ with pkgs; gtk = gtk3; }; - gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - - neovide = callPackage ../applications/editors/neovim/neovide { }; - - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - - vis = callPackage ../applications/editors/vis { }; - - viw = callPackage ../applications/editors/viw { }; - - virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; - - virt-top = callPackage ../applications/virtualization/virt-top { }; - - virt-what = callPackage ../applications/virtualization/virt-what { }; - virt-manager = callPackage ../applications/virtualization/virt-manager { system-libvirt = libvirt; }; @@ -33330,10 +14918,6 @@ with pkgs; qtermwidget = lxqt.qtermwidget; }; - virtscreen = callPackage ../tools/admin/virtscreen {}; - - virtual-ans = callPackage ../applications/audio/virtual-ans {}; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; @@ -33348,8 +14932,6 @@ with pkgs; headless = true; }); - virtualboxExtpack = callPackage ../applications/virtualization/virtualbox/extpack.nix { }; - virtualboxWithExtpack = lowPrio (virtualbox.override { extensionPack = virtualboxExtpack; }); @@ -33364,8 +14946,6 @@ with pkgs; else null; }; - vpcs = callPackage ../applications/virtualization/vpcs { }; - primusLib = callPackage ../tools/X11/primus/lib.nix { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; @@ -33387,13 +14967,8 @@ with pkgs; else null; }; - uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { }; - - viper4linux = callPackage ../applications/audio/viper4linux { }; viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { }; - vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt5.callPackage ../applications/video/vlc { # Newest libcaca changed the API, and libvlc didn't catch it. Until next # version arrives, it is safer to disable it. @@ -33412,30 +14987,14 @@ with pkgs; vmpk = libsForQt5.callPackage ../applications/audio/vmpk { }; - vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; - - vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { }; - - vocproc = callPackage ../applications/audio/vocproc { }; - - vnstat = callPackage ../applications/networking/vnstat { }; - - vocal = callPackage ../applications/audio/vocal { }; - - volnoti = callPackage ../applications/misc/volnoti { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { autoreconfHook = buildPackages.autoreconfHook269; }; - vsce = callPackage ../development/tools/vsce { }; - vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; - vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix { }; - vscode-utils = callPackage ../applications/editors/vscode/extensions/vscode-utils.nix { }; vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { }); @@ -33455,35 +15014,17 @@ with pkgs; inherit (nodePackages) node-gyp; }; - vue = callPackage ../applications/misc/vue { }; - vuze = callPackage ../applications/networking/p2p/vuze { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - vwm = callPackage ../applications/window-managers/vwm { }; - - yeahwm = callPackage ../applications/window-managers/yeahwm { }; - vym = callPackage ../applications/misc/vym { inherit (libsForQt5) qmake qtscript qtsvg qtbase wrapQtAppsHook; }; - wad = callPackage ../tools/security/wad { }; - - wafw00f = callPackage ../tools/security/wafw00f { }; - whispers = with python3Packages; toPythonApplication whispers; - waon = callPackage ../applications/audio/waon { }; - - warp = callPackage ../applications/networking/warp { }; - - warpd = callPackage ../applications/misc/warpd { }; - - w3m = callPackage ../applications/networking/browsers/w3m { }; - # Should always be the version with the most features w3m-full = w3m; @@ -33507,12 +15048,6 @@ with pkgs; imlib2 = imlib2-nox; }; - watchmate = callPackage ../applications/misc/watchmate { }; - - watson = callPackage ../applications/office/watson { }; - - wapiti = callPackage ../tools/security/wapiti { }; - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = recurseIntoAttrs ( @@ -33524,30 +15059,15 @@ with pkgs; inherit (wayfireApplications-unwrapped) wayfire; } ); - wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; - - waypipe = callPackage ../applications/networking/remote/waypipe { }; - - wayv = callPackage ../tools/X11/wayv {}; - - wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - - webanalyze = callPackage ../tools/security/webanalyze { }; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; - webex = callPackage ../applications/networking/instant-messengers/webex {}; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; websploit = python3Packages.callPackage ../tools/security/websploit {}; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; - - wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; - weechat-unwrapped = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; @@ -33571,8 +15091,6 @@ with pkgs; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { }; - whalebird = callPackage ../applications/misc/whalebird { electron = electron_19; }; @@ -33581,51 +15099,16 @@ with pkgs; wlroots = wlroots_0_14; }; - windowlab = callPackage ../applications/window-managers/windowlab { }; - - windowmaker = callPackage ../applications/window-managers/windowmaker { }; - dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { }; - - wily = callPackage ../applications/editors/wily { }; - wings = callPackage ../applications/graphics/wings { erlang = erlangR21; }; write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; - wlc = callPackage ../tools/misc/wlc { }; - - wlclock = callPackage ../applications/misc/wlclock { }; - - wlcs = callPackage ../development/tools/wlcs { }; - - wllvm = callPackage ../development/tools/wllvm { }; - - wmname = callPackage ../applications/misc/wmname { }; - - wmctrl = callPackage ../tools/X11/wmctrl { }; - - wmderland = callPackage ../applications/window-managers/wmderland { }; - - wmderlandc = callPackage ../applications/window-managers/wmderlandc { }; - - wmii = callPackage ../applications/window-managers/wmii { }; - - wofi = callPackage ../applications/misc/wofi { }; - - wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; - - cl-wordle = callPackage ../games/cl-wordle { }; - - wordbook = callPackage ../applications/misc/wordbook { }; - wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - wordgrinder = callPackage ../applications/office/wordgrinder { }; - workrave = callPackage ../applications/misc/workrave { inherit (python3Packages) jinja2; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; @@ -33638,14 +15121,6 @@ with pkgs; useChineseVersion = true; }; - wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; - - wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { }; - - wp4nix = callPackage ../development/tools/wp4nix { }; - - wp-cli = callPackage ../development/tools/wp-cli { }; - wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; wxhexeditor = callPackage ../applications/editors/wxhexeditor { @@ -33654,33 +15129,14 @@ with pkgs; wxGTK = wxGTK32; }; - xa = callPackage ../development/compilers/xa/xa.nix { }; - dxa = callPackage ../development/compilers/xa/dxa.nix { }; - x11basic = callPackage ../development/compilers/x11basic { autoconf = buildPackages.autoconf269; }; - x11vnc = callPackage ../tools/X11/x11vnc { }; - - x11spice = callPackage ../tools/X11/x11spice { }; - x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { }; - x2goserver = callPackage ../applications/networking/remote/x2goserver { }; - - x2vnc = callPackage ../tools/X11/x2vnc { }; - x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; - x42-avldrums = callPackage ../applications/audio/x42-avldrums { }; - - x42-gmsynth = callPackage ../applications/audio/x42-gmsynth { }; - - x42-plugins = callPackage ../applications/audio/x42-plugins { }; - - xannotate = callPackage ../tools/X11/xannotate {}; - xaos = callPackage ../applications/graphics/xaos { libpng = libpng12; }; @@ -33689,20 +15145,10 @@ with pkgs; rastermagick = imagemagick6; }; - xautomation = callPackage ../tools/X11/xautomation { }; - - xawtv = callPackage ../applications/video/xawtv { }; - - xbattbar = callPackage ../applications/misc/xbattbar { }; - - xbindkeys = callPackage ../tools/X11/xbindkeys { }; - xbindkeys-config = callPackage ../tools/X11/xbindkeys-config { gtk = gtk2; }; - xxh = callPackage ../tools/networking/xxh { }; - kodiPackages = recurseIntoAttrs (kodi.packages); kodi = callPackage ../applications/video/kodi { @@ -33719,89 +15165,29 @@ with pkgs; gbmSupport = true; }; - kodi-cli = callPackage ../tools/misc/kodi-cli { }; - xca = libsForQt5.callPackage ../applications/misc/xca { }; - xcalib = callPackage ../tools/X11/xcalib { }; - - xcape = callPackage ../tools/X11/xcape { }; - - xcat = callPackage ../tools/security/xcat { }; - - xchainkeys = callPackage ../tools/X11/xchainkeys { }; - - xchm = callPackage ../applications/misc/xchm { }; - inherit (xorg) xcompmgr; - x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; - - picom = callPackage ../applications/window-managers/picom {}; - - picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; - - picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; - - xd = callPackage ../applications/networking/p2p/xd {}; - - xdaliclock = callPackage ../tools/misc/xdaliclock {}; - - xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { }; - xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; - xdg-desktop-portal-gnome = callPackage ../development/libraries/xdg-desktop-portal-gnome { }; - - xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; - - xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; - - xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg-utils = callPackage ../tools/X11/xdg-utils { w3m = buildPackages.w3m-batch; }; - xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { }; - - xdotool = callPackage ../tools/X11/xdotool { }; - xed-editor = callPackage ../applications/editors/xed-editor { xapp = cinnamon.xapp; }; xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); - xen = xenPackages.xen-vanilla; - xen-slim = xenPackages.xen-slim; - xen-light = xenPackages.xen-light; - - xen_4_10 = xenPackages.xen_4_10-vanilla; - xen_4_10-slim = xenPackages.xen_4_10-slim; - xen_4_10-light = xenPackages.xen_4_10-light; - - xkbset = callPackage ../tools/X11/xkbset { }; - - xkbmon = callPackage ../applications/misc/xkbmon { }; - - win-spice = callPackage ../applications/virtualization/driver/win-spice { }; - win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; - win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; - win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; - win-signed-gplpv-drivers = callPackage ../applications/virtualization/driver/win-signed-gplpv-drivers { }; - - xfig = callPackage ../applications/graphics/xfig { }; - - xfractint = callPackage ../applications/graphics/xfractint {}; - - xine-ui = callPackage ../applications/video/xine-ui { }; - - xlsxgrep = callPackage ../applications/search/xlsxgrep { }; - - xmind = callPackage ../applications/misc/xmind { }; + xen = xenPackages.xen-vanilla; + xen-slim = xenPackages.xen-slim; + xen-light = xenPackages.xen-light; - xneur = callPackage ../applications/misc/xneur { }; + xen_4_10 = xenPackages.xen_4_10-vanilla; + xen_4_10-slim = xenPackages.xen_4_10-slim; + xen_4_10-light = xenPackages.xen_4_10-light; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; @@ -33819,26 +15205,10 @@ with pkgs; lua = lua5_3; }; - apvlv = callPackage ../applications/misc/apvlv { }; - xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; - xplugd = callPackage ../tools/X11/xplugd { }; - - xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; - - xkb-switch = callPackage ../tools/X11/xkb-switch { }; - - xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { }; - - xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; - - xlife = callPackage ../applications/graphics/xlife { }; - xmobar = haskellPackages.xmobar; - xmonad-log = callPackage ../tools/misc/xmonad-log { }; - xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { inherit (haskellPackages) ghcWithPackages; packages = _: [ haskellPackages.xmonad-contrib ]; @@ -33860,159 +15230,60 @@ with pkgs; desktopSupport = "xfce4"; }; - xmountains = callPackage ../applications/graphics/xmountains { }; - - xmppc = callPackage ../applications/networking/instant-messengers/xmppc {}; - - libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { }; xpraWithNvenc = callPackage ../tools/X11/xpra { withNvenc = true; nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; - libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; xplayer = callPackage ../applications/video/xplayer { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; inherit (cinnamon) xapp; }; - libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; - - xrectsel = callPackage ../tools/X11/xrectsel { }; - - xrestop = callPackage ../tools/X11/xrestop { }; - - xrgears = callPackage ../applications/graphics/xrgears { }; xsd = callPackage ../development/libraries/xsd { stdenv = gcc9Stdenv; }; - xscope = callPackage ../applications/misc/xscope { }; - - xscreensaver = callPackage ../misc/screensavers/xscreensaver { }; - - xsuspender = callPackage ../applications/misc/xsuspender { }; - - xss-lock = callPackage ../misc/screensavers/xss-lock { }; - - xloadimage = callPackage ../tools/X11/xloadimage { }; - - xssproxy = callPackage ../misc/screensavers/xssproxy { }; - - xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; - - xtrace = callPackage ../tools/X11/xtrace { }; - - xtruss = callPackage ../tools/X11/xtruss { }; - - xtuner = callPackage ../applications/audio/xtuner { }; - - xmacro = callPackage ../tools/X11/xmacro { }; - - xmenu = callPackage ../applications/misc/xmenu { }; - xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - xmp = callPackage ../applications/audio/xmp { }; - - xnee = callPackage ../tools/X11/xnee { }; - - xnotify = callPackage ../tools/X11/xnotify { }; - xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; - xzgv = callPackage ../applications/graphics/xzgv { }; - yabar = callPackage ../applications/window-managers/yabar { }; yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { }; - yarp = callPackage ../applications/science/robotics/yarp {}; - - yate = callPackage ../applications/misc/yate { }; - - yaup = callPackage ../applications/networking/yaup { }; - ydiff = with python3.pkgs; toPythonApplication ydiff; - ydict = callPackage ../applications/misc/ydict {}; - - yed = callPackage ../applications/graphics/yed {}; - - yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome) yelp; - yelp-tools = callPackage ../development/misc/yelp-tools { }; - yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; - yoshimi = callPackage ../applications/audio/yoshimi { }; - your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; }; youtube-dl = with python3Packages; toPythonApplication youtube-dl; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; - youtube-music = callPackage ../applications/audio/youtube-music { }; - - youki = callPackage ../applications/virtualization/youki { }; - yt-dlp = with python3Packages; toPythonApplication yt-dlp; yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; youtube-viewer = perlPackages.WWWYoutubeViewer; - ytalk = callPackage ../applications/networking/instant-messengers/ytalk { }; - - ytarchive = callPackage ../tools/misc/ytarchive { }; - - ytcast = callPackage ../tools/misc/ytcast { }; - - ytcc = callPackage ../tools/networking/ytcc { }; - - ytmdesktop = callPackage ../applications/audio/ytmdesktop { }; - - ytmdl = callPackage ../tools/misc/ytmdl { }; - - yutto = callPackage ../tools/misc/yutto { }; - yuview = libsForQt5.yuview; - zam-plugins = callPackage ../applications/audio/zam-plugins { }; - - zammad = callPackage ../applications/networking/misc/zammad { }; - - zathuraPkgs = callPackage ../applications/misc/zathura { }; zathura = zathuraPkgs.zathuraWrapper; - zdns = callPackage ../tools/security/zdns { }; - - zerobin = callPackage ../applications/networking/zerobin { }; - - zeroc-ice = callPackage ../development/libraries/zeroc-ice {}; - zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; - zeronet = callPackage ../applications/networking/p2p/zeronet { }; - - zeronet-conservancy = callPackage ../applications/networking/p2p/zeronet-conservancy { }; - zexy = callPackage ../applications/audio/pd-plugins/zexy { autoconf = buildPackages.autoconf269; }; - zgrab2 = callPackage ../tools/security/zgrab2 { }; - - zgrviewer = callPackage ../applications/graphics/zgrviewer { }; - zgv = callPackage ../applications/graphics/zgv { # Enable the below line for terminal display. Note # that it requires sixel graphics compatible terminals like mlterm @@ -34020,30 +15291,14 @@ with pkgs; SDL = SDL_sixel; }; - zim = callPackage ../applications/office/zim { }; - zine = callPackage ../applications/misc/zine { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { }; - - zita-at1 = callPackage ../applications/audio/zita-at1 { }; - - zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; - zola = callPackage ../applications/misc/zola { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { }; - - zotero = callPackage ../applications/office/zotero { }; - - zscroll = callPackage ../applications/misc/zscroll {}; - - zsteg = callPackage ../tools/security/zsteg { }; - inherit (nodePackages) zx; zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { @@ -34093,22 +15348,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - btcd = callPackage ../applications/blockchains/btcd { }; - - cgminer = callPackage ../applications/blockchains/cgminer { }; - - chia = callPackage ../applications/blockchains/chia { }; - - chia-dev-tools = callPackage ../applications/blockchains/chia-dev-tools { }; - - chia-plotter = callPackage ../applications/blockchains/chia-plotter { }; - - clboss = callPackage ../applications/blockchains/clboss { }; - - clightning = callPackage ../applications/blockchains/clightning { }; - - besu = callPackage ../applications/blockchains/besu { }; - bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { boost = boost17x; withGui = true; @@ -34132,13 +15371,8 @@ with pkgs; btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; }; - charge-lnd = callPackage ../applications/blockchains/charge-lnd { }; - cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; - dcrd = callPackage ../applications/blockchains/dcrd { }; - dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { boost = boost17x; withGui = true; @@ -34148,8 +15382,6 @@ with pkgs; withGui = false; }; - eclair = callPackage ../applications/blockchains/eclair { }; - electrs = callPackage ../applications/blockchains/electrs { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -34165,14 +15397,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - ergo = callPackage ../applications/blockchains/ergo { }; - - erigon = callPackage ../applications/blockchains/erigon { }; - - exodus = callPackage ../applications/blockchains/exodus { }; - - faraday = callPackage ../applications/blockchains/faraday { }; - fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; go-ethereum = callPackage ../applications/blockchains/go-ethereum { @@ -34193,28 +15417,12 @@ with pkgs; ledger_agent = with python3Packages; toPythonApplication ledger_agent; - ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - - lightning-loop = callPackage ../applications/blockchains/lightning-loop { }; - - lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost174; }; litecoind = litecoin.override { withGui = false; }; - livedl = callPackage ../tools/misc/livedl { }; - - lnd = callPackage ../applications/blockchains/lnd { }; - - lndconnect = callPackage ../applications/blockchains/lndconnect { }; - - lndhub-go = callPackage ../applications/blockchains/lndhub-go { }; - - lndmanage = callPackage ../applications/blockchains/lndmanage { }; - monero-cli = callPackage ../applications/blockchains/monero-cli { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; }; @@ -34240,8 +15448,6 @@ with pkgs; namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; - nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx { withGui = false; @@ -34251,12 +15457,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - ethabi = callPackage ../applications/blockchains/ethabi { }; - pycoin = with python3Packages; toPythonApplication pycoin; - stellar-core = callPackage ../applications/blockchains/stellar-core { }; - sumokoin = callPackage ../applications/blockchains/sumokoin { boost = boost17x; }; @@ -34273,20 +15475,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - taro = callPackage ../applications/blockchains/taro { }; - inherit (callPackages ../applications/blockchains/teos { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }) teos teos-watchtower-plugin; - terra-station = callPackage ../applications/blockchains/terra-station { }; - - tessera = callPackage ../applications/blockchains/tessera { }; - - torq = callPackage ../applications/blockchains/torq { }; - vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { boost = boost17x; withGui = true; @@ -34296,10 +15490,6 @@ with pkgs; withGui = false; }; - wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; - - wasabibackend = callPackage ../applications/blockchains/wasabibackend { }; - wownero = callPackage ../applications/blockchains/wownero { boost = boost175; }; @@ -34309,157 +15499,44 @@ with pkgs; stdenv = llvmPackages_14.stdenv; }; - zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { }; - - lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; - - openethereum = callPackage ../applications/blockchains/openethereum { }; - polkadot = callPackage ../applications/blockchains/polkadot { inherit (darwin.apple_sdk.frameworks) Security; }; - particl-core = callPackage ../applications/blockchains/particl-core { }; - - quorum = callPackage ../applications/blockchains/quorum { }; - samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { }; - scaleft = callPackage ../applications/networking/scaleft { }; - - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; - beancount = with python3.pkgs; toPythonApplication beancount; beancount-black = with python3.pkgs; toPythonApplication beancount-black; - bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; - bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; - cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; - cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; - - confd = callPackage ../tools/system/confd { }; - - conmon = callPackage ../applications/virtualization/conmon { }; - - conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; - digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; - eureka-editor = callPackage ../applications/misc/eureka-editor { }; - eureka-ideas = callPackage ../applications/misc/eureka-ideas { inherit (darwin.apple_sdk.frameworks) Security; }; - fava = callPackage ../applications/office/fava {}; - - nux = callPackage ../tools/misc/nux { }; - phonemizer = with python3Packages; toPythonApplication phonemizer; - tts = callPackage ../tools/audio/tts { }; - ### GAMES - _1oom = callPackage ../games/1oom { }; - - _2048-in-terminal = callPackage ../games/2048-in-terminal { }; - - _20kly = callPackage ../games/20kly { }; - _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; - ace-of-penguins = callPackage ../games/ace-of-penguins { }; - - among-sus = callPackage ../games/among-sus { }; - - antsimulator = callPackage ../games/antsimulator { }; - - augustus = callPackage ../games/augustus { }; - - ballerburg = callPackage ../games/ballerburg { } ; - - blockattack = callPackage ../games/blockattack { } ; - - colobot = callPackage ../games/colobot { }; - - doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; - - enigma = callPackage ../games/enigma { }; - - everspace = callPackage ../games/everspace { }; - - ezquake = callPackage ../games/ezquake { }; - fmodex = callPackage ../games/zandronum/fmod.nix { }; - freedroid = callPackage ../games/freedroid { }; - - freedroidrpg = callPackage ../games/freedroidrpg { }; - - freenukum = callPackage ../games/freenukum { }; - - gnome-hexgl = callPackage ../games/gnome-hexgl { }; - - gotypist = callPackage ../games/gotypist { }; - - heroic-unwrapped = callPackage ../games/heroic { }; - heroic = callPackage ../games/heroic/fhsenv.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; - julius = callPackage ../games/julius { }; - - jumpnbump = callPackage ../games/jumpnbump { }; - - keeperrl = callPackage ../games/keeperrl { }; - ### GAMES/LGAMES - barrage = callPackage ../games/lgames/barrage { }; - - lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; - - lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; - - lpairs2 = callPackage ../games/lgames/lpairs2 { }; - - ltris = callPackage ../games/lgames/ltris { }; - - lunar-client = callPackage ../games/lunar-client { }; - - maelstrom = callPackage ../games/maelstrom { }; - - mar1d = callPackage ../games/mar1d { } ; - - meritous = callPackage ../games/meritous { }; - - oh-my-git = callPackage ../games/oh-my-git { }; - - opendune = callPackage ../games/opendune { }; - - openrct2 = callPackage ../games/openrct2 { }; - - osu-lazer = callPackage ../games/osu-lazer { }; - - osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { }; - pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { }; qgo = libsForQt5.callPackage ../games/qgo { }; - rpg-cli = callPackage ../games/rpg-cli { }; - - runelite = callPackage ../games/runelite { }; - - runescape = callPackage ../games/runescape-launcher { }; - sm64ex = callPackage ../games/sm64ex { branch = "sm64ex"; }; @@ -34468,45 +15545,9 @@ with pkgs; branch = "sm64ex-coop"; }; - snipes = callPackage ../games/snipes { }; - - unvanquished = callPackage ../games/unvanquished { }; - - xbill = callPackage ../games/xbill { }; - - xmage = callPackage ../games/xmage { }; - - abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; - - abuse = callPackage ../games/abuse { }; - - adom = callPackage ../games/adom { }; - - airshipper = callPackage ../games/airshipper { }; - - airstrike = callPackage ../games/airstrike { }; - - alephone = callPackage ../games/alephone { }; - alephone-durandal = callPackage ../games/alephone/durandal { }; - alephone-eternal = callPackage ../games/alephone/eternal { }; - alephone-evil = callPackage ../games/alephone/evil { }; - alephone-infinity = callPackage ../games/alephone/infinity { }; - alephone-marathon = callPackage ../games/alephone/marathon { }; - alephone-pheonix = callPackage ../games/alephone/pheonix { }; - alephone-red = callPackage ../games/alephone/red { }; - alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { }; alephone-pathways-into-darkness = callPackage ../games/alephone/pathways-into-darkness { }; - alienarena = callPackage ../games/alienarena { }; - - amoeba = callPackage ../games/amoeba { }; - amoeba-data = callPackage ../games/amoeba/data.nix { }; - - andyetitmoves = callPackage ../games/andyetitmoves { }; - - angband = callPackage ../games/angband { }; - anki = python39Packages.callPackage ../games/anki { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; @@ -34516,8 +15557,6 @@ with pkgs; armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; - arena = callPackage ../games/arena { }; - arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; asc = callPackage ../games/asc { @@ -34525,46 +15564,14 @@ with pkgs; physfs = physfs_2; }; - assaultcube = callPackage ../games/assaultcube { }; - - astromenace = callPackage ../games/astromenace { }; - - atanks = callPackage ../games/atanks { }; - - azimuth = callPackage ../games/azimuth { }; - ballAndPaddle = callPackage ../games/ball-and-paddle { guile = guile_1_8; }; - banner = callPackage ../games/banner { }; - - bastet = callPackage ../games/bastet { }; - - beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { }; - black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; }; - blackshades = callPackage ../games/blackshades { }; - - blobby = callPackage ../games/blobby { }; - - blobwars = callPackage ../games/blobwars { }; - - boohu = callPackage ../games/boohu { }; - - braincurses = callPackage ../games/braincurses { }; - - brogue = callPackage ../games/brogue { }; - - brutalmaze = callPackage ../games/brutalmaze { }; - - bsdgames = callPackage ../games/bsdgames { }; - - btanks = callPackage ../games/btanks { }; - bugdom = callPackage ../games/bugdom { inherit (darwin.apple_sdk.frameworks) IOKit Foundation; }; @@ -34573,42 +15580,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; }; - cataclysmDDA = callPackage ../games/cataclysm-dda { }; - cataclysm-dda = cataclysmDDA.stable.tiles; cataclysm-dda-git = cataclysmDDA.git.tiles; - cbonsai = callPackage ../games/cbonsai { }; - - cdogs-sdl = callPackage ../games/cdogs-sdl { }; - - cgoban = callPackage ../games/cgoban { }; - - chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt5.callPackage ../games/chessx { }; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chromium-bsu = callPackage ../games/chromium-bsu { }; - - chocolateDoom = callPackage ../games/chocolate-doom { }; - - clonehero-unwrapped = callPackage ../games/clonehero { }; - - clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { }; - - crispyDoom = callPackage ../games/crispy-doom { }; - - vintagestory = callPackage ../games/vintagestory { }; - - ckan = callPackage ../games/ckan { }; - cockatrice = libsForQt5.callPackage ../games/cockatrice { }; - commandergenius = callPackage ../games/commandergenius { }; - construoBase = lowPrio (callPackage ../games/construo { libGL = null; libGLU = null; @@ -34619,8 +15600,6 @@ with pkgs; inherit libGL libGLU freeglut; }; - crack_attack = callPackage ../games/crack-attack { }; - crawlTiles = callPackage ../games/crawl { tileMode = true; }; @@ -34630,17 +15609,11 @@ with pkgs; inherit (import ../games/crossfire pkgs) crossfire-server crossfire-arch crossfire-maps crossfire-client; - crrcsim = callPackage ../games/crrcsim { }; - curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; cutemaze = qt6Packages.callPackage ../games/cutemaze { }; - cuyo = callPackage ../games/cuyo { }; - - darkplaces = callPackage ../games/darkplaces {}; - deliantra-server = callPackage ../games/deliantra/server.nix { stdenv = gcc10StdenvCompat; }; @@ -34664,10 +15637,6 @@ with pkgs; }; }; - dhewm3 = callPackage ../games/dhewm3 { }; - - domination = callPackage ../games/domination { }; - duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); @@ -34676,8 +15645,6 @@ with pkgs; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; - dxx-rebirth = callPackage ../games/dxx-rebirth { }; - inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets descent2-assets; @@ -34686,36 +15653,16 @@ with pkgs; d1x-rebirth-full d2x-rebirth-full; - easyrpg-player = callPackage ../games/easyrpg-player { }; - - eboard = callPackage ../games/eboard { }; - - ecwolf = callPackage ../games/ecwolf { }; - eduke32 = callPackage ../games/eduke32 { inherit (darwin.apple_sdk.frameworks) AGL Cocoa GLUT OpenGL; }; - egoboo = callPackage ../games/egoboo { }; - - eidolon = callPackage ../games/eidolon { }; - - EmptyEpsilon = callPackage ../games/empty-epsilon { }; - - endgame-singularity = callPackage ../games/endgame-singularity { }; - - endless-sky = callPackage ../games/endless-sky { }; - enyo-launcher = libsForQt5.callPackage ../games/enyo-launcher { }; - eternity = callPackage ../games/eternity-engine { }; - extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; - exult = callPackage ../games/exult { }; - flare = callPackage ../games/flare { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -34734,30 +15681,12 @@ with pkgs; factorio-demo = factorio.override { releaseType = "demo"; }; - factorio-mods = callPackage ../games/factorio/mods.nix { }; - - factorio-utils = callPackage ../games/factorio/utils.nix { }; - - fairymax = callPackage ../games/fairymax { }; - ferium = callPackage ../games/ferium { inherit (darwin.apple_sdk.frameworks) Security; }; - fheroes2 = callPackage ../games/fheroes2 { }; - - fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; - - jumpy = callPackage ../games/jumpy { }; - flightgear = libsForQt5.callPackage ../games/flightgear { }; - flock = callPackage ../development/tools/flock { }; - - forge-mtg = callPackage ../games/forge-mtg { }; - - freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { sdl2Client = false; gtkClient = true; @@ -34778,68 +15707,20 @@ with pkgs; freeciv_gtk = freeciv; - freedink = callPackage ../games/freedink { }; - - freeorion = callPackage ../games/freeorion { }; - - freesweep = callPackage ../games/freesweep { }; - - frotz = callPackage ../games/frotz { }; - - frogatto = callPackage ../games/frogatto { }; - - frozen-bubble = callPackage ../games/frozen-bubble { }; - - fsg = callPackage ../games/fsg { }; - - galaxis = callPackage ../games/galaxis { }; - - gambatte = callPackage ../games/gambatte { }; - garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; gargoyle = callPackage ../games/gargoyle { inherit (darwin) cctools; }; - gav = callPackage ../games/gav { }; - - gcs = callPackage ../games/gcs { }; - gcompris = libsForQt5.callPackage ../games/gcompris { }; - gemrb = callPackage ../games/gemrb { }; - - gimx = callPackage ../games/gimx { }; - - gl117 = callPackage ../games/gl-117 { }; - - globulation2 = callPackage ../games/globulation { }; - - gltron = callPackage ../games/gltron { }; - gl-gsync-demo = callPackage ../games/gl-gsync-demo { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; - gmad = callPackage ../games/gmad { }; - - gnonograms = callPackage ../games/gnonograms { }; - - gnubg = callPackage ../games/gnubg { }; - - gnuchess = callPackage ../games/gnuchess { }; - - gnugo = callPackage ../games/gnugo { }; - - gnujump = callPackage ../games/gnujump { }; - - gnushogi = callPackage ../games/gnushogi { }; - gogdl = python3Packages.callPackage ../games/gogdl { }; - gogui = callPackage ../games/gogui { }; - gscrabble = python3Packages.callPackage ../games/gscrabble { }; gshogi = python3Packages.callPackage ../games/gshogi { }; @@ -34850,56 +15731,24 @@ with pkgs; wine = wineWowPackages.unstable; }; - graphwar = callPackage ../games/graphwar { }; - gtetrinet = callPackage ../games/gtetrinet { inherit (gnome2) GConf libgnome libgnomeui; }; - gtypist = callPackage ../games/gtypist { }; - - gweled = callPackage ../games/gweled { }; - - gzdoom = callPackage ../games/gzdoom { }; - - harmonist = callPackage ../games/harmonist { }; - hedgewars = libsForQt5.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; - hikounomizu = callPackage ../games/hikounomizu { }; - - hyperrogue = callPackage ../games/hyperrogue { }; - - icbm3d = callPackage ../games/icbm3d { }; - - infra = callPackage ../tools/admin/infra { }; - - infra-arcana = callPackage ../games/infra-arcana { }; - - ingen = callPackage ../applications/audio/ingen { }; - - ideogram = callPackage ../applications/graphics/ideogram { }; - instaloader = python3Packages.callPackage ../tools/misc/instaloader { }; - instead = callPackage ../games/instead { }; - - instead-launcher = callPackage ../games/instead-launcher { }; - iortcw = callPackage ../games/iortcw { }; # used as base package for iortcw forks iortcw_sp = callPackage ../games/iortcw/sp.nix { }; - ivan = callPackage ../games/ivan { }; - ja2-stracciatella = callPackage ../games/ja2-stracciatella { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - katago = callPackage ../games/katago { }; - katagoWithCuda = katago.override { enableCuda = true; }; @@ -34908,18 +15757,12 @@ with pkgs; enableGPU = false; }; - klavaro = callPackage ../games/klavaro { }; - - kobodeluxe = callPackage ../games/kobodeluxe { }; - koboredux = callPackage ../games/koboredux { }; koboredux-free = callPackage ../games/koboredux { useProprietaryAssets = false; }; - koules = callPackage ../games/koules { }; - ldmud = callPackage ../games/ldmud { }; ldmud-full = callPackage ../games/ldmud { @@ -34936,16 +15779,8 @@ with pkgs; legendary-gl = python3Packages.callPackage ../games/legendary-gl { }; - left4gore-bin = callPackage ../games/left4gore { }; - lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { }; - liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; - - liberation-circuit = callPackage ../games/liberation-circuit { }; - - lincity = callPackage ../games/lincity { }; - lincity_ng = callPackage ../games/lincity/ng.nix { # https://github.com/lincity-ng/lincity-ng/issues/25 physfs = physfs_2; @@ -34955,25 +15790,10 @@ with pkgs; guile = guile_2_0; }; - liquidwar5 = callPackage ../games/liquidwar/5.nix { - }; - - lugaru = callPackage ../games/lugaru { }; - macopix = callPackage ../games/macopix { gtk = gtk2; }; - mari0 = callPackage ../games/mari0 { }; - - manaplus = callPackage ../games/manaplus { }; - - mars = callPackage ../games/mars { }; - - megaglest = callPackage ../games/megaglest { }; - - methane = callPackage ../games/methane { }; - mindustry = callPackage ../games/mindustry { }; mindustry-wayland = callPackage ../games/mindustry { glew = glew-egl; @@ -34984,15 +15804,9 @@ with pkgs; enableServer = true; }; - minecraft = callPackage ../games/minecraft { }; - - minecraft-server-hibernation = callPackage ../tools/games/minecraft/minecraft-server-hibernation { }; - minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; minecraft-server = minecraftServers.vanilla; # backwards compatibility - moon-buggy = callPackage ../games/moon-buggy { }; - inherit (callPackages ../games/minetest { inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) @@ -35006,8 +15820,6 @@ with pkgs; python = python3; }; - mrrescue = callPackage ../games/mrrescue { }; - mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; }; @@ -35016,14 +15828,6 @@ with pkgs; blightmud-tts = callPackage ../games/blightmud { withTTS = true; }; - n2048 = callPackage ../games/n2048 { }; - - naev = callPackage ../games/naev { }; - - nanosaur = callPackage ../games/nanosaur { }; - - nanosaur2 = callPackage ../games/nanosaur2 { }; - nethack = callPackage ../games/nethack { }; nethack-qt = callPackage ../games/nethack { @@ -35033,59 +15837,16 @@ with pkgs; nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; - netris = callPackage ../games/netris { }; - - neverball = callPackage ../games/neverball { }; - - nexuiz = callPackage ../games/nexuiz { }; - - ninvaders = callPackage ../games/ninvaders { }; - - njam = callPackage ../games/njam { }; - - npush = callPackage ../games/npush { }; - run-npush = callPackage ../games/npush/run.nix { }; - - newtonwars = callPackage ../games/newtonwars { }; - - nudoku = callPackage ../games/nudoku { }; - - nxengine-evo = callPackage ../games/nxengine-evo { }; - - odamex = callPackage ../games/odamex { }; - - oilrush = callPackage ../games/oilrush { }; - - onscripter-en = callPackage ../games/onscripter-en { }; - - openarena = callPackage ../games/openarena { }; - opendungeons = callPackage ../games/opendungeons { ogre = ogre1_10; }; - openlierox = callPackage ../games/openlierox { }; - openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; }; - openjk = callPackage ../games/openjk { }; - openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; - opensoldat = callPackage ../games/opensoldat { }; - - portmod = callPackage ../games/portmod { }; - - tetrio-desktop = callPackage ../games/tetrio-desktop { }; - - tr-patcher = callPackage ../games/tr-patcher { }; - - tes3cmd = callPackage ../games/tes3cmd { }; - - otto-matic = callPackage ../games/otto-matic { }; - openraPackages = import ../games/openra pkgs.__splicedPackages; openra = openraPackages.engines.release; @@ -35108,41 +15869,15 @@ with pkgs; static = true; }; }; - openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { }; - openttd-nml = callPackage ../games/openttd/nml.nix { }; - - opentyrian = callPackage ../games/opentyrian { }; openxcom = callPackage ../games/openxcom { SDL = SDL_compat; }; - openxray = callPackage ../games/openxray { }; - - orthorobot = callPackage ../games/orthorobot { }; - - pacvim = callPackage ../games/pacvim { }; - - papermc = callPackage ../games/papermc { }; - pentobi = libsForQt5.callPackage ../games/pentobi { }; - performous = callPackage ../games/performous { }; - - pinball = callPackage ../games/pinball { }; - - pingus = callPackage ../games/pingus { }; - - pioneer = callPackage ../games/pioneer { }; - - pioneers = callPackage ../games/pioneers { }; - - planetary_annihilation = callPackage ../games/planetaryannihilation { }; - prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher { }; prismlauncher = qt6Packages.callPackage ../games/prismlauncher { }; - pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { boost = boost16x; }; @@ -35152,32 +15887,14 @@ with pkgs; target = "server"; }; - pokete = callPackage ../games/pokete { }; - - powermanga = callPackage ../games/powermanga { }; - - prboom-plus = callPackage ../games/prboom-plus { }; - pysolfc = python3Packages.callPackage ../games/pysolfc { }; - qq = callPackage ../applications/networking/instant-messengers/qq { }; - - qqwing = callPackage ../games/qqwing { }; - - quake3wrapper = callPackage ../games/quake3/wrapper { }; - quake3demo = quake3wrapper { name = "quake3-demo-${lib.getVersion quake3demodata}"; description = "Demo of Quake 3 Arena, a classic first-person shooter"; paks = [ quake3pointrelease quake3demodata ]; }; - quake3demodata = callPackage ../games/quake3/content/demo.nix { }; - - quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; - - quake3hires = callPackage ../games/quake3/content/hires.nix { }; - quakespasm = callPackage ../games/quakespasm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL; }; @@ -35185,23 +15902,6 @@ with pkgs; inherit (darwin) moltenvk; }; - ioquake3 = callPackage ../games/quake3/ioquake { }; - quake3e = callPackage ../games/quake3/quake3e { }; - - quantumminigolf = callPackage ../games/quantumminigolf { }; - - r2mod_cli = callPackage ../games/r2mod_cli { }; - - racer = callPackage ../games/racer { }; - - randtype = callPackage ../games/randtype { }; - - raylib-games = callPackage ../games/raylib-games { }; - - redeclipse = callPackage ../games/redeclipse { }; - - rftg = callPackage ../games/rftg { }; - rigsofrods = callPackage ../games/rigsofrods { angelscript = angelscript_2_22; ogre = ogre1_9; @@ -35213,26 +15913,16 @@ with pkgs; }; }; - riko4 = callPackage ../games/riko4 { }; - - rili = callPackage ../games/rili { }; - rogue = callPackage ../games/rogue { ncurses = ncurses5; }; - robotfindskitten = callPackage ../games/robotfindskitten { }; - - rocksndiamonds = callPackage ../games/rocksndiamonds { }; - rott = callPackage ../games/rott { SDL = SDL_compat; }; rott-shareware = rott.override { buildShareware = true; }; - rrootage = callPackage ../games/rrootage { }; - space-cadet-pinball = callPackage ../games/space-cadet-pinball { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -35241,8 +15931,6 @@ with pkgs; openjdk = openjdk8; }; - sauerbraten = callPackage ../games/sauerbraten { }; - scid = callPackage ../games/scid { tcl = tcl-8_5; tk = tk-8_5; @@ -35267,36 +15955,15 @@ with pkgs; flight-of-the-amazon-queen lure-of-the-temptress; - scorched3d = callPackage ../games/scorched3d { }; - - scrolls = callPackage ../games/scrolls { }; - - service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; - - sfrotz = callPackage ../games/sfrotz { }; - sgtpuzzles = callPackage ../games/sgt-puzzles { }; sgtpuzzles-mobile = callPackage ../games/sgt-puzzles { isMobile = true; }; - shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; - - shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; - - sienna = callPackage ../games/sienna { }; - - sil = callPackage ../games/sil { }; - - sil-q = callPackage ../games/sil-q { }; - - simutrans = callPackage ../games/simutrans { }; # get binaries without data built by Hydra simutrans_binaries = lowPrio simutrans.binaries; - snake4 = callPackage ../games/snake4 { }; - soi = callPackage ../games/soi { lua = lua5_1; }; @@ -35305,29 +15972,10 @@ with pkgs; solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; - sollya = callPackage ../development/interpreters/sollya { }; - - solicurses = callPackage ../games/solicurses { }; - # You still can override by passing more arguments. - space-orbit = callPackage ../games/space-orbit { }; spring = callPackage ../games/spring { asciidoc = asciidoc-full; }; - springLobby = callPackage ../games/spring/springlobby.nix { }; - - srb2 = callPackage ../games/srb2 { }; - - srb2kart = callPackage ../games/srb2kart { }; - - ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; - - stardust = callPackage ../games/stardust { }; - - starspace = callPackage ../applications/science/machine-learning/starspace { }; - - stockfish = callPackage ../games/stockfish { }; - steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }); @@ -35336,51 +15984,25 @@ with pkgs; steam-run = steam.run; - steam-tui = callPackage ../games/steam-tui { }; - steamcmd = steamPackages.steamcmd; - steam-acf = callPackage ../tools/games/steam-acf { }; - protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit winetricks steam-run yad; }; protonup-ng = with python3Packages; toPythonApplication protonup-ng; - steam-rom-manager = callPackage ../tools/games/steam-rom-manager {}; - - sdlpop = callPackage ../games/sdlpop { }; - - stepmania = callPackage ../games/stepmania { }; - streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { }; - stt = callPackage ../tools/audio/stt { }; - stuntrally = callPackage ../games/stuntrally { ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; - superTux = callPackage ../games/supertux { }; - superTuxKart = callPackage ../games/super-tux-kart { inherit (darwin.apple_sdk.frameworks) Cocoa IOKit OpenAL; }; synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; - snis = callPackage ../games/snis { }; - - system-syzygy = callPackage ../games/system-syzygy { }; - - t4kcommon = callPackage ../games/t4kcommon { }; - - taisei = callPackage ../games/taisei { }; - - tcl2048 = callPackage ../games/tcl2048 { }; - - the-legend-of-edgar = callPackage ../games/the-legend-of-edgar { }; - the-powder-toy = callPackage ../games/the-powder-toy { lua = lua5_1; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -35388,147 +16010,49 @@ with pkgs; tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; - tbls = callPackage ../tools/misc/tbls { }; - - tecnoballz = callPackage ../games/tecnoballz { }; - - teetertorture = callPackage ../games/teetertorture { }; - - teeworlds = callPackage ../games/teeworlds { }; - tengine = callPackage ../servers/http/tengine { openssl = openssl_1_1; modules = with nginxModules; [ rtmp dav moreheaders modsecurity ]; }; - tennix = callPackage ../games/tennix { }; - - terraria-server = callPackage ../games/terraria-server { }; - tibia = pkgsi686Linux.callPackage ../games/tibia { }; - tintin = callPackage ../games/tintin { }; - - tinyfugue = callPackage ../games/tinyfugue { }; - - titanion = callPackage ../games/titanion { }; - - tome2 = callPackage ../games/tome2 { }; - - tome4 = callPackage ../games/tome4 { }; - - toppler = callPackage ../games/toppler { }; - - torus-trooper = callPackage ../games/torus-trooper { }; - - trackballs = callPackage ../games/trackballs { }; - - tumiki-fighters = callPackage ../games/tumiki-fighters { }; - - tuxpaint = callPackage ../games/tuxpaint { }; - - tuxtype = callPackage ../games/tuxtype { }; - - tworld2 = callPackage ../games/tworld2 { }; - speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC libpng = libpng12; }; - torcs = callPackage ../games/torcs { }; - - trigger = callPackage ../games/trigger { }; - - typespeed = callPackage ../games/typespeed { }; - - uchess = callPackage ../games/uchess { }; - - ufoai = callPackage ../games/ufoai { }; - - uhexen2 = callPackage ../games/uhexen2 { }; - - ultimatestunts = callPackage ../games/ultimatestunts { }; - ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { }; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx { }; - - umoria = callPackage ../games/umoria { }; - - unciv = callPackage ../games/unciv { }; - - unnethack = callPackage ../games/unnethack { }; - - uqm = callPackage ../games/uqm { }; - - urbanterror = callPackage ../games/urbanterror { }; - - ue4 = callPackage ../games/ue4 { }; - ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { }); ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; - vassal = callPackage ../games/vassal { }; - - vdrift = callPackage ../games/vdrift { }; - # To ensure vdrift's code is built on hydra vdrift-bin = vdrift.bin; - vectoroids = callPackage ../games/vectoroids { }; - vessel = pkgsi686Linux.callPackage ../games/vessel { }; - vitetris = callPackage ../games/vitetris { }; - - vms-empire = callPackage ../games/vms-empire { }; - voxelands = callPackage ../games/voxelands { libpng = libpng12; }; - wargus = callPackage ../games/wargus { }; - - warmux = callPackage ../games/warmux { }; - - warsow-engine = callPackage ../games/warsow/engine.nix { }; - - warsow = callPackage ../games/warsow { }; - - warzone2100 = callPackage ../games/warzone2100 { }; - wesnoth = callPackage ../games/wesnoth { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; wesnoth-dev = wesnoth; - widelands = callPackage ../games/widelands { }; - - worldofgoo = callPackage ../games/worldofgoo { }; - - xboard = callPackage ../games/xboard { }; - - xbomb = callPackage ../games/xbomb { }; - xconq = callPackage ../games/xconq { tcl = tcl-8_5; tk = tk-8_5; }; - xcowsay = callPackage ../games/xcowsay { }; - - xjump = callPackage ../games/xjump { }; - - xmoto = callPackage ../games/xmoto { }; - inherit (callPackage ../games/xonotic { }) xonotic-data @@ -35550,20 +16074,6 @@ with pkgs; 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 { }; - - xskat = callPackage ../games/xskat { }; - - xsnow = callPackage ../games/xsnow { }; - - xsok = callPackage ../games/xsok { }; - - xsokoban = callPackage ../games/xsokoban { }; - - xtris = callPackage ../games/xtris { }; - inherit (callPackage ../games/quake2/yquake2 { inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }) @@ -35579,46 +16089,18 @@ with pkgs; serverOnly = true; }; - zaz = callPackage ../games/zaz { }; - - zdbsp = callPackage ../games/zdoom/zdbsp.nix { }; - - zdoom = callPackage ../games/zdoom { }; - - zod = callPackage ../games/zod { }; - - zoom = callPackage ../games/zoom { }; - - keen4 = callPackage ../games/keen4 { }; - zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK32; }); zeroad = zeroadPackages.zeroad; - _0verkill = callPackage ../games/0verkill { }; - - _7kaa = callPackage ../games/7kaa { }; - - hhexen = callPackage ../games/hhexen { }; - - wyvern = callPackage ../games/wyvern { }; - - hsetroot = callPackage ../tools/X11/hsetroot { }; - - imwheel = callPackage ../tools/X11/imwheel { }; - - kakasi = callPackage ../tools/text/kakasi { }; - ### DESKTOP ENVIRONMENTS arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); - cdesktopenv = callPackage ../desktops/cdesktopenv { }; - cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; @@ -35637,16 +16119,6 @@ with pkgs; gnome43Extensions ; - gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; - - gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { }; - - gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - - gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { }; - - gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; - gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); @@ -35675,16 +16147,10 @@ with pkgs; pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - - wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; - rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; }; - surf-display = callPackage ../desktops/surf-display { }; - xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; @@ -35705,8 +16171,6 @@ with pkgs; gnome-themes-extra = gnome.gnome-themes-extra; - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; - ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro { @@ -35720,26 +16184,10 @@ with pkgs; avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { }; - chemtool = callPackage ../applications/science/chemistry/chemtool { }; - - cp2k = callPackage ../applications/science/chemistry/cp2k { }; - - d-seams = callPackage ../applications/science/chemistry/d-seams {}; - - ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; - - gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - jmol = callPackage ../applications/science/chemistry/jmol { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - marvin = callPackage ../applications/science/chemistry/marvin { }; - - molden = callPackage ../applications/science/chemistry/molden { }; - - octopus = callPackage ../applications/science/chemistry/octopus { }; - openlp = libsForQt5.callPackage ../applications/misc/openlp { }; openlpFull = openlp.override { pdfSupport = true; @@ -35748,12 +16196,6 @@ with pkgs; gstreamerSupport = true; }; - dkh = callPackage ../applications/science/chemistry/dkh { }; - - openmolcas = callPackage ../applications/science/chemistry/openmolcas { }; - - pymol = callPackage ../applications/science/chemistry/pymol { }; - quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { }; quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { useMpi = true; }; @@ -35764,48 +16206,22 @@ with pkgs; ### SCIENCE/GEOMETRY - antiprism = callPackage ../applications/science/geometry/antiprism { }; - - gama = callPackage ../applications/science/geometry/gama { }; - drgeo = callPackage ../applications/science/geometry/drgeo { inherit (gnome2) libglade; guile = guile_1_8; }; - tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ - tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT + /* tetgen = */ # AGPL3+ + /* tetgen_1_4 = */ # MIT ### SCIENCE/BENCHMARK - papi = callPackage ../development/libraries/science/benchmark/papi { }; - ### SCIENCE/BIOLOGY - alliance = callPackage ../applications/science/electronics/alliance { }; - - angsd = callPackage ../applications/science/biology/angsd { }; - ants = callPackage ../applications/science/biology/ants { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - aragorn = callPackage ../applications/science/biology/aragorn { }; - - astral = callPackage ../applications/science/biology/astral { }; - - archimedes = callPackage ../applications/science/electronics/archimedes { }; - - bayescan = callPackage ../applications/science/biology/bayescan { }; - - bedops = callPackage ../applications/science/biology/bedops { }; - - bedtools = callPackage ../applications/science/biology/bedtools { }; - - bcftools = callPackage ../applications/science/biology/bcftools { }; - - bftools = callPackage ../applications/science/biology/bftools { }; - blast = callPackage ../applications/science/biology/blast { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -35838,62 +16254,14 @@ with pkgs; boost = boost16x; }; - cmtk = callPackage ../applications/science/biology/cmtk { }; - - clustal-omega = callPackage ../applications/science/biology/clustal-omega { }; - - conglomerate = callPackage ../applications/science/biology/conglomerate { }; - - dalfox = callPackage ../tools/security/dalfox { }; - - davtest = callPackage ../tools/security/davtest { }; - - dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; - deepdiff = with python3Packages; toPythonApplication deepdiff; - deepsea = callPackage ../tools/security/deepsea { }; - deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; deep-translator = with python3Packages; toPythonApplication deep-translator; - delly = callPackage ../applications/science/biology/delly { }; - - diamond = callPackage ../applications/science/biology/diamond { }; - - dssp = callPackage ../applications/science/biology/dssp { }; - - ecopcr = callPackage ../applications/science/biology/ecopcr { }; - - eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { }; - - emboss = callPackage ../applications/science/biology/emboss { }; - - est-sfs = callPackage ../applications/science/biology/est-sfs { }; - - ezminc = callPackage ../applications/science/biology/EZminc { }; - - exonerate = callPackage ../applications/science/biology/exonerate { }; - - fastp = callPackage ../applications/science/biology/fastp { }; - febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { }; - flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { }; - - hisat2 = callPackage ../applications/science/biology/hisat2 { }; - - htslib = callPackage ../development/libraries/science/biology/htslib { }; - - igv = callPackage ../applications/science/biology/igv { }; - - inormalize = callPackage ../applications/science/biology/inormalize { }; - - iqtree = callPackage ../applications/science/biology/iqtree { }; - - itsx = callPackage ../applications/science/biology/itsx { }; - iv = callPackage ../applications/science/biology/iv { neuron-version = neuron.version; }; @@ -35902,111 +16270,32 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - kasmweb = callPackage ../servers/web-apps/kasmweb { }; - - kssd = callPackage ../applications/science/biology/kssd { }; - - last = callPackage ../applications/science/biology/last { }; - - macse = callPackage ../applications/science/biology/macse { }; - - MACS2 = callPackage ../applications/science/biology/MACS2 { }; - - mafft = callPackage ../applications/science/biology/mafft { }; - - migrate = callPackage ../applications/science/biology/migrate { }; - - minia = callPackage ../applications/science/biology/minia { }; - mirtk = callPackage ../development/libraries/science/biology/mirtk { boost = boost16x; }; - muscle = callPackage ../applications/science/biology/muscle { }; - - n3 = callPackage ../applications/science/biology/N3 { }; - neuron = callPackage ../applications/science/biology/neuron { python = null; }; neuron-mpi = neuron.override {useMpi = true; }; neuron-full = neuron-mpi.override { python = python2; }; - mrbayes = callPackage ../applications/science/biology/mrbayes { }; - mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; }; - megahit = callPackage ../applications/science/biology/megahit { }; - - messer-slim = callPackage ../applications/science/biology/messer-slim { }; - minc_tools = callPackage ../applications/science/biology/minc-tools { inherit (perlPackages) perl TextFormat; }; - minc_widgets = callPackage ../applications/science/biology/minc-widgets { }; - - mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { }; - - minimap2 = callPackage ../applications/science/biology/minimap2 { }; - mmseqs2 = callPackage ../applications/science/biology/mmseqs2 { inherit (llvmPackages) openmp; }; - mosdepth = callPackage ../applications/science/biology/mosdepth { }; - - niftyreg = callPackage ../applications/science/biology/niftyreg { }; - - niftyseg = callPackage ../applications/science/biology/niftyseg { }; - - manta = callPackage ../applications/science/biology/manta { }; - - obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { }; - - octopus-caller = callPackage ../applications/science/biology/octopus { }; - - paml = callPackage ../applications/science/biology/paml { }; - - picard-tools = callPackage ../applications/science/biology/picard-tools { }; - - platypus = callPackage ../applications/science/biology/platypus { }; - - plink-ng = callPackage ../applications/science/biology/plink-ng { }; - - prodigal = callPackage ../applications/science/biology/prodigal { }; - - quast = callPackage ../applications/science/biology/quast { }; - - raxml = callPackage ../applications/science/biology/raxml { }; - raxml-mpi = raxml.override { useMpi = true; }; - sambamba = callPackage ../applications/science/biology/sambamba { }; - - samblaster = callPackage ../applications/science/biology/samblaster { }; - - samtools = callPackage ../applications/science/biology/samtools { }; samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { stdenv = gccStdenv; }; - seqtk = callPackage ../applications/science/biology/seqtk { }; - - seqkit = callPackage ../applications/science/biology/seqkit { }; - - snpeff = callPackage ../applications/science/biology/snpeff { }; - - somafm-cli = callPackage ../tools/misc/somafm-cli { }; - - somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; - - sortmerna = callPackage ../applications/science/biology/sortmerna { }; - - stacks = callPackage ../applications/science/biology/stacks { }; - - star = callPackage ../applications/science/biology/star { }; - strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; }; inherit (callPackages ../applications/science/biology/sumatools {}) @@ -36014,133 +16303,30 @@ with pkgs; sumaclust sumatra; - seaview = callPackage ../applications/science/biology/seaview { }; - - SPAdes = callPackage ../applications/science/biology/spades { }; - - svaba = callPackage ../applications/science/biology/svaba { }; - - tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; - - tebreak = callPackage ../applications/science/biology/tebreak { }; - - treemix = callPackage ../applications/science/biology/treemix { }; - - trimal = callPackage ../applications/science/biology/trimal { }; - - truvari = callPackage ../applications/science/biology/truvari { }; - - varscan = callPackage ../applications/science/biology/varscan { }; - - whisper = callPackage ../applications/science/biology/whisper { }; - - xenomapper = callPackage ../applications/science/biology/xenomapper { }; - - hmmer = callPackage ../applications/science/biology/hmmer { }; - - bwa = callPackage ../applications/science/biology/bwa { }; - ### SCIENCE/MACHINE LEARNING - nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { }; - - sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; - - uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { }; - ### SCIENCE/MATH - _4ti2 = callPackage ../applications/science/math/4ti2 { }; - - almonds = callPackage ../applications/science/math/almonds { }; - - adolc = callPackage ../applications/science/math/adolc { }; - - amd-blis = callPackage ../development/libraries/science/math/amd-blis { }; - - amd-libflame = callPackage ../development/libraries/science/math/amd-libflame { }; - - arpack = callPackage ../development/libraries/science/math/arpack { }; - - blas = callPackage ../build-support/alternatives/blas { }; - blas-ilp64 = blas.override { isILP64 = true; }; - blas-reference = callPackage ../development/libraries/science/math/blas { }; - - bonmin = callPackage ../development/libraries/science/math/bonmin { }; - - brial = callPackage ../development/libraries/science/math/brial { }; - clblas = callPackage ../development/libraries/science/math/clblas { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; }; - cliquer = callPackage ../development/libraries/science/math/cliquer { }; - - ecos = callPackage ../development/libraries/science/math/ecos { }; - - flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; }; - gurobi = callPackage ../applications/science/math/gurobi { }; - - jags = callPackage ../applications/science/math/jags { }; - - lapack = callPackage ../build-support/alternatives/lapack { }; - lapack-ilp64 = lapack.override { isILP64 = true; }; - lapack-reference = callPackage ../development/libraries/science/math/liblapack { }; liblapack = lapack-reference; - libamplsolver = callPackage ../development/libraries/science/math/libamplsolver { }; - - libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; - - libhomfly = callPackage ../development/libraries/science/math/libhomfly { }; - - liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - - lrs = callPackage ../development/libraries/science/math/lrs { }; - - m4ri = callPackage ../development/libraries/science/math/m4ri { }; - - m4rie = callPackage ../development/libraries/science/math/m4rie { }; - - mkl = callPackage ../development/libraries/science/math/mkl { }; - - nasc = callPackage ../applications/science/math/nasc { }; - nota = haskellPackages.callPackage ../applications/science/math/nota { }; notus-scanner = with python3Packages; toPythonApplication notus-scanner; - openblas = callPackage ../development/libraries/science/math/openblas { }; - # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; - openlibm = callPackage ../development/libraries/science/math/openlibm {}; - - openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; - - planarity = callPackage ../development/libraries/science/math/planarity { }; - - scalapack = callPackage ../development/libraries/science/math/scalapack { }; - - rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; - - latte-integrale = callPackage ../development/libraries/science/math/latte-integrale { }; - - lcalc = callPackage ../development/libraries/science/math/lcalc { }; - - lrcalc = callPackage ../applications/science/math/lrcalc { }; - - lie = callPackage ../applications/science/math/LiE { }; - magma = callPackage ../development/libraries/science/math/magma { inherit (llvmPackages_rocm) openmp; }; @@ -36155,8 +16341,6 @@ with pkgs; useROCM = true; }; - clmagma = callPackage ../development/libraries/science/math/clmagma { }; - mathematica = callPackage ../applications/science/math/mathematica { }; mathematica-cuda = callPackage ../applications/science/math/mathematica { @@ -36175,12 +16359,6 @@ with pkgs; version = "11"; }; - metis = callPackage ../development/libraries/science/math/metis {}; - - nauty = callPackage ../applications/science/math/nauty {}; - - osi = callPackage ../development/libraries/science/math/osi { }; - or-tools = callPackage ../development/libraries/science/math/or-tools { python = python3; # or-tools builds with -std=c++20, so abseil-cpp must @@ -36191,8 +16369,6 @@ with pkgs; }; }; - rubiks = callPackage ../development/libraries/science/math/rubiks { }; - p4est-sc = callPackage ../development/libraries/science/math/p4est-sc { p4est-sc-debugEnable = false; }; @@ -36205,52 +16381,18 @@ with pkgs; p4est-sc = p4est-sc-dbg; }; - petsc = callPackage ../development/libraries/science/math/petsc { }; - - parmetis = callPackage ../development/libraries/science/math/parmetis { }; - - QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; - - scs = callPackage ../development/libraries/science/math/scs { }; - - sage = callPackage ../applications/science/math/sage { }; sageWithDoc = sage.override { withDoc = true; }; - sagetex = callPackage ../misc/sagetex { }; - - subread = callPackage ../applications/science/biology/subread { }; - - suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; - suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix {}; - suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {}; suitesparse = suitesparse_5_3; - suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas {}; - - superlu = callPackage ../development/libraries/science/math/superlu {}; - - symmetrica = callPackage ../applications/science/math/symmetrica {}; - - sympow = callPackage ../development/libraries/science/math/sympow { }; - trilinos = callPackage ../development/libraries/science/math/trilinos {}; trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; }; wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { }; - wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { }; - - wolfram-notebook = callPackage ../applications/science/math/wolfram-engine/notebook.nix { }; - - ipopt = callPackage ../development/libraries/science/math/ipopt { }; - gmsh = callPackage ../applications/science/math/gmsh { }; - wcpg = callPackage ../development/libraries/science/math/wcpg { }; - - zn_poly = callPackage ../development/libraries/science/math/zn_poly { }; - ### SCIENCE/MOLECULAR-DYNAMICS dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; }; @@ -36295,75 +16437,33 @@ with pkgs; ### SCIENCE/MEDICINE - aliza = callPackage ../applications/science/medicine/aliza { }; - - dcmtk = callPackage ../applications/science/medicine/dcmtk { }; - - xmedcon = callPackage ../applications/science/medicine/xmedcon { }; - ### SCIENCE/PHYSICS - dawn = callPackage ../applications/science/physics/dawn {}; - - dawncut = callPackage ../applications/science/physics/dawncut {}; - - elmerfem = callPackage ../applications/science/physics/elmerfem {}; - mcfm = callPackage ../applications/science/physics/MCFM { stdenv = gccStdenv; lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; }; }; - nnpdf = callPackage ../applications/science/physics/nnpdf { }; - - professor = callPackage ../applications/science/physics/professor { }; - - sacrifice = callPackage ../applications/science/physics/sacrifice {}; - - sherpa = callPackage ../applications/science/physics/sherpa {}; - - shtns = callPackage ../applications/science/physics/shtns { }; - validphys2 = with python3Packages; toPythonApplication validphys2; - xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; - xnec2c = callPackage ../applications/science/physics/xnec2c { }; - ### SCIENCE/PROGRAMMING dafny = dotnetPackages.Dafny; - groove = callPackage ../applications/science/programming/groove { }; - - plm = callPackage ../applications/science/programming/plm { }; - ### SCIENCE/LOGIC - abc-verifier = callPackage ../applications/science/logic/abc {}; - abella = callPackage ../applications/science/logic/abella { ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; - acgtk = callPackage ../applications/science/logic/acgtk {}; - - alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; - aspino = callPackage ../applications/science/logic/aspino { stdenv = gcc10StdenvCompat; }; - beluga = callPackage ../applications/science/logic/beluga {}; - boogie = dotnetPackages.Boogie; - cbmc = callPackage ../applications/science/logic/cbmc { }; - - cadical = callPackage ../applications/science/logic/cadical {}; - inherit (callPackage ./coq-packages.nix { inherit (ocaml-ng) ocamlPackages_4_05 @@ -36389,23 +16489,10 @@ with pkgs; coqPackages coq ; - coq2html = callPackage ../tools/typesetting/coq2html { }; - - cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; - - crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - - cubicle = callPackage ../applications/science/logic/cubicle { }; - cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); stdenv = gccStdenv; }; - cvc4 = callPackage ../applications/science/logic/cvc4 { }; - - cvc5 = callPackage ../applications/science/logic/cvc5 { }; - - drat-trim = callPackage ../applications/science/logic/drat-trim {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper { ocaml = ocaml-ng.ocamlPackages_4_14.ocaml.override { @@ -36417,36 +16504,10 @@ with pkgs; eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; }; - formula = callPackage ../applications/science/logic/formula { }; - - gappa = callPackage ../applications/science/logic/gappa { }; - - gfan = callPackage ../applications/science/math/gfan {}; - - giac = callPackage ../applications/science/math/giac { }; giac-with-xcas = giac.override { enableGUI = true; }; - ginac = callPackage ../applications/science/math/ginac { }; - - glom = callPackage ../applications/misc/glom { }; - - glucose = callPackage ../applications/science/logic/glucose { }; - glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { }; - - hol = callPackage ../applications/science/logic/hol { }; - inherit (ocaml-ng.ocamlPackages_4_12) hol_light; - hologram = callPackage ../tools/security/hologram { }; - - honeytrap = callPackage ../tools/security/honeytrap { }; - - kissat = callPackage ../applications/science/logic/kissat {}; - - tini = callPackage ../applications/virtualization/tini {}; - - ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; - isabelle = callPackage ../applications/science/logic/isabelle { polyml = polyml.overrideAttrs (_: { pname = "polyml-for-isabelle"; @@ -36465,61 +16526,18 @@ with pkgs; }; isabelle-components = recurseIntoAttrs (callPackage ../applications/science/logic/isabelle/components { }); - iprover = callPackage ../applications/science/logic/iprover { }; - - key = callPackage ../applications/science/logic/key { }; - - keymapviz = callPackage ../tools/misc/keymapviz { }; - - lean = callPackage ../applications/science/logic/lean {}; - lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; - elan = callPackage ../applications/science/logic/elan {}; mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 { inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; }; - leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; - - logisim = callPackage ../applications/science/logic/logisim {}; - - logisim-evolution = callPackage ../applications/science/logic/logisim-evolution {}; - - ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; - - metis-prover = callPackage ../applications/science/logic/metis-prover { }; - - mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; - - minisat = callPackage ../applications/science/logic/minisat {}; - - monosat = callPackage ../applications/science/logic/monosat {}; - - nusmv = callPackage ../applications/science/logic/nusmv { }; - - nuXmv = callPackage ../applications/science/logic/nuXmv {}; - - opensmt = callPackage ../applications/science/logic/opensmt { }; - - ott = callPackage ../applications/science/logic/ott { }; - - picosat = callPackage ../applications/science/logic/picosat {}; - - libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = callPackage ../applications/science/logic/prooftree { ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; - prover9 = callPackage ../applications/science/logic/prover9 { }; - - proverif = callPackage ../applications/science/logic/proverif { }; - satallax = callPackage ../applications/science/logic/satallax { }; - saw-tools = callPackage ../applications/science/logic/saw-tools {}; - spass = callPackage ../applications/science/logic/spass { stdenv = gccStdenv; }; @@ -36528,26 +16546,10 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; - tptp = callPackage ../applications/science/logic/tptp {}; - - celf = callPackage ../applications/science/logic/celf { }; - - fast-downward = callPackage ../applications/science/logic/fast-downward { }; - - twelf = callPackage ../applications/science/logic/twelf { }; - - verifast = callPackage ../applications/science/logic/verifast {}; - veriT = callPackage ../applications/science/logic/verit { stdenv = gccStdenv; }; - why3 = callPackage ../applications/science/logic/why3 { }; - - wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { }; - - workcraft = callPackage ../applications/science/logic/workcraft {}; - yices = callPackage ../applications/science/logic/yices { gmp-static = gmp.override { withStatic = true; }; }; @@ -36557,9 +16559,6 @@ with pkgs; z3_4_11 z3_4_8; z3 = z3_4_8; - z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; - - zchaff = callPackage ../applications/science/logic/zchaff { }; tlaplus = callPackage ../applications/science/logic/tlaplus { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -36567,81 +16566,31 @@ with pkgs; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; - tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {}; - - aiger = callPackage ../applications/science/logic/aiger {}; avy = callPackage ../applications/science/logic/avy {}; - btor2tools = callPackage ../applications/science/logic/btor2tools {}; - - boolector = callPackage ../applications/science/logic/boolector {}; - - bitwuzla = callPackage ../applications/science/logic/bitwuzla {}; - - symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; - - symfpu = callPackage ../applications/science/logic/symfpu {}; - - uhdm = callPackage ../applications/science/logic/uhdm {}; - - surelog = callPackage ../applications/science/logic/surelog {}; - - mcy = callPackage ../applications/science/logic/mcy {}; - - lingeling = callPackage ../applications/science/logic/lingeling {}; - ### SCIENCE / ENGINEERING - brmodelo = callPackage ../applications/science/engineering/brmodelo { }; - - jflap = callPackage ../applications/science/engineering/jflap { }; - strictdoc = python3.pkgs.callPackage ../applications/science/engineering/strictdoc { }; ### SCIENCE / ELECTRONICS - adms = callPackage ../applications/science/electronics/adms { }; - appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; - csxcad = callPackage ../applications/science/electronics/csxcad { }; - dataexplorer = callPackage ../applications/science/electronics/dataexplorer { # executable fails at startup for jdk > 17 jdk = jdk17; }; - diylc = callPackage ../applications/science/electronics/diylc { }; - - flatcam = callPackage ../applications/science/electronics/flatcam { }; - - flopoco = callPackage ../applications/science/electronics/flopoco { }; - - fparser = callPackage ../applications/science/electronics/fparser { }; - geda = callPackage ../applications/science/electronics/geda { guile = guile_2_0; }; - gerbv = callPackage ../applications/science/electronics/gerbv { }; - - gtkwave = callPackage ../applications/science/electronics/gtkwave { }; - - hyp2mat = callPackage ../applications/science/electronics/hyp2mat { }; - - fped = callPackage ../applications/science/electronics/fped { }; - - gaw = callPackage ../applications/science/electronics/gaw {}; - - horizon-eda = callPackage ../applications/science/electronics/horizon-eda {}; - # this is a wrapper for kicad.base and kicad.libraries - kicad = callPackage ../applications/science/electronics/kicad { }; kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; }; # mostly here so the kicad-unstable components (except packages3d) get built @@ -36653,30 +16602,12 @@ with pkgs; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; - ngspice = callPackage ../applications/science/electronics/ngspice { }; - - nvc = callPackage ../applications/science/electronics/nvc { }; - openems = callPackage ../applications/science/electronics/openems { qcsxcad = libsForQt5.qcsxcad; }; openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { }; - openboardview = callPackage ../applications/science/electronics/openboardview { }; - - pcb = callPackage ../applications/science/electronics/pcb { }; - - qucs = callPackage ../applications/science/electronics/qucs { }; - - qucs-s = callPackage ../applications/science/electronics/qucs-s { }; - - xcircuit = callPackage ../applications/science/electronics/xcircuit { }; - - xoscope = callPackage ../applications/science/electronics/xoscope { }; - - xschem = callPackage ../applications/science/electronics/xschem { }; - xyce = callPackage ../applications/science/electronics/xyce { }; xyce-parallel = callPackage ../applications/science/electronics/xyce { @@ -36705,23 +16636,10 @@ with pkgs; cudaSupport = config.cudaSupport or false; }; - dap = callPackage ../applications/science/math/dap { }; - - ecm = callPackage ../applications/science/math/ecm { }; - - eukleides = callPackage ../applications/science/math/eukleides { }; - - form = callPackage ../applications/science/math/form { }; - - fricas = callPackage ../applications/science/math/fricas { }; - - gap = callPackage ../applications/science/math/gap { }; - gap-minimal = lowPrio (gap.override { packageSet = "minimal"; }); gap-full = lowPrio (gap.override { packageSet = "full"; }); - geogebra = callPackage ../applications/science/math/geogebra { }; geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { electron = electron_14; }; @@ -36744,46 +16662,9 @@ with pkgs; }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; - gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; - - palp = callPackage ../applications/science/math/palp { }; - - ratpoints = callPackage ../applications/science/math/ratpoints {}; - - calc = callPackage ../applications/science/math/calc { }; - - pcalc = callPackage ../applications/science/math/pcalc { }; - - programmer-calculator = callPackage ../applications/science/math/programmer-calculator { }; - - bcal = callPackage ../applications/science/math/bcal { }; - - pagsuite = callPackage ../applications/science/math/pagsuite { }; - - pspp = callPackage ../applications/science/math/pspp { }; - - ssw = callPackage ../applications/misc/ssw { }; - - pynac = callPackage ../applications/science/math/pynac { }; - - scalp = callPackage ../applications/science/math/scalp { }; - - singular = callPackage ../applications/science/math/singular { }; - - scilab-bin = callPackage ../applications/science/math/scilab-bin {}; - - scilla = callPackage ../tools/security/scilla { }; - - scotch = callPackage ../applications/science/math/scotch { }; - - mininet = callPackage ../tools/virtualization/mininet { }; - - msieve = callPackage ../applications/science/math/msieve { }; weka = callPackage ../applications/science/math/weka { jre = openjdk11; }; - yad = callPackage ../tools/misc/yad { }; - yacas = libsForQt5.callPackage ../applications/science/math/yacas { }; yacas-gui = yacas.override { @@ -36795,8 +16676,6 @@ with pkgs; ### SCIENCE / MISC - boinc = callPackage ../applications/science/misc/boinc { }; - celestia = callPackage ../applications/science/astronomy/celestia { autoreconfHook = buildPackages.autoreconfHook269; inherit (gnome2) gtkglext; @@ -36815,12 +16694,6 @@ with pkgs; swig = swig4; }; - fityk = callPackage ../applications/science/misc/fityk { }; - - galario = callPackage ../development/libraries/galario { }; - - gildas = callPackage ../applications/science/astronomy/gildas { }; - gplates = libsForQt5.callPackage ../applications/science/misc/gplates { boost = boost175; # build with Python 3.10 fails, because boost <= 1.78 can't find @@ -36828,18 +16701,10 @@ with pkgs; python3 = python39; }; - grap = callPackage ../tools/security/grap { }; - - gravit = callPackage ../applications/science/astronomy/gravit { }; - golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK32; }; - megam = callPackage ../applications/science/misc/megam { }; - - netlogo = callPackage ../applications/science/misc/netlogo { }; - nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { }; ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; @@ -36860,69 +16725,30 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - simgrid = callPackage ../applications/science/misc/simgrid { }; - - sumo = callPackage ../applications/science/networking/sumo { }; - spyder = with python3.pkgs; toPythonApplication spyder; - spyre = callPackage ../tools/security/spyre { }; - - sq = callPackage ../development/tools/sq { }; - stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { }; stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { }; - astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; - tulip = libsForQt5.callPackage ../applications/science/misc/tulip { }; - vite = callPackage ../applications/science/misc/vite { }; - - xearth = callPackage ../applications/science/astronomy/xearth { }; - xplanet = callPackage ../applications/science/astronomy/xplanet { }; - ### SCIENCE / PHYSICS - apfelgrid = callPackage ../development/libraries/physics/apfelgrid { }; - - apfel = callPackage ../development/libraries/physics/apfel { }; - applgrid = callPackage ../development/libraries/physics/applgrid { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - hoppet = callPackage ../development/libraries/physics/hoppet { }; - - fastjet = callPackage ../development/libraries/physics/fastjet { }; - - fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { }; - - fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { }; - geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; - cernlib = callPackage ../development/libraries/physics/cernlib { }; - - clhep = callPackage ../development/libraries/physics/clhep { }; - - hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; - hepmc3 = callPackage ../development/libraries/physics/hepmc3 { python = null; }; - herwig = callPackage ../development/libraries/physics/herwig { }; - lhapdf = callPackage ../development/libraries/physics/lhapdf { python = python3; }; - mela = callPackage ../development/libraries/physics/mela { }; - - nlojet = callPackage ../development/libraries/physics/nlojet { }; - pythia = callPackage ../development/libraries/physics/pythia { hepmc = hepmc2; }; @@ -36932,8 +16758,6 @@ with pkgs; imagemagick = graphicsmagick-imagemagick-compat; }; - thepeg = callPackage ../development/libraries/physics/thepeg { }; - yoda = callPackage ../development/libraries/physics/yoda { python = python3; }; @@ -36941,129 +16765,37 @@ with pkgs; withRootSupport = true; }); - qcdnum = callPackage ../development/libraries/physics/qcdnum { }; - ### SCIENCE/ROBOTICS apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; - betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; - - emuflight-configurator = callPackage ../applications/science/robotics/emuflight-configurator { }; - - inav-configurator = callPackage ../applications/science/robotics/inav-configurator { }; - - mission-planner = callPackage ../applications/science/robotics/mission-planner { }; - ### MISC - acpilight = callPackage ../misc/acpilight { }; - - alpnpass = callPackage ../applications/networking/alpnpass { }; - android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { }; - - atmos = callPackage ../applications/networking/cluster/atmos {}; - - fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; - areca = callPackage ../applications/backup/areca { jdk = jdk8; jre = jre8; swt = swt_jdk8; }; - argononed = callPackage ../misc/drivers/argononed { }; - autotiling = python3Packages.callPackage ../misc/autotiling { }; - autotiling-rs = callPackage ../misc/autotiling-rs { }; - avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; - beep = callPackage ../misc/beep { }; - - bees = callPackage ../tools/filesystems/bees { }; - - bootil = callPackage ../development/libraries/bootil { }; - brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr {}; - brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; - - brightnessctl = callPackage ../misc/brightnessctl { }; - - cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - civo = callPackage ../applications/networking/cluster/civo { }; - - click = callPackage ../applications/networking/cluster/click { }; - clinfo = callPackage ../tools/system/clinfo { inherit (darwin.apple_sdk.frameworks) OpenCL; }; - clpeak = callPackage ../tools/misc/clpeak { }; - - cups = callPackage ../misc/cups { }; - - cups-filters = callPackage ../misc/cups/filters.nix { }; - - cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; - - cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; - - cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw {}; - - cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {}; - - cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog {}; - - cups-dymo = callPackage ../misc/cups/drivers/dymo {}; - - cups-pdf-to-pdf = callPackage ../misc/cups/drivers/cups-pdf-to-pdf {}; - - cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; - - cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; - - colort = callPackage ../applications/misc/colort { }; - - terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; - - epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; - - epson-escpr = callPackage ../misc/drivers/epson-escpr { }; - epson-escpr2 = callPackage ../misc/drivers/epson-escpr2 { }; - - epson_201207w = callPackage ../misc/drivers/epson_201207w { }; - - epson-201401w = callPackage ../misc/drivers/epson-201401w { }; - - epson-201106w = callPackage ../misc/drivers/epson-201106w { }; - - epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; - - foomatic-db = callPackage ../misc/cups/drivers/foomatic-db {}; - foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine {}; - foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree {}; foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds {}; foomatic-db-ppds-withNonfreeDb = callPackage ../misc/cups/drivers/foomatic-db-ppds { withNonfreeDb = true; }; - gutenprint = callPackage ../misc/drivers/gutenprint { }; - - gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; - - carps-cups = callPackage ../misc/cups/drivers/carps-cups { }; - - cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; - dcp9020cdwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).driver; dcp9020cdw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).cupswrapper; @@ -37076,110 +16808,20 @@ with pkgs; cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; - cups-brother-hll2350dw = callPackage ../misc/cups/drivers/hll2350dw { }; - - cups-brother-mfcl2750dw = callPackage ../misc/cups/drivers/mfcl2750dw { }; - - cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { }; - # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; - - cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - - darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; - - depotdownloader = callPackage ../tools/misc/depotdownloader { }; - - dbacl = callPackage ../tools/misc/dbacl { }; - - dbus-map = callPackage ../tools/misc/dbus-map { }; - - dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - deploy-rs = callPackage ../tools/package-management/deploy-rs { inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; }; - dockutil = callPackage ../os-specific/darwin/dockutil { }; - - eiciel = callPackage ../tools/filesystems/eiciel { }; - - apt = callPackage ../tools/package-management/apt { }; - - dpkg = callPackage ../tools/package-management/dpkg { }; - - dumb = callPackage ../misc/dumb { }; - - dump = callPackage ../tools/backup/dump { }; - - dxvk = callPackage ../misc/dxvk { }; - - ecdsatool = callPackage ../tools/security/ecdsatool { }; - - electricsheep = callPackage ../misc/screensavers/electricsheep { }; - - aaphoto = callPackage ../tools/graphics/aaphoto {}; - - flam3 = callPackage ../tools/graphics/flam3 { }; - - glee = callPackage ../tools/graphics/glee { }; - faust = res.faust2; - faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - - faust2 = callPackage ../applications/audio/faust/faust2.nix { }; - - faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; - - faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { }; - - faust2csound = callPackage ../applications/audio/faust/faust2csound.nix { }; - - faust2firefox = callPackage ../applications/audio/faust/faust2firefox.nix { }; - - faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { }; - - faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { }; - - faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { }; - - faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; - - faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; - - faustlive = callPackage ../applications/audio/faust/faustlive.nix { }; - - faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling { }; - - faustStk = callPackage ../applications/audio/faustStk { }; - - flockit = callPackage ../tools/backup/flockit { }; - - fahclient = callPackage ../applications/science/misc/foldingathome/client.nix {}; - fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {}; - fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {}; - - fbmark = callPackage ../tools/misc/fbmark { }; - - foma = callPackage ../tools/misc/foma { }; - - foo2zjs = callPackage ../misc/drivers/foo2zjs {}; - - foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - gammu = callPackage ../applications/misc/gammu { }; - - ghostscript = callPackage ../misc/ghostscript { }; - ghostscriptX = ghostscript.override { cupsSupport = true; x11Support = true; @@ -37190,57 +16832,21 @@ with pkgs; x11Support = false; }; - glava = callPackage ../applications/misc/glava {}; - gnuk = callPackage ../misc/gnuk { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - go365 = callPackage ../tools/security/go365 { }; - - gobuster = callPackage ../tools/security/gobuster { }; - - gotestwaf = callPackage ../tools/security/gotestwaf { }; - - gotrue = callPackage ../tools/security/gotrue {}; - - gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix {}; - - gowitness = callPackage ../tools/security/gowitness { }; - - guetzli = callPackage ../applications/graphics/guetzli { }; - - gummi = callPackage ../applications/misc/gummi { }; - - gummy = callPackage ../tools/misc/gummy { }; - hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - helm = callPackage ../applications/audio/helm { }; - - helmfile = callPackage ../applications/networking/cluster/helmfile { }; - - helmsman = callPackage ../applications/networking/cluster/helmsman { }; - - velero = callPackage ../applications/networking/cluster/velero { }; - - HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { }; - - hplip = callPackage ../misc/drivers/hplip { }; - hplipWithPlugin = hplip.override { withPlugin = true; }; - hyfetch = callPackage ../tools/misc/hyfetch { }; - hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; - webcat = callPackage ../tools/misc/webcat { }; - websocat = callPackage ../tools/misc/websocat { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -37251,36 +16857,15 @@ with pkgs; hjson = with python3Packages; toPythonApplication hjson; - hjson-go = callPackage ../development/tools/hjson-go { }; - - epkowa = callPackage ../misc/drivers/epkowa { }; - - utsushi = callPackage ../misc/drivers/utsushi { }; - - utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { }; - idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { inherit (darwin) sigtool; }; - logtop = callPackage ../tools/misc/logtop { }; - - igraph = callPackage ../development/libraries/igraph { }; - - igprof = callPackage ../development/tools/misc/igprof { }; - - illum = callPackage ../tools/system/illum { }; - image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; - infnoise = callPackage ../misc/drivers/infnoise { }; - # using the new configuration style proposal which is unstable - jack1 = callPackage ../misc/jackaudio/jack1.nix { }; jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; @@ -37297,26 +16882,10 @@ with pkgs; j2cli = with python3Packages; toPythonApplication j2cli; - jquake = callPackage ../applications/misc/jquake { }; - - jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; - - k40-whisperer = callPackage ../applications/misc/k40-whisperer { }; - - keynav = callPackage ../tools/X11/keynav { }; - - gnome-console = callPackage ../applications/terminal-emulators/gnome-console { }; - - kmon = callPackage ../tools/system/kmon { }; - - kompose = callPackage ../applications/networking/cluster/kompose { }; - kompute = callPackage ../development/libraries/kompute { fmt = fmt_8; }; - kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - # In general we only want keep the last three minor versions around that # correspond to the last three supported kubernetes versions: # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions @@ -37329,16 +16898,12 @@ with pkgs; ; kops = kops_1_25; - lguf-brightness = callPackage ../misc/lguf-brightness { }; - lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse { inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration; }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; - lilypond-unstable-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; openlilylib-fonts = openlilylib-fonts.override { @@ -37348,48 +16913,12 @@ with pkgs; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { }; - openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - - loop = callPackage ../tools/misc/loop { }; - mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; }; - mamba = callPackage ../applications/audio/mamba { }; - - martyr = callPackage ../development/libraries/martyr { }; - - mas = callPackage ../os-specific/darwin/mas { }; - - micromamba = callPackage ../tools/package-management/micromamba { }; - - moltengamepad = callPackage ../misc/drivers/moltengamepad { }; - - openzwave = callPackage ../development/libraries/openzwave { }; - - mongoc = callPackage ../development/libraries/mongoc { }; - - mongoose = callPackage ../development/libraries/science/math/mongoose {}; - - morph = callPackage ../tools/package-management/morph { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; - museeks = callPackage ../applications/audio/museeks { }; - - musly = callPackage ../applications/audio/musly { }; - - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; - - mynewt-newtmgr = callPackage ../tools/misc/mynewt-newtmgr { }; - - mysides = callPackage ../os-specific/darwin/mysides { }; - - nar-serve = callPackage ../tools/nix/nar-serve { }; - - neo = callPackage ../applications/misc/neo { }; - nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -37404,8 +16933,6 @@ with pkgs; nixops_unstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); - nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; - /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. @@ -37497,20 +17024,10 @@ with pkgs; (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs); - nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; - - nixdoc = callPackage ../tools/nix/nixdoc {}; - - dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { nix = nixVersions.nix_2_12; # fails to build with 2.13 }; - nix-doc = callPackage ../tools/package-management/nix-doc { }; - - nix-bundle = callPackage ../tools/package-management/nix-bundle { }; - nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; nix-deploy = haskell.lib.compose.justStaticExecutables haskellPackages.nix-deploy; nix-diff = haskell.lib.compose.justStaticExecutables haskellPackages.nix-diff; @@ -37519,22 +17036,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; nix-index-unwrapped = callPackage ../tools/package-management/nix-index { inherit (darwin.apple_sdk.frameworks) Security; }; - nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { }; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; }; - nix-pin = callPackage ../tools/package-management/nix-pin { }; - - nix-prefetch = callPackage ../tools/package-management/nix-prefetch { }; - nix-prefetch-github = with python3Packages; toPythonApplication nix-prefetch-github; @@ -37546,91 +17057,35 @@ with pkgs; nix-prefetch-svn nix-prefetch-scripts; - nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { }; - nix-update = python3Packages.callPackage ../tools/package-management/nix-update { }; - nix-update-source = callPackage ../tools/package-management/nix-update-source {}; - - nix-script = callPackage ../tools/nix/nix-script {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; - nix-top = callPackage ../tools/package-management/nix-top { }; - nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree); - nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { }; - nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; - - nix-serve = callPackage ../tools/package-management/nix-serve { }; - nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; - nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; - - alejandra = callPackage ../tools/nix/alejandra { }; - nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; - nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; - - nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { }; - - rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; - - nixos-artwork = callPackage ../data/misc/nixos-artwork { }; - nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; - nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { }; - - nixos-container = callPackage ../tools/virtualization/nixos-container { }; - - nixos-generators = callPackage ../tools/nix/nixos-generators { }; - nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { }; - extra-container = callPackage ../tools/virtualization/extra-container { }; - - norwester-font = callPackage ../data/fonts/norwester {}; - - nut = callPackage ../applications/misc/nut { }; - - nhentai = callPackage ../applications/misc/nhentai { }; - - nsncd = callPackage ../os-specific/linux/nsncd { }; - - nvd = callPackage ../tools/package-management/nvd { }; - solfege = python3Packages.callPackage ../misc/solfege { }; - disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { inherit (python2Packages) supervisor; }); - dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; - - disnixos = callPackage ../tools/package-management/disnix/disnixos { }; - DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { jdk = jdk8; }; - i3a = callPackage ../misc/i3a { }; - lice = python3Packages.callPackage ../tools/misc/lice {}; - m33-linux = callPackage ../misc/drivers/m33-linux { }; - - mnemonicode = callPackage ../misc/mnemonicode { }; - mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql80; in { gdal = gdal.override { libmysqlclient = mysql; @@ -37640,60 +17095,24 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); - r128gain = callPackage ../applications/audio/r128gain { }; - resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; - robin-map = callPackage ../development/libraries/robin-map { }; - - robo3t = callPackage ../applications/misc/robo3t { }; - - rucksack = callPackage ../development/tools/rucksack { }; - - ruff = callPackage ../development/tools/ruff { }; - - sam-ba = callPackage ../tools/misc/sam-ba { }; - - sndio = callPackage ../misc/sndio { }; - - sticky = callPackage ../applications/misc/sticky { }; - stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork { inherit (darwin.apple_sdk_11_0.frameworks) Security; }; - superd = callPackage ../misc/superd { }; - - oclgrind = callPackage ../development/tools/analysis/oclgrind { }; - - opkg = callPackage ../tools/package-management/opkg { }; - - opkg-utils = callPackage ../tools/package-management/opkg-utils { }; - OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; parsedmarc = with python3Packages; toPythonApplication parsedmarc; - pgmanage = callPackage ../applications/misc/pgmanage { }; - pgadmin4 = callPackage ../tools/admin/pgadmin { }; pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; - physlock = callPackage ../misc/screensavers/physlock { }; - pjsip = callPackage ../applications/networking/pjsip { inherit (darwin.apple_sdk.frameworks) AppKit; }; - pounce = callPackage ../servers/pounce { }; - - pt = callPackage ../applications/misc/pt { }; - - protocol = callPackage ../applications/networking/protocol { }; - - pykms = callPackage ../tools/networking/pykms { }; - pyupgrade = with python3Packages; toPythonApplication pyupgrade; pwncat = python3Packages.callPackage ../tools/security/pwncat { }; @@ -37710,179 +17129,50 @@ with pkgs; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; - qdl = callPackage ../tools/misc/qdl { }; - - qperf = callPackage ../os-specific/linux/qperf { }; - rates = callPackage ../tools/misc/rates { inherit (darwin.apple_sdk.frameworks) Security; }; - rars = callPackage ../development/tools/rars { }; - - rargs = callPackage ../tools/misc/rargs { }; - - rancher = callPackage ../applications/networking/cluster/rancher { }; - - rauc = callPackage ../tools/misc/rauc { }; - - rbspy = callPackage ../development/tools/rbspy { }; - - redprl = callPackage ../applications/science/logic/redprl { }; - - renderizer = callPackage ../development/tools/renderizer {}; - - rfc = callPackage ../tools/misc/rfc { }; - - rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { }; - pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { inherit glib gtk3 gobject-introspection wrapGAppsHook; }; - rpl = callPackage ../tools/text/rpl { }; - - ricty = callPackage ../data/fonts/ricty { }; - - rmfakecloud = callPackage ../servers/rmfakecloud { }; - - rmfuse = callPackage ../tools/filesystems/rmfuse {}; - - rmount = callPackage ../tools/filesystems/rmount {}; - romdirfs = callPackage ../tools/filesystems/romdirfs { stdenv = gccStdenv; }; - rss-glx = callPackage ../misc/screensavers/rss-glx { }; - - run-scaled = callPackage ../tools/X11/run-scaled { }; - - runiq = callPackage ../tools/text/runiq { }; - - runit = callPackage ../tools/system/runit { }; - - runitor = callPackage ../tools/system/runitor { }; - - refind = callPackage ../tools/bootloaders/refind { }; - - spectra = callPackage ../development/libraries/spectra { }; - - spectrojack = callPackage ../applications/audio/spectrojack { }; - - sift = callPackage ../tools/text/sift { }; - - xdragon = lowPrio (callPackage ../tools/X11/xdragon { }); - - xlockmore = callPackage ../misc/screensavers/xlockmore { }; - - xq = callPackage ../tools/misc/xq { }; - - xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; - - sailsd = callPackage ../misc/sailsd { }; - - shc = callPackage ../tools/security/shc { }; - - shellz = callPackage ../tools/security/shellz { }; - - timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { }; - - canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; - - hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; - - mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; - mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; - - mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { }; - mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { }; - - mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { }; - mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { }; - - mfcl2720dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2720dwcupswrapper { }; - mfcl2720dwlpr = callPackage ../misc/cups/drivers/mfcl2720dwlpr { }; - - mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { }; - mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { }; - - # This driver is only available as a 32 bit proprietary binary driver - mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver; - mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper; - - cups-brother-hll2375dw = callPackage ../misc/cups/drivers/brother/hll2375dw { }; - - mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; - mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; - - mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { }; - mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { }; - - samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { }; - samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; - samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; - samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; - - sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); - - sane-drivers = callPackage ../applications/graphics/sane/drivers.nix {}; - - senv = callPackage ../applications/misc/senv { }; - - brlaser = callPackage ../misc/cups/drivers/brlaser { }; - - fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { }; - - brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { }; + xdragon = lowPrio (callPackage ../tools/X11/xdragon { }); - brscan5 = callPackage ../applications/graphics/sane/backends/brscan5 { }; + timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { }; - dsseries = callPackage ../applications/graphics/sane/backends/dsseries { }; + mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; - sane-airscan = callPackage ../applications/graphics/sane/backends/airscan { }; + mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { }; - mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; + mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { }; - sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; + # This driver is only available as a 32 bit proprietary binary driver + mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver; + mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper; - sanoid = callPackage ../tools/backup/sanoid { }; + samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; - satysfi = callPackage ../tools/typesetting/satysfi { }; + sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); sc-controller = python3Packages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. }; - sct = callPackage ../tools/X11/sct {}; - scylladb = callPackage ../servers/scylladb { thrift = thrift-0_10; }; - seafile-server = callPackage ../servers/seafile-server { }; - - seafile-shared = callPackage ../misc/seafile-shared { }; - - ser2net = callPackage ../servers/ser2net {}; - - serviio = callPackage ../servers/serviio {}; - selinux-python = callPackage ../os-specific/linux/selinux-python { }; - slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; }; - smokeping = callPackage ../tools/networking/smokeping { }; - - snapraid = callPackage ../tools/filesystems/snapraid { }; - snscrape = with python3Packages; toPythonApplication snscrape; - soundmodem = callPackage ../applications/radio/soundmodem {}; - - soundOfSorting = callPackage ../misc/sound-of-sorting { }; - sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; }; @@ -37891,34 +17181,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; - spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { }; - - spnavcfg = callPackage ../applications/misc/spnavcfg { }; - - splix = callPackage ../misc/cups/drivers/splix { }; - - steamcontroller = callPackage ../misc/drivers/steamcontroller { }; - - stern = callPackage ../applications/networking/cluster/stern { }; - - streamripper = callPackage ../applications/audio/streamripper { }; - - sqsh = callPackage ../development/tools/sqsh { }; - - sysz = callPackage ../tools/misc/sysz { }; - - go-swag = callPackage ../development/tools/go-swag { }; - - go-swagger = callPackage ../development/tools/go-swagger { }; - - jx = callPackage ../applications/networking/cluster/jx {}; - - prow = callPackage ../applications/networking/cluster/prow { }; - - tagref = callPackage ../tools/misc/tagref { }; - - tcat = callPackage ../tools/misc/tcat { }; - tellico = libsForQt5.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -37935,104 +17197,22 @@ with pkgs; callPackage ../applications/networking/cluster/terraform-providers { } ); - terraforming = callPackage ../applications/networking/cluster/terraforming { }; - terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {}; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; - - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; - - terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; - - terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; - - terranix = callPackage ../applications/networking/cluster/terranix {}; - - terraspace = callPackage ../applications/networking/cluster/terraspace {}; - - tfswitch = callPackage ../applications/networking/cluster/tfswitch {}; - - tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - - tilt = callPackage ../applications/networking/cluster/tilt { }; - - timeular = callPackage ../applications/office/timeular {}; - - tewi-font = callPackage ../data/fonts/tewi { }; - ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; }; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vcluster = callPackage ../applications/networking/cluster/vcluster {}; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; - sshportal = callPackage ../servers/sshportal { }; - - ssh-audit = callPackage ../tools/security/ssh-audit { }; - - ssh-tools = callPackage ../applications/misc/ssh-tools { }; - - auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; - - thermald = callPackage ../tools/system/thermald { }; - - throttled = callPackage ../tools/system/throttled { }; - - thinkfan = callPackage ../tools/system/thinkfan { }; - - touchosc = callPackage ../applications/audio/touchosc {}; - - tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { }; - - tup = callPackage ../development/tools/build-managers/tup { }; - - tusk = callPackage ../applications/office/tusk { }; - - trufflehog = callPackage ../tools/security/trufflehog { }; - - tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; - tvheadend = callPackage ../servers/tvheadend { dtv-scan-tables = dtv-scan-tables_tvheadend; }; - twiggy = callPackage ../development/tools/twiggy { }; - - uacme = callPackage ../tools/admin/uacme { }; - - ufiformat = callPackage ../tools/system/ufiformat { }; - - ums = callPackage ../servers/ums { }; - - unityhub = callPackage ../development/tools/unityhub { }; - - urbit = callPackage ../misc/urbit { }; - - usb-reset = callPackage ../applications/misc/usb-reset { }; - - usql = callPackage ../applications/misc/usql { }; - - utf8cpp = callPackage ../development/libraries/utf8cpp { }; - - utf8proc = callPackage ../development/libraries/utf8proc { }; - - unicode-paracode = callPackage ../tools/misc/unicode { }; - unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vault = callPackage ../tools/security/vault { }; - - vault-medusa = callPackage ../tools/security/vault-medusa { }; - - vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; - vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; - vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; - vaultwarden = callPackage ../tools/security/vaultwarden { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; @@ -38040,43 +17220,17 @@ with pkgs; vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; }; vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; }; - vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - - vhs = callPackage ../applications/misc/vhs { }; - - vgmstream = callPackage ../applications/audio/vgmstream { }; - - viddy = callPackage ../tools/misc/viddy { }; - - ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; - - viewnior = callPackage ../applications/graphics/viewnior { }; - - vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { }; - vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { llvmPackages = llvmPackages_6; luaPackages = lua51Packages; }); - vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vikunja-api = callPackage ../servers/web-apps/vikunja/api.nix { }; - vikunja-frontend = callPackage ../servers/web-apps/vikunja/frontend.nix { }; - vips = callPackage ../tools/graphics/vips { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; - vipsdisp = callPackage ../applications/graphics/vipsdisp { }; - - nip2 = callPackage ../tools/graphics/nip2 { }; - - virglrenderer = callPackage ../development/libraries/virglrenderer { }; - - vivid = callPackage ../tools/misc/vivid { }; - vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; }); vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; @@ -38085,10 +17239,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; }; - vsh = callPackage ../tools/misc/vsh { }; - - vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { @@ -38096,35 +17246,17 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; }; - yabasic = callPackage ../development/interpreters/yabasic { }; - wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; libressl = libressl_3_5; }; - wasynth = callPackage ../development/tools/wasynth { }; - - wavegain = callPackage ../applications/audio/wavegain { }; - - wcalc = callPackage ../applications/misc/wcalc { }; - - webfs = callPackage ../servers/http/webfs { }; - - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; - - websocketd = callPackage ../applications/networking/websocketd { }; - wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { }; - wike = callPackage ../applications/misc/wike { }; - wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; - wiki-js = callPackage ../servers/web-apps/wiki-js { }; - wiki-tui = callPackage ../misc/wiki-tui { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -38153,20 +17285,8 @@ with pkgs; wineRelease = "wayland"; }); - wineasio = callPackage ../applications/emulators/wineasio { }; - - wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; - - with-shell = callPackage ../applications/misc/with-shell { }; - wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer {}; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; - - wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; - - wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; - inherit (callPackage ../servers/web-apps/wordpress {}) wordpress wordpress6_1; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { @@ -38175,8 +17295,6 @@ with pkgs; languages = lib.importJSON ../servers/web-apps/wordpress/packages/languages.json; }); - wprecon = callPackage ../tools/security/wprecon { }; - wraith = callPackage ../applications/networking/irc/wraith { openssl = openssl_1_1; }; @@ -38193,50 +17311,18 @@ with pkgs; inherit (darwin.stubs) setfile; }; - x11idle = callPackage ../tools/misc/x11idle {}; - - x11docker = callPackage ../applications/virtualization/x11docker { }; - - x2x = callPackage ../tools/X11/x2x { }; - - xboxdrv = callPackage ../misc/drivers/xboxdrv { }; - - xivlauncher = callPackage ../games/xivlauncher { }; - xortool = python3Packages.callPackage ../tools/security/xortool { }; - xorex = callPackage ../tools/security/xorex { }; - xbps = callPackage ../tools/package-management/xbps { openssl = openssl_1_1; }; - xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin) libobjc; }; - xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; - - xlayoutdisplay = callPackage ../tools/X11/xlayoutdisplay { }; - - xlog = callPackage ../applications/radio/xlog { }; - - xmagnify = callPackage ../tools/X11/xmagnify { }; - - xosd = callPackage ../misc/xosd { }; - - xosview = callPackage ../tools/X11/xosview { }; - - xosview2 = callPackage ../tools/X11/xosview2 { }; - - xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { }; - - xpad = callPackage ../applications/misc/xpad { }; - xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; sane-backends = sane-backends.override { libpng = libpng12; }; @@ -38251,62 +17337,22 @@ with pkgs; SDL = SDL_sixel; }; - xteddy = callPackage ../applications/misc/xteddy { }; - - xva-img = callPackage ../tools/virtualization/xva-img { }; - - xwiimote = callPackage ../misc/drivers/xwiimote { }; - - xzoom = callPackage ../tools/X11/xzoom {}; - yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai { inherit (darwin.apple_sdk_11_0.frameworks) SkyLight Cocoa Carbon ScriptingBridge; }; yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; - yadm = callPackage ../applications/version-management/yadm { }; - yamale = with python3Packages; toPythonApplication yamale; - yamdi = callPackage ../tools/video/yamdi { }; - - yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { }; - - yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; - - yara = callPackage ../tools/security/yara { }; - - yarGen = callPackage ../tools/security/yarGen { }; - - yersinia = callPackage ../tools/security/yersinia { }; - - yaxg = callPackage ../tools/graphics/yaxg {}; - - zap = callPackage ../tools/networking/zap { }; - - zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; - - zopfli = callPackage ../tools/compression/zopfli { }; - myEnvFun = callPackage ../misc/my-env { inherit (stdenv) mkDerivation; }; - znc = callPackage ../applications/networking/znc { }; - zncModules = recurseIntoAttrs ( callPackage ../applications/networking/znc/modules.nix { } ); - zoneminder = callPackage ../servers/zoneminder { }; - - xcp = callPackage ../tools/misc/xcp { }; - - zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; - - zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -38320,16 +17366,8 @@ with pkgs; spdlog = spdlog_1; - dart = callPackage ../development/interpreters/dart { }; - - httrack = callPackage ../tools/backup/httrack { }; - httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { }; - mg = callPackage ../applications/editors/mg { }; - - mpvc = callPackage ../applications/misc/mpvc { }; - discord = import ../applications/networking/instant-messengers/discord { inherit lib stdenv; inherit (pkgs) callPackage fetchurl; @@ -38350,85 +17388,32 @@ with pkgs; golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; - linkchecker = callPackage ../tools/networking/linkchecker { }; - - tomb = callPackage ../os-specific/linux/tomb {}; - sccache = callPackage ../development/tools/misc/sccache { inherit (darwin.apple_sdk.frameworks) Security; }; - sequeler = callPackage ../applications/misc/sequeler { }; - - sequelpro = callPackage ../applications/misc/sequelpro {}; - - snowsql = callPackage ../applications/misc/snowsql {}; - snowmachine = python3Packages.callPackage ../applications/misc/snowmachine {}; - sidequest = callPackage ../applications/misc/sidequest {}; - - maphosts = callPackage ../tools/networking/maphosts {}; - - zimg = callPackage ../development/libraries/zimg { }; - - wtf = callPackage ../applications/misc/wtf { }; - - zk-shell = callPackage ../applications/misc/zk-shell { }; - tora = libsForQt5.callPackage ../development/tools/tora {}; xulrunner = firefox-unwrapped; - xrq = callPackage ../applications/misc/xrq { }; - - pynitrokey = callPackage ../tools/security/pynitrokey { }; - nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; - - fpm2 = callPackage ../tools/security/fpm2 { }; - - simplenote = callPackage ../applications/misc/simplenote { }; hy = with python3Packages; toPythonApplication hy; - wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { }; - - check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; - ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; - vdr = callPackage ../applications/video/vdr { }; vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); - wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; - - chrome-export = callPackage ../tools/misc/chrome-export {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; - NSPlist = callPackage ../development/libraries/NSPlist {}; - PlistCpp = callPackage ../development/libraries/PlistCpp { boost = boost172; }; - xib2nib = callPackage ../development/tools/xib2nib {}; - linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli {}; - hss = callPackage ../tools/networking/hss {}; - - undaemonize = callPackage ../tools/system/undaemonize {}; - - houdini = callPackage ../applications/misc/houdini {}; - - openfst = callPackage ../development/libraries/openfst {}; - - opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; - - openring = callPackage ../applications/misc/openring { }; - openvino = callPackage ../development/libraries/openvino { stdenv = gcc10StdenvCompat; python = python3; }; @@ -38447,24 +17432,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - dnstake = callPackage ../tools/networking/dnstake {}; - dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; - dnstwist = callPackage ../tools/networking/dnstwist {}; - - dsniff = callPackage ../tools/networking/dsniff {}; - - wal-g = callPackage ../tools/backup/wal-g { }; - - tlwg = callPackage ../data/fonts/tlwg { }; - - tt2020 = callPackage ../data/fonts/tt2020 { }; - - simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -38473,16 +17444,7 @@ with pkgs; xml2rfc = with python3Packages; toPythonApplication xml2rfc; - mmark = callPackage ../tools/typesetting/mmark { }; - - wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { }; - - wiremock = callPackage ../tools/networking/wiremock { }; - - teseq = callPackage ../applications/misc/teseq { }; - ape = callPackage ../applications/misc/ape { }; - attemptoClex = callPackage ../applications/misc/ape/clex.nix { }; apeClex = callPackage ../applications/misc/ape/apeclex.nix { }; # Unix tools @@ -38507,30 +17469,16 @@ with pkgs; stdenv = crossLibcStdenv; }; - yrd = callPackage ../tools/networking/yrd { }; - - powershell = callPackage ../shells/powershell { }; - - doing = callPackage ../applications/misc/doing { }; - - undervolt = callPackage ../os-specific/linux/undervolt { }; - alibuild = callPackage ../development/tools/build-managers/alibuild { python = python3; }; - tsukae = callPackage ../applications/misc/tsukae { }; - - tsung = callPackage ../applications/networking/tsung {}; - bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; xp-pen-g430-driver = libsForQt5.xp-pen-g430-driver; - new-session-manager = callPackage ../applications/audio/new-session-manager { }; - newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; @@ -38544,90 +17492,20 @@ with pkgs; stdenv = crossLibcStdenv; }; - omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; - - wasmtime = callPackage ../development/interpreters/wasmtime {}; - wfuzz = with python3Packages; toPythonApplication wfuzz; - bemenu = callPackage ../applications/misc/bemenu { }; - - _9menu = callPackage ../applications/misc/9menu { }; - - dapper = callPackage ../development/tools/dapper { }; - kube3d = callPackage ../applications/networking/cluster/kube3d { buildGoModule = buildGo118Module; # tests fail with 1.19 }; - zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {}; - zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; - zrepl = callPackage ../tools/backup/zrepl { }; - - uhubctl = callPackage ../tools/misc/uhubctl {}; - kodelife = callPackage ../applications/graphics/kodelife { inherit (gst_all_1) gstreamer gst-plugins-base; }; - bunnyfetch = callPackage ../tools/misc/bunnyfetch {}; - - _3proxy = callPackage ../applications/networking/3proxy {}; - - pigeon = callPackage ../development/tools/pigeon {}; - - verifpal = callPackage ../tools/security/verifpal {}; - - nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; - - webwormhole = callPackage ../tools/networking/webwormhole { }; - - werf = callPackage ../applications/networking/cluster/werf { }; - - wifi-password = callPackage ../os-specific/darwin/wifi-password {}; - - qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {}; - - coz = callPackage ../development/tools/analysis/coz {}; - - keycard-cli = callPackage ../tools/security/keycard-cli {}; - sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr {}; - - stayrtr = callPackage ../servers/stayrtr {}; - - sunshine = callPackage ../servers/sunshine {}; - - sentencepiece = callPackage ../development/libraries/sentencepiece {}; - - kaf = callPackage ../development/tools/kaf { }; - - kcli = callPackage ../development/tools/kcli { }; - - pxlib = callPackage ../development/libraries/pxlib {}; - - pxview = callPackage ../development/tools/pxview {}; - - unstick = callPackage ../os-specific/linux/unstick {}; - - quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - - usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules {}; - - go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; - - hashdeep = callPackage ../tools/security/hashdeep { }; - - pdf-parser = callPackage ../tools/misc/pdf-parser {}; - - fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; - - btcdeb = callPackage ../applications/blockchains/btcdeb { }; - jami = callPackages ../applications/networking/instant-messengers/jami { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; @@ -38635,95 +17513,26 @@ with pkgs; }; inherit (jami) jami-daemon jami-client; - jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; - - zenstates = callPackage ../os-specific/linux/zenstates {}; - - ryzenadj = callPackage ../os-specific/linux/ryzenadj {}; - - vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; - - gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - - navidrome = callPackage ../servers/misc/navidrome { }; - - zalgo = callPackage ../tools/misc/zalgo { }; - zettlr = callPackage ../applications/misc/zettlr { texlive = texlive.combined.scheme-medium; }; - unpoller = callPackage ../servers/monitoring/unpoller {}; - fac-build = callPackage ../development/tools/build-managers/fac { inherit (darwin.apple_sdk.frameworks) CoreServices; }; - treefmt = callPackage ../development/tools/treefmt { }; - - bottom = callPackage ../tools/system/bottom { }; - cagebreak = callPackage ../applications/window-managers/cagebreak { wlroots = wlroots_0_15; }; - psftools = callPackage ../os-specific/linux/psftools {}; - - lc3tools = callPackage ../development/tools/lc3tools {}; - ldid = callPackage ../development/tools/ldid { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - xcolor = callPackage ../tools/graphics/xcolor { }; - - xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; - - xsos = callPackage ../os-specific/linux/xsos { }; - - xmcp = callPackage ../tools/X11/xmcp { }; - - ymuse = callPackage ../applications/audio/ymuse { }; - - zk = callPackage ../applications/office/zk {}; - - zktree = callPackage ../applications/misc/zktree {}; - zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; }; - zthrottle = callPackage ../tools/misc/zthrottle { }; - - honeymarker = callPackage ../servers/tracing/honeycomb/honeymarker { }; - - honeytail = callPackage ../servers/tracing/honeycomb/honeytail { }; - - honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { }; - - mictray = callPackage ../tools/audio/mictray { }; - - swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { }; - - swaysettings = callPackage ../applications/misc/swaysettings { }; - aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; - widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; - - alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { }; - - tuner = callPackage ../applications/audio/tuner { }; - - jfrog-cli = callPackage ../tools/misc/jfrog-cli { }; - - ov = callPackage ../tools/text/ov { }; - - tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { }; - - tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { }; - - resgate = callPackage ../servers/resgate { }; - - oversteer = callPackage ../applications/misc/oversteer { }; } diff --git a/pkgs/games/0verkill/default.nix b/pkgs/unit/_0/_0verkill/pkg-fun.nix similarity index 100% rename from pkgs/games/0verkill/default.nix rename to pkgs/unit/_0/_0verkill/pkg-fun.nix diff --git a/pkgs/tools/misc/0x/add-Cargo-lock.diff b/pkgs/unit/_0/_0x/add-Cargo-lock.diff similarity index 100% rename from pkgs/tools/misc/0x/add-Cargo-lock.diff rename to pkgs/unit/_0/_0x/add-Cargo-lock.diff diff --git a/pkgs/tools/misc/0x/default.nix b/pkgs/unit/_0/_0x/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/0x/default.nix rename to pkgs/unit/_0/_0x/pkg-fun.nix diff --git a/pkgs/games/1oom/default.nix b/pkgs/unit/_1/_1oom/pkg-fun.nix similarity index 100% rename from pkgs/games/1oom/default.nix rename to pkgs/unit/_1/_1oom/pkg-fun.nix diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/unit/_1/_1password/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/1password/default.nix rename to pkgs/unit/_1/_1password/pkg-fun.nix diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/unit/_2/_2048-in-terminal/pkg-fun.nix similarity index 100% rename from pkgs/games/2048-in-terminal/default.nix rename to pkgs/unit/_2/_2048-in-terminal/pkg-fun.nix diff --git a/pkgs/games/20kly/default.nix b/pkgs/unit/_2/_20kly/pkg-fun.nix similarity index 100% rename from pkgs/games/20kly/default.nix rename to pkgs/unit/_2/_20kly/pkg-fun.nix diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/unit/_3/_3270font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/3270font/default.nix rename to pkgs/unit/_3/_3270font/pkg-fun.nix diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/unit/_3/_389-ds-base/pkg-fun.nix similarity index 100% rename from pkgs/servers/ldap/389/default.nix rename to pkgs/unit/_3/_389-ds-base/pkg-fun.nix diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/unit/_3/_3llo/Gemfile similarity index 100% rename from pkgs/tools/misc/3llo/Gemfile rename to pkgs/unit/_3/_3llo/Gemfile diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/unit/_3/_3llo/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/3llo/Gemfile.lock rename to pkgs/unit/_3/_3llo/Gemfile.lock diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/unit/_3/_3llo/gemset.nix similarity index 100% rename from pkgs/tools/misc/3llo/gemset.nix rename to pkgs/unit/_3/_3llo/gemset.nix diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/unit/_3/_3llo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/3llo/default.nix rename to pkgs/unit/_3/_3llo/pkg-fun.nix diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/unit/_3/_3mux/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/3mux/default.nix rename to pkgs/unit/_3/_3mux/pkg-fun.nix diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/unit/_3/_3proxy/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/3proxy/default.nix rename to pkgs/unit/_3/_3proxy/pkg-fun.nix diff --git a/pkgs/development/compilers/4th/001-install-manual-fixup.diff b/pkgs/unit/_4/_4th/001-install-manual-fixup.diff similarity index 100% rename from pkgs/development/compilers/4th/001-install-manual-fixup.diff rename to pkgs/unit/_4/_4th/001-install-manual-fixup.diff diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/unit/_4/_4th/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/4th/default.nix rename to pkgs/unit/_4/_4th/pkg-fun.nix diff --git a/pkgs/applications/science/math/4ti2/default.nix b/pkgs/unit/_4/_4ti2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/4ti2/default.nix rename to pkgs/unit/_4/_4ti2/pkg-fun.nix diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/unit/_6/_6tunnel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/6tunnel/default.nix rename to pkgs/unit/_6/_6tunnel/pkg-fun.nix diff --git a/pkgs/games/7kaa/default.nix b/pkgs/unit/_7/_7kaa/pkg-fun.nix similarity index 100% rename from pkgs/games/7kaa/default.nix rename to pkgs/unit/_7/_7kaa/pkg-fun.nix diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/unit/_9/_915resolution/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/915resolution/default.nix rename to pkgs/unit/_9/_915resolution/pkg-fun.nix diff --git a/pkgs/applications/misc/9menu/default.nix b/pkgs/unit/_9/_9menu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/9menu/default.nix rename to pkgs/unit/_9/_9menu/pkg-fun.nix diff --git a/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch b/pkgs/unit/_9/_9pfs/fix-darwin-build.patch similarity index 100% rename from pkgs/tools/filesystems/9pfs/fix-darwin-build.patch rename to pkgs/unit/_9/_9pfs/fix-darwin-build.patch diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/unit/_9/_9pfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/9pfs/default.nix rename to pkgs/unit/_9/_9pfs/pkg-fun.nix diff --git a/pkgs/common-updater/combinators.nix b/pkgs/unit/_e/_experimental-update-script-combinators/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/combinators.nix rename to pkgs/unit/_e/_experimental-update-script-combinators/pkg-fun.nix diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/unit/a2/a2jmidid/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/a2jmidid/default.nix rename to pkgs/unit/a2/a2jmidid/pkg-fun.nix diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/unit/a2/a2ps/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/a2ps/default.nix rename to pkgs/unit/a2/a2ps/pkg-fun.nix diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/unit/a5/a52dec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/a52dec/default.nix rename to pkgs/unit/a5/a52dec/pkg-fun.nix diff --git a/pkgs/tools/misc/aaa/default.nix b/pkgs/unit/aa/aaa/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/aaa/default.nix rename to pkgs/unit/aa/aaa/pkg-fun.nix diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/unit/aa/aacgain/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/aacgain/default.nix rename to pkgs/unit/aa/aacgain/pkg-fun.nix diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/unit/aa/aalib/darwin.patch similarity index 100% rename from pkgs/development/libraries/aalib/darwin.patch rename to pkgs/unit/aa/aalib/darwin.patch diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/unit/aa/aalib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aalib/default.nix rename to pkgs/unit/aa/aalib/pkg-fun.nix diff --git a/pkgs/tools/graphics/aaphoto/default.nix b/pkgs/unit/aa/aaphoto/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/aaphoto/default.nix rename to pkgs/unit/aa/aaphoto/pkg-fun.nix diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/unit/aa/aardvark-dns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/aardvark-dns/default.nix rename to pkgs/unit/aa/aardvark-dns/pkg-fun.nix diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/unit/aa/aaxtomp3/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/aaxtomp3/default.nix rename to pkgs/unit/aa/aaxtomp3/pkg-fun.nix diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/unit/ab/abbaye-des-morts/pkg-fun.nix similarity index 100% rename from pkgs/games/abbaye-des-morts/default.nix rename to pkgs/unit/ab/abbaye-des-morts/pkg-fun.nix diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/unit/ab/abc-verifier/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/abc/default.nix rename to pkgs/unit/ab/abc-verifier/pkg-fun.nix diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/unit/ab/abcl/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/abcl/default.nix rename to pkgs/unit/ab/abcl/pkg-fun.nix diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/unit/ab/abcm2ps/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/abcm2ps/default.nix rename to pkgs/unit/ab/abcm2ps/pkg-fun.nix diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/unit/ab/abcmidi/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/abcmidi/default.nix rename to pkgs/unit/ab/abcmidi/pkg-fun.nix diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/unit/ab/abduco/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/abduco/default.nix rename to pkgs/unit/ab/abduco/pkg-fun.nix diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/unit/ab/abi-compliance-checker/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/abi-compliance-checker/default.nix rename to pkgs/unit/ab/abi-compliance-checker/pkg-fun.nix diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/unit/ab/abi-dumper/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/abi-dumper/default.nix rename to pkgs/unit/ab/abi-dumper/pkg-fun.nix diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/unit/ab/abiword/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/abiword/default.nix rename to pkgs/unit/ab/abiword/pkg-fun.nix diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/unit/ab/ablog/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ablog/default.nix rename to pkgs/unit/ab/ablog/pkg-fun.nix diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/unit/ab/abook/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/abook/default.nix rename to pkgs/unit/ab/abook/pkg-fun.nix diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/unit/ab/abootimg/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/abootimg/default.nix rename to pkgs/unit/ab/abootimg/pkg-fun.nix diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/unit/ab/abseil-cpp_202103/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/abseil-cpp/202103.nix rename to pkgs/unit/ab/abseil-cpp_202103/pkg-fun.nix diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/unit/ab/abseil-cpp_202111/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/abseil-cpp/202111.nix rename to pkgs/unit/ab/abseil-cpp_202111/pkg-fun.nix diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/unit/ab/abseil-cpp_202206/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/abseil-cpp/202206.nix rename to pkgs/unit/ab/abseil-cpp_202206/pkg-fun.nix diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/unit/ab/abuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/abuild/default.nix rename to pkgs/unit/ab/abuild/pkg-fun.nix diff --git a/pkgs/games/abuse/abuse.sh b/pkgs/unit/ab/abuse/abuse.sh similarity index 100% rename from pkgs/games/abuse/abuse.sh rename to pkgs/unit/ab/abuse/abuse.sh diff --git a/pkgs/games/abuse/default.nix b/pkgs/unit/ab/abuse/pkg-fun.nix similarity index 100% rename from pkgs/games/abuse/default.nix rename to pkgs/unit/ab/abuse/pkg-fun.nix diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/unit/ac/accelergy/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/computer-architecture/accelergy/default.nix rename to pkgs/unit/ac/accelergy/pkg-fun.nix diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/pkgs/unit/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch rename to pkgs/unit/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/pkgs/unit/ac/accountsservice/drop-prefix-check-extensions.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch rename to pkgs/unit/ac/accountsservice/drop-prefix-check-extensions.patch diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/unit/ac/accountsservice/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/fix-paths.patch rename to pkgs/unit/ac/accountsservice/fix-paths.patch diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/unit/ac/accountsservice/no-create-dirs.patch similarity index 100% rename from pkgs/development/libraries/accountsservice/no-create-dirs.patch rename to pkgs/unit/ac/accountsservice/no-create-dirs.patch diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/unit/ac/accountsservice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/accountsservice/default.nix rename to pkgs/unit/ac/accountsservice/pkg-fun.nix diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/unit/ac/acct/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/acct/default.nix rename to pkgs/unit/ac/acct/pkg-fun.nix diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/unit/ac/accuraterip-checksum/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/accuraterip-checksum/default.nix rename to pkgs/unit/ac/accuraterip-checksum/pkg-fun.nix diff --git a/pkgs/games/ace-of-penguins/fixup-miscompilations.patch b/pkgs/unit/ac/ace-of-penguins/fixup-miscompilations.patch similarity index 100% rename from pkgs/games/ace-of-penguins/fixup-miscompilations.patch rename to pkgs/unit/ac/ace-of-penguins/fixup-miscompilations.patch diff --git a/pkgs/games/ace-of-penguins/default.nix b/pkgs/unit/ac/ace-of-penguins/pkg-fun.nix similarity index 100% rename from pkgs/games/ace-of-penguins/default.nix rename to pkgs/unit/ac/ace-of-penguins/pkg-fun.nix diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/unit/ac/ace/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ace/default.nix rename to pkgs/unit/ac/ace/pkg-fun.nix diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/unit/ac/acgtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/acgtk/default.nix rename to pkgs/unit/ac/acgtk/pkg-fun.nix diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/unit/ac/acl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/acl/default.nix rename to pkgs/unit/ac/acl/pkg-fun.nix diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/unit/ac/acme-sh/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/acme-sh/default.nix rename to pkgs/unit/ac/acme-sh/pkg-fun.nix diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/unit/ac/acme/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/acme/default.nix rename to pkgs/unit/ac/acme/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/unit/ac/acorn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/acorn/default.nix rename to pkgs/unit/ac/acorn/pkg-fun.nix diff --git a/pkgs/tools/audio/acousticbrainz-client/default.nix b/pkgs/unit/ac/acousticbrainz-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/acousticbrainz-client/default.nix rename to pkgs/unit/ac/acousticbrainz-client/pkg-fun.nix diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/unit/ac/acoustidFingerprinter/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/acoustid-fingerprinter/default.nix rename to pkgs/unit/ac/acoustidFingerprinter/pkg-fun.nix diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/unit/ac/acpi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/acpi/default.nix rename to pkgs/unit/ac/acpi/pkg-fun.nix diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/unit/ac/acpica-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/acpica-tools/default.nix rename to pkgs/unit/ac/acpica-tools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/unit/ac/acpid/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/acpid/default.nix rename to pkgs/unit/ac/acpid/pkg-fun.nix diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/unit/ac/acpilight/pkg-fun.nix similarity index 100% rename from pkgs/misc/acpilight/default.nix rename to pkgs/unit/ac/acpilight/pkg-fun.nix diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/unit/ac/acpitool/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/acpitool/default.nix rename to pkgs/unit/ac/acpitool/pkg-fun.nix diff --git a/pkgs/development/tools/misc/acr/default.nix b/pkgs/unit/ac/acr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/acr/default.nix rename to pkgs/unit/ac/acr/pkg-fun.nix diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/unit/ac/acsccid/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/acsccid/default.nix rename to pkgs/unit/ac/acsccid/pkg-fun.nix diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/unit/ac/act/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/act/default.nix rename to pkgs/unit/ac/act/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/unit/ac/actionlint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/actionlint/default.nix rename to pkgs/unit/ac/actionlint/pkg-fun.nix diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/unit/ac/activate-linux/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/activate-linux/default.nix rename to pkgs/unit/ac/activate-linux/pkg-fun.nix diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/unit/ac/activemq/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/apache-activemq/default.nix rename to pkgs/unit/ac/activemq/pkg-fun.nix diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/unit/ac/actkbd/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/actkbd/default.nix rename to pkgs/unit/ac/actkbd/pkg-fun.nix diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/unit/ad/adafruit-ampy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/adafruit-ampy/default.nix rename to pkgs/unit/ad/adafruit-ampy/pkg-fun.nix diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/unit/ad/adapta-backgrounds/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/adapta-backgrounds/default.nix rename to pkgs/unit/ad/adapta-backgrounds/pkg-fun.nix diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/unit/ad/adapta-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/adapta/default.nix rename to pkgs/unit/ad/adapta-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/unit/ad/adapta-kde-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/adapta-kde/default.nix rename to pkgs/unit/ad/adapta-kde-theme/pkg-fun.nix diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/unit/ad/adcli/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/adcli/default.nix rename to pkgs/unit/ad/adcli/pkg-fun.nix diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/pkgs/unit/ad/addOpenGLRunpath/pkg-fun.nix similarity index 100% rename from pkgs/build-support/add-opengl-runpath/default.nix rename to pkgs/unit/ad/addOpenGLRunpath/pkg-fun.nix diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/unit/ad/addOpenGLRunpath/setup-hook.sh similarity index 100% rename from pkgs/build-support/add-opengl-runpath/setup-hook.sh rename to pkgs/unit/ad/addOpenGLRunpath/setup-hook.sh diff --git a/pkgs/tools/misc/addic7ed-cli/default.nix b/pkgs/unit/ad/addic7ed-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/addic7ed-cli/default.nix rename to pkgs/unit/ad/addic7ed-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/unit/ad/addlicense/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/addlicense/default.nix rename to pkgs/unit/ad/addlicense/pkg-fun.nix diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/unit/ad/adementary-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/adementary/default.nix rename to pkgs/unit/ad/adementary-theme/pkg-fun.nix diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/unit/ad/adenum/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/adenum/default.nix rename to pkgs/unit/ad/adenum/pkg-fun.nix diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/unit/ad/adguardhome/bins.nix similarity index 100% rename from pkgs/servers/adguardhome/bins.nix rename to pkgs/unit/ad/adguardhome/bins.nix diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/unit/ad/adguardhome/pkg-fun.nix similarity index 100% rename from pkgs/servers/adguardhome/default.nix rename to pkgs/unit/ad/adguardhome/pkg-fun.nix diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/unit/ad/adguardhome/update.sh similarity index 100% rename from pkgs/servers/adguardhome/update.sh rename to pkgs/unit/ad/adguardhome/update.sh diff --git a/pkgs/applications/video/adl/default.nix b/pkgs/unit/ad/adl/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/adl/default.nix rename to pkgs/unit/ad/adl/pkg-fun.nix diff --git a/pkgs/servers/adminer/default.nix b/pkgs/unit/ad/adminer/pkg-fun.nix similarity index 100% rename from pkgs/servers/adminer/default.nix rename to pkgs/unit/ad/adminer/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/unit/ad/adms/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/adms/default.nix rename to pkgs/unit/ad/adms/pkg-fun.nix diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/unit/ad/adns/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/adns/default.nix rename to pkgs/unit/ad/adns/pkg-fun.nix diff --git a/pkgs/applications/science/math/adolc/default.nix b/pkgs/unit/ad/adolc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/adolc/default.nix rename to pkgs/unit/ad/adolc/pkg-fun.nix diff --git a/pkgs/games/adom/default.nix b/pkgs/unit/ad/adom/pkg-fun.nix similarity index 100% rename from pkgs/games/adom/default.nix rename to pkgs/unit/ad/adom/pkg-fun.nix diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/unit/ad/adreaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/adreaper/default.nix rename to pkgs/unit/ad/adreaper/pkg-fun.nix diff --git a/pkgs/tools/misc/adrgen/default.nix b/pkgs/unit/ad/adrgen/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/adrgen/default.nix rename to pkgs/unit/ad/adrgen/pkg-fun.nix diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/unit/ad/adriconf/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/adriconf/default.nix rename to pkgs/unit/ad/adriconf/pkg-fun.nix diff --git a/pkgs/development/libraries/adslib/default.nix b/pkgs/unit/ad/adslib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/adslib/default.nix rename to pkgs/unit/ad/adslib/pkg-fun.nix diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/unit/ad/adtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/adtool/default.nix rename to pkgs/unit/ad/adtool/pkg-fun.nix diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/unit/ad/advancecomp/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/advancecomp/default.nix rename to pkgs/unit/ad/advancecomp/pkg-fun.nix diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/unit/ad/adw-gtk3/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/adw-gtk3/default.nix rename to pkgs/unit/ad/adw-gtk3/pkg-fun.nix diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/unit/ae/aefs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/aefs/default.nix rename to pkgs/unit/ae/aefs/pkg-fun.nix diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/unit/ae/aeolus/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/aeolus/default.nix rename to pkgs/unit/ae/aeolus/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/unit/ae/aerc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/aerc/default.nix rename to pkgs/unit/ae/aerc/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/unit/ae/aerc/runtime-sharedir.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch rename to pkgs/unit/ae/aerc/runtime-sharedir.patch diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/unit/ae/aerospike/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/aerospike/default.nix rename to pkgs/unit/ae/aerospike/pkg-fun.nix diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/unit/ae/aescrypt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/aescrypt/default.nix rename to pkgs/unit/ae/aescrypt/pkg-fun.nix diff --git a/pkgs/tools/security/aesfix/default.nix b/pkgs/unit/ae/aesfix/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/aesfix/default.nix rename to pkgs/unit/ae/aesfix/pkg-fun.nix diff --git a/pkgs/tools/security/aeskeyfind/default.nix b/pkgs/unit/ae/aeskeyfind/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/aeskeyfind/default.nix rename to pkgs/unit/ae/aeskeyfind/pkg-fun.nix diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/unit/ae/aespipe/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/aespipe/default.nix rename to pkgs/unit/ae/aespipe/pkg-fun.nix diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/unit/ae/aether-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/aether-lv2/default.nix rename to pkgs/unit/ae/aether-lv2/pkg-fun.nix diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/unit/ae/aether/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/aether/default.nix rename to pkgs/unit/ae/aether/pkg-fun.nix diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/unit/ae/aewan/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/aewan/default.nix rename to pkgs/unit/ae/aewan/pkg-fun.nix diff --git a/pkgs/tools/misc/afetch/default.nix b/pkgs/unit/af/afetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/afetch/default.nix rename to pkgs/unit/af/afetch/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/unit/af/afew/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/afew/default.nix rename to pkgs/unit/af/afew/pkg-fun.nix diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/unit/af/afflib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/afflib/default.nix rename to pkgs/unit/af/afflib/pkg-fun.nix diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/unit/af/afio/0001-makefile-fix-installation.patch similarity index 100% rename from pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch rename to pkgs/unit/af/afio/0001-makefile-fix-installation.patch diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/unit/af/afio/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/afio/default.nix rename to pkgs/unit/af/afio/pkg-fun.nix diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/unit/af/afpfs-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/afpfs-ng/default.nix rename to pkgs/unit/af/afpfs-ng/pkg-fun.nix diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/unit/af/aften/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aften/default.nix rename to pkgs/unit/af/aften/pkg-fun.nix diff --git a/pkgs/development/libraries/aften/simd-fallback.patch b/pkgs/unit/af/aften/simd-fallback.patch similarity index 100% rename from pkgs/development/libraries/aften/simd-fallback.patch rename to pkgs/unit/af/aften/simd-fallback.patch diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/unit/af/afterburn/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/afterburn/default.nix rename to pkgs/unit/af/afterburn/pkg-fun.nix diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/unit/af/afuse/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/afuse/default.nix rename to pkgs/unit/af/afuse/pkg-fun.nix diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/unit/ag/agave/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/agave/default.nix rename to pkgs/unit/ag/agave/pkg-fun.nix diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/unit/ag/agda-pkg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/agda-pkg/default.nix rename to pkgs/unit/ag/agda-pkg/pkg-fun.nix diff --git a/pkgs/tools/security/age/default.nix b/pkgs/unit/ag/age/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/age/default.nix rename to pkgs/unit/ag/age/pkg-fun.nix diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/unit/ag/agebox/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/agebox/default.nix rename to pkgs/unit/ag/agebox/pkg-fun.nix diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/unit/ag/agedu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/agedu/default.nix rename to pkgs/unit/ag/agedu/pkg-fun.nix diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/unit/ag/agenda/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/agenda/default.nix rename to pkgs/unit/ag/agenda/pkg-fun.nix diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/unit/ag/agg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/agg/default.nix rename to pkgs/unit/ag/agg/pkg-fun.nix diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/unit/ag/agi/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/agi/default.nix rename to pkgs/unit/ag/agi/pkg-fun.nix diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/unit/ag/agkozak-zsh-prompt/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/agkozak-zsh-prompt/default.nix rename to pkgs/unit/ag/agkozak-zsh-prompt/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/unit/ag/agola/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/agola/default.nix rename to pkgs/unit/ag/agola/pkg-fun.nix diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/unit/ag/agrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/agrep/default.nix rename to pkgs/unit/ag/agrep/pkg-fun.nix diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/unit/ah/aha/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/aha/default.nix rename to pkgs/unit/ah/aha/pkg-fun.nix diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/unit/ah/ahcpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ahcpd/default.nix rename to pkgs/unit/ah/ahcpd/pkg-fun.nix diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/unit/ah/ahoviewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/ahoviewer/default.nix rename to pkgs/unit/ah/ahoviewer/pkg-fun.nix diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/unit/ai/aide/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/aide/default.nix rename to pkgs/unit/ai/aide/pkg-fun.nix diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/unit/ai/aiger/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/aiger/default.nix rename to pkgs/unit/ai/aiger/pkg-fun.nix diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/unit/ai/aileron/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/aileron/default.nix rename to pkgs/unit/ai/aileron/pkg-fun.nix diff --git a/pkgs/development/tools/air/default.nix b/pkgs/unit/ai/air/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/air/default.nix rename to pkgs/unit/ai/air/pkg-fun.nix diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/unit/ai/aircrack-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/aircrack-ng/default.nix rename to pkgs/unit/ai/aircrack-ng/pkg-fun.nix diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/unit/ai/airgeddon/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/airgeddon/default.nix rename to pkgs/unit/ai/airgeddon/pkg-fun.nix diff --git a/pkgs/games/airshipper/default.nix b/pkgs/unit/ai/airshipper/pkg-fun.nix similarity index 100% rename from pkgs/games/airshipper/default.nix rename to pkgs/unit/ai/airshipper/pkg-fun.nix diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/unit/ai/airsonic/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/airsonic/default.nix rename to pkgs/unit/ai/airsonic/pkg-fun.nix diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/unit/ai/airspy/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/airspy/default.nix rename to pkgs/unit/ai/airspy/pkg-fun.nix diff --git a/pkgs/applications/radio/airspyhf/default.nix b/pkgs/unit/ai/airspyhf/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/airspyhf/default.nix rename to pkgs/unit/ai/airspyhf/pkg-fun.nix diff --git a/pkgs/games/airstrike/default.nix b/pkgs/unit/ai/airstrike/pkg-fun.nix similarity index 100% rename from pkgs/games/airstrike/default.nix rename to pkgs/unit/ai/airstrike/pkg-fun.nix diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/unit/ai/airwave/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/airwave/default.nix rename to pkgs/unit/ai/airwave/pkg-fun.nix diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/unit/ai/airwindows-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/airwindows-lv2/default.nix rename to pkgs/unit/ai/airwindows-lv2/pkg-fun.nix diff --git a/pkgs/development/libraries/aixlog/default.nix b/pkgs/unit/ai/aixlog/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aixlog/default.nix rename to pkgs/unit/ai/aixlog/pkg-fun.nix diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/unit/aj/aj-snapshot/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/aj-snapshot/default.nix rename to pkgs/unit/aj/aj-snapshot/pkg-fun.nix diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/unit/ak/akira-unstable/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/akira/default.nix rename to pkgs/unit/ak/akira-unstable/pkg-fun.nix diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/unit/ak/akkoma/mix.nix similarity index 100% rename from pkgs/servers/akkoma/mix.nix rename to pkgs/unit/ak/akkoma/mix.nix diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/unit/ak/akkoma/pkg-fun.nix similarity index 100% rename from pkgs/servers/akkoma/default.nix rename to pkgs/unit/ak/akkoma/pkg-fun.nix diff --git a/pkgs/tools/package-management/akku/hardcode-libcurl.patch b/pkgs/unit/ak/akku/hardcode-libcurl.patch similarity index 100% rename from pkgs/tools/package-management/akku/hardcode-libcurl.patch rename to pkgs/unit/ak/akku/hardcode-libcurl.patch diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/unit/ak/akku/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/akku/default.nix rename to pkgs/unit/ak/akku/pkg-fun.nix diff --git a/pkgs/development/compilers/alan/default.nix b/pkgs/unit/al/alan/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/alan/default.nix rename to pkgs/unit/al/alan/pkg-fun.nix diff --git a/pkgs/development/compilers/alan/2.nix b/pkgs/unit/al/alan_2/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/alan/2.nix rename to pkgs/unit/al/alan_2/pkg-fun.nix diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/unit/al/alass/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/alass/default.nix rename to pkgs/unit/al/alass/pkg-fun.nix diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/unit/al/albatross/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/albatross/default.nix rename to pkgs/unit/al/albatross/pkg-fun.nix diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/unit/al/alchemy/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/alchemy/default.nix rename to pkgs/unit/al/alchemy/pkg-fun.nix diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/unit/al/alda/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/alda/default.nix rename to pkgs/unit/al/alda/pkg-fun.nix diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/unit/al/aldo/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/aldo/default.nix rename to pkgs/unit/al/aldo/pkg-fun.nix diff --git a/pkgs/data/fonts/alegreya-sans/default.nix b/pkgs/unit/al/alegreya-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/alegreya-sans/default.nix rename to pkgs/unit/al/alegreya-sans/pkg-fun.nix diff --git a/pkgs/data/fonts/alegreya/default.nix b/pkgs/unit/al/alegreya/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/alegreya/default.nix rename to pkgs/unit/al/alegreya/pkg-fun.nix diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/unit/al/alejandra/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/alejandra/default.nix rename to pkgs/unit/al/alejandra/pkg-fun.nix diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/unit/al/alembic/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/alembic/default.nix rename to pkgs/unit/al/alembic/pkg-fun.nix diff --git a/pkgs/games/alephone/durandal/default.nix b/pkgs/unit/al/alephone-durandal/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/durandal/default.nix rename to pkgs/unit/al/alephone-durandal/pkg-fun.nix diff --git a/pkgs/games/alephone/eternal/default.nix b/pkgs/unit/al/alephone-eternal/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/eternal/default.nix rename to pkgs/unit/al/alephone-eternal/pkg-fun.nix diff --git a/pkgs/games/alephone/evil/default.nix b/pkgs/unit/al/alephone-evil/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/evil/default.nix rename to pkgs/unit/al/alephone-evil/pkg-fun.nix diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/unit/al/alephone-infinity/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/infinity/default.nix rename to pkgs/unit/al/alephone-infinity/pkg-fun.nix diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/unit/al/alephone-marathon/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/marathon/default.nix rename to pkgs/unit/al/alephone-marathon/pkg-fun.nix diff --git a/pkgs/games/alephone/pheonix/default.nix b/pkgs/unit/al/alephone-pheonix/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/pheonix/default.nix rename to pkgs/unit/al/alephone-pheonix/pkg-fun.nix diff --git a/pkgs/games/alephone/red/default.nix b/pkgs/unit/al/alephone-red/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/red/default.nix rename to pkgs/unit/al/alephone-red/pkg-fun.nix diff --git a/pkgs/games/alephone/rubicon-x/default.nix b/pkgs/unit/al/alephone-rubicon-x/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/rubicon-x/default.nix rename to pkgs/unit/al/alephone-rubicon-x/pkg-fun.nix diff --git a/pkgs/games/alephone/default.nix b/pkgs/unit/al/alephone/pkg-fun.nix similarity index 100% rename from pkgs/games/alephone/default.nix rename to pkgs/unit/al/alephone/pkg-fun.nix diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/unit/al/alerta-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/alerta/default.nix rename to pkgs/unit/al/alerta-server/pkg-fun.nix diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/unit/al/alerta/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/alerta/client.nix rename to pkgs/unit/al/alerta/pkg-fun.nix diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/unit/al/alertmanager-bot/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/alertmanager-bot/default.nix rename to pkgs/unit/al/alertmanager-bot/pkg-fun.nix diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/unit/al/alertmanager-irc-relay/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/alertmanager-irc-relay/default.nix rename to pkgs/unit/al/alertmanager-irc-relay/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/unit/al/alfaview/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/alfaview/default.nix rename to pkgs/unit/al/alfaview/pkg-fun.nix diff --git a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/pkgs/unit/al/alglib/patch-alglib-CMakeLists.patch similarity index 100% rename from pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch rename to pkgs/unit/al/alglib/patch-alglib-CMakeLists.patch diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/unit/al/alglib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/alglib/default.nix rename to pkgs/unit/al/alglib/pkg-fun.nix diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/unit/al/algol68g/0001-plotutils-png-support.diff similarity index 100% rename from pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff rename to pkgs/unit/al/algol68g/0001-plotutils-png-support.diff diff --git a/pkgs/development/compilers/algol68g/default.nix b/pkgs/unit/al/algol68g/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/algol68g/default.nix rename to pkgs/unit/al/algol68g/pkg-fun.nix diff --git a/pkgs/data/fonts/alice/default.nix b/pkgs/unit/al/alice/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/alice/default.nix rename to pkgs/unit/al/alice/pkg-fun.nix diff --git a/pkgs/games/alienarena/default.nix b/pkgs/unit/al/alienarena/pkg-fun.nix similarity index 100% rename from pkgs/games/alienarena/default.nix rename to pkgs/unit/al/alienarena/pkg-fun.nix diff --git a/pkgs/tools/text/align/default.nix b/pkgs/unit/al/align/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/align/default.nix rename to pkgs/unit/al/align/pkg-fun.nix diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/unit/al/aliyun-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aliyun-cli/default.nix rename to pkgs/unit/al/aliyun-cli/pkg-fun.nix diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/unit/al/aliza/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/medicine/aliza/default.nix rename to pkgs/unit/al/aliza/pkg-fun.nix diff --git a/pkgs/data/fonts/alkalami/default.nix b/pkgs/unit/al/alkalami/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/alkalami/default.nix rename to pkgs/unit/al/alkalami/pkg-fun.nix diff --git a/pkgs/development/libraries/allegro/encoding.patch b/pkgs/unit/al/allegro4/encoding.patch similarity index 100% rename from pkgs/development/libraries/allegro/encoding.patch rename to pkgs/unit/al/allegro4/encoding.patch diff --git a/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch b/pkgs/unit/al/allegro4/nix-unstable-sandbox-fix.patch similarity index 100% rename from pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch rename to pkgs/unit/al/allegro4/nix-unstable-sandbox-fix.patch diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/unit/al/allegro4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/allegro/default.nix rename to pkgs/unit/al/allegro4/pkg-fun.nix diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/unit/al/allegro5/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/allegro/5.nix rename to pkgs/unit/al/allegro5/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/unit/al/alliance/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/alliance/default.nix rename to pkgs/unit/al/alliance/pkg-fun.nix diff --git a/pkgs/servers/allmark/default.nix b/pkgs/unit/al/allmark/pkg-fun.nix similarity index 100% rename from pkgs/servers/allmark/default.nix rename to pkgs/unit/al/allmark/pkg-fun.nix diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/unit/al/allure/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/allure/default.nix rename to pkgs/unit/al/allure/pkg-fun.nix diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/unit/al/almanah/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/almanah/default.nix rename to pkgs/unit/al/almanah/pkg-fun.nix diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/unit/al/almonds/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/almonds/default.nix rename to pkgs/unit/al/almonds/pkg-fun.nix diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/unit/al/alock/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/alock/default.nix rename to pkgs/unit/al/alock/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/unit/al/alot/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/alot/default.nix rename to pkgs/unit/al/alot/pkg-fun.nix diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/unit/al/alpine-make-vm-image/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/alpine-make-vm-image/default.nix rename to pkgs/unit/al/alpine-make-vm-image/pkg-fun.nix diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/unit/al/alpnpass/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/alpnpass/default.nix rename to pkgs/unit/al/alpnpass/pkg-fun.nix diff --git a/pkgs/servers/alps/default.nix b/pkgs/unit/al/alps/pkg-fun.nix similarity index 100% rename from pkgs/servers/alps/default.nix rename to pkgs/unit/al/alps/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/unit/al/alsa-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix rename to pkgs/unit/al/alsa-firmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/unit/al/alsa-lib/alsa-plugin-conf-multilib.patch similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch rename to pkgs/unit/al/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/unit/al/alsa-lib/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix rename to pkgs/unit/al/alsa-lib/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix b/pkgs/unit/al/alsa-oss/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix rename to pkgs/unit/al/alsa-oss/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/pkgs/unit/al/alsa-plugins-wrapper/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix rename to pkgs/unit/al/alsa-plugins-wrapper/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix b/pkgs/unit/al/alsa-plugins/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix rename to pkgs/unit/al/alsa-plugins/pkg-fun.nix diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/unit/al/alsa-scarlett-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/alsa-scarlett-gui/default.nix rename to pkgs/unit/al/alsa-scarlett-gui/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/unit/al/alsa-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix rename to pkgs/unit/al/alsa-tools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix b/pkgs/unit/al/alsa-topology-conf/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix rename to pkgs/unit/al/alsa-topology-conf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/unit/al/alsa-ucm-conf/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix rename to pkgs/unit/al/alsa-ucm-conf/pkg-fun.nix diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/unit/al/alsaequal/caps_9.x.patch similarity index 100% rename from pkgs/tools/audio/alsaequal/caps_9.x.patch rename to pkgs/unit/al/alsaequal/caps_9.x.patch diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/unit/al/alsaequal/false_error.patch similarity index 100% rename from pkgs/tools/audio/alsaequal/false_error.patch rename to pkgs/unit/al/alsaequal/false_error.patch diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/unit/al/alsaequal/makefile.patch similarity index 100% rename from pkgs/tools/audio/alsaequal/makefile.patch rename to pkgs/unit/al/alsaequal/makefile.patch diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/unit/al/alsaequal/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/alsaequal/default.nix rename to pkgs/unit/al/alsaequal/pkg-fun.nix diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/unit/al/alt-ergo/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/alt-ergo/default.nix rename to pkgs/unit/al/alt-ergo/pkg-fun.nix diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/unit/al/altair/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/altair-graphql-client/default.nix rename to pkgs/unit/al/altair/pkg-fun.nix diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/unit/al/altermime/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/altermime/default.nix rename to pkgs/unit/al/altermime/pkg-fun.nix diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/unit/al/althttpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/althttpd/default.nix rename to pkgs/unit/al/althttpd/pkg-fun.nix diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/unit/al/alttab/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/alttab/default.nix rename to pkgs/unit/al/alttab/pkg-fun.nix diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/unit/al/alttpr-opentracker/deps.nix similarity index 100% rename from pkgs/tools/games/opentracker/deps.nix rename to pkgs/unit/al/alttpr-opentracker/deps.nix diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/unit/al/alttpr-opentracker/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/opentracker/default.nix rename to pkgs/unit/al/alttpr-opentracker/pkg-fun.nix diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/unit/al/alure/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/alure/default.nix rename to pkgs/unit/al/alure/pkg-fun.nix diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/unit/al/alure2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/alure2/default.nix rename to pkgs/unit/al/alure2/pkg-fun.nix diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/unit/am/AMB-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/AMB-plugins/default.nix rename to pkgs/unit/am/AMB-plugins/pkg-fun.nix diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/unit/am/amass/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/amass/default.nix rename to pkgs/unit/am/amass/pkg-fun.nix diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/unit/am/amazon-ec2-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/amazon-ec2-utils/default.nix rename to pkgs/unit/am/amazon-ec2-utils/pkg-fun.nix diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/unit/am/amazon-ecr-credential-helper/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/amazon-ecr-credential-helper/default.nix rename to pkgs/unit/am/amazon-ecr-credential-helper/pkg-fun.nix diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/unit/am/amazon-ecs-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/amazon-ecs-cli/default.nix rename to pkgs/unit/am/amazon-ecs-cli/pkg-fun.nix diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/unit/am/amber-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/amber/default.nix rename to pkgs/unit/am/amber-theme/pkg-fun.nix diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/unit/am/amberol/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/amberol/default.nix rename to pkgs/unit/am/amberol/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/unit/am/amd-blis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/amd-blis/default.nix rename to pkgs/unit/am/amd-blis/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/amd-libflame/add-lapacke.diff b/pkgs/unit/am/amd-libflame/add-lapacke.diff similarity index 100% rename from pkgs/development/libraries/science/math/amd-libflame/add-lapacke.diff rename to pkgs/unit/am/amd-libflame/add-lapacke.diff diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/unit/am/amd-libflame/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/amd-libflame/default.nix rename to pkgs/unit/am/amd-libflame/pkg-fun.nix diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/unit/am/amdvlk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/amdvlk/default.nix rename to pkgs/unit/am/amdvlk/pkg-fun.nix diff --git a/pkgs/development/libraries/amdvlk/test.nix b/pkgs/unit/am/amdvlk/test.nix similarity index 100% rename from pkgs/development/libraries/amdvlk/test.nix rename to pkgs/unit/am/amdvlk/test.nix diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/unit/am/ameba/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ameba/default.nix rename to pkgs/unit/am/ameba/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/unit/am/amfora/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/amfora/default.nix rename to pkgs/unit/am/amfora/pkg-fun.nix diff --git a/pkgs/tools/games/minecraft/amidst/default.nix b/pkgs/unit/am/amidst/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/minecraft/amidst/default.nix rename to pkgs/unit/am/amidst/pkg-fun.nix diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/unit/am/amiri/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/amiri/default.nix rename to pkgs/unit/am/amiri/pkg-fun.nix diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/unit/am/aml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aml/default.nix rename to pkgs/unit/am/aml/pkg-fun.nix diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/unit/am/amoco/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/amoco/default.nix rename to pkgs/unit/am/amoco/pkg-fun.nix diff --git a/pkgs/games/amoeba/data.nix b/pkgs/unit/am/amoeba-data/pkg-fun.nix similarity index 100% rename from pkgs/games/amoeba/data.nix rename to pkgs/unit/am/amoeba-data/pkg-fun.nix diff --git a/pkgs/games/amoeba/include-string-h.patch b/pkgs/unit/am/amoeba/include-string-h.patch similarity index 100% rename from pkgs/games/amoeba/include-string-h.patch rename to pkgs/unit/am/amoeba/include-string-h.patch diff --git a/pkgs/games/amoeba/default.nix b/pkgs/unit/am/amoeba/pkg-fun.nix similarity index 100% rename from pkgs/games/amoeba/default.nix rename to pkgs/unit/am/amoeba/pkg-fun.nix diff --git a/pkgs/games/among-sus/default.nix b/pkgs/unit/am/among-sus/pkg-fun.nix similarity index 100% rename from pkgs/games/among-sus/default.nix rename to pkgs/unit/am/among-sus/pkg-fun.nix diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/unit/am/amp/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/amp/default.nix rename to pkgs/unit/am/amp/pkg-fun.nix diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/unit/am/amrnb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/amrnb/default.nix rename to pkgs/unit/am/amrnb/pkg-fun.nix diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/unit/am/amrwb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/amrwb/default.nix rename to pkgs/unit/am/amrwb/pkg-fun.nix diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/unit/am/ams-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ams-lv2/default.nix rename to pkgs/unit/am/ams-lv2/pkg-fun.nix diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/unit/am/ams/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ams/default.nix rename to pkgs/unit/am/ams/pkg-fun.nix diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/unit/am/amtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/amtk/default.nix rename to pkgs/unit/am/amtk/pkg-fun.nix diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/unit/am/amtterm/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/amtterm/default.nix rename to pkgs/unit/am/amtterm/pkg-fun.nix diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/unit/am/amule/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/p2p/amule/default.nix rename to pkgs/unit/am/amule/pkg-fun.nix diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/unit/an/analog/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/analog/default.nix rename to pkgs/unit/an/analog/pkg-fun.nix diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/unit/an/ananicy-cpp/pkg-fun.nix similarity index 100% rename from pkgs/misc/ananicy-cpp/default.nix rename to pkgs/unit/an/ananicy-cpp/pkg-fun.nix diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/unit/an/ananicy/pkg-fun.nix similarity index 100% rename from pkgs/misc/ananicy/default.nix rename to pkgs/unit/an/ananicy/pkg-fun.nix diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/unit/an/anarchism/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/anarchism/default.nix rename to pkgs/unit/an/anarchism/pkg-fun.nix diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/unit/an/anbox/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/anbox/default.nix rename to pkgs/unit/an/anbox/pkg-fun.nix diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/unit/an/andagii/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/andagii/default.nix rename to pkgs/unit/an/andagii/pkg-fun.nix diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/unit/an/anders/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/anders/default.nix rename to pkgs/unit/an/anders/pkg-fun.nix diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/unit/an/andika/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/andika/default.nix rename to pkgs/unit/an/andika/pkg-fun.nix diff --git a/pkgs/tools/backup/android-backup-extractor/default.nix b/pkgs/unit/an/android-backup-extractor/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/android-backup-extractor/default.nix rename to pkgs/unit/an/android-backup-extractor/pkg-fun.nix diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/unit/an/android-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/android-udev-rules/default.nix rename to pkgs/unit/an/android-udev-rules/pkg-fun.nix diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/unit/an/andyetitmoves/pkg-fun.nix similarity index 100% rename from pkgs/games/andyetitmoves/default.nix rename to pkgs/unit/an/andyetitmoves/pkg-fun.nix diff --git a/pkgs/tools/text/anewer/default.nix b/pkgs/unit/an/anewer/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/anewer/default.nix rename to pkgs/unit/an/anewer/pkg-fun.nix diff --git a/pkgs/games/angband/default.nix b/pkgs/unit/an/angband/pkg-fun.nix similarity index 100% rename from pkgs/games/angband/default.nix rename to pkgs/unit/an/angband/pkg-fun.nix diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/unit/an/angelscript/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/angelscript/default.nix rename to pkgs/unit/an/angelscript/pkg-fun.nix diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/unit/an/angelscript_2_22/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/angelscript/2.22.nix rename to pkgs/unit/an/angelscript_2_22/pkg-fun.nix diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/unit/an/angle-grinder/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/angle-grinder/default.nix rename to pkgs/unit/an/angle-grinder/pkg-fun.nix diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/unit/an/angsd/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/angsd/default.nix rename to pkgs/unit/an/angsd/pkg-fun.nix diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/unit/an/ani-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/ani-cli/default.nix rename to pkgs/unit/an/ani-cli/pkg-fun.nix diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/unit/an/animbar/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/animbar/default.nix rename to pkgs/unit/an/animbar/pkg-fun.nix diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/unit/an/anime-downloader/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/anime-downloader/default.nix rename to pkgs/unit/an/anime-downloader/pkg-fun.nix diff --git a/pkgs/applications/video/anime-downloader/update.sh b/pkgs/unit/an/anime-downloader/update.sh similarity index 100% rename from pkgs/applications/video/anime-downloader/update.sh rename to pkgs/unit/an/anime-downloader/update.sh diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/unit/an/ankacoder-condensed/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/condensed.nix rename to pkgs/unit/an/ankacoder-condensed/pkg-fun.nix diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/unit/an/ankacoder/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/default.nix rename to pkgs/unit/an/ankacoder/pkg-fun.nix diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/unit/an/annapurna-sil/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/annapurna-sil/default.nix rename to pkgs/unit/an/annapurna-sil/pkg-fun.nix diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/unit/an/anonymousPro/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/anonymous-pro/default.nix rename to pkgs/unit/an/anonymousPro/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/unit/an/ansible-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/ansible-language-server/default.nix rename to pkgs/unit/an/ansible-language-server/pkg-fun.nix diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/unit/an/ansifilter/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ansifilter/default.nix rename to pkgs/unit/an/ansifilter/pkg-fun.nix diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/unit/an/ant-bloody-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/ant-theme/ant-bloody.nix rename to pkgs/unit/an/ant-bloody-theme/pkg-fun.nix diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/unit/an/ant-nebula-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/ant-theme/ant-nebula.nix rename to pkgs/unit/an/ant-nebula-theme/pkg-fun.nix diff --git a/pkgs/data/themes/ant-theme/ant.nix b/pkgs/unit/an/ant-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/ant-theme/ant.nix rename to pkgs/unit/an/ant-theme/pkg-fun.nix diff --git a/pkgs/development/compilers/ante/default.nix b/pkgs/unit/an/ante/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ante/default.nix rename to pkgs/unit/an/ante/pkg-fun.nix diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/unit/an/antfs-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/antfs-cli/default.nix rename to pkgs/unit/an/antfs-cli/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/unit/an/anthy/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/anthy/default.nix rename to pkgs/unit/an/anthy/pkg-fun.nix diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/unit/an/antibody/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/antibody/default.nix rename to pkgs/unit/an/antibody/pkg-fun.nix diff --git a/pkgs/development/libraries/antic/default.nix b/pkgs/unit/an/antic/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/antic/default.nix rename to pkgs/unit/an/antic/pkg-fun.nix diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/unit/an/antigen/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/antigen/default.nix rename to pkgs/unit/an/antigen/pkg-fun.nix diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/unit/an/antiprism/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/geometry/antiprism/default.nix rename to pkgs/unit/an/antiprism/pkg-fun.nix diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch b/pkgs/unit/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch similarity index 100% rename from pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch rename to pkgs/unit/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/unit/an/antiword/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/antiword/default.nix rename to pkgs/unit/an/antiword/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch b/pkgs/unit/an/antlr2/2.7.7-fixes.patch similarity index 100% rename from pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch rename to pkgs/unit/an/antlr2/2.7.7-fixes.patch diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/unit/an/antlr2/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/antlr/2.7.7.nix rename to pkgs/unit/an/antlr2/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/unit/an/antlr3_4/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/antlr/3.4.nix rename to pkgs/unit/an/antlr3_4/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/unit/an/antlr3_5/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/antlr/3.5.nix rename to pkgs/unit/an/antlr3_5/pkg-fun.nix diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/unit/an/antora/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/documentation/antora/default.nix rename to pkgs/unit/an/antora/pkg-fun.nix diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/unit/an/antsimulator/pkg-fun.nix similarity index 100% rename from pkgs/games/antsimulator/default.nix rename to pkgs/unit/an/antsimulator/pkg-fun.nix diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/unit/an/anttweakbar/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/AntTweakBar/default.nix rename to pkgs/unit/an/anttweakbar/pkg-fun.nix diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/unit/an/any-nix-shell/pkg-fun.nix similarity index 100% rename from pkgs/shells/any-nix-shell/default.nix rename to pkgs/unit/an/any-nix-shell/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/unit/an/anydesk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/anydesk/default.nix rename to pkgs/unit/an/anydesk/pkg-fun.nix diff --git a/pkgs/tools/misc/anystyle-cli/gemset.nix b/pkgs/unit/an/anystyle-cli/gemset.nix similarity index 100% rename from pkgs/tools/misc/anystyle-cli/gemset.nix rename to pkgs/unit/an/anystyle-cli/gemset.nix diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/unit/an/anystyle-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/anystyle-cli/default.nix rename to pkgs/unit/an/anystyle-cli/pkg-fun.nix diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/unit/an/anytype/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/anytype/default.nix rename to pkgs/unit/an/anytype/pkg-fun.nix diff --git a/pkgs/servers/ldap/apache-directory-server/default.nix b/pkgs/unit/ap/apache-directory-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/ldap/apache-directory-server/default.nix rename to pkgs/unit/ap/apache-directory-server/pkg-fun.nix diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/unit/ap/apache-directory-studio/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/apache-directory-studio/default.nix rename to pkgs/unit/ap/apache-directory-studio/pkg-fun.nix diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/unit/ap/apache-flex-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/apache-flex-sdk/default.nix rename to pkgs/unit/ap/apache-flex-sdk/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/unit/ap/apacheAnt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/apache-ant/default.nix rename to pkgs/unit/ap/apacheAnt/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/unit/ap/apacheAnt_1_9/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/apache-ant/1.9.nix rename to pkgs/unit/ap/apacheAnt_1_9/pkg-fun.nix diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/unit/ap/apacheHttpd_2_4/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/apache-httpd/2.4.nix rename to pkgs/unit/ap/apacheHttpd_2_4/pkg-fun.nix diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/unit/ap/apcupsd/pkg-fun.nix similarity index 100% rename from pkgs/servers/apcupsd/default.nix rename to pkgs/unit/ap/apcupsd/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/unit/ap/apfel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/apfel/default.nix rename to pkgs/unit/ap/apfel/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/unit/ap/apfelgrid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/apfelgrid/default.nix rename to pkgs/unit/ap/apfelgrid/pkg-fun.nix diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/unit/ap/apfs-fuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/apfs-fuse/default.nix rename to pkgs/unit/ap/apfs-fuse/pkg-fun.nix diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/unit/ap/apfsprogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/apfsprogs/default.nix rename to pkgs/unit/ap/apfsprogs/pkg-fun.nix diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/unit/ap/apg/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/apg/default.nix rename to pkgs/unit/ap/apg/pkg-fun.nix diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/unit/ap/apgdiff/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/apgdiff/default.nix rename to pkgs/unit/ap/apgdiff/pkg-fun.nix diff --git a/pkgs/tools/package-management/apkg/default.nix b/pkgs/unit/ap/apkg/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/apkg/default.nix rename to pkgs/unit/ap/apkg/pkg-fun.nix diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/unit/ap/apkid/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/apkid/default.nix rename to pkgs/unit/ap/apkid/pkg-fun.nix diff --git a/pkgs/tools/security/apkleaks/default.nix b/pkgs/unit/ap/apkleaks/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/apkleaks/default.nix rename to pkgs/unit/ap/apkleaks/pkg-fun.nix diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/unit/ap/apko/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/apko/default.nix rename to pkgs/unit/ap/apko/pkg-fun.nix diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/unit/ap/apksigcopier/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/apksigcopier/default.nix rename to pkgs/unit/ap/apksigcopier/pkg-fun.nix diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/unit/ap/apksigner/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/apksigner/default.nix rename to pkgs/unit/ap/apksigner/pkg-fun.nix diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/unit/ap/apngasm/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/apngasm/default.nix rename to pkgs/unit/ap/apngasm/pkg-fun.nix diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/unit/ap/apngasm_2/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/apngasm/2.nix rename to pkgs/unit/ap/apngasm_2/pkg-fun.nix diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/unit/ap/apparix/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/apparix/default.nix rename to pkgs/unit/ap/apparix/pkg-fun.nix diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/unit/ap/appdaemon/pkg-fun.nix similarity index 100% rename from pkgs/servers/home-assistant/appdaemon.nix rename to pkgs/unit/ap/appdaemon/pkg-fun.nix diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/unit/ap/appeditor/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/appeditor/default.nix rename to pkgs/unit/ap/appeditor/pkg-fun.nix diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/unit/ap/appflowy/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/appflowy/default.nix rename to pkgs/unit/ap/appflowy/pkg-fun.nix diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/unit/ap/appgate-sdp/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/appgate-sdp/default.nix rename to pkgs/unit/ap/appgate-sdp/pkg-fun.nix diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/unit/ap/appimage-run/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/appimage-run/default.nix rename to pkgs/unit/ap/appimage-run/pkg-fun.nix diff --git a/pkgs/tools/package-management/appimagekit/nix.patch b/pkgs/unit/ap/appimagekit/nix.patch similarity index 100% rename from pkgs/tools/package-management/appimagekit/nix.patch rename to pkgs/unit/ap/appimagekit/nix.patch diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/unit/ap/appimagekit/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/appimagekit/default.nix rename to pkgs/unit/ap/appimagekit/pkg-fun.nix diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/unit/ap/appindicator-sharp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/appindicator-sharp/default.nix rename to pkgs/unit/ap/appindicator-sharp/pkg-fun.nix diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/unit/ap/apple-cursor/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/apple-cursor/default.nix rename to pkgs/unit/ap/apple-cursor/pkg-fun.nix diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/pkgs/unit/ap/appstream-glib/paths.patch similarity index 100% rename from pkgs/development/libraries/appstream-glib/paths.patch rename to pkgs/unit/ap/appstream-glib/paths.patch diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/unit/ap/appstream-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/appstream-glib/default.nix rename to pkgs/unit/ap/appstream-glib/pkg-fun.nix diff --git a/pkgs/development/libraries/appstream/fix-paths.patch b/pkgs/unit/ap/appstream/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/appstream/fix-paths.patch rename to pkgs/unit/ap/appstream/fix-paths.patch diff --git a/pkgs/development/libraries/appstream/installed-tests-path.patch b/pkgs/unit/ap/appstream/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/appstream/installed-tests-path.patch rename to pkgs/unit/ap/appstream/installed-tests-path.patch diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/unit/ap/appstream/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/appstream/default.nix rename to pkgs/unit/ap/appstream/pkg-fun.nix diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/unit/ap/appthreat-depscan/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/appthreat-depscan/default.nix rename to pkgs/unit/ap/appthreat-depscan/pkg-fun.nix diff --git a/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/pkgs/unit/ap/appvm/0001-Remove-menu-bar.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch rename to pkgs/unit/ap/appvm/0001-Remove-menu-bar.patch diff --git a/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch b/pkgs/unit/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch rename to pkgs/unit/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch diff --git a/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch b/pkgs/unit/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch rename to pkgs/unit/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch diff --git a/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch b/pkgs/unit/ap/appvm/0004-Use-title-application-name-as-subtitle.patch similarity index 100% rename from pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch rename to pkgs/unit/ap/appvm/0004-Use-title-application-name-as-subtitle.patch diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/unit/ap/appvm/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/appvm/default.nix rename to pkgs/unit/ap/appvm/pkg-fun.nix diff --git a/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch b/pkgs/unit/ap/aprutil/fix-libxcrypt-build.patch similarity index 100% rename from pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch rename to pkgs/unit/ap/aprutil/fix-libxcrypt-build.patch diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/unit/ap/aprutil/include-static-dependencies.patch similarity index 100% rename from pkgs/development/libraries/apr-util/include-static-dependencies.patch rename to pkgs/unit/ap/aprutil/include-static-dependencies.patch diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/unit/ap/aprutil/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/apr-util/default.nix rename to pkgs/unit/ap/aprutil/pkg-fun.nix diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/unit/ap/apt-cacher-ng/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/apt-cacher-ng/default.nix rename to pkgs/unit/ap/apt-cacher-ng/pkg-fun.nix diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/unit/ap/apt-offline/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/apt-offline/default.nix rename to pkgs/unit/ap/apt-offline/pkg-fun.nix diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/unit/ap/apt/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/apt/default.nix rename to pkgs/unit/ap/apt/pkg-fun.nix diff --git a/pkgs/development/libraries/aptdec/default.nix b/pkgs/unit/ap/aptdec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aptdec/default.nix rename to pkgs/unit/ap/aptdec/pkg-fun.nix diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/unit/ap/aptly/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/aptly/default.nix rename to pkgs/unit/ap/aptly/pkg-fun.nix diff --git a/pkgs/misc/apulse/default.nix b/pkgs/unit/ap/apulse/pkg-fun.nix similarity index 100% rename from pkgs/misc/apulse/default.nix rename to pkgs/unit/ap/apulse/pkg-fun.nix diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/pkgs/unit/ap/apvlv/fix-build-with-poppler-0.73.0.patch similarity index 100% rename from pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch rename to pkgs/unit/ap/apvlv/fix-build-with-poppler-0.73.0.patch diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/unit/ap/apvlv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/apvlv/default.nix rename to pkgs/unit/ap/apvlv/pkg-fun.nix diff --git a/pkgs/tools/misc/aquosctl/default.nix b/pkgs/unit/aq/aquosctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/aquosctl/default.nix rename to pkgs/unit/aq/aquosctl/pkg-fun.nix diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/unit/ar/arachne-pnr/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/arachne-pnr/default.nix rename to pkgs/unit/ar/arachne-pnr/pkg-fun.nix diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/unit/ar/aragorn/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/aragorn/default.nix rename to pkgs/unit/ar/aragorn/pkg-fun.nix diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/unit/ar/arandr/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/arandr/default.nix rename to pkgs/unit/ar/arandr/pkg-fun.nix diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/unit/ar/arangodb/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/arangodb/default.nix rename to pkgs/unit/ar/arangodb/pkg-fun.nix diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/unit/ar/aravis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aravis/default.nix rename to pkgs/unit/ar/aravis/pkg-fun.nix diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/unit/ar/arb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/arb/default.nix rename to pkgs/unit/ar/arb/pkg-fun.nix diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/unit/ar/arc-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/arc-icon-theme/default.nix rename to pkgs/unit/ar/arc-icon-theme/pkg-fun.nix diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/unit/ar/arc-kde-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/arc-kde/default.nix rename to pkgs/unit/ar/arc-kde-theme/pkg-fun.nix diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/unit/ar/arc-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/arc/default.nix rename to pkgs/unit/ar/arc-theme/pkg-fun.nix diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/unit/ar/arch-install-scripts/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/arch-install-scripts/default.nix rename to pkgs/unit/ar/arch-install-scripts/pkg-fun.nix diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/unit/ar/archi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/archi/default.nix rename to pkgs/unit/ar/archi/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/unit/ar/archimedes/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/archimedes/default.nix rename to pkgs/unit/ar/archimedes/pkg-fun.nix diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/unit/ar/archivebox/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/archivebox/default.nix rename to pkgs/unit/ar/archivebox/pkg-fun.nix diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/unit/ar/archivemount/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/archivemount/default.nix rename to pkgs/unit/ar/archivemount/pkg-fun.nix diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/unit/ar/archiver/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/archiver/default.nix rename to pkgs/unit/ar/archiver/pkg-fun.nix diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/unit/ar/archivy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/archivy/default.nix rename to pkgs/unit/ar/archivy/pkg-fun.nix diff --git a/pkgs/development/embedded/arduino/arduino-ci/default.nix b/pkgs/unit/ar/arduino-ci/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-ci/default.nix rename to pkgs/unit/ar/arduino-ci/pkg-fun.nix diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/unit/ar/arduino-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-cli/default.nix rename to pkgs/unit/ar/arduino-cli/pkg-fun.nix diff --git a/pkgs/development/embedded/arduino/arduino-core/downloads.nix b/pkgs/unit/ar/arduino-core-unwrapped/downloads.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-core/downloads.nix rename to pkgs/unit/ar/arduino-core-unwrapped/downloads.nix diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/unit/ar/arduino-core-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-core/default.nix rename to pkgs/unit/ar/arduino-core-unwrapped/pkg-fun.nix diff --git a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix b/pkgs/unit/ar/arduino-core/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-core/chrootenv.nix rename to pkgs/unit/ar/arduino-core/pkg-fun.nix diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/unit/ar/arduino-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-language-server/default.nix rename to pkgs/unit/ar/arduino-language-server/pkg-fun.nix diff --git a/pkgs/development/embedded/arduino/arduino-mk/default.nix b/pkgs/unit/ar/arduino-mk/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/arduino/arduino-mk/default.nix rename to pkgs/unit/ar/arduino-mk/pkg-fun.nix diff --git a/pkgs/games/arena/default.nix b/pkgs/unit/ar/arena/pkg-fun.nix similarity index 100% rename from pkgs/games/arena/default.nix rename to pkgs/unit/ar/arena/pkg-fun.nix diff --git a/pkgs/development/libraries/argagg/0001-catch.diff b/pkgs/unit/ar/argagg/0001-catch.diff similarity index 100% rename from pkgs/development/libraries/argagg/0001-catch.diff rename to pkgs/unit/ar/argagg/0001-catch.diff diff --git a/pkgs/development/libraries/argagg/default.nix b/pkgs/unit/ar/argagg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/argagg/default.nix rename to pkgs/unit/ar/argagg/pkg-fun.nix diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/unit/ar/argbash/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/argbash/default.nix rename to pkgs/unit/ar/argbash/pkg-fun.nix diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/unit/ar/argc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/argc/default.nix rename to pkgs/unit/ar/argc/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/unit/ar/argo-rollouts/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/argo-rollouts/default.nix rename to pkgs/unit/ar/argo-rollouts/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/unit/ar/argo/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/argo/default.nix rename to pkgs/unit/ar/argo/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/argo/staticfiles.go.mod b/pkgs/unit/ar/argo/staticfiles.go.mod similarity index 100% rename from pkgs/applications/networking/cluster/argo/staticfiles.go.mod rename to pkgs/unit/ar/argo/staticfiles.go.mod diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/unit/ar/argocd-autopilot/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/argocd-autopilot/default.nix rename to pkgs/unit/ar/argocd-autopilot/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/unit/ar/argocd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/argocd/default.nix rename to pkgs/unit/ar/argocd/pkg-fun.nix diff --git a/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch b/pkgs/unit/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch similarity index 100% rename from pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch rename to pkgs/unit/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/unit/ar/argononed/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/argononed/default.nix rename to pkgs/unit/ar/argononed/pkg-fun.nix diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/unit/ar/argp-standalone/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/argp-standalone/default.nix rename to pkgs/unit/ar/argp-standalone/pkg-fun.nix diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/unit/ar/argparse/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/argparse/default.nix rename to pkgs/unit/ar/argparse/pkg-fun.nix diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/unit/ar/argtable/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/argtable/default.nix rename to pkgs/unit/ar/argtable/pkg-fun.nix diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/unit/ar/arguments/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/arguments/default.nix rename to pkgs/unit/ar/arguments/pkg-fun.nix diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/unit/ar/argus-clients/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/argus-clients/default.nix rename to pkgs/unit/ar/argus-clients/pkg-fun.nix diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/unit/ar/argus/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/argus/default.nix rename to pkgs/unit/ar/argus/pkg-fun.nix diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/unit/ar/argyllcms/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/argyllcms/default.nix rename to pkgs/unit/ar/argyllcms/pkg-fun.nix diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/unit/ar/ario/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ario/default.nix rename to pkgs/unit/ar/ario/pkg-fun.nix diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/unit/ar/arion/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/arion/default.nix rename to pkgs/unit/ar/arion/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/unit/ar/arkade/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/arkade/default.nix rename to pkgs/unit/ar/arkade/pkg-fun.nix diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/unit/ar/arkpandora_ttf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/arkpandora/default.nix rename to pkgs/unit/ar/arkpandora_ttf/pkg-fun.nix diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/unit/ar/armadillo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/armadillo/default.nix rename to pkgs/unit/ar/armadillo/pkg-fun.nix diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/pkgs/unit/ar/armadillo/use-unix-config-on-OS-X.patch similarity index 100% rename from pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch rename to pkgs/unit/ar/armadillo/use-unix-config-on-OS-X.patch diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/unit/ar/armcord/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/armcord/default.nix rename to pkgs/unit/ar/armcord/pkg-fun.nix diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/unit/ar/arp-scan/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/arp-scan/default.nix rename to pkgs/unit/ar/arp-scan/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/unit/ar/arpa2cm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/arpa2cm/default.nix rename to pkgs/unit/ar/arpa2cm/pkg-fun.nix diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/unit/ar/arpa2common/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/arpa2common/default.nix rename to pkgs/unit/ar/arpa2common/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/unit/ar/arpack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/arpack/default.nix rename to pkgs/unit/ar/arpack/pkg-fun.nix diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/unit/ar/arping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/arping/default.nix rename to pkgs/unit/ar/arping/pkg-fun.nix diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/unit/ar/arpoison/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/arpoison/default.nix rename to pkgs/unit/ar/arpoison/pkg-fun.nix diff --git a/pkgs/development/libraries/arrayfire/no-download.patch b/pkgs/unit/ar/arrayfire/no-download.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-download.patch rename to pkgs/unit/ar/arrayfire/no-download.patch diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/unit/ar/arrayfire/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/arrayfire/default.nix rename to pkgs/unit/ar/arrayfire/pkg-fun.nix diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/pkgs/unit/ar/arrow-cpp/darwin.patch similarity index 100% rename from pkgs/development/libraries/arrow-cpp/darwin.patch rename to pkgs/unit/ar/arrow-cpp/darwin.patch diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/unit/ar/arrow-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/arrow-cpp/default.nix rename to pkgs/unit/ar/arrow-cpp/pkg-fun.nix diff --git a/pkgs/development/libraries/arrow-glib/default.nix b/pkgs/unit/ar/arrow-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/arrow-glib/default.nix rename to pkgs/unit/ar/arrow-glib/pkg-fun.nix diff --git a/pkgs/tools/security/arsenal/default.nix b/pkgs/unit/ar/arsenal/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/arsenal/default.nix rename to pkgs/unit/ar/arsenal/pkg-fun.nix diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/unit/ar/artem/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/artem/default.nix rename to pkgs/unit/ar/artem/pkg-fun.nix diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/unit/ar/artha/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/artha/default.nix rename to pkgs/unit/ar/artha/pkg-fun.nix diff --git a/pkgs/data/themes/artim-dark/default.nix b/pkgs/unit/ar/artim-dark/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/artim-dark/default.nix rename to pkgs/unit/ar/artim-dark/pkg-fun.nix diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/unit/ar/artyFX/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/artyFX/default.nix rename to pkgs/unit/ar/artyFX/pkg-fun.nix diff --git a/pkgs/tools/security/arubaotp-seed-extractor/default.nix b/pkgs/unit/ar/arubaotp-seed-extractor/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/arubaotp-seed-extractor/default.nix rename to pkgs/unit/ar/arubaotp-seed-extractor/pkg-fun.nix diff --git a/pkgs/tools/misc/as-tree/cargo-lock.patch b/pkgs/unit/as/as-tree/cargo-lock.patch similarity index 100% rename from pkgs/tools/misc/as-tree/cargo-lock.patch rename to pkgs/unit/as/as-tree/cargo-lock.patch diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/unit/as/as-tree/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/as-tree/default.nix rename to pkgs/unit/as/as-tree/pkg-fun.nix diff --git a/pkgs/development/compilers/as31/0000-getline-break.patch b/pkgs/unit/as/as31/0000-getline-break.patch similarity index 100% rename from pkgs/development/compilers/as31/0000-getline-break.patch rename to pkgs/unit/as/as31/0000-getline-break.patch diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/unit/as/as31/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/as31/default.nix rename to pkgs/unit/as/as31/pkg-fun.nix diff --git a/pkgs/tools/audio/asap/default.nix b/pkgs/unit/as/asap/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/asap/default.nix rename to pkgs/unit/as/asap/pkg-fun.nix diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/unit/as/asc-key-to-qr-code-gif/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/asc-key-to-qr-code-gif/default.nix rename to pkgs/unit/as/asc-key-to-qr-code-gif/pkg-fun.nix diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/unit/as/ascii-image-converter/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/ascii-image-converter/default.nix rename to pkgs/unit/as/ascii-image-converter/pkg-fun.nix diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/unit/as/ascii/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ascii/default.nix rename to pkgs/unit/as/ascii/pkg-fun.nix diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/unit/as/asciidoctor-with-extensions/Gemfile similarity index 100% rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile rename to pkgs/unit/as/asciidoctor-with-extensions/Gemfile diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/unit/as/asciidoctor-with-extensions/Gemfile.lock similarity index 100% rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock rename to pkgs/unit/as/asciidoctor-with-extensions/Gemfile.lock diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/unit/as/asciidoctor-with-extensions/gemset.nix similarity index 100% rename from pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix rename to pkgs/unit/as/asciidoctor-with-extensions/gemset.nix diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/unit/as/asciidoctor-with-extensions/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix rename to pkgs/unit/as/asciidoctor-with-extensions/pkg-fun.nix diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/unit/as/asciidoctorj/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/asciidoctorj/default.nix rename to pkgs/unit/as/asciidoctorj/pkg-fun.nix diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/unit/as/asciigraph/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/asciigraph/default.nix rename to pkgs/unit/as/asciigraph/pkg-fun.nix diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/unit/as/asciinema-scenario/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/asciinema-scenario/default.nix rename to pkgs/unit/as/asciinema-scenario/pkg-fun.nix diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/unit/as/asciinema/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/asciinema/default.nix rename to pkgs/unit/as/asciinema/pkg-fun.nix diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/unit/as/asciiquarium/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/asciiquarium/default.nix rename to pkgs/unit/as/asciiquarium/pkg-fun.nix diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/unit/as/asdf-vm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/asdf-vm/default.nix rename to pkgs/unit/as/asdf-vm/pkg-fun.nix diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/unit/as/aseprite/allegro-glibc-2.30.patch similarity index 100% rename from pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch rename to pkgs/unit/as/aseprite/allegro-glibc-2.30.patch diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/unit/as/aseprite/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/aseprite/default.nix rename to pkgs/unit/as/aseprite/pkg-fun.nix diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/unit/as/aseprite/skia-deps.nix similarity index 100% rename from pkgs/applications/editors/aseprite/skia-deps.nix rename to pkgs/unit/as/aseprite/skia-deps.nix diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/unit/as/aseprite/skia.nix similarity index 100% rename from pkgs/applications/editors/aseprite/skia.nix rename to pkgs/unit/as/aseprite/skia.nix diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/unit/as/aseq2json/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/aseq2json/default.nix rename to pkgs/unit/as/aseq2json/pkg-fun.nix diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/unit/as/ashpd-demo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ashpd-demo/default.nix rename to pkgs/unit/as/ashpd-demo/pkg-fun.nix diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/unit/as/ashuffle/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ashuffle/default.nix rename to pkgs/unit/as/ashuffle/pkg-fun.nix diff --git a/pkgs/tools/misc/askalono/default.nix b/pkgs/unit/as/askalono/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/askalono/default.nix rename to pkgs/unit/as/askalono/pkg-fun.nix diff --git a/pkgs/tools/networking/asleap/default.nix b/pkgs/unit/as/asleap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/asleap/default.nix rename to pkgs/unit/as/asleap/pkg-fun.nix diff --git a/pkgs/development/tools/misc/asls/default.nix b/pkgs/unit/as/asls/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/asls/default.nix rename to pkgs/unit/as/asls/pkg-fun.nix diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/unit/as/asmfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/asmfmt/default.nix rename to pkgs/unit/as/asmfmt/pkg-fun.nix diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/unit/as/asmjit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/asmjit/default.nix rename to pkgs/unit/as/asmjit/pkg-fun.nix diff --git a/pkgs/development/interpreters/asmrepl/Gemfile b/pkgs/unit/as/asmrepl/Gemfile similarity index 100% rename from pkgs/development/interpreters/asmrepl/Gemfile rename to pkgs/unit/as/asmrepl/Gemfile diff --git a/pkgs/development/interpreters/asmrepl/Gemfile.lock b/pkgs/unit/as/asmrepl/Gemfile.lock similarity index 100% rename from pkgs/development/interpreters/asmrepl/Gemfile.lock rename to pkgs/unit/as/asmrepl/Gemfile.lock diff --git a/pkgs/development/interpreters/asmrepl/gemset.nix b/pkgs/unit/as/asmrepl/gemset.nix similarity index 100% rename from pkgs/development/interpreters/asmrepl/gemset.nix rename to pkgs/unit/as/asmrepl/gemset.nix diff --git a/pkgs/development/interpreters/asmrepl/default.nix b/pkgs/unit/as/asmrepl/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/asmrepl/default.nix rename to pkgs/unit/as/asmrepl/pkg-fun.nix diff --git a/pkgs/applications/networking/asn/default.nix b/pkgs/unit/as/asn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/asn/default.nix rename to pkgs/unit/as/asn/pkg-fun.nix diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/unit/as/asn1c/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/asn1c/default.nix rename to pkgs/unit/as/asn1c/pkg-fun.nix diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/unit/as/asnmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/asnmap/default.nix rename to pkgs/unit/as/asnmap/pkg-fun.nix diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/unit/as/asouldocs/pkg-fun.nix similarity index 100% rename from pkgs/servers/asouldocs/default.nix rename to pkgs/unit/as/asouldocs/pkg-fun.nix diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/unit/as/aspcud/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/aspcud/default.nix rename to pkgs/unit/as/aspcud/pkg-fun.nix diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/unit/as/aspectj/builder.sh similarity index 100% rename from pkgs/development/compilers/aspectj/builder.sh rename to pkgs/unit/as/aspectj/builder.sh diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/unit/as/aspectj/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/aspectj/default.nix rename to pkgs/unit/as/aspectj/pkg-fun.nix diff --git a/pkgs/development/libraries/aspell/clang.patch b/pkgs/unit/as/aspell/clang.patch similarity index 100% rename from pkgs/development/libraries/aspell/clang.patch rename to pkgs/unit/as/aspell/clang.patch diff --git a/pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch b/pkgs/unit/as/aspell/data-dirs-from-nix-profiles.patch similarity index 100% rename from pkgs/development/libraries/aspell/data-dirs-from-nix-profiles.patch rename to pkgs/unit/as/aspell/data-dirs-from-nix-profiles.patch diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/unit/as/aspell/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aspell/default.nix rename to pkgs/unit/as/aspell/pkg-fun.nix diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/unit/as/assaultcube/pkg-fun.nix similarity index 100% rename from pkgs/games/assaultcube/default.nix rename to pkgs/unit/as/assaultcube/pkg-fun.nix diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/unit/as/assh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/assh/default.nix rename to pkgs/unit/as/assh/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/pkgs/unit/as/assign-lb-ip/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/assign-lb-ip/default.nix rename to pkgs/unit/as/assign-lb-ip/pkg-fun.nix diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/unit/as/assimp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/assimp/default.nix rename to pkgs/unit/as/assimp/pkg-fun.nix diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/unit/as/astc-encoder/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/astc-encoder/default.nix rename to pkgs/unit/as/astc-encoder/pkg-fun.nix diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/unit/as/asterisk-module-sccp/pkg-fun.nix similarity index 100% rename from pkgs/servers/asterisk/sccp/default.nix rename to pkgs/unit/as/asterisk-module-sccp/pkg-fun.nix diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/unit/as/astral/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/astral/default.nix rename to pkgs/unit/as/astral/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/unit/as/astrolabe-generator/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/astrolabe-generator/default.nix rename to pkgs/unit/as/astrolabe-generator/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/unit/as/astrolog/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/astrolog/default.nix rename to pkgs/unit/as/astrolog/pkg-fun.nix diff --git a/pkgs/games/astromenace/default.nix b/pkgs/unit/as/astromenace/pkg-fun.nix similarity index 100% rename from pkgs/games/astromenace/default.nix rename to pkgs/unit/as/astromenace/pkg-fun.nix diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/unit/as/astyle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/astyle/default.nix rename to pkgs/unit/as/astyle/pkg-fun.nix diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/unit/as/asunder/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/asunder/default.nix rename to pkgs/unit/as/asunder/pkg-fun.nix diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/unit/as/asusctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/system/asusctl/default.nix rename to pkgs/unit/as/asusctl/pkg-fun.nix diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/unit/as/async-profiler/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/async-profiler/default.nix rename to pkgs/unit/as/async-profiler/pkg-fun.nix diff --git a/pkgs/development/tools/async/default.nix b/pkgs/unit/as/async/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/async/default.nix rename to pkgs/unit/as/async/pkg-fun.nix diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/unit/at/at-spi2-core/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/at-spi2-core/default.nix rename to pkgs/unit/at/at-spi2-core/pkg-fun.nix diff --git a/pkgs/tools/system/at/install.patch b/pkgs/unit/at/at/install.patch similarity index 100% rename from pkgs/tools/system/at/install.patch rename to pkgs/unit/at/at/install.patch diff --git a/pkgs/tools/system/at/default.nix b/pkgs/unit/at/at/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/at/default.nix rename to pkgs/unit/at/at/pkg-fun.nix diff --git a/pkgs/games/atanks/default.nix b/pkgs/unit/at/atanks/pkg-fun.nix similarity index 100% rename from pkgs/games/atanks/default.nix rename to pkgs/unit/at/atanks/pkg-fun.nix diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/unit/at/atari800/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/atari800/default.nix rename to pkgs/unit/at/atari800/pkg-fun.nix diff --git a/pkgs/applications/emulators/atari++/default.nix b/pkgs/unit/at/ataripp/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/atari++/default.nix rename to pkgs/unit/at/ataripp/pkg-fun.nix diff --git a/pkgs/development/compilers/atasm/0000-file-not-found.diff b/pkgs/unit/at/atasm/0000-file-not-found.diff similarity index 100% rename from pkgs/development/compilers/atasm/0000-file-not-found.diff rename to pkgs/unit/at/atasm/0000-file-not-found.diff diff --git a/pkgs/development/compilers/atasm/0001-select-flags.diff b/pkgs/unit/at/atasm/0001-select-flags.diff similarity index 100% rename from pkgs/development/compilers/atasm/0001-select-flags.diff rename to pkgs/unit/at/atasm/0001-select-flags.diff diff --git a/pkgs/development/compilers/atasm/default.nix b/pkgs/unit/at/atasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/atasm/default.nix rename to pkgs/unit/at/atasm/pkg-fun.nix diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/unit/at/atftp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/atftp/default.nix rename to pkgs/unit/at/atftp/pkg-fun.nix diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/unit/at/atheme/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/atheme/default.nix rename to pkgs/unit/at/atheme/pkg-fun.nix diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/unit/at/atinout/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/atinout/default.nix rename to pkgs/unit/at/atinout/pkg-fun.nix diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/unit/at/atkinson-hyperlegible/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/atkinson-hyperlegible/default.nix rename to pkgs/unit/at/atkinson-hyperlegible/pkg-fun.nix diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/unit/at/atkmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/atkmm/default.nix rename to pkgs/unit/at/atkmm/pkg-fun.nix diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/unit/at/atkmm_2_36/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/atkmm/2.36.nix rename to pkgs/unit/at/atkmm_2_36/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/unit/at/atlantis/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/atlantis/default.nix rename to pkgs/unit/at/atlantis/pkg-fun.nix diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/unit/at/atlassian-bamboo/pkg-fun.nix similarity index 100% rename from pkgs/servers/atlassian/bamboo.nix rename to pkgs/unit/at/atlassian-bamboo/pkg-fun.nix diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/unit/at/atlassian-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/atlassian-cli/default.nix rename to pkgs/unit/at/atlassian-cli/pkg-fun.nix diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/unit/at/atlassian-cli/wrapper.sh similarity index 100% rename from pkgs/applications/office/atlassian-cli/wrapper.sh rename to pkgs/unit/at/atlassian-cli/wrapper.sh diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/unit/at/atlassian-confluence/pkg-fun.nix similarity index 100% rename from pkgs/servers/atlassian/confluence.nix rename to pkgs/unit/at/atlassian-confluence/pkg-fun.nix diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/unit/at/atlassian-crowd/pkg-fun.nix similarity index 100% rename from pkgs/servers/atlassian/crowd.nix rename to pkgs/unit/at/atlassian-crowd/pkg-fun.nix diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/unit/at/atlassian-jira/pkg-fun.nix similarity index 100% rename from pkgs/servers/atlassian/jira.nix rename to pkgs/unit/at/atlassian-jira/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/unit/at/atmos/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/atmos/default.nix rename to pkgs/unit/at/atmos/pkg-fun.nix diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/unit/at/atomEnv/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/atom/env.nix rename to pkgs/unit/at/atomEnv/pkg-fun.nix diff --git a/pkgs/tools/security/atomic-operator/default.nix b/pkgs/unit/at/atomic-operator/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/atomic-operator/default.nix rename to pkgs/unit/at/atomic-operator/pkg-fun.nix diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/unit/at/atool/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/atool/default.nix rename to pkgs/unit/at/atool/pkg-fun.nix diff --git a/pkgs/os-specific/linux/atop/atop.service.patch b/pkgs/unit/at/atop/atop.service.patch similarity index 100% rename from pkgs/os-specific/linux/atop/atop.service.patch rename to pkgs/unit/at/atop/atop.service.patch diff --git a/pkgs/os-specific/linux/atop/atopacct.service.patch b/pkgs/unit/at/atop/atopacct.service.patch similarity index 100% rename from pkgs/os-specific/linux/atop/atopacct.service.patch rename to pkgs/unit/at/atop/atopacct.service.patch diff --git a/pkgs/os-specific/linux/atop/fix-paths.patch b/pkgs/unit/at/atop/fix-paths.patch similarity index 100% rename from pkgs/os-specific/linux/atop/fix-paths.patch rename to pkgs/unit/at/atop/fix-paths.patch diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/unit/at/atop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/atop/default.nix rename to pkgs/unit/at/atop/pkg-fun.nix diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/unit/at/ats-acc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ats-acc/default.nix rename to pkgs/unit/at/ats-acc/pkg-fun.nix diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/unit/at/ats/install-atsdoc-hats-files.patch similarity index 100% rename from pkgs/development/compilers/ats/install-atsdoc-hats-files.patch rename to pkgs/unit/at/ats/install-atsdoc-hats-files.patch diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/unit/at/ats/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ats/default.nix rename to pkgs/unit/at/ats/pkg-fun.nix diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/unit/at/ats2/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ats2/default.nix rename to pkgs/unit/at/ats2/pkg-fun.nix diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/unit/at/ats2/setup-contrib-hook.sh similarity index 100% rename from pkgs/development/compilers/ats2/setup-contrib-hook.sh rename to pkgs/unit/at/ats2/setup-contrib-hook.sh diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/unit/at/ats2/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/ats2/setup-hook.sh rename to pkgs/unit/at/ats2/setup-hook.sh diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/unit/at/attemptoClex/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ape/clex.nix rename to pkgs/unit/at/attemptoClex/pkg-fun.nix diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/unit/at/attr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/attr/default.nix rename to pkgs/unit/at/attr/pkg-fun.nix diff --git a/pkgs/applications/emulators/attract-mode/default.nix b/pkgs/unit/at/attract-mode/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/attract-mode/default.nix rename to pkgs/unit/at/attract-mode/pkg-fun.nix diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/unit/au/aubio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aubio/default.nix rename to pkgs/unit/au/aubio/pkg-fun.nix diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/unit/au/aucatctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/aucatctl/default.nix rename to pkgs/unit/au/aucatctl/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/unit/au/auctex/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/auctex/default.nix rename to pkgs/unit/au/auctex/pkg-fun.nix diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/unit/au/audiality2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audiality2/default.nix rename to pkgs/unit/au/audiality2/pkg-fun.nix diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/unit/au/audible-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/audible-cli/default.nix rename to pkgs/unit/au/audible-cli/pkg-fun.nix diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/unit/au/audio-recorder/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/audio-recorder/default.nix rename to pkgs/unit/au/audio-recorder/pkg-fun.nix diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/unit/au/audiowaveform/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/audiowaveform/default.nix rename to pkgs/unit/au/audiowaveform/pkg-fun.nix diff --git a/pkgs/os-specific/linux/audit/patches/weak-symbols.patch b/pkgs/unit/au/audit/patches/weak-symbols.patch similarity index 100% rename from pkgs/os-specific/linux/audit/patches/weak-symbols.patch rename to pkgs/unit/au/audit/patches/weak-symbols.patch diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/unit/au/audit/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/audit/default.nix rename to pkgs/unit/au/audit/pkg-fun.nix diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/unit/au/auditwheel/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/auditwheel/default.nix rename to pkgs/unit/au/auditwheel/pkg-fun.nix diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/unit/au/augeas/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/augeas/default.nix rename to pkgs/unit/au/augeas/pkg-fun.nix diff --git a/pkgs/games/augustus/default.nix b/pkgs/unit/au/augustus/pkg-fun.nix similarity index 100% rename from pkgs/games/augustus/default.nix rename to pkgs/unit/au/augustus/pkg-fun.nix diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/unit/au/aurulent-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/aurulent-sans/default.nix rename to pkgs/unit/au/aurulent-sans/pkg-fun.nix diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/unit/au/auth0-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/auth0-cli/default.nix rename to pkgs/unit/au/auth0-cli/pkg-fun.nix diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/unit/au/authenticator/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/authenticator/default.nix rename to pkgs/unit/au/authenticator/pkg-fun.nix diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/unit/au/authy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/authy/default.nix rename to pkgs/unit/au/authy/pkg-fun.nix diff --git a/pkgs/tools/security/authz0/default.nix b/pkgs/unit/au/authz0/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/authz0/default.nix rename to pkgs/unit/au/authz0/pkg-fun.nix diff --git a/pkgs/tools/system/auto-cpufreq/fix-version-output.patch b/pkgs/unit/au/auto-cpufreq/fix-version-output.patch similarity index 100% rename from pkgs/tools/system/auto-cpufreq/fix-version-output.patch rename to pkgs/unit/au/auto-cpufreq/fix-version-output.patch diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/unit/au/auto-cpufreq/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/auto-cpufreq/default.nix rename to pkgs/unit/au/auto-cpufreq/pkg-fun.nix diff --git a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/pkgs/unit/au/auto-cpufreq/prevent-install-and-copy.patch similarity index 100% rename from pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch rename to pkgs/unit/au/auto-cpufreq/prevent-install-and-copy.patch diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/unit/au/auto-multiple-choice/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/auto-multiple-choice/default.nix rename to pkgs/unit/au/auto-multiple-choice/pkg-fun.nix diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/unit/au/autoadb/pkg-fun.nix similarity index 100% rename from pkgs/misc/autoadb/default.nix rename to pkgs/unit/au/autoadb/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/unit/au/autobuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autobuild/default.nix rename to pkgs/unit/au/autobuild/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/unit/au/autoconf-archive/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autoconf-archive/default.nix rename to pkgs/unit/au/autoconf-archive/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/unit/au/autoconf213/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autoconf/2.13.nix rename to pkgs/unit/au/autoconf213/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/unit/au/autoconf264/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autoconf/2.64.nix rename to pkgs/unit/au/autoconf264/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autoconf/2.69.nix b/pkgs/unit/au/autoconf269/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autoconf/2.69.nix rename to pkgs/unit/au/autoconf269/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autoconf/2.71-fix-race.patch b/pkgs/unit/au/autoconf271/2.71-fix-race.patch similarity index 100% rename from pkgs/development/tools/misc/autoconf/2.71-fix-race.patch rename to pkgs/unit/au/autoconf271/2.71-fix-race.patch diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/unit/au/autoconf271/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autoconf/default.nix rename to pkgs/unit/au/autoconf271/pkg-fun.nix diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/unit/au/autocutsel/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/autocutsel/default.nix rename to pkgs/unit/au/autocutsel/pkg-fun.nix diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/unit/au/autofs5/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/autofs/default.nix rename to pkgs/unit/au/autofs5/pkg-fun.nix diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/unit/au/autogen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/autogen/default.nix rename to pkgs/unit/au/autogen/pkg-fun.nix diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/unit/au/autojump/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/autojump/default.nix rename to pkgs/unit/au/autojump/pkg-fun.nix diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/unit/au/autokey/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/autokey/default.nix rename to pkgs/unit/au/autokey/pkg-fun.nix diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/unit/au/automatic-timezoned/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/automatic-timezoned/default.nix rename to pkgs/unit/au/automatic-timezoned/pkg-fun.nix diff --git a/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/pkgs/unit/au/automaticcomponenttoolkit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix rename to pkgs/unit/au/automaticcomponenttoolkit/pkg-fun.nix diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/unit/au/automirror/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/automirror/default.nix rename to pkgs/unit/au/automirror/pkg-fun.nix diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/unit/au/automysqlbackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/automysqlbackup/default.nix rename to pkgs/unit/au/automysqlbackup/pkg-fun.nix diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/unit/au/autopanosiftc/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/autopanosiftc/default.nix rename to pkgs/unit/au/autopanosiftc/pkg-fun.nix diff --git a/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch b/pkgs/unit/au/autorandr/0001-don-t-use-sys.executable.patch similarity index 100% rename from pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch rename to pkgs/unit/au/autorandr/0001-don-t-use-sys.executable.patch diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/unit/au/autorandr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/autorandr/default.nix rename to pkgs/unit/au/autorandr/pkg-fun.nix diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/unit/au/autorestic/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/autorestic/default.nix rename to pkgs/unit/au/autorestic/pkg-fun.nix diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/unit/au/autorevision/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/autorevision/default.nix rename to pkgs/unit/au/autorevision/pkg-fun.nix diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/unit/au/autospotting/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/autospotting/default.nix rename to pkgs/unit/au/autospotting/pkg-fun.nix diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/unit/au/autossh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/autossh/default.nix rename to pkgs/unit/au/autossh/pkg-fun.nix diff --git a/pkgs/os-specific/linux/autosuspend/default.nix b/pkgs/unit/au/autosuspend/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/autosuspend/default.nix rename to pkgs/unit/au/autosuspend/pkg-fun.nix diff --git a/pkgs/applications/audio/autotalent/default.nix b/pkgs/unit/au/autotalent/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/autotalent/default.nix rename to pkgs/unit/au/autotalent/pkg-fun.nix diff --git a/pkgs/misc/autotiling-rs/default.nix b/pkgs/unit/au/autotiling-rs/pkg-fun.nix similarity index 100% rename from pkgs/misc/autotiling-rs/default.nix rename to pkgs/unit/au/autotiling-rs/pkg-fun.nix diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/unit/au/autotrace/autofig.nix similarity index 100% rename from pkgs/applications/graphics/autotrace/autofig.nix rename to pkgs/unit/au/autotrace/autofig.nix diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/unit/au/autotrace/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/autotrace/default.nix rename to pkgs/unit/au/autotrace/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/av-98/default.nix b/pkgs/unit/av/av-98/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/av-98/default.nix rename to pkgs/unit/av/av-98/pkg-fun.nix diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/unit/av/avalonia-ilspy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/avalonia-ilspy/default.nix rename to pkgs/unit/av/avalonia-ilspy/pkg-fun.nix diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/unit/av/avfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/avfs/default.nix rename to pkgs/unit/av/avfs/pkg-fun.nix diff --git a/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch b/pkgs/unit/av/aviator/bump-golang-x-sys.patch similarity index 100% rename from pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch rename to pkgs/unit/av/aviator/bump-golang-x-sys.patch diff --git a/pkgs/development/tools/misc/aviator/default.nix b/pkgs/unit/av/aviator/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/aviator/default.nix rename to pkgs/unit/av/aviator/pkg-fun.nix diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/unit/av/avizo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/avizo/default.nix rename to pkgs/unit/av/avizo/pkg-fun.nix diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/unit/av/avocode/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/avocode/default.nix rename to pkgs/unit/av/avocode/pkg-fun.nix diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/unit/av/avr8burnomat/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/avr8-burn-omat/default.nix rename to pkgs/unit/av/avr8burnomat/pkg-fun.nix diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/unit/av/avra/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/avra/default.nix rename to pkgs/unit/av/avra/pkg-fun.nix diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/unit/av/avrdude/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/avrdude/default.nix rename to pkgs/unit/av/avrdude/pkg-fun.nix diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/unit/av/avrdudess/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/avrdudess/default.nix rename to pkgs/unit/av/avrdudess/pkg-fun.nix diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/unit/av/avro-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/avro-c/default.nix rename to pkgs/unit/av/avro-c/pkg-fun.nix diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/unit/av/avro-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/avro-c++/default.nix rename to pkgs/unit/av/avro-cpp/pkg-fun.nix diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/unit/av/avro-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/avro-tools/default.nix rename to pkgs/unit/av/avro-tools/pkg-fun.nix diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/unit/aw/awf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/awf/default.nix rename to pkgs/unit/aw/awf/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/unit/aw/aws-c-auth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-auth/default.nix rename to pkgs/unit/aw/aws-c-auth/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/unit/aw/aws-c-common/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-common/default.nix rename to pkgs/unit/aw/aws-c-common/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/unit/aw/aws-c-common/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/aws-c-common/setup-hook.sh rename to pkgs/unit/aw/aws-c-common/setup-hook.sh diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/unit/aw/aws-c-compression/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-compression/default.nix rename to pkgs/unit/aw/aws-c-compression/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/unit/aw/aws-c-event-stream/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-event-stream/default.nix rename to pkgs/unit/aw/aws-c-event-stream/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/unit/aw/aws-c-http/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-http/default.nix rename to pkgs/unit/aw/aws-c-http/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/unit/aw/aws-c-mqtt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-mqtt/default.nix rename to pkgs/unit/aw/aws-c-mqtt/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/unit/aw/aws-c-s3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-s3/default.nix rename to pkgs/unit/aw/aws-c-s3/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/unit/aw/aws-c-sdkutils/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-c-sdkutils/default.nix rename to pkgs/unit/aw/aws-c-sdkutils/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/unit/aw/aws-checksums/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-checksums/default.nix rename to pkgs/unit/aw/aws-checksums/pkg-fun.nix diff --git a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/unit/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch similarity index 100% rename from pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch rename to pkgs/unit/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/unit/aw/aws-crt-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/aws-crt-cpp/default.nix rename to pkgs/unit/aw/aws-crt-cpp/pkg-fun.nix diff --git a/pkgs/tools/admin/aws-env/deps.nix b/pkgs/unit/aw/aws-env/deps.nix similarity index 100% rename from pkgs/tools/admin/aws-env/deps.nix rename to pkgs/unit/aw/aws-env/deps.nix diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/unit/aw/aws-env/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-env/default.nix rename to pkgs/unit/aw/aws-env/pkg-fun.nix diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/unit/aw/aws-iam-authenticator/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/aws-iam-authenticator/default.nix rename to pkgs/unit/aw/aws-iam-authenticator/pkg-fun.nix diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/unit/aw/aws-lambda-rie/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix rename to pkgs/unit/aw/aws-lambda-rie/pkg-fun.nix diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/unit/aw/aws-nuke/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-nuke/default.nix rename to pkgs/unit/aw/aws-nuke/pkg-fun.nix diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/unit/aw/aws-rotate-key/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-rotate-key/default.nix rename to pkgs/unit/aw/aws-rotate-key/pkg-fun.nix diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/unit/aw/aws-sam-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/aws-sam-cli/default.nix rename to pkgs/unit/aw/aws-sam-cli/pkg-fun.nix diff --git a/pkgs/development/tools/aws-sam-cli/support-click-8-1.patch b/pkgs/unit/aw/aws-sam-cli/support-click-8-1.patch similarity index 100% rename from pkgs/development/tools/aws-sam-cli/support-click-8-1.patch rename to pkgs/unit/aw/aws-sam-cli/support-click-8-1.patch diff --git a/pkgs/development/tools/aws-sam-cli/use_forward_compatible_log_silencing.patch b/pkgs/unit/aw/aws-sam-cli/use_forward_compatible_log_silencing.patch similarity index 100% rename from pkgs/development/tools/aws-sam-cli/use_forward_compatible_log_silencing.patch rename to pkgs/unit/aw/aws-sam-cli/use_forward_compatible_log_silencing.patch diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/unit/aw/aws-sso-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-sso-cli/default.nix rename to pkgs/unit/aw/aws-sso-cli/pkg-fun.nix diff --git a/pkgs/tools/admin/aws-sso-creds/default.nix b/pkgs/unit/aw/aws-sso-creds/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-sso-creds/default.nix rename to pkgs/unit/aw/aws-sso-creds/pkg-fun.nix diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/unit/aw/aws-vault/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/aws-vault/default.nix rename to pkgs/unit/aw/aws-vault/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/unit/aw/aws-workspaces/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/aws-workspaces/default.nix rename to pkgs/unit/aw/aws-workspaces/pkg-fun.nix diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/unit/aw/aws_mturk_clt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/aws-mturk-clt/default.nix rename to pkgs/unit/aw/aws_mturk_clt/pkg-fun.nix diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/unit/aw/awscli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awscli/default.nix rename to pkgs/unit/aw/awscli/pkg-fun.nix diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/unit/aw/awscli2/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awscli2/default.nix rename to pkgs/unit/aw/awscli2/pkg-fun.nix diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/unit/aw/awsebcli/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/awsebcli/default.nix rename to pkgs/unit/aw/awsebcli/pkg-fun.nix diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/unit/aw/awslimitchecker/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awslimitchecker/default.nix rename to pkgs/unit/aw/awslimitchecker/pkg-fun.nix diff --git a/pkgs/tools/admin/awslimitchecker/version.patch b/pkgs/unit/aw/awslimitchecker/version.patch similarity index 100% rename from pkgs/tools/admin/awslimitchecker/version.patch rename to pkgs/unit/aw/awslimitchecker/version.patch diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/unit/aw/awslogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awslogs/default.nix rename to pkgs/unit/aw/awslogs/pkg-fun.nix diff --git a/pkgs/tools/admin/awsls/default.nix b/pkgs/unit/aw/awsls/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awsls/default.nix rename to pkgs/unit/aw/awsls/pkg-fun.nix diff --git a/pkgs/tools/admin/awsrm/default.nix b/pkgs/unit/aw/awsrm/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awsrm/default.nix rename to pkgs/unit/aw/awsrm/pkg-fun.nix diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/unit/aw/awstats/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/awstats/default.nix rename to pkgs/unit/aw/awstats/pkg-fun.nix diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/unit/aw/awsweeper/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/awsweeper/default.nix rename to pkgs/unit/aw/awsweeper/pkg-fun.nix diff --git a/pkgs/applications/radio/ax25-apps/default.nix b/pkgs/unit/ax/ax25-apps/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/ax25-apps/default.nix rename to pkgs/unit/ax/ax25-apps/pkg-fun.nix diff --git a/pkgs/applications/radio/ax25-tools/default.nix b/pkgs/unit/ax/ax25-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/ax25-tools/default.nix rename to pkgs/unit/ax/ax25-tools/pkg-fun.nix diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/unit/ax/axis2/builder.sh similarity index 100% rename from pkgs/servers/http/tomcat/axis2/builder.sh rename to pkgs/unit/ax/axis2/builder.sh diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/unit/ax/axis2/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/tomcat/axis2/default.nix rename to pkgs/unit/ax/axis2/pkg-fun.nix diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/unit/ay/ayatana-ido/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ayatana-ido/default.nix rename to pkgs/unit/ay/ayatana-ido/pkg-fun.nix diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/unit/ay/ayu-theme-gtk/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/ayu-theme-gtk/default.nix rename to pkgs/unit/ay/ayu-theme-gtk/pkg-fun.nix diff --git a/pkgs/games/azimuth/default.nix b/pkgs/unit/az/azimuth/pkg-fun.nix similarity index 100% rename from pkgs/games/azimuth/default.nix rename to pkgs/unit/az/azimuth/pkg-fun.nix diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/unit/az/azpainter/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/azpainter/default.nix rename to pkgs/unit/az/azpainter/pkg-fun.nix diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/unit/az/azure-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/azure-cli/default.nix rename to pkgs/unit/az/azure-cli/pkg-fun.nix diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/unit/az/azure-cli/python-packages.nix similarity index 100% rename from pkgs/tools/admin/azure-cli/python-packages.nix rename to pkgs/unit/az/azure-cli/python-packages.nix diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/unit/az/azure-functions-core-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/azure-functions-core-tools/default.nix rename to pkgs/unit/az/azure-functions-core-tools/pkg-fun.nix diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/unit/az/azure-static-sites-client/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/default.nix rename to pkgs/unit/az/azure-static-sites-client/pkg-fun.nix diff --git a/pkgs/development/tools/azure-static-sites-client/update.sh b/pkgs/unit/az/azure-static-sites-client/update.sh similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/update.sh rename to pkgs/unit/az/azure-static-sites-client/update.sh diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/unit/az/azure-static-sites-client/versions.json similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/versions.json rename to pkgs/unit/az/azure-static-sites-client/versions.json diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/unit/az/azure-storage-azcopy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/azcopy/default.nix rename to pkgs/unit/az/azure-storage-azcopy/pkg-fun.nix diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/unit/az/azuredatastudio/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/azuredatastudio/default.nix rename to pkgs/unit/az/azuredatastudio/pkg-fun.nix diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/unit/b3/b3sum/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/b3sum/default.nix rename to pkgs/unit/b3/b3sum/pkg-fun.nix diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/unit/b4/b4/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/b4/default.nix rename to pkgs/unit/b4/b4/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/pkgs/unit/b4/b43FirmwareCutter/no-root-install.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch rename to pkgs/unit/b4/b43FirmwareCutter/no-root-install.patch diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/unit/b4/b43FirmwareCutter/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix rename to pkgs/unit/b4/b43FirmwareCutter/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/unit/b4/b43Firmware_5_1_138/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix rename to pkgs/unit/b4/b43Firmware_5_1_138/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/unit/b4/b43Firmware_6_30_163_46/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix rename to pkgs/unit/b4/b43Firmware_6_30_163_46/pkg-fun.nix diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/unit/b6/b612/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/b612/default.nix rename to pkgs/unit/b6/b612/pkg-fun.nix diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/unit/ba/babashka/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/clojure/babashka.nix rename to pkgs/unit/ba/babashka/pkg-fun.nix diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/unit/ba/babeld/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/babeld/default.nix rename to pkgs/unit/ba/babeld/pkg-fun.nix diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/unit/ba/babelfish/pkg-fun.nix similarity index 100% rename from pkgs/shells/fish/babelfish.nix rename to pkgs/unit/ba/babelfish/pkg-fun.nix diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/unit/ba/babelstone-han/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/babelstone-han/default.nix rename to pkgs/unit/ba/babelstone-han/pkg-fun.nix diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/unit/ba/babeltrace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/babeltrace/default.nix rename to pkgs/unit/ba/babeltrace/pkg-fun.nix diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/unit/ba/babl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/babl/default.nix rename to pkgs/unit/ba/babl/pkg-fun.nix diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/unit/ba/backblaze-b2/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/backblaze-b2/default.nix rename to pkgs/unit/ba/backblaze-b2/pkg-fun.nix diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/unit/ba/backintime-common/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sync/backintime/common.nix rename to pkgs/unit/ba/backintime-common/pkg-fun.nix diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/unit/ba/backward-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/backward-cpp/default.nix rename to pkgs/unit/ba/backward-cpp/pkg-fun.nix diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/unit/ba/bacnet-stack/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bacnet-stack/default.nix rename to pkgs/unit/ba/bacnet-stack/pkg-fun.nix diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/unit/ba/bada-bib/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/bada-bib/default.nix rename to pkgs/unit/ba/bada-bib/pkg-fun.nix diff --git a/pkgs/tools/security/badrobot/default.nix b/pkgs/unit/ba/badrobot/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/badrobot/default.nix rename to pkgs/unit/ba/badrobot/pkg-fun.nix diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/unit/ba/badvpn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/badvpn/default.nix rename to pkgs/unit/ba/badvpn/pkg-fun.nix diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/unit/ba/baekmuk-ttf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/baekmuk-ttf/default.nix rename to pkgs/unit/ba/baekmuk-ttf/pkg-fun.nix diff --git a/pkgs/servers/web-apps/baget/deps.nix b/pkgs/unit/ba/baget/deps.nix similarity index 100% rename from pkgs/servers/web-apps/baget/deps.nix rename to pkgs/unit/ba/baget/deps.nix diff --git a/pkgs/servers/web-apps/baget/default.nix b/pkgs/unit/ba/baget/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/baget/default.nix rename to pkgs/unit/ba/baget/pkg-fun.nix diff --git a/pkgs/servers/web-apps/baget/updater.sh b/pkgs/unit/ba/baget/updater.sh similarity index 100% rename from pkgs/servers/web-apps/baget/updater.sh rename to pkgs/unit/ba/baget/updater.sh diff --git a/pkgs/tools/backup/bakelite/default.nix b/pkgs/unit/ba/bakelite/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/bakelite/default.nix rename to pkgs/unit/ba/bakelite/pkg-fun.nix diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/unit/ba/bakoma_ttf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/bakoma-ttf/default.nix rename to pkgs/unit/ba/bakoma_ttf/pkg-fun.nix diff --git a/pkgs/games/ballerburg/default.nix b/pkgs/unit/ba/ballerburg/pkg-fun.nix similarity index 100% rename from pkgs/games/ballerburg/default.nix rename to pkgs/unit/ba/ballerburg/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/unit/ba/balsa/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/balsa/default.nix rename to pkgs/unit/ba/balsa/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/unit/ba/bam/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bam/default.nix rename to pkgs/unit/ba/bam/pkg-fun.nix diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/unit/ba/bamf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bamf/default.nix rename to pkgs/unit/ba/bamf/pkg-fun.nix diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/unit/ba/banana-accounting/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/banana-accounting/default.nix rename to pkgs/unit/ba/banana-accounting/pkg-fun.nix diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/unit/ba/bandwidth/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bandwidth/default.nix rename to pkgs/unit/ba/bandwidth/pkg-fun.nix diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/unit/ba/banking/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/banking/default.nix rename to pkgs/unit/ba/banking/pkg-fun.nix diff --git a/pkgs/games/banner/default.nix b/pkgs/unit/ba/banner/pkg-fun.nix similarity index 100% rename from pkgs/games/banner/default.nix rename to pkgs/unit/ba/banner/pkg-fun.nix diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/unit/ba/bao/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bao/default.nix rename to pkgs/unit/ba/bao/pkg-fun.nix diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/unit/ba/bar/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/bar/default.nix rename to pkgs/unit/ba/bar/pkg-fun.nix diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/unit/ba/barcode/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/barcode/default.nix rename to pkgs/unit/ba/barcode/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/unit/ba/baresip/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/baresip/default.nix rename to pkgs/unit/ba/baresip/pkg-fun.nix diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/unit/ba/barlow/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/barlow/default.nix rename to pkgs/unit/ba/barlow/pkg-fun.nix diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/unit/ba/barman/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/barman/default.nix rename to pkgs/unit/ba/barman/pkg-fun.nix diff --git a/pkgs/tools/misc/barman/unwrap-subprocess.patch b/pkgs/unit/ba/barman/unwrap-subprocess.patch similarity index 100% rename from pkgs/tools/misc/barman/unwrap-subprocess.patch rename to pkgs/unit/ba/barman/unwrap-subprocess.patch diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/unit/ba/barrage/pkg-fun.nix similarity index 100% rename from pkgs/games/lgames/barrage/default.nix rename to pkgs/unit/ba/barrage/pkg-fun.nix diff --git a/pkgs/tools/misc/bartib/default.nix b/pkgs/unit/ba/bartib/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bartib/default.nix rename to pkgs/unit/ba/bartib/pkg-fun.nix diff --git a/pkgs/misc/base16-shell-preview/default.nix b/pkgs/unit/ba/base16-shell-preview/pkg-fun.nix similarity index 100% rename from pkgs/misc/base16-shell-preview/default.nix rename to pkgs/unit/ba/base16-shell-preview/pkg-fun.nix diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/unit/ba/base16-universal-manager/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/base16-universal-manager/default.nix rename to pkgs/unit/ba/base16-universal-manager/pkg-fun.nix diff --git a/pkgs/servers/baserow/default.nix b/pkgs/unit/ba/baserow/pkg-fun.nix similarity index 100% rename from pkgs/servers/baserow/default.nix rename to pkgs/unit/ba/baserow/pkg-fun.nix diff --git a/pkgs/tools/text/xml/basex/basex.svg b/pkgs/unit/ba/basex/basex.svg similarity index 100% rename from pkgs/tools/text/xml/basex/basex.svg rename to pkgs/unit/ba/basex/basex.svg diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/unit/ba/basex/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/basex/default.nix rename to pkgs/unit/ba/basex/pkg-fun.nix diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/unit/ba/bash-completion/pkg-fun.nix similarity index 100% rename from pkgs/shells/bash/bash-completion/default.nix rename to pkgs/unit/ba/bash-completion/pkg-fun.nix diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/unit/ba/bash-my-aws/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/bash-my-aws/default.nix rename to pkgs/unit/ba/bash-my-aws/pkg-fun.nix diff --git a/pkgs/development/libraries/bash/bash-preexec/default.nix b/pkgs/unit/ba/bash-preexec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bash/bash-preexec/default.nix rename to pkgs/unit/ba/bash-preexec/pkg-fun.nix diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/unit/ba/bash-supergenpass/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bash-supergenpass/default.nix rename to pkgs/unit/ba/bash-supergenpass/pkg-fun.nix diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/unit/ba/bashSnippets/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bashSnippets/default.nix rename to pkgs/unit/ba/bashSnippets/pkg-fun.nix diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/unit/ba/bash_unit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bash_unit/default.nix rename to pkgs/unit/ba/bash_unit/pkg-fun.nix diff --git a/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch b/pkgs/unit/ba/bashblog/0001-Setting-markdown_bin.patch similarity index 100% rename from pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch rename to pkgs/unit/ba/bashblog/0001-Setting-markdown_bin.patch diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/unit/ba/bashblog/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/bashblog/default.nix rename to pkgs/unit/ba/bashblog/pkg-fun.nix diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/unit/ba/bashcards/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bashcards/default.nix rename to pkgs/unit/ba/bashcards/pkg-fun.nix diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/unit/ba/bashdb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/bashdb/default.nix rename to pkgs/unit/ba/bashdb/pkg-fun.nix diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/unit/ba/bashmount/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/bashmount/default.nix rename to pkgs/unit/ba/bashmount/pkg-fun.nix diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/unit/ba/bashplotlib/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bashplotlib/default.nix rename to pkgs/unit/ba/bashplotlib/pkg-fun.nix diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/unit/ba/basiliskii/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/basiliskii/default.nix rename to pkgs/unit/ba/basiliskii/pkg-fun.nix diff --git a/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch b/pkgs/unit/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch similarity index 100% rename from pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch rename to pkgs/unit/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch diff --git a/pkgs/games/bastet/default.nix b/pkgs/unit/ba/bastet/pkg-fun.nix similarity index 100% rename from pkgs/games/bastet/default.nix rename to pkgs/unit/ba/bastet/pkg-fun.nix diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/unit/ba/batik/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/batik/default.nix rename to pkgs/unit/ba/batik/pkg-fun.nix diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/unit/ba/bats/libraries.nix similarity index 100% rename from pkgs/development/interpreters/bats/libraries.nix rename to pkgs/unit/ba/bats/libraries.nix diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/unit/ba/bats/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/bats/default.nix rename to pkgs/unit/ba/bats/pkg-fun.nix diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/unit/ba/batsignal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/batsignal/default.nix rename to pkgs/unit/ba/batsignal/pkg-fun.nix diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/unit/ba/baudline/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/baudline/default.nix rename to pkgs/unit/ba/baudline/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/unit/ba/bayescan/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bayescan/default.nix rename to pkgs/unit/ba/bayescan/pkg-fun.nix diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/unit/ba/bazarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/bazarr/default.nix rename to pkgs/unit/ba/bazarr/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/unit/ba/bazel-buildtools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bazel/buildtools/default.nix rename to pkgs/unit/ba/bazel-buildtools/pkg-fun.nix diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/unit/ba/bazel-gazelle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bazel-gazelle/default.nix rename to pkgs/unit/ba/bazel-gazelle/pkg-fun.nix diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/unit/ba/bazel-kazel/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bazel-kazel/default.nix rename to pkgs/unit/ba/bazel-kazel/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch b/pkgs/unit/ba/bazel-remote/disable_build_file_generation.patch similarity index 100% rename from pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch rename to pkgs/unit/ba/bazel-remote/disable_build_file_generation.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/unit/ba/bazel-remote/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix rename to pkgs/unit/ba/bazel-remote/pkg-fun.nix diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/unit/ba/bazelisk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bazelisk/default.nix rename to pkgs/unit/ba/bazelisk/pkg-fun.nix diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/unit/bb/bb/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bb/default.nix rename to pkgs/unit/bb/bb/pkg-fun.nix diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/unit/bb/bbe/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bbe/default.nix rename to pkgs/unit/bb/bbe/pkg-fun.nix diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/unit/bb/bbin/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bbin/default.nix rename to pkgs/unit/bb/bbin/pkg-fun.nix diff --git a/pkgs/development/libraries/bc-decaf/default.nix b/pkgs/unit/bc/bc-decaf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bc-decaf/default.nix rename to pkgs/unit/bc/bc-decaf/pkg-fun.nix diff --git a/pkgs/development/libraries/soci/bc-soci.nix b/pkgs/unit/bc/bc-soci/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/soci/bc-soci.nix rename to pkgs/unit/bc/bc-soci/pkg-fun.nix diff --git a/pkgs/tools/misc/bc/cross-bc.patch b/pkgs/unit/bc/bc/cross-bc.patch similarity index 100% rename from pkgs/tools/misc/bc/cross-bc.patch rename to pkgs/unit/bc/bc/cross-bc.patch diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/unit/bc/bc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bc/default.nix rename to pkgs/unit/bc/bc/pkg-fun.nix diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/pkgs/unit/bc/bcache-tools/bcache-udev-modern.patch similarity index 100% rename from pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch rename to pkgs/unit/bc/bcache-tools/bcache-udev-modern.patch diff --git a/pkgs/tools/filesystems/bcache-tools/fix-static.patch b/pkgs/unit/bc/bcache-tools/fix-static.patch similarity index 100% rename from pkgs/tools/filesystems/bcache-tools/fix-static.patch rename to pkgs/unit/bc/bcache-tools/fix-static.patch diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/unit/bc/bcache-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/bcache-tools/default.nix rename to pkgs/unit/bc/bcache-tools/pkg-fun.nix diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/unit/bc/bcachefs-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/bcachefs-tools/default.nix rename to pkgs/unit/bc/bcachefs-tools/pkg-fun.nix diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/unit/bc/bcal/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/bcal/default.nix rename to pkgs/unit/bc/bcal/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/unit/bc/bcftools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bcftools/default.nix rename to pkgs/unit/bc/bcftools/pkg-fun.nix diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/unit/bc/bcg729/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bcg729/default.nix rename to pkgs/unit/bc/bcg729/pkg-fun.nix diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/unit/bc/bchoppr/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bchoppr/default.nix rename to pkgs/unit/bc/bchoppr/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/unit/bc/bchunk/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/bchunk/default.nix rename to pkgs/unit/bc/bchunk/pkg-fun.nix diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/unit/bc/bctoolbox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bctoolbox/default.nix rename to pkgs/unit/bc/bctoolbox/pkg-fun.nix diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/unit/bc/bcunit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bcunit/default.nix rename to pkgs/unit/bc/bcunit/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/unit/bd/bdep/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/build2/bdep.nix rename to pkgs/unit/bd/bdep/pkg-fun.nix diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/unit/bd/bdf2psf/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bdf2psf/default.nix rename to pkgs/unit/bd/bdf2psf/pkg-fun.nix diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/unit/bd/bdf2sfd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bdf2sfd/default.nix rename to pkgs/unit/bd/bdf2sfd/pkg-fun.nix diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/unit/bd/bdfresize/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bdfresize/default.nix rename to pkgs/unit/bd/bdfresize/pkg-fun.nix diff --git a/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/pkgs/unit/bd/bdfresize/remove-malloc-declaration.patch similarity index 100% rename from pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch rename to pkgs/unit/bd/bdfresize/remove-malloc-declaration.patch diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/unit/bd/bdsync/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/bdsync/default.nix rename to pkgs/unit/bd/bdsync/pkg-fun.nix diff --git a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch b/pkgs/unit/be/BeatSaberModManager/add-runtime-identifier.patch similarity index 100% rename from pkgs/games/BeatSaberModManager/add-runtime-identifier.patch rename to pkgs/unit/be/BeatSaberModManager/add-runtime-identifier.patch diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/unit/be/BeatSaberModManager/deps.nix similarity index 100% rename from pkgs/games/BeatSaberModManager/deps.nix rename to pkgs/unit/be/BeatSaberModManager/deps.nix diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/unit/be/BeatSaberModManager/pkg-fun.nix similarity index 100% rename from pkgs/games/BeatSaberModManager/default.nix rename to pkgs/unit/be/BeatSaberModManager/pkg-fun.nix diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/unit/be/bean-add/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/beancount/bean-add.nix rename to pkgs/unit/be/bean-add/pkg-fun.nix diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/unit/be/beancount-ing-diba/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/beancount/beancount-ing-diba.nix rename to pkgs/unit/be/beancount-ing-diba/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/unit/be/beancount-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/beancount-language-server/default.nix rename to pkgs/unit/be/beancount-language-server/pkg-fun.nix diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/unit/be/beanstalkd/pkg-fun.nix similarity index 100% rename from pkgs/servers/beanstalkd/default.nix rename to pkgs/unit/be/beanstalkd/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/unit/be/bear/no-double-relative.patch similarity index 100% rename from pkgs/development/tools/build-managers/bear/no-double-relative.patch rename to pkgs/unit/be/bear/no-double-relative.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/unit/be/bear/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bear/default.nix rename to pkgs/unit/be/bear/pkg-fun.nix diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/unit/be/bearssl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bearssl/default.nix rename to pkgs/unit/be/bearssl/pkg-fun.nix diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/unit/be/beats/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/beats/default.nix rename to pkgs/unit/be/beats/pkg-fun.nix diff --git a/pkgs/development/tools/beautysh/default.nix b/pkgs/unit/be/beautysh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/beautysh/default.nix rename to pkgs/unit/be/beautysh/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bedops/default.nix b/pkgs/unit/be/bedops/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bedops/default.nix rename to pkgs/unit/be/bedops/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/unit/be/bedtools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bedtools/default.nix rename to pkgs/unit/be/bedtools/pkg-fun.nix diff --git a/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch b/pkgs/unit/be/bee-clef/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch similarity index 100% rename from pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch rename to pkgs/unit/be/bee-clef/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch diff --git a/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch b/pkgs/unit/be/bee-clef/0002-nix-diff-for-substituteAll.patch similarity index 100% rename from pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch rename to pkgs/unit/be/bee-clef/0002-nix-diff-for-substituteAll.patch diff --git a/pkgs/applications/networking/bee/ensure-clef-account b/pkgs/unit/be/bee-clef/ensure-clef-account similarity index 100% rename from pkgs/applications/networking/bee/ensure-clef-account rename to pkgs/unit/be/bee-clef/ensure-clef-account diff --git a/pkgs/applications/networking/bee/bee-clef.nix b/pkgs/unit/be/bee-clef/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/bee/bee-clef.nix rename to pkgs/unit/be/bee-clef/pkg-fun.nix diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/unit/be/beecrypt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/beecrypt/default.nix rename to pkgs/unit/be/beecrypt/pkg-fun.nix diff --git a/pkgs/os-specific/linux/beefi/default.nix b/pkgs/unit/be/beefi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/beefi/default.nix rename to pkgs/unit/be/beefi/pkg-fun.nix diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/unit/be/beekeeper-studio/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/beekeeper-studio/default.nix rename to pkgs/unit/be/beekeeper-studio/pkg-fun.nix diff --git a/pkgs/misc/beep/default.nix b/pkgs/unit/be/beep/pkg-fun.nix similarity index 100% rename from pkgs/misc/beep/default.nix rename to pkgs/unit/be/beep/pkg-fun.nix diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/unit/be/bees/bees-service-wrapper similarity index 100% rename from pkgs/tools/filesystems/bees/bees-service-wrapper rename to pkgs/unit/be/bees/bees-service-wrapper diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/unit/be/bees/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/bees/default.nix rename to pkgs/unit/be/bees/pkg-fun.nix diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/unit/be/behdad-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/behdad-fonts/default.nix rename to pkgs/unit/be/behdad-fonts/pkg-fun.nix diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/unit/be/belcard/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/belcard/default.nix rename to pkgs/unit/be/belcard/pkg-fun.nix diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/unit/be/belle-sip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/belle-sip/default.nix rename to pkgs/unit/be/belle-sip/pkg-fun.nix diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/unit/be/below/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/below/default.nix rename to pkgs/unit/be/below/pkg-fun.nix diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/unit/be/belr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/belr/default.nix rename to pkgs/unit/be/belr/pkg-fun.nix diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/unit/be/beluga/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/beluga/default.nix rename to pkgs/unit/be/beluga/pkg-fun.nix diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/unit/be/bemenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bemenu/default.nix rename to pkgs/unit/be/bemenu/pkg-fun.nix diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/unit/be/bencodetools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bencodetools/default.nix rename to pkgs/unit/be/bencodetools/pkg-fun.nix diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/unit/be/benthos/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/benthos/default.nix rename to pkgs/unit/be/benthos/pkg-fun.nix diff --git a/pkgs/tools/video/bento4/libap4.patch b/pkgs/unit/be/bento4/libap4.patch similarity index 100% rename from pkgs/tools/video/bento4/libap4.patch rename to pkgs/unit/be/bento4/libap4.patch diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/unit/be/bento4/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/bento4/default.nix rename to pkgs/unit/be/bento4/pkg-fun.nix diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/unit/be/bepasty/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bepasty/default.nix rename to pkgs/unit/be/bepasty/pkg-fun.nix diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/unit/be/ber_metaocaml/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ocaml/ber-metaocaml.nix rename to pkgs/unit/be/ber_metaocaml/pkg-fun.nix diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/unit/be/berglas/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/berglas/default.nix rename to pkgs/unit/be/berglas/pkg-fun.nix diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/unit/be/berry/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/berry/default.nix rename to pkgs/unit/be/berry/pkg-fun.nix diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/unit/be/besu/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/besu/default.nix rename to pkgs/unit/be/besu/pkg-fun.nix diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/unit/be/betaflight-configurator/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/robotics/betaflight-configurator/default.nix rename to pkgs/unit/be/betaflight-configurator/pkg-fun.nix diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/unit/be/bettercap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bettercap/default.nix rename to pkgs/unit/be/bettercap/pkg-fun.nix diff --git a/pkgs/tools/misc/betterdiscord-installer/default.nix b/pkgs/unit/be/betterdiscord-installer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/betterdiscord-installer/default.nix rename to pkgs/unit/be/betterdiscord-installer/pkg-fun.nix diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/unit/be/betterdiscordctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/betterdiscordctl/default.nix rename to pkgs/unit/be/betterdiscordctl/pkg-fun.nix diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/unit/be/betterlockscreen/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/betterlockscreen/default.nix rename to pkgs/unit/be/betterlockscreen/pkg-fun.nix diff --git a/pkgs/tools/X11/bevelbar/default.nix b/pkgs/unit/be/bevelbar/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/bevelbar/default.nix rename to pkgs/unit/be/bevelbar/pkg-fun.nix diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/unit/be/beyond-identity/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/beyond-identity/default.nix rename to pkgs/unit/be/beyond-identity/pkg-fun.nix diff --git a/pkgs/tools/misc/bfetch/default.nix b/pkgs/unit/bf/bfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bfetch/default.nix rename to pkgs/unit/bf/bfetch/pkg-fun.nix diff --git a/pkgs/applications/version-management/bfg-repo-cleaner/default.nix b/pkgs/unit/bf/bfg-repo-cleaner/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/bfg-repo-cleaner/default.nix rename to pkgs/unit/bf/bfg-repo-cleaner/pkg-fun.nix diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/unit/bf/bfr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bfr/default.nix rename to pkgs/unit/bf/bfr/pkg-fun.nix diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/unit/bf/bfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/bfs/default.nix rename to pkgs/unit/bf/bfs/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/unit/bf/bftools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bftools/default.nix rename to pkgs/unit/bf/bftools/pkg-fun.nix diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/unit/bf/bftpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/ftp/bftpd/default.nix rename to pkgs/unit/bf/bftpd/pkg-fun.nix diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/unit/bg/bgnet/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/bgnet/default.nix rename to pkgs/unit/bg/bgnet/pkg-fun.nix diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/unit/bg/bgpdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bgpdump/default.nix rename to pkgs/unit/bg/bgpdump/pkg-fun.nix diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/unit/bg/bgpq3/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bgpq3/default.nix rename to pkgs/unit/bg/bgpq3/pkg-fun.nix diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/unit/bg/bgpq4/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bgpq4/default.nix rename to pkgs/unit/bg/bgpq4/pkg-fun.nix diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/unit/bg/bgs/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/bgs/default.nix rename to pkgs/unit/bg/bgs/pkg-fun.nix diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/unit/bi/bibata-cursors-translucent/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/bibata-cursors/translucent.nix rename to pkgs/unit/bi/bibata-cursors-translucent/pkg-fun.nix diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/unit/bi/bibata-extra-cursors/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/bibata-cursors/extra.nix rename to pkgs/unit/bi/bibata-extra-cursors/pkg-fun.nix diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/unit/bi/bibclean/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/bibclean/default.nix rename to pkgs/unit/bi/bibclean/pkg-fun.nix diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/unit/bi/biber/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/biber/default.nix rename to pkgs/unit/bi/biber/pkg-fun.nix diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/unit/bi/biblatex-check/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/biblatex-check/default.nix rename to pkgs/unit/bi/biblatex-check/pkg-fun.nix diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/unit/bi/biblesync/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/biblesync/default.nix rename to pkgs/unit/bi/biblesync/pkg-fun.nix diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/pkgs/unit/bi/biboumi/catch.patch similarity index 100% rename from pkgs/servers/xmpp/biboumi/catch.patch rename to pkgs/unit/bi/biboumi/catch.patch diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/unit/bi/biboumi/pkg-fun.nix similarity index 100% rename from pkgs/servers/xmpp/biboumi/default.nix rename to pkgs/unit/bi/biboumi/pkg-fun.nix diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/unit/bi/bibtex2html/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bibtex2html/default.nix rename to pkgs/unit/bi/bibtex2html/pkg-fun.nix diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/unit/bi/bibtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bibtool/default.nix rename to pkgs/unit/bi/bibtool/pkg-fun.nix diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/unit/bi/bibutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bibutils/default.nix rename to pkgs/unit/bi/bibutils/pkg-fun.nix diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/unit/bi/bic/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/bic/default.nix rename to pkgs/unit/bi/bic/pkg-fun.nix diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/unit/bi/bicon/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bicon/default.nix rename to pkgs/unit/bi/bicon/pkg-fun.nix diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/unit/bi/bicpl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/biology/bicpl/default.nix rename to pkgs/unit/bi/bicpl/pkg-fun.nix diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/unit/bi/bigloo/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/bigloo/default.nix rename to pkgs/unit/bi/bigloo/pkg-fun.nix diff --git a/pkgs/tools/security/binbloom/default.nix b/pkgs/unit/bi/binbloom/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/binbloom/default.nix rename to pkgs/unit/bi/binbloom/pkg-fun.nix diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/unit/bi/bind/dont-keep-configure-flags.patch similarity index 100% rename from pkgs/servers/dns/bind/dont-keep-configure-flags.patch rename to pkgs/unit/bi/bind/dont-keep-configure-flags.patch diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/unit/bi/bind/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/bind/default.nix rename to pkgs/unit/bi/bind/pkg-fun.nix diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/unit/bi/bindfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/bindfs/default.nix rename to pkgs/unit/bi/bindfs/pkg-fun.nix diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/unit/bi/bingo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bingo/default.nix rename to pkgs/unit/bi/bingo/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/unit/bi/bingrep/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/bingrep/default.nix rename to pkgs/unit/bi/bingrep/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/unit/bi/binlore/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/binlore/default.nix rename to pkgs/unit/bi/binlore/pkg-fun.nix diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/unit/bi/biodiff/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/biodiff/default.nix rename to pkgs/unit/bi/biodiff/pkg-fun.nix diff --git a/pkgs/tools/networking/biosdevname/makefile.patch b/pkgs/unit/bi/biosdevname/makefile.patch similarity index 100% rename from pkgs/tools/networking/biosdevname/makefile.patch rename to pkgs/unit/bi/biosdevname/makefile.patch diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/unit/bi/biosdevname/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/biosdevname/default.nix rename to pkgs/unit/bi/biosdevname/pkg-fun.nix diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/unit/bi/bird-lg/pkg-fun.nix similarity index 100% rename from pkgs/servers/bird-lg/default.nix rename to pkgs/unit/bi/bird-lg/pkg-fun.nix diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/unit/bi/bird/dont-create-sysconfdir-2.patch similarity index 100% rename from pkgs/servers/bird/dont-create-sysconfdir-2.patch rename to pkgs/unit/bi/bird/dont-create-sysconfdir-2.patch diff --git a/pkgs/servers/bird/default.nix b/pkgs/unit/bi/bird/pkg-fun.nix similarity index 100% rename from pkgs/servers/bird/default.nix rename to pkgs/unit/bi/bird/pkg-fun.nix diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/unit/bi/birdfont/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/birdfont/default.nix rename to pkgs/unit/bi/birdfont/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/unit/bi/bison/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/bison/default.nix rename to pkgs/unit/bi/bison/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/unit/bi/bisoncpp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/bisonc++/default.nix rename to pkgs/unit/bi/bisoncpp/pkg-fun.nix diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/unit/bi/bisq-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/bisq-desktop/default.nix rename to pkgs/unit/bi/bisq-desktop/pkg-fun.nix diff --git a/pkgs/applications/blockchains/bisq-desktop/update.sh b/pkgs/unit/bi/bisq-desktop/update.sh similarity index 100% rename from pkgs/applications/blockchains/bisq-desktop/update.sh rename to pkgs/unit/bi/bisq-desktop/update.sh diff --git a/pkgs/applications/version-management/bit/default.nix b/pkgs/unit/bi/bit/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/bit/default.nix rename to pkgs/unit/bi/bit/pkg-fun.nix diff --git a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile b/pkgs/unit/bi/bitbucket-server-cli/Gemfile similarity index 100% rename from pkgs/applications/version-management/bitbucket-server-cli/Gemfile rename to pkgs/unit/bi/bitbucket-server-cli/Gemfile diff --git a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock b/pkgs/unit/bi/bitbucket-server-cli/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock rename to pkgs/unit/bi/bitbucket-server-cli/Gemfile.lock diff --git a/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix b/pkgs/unit/bi/bitbucket-server-cli/gemset.nix similarity index 100% rename from pkgs/applications/version-management/bitbucket-server-cli/gemset.nix rename to pkgs/unit/bi/bitbucket-server-cli/gemset.nix diff --git a/pkgs/applications/version-management/bitbucket-server-cli/default.nix b/pkgs/unit/bi/bitbucket-server-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/bitbucket-server-cli/default.nix rename to pkgs/unit/bi/bitbucket-server-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/unit/bi/bitlbee-discord/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix rename to pkgs/unit/bi/bitlbee-discord/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/unit/bi/bitlbee-facebook/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix rename to pkgs/unit/bi/bitlbee-facebook/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/unit/bi/bitlbee-mastodon/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix rename to pkgs/unit/bi/bitlbee-mastodon/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/unit/bi/bitlbee-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix rename to pkgs/unit/bi/bitlbee-plugins/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/unit/bi/bitlbee-steam/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix rename to pkgs/unit/bi/bitlbee-steam/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/unit/bi/bitlbee/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bitlbee/default.nix rename to pkgs/unit/bi/bitlbee/pkg-fun.nix diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/unit/bi/bitmeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bitmeter/default.nix rename to pkgs/unit/bi/bitmeter/pkg-fun.nix diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/unit/bi/bitwarden/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bitwarden/default.nix rename to pkgs/unit/bi/bitwarden/pkg-fun.nix diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/unit/bi/bitwig-studio3/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix rename to pkgs/unit/bi/bitwig-studio3/pkg-fun.nix diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/unit/bi/bitwise/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bitwise/default.nix rename to pkgs/unit/bi/bitwise/pkg-fun.nix diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/unit/bi/bitwuzla/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/bitwuzla/default.nix rename to pkgs/unit/bi/bitwuzla/pkg-fun.nix diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/unit/bj/bjumblr/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bjumblr/default.nix rename to pkgs/unit/bj/bjumblr/pkg-fun.nix diff --git a/pkgs/applications/misc/bklk/default.nix b/pkgs/unit/bk/bklk/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bklk/default.nix rename to pkgs/unit/bk/bklk/pkg-fun.nix diff --git a/pkgs/tools/misc/bkyml/default.nix b/pkgs/unit/bk/bkyml/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bkyml/default.nix rename to pkgs/unit/bk/bkyml/pkg-fun.nix diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/unit/bl/blackbird/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/blackbird/default.nix rename to pkgs/unit/bl/blackbird/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/unit/bl/blackbox-terminal/marble.nix similarity index 100% rename from pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix rename to pkgs/unit/bl/blackbox-terminal/marble.nix diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/unit/bl/blackbox-terminal/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/blackbox-terminal/default.nix rename to pkgs/unit/bl/blackbox-terminal/pkg-fun.nix diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/unit/bl/blackbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/blackbox/default.nix rename to pkgs/unit/bl/blackbox/pkg-fun.nix diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/unit/bl/blackfire/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/blackfire/default.nix rename to pkgs/unit/bl/blackfire/pkg-fun.nix diff --git a/pkgs/development/embedded/blackmagic/helper.sh b/pkgs/unit/bl/blackmagic/helper.sh similarity index 100% rename from pkgs/development/embedded/blackmagic/helper.sh rename to pkgs/unit/bl/blackmagic/helper.sh diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/unit/bl/blackmagic/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/blackmagic/default.nix rename to pkgs/unit/bl/blackmagic/pkg-fun.nix diff --git a/pkgs/games/blackshades/default.nix b/pkgs/unit/bl/blackshades/pkg-fun.nix similarity index 100% rename from pkgs/games/blackshades/default.nix rename to pkgs/unit/bl/blackshades/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/blahtexml/default.nix b/pkgs/unit/bl/blahtexml/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/blahtexml/default.nix rename to pkgs/unit/bl/blahtexml/pkg-fun.nix diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/unit/bl/blanket/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/blanket/default.nix rename to pkgs/unit/bl/blanket/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/unit/bl/blas-reference/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/blas/default.nix rename to pkgs/unit/bl/blas-reference/pkg-fun.nix diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/unit/bl/blas/pkg-fun.nix similarity index 100% rename from pkgs/build-support/alternatives/blas/default.nix rename to pkgs/unit/bl/blas/pkg-fun.nix diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/unit/bl/blaze/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/blaze/default.nix rename to pkgs/unit/bl/blaze/pkg-fun.nix diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/unit/bl/bleachbit/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bleachbit/default.nix rename to pkgs/unit/bl/bleachbit/pkg-fun.nix diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/unit/bl/blender-with-packages/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/blender/wrapper.nix rename to pkgs/unit/bl/blender-with-packages/pkg-fun.nix diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/unit/bl/blesh/pkg-fun.nix similarity index 100% rename from pkgs/shells/bash/blesh/default.nix rename to pkgs/unit/bl/blesh/pkg-fun.nix diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/unit/bl/bless/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/bless/default.nix rename to pkgs/unit/bl/bless/pkg-fun.nix diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/unit/bl/blflash/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/blflash/default.nix rename to pkgs/unit/bl/blflash/pkg-fun.nix diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/unit/bl/blink1-tool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/blink1-tool/default.nix rename to pkgs/unit/bl/blink1-tool/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/unit/bl/blis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/blis/default.nix rename to pkgs/unit/bl/blis/pkg-fun.nix diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/unit/bl/bliss/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/bliss/default.nix rename to pkgs/unit/bl/bliss/pkg-fun.nix diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/unit/bl/blitz/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/blitz/default.nix rename to pkgs/unit/bl/blitz/pkg-fun.nix diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/unit/bl/blktrace/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/blktrace/default.nix rename to pkgs/unit/bl/blktrace/pkg-fun.nix diff --git a/pkgs/servers/bloat/default.nix b/pkgs/unit/bl/bloat/pkg-fun.nix similarity index 100% rename from pkgs/servers/bloat/default.nix rename to pkgs/unit/bl/bloat/pkg-fun.nix diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/unit/bl/bloaty/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bloaty/default.nix rename to pkgs/unit/bl/bloaty/pkg-fun.nix diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/unit/bl/blobby/blobby.sh similarity index 100% rename from pkgs/games/blobby/blobby.sh rename to pkgs/unit/bl/blobby/blobby.sh diff --git a/pkgs/games/blobby/default.nix b/pkgs/unit/bl/blobby/pkg-fun.nix similarity index 100% rename from pkgs/games/blobby/default.nix rename to pkgs/unit/bl/blobby/pkg-fun.nix diff --git a/pkgs/tools/filesystems/blobfuse/install-adls.patch b/pkgs/unit/bl/blobfuse/install-adls.patch similarity index 100% rename from pkgs/tools/filesystems/blobfuse/install-adls.patch rename to pkgs/unit/bl/blobfuse/install-adls.patch diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/unit/bl/blobfuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/blobfuse/default.nix rename to pkgs/unit/bl/blobfuse/pkg-fun.nix diff --git a/pkgs/games/blobwars/default.nix b/pkgs/unit/bl/blobwars/pkg-fun.nix similarity index 100% rename from pkgs/games/blobwars/default.nix rename to pkgs/unit/bl/blobwars/pkg-fun.nix diff --git a/pkgs/games/blockattack/default.nix b/pkgs/unit/bl/blockattack/pkg-fun.nix similarity index 100% rename from pkgs/games/blockattack/default.nix rename to pkgs/unit/bl/blockattack/pkg-fun.nix diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/unit/bl/blockbench-electron/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/blockbench-electron/default.nix rename to pkgs/unit/bl/blockbench-electron/pkg-fun.nix diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/unit/bl/blockbook/pkg-fun.nix similarity index 100% rename from pkgs/servers/blockbook/default.nix rename to pkgs/unit/bl/blockbook/pkg-fun.nix diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/unit/bl/blockhash/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/blockhash/default.nix rename to pkgs/unit/bl/blockhash/pkg-fun.nix diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/unit/bl/blocky/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/blocky/default.nix rename to pkgs/unit/bl/blocky/pkg-fun.nix diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/unit/bl/blogc/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/blogc/default.nix rename to pkgs/unit/bl/blogc/pkg-fun.nix diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/unit/bl/bloodspilot-client/pkg-fun.nix similarity index 100% rename from pkgs/games/xpilot/bloodspilot-client.nix rename to pkgs/unit/bl/bloodspilot-client/pkg-fun.nix diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/unit/bl/bloodspilot-server/pkg-fun.nix similarity index 100% rename from pkgs/games/xpilot/bloodspilot-server.nix rename to pkgs/unit/bl/bloodspilot-server/pkg-fun.nix diff --git a/pkgs/games/xpilot/server-gcc5.patch b/pkgs/unit/bl/bloodspilot-server/server-gcc5.patch similarity index 100% rename from pkgs/games/xpilot/server-gcc5.patch rename to pkgs/unit/bl/bloodspilot-server/server-gcc5.patch diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/unit/bl/bloomrpc/pkg-fun.nix similarity index 100% rename from pkgs/development/web/bloomrpc/default.nix rename to pkgs/unit/bl/bloomrpc/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/unit/bl/bloop/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bloop/default.nix rename to pkgs/unit/bl/bloop/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/unit/bl/blueberry/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/blueberry/default.nix rename to pkgs/unit/bl/blueberry/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c b/pkgs/unit/bl/bluejeans-gui/localtime64_stub.c similarity index 100% rename from pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c rename to pkgs/unit/bl/bluejeans-gui/localtime64_stub.c diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/unit/bl/bluejeans-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/bluejeans/default.nix rename to pkgs/unit/bl/bluejeans-gui/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/update.sh b/pkgs/unit/bl/bluejeans-gui/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/bluejeans/update.sh rename to pkgs/unit/bl/bluejeans-gui/update.sh diff --git a/pkgs/applications/networking/mailreaders/bluemail/default.nix b/pkgs/unit/bl/bluemail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/bluemail/default.nix rename to pkgs/unit/bl/bluemail/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/unit/bl/blueman/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/blueman/default.nix rename to pkgs/unit/bl/blueman/pkg-fun.nix diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/unit/bl/bluemix-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/bluemix-cli/default.nix rename to pkgs/unit/bl/bluemix-cli/pkg-fun.nix diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/unit/bl/blueprint-compiler/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/blueprint/default.nix rename to pkgs/unit/bl/blueprint-compiler/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/unit/bl/bluetuith/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/bluetuith/default.nix rename to pkgs/unit/bl/bluetuith/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/unit/bl/bluewalker/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/bluewalker/default.nix rename to pkgs/unit/bl/bluewalker/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/unit/bl/bluez-alsa/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/bluez-alsa/default.nix rename to pkgs/unit/bl/bluez-alsa/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/unit/bl/bluez-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/bluez-tools/default.nix rename to pkgs/unit/bl/bluez-tools/pkg-fun.nix diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/unit/bl/blugon/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/blugon/default.nix rename to pkgs/unit/bl/blugon/pkg-fun.nix diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/unit/bl/blur-effect/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/blur-effect/default.nix rename to pkgs/unit/bl/blur-effect/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch b/pkgs/unit/bm/bmake/bootstrap-fix.patch similarity index 100% rename from pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch rename to pkgs/unit/bm/bmake/bootstrap-fix.patch diff --git a/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch b/pkgs/unit/bm/bmake/fix-localtime-test.patch similarity index 100% rename from pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch rename to pkgs/unit/bm/bmake/fix-localtime-test.patch diff --git a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/pkgs/unit/bm/bmake/fix-unexport-env-test.patch similarity index 100% rename from pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch rename to pkgs/unit/bm/bmake/fix-unexport-env-test.patch diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/unit/bm/bmake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bmake/default.nix rename to pkgs/unit/bm/bmake/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/unit/bm/bmake/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/bmake/setup-hook.sh rename to pkgs/unit/bm/bmake/setup-hook.sh diff --git a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/pkgs/unit/bm/bmake/unconditional-ksh-test.patch similarity index 100% rename from pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch rename to pkgs/unit/bm/bmake/unconditional-ksh-test.patch diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/unit/bm/bmap-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bmap-tools/default.nix rename to pkgs/unit/bm/bmap-tools/pkg-fun.nix diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/unit/bm/bmon/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bmon/default.nix rename to pkgs/unit/bm/bmon/pkg-fun.nix diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/unit/bm/bmrsa/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bmrsa/11.nix rename to pkgs/unit/bm/bmrsa/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/unit/bo/bob/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/bob/default.nix rename to pkgs/unit/bo/bob/pkg-fun.nix diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/unit/bo/boca/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boca/default.nix rename to pkgs/unit/bo/boca/pkg-fun.nix diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/unit/bo/boehmgc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boehm-gc/default.nix rename to pkgs/unit/bo/boehmgc/pkg-fun.nix diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/unit/bo/bogofilter/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bogofilter/default.nix rename to pkgs/unit/bo/bogofilter/pkg-fun.nix diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/unit/bo/boinc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/boinc/default.nix rename to pkgs/unit/bo/boinc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/pkgs/unit/bo/bolt/0001-skip-mkdir.patch similarity index 100% rename from pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch rename to pkgs/unit/bo/bolt/0001-skip-mkdir.patch diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/unit/bo/bolt/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/bolt/default.nix rename to pkgs/unit/bo/bolt/pkg-fun.nix diff --git a/pkgs/tools/misc/boltbrowser/default.nix b/pkgs/unit/bo/boltbrowser/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/boltbrowser/default.nix rename to pkgs/unit/bo/boltbrowser/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/unit/bo/bombadillo/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/bombadillo/default.nix rename to pkgs/unit/bo/bombadillo/pkg-fun.nix diff --git a/pkgs/development/tools/bomber-go/default.nix b/pkgs/unit/bo/bomber-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bomber-go/default.nix rename to pkgs/unit/bo/bomber-go/pkg-fun.nix diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/unit/bo/bombono/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/bombono/default.nix rename to pkgs/unit/bo/bombono/pkg-fun.nix diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/unit/bo/bomutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/bomutils/default.nix rename to pkgs/unit/bo/bomutils/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/unit/bo/bonmin/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/bonmin/default.nix rename to pkgs/unit/bo/bonmin/pkg-fun.nix diff --git a/pkgs/development/tools/misc/bonnmotion/install.patch b/pkgs/unit/bo/bonnmotion/install.patch similarity index 100% rename from pkgs/development/tools/misc/bonnmotion/install.patch rename to pkgs/unit/bo/bonnmotion/install.patch diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/unit/bo/bonnmotion/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/bonnmotion/default.nix rename to pkgs/unit/bo/bonnmotion/pkg-fun.nix diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/unit/bo/bonzomatic/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/bonzomatic/default.nix rename to pkgs/unit/bo/bonzomatic/pkg-fun.nix diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/unit/bo/boofuzz/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/boofuzz/default.nix rename to pkgs/unit/bo/boofuzz/pkg-fun.nix diff --git a/pkgs/games/boohu/deps.nix b/pkgs/unit/bo/boohu/deps.nix similarity index 100% rename from pkgs/games/boohu/deps.nix rename to pkgs/unit/bo/boohu/deps.nix diff --git a/pkgs/games/boohu/default.nix b/pkgs/unit/bo/boohu/pkg-fun.nix similarity index 100% rename from pkgs/games/boohu/default.nix rename to pkgs/unit/bo/boohu/pkg-fun.nix diff --git a/pkgs/tools/text/book-summary/default.nix b/pkgs/unit/bo/book-summary/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/book-summary/default.nix rename to pkgs/unit/bo/book-summary/pkg-fun.nix diff --git a/pkgs/applications/office/bookletimposer/configdir.patch b/pkgs/unit/bo/bookletimposer/configdir.patch similarity index 100% rename from pkgs/applications/office/bookletimposer/configdir.patch rename to pkgs/unit/bo/bookletimposer/configdir.patch diff --git a/pkgs/applications/office/bookletimposer/i18n.patch b/pkgs/unit/bo/bookletimposer/i18n.patch similarity index 100% rename from pkgs/applications/office/bookletimposer/i18n.patch rename to pkgs/unit/bo/bookletimposer/i18n.patch diff --git a/pkgs/applications/office/bookletimposer/default.nix b/pkgs/unit/bo/bookletimposer/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/bookletimposer/default.nix rename to pkgs/unit/bo/bookletimposer/pkg-fun.nix diff --git a/pkgs/servers/web-apps/bookstack/composer-env.nix b/pkgs/unit/bo/bookstack/composer-env.nix similarity index 100% rename from pkgs/servers/web-apps/bookstack/composer-env.nix rename to pkgs/unit/bo/bookstack/composer-env.nix diff --git a/pkgs/servers/web-apps/bookstack/composition.nix b/pkgs/unit/bo/bookstack/composition.nix similarity index 100% rename from pkgs/servers/web-apps/bookstack/composition.nix rename to pkgs/unit/bo/bookstack/composition.nix diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/unit/bo/bookstack/php-packages.nix similarity index 100% rename from pkgs/servers/web-apps/bookstack/php-packages.nix rename to pkgs/unit/bo/bookstack/php-packages.nix diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/unit/bo/bookstack/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/bookstack/default.nix rename to pkgs/unit/bo/bookstack/pkg-fun.nix diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/unit/bo/bookworm/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/bookworm/default.nix rename to pkgs/unit/bo/bookworm/pkg-fun.nix diff --git a/pkgs/applications/science/logic/boolector/cmake-gtest.patch b/pkgs/unit/bo/boolector/cmake-gtest.patch similarity index 100% rename from pkgs/applications/science/logic/boolector/cmake-gtest.patch rename to pkgs/unit/bo/boolector/cmake-gtest.patch diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/unit/bo/boolector/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/boolector/default.nix rename to pkgs/unit/bo/boolector/pkg-fun.nix diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/unit/bo/boolstuff/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boolstuff/default.nix rename to pkgs/unit/bo/boolstuff/pkg-fun.nix diff --git a/pkgs/applications/audio/boops/default.nix b/pkgs/unit/bo/boops/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/boops/default.nix rename to pkgs/unit/bo/boops/pkg-fun.nix diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/unit/bo/boost-build/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/boost-build/default.nix rename to pkgs/unit/bo/boost-build/pkg-fun.nix diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/unit/bo/boost-sml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boost-ext/boost-sml/default.nix rename to pkgs/unit/bo/boost-sml/pkg-fun.nix diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/unit/bo/boost_process/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boost-process/default.nix rename to pkgs/unit/bo/boost_process/pkg-fun.nix diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/unit/bo/booster/pkg-fun.nix similarity index 100% rename from pkgs/applications/system/booster/default.nix rename to pkgs/unit/bo/booster/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/unit/bo/boot/builder.sh similarity index 100% rename from pkgs/development/tools/build-managers/boot/builder.sh rename to pkgs/unit/bo/boot/builder.sh diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/unit/bo/boot/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/boot/default.nix rename to pkgs/unit/bo/boot/pkg-fun.nix diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/unit/bo/bootil/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bootil/default.nix rename to pkgs/unit/bo/bootil/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/unit/bo/bootiso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/bootiso/default.nix rename to pkgs/unit/bo/bootiso/pkg-fun.nix diff --git a/pkgs/tools/misc/bootspec/default.nix b/pkgs/unit/bo/bootspec/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bootspec/default.nix rename to pkgs/unit/bo/bootspec/pkg-fun.nix diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/unit/bo/bootstrap-studio/pkg-fun.nix similarity index 100% rename from pkgs/development/web/bootstrap-studio/default.nix rename to pkgs/unit/bo/bootstrap-studio/pkg-fun.nix diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/unit/bo/borg-sans-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/borg-sans-mono/default.nix rename to pkgs/unit/bo/borg-sans-mono/pkg-fun.nix diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/unit/bo/borgbackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/borgbackup/default.nix rename to pkgs/unit/bo/borgbackup/pkg-fun.nix diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/unit/bo/borgmatic/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/borgmatic/default.nix rename to pkgs/unit/bo/borgmatic/pkg-fun.nix diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/unit/bo/boringssl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boringssl/default.nix rename to pkgs/unit/bo/boringssl/pkg-fun.nix diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/unit/bo/boringtun/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/boringtun/default.nix rename to pkgs/unit/bo/boringtun/pkg-fun.nix diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/unit/bo/boron/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/boron/default.nix rename to pkgs/unit/bo/boron/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/unit/bo/bosh-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/bosh-cli/default.nix rename to pkgs/unit/bo/bosh-cli/pkg-fun.nix diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/unit/bo/bossa-arduino/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/bossa/arduino.nix rename to pkgs/unit/bo/bossa-arduino/pkg-fun.nix diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/unit/bo/bosun/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/bosun/default.nix rename to pkgs/unit/bo/bosun/pkg-fun.nix diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/unit/bo/bottles-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bottles/default.nix rename to pkgs/unit/bo/bottles-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/unit/bo/bottles-unwrapped/vulkan_icd.patch similarity index 100% rename from pkgs/applications/misc/bottles/vulkan_icd.patch rename to pkgs/unit/bo/bottles-unwrapped/vulkan_icd.patch diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/unit/bo/bottles/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bottles/fhsenv.nix rename to pkgs/unit/bo/bottles/pkg-fun.nix diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/unit/bo/bottom-rs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bottom-rs/default.nix rename to pkgs/unit/bo/bottom-rs/pkg-fun.nix diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/unit/bo/bottom/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/bottom/default.nix rename to pkgs/unit/bo/bottom/pkg-fun.nix diff --git a/pkgs/tools/admin/boulder/no-build-id-test.patch b/pkgs/unit/bo/boulder/no-build-id-test.patch similarity index 100% rename from pkgs/tools/admin/boulder/no-build-id-test.patch rename to pkgs/unit/bo/boulder/no-build-id-test.patch diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/unit/bo/boulder/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/boulder/default.nix rename to pkgs/unit/bo/boulder/pkg-fun.nix diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/unit/bo/boundary/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/boundary/default.nix rename to pkgs/unit/bo/boundary/pkg-fun.nix diff --git a/pkgs/tools/networking/boundary/update.sh b/pkgs/unit/bo/boundary/update.sh similarity index 100% rename from pkgs/tools/networking/boundary/update.sh rename to pkgs/unit/bo/boundary/update.sh diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/unit/bo/bowtie/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bowtie/default.nix rename to pkgs/unit/bo/bowtie/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/unit/bo/bowtie2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bowtie2/default.nix rename to pkgs/unit/bo/bowtie2/pkg-fun.nix diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/unit/bo/box2d/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/box2d/default.nix rename to pkgs/unit/bo/box2d/pkg-fun.nix diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/unit/bo/box64/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/box64/default.nix rename to pkgs/unit/bo/box64/pkg-fun.nix diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/unit/bo/boxes/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/boxes/default.nix rename to pkgs/unit/bo/boxes/pkg-fun.nix diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/unit/bo/boxfort/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/boxfort/default.nix rename to pkgs/unit/bo/boxfort/pkg-fun.nix diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/unit/bo/boxfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/boxfs/default.nix rename to pkgs/unit/bo/boxfs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/unit/bo/boxfs/work-around-API-borkage.patch similarity index 100% rename from pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch rename to pkgs/unit/bo/boxfs/work-around-API-borkage.patch diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/unit/bp/bpf-linker/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bpf-linker/default.nix rename to pkgs/unit/bp/bpf-linker/pkg-fun.nix diff --git a/pkgs/os-specific/linux/bpfmon/default.nix b/pkgs/unit/bp/bpfmon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/bpfmon/default.nix rename to pkgs/unit/bp/bpfmon/pkg-fun.nix diff --git a/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/unit/bp/bpftools/include-asm-types-for-ppc64le.patch similarity index 100% rename from pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch rename to pkgs/unit/bp/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/unit/bp/bpftools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/bpftools/default.nix rename to pkgs/unit/bp/bpftools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/bpftools/strip-binary-name.patch b/pkgs/unit/bp/bpftools/strip-binary-name.patch similarity index 100% rename from pkgs/os-specific/linux/bpftools/strip-binary-name.patch rename to pkgs/unit/bp/bpftools/strip-binary-name.patch diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/unit/bp/bpkg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/build2/bpkg.nix rename to pkgs/unit/bp/bpkg/pkg-fun.nix diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/unit/bp/bpm-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/bpm-tools/default.nix rename to pkgs/unit/bp/bpm-tools/pkg-fun.nix diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/unit/bp/bpytop/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/bpytop/default.nix rename to pkgs/unit/bp/bpytop/pkg-fun.nix diff --git a/pkgs/games/braincurses/default.nix b/pkgs/unit/br/braincurses/pkg-fun.nix similarity index 100% rename from pkgs/games/braincurses/default.nix rename to pkgs/unit/br/braincurses/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile b/pkgs/unit/br/brakeman/Gemfile similarity index 100% rename from pkgs/development/tools/analysis/brakeman/Gemfile rename to pkgs/unit/br/brakeman/Gemfile diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/unit/br/brakeman/Gemfile.lock similarity index 100% rename from pkgs/development/tools/analysis/brakeman/Gemfile.lock rename to pkgs/unit/br/brakeman/Gemfile.lock diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/unit/br/brakeman/gemset.nix similarity index 100% rename from pkgs/development/tools/analysis/brakeman/gemset.nix rename to pkgs/unit/br/brakeman/gemset.nix diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/unit/br/brakeman/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/brakeman/default.nix rename to pkgs/unit/br/brakeman/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/unit/br/brasero/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/brasero/wrapper.nix rename to pkgs/unit/br/brasero/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/unit/br/brave/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/brave/default.nix rename to pkgs/unit/br/brave/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/unit/br/brave/update.sh similarity index 100% rename from pkgs/applications/networking/browsers/brave/update.sh rename to pkgs/unit/br/brave/update.sh diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/unit/br/breakpad/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/breakpad/default.nix rename to pkgs/unit/br/breakpad/pkg-fun.nix diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/unit/br/breitbandmessung/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/breitbandmessung/default.nix rename to pkgs/unit/br/breitbandmessung/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/unit/br/brgenml1cupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix rename to pkgs/unit/br/brgenml1cupswrapper/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/unit/br/brial/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/brial/default.nix rename to pkgs/unit/br/brial/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/unit/br/briar-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/briar-desktop/default.nix rename to pkgs/unit/br/briar-desktop/pkg-fun.nix diff --git a/pkgs/servers/brickd/default.nix b/pkgs/unit/br/brickd/pkg-fun.nix similarity index 100% rename from pkgs/servers/brickd/default.nix rename to pkgs/unit/br/brickd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/unit/br/bridge-utils/autoconf-ar.patch similarity index 100% rename from pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch rename to pkgs/unit/br/bridge-utils/autoconf-ar.patch diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/unit/br/bridge-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/bridge-utils/default.nix rename to pkgs/unit/br/bridge-utils/pkg-fun.nix diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/unit/br/brig/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/brig/default.nix rename to pkgs/unit/br/brig/pkg-fun.nix diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/unit/br/brigand/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/brigand/default.nix rename to pkgs/unit/br/brigand/pkg-fun.nix diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/unit/br/brightnessctl/pkg-fun.nix similarity index 100% rename from pkgs/misc/brightnessctl/default.nix rename to pkgs/unit/br/brightnessctl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/unit/br/brillo/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/brillo/default.nix rename to pkgs/unit/br/brillo/pkg-fun.nix diff --git a/pkgs/os-specific/linux/brillo/udev-rule.patch b/pkgs/unit/br/brillo/udev-rule.patch similarity index 100% rename from pkgs/os-specific/linux/brillo/udev-rule.patch rename to pkgs/unit/br/brillo/udev-rule.patch diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/pkgs/unit/br/brise/fetchPackages.nix similarity index 100% rename from pkgs/data/misc/brise/fetchPackages.nix rename to pkgs/unit/br/brise/fetchPackages.nix diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/unit/br/brise/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/brise/default.nix rename to pkgs/unit/br/brise/pkg-fun.nix diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/unit/br/briss/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/briss/default.nix rename to pkgs/unit/br/briss/pkg-fun.nix diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/unit/br/bristol/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bristol/default.nix rename to pkgs/unit/br/bristol/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/unit/br/brlaser/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/brlaser/default.nix rename to pkgs/unit/br/brlaser/pkg-fun.nix diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/unit/br/brltty/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/brltty/default.nix rename to pkgs/unit/br/brltty/pkg-fun.nix diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/unit/br/brmodelo/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/engineering/brmodelo/default.nix rename to pkgs/unit/br/brmodelo/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/unit/br/broadcom-bt-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix rename to pkgs/unit/br/broadcom-bt-firmware/pkg-fun.nix diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/unit/br/broadlink-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/broadlink-cli/default.nix rename to pkgs/unit/br/broadlink-cli/pkg-fun.nix diff --git a/pkgs/games/brogue/default.nix b/pkgs/unit/br/brogue/pkg-fun.nix similarity index 100% rename from pkgs/games/brogue/default.nix rename to pkgs/unit/br/brogue/pkg-fun.nix diff --git a/pkgs/data/fonts/bront/default.nix b/pkgs/unit/br/bront_fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/bront/default.nix rename to pkgs/unit/br/bront_fonts/pkg-fun.nix diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/unit/br/brook/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/brook/default.nix rename to pkgs/unit/br/brook/pkg-fun.nix diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/unit/br/brotli/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/brotli/default.nix rename to pkgs/unit/br/brotli/pkg-fun.nix diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/unit/br/browserpass/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/browserpass/default.nix rename to pkgs/unit/br/browserpass/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/unit/br/browsh/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/browsh/default.nix rename to pkgs/unit/br/browsh/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/unit/br/brscan4/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan4/default.nix rename to pkgs/unit/br/brscan4/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/backends/brscan4/preload.c b/pkgs/unit/br/brscan4/preload.c similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan4/preload.c rename to pkgs/unit/br/brscan4/preload.c diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/unit/br/brscan4/udev_rules_type1.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix rename to pkgs/unit/br/brscan4/udev_rules_type1.nix diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/unit/br/brscan5/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/brscan5/default.nix rename to pkgs/unit/br/brscan5/pkg-fun.nix diff --git a/pkgs/development/libraries/brunsli/default.nix b/pkgs/unit/br/brunsli/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/brunsli/default.nix rename to pkgs/unit/br/brunsli/pkg-fun.nix diff --git a/pkgs/games/brutalmaze/default.nix b/pkgs/unit/br/brutalmaze/pkg-fun.nix similarity index 100% rename from pkgs/games/brutalmaze/default.nix rename to pkgs/unit/br/brutalmaze/pkg-fun.nix diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/unit/br/bruteforce-luks/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bruteforce-luks/default.nix rename to pkgs/unit/br/bruteforce-luks/pkg-fun.nix diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/unit/br/brutespray/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/brutespray/default.nix rename to pkgs/unit/br/brutespray/pkg-fun.nix diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/unit/bs/bs-platform/build-bs-platform.nix similarity index 100% rename from pkgs/development/compilers/bs-platform/build-bs-platform.nix rename to pkgs/unit/bs/bs-platform/build-bs-platform.nix diff --git a/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch b/pkgs/unit/bs/bs-platform/jscomp-release-ninja.patch similarity index 100% rename from pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch rename to pkgs/unit/bs/bs-platform/jscomp-release-ninja.patch diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/unit/bs/bs-platform/ocaml.nix similarity index 100% rename from pkgs/development/compilers/bs-platform/ocaml.nix rename to pkgs/unit/bs/bs-platform/ocaml.nix diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/unit/bs/bs-platform/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/bs-platform/default.nix rename to pkgs/unit/bs/bs-platform/pkg-fun.nix diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/unit/bs/bschaffl/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bschaffl/default.nix rename to pkgs/unit/bs/bschaffl/pkg-fun.nix diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/unit/bs/bsd-finger/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bsd-finger/default.nix rename to pkgs/unit/bs/bsd-finger/pkg-fun.nix diff --git a/pkgs/tools/networking/bsd-finger/ubuntu-0.17-9.patch b/pkgs/unit/bs/bsd-finger/ubuntu-0.17-9.patch similarity index 100% rename from pkgs/tools/networking/bsd-finger/ubuntu-0.17-9.patch rename to pkgs/unit/bs/bsd-finger/ubuntu-0.17-9.patch diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/unit/bs/bsdbuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/bsdbuild/default.nix rename to pkgs/unit/bs/bsdbuild/pkg-fun.nix diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/unit/bs/bsdgames/pkg-fun.nix similarity index 100% rename from pkgs/games/bsdgames/default.nix rename to pkgs/unit/bs/bsdgames/pkg-fun.nix diff --git a/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch b/pkgs/unit/bs/bsdiff/CVE-2020-14315.patch similarity index 100% rename from pkgs/tools/compression/bsdiff/CVE-2020-14315.patch rename to pkgs/unit/bs/bsdiff/CVE-2020-14315.patch diff --git a/pkgs/tools/compression/bsdiff/include-systypes.patch b/pkgs/unit/bs/bsdiff/include-systypes.patch similarity index 100% rename from pkgs/tools/compression/bsdiff/include-systypes.patch rename to pkgs/unit/bs/bsdiff/include-systypes.patch diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/unit/bs/bsdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/bsdiff/default.nix rename to pkgs/unit/bs/bsdiff/pkg-fun.nix diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/unit/bs/bsequencer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bsequencer/default.nix rename to pkgs/unit/bs/bsequencer/pkg-fun.nix diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/unit/bs/bshapr/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bshapr/default.nix rename to pkgs/unit/bs/bshapr/pkg-fun.nix diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/unit/bs/bslizr/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/bslizr/default.nix rename to pkgs/unit/bs/bslizr/pkg-fun.nix diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/unit/bs/bsp-layout/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bsp-layout/default.nix rename to pkgs/unit/bs/bsp-layout/pkg-fun.nix diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/unit/bs/bspwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/bspwm/default.nix rename to pkgs/unit/bs/bspwm/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/unit/bt/bt-fw-converter/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix rename to pkgs/unit/bt/bt-fw-converter/pkg-fun.nix diff --git a/pkgs/games/btanks/default.nix b/pkgs/unit/bt/btanks/pkg-fun.nix similarity index 100% rename from pkgs/games/btanks/default.nix rename to pkgs/unit/bt/btanks/pkg-fun.nix diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/unit/bt/btar/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/btar/default.nix rename to pkgs/unit/bt/btar/pkg-fun.nix diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/unit/bt/btcd/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/btcd/default.nix rename to pkgs/unit/bt/btcd/pkg-fun.nix diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/unit/bt/btcdeb/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/btcdeb/default.nix rename to pkgs/unit/bt/btcdeb/pkg-fun.nix diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/unit/bt/btdu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/btdu/default.nix rename to pkgs/unit/bt/btdu/pkg-fun.nix diff --git a/pkgs/tools/misc/btdu/update.py b/pkgs/unit/bt/btdu/update.py similarity index 100% rename from pkgs/tools/misc/btdu/update.py rename to pkgs/unit/bt/btdu/update.py diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/unit/bt/btfs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/btfs/default.nix rename to pkgs/unit/bt/btfs/pkg-fun.nix diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/unit/bt/btor2tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/btor2tools/default.nix rename to pkgs/unit/bt/btor2tools/pkg-fun.nix diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/unit/bt/btrbk/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/btrbk/default.nix rename to pkgs/unit/bt/btrbk/pkg-fun.nix diff --git a/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/pkgs/unit/bt/btrfs-heatmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/btrfs-heatmap/default.nix rename to pkgs/unit/bt/btrfs-heatmap/pkg-fun.nix diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/unit/bt/btrfs-progs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/btrfs-progs/default.nix rename to pkgs/unit/bt/btrfs-progs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/btrfs-snap/default.nix b/pkgs/unit/bt/btrfs-snap/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/btrfs-snap/default.nix rename to pkgs/unit/bt/btrfs-snap/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/unit/bu/bubblemail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/bubblemail/default.nix rename to pkgs/unit/bu/bubblemail/pkg-fun.nix diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/unit/bu/bubblewrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/bubblewrap/default.nix rename to pkgs/unit/bu/bubblewrap/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/pkgs/unit/bu/buck/pex-mtime.patch similarity index 100% rename from pkgs/development/tools/build-managers/buck/pex-mtime.patch rename to pkgs/unit/bu/buck/pex-mtime.patch diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/unit/bu/buck/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/buck/default.nix rename to pkgs/unit/bu/buck/pkg-fun.nix diff --git a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch b/pkgs/unit/bu/buddy/gcc-4.3.3-fixes.patch similarity index 100% rename from pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch rename to pkgs/unit/bu/buddy/gcc-4.3.3-fixes.patch diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/unit/bu/buddy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/buddy/default.nix rename to pkgs/unit/bu/buddy/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/buf-language-server/default.nix b/pkgs/unit/bu/buf-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/buf-language-server/default.nix rename to pkgs/unit/bu/buf-language-server/pkg-fun.nix diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/unit/bu/buf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/buf/default.nix rename to pkgs/unit/bu/buf/pkg-fun.nix diff --git a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch b/pkgs/unit/bu/buf/skip_test_requiring_dotgit.patch similarity index 100% rename from pkgs/development/tools/buf/skip_test_requiring_dotgit.patch rename to pkgs/unit/bu/buf/skip_test_requiring_dotgit.patch diff --git a/pkgs/development/tools/buf/skip_test_requiring_network.patch b/pkgs/unit/bu/buf/skip_test_requiring_network.patch similarity index 100% rename from pkgs/development/tools/buf/skip_test_requiring_network.patch rename to pkgs/unit/bu/buf/skip_test_requiring_network.patch diff --git a/pkgs/development/bower-modules/generic/default.nix b/pkgs/unit/bu/buildBowerComponents/pkg-fun.nix similarity index 100% rename from pkgs/development/bower-modules/generic/default.nix rename to pkgs/unit/bu/buildBowerComponents/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/unit/bu/buildDotnetModule/hooks/default.nix similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix rename to pkgs/unit/bu/buildDotnetModule/hooks/default.nix diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/unit/bu/buildDotnetModule/hooks/dotnet-build-hook.sh similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh rename to pkgs/unit/bu/buildDotnetModule/hooks/dotnet-build-hook.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/unit/bu/buildDotnetModule/hooks/dotnet-check-hook.sh similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh rename to pkgs/unit/bu/buildDotnetModule/hooks/dotnet-check-hook.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/unit/bu/buildDotnetModule/hooks/dotnet-configure-hook.sh similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh rename to pkgs/unit/bu/buildDotnetModule/hooks/dotnet-configure-hook.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/unit/bu/buildDotnetModule/hooks/dotnet-fixup-hook.sh similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh rename to pkgs/unit/bu/buildDotnetModule/hooks/dotnet-fixup-hook.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/unit/bu/buildDotnetModule/hooks/dotnet-install-hook.sh similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh rename to pkgs/unit/bu/buildDotnetModule/hooks/dotnet-install-hook.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/unit/bu/buildDotnetModule/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-module/default.nix rename to pkgs/unit/bu/buildDotnetModule/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/build-dotnet-package/default.nix b/pkgs/unit/bu/buildDotnetPackage/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/build-dotnet-package/default.nix rename to pkgs/unit/bu/buildDotnetPackage/pkg-fun.nix diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/unit/bu/buildEmscriptenPackage/pkg-fun.nix similarity index 100% rename from pkgs/development/em-modules/generic/default.nix rename to pkgs/unit/bu/buildEmscriptenPackage/pkg-fun.nix diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/unit/bu/buildEnv/builder.pl similarity index 100% rename from pkgs/build-support/buildenv/builder.pl rename to pkgs/unit/bu/buildEnv/builder.pl diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/unit/bu/buildEnv/pkg-fun.nix similarity index 100% rename from pkgs/build-support/buildenv/default.nix rename to pkgs/unit/bu/buildEnv/pkg-fun.nix diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/unit/bu/buildFHSUserEnvBubblewrap/env.nix similarity index 100% rename from pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix rename to pkgs/unit/bu/buildFHSUserEnvBubblewrap/env.nix diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/unit/bu/buildFHSUserEnvBubblewrap/pkg-fun.nix similarity index 100% rename from pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix rename to pkgs/unit/bu/buildFHSUserEnvBubblewrap/pkg-fun.nix diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/unit/bu/buildFHSUserEnvChroot/chrootenv/default.nix similarity index 100% rename from pkgs/build-support/build-fhs-userenv/chrootenv/default.nix rename to pkgs/unit/bu/buildFHSUserEnvChroot/chrootenv/default.nix diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c b/pkgs/unit/bu/buildFHSUserEnvChroot/chrootenv/src/chrootenv.c similarity index 100% rename from pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c rename to pkgs/unit/bu/buildFHSUserEnvChroot/chrootenv/src/chrootenv.c diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build b/pkgs/unit/bu/buildFHSUserEnvChroot/chrootenv/src/meson.build similarity index 100% rename from pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build rename to pkgs/unit/bu/buildFHSUserEnvChroot/chrootenv/src/meson.build diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/unit/bu/buildFHSUserEnvChroot/env.nix similarity index 100% rename from pkgs/build-support/build-fhs-userenv/env.nix rename to pkgs/unit/bu/buildFHSUserEnvChroot/env.nix diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/unit/bu/buildFHSUserEnvChroot/pkg-fun.nix similarity index 100% rename from pkgs/build-support/build-fhs-userenv/default.nix rename to pkgs/unit/bu/buildFHSUserEnvChroot/pkg-fun.nix diff --git a/pkgs/build-support/build-maven.nix b/pkgs/unit/bu/buildMaven/pkg-fun.nix similarity index 100% rename from pkgs/build-support/build-maven.nix rename to pkgs/unit/bu/buildMaven/pkg-fun.nix diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/unit/bu/buildNpmPackage/pkg-fun.nix similarity index 100% rename from pkgs/build-support/node/build-npm-package/default.nix rename to pkgs/unit/bu/buildNpmPackage/pkg-fun.nix diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/unit/bu/buildRustCrate/build-crate.nix similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/build-crate.nix rename to pkgs/unit/bu/buildRustCrate/build-crate.nix diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/unit/bu/buildRustCrate/configure-crate.nix similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/configure-crate.nix rename to pkgs/unit/bu/buildRustCrate/configure-crate.nix diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/unit/bu/buildRustCrate/install-crate.nix similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/install-crate.nix rename to pkgs/unit/bu/buildRustCrate/install-crate.nix diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/unit/bu/buildRustCrate/lib.sh similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/lib.sh rename to pkgs/unit/bu/buildRustCrate/lib.sh diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/unit/bu/buildRustCrate/log.nix similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/log.nix rename to pkgs/unit/bu/buildRustCrate/log.nix diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/unit/bu/buildRustCrate/pkg-fun.nix similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/default.nix rename to pkgs/unit/bu/buildRustCrate/pkg-fun.nix diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/unit/bu/buildRustCrateHelpers/pkg-fun.nix similarity index 100% rename from pkgs/build-support/rust/build-rust-crate/helpers.nix rename to pkgs/unit/bu/buildRustCrateHelpers/pkg-fun.nix diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/unit/bu/buildah-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/buildah/default.nix rename to pkgs/unit/bu/buildah-unwrapped/pkg-fun.nix diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/unit/bu/buildah/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/buildah/wrapper.nix rename to pkgs/unit/bu/buildah/pkg-fun.nix diff --git a/pkgs/applications/virtualization/buildkit-nix/default.nix b/pkgs/unit/bu/buildkit-nix/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/buildkit-nix/default.nix rename to pkgs/unit/bu/buildkit-nix/pkg-fun.nix diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/unit/bu/buildkit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/buildkit/default.nix rename to pkgs/unit/bu/buildkit/pkg-fun.nix diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/unit/bu/buildkite-agent-metrics/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/buildkite-agent-metrics/default.nix rename to pkgs/unit/bu/buildkite-agent-metrics/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/unit/bu/buildkite-agent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix rename to pkgs/unit/bu/buildkite-agent/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/unit/bu/buildkite-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/buildkite-cli/default.nix rename to pkgs/unit/bu/buildkite-cli/pkg-fun.nix diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/unit/bu/buildpack/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/buildpack/default.nix rename to pkgs/unit/bu/buildpack/pkg-fun.nix diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/unit/bu/buildtorrent/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/buildtorrent/default.nix rename to pkgs/unit/bu/buildtorrent/pkg-fun.nix diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/unit/bu/buku/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/buku/default.nix rename to pkgs/unit/bu/buku/pkg-fun.nix diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/unit/bu/bukubrow/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bukubrow/default.nix rename to pkgs/unit/bu/bukubrow/pkg-fun.nix diff --git a/pkgs/applications/misc/bukut/default.nix b/pkgs/unit/bu/bukut/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/bukut/default.nix rename to pkgs/unit/bu/bukut/pkg-fun.nix diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/unit/bu/bulletml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bulletml/default.nix rename to pkgs/unit/bu/bulletml/pkg-fun.nix diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/unit/bu/bully/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bully/default.nix rename to pkgs/unit/bu/bully/pkg-fun.nix diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/unit/bu/bump/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/github/bump/default.nix rename to pkgs/unit/bu/bump/pkg-fun.nix diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/unit/bu/bumpver/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/bumpver/default.nix rename to pkgs/unit/bu/bumpver/pkg-fun.nix diff --git a/pkgs/development/web/bun/default.nix b/pkgs/unit/bu/bun/pkg-fun.nix similarity index 100% rename from pkgs/development/web/bun/default.nix rename to pkgs/unit/bu/bun/pkg-fun.nix diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/unit/bu/bundix/pkg-fun.nix similarity index 100% rename from pkgs/development/ruby-modules/bundix/default.nix rename to pkgs/unit/bu/bundix/pkg-fun.nix diff --git a/pkgs/tools/security/bundler-audit/Gemfile b/pkgs/unit/bu/bundler-audit/Gemfile similarity index 100% rename from pkgs/tools/security/bundler-audit/Gemfile rename to pkgs/unit/bu/bundler-audit/Gemfile diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/unit/bu/bundler-audit/Gemfile.lock similarity index 100% rename from pkgs/tools/security/bundler-audit/Gemfile.lock rename to pkgs/unit/bu/bundler-audit/Gemfile.lock diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/unit/bu/bundler-audit/gemset.nix similarity index 100% rename from pkgs/tools/security/bundler-audit/gemset.nix rename to pkgs/unit/bu/bundler-audit/gemset.nix diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/unit/bu/bundler-audit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/bundler-audit/default.nix rename to pkgs/unit/bu/bundler-audit/pkg-fun.nix diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/unit/bu/bundler/pkg-fun.nix similarity index 100% rename from pkgs/development/ruby-modules/bundler/default.nix rename to pkgs/unit/bu/bundler/pkg-fun.nix diff --git a/pkgs/development/ruby-modules/bundler-update-script/default.nix b/pkgs/unit/bu/bundlerUpdateScript/pkg-fun.nix similarity index 100% rename from pkgs/development/ruby-modules/bundler-update-script/default.nix rename to pkgs/unit/bu/bundlerUpdateScript/pkg-fun.nix diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/unit/bu/bundletool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bundletool/default.nix rename to pkgs/unit/bu/bundletool/pkg-fun.nix diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/unit/bu/bunnyfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/bunnyfetch/default.nix rename to pkgs/unit/bu/bunnyfetch/pkg-fun.nix diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/unit/bu/bunyan-rs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/bunyan-rs/default.nix rename to pkgs/unit/bu/bunyan-rs/pkg-fun.nix diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/unit/bu/bup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/bup/default.nix rename to pkgs/unit/bu/bup/pkg-fun.nix diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/unit/bu/bupc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/bupc/default.nix rename to pkgs/unit/bu/bupc/pkg-fun.nix diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/unit/bu/bupstash/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/bupstash/default.nix rename to pkgs/unit/bu/bupstash/pkg-fun.nix diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/unit/bu/burp/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/burp/default.nix rename to pkgs/unit/bu/burp/pkg-fun.nix diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/unit/bu/burpsuite/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/burpsuite/default.nix rename to pkgs/unit/bu/burpsuite/pkg-fun.nix diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/unit/bu/busybox/busybox-in-store.patch similarity index 100% rename from pkgs/os-specific/linux/busybox/busybox-in-store.patch rename to pkgs/unit/bu/busybox/busybox-in-store.patch diff --git a/pkgs/os-specific/linux/busybox/clang-cross.patch b/pkgs/unit/bu/busybox/clang-cross.patch similarity index 100% rename from pkgs/os-specific/linux/busybox/clang-cross.patch rename to pkgs/unit/bu/busybox/clang-cross.patch diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/unit/bu/busybox/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/busybox/default.nix rename to pkgs/unit/bu/busybox/pkg-fun.nix diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/unit/bu/butane/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/butane/default.nix rename to pkgs/unit/bu/butane/pkg-fun.nix diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/unit/bu/buttercup-desktop/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/buttercup-desktop/default.nix rename to pkgs/unit/bu/buttercup-desktop/pkg-fun.nix diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/unit/bv/bvi/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/bvi/default.nix rename to pkgs/unit/bv/bvi/pkg-fun.nix diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/unit/bv/bviplus/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/bviplus/default.nix rename to pkgs/unit/bv/bviplus/pkg-fun.nix diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/unit/bw/bwa/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/bwa/default.nix rename to pkgs/unit/bw/bwa/pkg-fun.nix diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/unit/bw/bwbasic/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/bwbasic/default.nix rename to pkgs/unit/bw/bwbasic/pkg-fun.nix diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/unit/bw/bwidget/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bwidget/default.nix rename to pkgs/unit/bw/bwidget/pkg-fun.nix diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/unit/bw/bwm_ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/bwm-ng/default.nix rename to pkgs/unit/bw/bwm_ng/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/unit/by/byacc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/byacc/default.nix rename to pkgs/unit/by/byacc/pkg-fun.nix diff --git a/pkgs/applications/video/byzanz/add-amflags.patch b/pkgs/unit/by/byzanz/add-amflags.patch similarity index 100% rename from pkgs/applications/video/byzanz/add-amflags.patch rename to pkgs/unit/by/byzanz/add-amflags.patch diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/unit/by/byzanz/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/byzanz/default.nix rename to pkgs/unit/by/byzanz/pkg-fun.nix diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/unit/bz/bzip2/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/bzip2/default.nix rename to pkgs/unit/bz/bzip2/pkg-fun.nix diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/unit/bz/bzip2_1_1/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/bzip2/1_1.nix rename to pkgs/unit/bz/bzip2_1_1/pkg-fun.nix diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/unit/bz/bzrtp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/bzrtp/default.nix rename to pkgs/unit/bz/bzrtp/pkg-fun.nix diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/unit/c-/c-blosc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/c-blosc/default.nix rename to pkgs/unit/c-/c-blosc/pkg-fun.nix diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/unit/c2/c2ffi/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/c2ffi/default.nix rename to pkgs/unit/c2/c2ffi/pkg-fun.nix diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/unit/c3/c3c/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/c3c/default.nix rename to pkgs/unit/c3/c3c/pkg-fun.nix diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/unit/ca/cabextract/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/cabextract/default.nix rename to pkgs/unit/ca/cabextract/pkg-fun.nix diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/unit/ca/cabin/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cabin/default.nix rename to pkgs/unit/ca/cabin/pkg-fun.nix diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/unit/ca/cacert/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/cacert/default.nix rename to pkgs/unit/ca/cacert/pkg-fun.nix diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/unit/ca/cacert/setup-hook.sh similarity index 100% rename from pkgs/data/misc/cacert/setup-hook.sh rename to pkgs/unit/ca/cacert/setup-hook.sh diff --git a/pkgs/data/misc/cacert/test-cert-file.crt b/pkgs/unit/ca/cacert/test-cert-file.crt similarity index 100% rename from pkgs/data/misc/cacert/test-cert-file.crt rename to pkgs/unit/ca/cacert/test-cert-file.crt diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/unit/ca/cacert/update.sh similarity index 100% rename from pkgs/data/misc/cacert/update.sh rename to pkgs/unit/ca/cacert/update.sh diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/unit/ca/cached-nix-shell/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/cached-nix-shell/default.nix rename to pkgs/unit/ca/cached-nix-shell/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/unit/ca/cachefilesd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cachefilesd/default.nix rename to pkgs/unit/ca/cachefilesd/pkg-fun.nix diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/unit/ca/cadaver/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cadaver/default.nix rename to pkgs/unit/ca/cadaver/pkg-fun.nix diff --git a/pkgs/servers/caddy/default.nix b/pkgs/unit/ca/caddy/pkg-fun.nix similarity index 100% rename from pkgs/servers/caddy/default.nix rename to pkgs/unit/ca/caddy/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/unit/ca/cadical/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cadical/default.nix rename to pkgs/unit/ca/cadical/pkg-fun.nix diff --git a/pkgs/development/tools/cadre/Gemfile b/pkgs/unit/ca/cadre/Gemfile similarity index 100% rename from pkgs/development/tools/cadre/Gemfile rename to pkgs/unit/ca/cadre/Gemfile diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/unit/ca/cadre/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cadre/Gemfile.lock rename to pkgs/unit/ca/cadre/Gemfile.lock diff --git a/pkgs/development/tools/cadre/gemset.nix b/pkgs/unit/ca/cadre/gemset.nix similarity index 100% rename from pkgs/development/tools/cadre/gemset.nix rename to pkgs/unit/ca/cadre/gemset.nix diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/unit/ca/cadre/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cadre/default.nix rename to pkgs/unit/ca/cadre/pkg-fun.nix diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/unit/ca/cadvisor/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/cadvisor/default.nix rename to pkgs/unit/ca/cadvisor/pkg-fun.nix diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/unit/ca/caerbannog/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/caerbannog/default.nix rename to pkgs/unit/ca/caerbannog/pkg-fun.nix diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/unit/ca/caf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/caf/default.nix rename to pkgs/unit/ca/caf/pkg-fun.nix diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/unit/ca/cairo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cairo/default.nix rename to pkgs/unit/ca/cairo/pkg-fun.nix diff --git a/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch b/pkgs/unit/ca/cairo/skip-configure-stderr-check.patch similarity index 100% rename from pkgs/development/libraries/cairo/skip-configure-stderr-check.patch rename to pkgs/unit/ca/cairo/skip-configure-stderr-check.patch diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/unit/ca/cairomm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cairomm/default.nix rename to pkgs/unit/ca/cairomm/pkg-fun.nix diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/unit/ca/cakelisp/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/cakelisp/default.nix rename to pkgs/unit/ca/cakelisp/pkg-fun.nix diff --git a/pkgs/data/fonts/caladea/cambria-alias.conf b/pkgs/unit/ca/caladea/cambria-alias.conf similarity index 100% rename from pkgs/data/fonts/caladea/cambria-alias.conf rename to pkgs/unit/ca/caladea/cambria-alias.conf diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/unit/ca/caladea/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/caladea/default.nix rename to pkgs/unit/ca/caladea/pkg-fun.nix diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/unit/ca/calamares-nixos-extensions/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/calamares-nixos-extensions/default.nix rename to pkgs/unit/ca/calamares-nixos-extensions/pkg-fun.nix diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/unit/ca/calc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/calc/default.nix rename to pkgs/unit/ca/calc/pkg-fun.nix diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/unit/ca/calcium/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/calcium/default.nix rename to pkgs/unit/ca/calcium/pkg-fun.nix diff --git a/pkgs/applications/misc/calcoo/0001-javac-encoding.diff b/pkgs/unit/ca/calcoo/0001-javac-encoding.diff similarity index 100% rename from pkgs/applications/misc/calcoo/0001-javac-encoding.diff rename to pkgs/unit/ca/calcoo/0001-javac-encoding.diff diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/unit/ca/calcoo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/calcoo/default.nix rename to pkgs/unit/ca/calcoo/pkg-fun.nix diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/unit/ca/calculix/calculix.patch similarity index 100% rename from pkgs/applications/science/math/calculix/calculix.patch rename to pkgs/unit/ca/calculix/calculix.patch diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/unit/ca/calculix/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/calculix/default.nix rename to pkgs/unit/ca/calculix/pkg-fun.nix diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/unit/ca/calcurse/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/calcurse/default.nix rename to pkgs/unit/ca/calcurse/pkg-fun.nix diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/unit/ca/calendar-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/calendar-cli/default.nix rename to pkgs/unit/ca/calendar-cli/pkg-fun.nix diff --git a/pkgs/servers/calibre-web/db-migrations.patch b/pkgs/unit/ca/calibre-web/db-migrations.patch similarity index 100% rename from pkgs/servers/calibre-web/db-migrations.patch rename to pkgs/unit/ca/calibre-web/db-migrations.patch diff --git a/pkgs/servers/calibre-web/default-logger.patch b/pkgs/unit/ca/calibre-web/default-logger.patch similarity index 100% rename from pkgs/servers/calibre-web/default-logger.patch rename to pkgs/unit/ca/calibre-web/default-logger.patch diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/unit/ca/calibre-web/pkg-fun.nix similarity index 100% rename from pkgs/servers/calibre-web/default.nix rename to pkgs/unit/ca/calibre-web/pkg-fun.nix diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/unit/ca/callaudiod/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/callaudiod/default.nix rename to pkgs/unit/ca/callaudiod/pkg-fun.nix diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/unit/ca/calls/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/calls/default.nix rename to pkgs/unit/ca/calls/pkg-fun.nix diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/unit/ca/cambalache/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cambalache/default.nix rename to pkgs/unit/ca/cambalache/pkg-fun.nix diff --git a/pkgs/tools/security/cameradar/default.nix b/pkgs/unit/ca/cameradar/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cameradar/default.nix rename to pkgs/unit/ca/cameradar/pkg-fun.nix diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/unit/ca/camingo-code/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/camingo-code/default.nix rename to pkgs/unit/ca/camingo-code/pkg-fun.nix diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/unit/ca/can-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/can-utils/default.nix rename to pkgs/unit/ca/can-utils/pkg-fun.nix diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/unit/ca/canokey-qemu/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/qemu/canokey-qemu.nix rename to pkgs/unit/ca/canokey-qemu/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/unit/ca/canon-cups-ufr2/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/canon/default.nix rename to pkgs/unit/ca/canon-cups-ufr2/pkg-fun.nix diff --git a/pkgs/build-support/java/canonicalize-jar.sh b/pkgs/unit/ca/canonicalize-jar/canonicalize-jar.sh similarity index 100% rename from pkgs/build-support/java/canonicalize-jar.sh rename to pkgs/unit/ca/canonicalize-jar/canonicalize-jar.sh diff --git a/pkgs/build-support/java/canonicalize-jar.nix b/pkgs/unit/ca/canonicalize-jar/pkg-fun.nix similarity index 100% rename from pkgs/build-support/java/canonicalize-jar.nix rename to pkgs/unit/ca/canonicalize-jar/pkg-fun.nix diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/unit/ca/canta-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/canta/default.nix rename to pkgs/unit/ca/canta-theme/pkg-fun.nix diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/unit/ca/cantarell-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cantarell-fonts/default.nix rename to pkgs/unit/ca/cantarell-fonts/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/unit/ca/canto-curses/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/canto-curses/default.nix rename to pkgs/unit/ca/canto-curses/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/unit/ca/canto-daemon/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/canto-daemon/default.nix rename to pkgs/unit/ca/canto-daemon/pkg-fun.nix diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/unit/ca/cantoolz/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cantoolz/default.nix rename to pkgs/unit/ca/cantoolz/pkg-fun.nix diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/unit/ca/capitaine-cursors-themed/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/capitaine-cursors-themed/default.nix rename to pkgs/unit/ca/capitaine-cursors-themed/pkg-fun.nix diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/unit/ca/capitaine-cursors/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/capitaine-cursors/default.nix rename to pkgs/unit/ca/capitaine-cursors/pkg-fun.nix diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/unit/ca/capnproto-java/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/capnproto-java/default.nix rename to pkgs/unit/ca/capnproto-java/pkg-fun.nix diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/unit/ca/capnproto/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/capnproto/default.nix rename to pkgs/unit/ca/capnproto/pkg-fun.nix diff --git a/pkgs/applications/emulators/caprice32/default.nix b/pkgs/unit/ca/caprice32/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/caprice32/default.nix rename to pkgs/unit/ca/caprice32/pkg-fun.nix diff --git a/pkgs/applications/emulators/caprice32/string.patch b/pkgs/unit/ca/caprice32/string.patch similarity index 100% rename from pkgs/applications/emulators/caprice32/string.patch rename to pkgs/unit/ca/caprice32/string.patch diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/unit/ca/caprine-bin/build-from-appimage.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix rename to pkgs/unit/ca/caprine-bin/build-from-appimage.nix diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/pkgs/unit/ca/caprine-bin/build-from-dmg.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix rename to pkgs/unit/ca/caprine-bin/build-from-dmg.nix diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/unit/ca/caprine-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/caprine-bin/default.nix rename to pkgs/unit/ca/caprine-bin/pkg-fun.nix diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/unit/ca/caps/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/caps/default.nix rename to pkgs/unit/ca/caps/pkg-fun.nix diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/unit/ca/capstone/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/capstone/default.nix rename to pkgs/unit/ca/capstone/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/unit/ca/captive-browser/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/captive-browser/default.nix rename to pkgs/unit/ca/captive-browser/pkg-fun.nix diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/unit/ca/capture/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/capture/default.nix rename to pkgs/unit/ca/capture/pkg-fun.nix diff --git a/pkgs/shells/carapace/default.nix b/pkgs/unit/ca/carapace/pkg-fun.nix similarity index 100% rename from pkgs/shells/carapace/default.nix rename to pkgs/unit/ca/carapace/pkg-fun.nix diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/unit/ca/cardboard/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/cardboard/default.nix rename to pkgs/unit/ca/cardboard/pkg-fun.nix diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/unit/ca/carddav-util/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/carddav-util/default.nix rename to pkgs/unit/ca/carddav-util/pkg-fun.nix diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/unit/ca/cardinal/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cardinal/default.nix rename to pkgs/unit/ca/cardinal/pkg-fun.nix diff --git a/pkgs/data/fonts/cardo/default.nix b/pkgs/unit/ca/cardo/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cardo/default.nix rename to pkgs/unit/ca/cardo/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/unit/ca/cargo-about/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-about/default.nix rename to pkgs/unit/ca/cargo-about/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch b/pkgs/unit/ca/cargo-about/update-mimalloc.patch similarity index 100% rename from pkgs/development/tools/rust/cargo-about/update-mimalloc.patch rename to pkgs/unit/ca/cargo-about/update-mimalloc.patch diff --git a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch b/pkgs/unit/ca/cargo-about/zstd-pkg-config.patch similarity index 100% rename from pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch rename to pkgs/unit/ca/cargo-about/zstd-pkg-config.patch diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/unit/ca/cargo-all-features/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-all-features/default.nix rename to pkgs/unit/ca/cargo-all-features/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/unit/ca/cargo-apk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-apk/default.nix rename to pkgs/unit/ca/cargo-apk/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/unit/ca/cargo-binutils/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-binutils/default.nix rename to pkgs/unit/ca/cargo-binutils/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/unit/ca/cargo-bitbake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bitbake/default.nix rename to pkgs/unit/ca/cargo-bitbake/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/unit/ca/cargo-bloat/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bloat/default.nix rename to pkgs/unit/ca/cargo-bloat/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/unit/ca/cargo-bolero/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-bolero/default.nix rename to pkgs/unit/ca/cargo-bolero/pkg-fun.nix diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/unit/ca/cargo-bootimage/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/bootimage/default.nix rename to pkgs/unit/ca/cargo-bootimage/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/unit/ca/cargo-careful/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-careful/default.nix rename to pkgs/unit/ca/cargo-careful/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/unit/ca/cargo-chef/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-chef/default.nix rename to pkgs/unit/ca/cargo-chef/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/unit/ca/cargo-criterion/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-criterion/default.nix rename to pkgs/unit/ca/cargo-criterion/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/unit/ca/cargo-cross/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-cross/default.nix rename to pkgs/unit/ca/cargo-cross/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/unit/ca/cargo-deb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-deb/default.nix rename to pkgs/unit/ca/cargo-deb/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/unit/ca/cargo-depgraph/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-depgraph/default.nix rename to pkgs/unit/ca/cargo-depgraph/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-deps/default.nix b/pkgs/unit/ca/cargo-deps/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-deps/default.nix rename to pkgs/unit/ca/cargo-deps/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/unit/ca/cargo-diet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-diet/default.nix rename to pkgs/unit/ca/cargo-diet/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/unit/ca/cargo-espmonitor/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-espmonitor/default.nix rename to pkgs/unit/ca/cargo-espmonitor/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/unit/ca/cargo-expand/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-expand/default.nix rename to pkgs/unit/ca/cargo-expand/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/unit/ca/cargo-feature/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-feature/default.nix rename to pkgs/unit/ca/cargo-feature/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/unit/ca/cargo-fuzz/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-fuzz/default.nix rename to pkgs/unit/ca/cargo-fuzz/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/unit/ca/cargo-generate/no-vendor.patch similarity index 100% rename from pkgs/development/tools/rust/cargo-generate/no-vendor.patch rename to pkgs/unit/ca/cargo-generate/no-vendor.patch diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/unit/ca/cargo-generate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-generate/default.nix rename to pkgs/unit/ca/cargo-generate/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-graph/default.nix b/pkgs/unit/ca/cargo-graph/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-graph/default.nix rename to pkgs/unit/ca/cargo-graph/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/unit/ca/cargo-guppy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-guppy/default.nix rename to pkgs/unit/ca/cargo-guppy/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/unit/ca/cargo-hack/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-hack/default.nix rename to pkgs/unit/ca/cargo-hack/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/unit/ca/cargo-hakari/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-hakari/default.nix rename to pkgs/unit/ca/cargo-hakari/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/unit/ca/cargo-insta/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-insta/default.nix rename to pkgs/unit/ca/cargo-insta/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/unit/ca/cargo-kcov/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-kcov/default.nix rename to pkgs/unit/ca/cargo-kcov/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/unit/ca/cargo-license/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-license/default.nix rename to pkgs/unit/ca/cargo-license/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/unit/ca/cargo-limit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-limit/default.nix rename to pkgs/unit/ca/cargo-limit/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/unit/ca/cargo-llvm-cov/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-llvm-cov/default.nix rename to pkgs/unit/ca/cargo-llvm-cov/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/unit/ca/cargo-llvm-lines/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-llvm-lines/default.nix rename to pkgs/unit/ca/cargo-llvm-lines/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/unit/ca/cargo-lock/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-lock/default.nix rename to pkgs/unit/ca/cargo-lock/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/unit/ca/cargo-modules/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-modules/default.nix rename to pkgs/unit/ca/cargo-modules/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/unit/ca/cargo-mommy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-mommy/default.nix rename to pkgs/unit/ca/cargo-mommy/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/unit/ca/cargo-play/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-play/default.nix rename to pkgs/unit/ca/cargo-play/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-profiler/default.nix b/pkgs/unit/ca/cargo-profiler/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-profiler/default.nix rename to pkgs/unit/ca/cargo-profiler/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/unit/ca/cargo-public-api/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-public-api/default.nix rename to pkgs/unit/ca/cargo-public-api/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/unit/ca/cargo-readme/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-readme/default.nix rename to pkgs/unit/ca/cargo-readme/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/unit/ca/cargo-release/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-release/default.nix rename to pkgs/unit/ca/cargo-release/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/unit/ca/cargo-rr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-rr/default.nix rename to pkgs/unit/ca/cargo-rr/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/unit/ca/cargo-semver-checks/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-semver-checks/default.nix rename to pkgs/unit/ca/cargo-semver-checks/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/unit/ca/cargo-show-asm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-show-asm/default.nix rename to pkgs/unit/ca/cargo-show-asm/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix b/pkgs/unit/ca/cargo-show-asm/test-basic-x86_64.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix rename to pkgs/unit/ca/cargo-show-asm/test-basic-x86_64.nix diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/unit/ca/cargo-sort/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-sort/default.nix rename to pkgs/unit/ca/cargo-sort/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/unit/ca/cargo-sweep/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-sweep/default.nix rename to pkgs/unit/ca/cargo-sweep/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/unit/ca/cargo-sync-readme/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-sync-readme/default.nix rename to pkgs/unit/ca/cargo-sync-readme/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/unit/ca/cargo-tally/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-tally/default.nix rename to pkgs/unit/ca/cargo-tally/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/unit/ca/cargo-tauri/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-tauri/default.nix rename to pkgs/unit/ca/cargo-tauri/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/unit/ca/cargo-temp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-temp/default.nix rename to pkgs/unit/ca/cargo-temp/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/unit/ca/cargo-unused-features/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-unused-features/default.nix rename to pkgs/unit/ca/cargo-unused-features/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/unit/ca/cargo-valgrind/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-valgrind/default.nix rename to pkgs/unit/ca/cargo-valgrind/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/unit/ca/cargo-wipe/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-wipe/default.nix rename to pkgs/unit/ca/cargo-wipe/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/unit/ca/cargo-xbuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-xbuild/default.nix rename to pkgs/unit/ca/cargo-xbuild/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/unit/ca/cargo-zigbuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-zigbuild/default.nix rename to pkgs/unit/ca/cargo-zigbuild/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/unit/ca/cargo2junit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cargo2junit/default.nix rename to pkgs/unit/ca/cargo2junit/pkg-fun.nix diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/unit/ca/cariddi/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cariddi/default.nix rename to pkgs/unit/ca/cariddi/pkg-fun.nix diff --git a/pkgs/data/fonts/carlito/calibri-alias.conf b/pkgs/unit/ca/carlito/calibri-alias.conf similarity index 100% rename from pkgs/data/fonts/carlito/calibri-alias.conf rename to pkgs/unit/ca/carlito/calibri-alias.conf diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/unit/ca/carlito/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/carlito/default.nix rename to pkgs/unit/ca/carlito/pkg-fun.nix diff --git a/pkgs/development/libraries/caroline/default.nix b/pkgs/unit/ca/caroline/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/caroline/default.nix rename to pkgs/unit/ca/caroline/pkg-fun.nix diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/unit/ca/carp/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/carp/default.nix rename to pkgs/unit/ca/carp/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/unit/ca/carps-cups/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/carps-cups/default.nix rename to pkgs/unit/ca/carps-cups/pkg-fun.nix diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/unit/ca/cascadia-code/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cascadia-code/default.nix rename to pkgs/unit/ca/cascadia-code/pkg-fun.nix diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/unit/ca/cassandra-cpp-driver/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cassandra-cpp-driver/default.nix rename to pkgs/unit/ca/cassandra-cpp-driver/pkg-fun.nix diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/unit/ca/cassowary/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cassowary/default.nix rename to pkgs/unit/ca/cassowary/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/unit/ca/castget/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/castget/default.nix rename to pkgs/unit/ca/castget/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/unit/ca/castor/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/castor/default.nix rename to pkgs/unit/ca/castor/pkg-fun.nix diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/unit/ca/castty/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/castty/default.nix rename to pkgs/unit/ca/castty/pkg-fun.nix diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/unit/ca/castxml/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/castxml/default.nix rename to pkgs/unit/ca/castxml/pkg-fun.nix diff --git a/pkgs/games/cataclysm-dda/builder.nix b/pkgs/unit/ca/cataclysmDDA/builder.nix similarity index 100% rename from pkgs/games/cataclysm-dda/builder.nix rename to pkgs/unit/ca/cataclysmDDA/builder.nix diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/unit/ca/cataclysmDDA/common.nix similarity index 100% rename from pkgs/games/cataclysm-dda/common.nix rename to pkgs/unit/ca/cataclysmDDA/common.nix diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/unit/ca/cataclysmDDA/git.nix similarity index 100% rename from pkgs/games/cataclysm-dda/git.nix rename to pkgs/unit/ca/cataclysmDDA/git.nix diff --git a/pkgs/games/cataclysm-dda/lib.nix b/pkgs/unit/ca/cataclysmDDA/lib.nix similarity index 100% rename from pkgs/games/cataclysm-dda/lib.nix rename to pkgs/unit/ca/cataclysmDDA/lib.nix diff --git a/pkgs/games/cataclysm-dda/locale-path-git.patch b/pkgs/unit/ca/cataclysmDDA/locale-path-git.patch similarity index 100% rename from pkgs/games/cataclysm-dda/locale-path-git.patch rename to pkgs/unit/ca/cataclysmDDA/locale-path-git.patch diff --git a/pkgs/games/cataclysm-dda/locale-path-stable.patch b/pkgs/unit/ca/cataclysmDDA/locale-path-stable.patch similarity index 100% rename from pkgs/games/cataclysm-dda/locale-path-stable.patch rename to pkgs/unit/ca/cataclysmDDA/locale-path-stable.patch diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/unit/ca/cataclysmDDA/pkg-fun.nix similarity index 100% rename from pkgs/games/cataclysm-dda/default.nix rename to pkgs/unit/ca/cataclysmDDA/pkg-fun.nix diff --git a/pkgs/games/cataclysm-dda/pkgs/default.nix b/pkgs/unit/ca/cataclysmDDA/pkgs/default.nix similarity index 100% rename from pkgs/games/cataclysm-dda/pkgs/default.nix rename to pkgs/unit/ca/cataclysmDDA/pkgs/default.nix diff --git a/pkgs/games/cataclysm-dda/pkgs/tilesets/UndeadPeople/default.nix b/pkgs/unit/ca/cataclysmDDA/pkgs/tilesets/UndeadPeople/default.nix similarity index 100% rename from pkgs/games/cataclysm-dda/pkgs/tilesets/UndeadPeople/default.nix rename to pkgs/unit/ca/cataclysmDDA/pkgs/tilesets/UndeadPeople/default.nix diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/unit/ca/cataclysmDDA/stable.nix similarity index 100% rename from pkgs/games/cataclysm-dda/stable.nix rename to pkgs/unit/ca/cataclysmDDA/stable.nix diff --git a/pkgs/games/cataclysm-dda/wrapper.nix b/pkgs/unit/ca/cataclysmDDA/wrapper.nix similarity index 100% rename from pkgs/games/cataclysm-dda/wrapper.nix rename to pkgs/unit/ca/cataclysmDDA/wrapper.nix diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/unit/ca/catatonit/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/catatonit/default.nix rename to pkgs/unit/ca/catatonit/pkg-fun.nix diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/unit/ca/catch/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/catch/default.nix rename to pkgs/unit/ca/catch/pkg-fun.nix diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/unit/ca/catch2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/catch2/default.nix rename to pkgs/unit/ca/catch2/pkg-fun.nix diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/unit/ca/catch2_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/catch2/3.nix rename to pkgs/unit/ca/catch2_3/pkg-fun.nix diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/unit/ca/catclock/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/catclock/default.nix rename to pkgs/unit/ca/catclock/pkg-fun.nix diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/unit/ca/catdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/catdoc/default.nix rename to pkgs/unit/ca/catdoc/pkg-fun.nix diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/unit/ca/catdocx/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/catdocx/default.nix rename to pkgs/unit/ca/catdocx/pkg-fun.nix diff --git a/pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff b/pkgs/unit/ca/catfs/fix-for-rust-1.65.diff similarity index 100% rename from pkgs/os-specific/linux/catfs/fix-for-rust-1.65.diff rename to pkgs/unit/ca/catfs/fix-for-rust-1.65.diff diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/unit/ca/catfs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/catfs/default.nix rename to pkgs/unit/ca/catfs/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/unit/ca/catgirl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/catgirl/default.nix rename to pkgs/unit/ca/catgirl/pkg-fun.nix diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/unit/ca/catimg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/catimg/default.nix rename to pkgs/unit/ca/catimg/pkg-fun.nix diff --git a/pkgs/data/icons/catppuccin-cursors/default.nix b/pkgs/unit/ca/catppuccin-cursors/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/catppuccin-cursors/default.nix rename to pkgs/unit/ca/catppuccin-cursors/pkg-fun.nix diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/unit/ca/catppuccin-gtk/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/catppuccin-gtk/default.nix rename to pkgs/unit/ca/catppuccin-gtk/pkg-fun.nix diff --git a/pkgs/data/themes/catppuccin-kde/default.nix b/pkgs/unit/ca/catppuccin-kde/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/catppuccin-kde/default.nix rename to pkgs/unit/ca/catppuccin-kde/pkg-fun.nix diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/unit/ca/catt/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/catt/default.nix rename to pkgs/unit/ca/catt/pkg-fun.nix diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/unit/ca/caudec/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/caudec/default.nix rename to pkgs/unit/ca/caudec/pkg-fun.nix diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/unit/ca/cauwugo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/cauwugo/default.nix rename to pkgs/unit/ca/cauwugo/pkg-fun.nix diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/unit/ca/cava/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cava/default.nix rename to pkgs/unit/ca/cava/pkg-fun.nix diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/unit/ca/cawbird/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cawbird/default.nix rename to pkgs/unit/ca/cawbird/pkg-fun.nix diff --git a/pkgs/servers/cayley/default.nix b/pkgs/unit/ca/cayley/pkg-fun.nix similarity index 100% rename from pkgs/servers/cayley/default.nix rename to pkgs/unit/ca/cayley/pkg-fun.nix diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/unit/cb/cbatticon/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cbatticon/default.nix rename to pkgs/unit/cb/cbatticon/pkg-fun.nix diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/unit/cb/cbc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/cbc/default.nix rename to pkgs/unit/cb/cbc/pkg-fun.nix diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/unit/cb/cbfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cbfmt/default.nix rename to pkgs/unit/cb/cbfmt/pkg-fun.nix diff --git a/pkgs/tools/networking/cbftp/default.nix b/pkgs/unit/cb/cbftp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cbftp/default.nix rename to pkgs/unit/cb/cbftp/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/unit/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch similarity index 100% rename from pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch rename to pkgs/unit/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/unit/cb/cbmc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cbmc/default.nix rename to pkgs/unit/cb/cbmc/pkg-fun.nix diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/unit/cb/cbonsai/pkg-fun.nix similarity index 100% rename from pkgs/games/cbonsai/default.nix rename to pkgs/unit/cb/cbonsai/pkg-fun.nix diff --git a/pkgs/development/tools/cbor-diag/Gemfile b/pkgs/unit/cb/cbor-diag/Gemfile similarity index 100% rename from pkgs/development/tools/cbor-diag/Gemfile rename to pkgs/unit/cb/cbor-diag/Gemfile diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/unit/cb/cbor-diag/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cbor-diag/Gemfile.lock rename to pkgs/unit/cb/cbor-diag/Gemfile.lock diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/unit/cb/cbor-diag/gemset.nix similarity index 100% rename from pkgs/development/tools/cbor-diag/gemset.nix rename to pkgs/unit/cb/cbor-diag/gemset.nix diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/unit/cb/cbor-diag/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cbor-diag/default.nix rename to pkgs/unit/cb/cbor-diag/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/unit/cb/cbrowser/backslashes-quotes.diff similarity index 100% rename from pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff rename to pkgs/unit/cb/cbrowser/backslashes-quotes.diff diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/unit/cb/cbrowser/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cbrowser/default.nix rename to pkgs/unit/cb/cbrowser/pkg-fun.nix diff --git a/pkgs/development/embedded/cc-tool/default.nix b/pkgs/unit/cc/cc-tool/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/cc-tool/default.nix rename to pkgs/unit/cc/cc-tool/pkg-fun.nix diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/unit/cc/cc65/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/cc65/default.nix rename to pkgs/unit/cc/cc65/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/pkgs/unit/cc/ccache/force-objdump-on-darwin.patch similarity index 100% rename from pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch rename to pkgs/unit/cc/ccache/force-objdump-on-darwin.patch diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/unit/cc/ccache/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ccache/default.nix rename to pkgs/unit/cc/ccache/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/cccc/cccc.patch b/pkgs/unit/cc/cccc/cccc.patch similarity index 100% rename from pkgs/development/tools/analysis/cccc/cccc.patch rename to pkgs/unit/cc/cccc/cccc.patch diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/unit/cc/cccc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/cccc/default.nix rename to pkgs/unit/cc/cccc/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/unit/cc/ccd2iso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/ccd2iso/default.nix rename to pkgs/unit/cc/ccd2iso/pkg-fun.nix diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/unit/cc/ccemux/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/ccemux/default.nix rename to pkgs/unit/cc/ccemux/pkg-fun.nix diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/unit/cc/ccextractor/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/ccextractor/default.nix rename to pkgs/unit/cc/ccextractor/pkg-fun.nix diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/unit/cc/ccid/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ccid/default.nix rename to pkgs/unit/cc/ccid/pkg-fun.nix diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/unit/cc/ccloud-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ccloud-cli/default.nix rename to pkgs/unit/cc/ccloud-cli/pkg-fun.nix diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/unit/cc/cconv/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/cconv/default.nix rename to pkgs/unit/cc/cconv/pkg-fun.nix diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/unit/cc/ccrtp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ccrtp/default.nix rename to pkgs/unit/cc/ccrtp/pkg-fun.nix diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/unit/cc/ccrypt/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ccrypt/default.nix rename to pkgs/unit/cc/ccrypt/pkg-fun.nix diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/unit/cc/ccsymbols/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ccsymbols/default.nix rename to pkgs/unit/cc/ccsymbols/pkg-fun.nix diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/unit/cc/ccze/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ccze/default.nix rename to pkgs/unit/cc/ccze/pkg-fun.nix diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/unit/cd/cddl/Gemfile similarity index 100% rename from pkgs/development/tools/cddl/Gemfile rename to pkgs/unit/cd/cddl/Gemfile diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/unit/cd/cddl/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cddl/Gemfile.lock rename to pkgs/unit/cd/cddl/Gemfile.lock diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/unit/cd/cddl/gemset.nix similarity index 100% rename from pkgs/development/tools/cddl/gemset.nix rename to pkgs/unit/cd/cddl/gemset.nix diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/unit/cd/cddl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cddl/default.nix rename to pkgs/unit/cd/cddl/pkg-fun.nix diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/unit/cd/cddlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cddlib/default.nix rename to pkgs/unit/cd/cddlib/pkg-fun.nix diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/unit/cd/cde/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/cde/default.nix rename to pkgs/unit/cd/cde/pkg-fun.nix diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/pkgs/unit/cd/cdecl/cdecl-2.5-lex.patch similarity index 100% rename from pkgs/development/tools/cdecl/cdecl-2.5-lex.patch rename to pkgs/unit/cd/cdecl/cdecl-2.5-lex.patch diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/unit/cd/cdecl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cdecl/default.nix rename to pkgs/unit/cd/cdecl/pkg-fun.nix diff --git a/pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch b/pkgs/unit/cd/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch similarity index 100% rename from pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch rename to pkgs/unit/cd/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch diff --git a/pkgs/desktops/cdesktopenv/2.3.2.patch b/pkgs/unit/cd/cdesktopenv/2.3.2.patch similarity index 100% rename from pkgs/desktops/cdesktopenv/2.3.2.patch rename to pkgs/unit/cd/cdesktopenv/2.3.2.patch diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/unit/cd/cdesktopenv/pkg-fun.nix similarity index 100% rename from pkgs/desktops/cdesktopenv/default.nix rename to pkgs/unit/cd/cdesktopenv/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/unit/cd/cdi2iso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/cdi2iso/default.nix rename to pkgs/unit/cd/cdi2iso/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/pkgs/unit/cd/cdimgtools/nrgtool_fix_my.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch rename to pkgs/unit/cd/cdimgtools/nrgtool_fix_my.patch diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/unit/cd/cdimgtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/cdimgtools/default.nix rename to pkgs/unit/cd/cdimgtools/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/pkgs/unit/cd/cdimgtools/removed_dvdcss_interface_2.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch rename to pkgs/unit/cd/cdimgtools/removed_dvdcss_interface_2.patch diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/unit/cd/cdk-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cdk-go/default.nix rename to pkgs/unit/cd/cdk-go/pkg-fun.nix diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/unit/cd/cdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cdk/default.nix rename to pkgs/unit/cd/cdk/pkg-fun.nix diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/unit/cd/cdo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cdo/default.nix rename to pkgs/unit/cd/cdo/pkg-fun.nix diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/unit/cd/cdogs-sdl/pkg-fun.nix similarity index 100% rename from pkgs/games/cdogs-sdl/default.nix rename to pkgs/unit/cd/cdogs-sdl/pkg-fun.nix diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/unit/cd/cdpr/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cdpr/default.nix rename to pkgs/unit/cd/cdpr/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch b/pkgs/unit/cd/cdrdao/adjust-includes-for-glibc-212.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch rename to pkgs/unit/cd/cdrdao/adjust-includes-for-glibc-212.patch diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/unit/cd/cdrdao/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/cdrdao/default.nix rename to pkgs/unit/cd/cdrdao/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch b/pkgs/unit/cd/cdrkit/cdrkit-1.1.11-fno-common.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch rename to pkgs/unit/cd/cdrkit/cdrkit-1.1.11-fno-common.patch diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/pkgs/unit/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch rename to pkgs/unit/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch diff --git a/pkgs/tools/cd-dvd/cdrkit/include-path.patch b/pkgs/unit/cd/cdrkit/include-path.patch similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/include-path.patch rename to pkgs/unit/cd/cdrkit/include-path.patch diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/unit/cd/cdrkit/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/cdrkit/default.nix rename to pkgs/unit/cd/cdrkit/pkg-fun.nix diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/unit/cd/cdxgen/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cdxgen/default.nix rename to pkgs/unit/cd/cdxgen/pkg-fun.nix diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/unit/ce/celf/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/celf/default.nix rename to pkgs/unit/ce/celf/pkg-fun.nix diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/unit/ce/celluloid/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/celluloid/default.nix rename to pkgs/unit/ce/celluloid/pkg-fun.nix diff --git a/pkgs/applications/emulators/cemu/cmakelists.patch b/pkgs/unit/ce/cemu/cmakelists.patch similarity index 100% rename from pkgs/applications/emulators/cemu/cmakelists.patch rename to pkgs/unit/ce/cemu/cmakelists.patch diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/unit/ce/cemu/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/cemu/default.nix rename to pkgs/unit/ce/cemu/pkg-fun.nix diff --git a/pkgs/applications/emulators/cen64/default.nix b/pkgs/unit/ce/cen64/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/cen64/default.nix rename to pkgs/unit/ce/cen64/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/unit/ce/centerim/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/centerim/default.nix rename to pkgs/unit/ce/centerim/pkg-fun.nix diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/unit/ce/ceph-csi/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/ceph-csi/default.nix rename to pkgs/unit/ce/ceph-csi/pkg-fun.nix diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/unit/ce/ceptre/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/ceptre/default.nix rename to pkgs/unit/ce/ceptre/pkg-fun.nix diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/unit/ce/cereal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cereal/default.nix rename to pkgs/unit/ce/cereal/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch b/pkgs/unit/ce/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch similarity index 100% rename from pkgs/development/libraries/physics/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch rename to pkgs/unit/ce/cernlib/0001-Use-strerror-rather-than-sys_errlist-to-fix-compilat.patch diff --git a/pkgs/development/libraries/physics/cernlib/patch.patch b/pkgs/unit/ce/cernlib/patch.patch similarity index 100% rename from pkgs/development/libraries/physics/cernlib/patch.patch rename to pkgs/unit/ce/cernlib/patch.patch diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/unit/ce/cernlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/cernlib/default.nix rename to pkgs/unit/ce/cernlib/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/unit/ce/cernlib/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/physics/cernlib/setup-hook.sh rename to pkgs/unit/ce/cernlib/setup-hook.sh diff --git a/pkgs/tools/security/certgraph/default.nix b/pkgs/unit/ce/certgraph/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/certgraph/default.nix rename to pkgs/unit/ce/certgraph/pkg-fun.nix diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/unit/ce/certigo/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/certigo/default.nix rename to pkgs/unit/ce/certigo/pkg-fun.nix diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/unit/ce/certipy/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/certipy/default.nix rename to pkgs/unit/ce/certipy/pkg-fun.nix diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/unit/ce/certstrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/certstrap/default.nix rename to pkgs/unit/ce/certstrap/pkg-fun.nix diff --git a/pkgs/tools/security/cewl/Gemfile b/pkgs/unit/ce/cewl/Gemfile similarity index 100% rename from pkgs/tools/security/cewl/Gemfile rename to pkgs/unit/ce/cewl/Gemfile diff --git a/pkgs/tools/security/cewl/Gemfile.lock b/pkgs/unit/ce/cewl/Gemfile.lock similarity index 100% rename from pkgs/tools/security/cewl/Gemfile.lock rename to pkgs/unit/ce/cewl/Gemfile.lock diff --git a/pkgs/tools/security/cewl/gemset.nix b/pkgs/unit/ce/cewl/gemset.nix similarity index 100% rename from pkgs/tools/security/cewl/gemset.nix rename to pkgs/unit/ce/cewl/gemset.nix diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/unit/ce/cewl/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cewl/default.nix rename to pkgs/unit/ce/cewl/pkg-fun.nix diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/unit/cf/cf-terraforming/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cf-terraforming/default.nix rename to pkgs/unit/cf/cf-terraforming/pkg-fun.nix diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/unit/cf/cf-vault/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/cf-vault/default.nix rename to pkgs/unit/cf/cf-vault/pkg-fun.nix diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/unit/cf/cfdg/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/cfdg/default.nix rename to pkgs/unit/cf/cfdg/pkg-fun.nix diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/unit/cf/cfdg/src-info-for-default.nix similarity index 100% rename from pkgs/tools/graphics/cfdg/src-info-for-default.nix rename to pkgs/unit/cf/cfdg/src-info-for-default.nix diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch b/pkgs/unit/cf/cfitsio/darwin-rpath-universal.patch similarity index 100% rename from pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch rename to pkgs/unit/cf/cfitsio/darwin-rpath-universal.patch diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/unit/cf/cfitsio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/cfitsio/default.nix rename to pkgs/unit/cf/cfitsio/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/unit/cf/cflow/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cflow/default.nix rename to pkgs/unit/cf/cflow/pkg-fun.nix diff --git a/pkgs/applications/file-managers/cfm/default.nix b/pkgs/unit/cf/cfm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/cfm/default.nix rename to pkgs/unit/cf/cfm/pkg-fun.nix diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/unit/cf/cfn-nag/Gemfile similarity index 100% rename from pkgs/development/tools/cfn-nag/Gemfile rename to pkgs/unit/cf/cfn-nag/Gemfile diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/unit/cf/cfn-nag/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cfn-nag/Gemfile.lock rename to pkgs/unit/cf/cfn-nag/Gemfile.lock diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/unit/cf/cfn-nag/gemset.nix similarity index 100% rename from pkgs/development/tools/cfn-nag/gemset.nix rename to pkgs/unit/cf/cfn-nag/gemset.nix diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/unit/cf/cfn-nag/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cfn-nag/default.nix rename to pkgs/unit/cf/cfn-nag/pkg-fun.nix diff --git a/pkgs/tools/misc/cfonts/default.nix b/pkgs/unit/cf/cfonts/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cfonts/default.nix rename to pkgs/unit/cf/cfonts/pkg-fun.nix diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/unit/cf/cfr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/cfr/default.nix rename to pkgs/unit/cf/cfr/pkg-fun.nix diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/unit/cf/cfripper/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cfripper/default.nix rename to pkgs/unit/cf/cfripper/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix b/pkgs/unit/cf/cfs-zen-tweaks/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cfs-zen-tweaks/default.nix rename to pkgs/unit/cf/cfs-zen-tweaks/pkg-fun.nix diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/unit/cf/cfssl/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cfssl/default.nix rename to pkgs/unit/cf/cfssl/pkg-fun.nix diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/unit/cg/cg3/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/cg3/default.nix rename to pkgs/unit/cg/cg3/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/unit/cg/cgdb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cgdb/default.nix rename to pkgs/unit/cg/cgdb/pkg-fun.nix diff --git a/pkgs/servers/http/cgiserver/default.nix b/pkgs/unit/cg/cgiserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/cgiserver/default.nix rename to pkgs/unit/cg/cgiserver/pkg-fun.nix diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/unit/cg/cglm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cglm/default.nix rename to pkgs/unit/cg/cglm/pkg-fun.nix diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/unit/cg/cgminer/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/cgminer/default.nix rename to pkgs/unit/cg/cgminer/pkg-fun.nix diff --git a/pkgs/games/cgoban/default.nix b/pkgs/unit/cg/cgoban/pkg-fun.nix similarity index 100% rename from pkgs/games/cgoban/default.nix rename to pkgs/unit/cg/cgoban/pkg-fun.nix diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/unit/cg/cgreen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cgreen/default.nix rename to pkgs/unit/cg/cgreen/pkg-fun.nix diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/unit/cg/cgui/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cgui/default.nix rename to pkgs/unit/cg/cgui/pkg-fun.nix diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/unit/ch/CHOWTapeModel/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/CHOWTapeModel/default.nix rename to pkgs/unit/ch/CHOWTapeModel/pkg-fun.nix diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/unit/ch/ChowCentaur/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ChowCentaur/default.nix rename to pkgs/unit/ch/ChowCentaur/pkg-fun.nix diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/unit/ch/ChowKick/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ChowKick/default.nix rename to pkgs/unit/ch/ChowKick/pkg-fun.nix diff --git a/pkgs/applications/audio/ChowPhaser/default.nix b/pkgs/unit/ch/ChowPhaser/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ChowPhaser/default.nix rename to pkgs/unit/ch/ChowPhaser/pkg-fun.nix diff --git a/pkgs/tools/security/chain-bench/default.nix b/pkgs/unit/ch/chain-bench/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/chain-bench/default.nix rename to pkgs/unit/ch/chain-bench/pkg-fun.nix diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/unit/ch/chamber/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/chamber/default.nix rename to pkgs/unit/ch/chamber/pkg-fun.nix diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/unit/ch/changedetection-io/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/changedetection-io/default.nix rename to pkgs/unit/ch/changedetection-io/pkg-fun.nix diff --git a/pkgs/tools/misc/changelogger/default.nix b/pkgs/unit/ch/changelogger/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/changelogger/default.nix rename to pkgs/unit/ch/changelogger/pkg-fun.nix diff --git a/pkgs/tools/networking/changetower/default.nix b/pkgs/unit/ch/changetower/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/changetower/default.nix rename to pkgs/unit/ch/changetower/pkg-fun.nix diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/unit/ch/changie/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/changie/default.nix rename to pkgs/unit/ch/changie/pkg-fun.nix diff --git a/pkgs/development/tools/changie/skip-flaky-test.patch b/pkgs/unit/ch/changie/skip-flaky-test.patch similarity index 100% rename from pkgs/development/tools/changie/skip-flaky-test.patch rename to pkgs/unit/ch/changie/skip-flaky-test.patch diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/unit/ch/chaos/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/chaos/default.nix rename to pkgs/unit/ch/chaos/pkg-fun.nix diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/unit/ch/charge-lnd/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/charge-lnd/default.nix rename to pkgs/unit/ch/charge-lnd/pkg-fun.nix diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/unit/ch/charis-sil/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/charis-sil/default.nix rename to pkgs/unit/ch/charis-sil/pkg-fun.nix diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/unit/ch/charliecloud/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/charliecloud/default.nix rename to pkgs/unit/ch/charliecloud/pkg-fun.nix diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/unit/ch/charls/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/charls/default.nix rename to pkgs/unit/ch/charls/pkg-fun.nix diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/unit/ch/charm/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/charm/default.nix rename to pkgs/unit/ch/charm/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/unit/ch/chart-testing/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm/chart-testing/default.nix rename to pkgs/unit/ch/chart-testing/pkg-fun.nix diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/unit/ch/chase/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/chase/default.nix rename to pkgs/unit/ch/chase/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/unit/ch/chatty/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/chatty/default.nix rename to pkgs/unit/ch/chatty/pkg-fun.nix diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/unit/ch/cheat/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cheat/default.nix rename to pkgs/unit/ch/cheat/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/unit/ch/check-esxi-hardware/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/plugins/esxi.nix rename to pkgs/unit/ch/check-esxi-hardware/pkg-fun.nix diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/unit/ch/check-jsonschema/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/check-jsonschema/default.nix rename to pkgs/unit/ch/check-jsonschema/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/openvpn.nix b/pkgs/unit/ch/check-openvpn/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/plugins/openvpn.nix rename to pkgs/unit/ch/check-openvpn/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/unit/ch/check-uptime/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/plugins/uptime.nix rename to pkgs/unit/ch/check-uptime/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/pkgs/unit/ch/check-wmiplus/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/plugins/wmiplus/default.nix rename to pkgs/unit/ch/check-wmiplus/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch b/pkgs/unit/ch/check-wmiplus/wmiplus_fix_manpage.patch similarity index 100% rename from pkgs/servers/monitoring/plugins/wmiplus/wmiplus_fix_manpage.patch rename to pkgs/unit/ch/check-wmiplus/wmiplus_fix_manpage.patch diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/unit/ch/checkSSLCert/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix rename to pkgs/unit/ch/checkSSLCert/pkg-fun.nix diff --git a/pkgs/servers/monitoring/nagios/plugins/smartmon.nix b/pkgs/unit/ch/check_smartmon/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/nagios/plugins/smartmon.nix rename to pkgs/unit/ch/check_smartmon/pkg-fun.nix diff --git a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/pkgs/unit/ch/check_systemd/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/nagios/plugins/check_systemd.nix rename to pkgs/unit/ch/check_systemd/pkg-fun.nix diff --git a/pkgs/servers/monitoring/nagios/plugins/zfs.nix b/pkgs/unit/ch/check_zfs/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/nagios/plugins/zfs.nix rename to pkgs/unit/ch/check_zfs/pkg-fun.nix diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/unit/ch/checkbashisms/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/checkbashisms/default.nix rename to pkgs/unit/ch/checkbashisms/pkg-fun.nix diff --git a/pkgs/tools/package-management/checkinstall/empty-dirs.patch b/pkgs/unit/ch/checkinstall/empty-dirs.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/empty-dirs.patch rename to pkgs/unit/ch/checkinstall/empty-dirs.patch diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/pkgs/unit/ch/checkinstall/etc-dirs.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/etc-dirs.patch rename to pkgs/unit/ch/checkinstall/etc-dirs.patch diff --git a/pkgs/tools/package-management/checkinstall/glibc-check.patch b/pkgs/unit/ch/checkinstall/glibc-check.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/glibc-check.patch rename to pkgs/unit/ch/checkinstall/glibc-check.patch diff --git a/pkgs/tools/package-management/checkinstall/missing-functions.patch b/pkgs/unit/ch/checkinstall/missing-functions.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/missing-functions.patch rename to pkgs/unit/ch/checkinstall/missing-functions.patch diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/unit/ch/checkinstall/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/checkinstall/default.nix rename to pkgs/unit/ch/checkinstall/pkg-fun.nix diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/pkgs/unit/ch/checkinstall/readlink-types.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/readlink-types.patch rename to pkgs/unit/ch/checkinstall/readlink-types.patch diff --git a/pkgs/tools/package-management/checkinstall/scandir.patch b/pkgs/unit/ch/checkinstall/scandir.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/scandir.patch rename to pkgs/unit/ch/checkinstall/scandir.patch diff --git a/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/pkgs/unit/ch/checkinstall/set-buildroot.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/set-buildroot.patch rename to pkgs/unit/ch/checkinstall/set-buildroot.patch diff --git a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/pkgs/unit/ch/checkinstall/use-old-memcpy.patch similarity index 100% rename from pkgs/tools/package-management/checkinstall/use-old-memcpy.patch rename to pkgs/unit/ch/checkinstall/use-old-memcpy.patch diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/unit/ch/checkip/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/checkip/default.nix rename to pkgs/unit/ch/checkip/pkg-fun.nix diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/unit/ch/checkmake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/checkmake/default.nix rename to pkgs/unit/ch/checkmake/pkg-fun.nix diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/unit/ch/checkmate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/checkmate/default.nix rename to pkgs/unit/ch/checkmate/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch b/pkgs/unit/ch/checkov/flake8-compat-5.x.patch similarity index 100% rename from pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch rename to pkgs/unit/ch/checkov/flake8-compat-5.x.patch diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/unit/ch/checkov/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/checkov/default.nix rename to pkgs/unit/ch/checkov/pkg-fun.nix diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/unit/ch/checkpolicy/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/checkpolicy/default.nix rename to pkgs/unit/ch/checkpolicy/pkg-fun.nix diff --git a/pkgs/development/mobile/checkra1n/default.nix b/pkgs/unit/ch/checkra1n/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/checkra1n/default.nix rename to pkgs/unit/ch/checkra1n/pkg-fun.nix diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/unit/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch similarity index 100% rename from pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch rename to pkgs/unit/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/unit/ch/checksec/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/checksec/default.nix rename to pkgs/unit/ch/checksec/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/unit/ch/checkstyle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/checkstyle/default.nix rename to pkgs/unit/ch/checkstyle/pkg-fun.nix diff --git a/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch b/pkgs/unit/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch similarity index 100% rename from pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch rename to pkgs/unit/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch diff --git a/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch b/pkgs/unit/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch similarity index 100% rename from pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch rename to pkgs/unit/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/unit/ch/cheesecutter/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cheesecutter/default.nix rename to pkgs/unit/ch/cheesecutter/pkg-fun.nix diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/unit/ch/chefdk/Gemfile similarity index 100% rename from pkgs/development/tools/chefdk/Gemfile rename to pkgs/unit/ch/chefdk/Gemfile diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/unit/ch/chefdk/Gemfile.lock similarity index 100% rename from pkgs/development/tools/chefdk/Gemfile.lock rename to pkgs/unit/ch/chefdk/Gemfile.lock diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/unit/ch/chefdk/gemset.nix similarity index 100% rename from pkgs/development/tools/chefdk/gemset.nix rename to pkgs/unit/ch/chefdk/gemset.nix diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/unit/ch/chefdk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/chefdk/default.nix rename to pkgs/unit/ch/chefdk/pkg-fun.nix diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/unit/ch/chelf/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/chelf/default.nix rename to pkgs/unit/ch/chelf/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/unit/ch/chemtool/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/chemtool/default.nix rename to pkgs/unit/ch/chemtool/pkg-fun.nix diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/unit/ch/cherry/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cherry/default.nix rename to pkgs/unit/ch/cherry/pkg-fun.nix diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/unit/ch/cherrytree/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cherrytree/default.nix rename to pkgs/unit/ch/cherrytree/pkg-fun.nix diff --git a/pkgs/games/chessdb/default.nix b/pkgs/unit/ch/chessdb/pkg-fun.nix similarity index 100% rename from pkgs/games/chessdb/default.nix rename to pkgs/unit/ch/chessdb/pkg-fun.nix diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/unit/ch/chez-matchable/pkg-fun.nix similarity index 100% rename from pkgs/development/chez-modules/chez-matchable/default.nix rename to pkgs/unit/ch/chez-matchable/pkg-fun.nix diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/unit/ch/chez-mit/pkg-fun.nix similarity index 100% rename from pkgs/development/chez-modules/chez-mit/default.nix rename to pkgs/unit/ch/chez-mit/pkg-fun.nix diff --git a/pkgs/development/compilers/chez-racket/default.nix b/pkgs/unit/ch/chez-racket/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/chez-racket/default.nix rename to pkgs/unit/ch/chez-racket/pkg-fun.nix diff --git a/pkgs/development/compilers/chez-racket/setup-hook.sh b/pkgs/unit/ch/chez-racket/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/chez-racket/setup-hook.sh rename to pkgs/unit/ch/chez-racket/setup-hook.sh diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/unit/ch/chez-racket/shared.nix similarity index 100% rename from pkgs/development/compilers/chez-racket/shared.nix rename to pkgs/unit/ch/chez-racket/shared.nix diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/unit/ch/chez-scmutils/pkg-fun.nix similarity index 100% rename from pkgs/development/chez-modules/chez-scmutils/default.nix rename to pkgs/unit/ch/chez-scmutils/pkg-fun.nix diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/unit/ch/chez-srfi/pkg-fun.nix similarity index 100% rename from pkgs/development/chez-modules/chez-srfi/default.nix rename to pkgs/unit/ch/chez-srfi/pkg-fun.nix diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/unit/ch/chezmoi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/chezmoi/default.nix rename to pkgs/unit/ch/chezmoi/pkg-fun.nix diff --git a/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch b/pkgs/unit/ch/chia-dev-tools/fix-paths.patch similarity index 100% rename from pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch rename to pkgs/unit/ch/chia-dev-tools/fix-paths.patch diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/unit/ch/chia-dev-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/chia-dev-tools/default.nix rename to pkgs/unit/ch/chia-dev-tools/pkg-fun.nix diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/unit/ch/chia-plotter/dont_fetch_dependencies.patch similarity index 100% rename from pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch rename to pkgs/unit/ch/chia-plotter/dont_fetch_dependencies.patch diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/unit/ch/chia-plotter/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/chia-plotter/default.nix rename to pkgs/unit/ch/chia-plotter/pkg-fun.nix diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/unit/ch/chia/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/chia/default.nix rename to pkgs/unit/ch/chia/pkg-fun.nix diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/unit/ch/chibi/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/chibi/default.nix rename to pkgs/unit/ch/chibi/pkg-fun.nix diff --git a/pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch b/pkgs/unit/ch/chickenPackages_4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch similarity index 100% rename from pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch rename to pkgs/unit/ch/chickenPackages_4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/unit/ch/chickenPackages_4/chicken.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/chicken.nix rename to pkgs/unit/ch/chickenPackages_4/chicken.nix diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/unit/ch/chickenPackages_4/egg2nix.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/egg2nix.nix rename to pkgs/unit/ch/chickenPackages_4/egg2nix.nix diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/unit/ch/chickenPackages_4/eggDerivation.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/eggDerivation.nix rename to pkgs/unit/ch/chickenPackages_4/eggDerivation.nix diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/unit/ch/chickenPackages_4/eggs.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/eggs.nix rename to pkgs/unit/ch/chickenPackages_4/eggs.nix diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/unit/ch/chickenPackages_4/fetchegg/builder.sh similarity index 100% rename from pkgs/development/compilers/chicken/4/fetchegg/builder.sh rename to pkgs/unit/ch/chickenPackages_4/fetchegg/builder.sh diff --git a/pkgs/development/compilers/chicken/4/fetchegg/default.nix b/pkgs/unit/ch/chickenPackages_4/fetchegg/default.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/fetchegg/default.nix rename to pkgs/unit/ch/chickenPackages_4/fetchegg/default.nix diff --git a/pkgs/development/compilers/chicken/4/overrides.nix b/pkgs/unit/ch/chickenPackages_4/overrides.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/overrides.nix rename to pkgs/unit/ch/chickenPackages_4/overrides.nix diff --git a/pkgs/development/compilers/chicken/4/default.nix b/pkgs/unit/ch/chickenPackages_4/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/chicken/4/default.nix rename to pkgs/unit/ch/chickenPackages_4/pkg-fun.nix diff --git a/pkgs/development/compilers/chicken/4/setup-hook.sh b/pkgs/unit/ch/chickenPackages_4/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/chicken/4/setup-hook.sh rename to pkgs/unit/ch/chickenPackages_4/setup-hook.sh diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/unit/ch/chickenPackages_5/chicken.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/chicken.nix rename to pkgs/unit/ch/chickenPackages_5/chicken.nix diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/unit/ch/chickenPackages_5/egg2nix.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/egg2nix.nix rename to pkgs/unit/ch/chickenPackages_5/egg2nix.nix diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/unit/ch/chickenPackages_5/eggDerivation.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/eggDerivation.nix rename to pkgs/unit/ch/chickenPackages_5/eggDerivation.nix diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/unit/ch/chickenPackages_5/eggs.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/eggs.nix rename to pkgs/unit/ch/chickenPackages_5/eggs.nix diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/pkgs/unit/ch/chickenPackages_5/fetchegg/builder.sh similarity index 100% rename from pkgs/development/compilers/chicken/5/fetchegg/builder.sh rename to pkgs/unit/ch/chickenPackages_5/fetchegg/builder.sh diff --git a/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/pkgs/unit/ch/chickenPackages_5/fetchegg/default.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/fetchegg/default.nix rename to pkgs/unit/ch/chickenPackages_5/fetchegg/default.nix diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/unit/ch/chickenPackages_5/overrides.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/overrides.nix rename to pkgs/unit/ch/chickenPackages_5/overrides.nix diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/unit/ch/chickenPackages_5/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/chicken/5/default.nix rename to pkgs/unit/ch/chickenPackages_5/pkg-fun.nix diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/unit/ch/chickenPackages_5/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/chicken/5/setup-hook.sh rename to pkgs/unit/ch/chickenPackages_5/setup-hook.sh diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/unit/ch/chipmunk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/chipmunk/default.nix rename to pkgs/unit/ch/chipmunk/pkg-fun.nix diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/unit/ch/chirp/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/chirp/default.nix rename to pkgs/unit/ch/chirp/pkg-fun.nix diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/unit/ch/chisel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/chisel/default.nix rename to pkgs/unit/ch/chisel/pkg-fun.nix diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/unit/ch/chkcrontab/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/chkcrontab/default.nix rename to pkgs/unit/ch/chkcrontab/pkg-fun.nix diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/unit/ch/chkrootkit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/chkrootkit/default.nix rename to pkgs/unit/ch/chkrootkit/pkg-fun.nix diff --git a/pkgs/tools/admin/chkservice/default.nix b/pkgs/unit/ch/chkservice/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/chkservice/default.nix rename to pkgs/unit/ch/chkservice/pkg-fun.nix diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/unit/ch/chmlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/chmlib/default.nix rename to pkgs/unit/ch/chmlib/pkg-fun.nix diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/pkgs/unit/ch/chntpw/00-chntpw-build-arch-autodetect.patch similarity index 100% rename from pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch rename to pkgs/unit/ch/chntpw/00-chntpw-build-arch-autodetect.patch diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/pkgs/unit/ch/chntpw/01-chntpw-install-target.patch similarity index 100% rename from pkgs/tools/security/chntpw/01-chntpw-install-target.patch rename to pkgs/unit/ch/chntpw/01-chntpw-install-target.patch diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/unit/ch/chntpw/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/chntpw/default.nix rename to pkgs/unit/ch/chntpw/pkg-fun.nix diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/unit/ch/chocolateDoom/pkg-fun.nix similarity index 100% rename from pkgs/games/chocolate-doom/default.nix rename to pkgs/unit/ch/chocolateDoom/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/unit/ch/cholmod-extra/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/cholmod-extra/default.nix rename to pkgs/unit/ch/cholmod-extra/pkg-fun.nix diff --git a/pkgs/data/fonts/chonburi/default.nix b/pkgs/unit/ch/chonburi-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/chonburi/default.nix rename to pkgs/unit/ch/chonburi-font/pkg-fun.nix diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/unit/ch/choose/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/choose/default.nix rename to pkgs/unit/ch/choose/pkg-fun.nix diff --git a/pkgs/tools/security/chopchop/default.nix b/pkgs/unit/ch/chopchop/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/chopchop/default.nix rename to pkgs/unit/ch/chopchop/pkg-fun.nix diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/unit/ch/chroma/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/chroma/default.nix rename to pkgs/unit/ch/chroma/pkg-fun.nix diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/unit/ch/chroma/src.json similarity index 100% rename from pkgs/tools/text/chroma/src.json rename to pkgs/unit/ch/chroma/src.json diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/unit/ch/chromaprint/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/chromaprint/default.nix rename to pkgs/unit/ch/chromaprint/pkg-fun.nix diff --git a/pkgs/tools/misc/chrome-export/default.nix b/pkgs/unit/ch/chrome-export/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/chrome-export/default.nix rename to pkgs/unit/ch/chrome-export/pkg-fun.nix diff --git a/pkgs/games/chromium-bsu/default.nix b/pkgs/unit/ch/chromium-bsu/pkg-fun.nix similarity index 100% rename from pkgs/games/chromium-bsu/default.nix rename to pkgs/unit/ch/chromium-bsu/pkg-fun.nix diff --git a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/pkgs/unit/ch/chromium-xorg-conf/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/chromium-xorg-conf/default.nix rename to pkgs/unit/ch/chromium-xorg-conf/pkg-fun.nix diff --git a/pkgs/tools/networking/chrony/makefile.patch b/pkgs/unit/ch/chrony/makefile.patch similarity index 100% rename from pkgs/tools/networking/chrony/makefile.patch rename to pkgs/unit/ch/chrony/makefile.patch diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/unit/ch/chrony/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/chrony/default.nix rename to pkgs/unit/ch/chrony/pkg-fun.nix diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/unit/ch/chrpath/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/chrpath/default.nix rename to pkgs/unit/ch/chrpath/pkg-fun.nix diff --git a/pkgs/development/tools/misc/chruby-fish/default.nix b/pkgs/unit/ch/chruby-fish/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/chruby-fish/default.nix rename to pkgs/unit/ch/chruby-fish/pkg-fun.nix diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/unit/ch/chrysalis/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/chrysalis/default.nix rename to pkgs/unit/ch/chrysalis/pkg-fun.nix diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/unit/ch/cht-sh/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cht.sh/default.nix rename to pkgs/unit/ch/cht-sh/pkg-fun.nix diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/unit/ch/chunkfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/chunkfs/default.nix rename to pkgs/unit/ch/chunkfs/pkg-fun.nix diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/unit/ch/chunksync/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/chunksync/default.nix rename to pkgs/unit/ch/chunksync/pkg-fun.nix diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/unit/ci/ciao/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ciao/default.nix rename to pkgs/unit/ci/ciao/pkg-fun.nix diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/unit/ci/cicero-tui/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cicero-tui/default.nix rename to pkgs/unit/ci/cicero-tui/pkg-fun.nix diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/unit/ci/cider/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cider/default.nix rename to pkgs/unit/ci/cider/pkg-fun.nix diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/unit/ci/cidrgrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/cidrgrep/default.nix rename to pkgs/unit/ci/cidrgrep/pkg-fun.nix diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/unit/ci/cie-middleware-linux/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cie-middleware-linux/default.nix rename to pkgs/unit/ci/cie-middleware-linux/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/unit/ci/cifs-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cifs-utils/default.nix rename to pkgs/unit/ci/cifs-utils/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/unit/ci/cilium-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/cilium/default.nix rename to pkgs/unit/ci/cilium-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/unit/ci/cimg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cimg/default.nix rename to pkgs/unit/ci/cimg/pkg-fun.nix diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/unit/ci/cinelerra/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/cinelerra/default.nix rename to pkgs/unit/ci/cinelerra/pkg-fun.nix diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/unit/ci/ciopfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/ciopfs/default.nix rename to pkgs/unit/ci/ciopfs/pkg-fun.nix diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/unit/ci/cipher/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cipher/default.nix rename to pkgs/unit/ci/cipher/pkg-fun.nix diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/unit/ci/circleci-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/circleci-cli/default.nix rename to pkgs/unit/ci/circleci-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/unit/ci/circumflex/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/circumflex/default.nix rename to pkgs/unit/ci/circumflex/pkg-fun.nix diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/unit/ci/circup/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/circup/default.nix rename to pkgs/unit/ci/circup/pkg-fun.nix diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/unit/ci/circus/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/circus/default.nix rename to pkgs/unit/ci/circus/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/unit/ci/cirrus-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/cirrus-cli/default.nix rename to pkgs/unit/ci/cirrus-cli/pkg-fun.nix diff --git a/pkgs/tools/security/cirrusgo/default.nix b/pkgs/unit/ci/cirrusgo/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cirrusgo/default.nix rename to pkgs/unit/ci/cirrusgo/pkg-fun.nix diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/unit/ci/ciscoPacketTracer7/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cisco-packet-tracer/7.nix rename to pkgs/unit/ci/ciscoPacketTracer7/pkg-fun.nix diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/unit/ci/ciscoPacketTracer8/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cisco-packet-tracer/8.nix rename to pkgs/unit/ci/ciscoPacketTracer8/pkg-fun.nix diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/unit/ci/citations/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/citations/default.nix rename to pkgs/unit/ci/citations/pkg-fun.nix diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/unit/ci/civetweb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/civetweb/default.nix rename to pkgs/unit/ci/civetweb/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/unit/ci/civo/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/civo/default.nix rename to pkgs/unit/ci/civo/pkg-fun.nix diff --git a/pkgs/tools/admin/cjdns-tools/default.nix b/pkgs/unit/cj/cjdns-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/cjdns-tools/default.nix rename to pkgs/unit/cj/cjdns-tools/pkg-fun.nix diff --git a/pkgs/tools/admin/cjdns-tools/wrapper.sh b/pkgs/unit/cj/cjdns-tools/wrapper.sh similarity index 100% rename from pkgs/tools/admin/cjdns-tools/wrapper.sh rename to pkgs/unit/cj/cjdns-tools/wrapper.sh diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/unit/cj/cjdns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cjdns/default.nix rename to pkgs/unit/cj/cjdns/pkg-fun.nix diff --git a/pkgs/development/libraries/cjose/default.nix b/pkgs/unit/cj/cjose/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cjose/default.nix rename to pkgs/unit/cj/cjose/pkg-fun.nix diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/unit/cj/cjson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cjson/default.nix rename to pkgs/unit/cj/cjson/pkg-fun.nix diff --git a/pkgs/games/ckan/default.nix b/pkgs/unit/ck/ckan/pkg-fun.nix similarity index 100% rename from pkgs/games/ckan/default.nix rename to pkgs/unit/ck/ckan/pkg-fun.nix diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/unit/ck/ckbcomp/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/ckbcomp/default.nix rename to pkgs/unit/ck/ckbcomp/pkg-fun.nix diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/unit/ck/cksfv/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cksfv/default.nix rename to pkgs/unit/ck/cksfv/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/unit/cl/cl-launch/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cl-launch/default.nix rename to pkgs/unit/cl/cl-launch/pkg-fun.nix diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/unit/cl/cl-wordle/pkg-fun.nix similarity index 100% rename from pkgs/games/cl-wordle/default.nix rename to pkgs/unit/cl/cl-wordle/pkg-fun.nix diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/unit/cl/clac/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clac/default.nix rename to pkgs/unit/cl/clac/pkg-fun.nix diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/unit/cl/clair/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/clair/default.nix rename to pkgs/unit/cl/clair/pkg-fun.nix diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/unit/cl/clairvoyance/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/clairvoyance/default.nix rename to pkgs/unit/cl/clairvoyance/pkg-fun.nix diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/pkgs/unit/cl/clamsmtp/header-order.patch similarity index 100% rename from pkgs/servers/mail/clamsmtp/header-order.patch rename to pkgs/unit/cl/clamsmtp/header-order.patch diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/unit/cl/clamsmtp/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/clamsmtp/default.nix rename to pkgs/unit/cl/clamsmtp/pkg-fun.nix diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/unit/cl/clanlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clanlib/default.nix rename to pkgs/unit/cl/clanlib/pkg-fun.nix diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/unit/cl/clapper/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/clapper/default.nix rename to pkgs/unit/cl/clapper/pkg-fun.nix diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/unit/cl/clash-geoip/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/clash-geoip/default.nix rename to pkgs/unit/cl/clash-geoip/pkg-fun.nix diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/unit/cl/clash/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/clash/default.nix rename to pkgs/unit/cl/clash/pkg-fun.nix diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/unit/cl/classads/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/classads/default.nix rename to pkgs/unit/cl/classads/pkg-fun.nix diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/unit/cl/classicube/fix-linking.patch similarity index 100% rename from pkgs/games/classicube/fix-linking.patch rename to pkgs/unit/cl/classicube/fix-linking.patch diff --git a/pkgs/games/classicube/font-location.patch b/pkgs/unit/cl/classicube/font-location.patch similarity index 100% rename from pkgs/games/classicube/font-location.patch rename to pkgs/unit/cl/classicube/font-location.patch diff --git a/pkgs/games/classicube/default.nix b/pkgs/unit/cl/classicube/pkg-fun.nix similarity index 100% rename from pkgs/games/classicube/default.nix rename to pkgs/unit/cl/classicube/pkg-fun.nix diff --git a/pkgs/games/classicube/use-sdl.patch b/pkgs/unit/cl/classicube/use-sdl.patch similarity index 100% rename from pkgs/games/classicube/use-sdl.patch rename to pkgs/unit/cl/classicube/use-sdl.patch diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/unit/cl/claws-mail/mime.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/claws-mail/mime.patch rename to pkgs/unit/cl/claws-mail/mime.patch diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/unit/cl/claws-mail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/claws-mail/default.nix rename to pkgs/unit/cl/claws-mail/pkg-fun.nix diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/unit/cl/claws/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/claws/default.nix rename to pkgs/unit/cl/claws/pkg-fun.nix diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/unit/cl/clboss/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/clboss/default.nix rename to pkgs/unit/cl/clboss/pkg-fun.nix diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/unit/cl/cldr-annotations/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/cldr-annotations/default.nix rename to pkgs/unit/cl/cldr-annotations/pkg-fun.nix diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/unit/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch similarity index 100% rename from pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch rename to pkgs/unit/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/unit/cl/clean/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/clean/default.nix rename to pkgs/unit/cl/clean/pkg-fun.nix diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/pkgs/unit/cl/clearlooks-phenix/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/clearlooks-phenix/default.nix rename to pkgs/unit/cl/clearlooks-phenix/pkg-fun.nix diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/unit/cl/clearlyU/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/clearlyU/default.nix rename to pkgs/unit/cl/clearlyU/pkg-fun.nix diff --git a/pkgs/tools/misc/clematis/default.nix b/pkgs/unit/cl/clematis/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clematis/default.nix rename to pkgs/unit/cl/clematis/pkg-fun.nix diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/unit/cl/clerk/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/clerk/default.nix rename to pkgs/unit/cl/clerk/pkg-fun.nix diff --git a/pkgs/applications/file-managers/clex/default.nix b/pkgs/unit/cl/clex/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/clex/default.nix rename to pkgs/unit/cl/clex/pkg-fun.nix diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/unit/cl/clfft/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clfft/default.nix rename to pkgs/unit/cl/clfft/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/unit/cl/clhep/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/clhep/default.nix rename to pkgs/unit/cl/clhep/pkg-fun.nix diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/unit/cl/cli-visualizer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cli-visualizer/default.nix rename to pkgs/unit/cl/cli-visualizer/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/unit/cl/cli11/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cli11/default.nix rename to pkgs/unit/cl/cli11/pkg-fun.nix diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/unit/cl/cli53/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/cli53/default.nix rename to pkgs/unit/cl/cli53/pkg-fun.nix diff --git a/pkgs/tools/security/cliam/default.nix b/pkgs/unit/cl/cliam/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cliam/default.nix rename to pkgs/unit/cl/cliam/pkg-fun.nix diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/unit/cl/clib/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/clib/default.nix rename to pkgs/unit/cl/clib/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/unit/cl/click/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/click/default.nix rename to pkgs/unit/cl/click/pkg-fun.nix diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/unit/cl/clickclack/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clickclack/default.nix rename to pkgs/unit/cl/clickclack/pkg-fun.nix diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/unit/cl/clickhouse-backup/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/clickhouse-backup/default.nix rename to pkgs/unit/cl/clickhouse-backup/pkg-fun.nix diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/unit/cl/client-ip-echo/client-ip-echo.nix similarity index 100% rename from pkgs/servers/misc/client-ip-echo/client-ip-echo.nix rename to pkgs/unit/cl/client-ip-echo/client-ip-echo.nix diff --git a/pkgs/servers/misc/client-ip-echo/default.nix b/pkgs/unit/cl/client-ip-echo/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/client-ip-echo/default.nix rename to pkgs/unit/cl/client-ip-echo/pkg-fun.nix diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/unit/cl/clifm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/clifm/default.nix rename to pkgs/unit/cl/clifm/pkg-fun.nix diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/unit/cl/clight/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/clight/default.nix rename to pkgs/unit/cl/clight/pkg-fun.nix diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/unit/cl/clightd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/clight/clightd.nix rename to pkgs/unit/cl/clightd/pkg-fun.nix diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/unit/cl/clightning/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/clightning/default.nix rename to pkgs/unit/cl/clightning/pkg-fun.nix diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/unit/cl/cling/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/cling/default.nix rename to pkgs/unit/cl/cling/pkg-fun.nix diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/unit/cl/clingcon/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/potassco/clingcon.nix rename to pkgs/unit/cl/clingcon/pkg-fun.nix diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/unit/cl/clingo/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/potassco/clingo.nix rename to pkgs/unit/cl/clingo/pkg-fun.nix diff --git a/pkgs/tools/misc/clini/default.nix b/pkgs/unit/cl/clini/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clini/default.nix rename to pkgs/unit/cl/clini/pkg-fun.nix diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/unit/cl/clipbuzz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clipbuzz/default.nix rename to pkgs/unit/cl/clipbuzz/pkg-fun.nix diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/unit/cl/clipcat/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/clipcat/default.nix rename to pkgs/unit/cl/clipcat/pkg-fun.nix diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/unit/cl/cliphist/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/cliphist/default.nix rename to pkgs/unit/cl/cliphist/pkg-fun.nix diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/unit/cl/clipit/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/clipit/default.nix rename to pkgs/unit/cl/clipit/pkg-fun.nix diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/unit/cl/clipman/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/clipman/default.nix rename to pkgs/unit/cl/clipman/pkg-fun.nix diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/unit/cl/clipmenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/clipmenu/default.nix rename to pkgs/unit/cl/clipmenu/pkg-fun.nix diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/unit/cl/clipnotify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clipnotify/default.nix rename to pkgs/unit/cl/clipnotify/pkg-fun.nix diff --git a/pkgs/development/libraries/clipp/clipp.pc b/pkgs/unit/cl/clipp/clipp.pc similarity index 100% rename from pkgs/development/libraries/clipp/clipp.pc rename to pkgs/unit/cl/clipp/clipp.pc diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/unit/cl/clipp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clipp/default.nix rename to pkgs/unit/cl/clipp/pkg-fun.nix diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/unit/cl/clipper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clipper/default.nix rename to pkgs/unit/cl/clipper/pkg-fun.nix diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/unit/cl/clipqr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/clipqr/default.nix rename to pkgs/unit/cl/clipqr/pkg-fun.nix diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/unit/cl/clips/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/clips/default.nix rename to pkgs/unit/cl/clips/pkg-fun.nix diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/unit/cl/clipster/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clipster/default.nix rename to pkgs/unit/cl/clipster/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/unit/cl/cliquer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/cliquer/default.nix rename to pkgs/unit/cl/cliquer/pkg-fun.nix diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/unit/cl/clisp-tip/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/clisp/hg.nix rename to pkgs/unit/cl/clisp-tip/pkg-fun.nix diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/unit/cl/clj-kondo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/clj-kondo/default.nix rename to pkgs/unit/cl/clj-kondo/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/unit/cl/clmagma/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/clmagma/default.nix rename to pkgs/unit/cl/clmagma/pkg-fun.nix diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/unit/cl/cln/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cln/default.nix rename to pkgs/unit/cl/cln/pkg-fun.nix diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/unit/cl/cloc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cloc/default.nix rename to pkgs/unit/cl/cloc/pkg-fun.nix diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/unit/cl/clog-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/clog-cli/default.nix rename to pkgs/unit/cl/clog-cli/pkg-fun.nix diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/unit/cl/clojure-lsp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/clojure-lsp/default.nix rename to pkgs/unit/cl/clojure-lsp/pkg-fun.nix diff --git a/pkgs/games/clonehero/default.nix b/pkgs/unit/cl/clonehero-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/games/clonehero/default.nix rename to pkgs/unit/cl/clonehero-unwrapped/pkg-fun.nix diff --git a/pkgs/games/clonehero/fhs-wrapper.nix b/pkgs/unit/cl/clonehero/pkg-fun.nix similarity index 100% rename from pkgs/games/clonehero/fhs-wrapper.nix rename to pkgs/unit/cl/clonehero/pkg-fun.nix diff --git a/pkgs/games/clonehero/xdg-wrapper.nix b/pkgs/unit/cl/clonehero/xdg-wrapper.nix similarity index 100% rename from pkgs/games/clonehero/xdg-wrapper.nix rename to pkgs/unit/cl/clonehero/xdg-wrapper.nix diff --git a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch b/pkgs/unit/cl/cloogppl/fix-ppl-version.patch similarity index 100% rename from pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch rename to pkgs/unit/cl/cloogppl/fix-ppl-version.patch diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/unit/cl/cloogppl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cloog-ppl/default.nix rename to pkgs/unit/cl/cloogppl/pkg-fun.nix diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/unit/cl/clooj/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/clojure/clooj.nix rename to pkgs/unit/cl/clooj/pkg-fun.nix diff --git a/pkgs/build-support/closure-info.nix b/pkgs/unit/cl/closureInfo/pkg-fun.nix similarity index 100% rename from pkgs/build-support/closure-info.nix rename to pkgs/unit/cl/closureInfo/pkg-fun.nix diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/unit/cl/closurecompiler/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/closure/default.nix rename to pkgs/unit/cl/closurecompiler/pkg-fun.nix diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/unit/cl/cloud-hypervisor/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/cloud-hypervisor/default.nix rename to pkgs/unit/cl/cloud-hypervisor/pkg-fun.nix diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/unit/cl/cloud-nuke/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cloud-nuke/default.nix rename to pkgs/unit/cl/cloud-nuke/pkg-fun.nix diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/unit/cl/cloud-sql-proxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cloud-sql-proxy/default.nix rename to pkgs/unit/cl/cloud-sql-proxy/pkg-fun.nix diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/unit/cl/cloud-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cloud-utils/default.nix rename to pkgs/unit/cl/cloud-utils/pkg-fun.nix diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/unit/cl/cloudbrute/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cloudbrute/default.nix rename to pkgs/unit/cl/cloudbrute/pkg-fun.nix diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/unit/cl/cloudflare-dyndns/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cloudflare-dyndns/default.nix rename to pkgs/unit/cl/cloudflare-dyndns/pkg-fun.nix diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/unit/cl/cloudflare-warp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cloudflare-warp/default.nix rename to pkgs/unit/cl/cloudflare-warp/pkg-fun.nix diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/unit/cl/cloudflared/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/default.nix rename to pkgs/unit/cl/cloudflared/pkg-fun.nix diff --git a/pkgs/applications/networking/cloudflared/tests.nix b/pkgs/unit/cl/cloudflared/tests.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/tests.nix rename to pkgs/unit/cl/cloudflared/tests.nix diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/unit/cl/cloudfoundry-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix rename to pkgs/unit/cl/cloudfoundry-cli/pkg-fun.nix diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/unit/cl/cloudfox/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cloudfox/default.nix rename to pkgs/unit/cl/cloudfox/pkg-fun.nix diff --git a/pkgs/tools/security/cloudlist/default.nix b/pkgs/unit/cl/cloudlist/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cloudlist/default.nix rename to pkgs/unit/cl/cloudlist/pkg-fun.nix diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/unit/cl/cloudmonkey/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/cloudmonkey/default.nix rename to pkgs/unit/cl/cloudmonkey/pkg-fun.nix diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/unit/cl/cloudsmith-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cloudsmith-cli/default.nix rename to pkgs/unit/cl/cloudsmith-cli/pkg-fun.nix diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/unit/cl/clp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/clp/default.nix rename to pkgs/unit/cl/clp/pkg-fun.nix diff --git a/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff b/pkgs/unit/cl/clpeak/clpeak-clhpp2.diff similarity index 100% rename from pkgs/tools/misc/clpeak/clpeak-clhpp2.diff rename to pkgs/unit/cl/clpeak/clpeak-clhpp2.diff diff --git a/pkgs/tools/misc/clpeak/default.nix b/pkgs/unit/cl/clpeak/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/clpeak/default.nix rename to pkgs/unit/cl/clpeak/pkg-fun.nix diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/unit/cl/clpm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/clpm/default.nix rename to pkgs/unit/cl/clpm/pkg-fun.nix diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/unit/cl/clprover/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/clprover/clprover.nix rename to pkgs/unit/cl/clprover/pkg-fun.nix diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/unit/cl/clustal-omega/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/clustal-omega/default.nix rename to pkgs/unit/cl/clustal-omega/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/unit/cl/clusterctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/clusterctl/default.nix rename to pkgs/unit/cl/clusterctl/pkg-fun.nix diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/unit/cl/clutter-gst/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clutter-gst/default.nix rename to pkgs/unit/cl/clutter-gst/pkg-fun.nix diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/unit/cl/clutter-gtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clutter-gtk/default.nix rename to pkgs/unit/cl/clutter-gtk/pkg-fun.nix diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/unit/cl/clutter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/clutter/default.nix rename to pkgs/unit/cl/clutter/pkg-fun.nix diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/unit/cm/cm256cc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cm256cc/default.nix rename to pkgs/unit/cm/cm256cc/pkg-fun.nix diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/unit/cm/cm_unicode/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cm-unicode/default.nix rename to pkgs/unit/cm/cm_unicode/pkg-fun.nix diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/unit/cm/cmark-gfm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cmark-gfm/default.nix rename to pkgs/unit/cm/cmark-gfm/pkg-fun.nix diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/unit/cm/cmark/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cmark/default.nix rename to pkgs/unit/cm/cmark/pkg-fun.nix diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/unit/cm/cmatrix/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cmatrix/default.nix rename to pkgs/unit/cm/cmatrix/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/unit/cm/cmctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/cmctl/default.nix rename to pkgs/unit/cm/cmctl/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/cmctl/update.sh b/pkgs/unit/cm/cmctl/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/cmctl/update.sh rename to pkgs/unit/cm/cmctl/update.sh diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/unit/cm/cmdstan/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/cmdstan/default.nix rename to pkgs/unit/cm/cmdstan/pkg-fun.nix diff --git a/pkgs/tools/text/cmigemo/no-http-tool-check.patch b/pkgs/unit/cm/cmigemo/no-http-tool-check.patch similarity index 100% rename from pkgs/tools/text/cmigemo/no-http-tool-check.patch rename to pkgs/unit/cm/cmigemo/no-http-tool-check.patch diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/unit/cm/cmigemo/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/cmigemo/default.nix rename to pkgs/unit/cm/cmigemo/pkg-fun.nix diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/unit/cm/cminpack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cminpack/default.nix rename to pkgs/unit/cm/cminpack/pkg-fun.nix diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/unit/cm/cmocka/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cmocka/default.nix rename to pkgs/unit/cm/cmocka/pkg-fun.nix diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/unit/cm/cmrt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cmrt/default.nix rename to pkgs/unit/cm/cmrt/pkg-fun.nix diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/unit/cm/cmt/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cmt/default.nix rename to pkgs/unit/cm/cmt/pkg-fun.nix diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/unit/cm/cmtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/cmtk/default.nix rename to pkgs/unit/cm/cmtk/pkg-fun.nix diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/unit/cm/cmusfm/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cmusfm/default.nix rename to pkgs/unit/cm/cmusfm/pkg-fun.nix diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/unit/cn/cni-plugin-flannel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/flannel/plugin.nix rename to pkgs/unit/cn/cni-plugin-flannel/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/unit/cn/cni-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/cni/plugins.nix rename to pkgs/unit/cn/cni-plugins/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/unit/cn/cni/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/cni/default.nix rename to pkgs/unit/cn/cni/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch b/pkgs/unit/cn/cnijfilter2/patches/get_protocol.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch rename to pkgs/unit/cn/cnijfilter2/patches/get_protocol.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/unit/cn/cnijfilter2/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter2/default.nix rename to pkgs/unit/cn/cnijfilter2/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch b/pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch rename to pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch b/pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch rename to pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch b/pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch rename to pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch b/pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch rename to pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch b/pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch rename to pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch rename to pkgs/unit/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/unit/cn/cnijfilter_4_00/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix rename to pkgs/unit/cn/cnijfilter_4_00/pkg-fun.nix diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/unit/cn/cnping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cnping/default.nix rename to pkgs/unit/cn/cnping/pkg-fun.nix diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/unit/cn/cnstrokeorder/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cnstrokeorder/default.nix rename to pkgs/unit/cn/cnstrokeorder/pkg-fun.nix diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/unit/cn/cntlm/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/cntlm/default.nix rename to pkgs/unit/cn/cntlm/pkg-fun.nix diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/unit/cn/cntr/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/cntr/default.nix rename to pkgs/unit/cn/cntr/pkg-fun.nix diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/unit/co/CoinMP/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/CoinMP/default.nix rename to pkgs/unit/co/CoinMP/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/unit/co/coan/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/coan/default.nix rename to pkgs/unit/co/coan/pkg-fun.nix diff --git a/pkgs/development/tools/cobra-cli/default.nix b/pkgs/unit/co/cobra-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cobra-cli/default.nix rename to pkgs/unit/co/cobra-cli/pkg-fun.nix diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/unit/co/coccinelle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/coccinelle/default.nix rename to pkgs/unit/co/coccinelle/pkg-fun.nix diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/unit/co/cockroachdb/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/cockroachdb/default.nix rename to pkgs/unit/co/cockroachdb/pkg-fun.nix diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/unit/co/cod/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cod/default.nix rename to pkgs/unit/co/cod/pkg-fun.nix diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/unit/co/code-minimap/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/code-minimap/default.nix rename to pkgs/unit/co/code-minimap/pkg-fun.nix diff --git a/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch b/pkgs/unit/co/codeblocks/fix-clipboard-flush.patch similarity index 100% rename from pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch rename to pkgs/unit/co/codeblocks/fix-clipboard-flush.patch diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/unit/co/codeblocks/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/codeblocks/default.nix rename to pkgs/unit/co/codeblocks/pkg-fun.nix diff --git a/pkgs/applications/editors/codeblocks/writable-projects.patch b/pkgs/unit/co/codeblocks/writable-projects.patch similarity index 100% rename from pkgs/applications/editors/codeblocks/writable-projects.patch rename to pkgs/unit/co/codeblocks/writable-projects.patch diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/unit/co/codebraid/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/codebraid/default.nix rename to pkgs/unit/co/codebraid/pkg-fun.nix diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/unit/co/codec2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/codec2/default.nix rename to pkgs/unit/co/codec2/pkg-fun.nix diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/unit/co/codecserver/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/codecserver/default.nix rename to pkgs/unit/co/codecserver/pkg-fun.nix diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/unit/co/codeowners/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/codeowners/default.nix rename to pkgs/unit/co/codeowners/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/unit/co/codeql/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/codeql/default.nix rename to pkgs/unit/co/codeql/pkg-fun.nix diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/unit/co/coder/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/coder/default.nix rename to pkgs/unit/co/coder/pkg-fun.nix diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/unit/co/codesearch/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/codesearch/default.nix rename to pkgs/unit/co/codesearch/pkg-fun.nix diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/unit/co/codespell/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/codespell/default.nix rename to pkgs/unit/co/codespell/pkg-fun.nix diff --git a/pkgs/tools/security/coercer/default.nix b/pkgs/unit/co/coercer/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/coercer/default.nix rename to pkgs/unit/co/coercer/pkg-fun.nix diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/unit/co/coeurl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/coeurl/default.nix rename to pkgs/unit/co/coeurl/pkg-fun.nix diff --git a/pkgs/development/web/cog/default.nix b/pkgs/unit/co/cog/pkg-fun.nix similarity index 100% rename from pkgs/development/web/cog/default.nix rename to pkgs/unit/co/cog/pkg-fun.nix diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/unit/co/coin3d/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/coin3d/default.nix rename to pkgs/unit/co/coin3d/pkg-fun.nix diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/unit/co/cointop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cointop/default.nix rename to pkgs/unit/co/cointop/pkg-fun.nix diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/unit/co/colemak-dh/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/colemak-dh/default.nix rename to pkgs/unit/co/colemak-dh/pkg-fun.nix diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/unit/co/colima/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/colima/default.nix rename to pkgs/unit/co/colima/pkg-fun.nix diff --git a/pkgs/development/libraries/collada-dom/default.nix b/pkgs/unit/co/collada-dom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/collada-dom/default.nix rename to pkgs/unit/co/collada-dom/pkg-fun.nix diff --git a/pkgs/applications/emulators/collapseos-cvm/default.nix b/pkgs/unit/co/collapseos-cvm/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/collapseos-cvm/default.nix rename to pkgs/unit/co/collapseos-cvm/pkg-fun.nix diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/unit/co/collectd-data/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/collectd/data.nix rename to pkgs/unit/co/collectd-data/pkg-fun.nix diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/unit/co/colloid-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/colloid-gtk-theme/default.nix rename to pkgs/unit/co/colloid-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/unit/co/colloid-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/colloid-icon-theme/default.nix rename to pkgs/unit/co/colloid-icon-theme/pkg-fun.nix diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/unit/co/colloid-kde/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/colloid-kde/default.nix rename to pkgs/unit/co/colloid-kde/pkg-fun.nix diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/unit/co/colm/cross-compile.patch similarity index 100% rename from pkgs/development/compilers/colm/cross-compile.patch rename to pkgs/unit/co/colm/cross-compile.patch diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/unit/co/colm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/colm/default.nix rename to pkgs/unit/co/colm/pkg-fun.nix diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/unit/co/colmena/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/colmena/default.nix rename to pkgs/unit/co/colmena/pkg-fun.nix diff --git a/pkgs/games/colobot/data.nix b/pkgs/unit/co/colobot/data.nix similarity index 100% rename from pkgs/games/colobot/data.nix rename to pkgs/unit/co/colobot/data.nix diff --git a/pkgs/games/colobot/default.nix b/pkgs/unit/co/colobot/pkg-fun.nix similarity index 100% rename from pkgs/games/colobot/default.nix rename to pkgs/unit/co/colobot/pkg-fun.nix diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/unit/co/colord-gtk/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/colord-gtk/default.nix rename to pkgs/unit/co/colord-gtk/pkg-fun.nix diff --git a/pkgs/tools/misc/colord/installed-tests-path.patch b/pkgs/unit/co/colord/installed-tests-path.patch similarity index 100% rename from pkgs/tools/misc/colord/installed-tests-path.patch rename to pkgs/unit/co/colord/installed-tests-path.patch diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/unit/co/colord/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/colord/default.nix rename to pkgs/unit/co/colord/pkg-fun.nix diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/unit/co/colordiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/colordiff/default.nix rename to pkgs/unit/co/colordiff/pkg-fun.nix diff --git a/pkgs/tools/misc/colorless/default.nix b/pkgs/unit/co/colorless/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/colorless/default.nix rename to pkgs/unit/co/colorless/pkg-fun.nix diff --git a/pkgs/tools/system/colorls/Gemfile b/pkgs/unit/co/colorls/Gemfile similarity index 100% rename from pkgs/tools/system/colorls/Gemfile rename to pkgs/unit/co/colorls/Gemfile diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/unit/co/colorls/Gemfile.lock similarity index 100% rename from pkgs/tools/system/colorls/Gemfile.lock rename to pkgs/unit/co/colorls/Gemfile.lock diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/unit/co/colorls/gemset.nix similarity index 100% rename from pkgs/tools/system/colorls/gemset.nix rename to pkgs/unit/co/colorls/gemset.nix diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/unit/co/colorls/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/colorls/default.nix rename to pkgs/unit/co/colorls/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/unit/co/colormake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/colormake/default.nix rename to pkgs/unit/co/colormake/pkg-fun.nix diff --git a/pkgs/tools/misc/colorpanes/default.nix b/pkgs/unit/co/colorpanes/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/colorpanes/default.nix rename to pkgs/unit/co/colorpanes/pkg-fun.nix diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/unit/co/colorpicker/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/colorpicker/default.nix rename to pkgs/unit/co/colorpicker/pkg-fun.nix diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/unit/co/colort/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/colort/default.nix rename to pkgs/unit/co/colort/pkg-fun.nix diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/unit/co/colorz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/colorz/default.nix rename to pkgs/unit/co/colorz/pkg-fun.nix diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/unit/co/colpack/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/colpack/default.nix rename to pkgs/unit/co/colpack/pkg-fun.nix diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/unit/co/combinatorial_designs/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/combinatorial_designs/default.nix rename to pkgs/unit/co/combinatorial_designs/pkg-fun.nix diff --git a/pkgs/development/tools/comby/comby.patch b/pkgs/unit/co/comby/comby.patch similarity index 100% rename from pkgs/development/tools/comby/comby.patch rename to pkgs/unit/co/comby/comby.patch diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/unit/co/comby/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/comby/default.nix rename to pkgs/unit/co/comby/pkg-fun.nix diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/unit/co/comedilib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/comedilib/default.nix rename to pkgs/unit/co/comedilib/pkg-fun.nix diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/unit/co/comfortaa/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/comfortaa/default.nix rename to pkgs/unit/co/comfortaa/pkg-fun.nix diff --git a/pkgs/data/fonts/comic-mono/comic-mono-weight.conf b/pkgs/unit/co/comic-mono/comic-mono-weight.conf similarity index 100% rename from pkgs/data/fonts/comic-mono/comic-mono-weight.conf rename to pkgs/unit/co/comic-mono/comic-mono-weight.conf diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/unit/co/comic-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/comic-mono/default.nix rename to pkgs/unit/co/comic-mono/pkg-fun.nix diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/unit/co/comic-neue/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/comic-neue/default.nix rename to pkgs/unit/co/comic-neue/pkg-fun.nix diff --git a/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/pkgs/unit/co/comic-relief/comic-sans-ms-alias.conf similarity index 100% rename from pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf rename to pkgs/unit/co/comic-relief/comic-sans-ms-alias.conf diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/unit/co/comic-relief/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/comic-relief/default.nix rename to pkgs/unit/co/comic-relief/pkg-fun.nix diff --git a/pkgs/data/icons/comixcursors/makefile-shell-var.patch b/pkgs/unit/co/comixcursors/makefile-shell-var.patch similarity index 100% rename from pkgs/data/icons/comixcursors/makefile-shell-var.patch rename to pkgs/unit/co/comixcursors/makefile-shell-var.patch diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/unit/co/comixcursors/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/comixcursors/default.nix rename to pkgs/unit/co/comixcursors/pkg-fun.nix diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/unit/co/comma/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/comma/default.nix rename to pkgs/unit/co/comma/pkg-fun.nix diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/unit/co/commandergenius/pkg-fun.nix similarity index 100% rename from pkgs/games/commandergenius/default.nix rename to pkgs/unit/co/commandergenius/pkg-fun.nix diff --git a/pkgs/applications/version-management/commit-formatter/default.nix b/pkgs/unit/co/commit-formatter/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/commit-formatter/default.nix rename to pkgs/unit/co/commit-formatter/pkg-fun.nix diff --git a/pkgs/tools/security/commix/default.nix b/pkgs/unit/co/commix/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/commix/default.nix rename to pkgs/unit/co/commix/pkg-fun.nix diff --git a/pkgs/data/misc/common-licenses/default.nix b/pkgs/unit/co/common-licenses/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/common-licenses/default.nix rename to pkgs/unit/co/common-licenses/pkg-fun.nix diff --git a/pkgs/common-updater/scripts.nix b/pkgs/unit/co/common-updater-scripts/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/scripts.nix rename to pkgs/unit/co/common-updater-scripts/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/unit/co/commonsBcel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/bcel/default.nix rename to pkgs/unit/co/commonsBcel/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/unit/co/commonsBsf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/bsf/default.nix rename to pkgs/unit/co/commonsBsf/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/unit/co/commonsCompress/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/compress/default.nix rename to pkgs/unit/co/commonsCompress/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/unit/co/commonsDaemon/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/daemon/default.nix rename to pkgs/unit/co/commonsDaemon/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/unit/co/commonsFileUpload/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/fileupload/default.nix rename to pkgs/unit/co/commonsFileUpload/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/unit/co/commonsIo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/io/default.nix rename to pkgs/unit/co/commonsIo/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/unit/co/commonsLang/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/lang/default.nix rename to pkgs/unit/co/commonsLang/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/unit/co/commonsLogging/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/logging/default.nix rename to pkgs/unit/co/commonsLogging/pkg-fun.nix diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/unit/co/commonsMath/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/commons/math/default.nix rename to pkgs/unit/co/commonsMath/pkg-fun.nix diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/unit/co/compactor/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/compactor/default.nix rename to pkgs/unit/co/compactor/pkg-fun.nix diff --git a/pkgs/development/tools/compass/Gemfile b/pkgs/unit/co/compass/Gemfile similarity index 100% rename from pkgs/development/tools/compass/Gemfile rename to pkgs/unit/co/compass/Gemfile diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/unit/co/compass/Gemfile.lock similarity index 100% rename from pkgs/development/tools/compass/Gemfile.lock rename to pkgs/unit/co/compass/Gemfile.lock diff --git a/pkgs/development/tools/compass/gemset.nix b/pkgs/unit/co/compass/gemset.nix similarity index 100% rename from pkgs/development/tools/compass/gemset.nix rename to pkgs/unit/co/compass/gemset.nix diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/unit/co/compass/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/compass/default.nix rename to pkgs/unit/co/compass/pkg-fun.nix diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/unit/co/compile-daemon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/compile-daemon/default.nix rename to pkgs/unit/co/compile-daemon/pkg-fun.nix diff --git a/pkgs/tools/misc/complete-alias/default.nix b/pkgs/unit/co/complete-alias/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/complete-alias/default.nix rename to pkgs/unit/co/complete-alias/pkg-fun.nix diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/unit/co/complexity/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/complexity/default.nix rename to pkgs/unit/co/complexity/pkg-fun.nix diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/unit/co/compressFirmwareXz/pkg-fun.nix similarity index 100% rename from pkgs/build-support/kernel/compress-firmware-xz.nix rename to pkgs/unit/co/compressFirmwareXz/pkg-fun.nix diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/unit/co/compsize/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/compsize/default.nix rename to pkgs/unit/co/compsize/pkg-fun.nix diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/unit/co/computecpp-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/computecpp/default.nix rename to pkgs/unit/co/computecpp-unwrapped/pkg-fun.nix diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/unit/co/comrak/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/comrak/default.nix rename to pkgs/unit/co/comrak/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/unit/co/conan/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/conan/default.nix rename to pkgs/unit/co/conan/pkg-fun.nix diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/unit/co/conda/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/conda/default.nix rename to pkgs/unit/co/conda/pkg-fun.nix diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/unit/co/conduktor/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/conduktor/default.nix rename to pkgs/unit/co/conduktor/pkg-fun.nix diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/unit/co/confd/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/confd/default.nix rename to pkgs/unit/co/confd/pkg-fun.nix diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/unit/co/confluencepot/pkg-fun.nix similarity index 100% rename from pkgs/servers/confluencepot/default.nix rename to pkgs/unit/co/confluencepot/pkg-fun.nix diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/unit/co/confluent-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/confluent-cli/default.nix rename to pkgs/unit/co/confluent-cli/pkg-fun.nix diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/unit/co/confluent-platform/pkg-fun.nix similarity index 100% rename from pkgs/servers/confluent-platform/default.nix rename to pkgs/unit/co/confluent-platform/pkg-fun.nix diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/unit/co/conform/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/conform/default.nix rename to pkgs/unit/co/conform/pkg-fun.nix diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/unit/co/conftest/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/conftest/default.nix rename to pkgs/unit/co/conftest/pkg-fun.nix diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/unit/co/conglomerate/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/conglomerate/default.nix rename to pkgs/unit/co/conglomerate/pkg-fun.nix diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/unit/co/conmon-rs/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/conmon-rs/default.nix rename to pkgs/unit/co/conmon-rs/pkg-fun.nix diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/unit/co/conmon/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/conmon/default.nix rename to pkgs/unit/co/conmon/pkg-fun.nix diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/unit/co/connect/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/connect/default.nix rename to pkgs/unit/co/connect/pkg-fun.nix diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/unit/co/conntrack-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/conntrack-tools/default.nix rename to pkgs/unit/co/conntrack-tools/pkg-fun.nix diff --git a/pkgs/tools/misc/conserver/default.nix b/pkgs/unit/co/conserver/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/conserver/default.nix rename to pkgs/unit/co/conserver/pkg-fun.nix diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/unit/co/console-bridge/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/console-bridge/default.nix rename to pkgs/unit/co/console-bridge/pkg-fun.nix diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/unit/co/conspy/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/conspy/default.nix rename to pkgs/unit/co/conspy/pkg-fun.nix diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/pkgs/unit/co/consul-alerts/deps.nix similarity index 100% rename from pkgs/servers/monitoring/consul-alerts/deps.nix rename to pkgs/unit/co/consul-alerts/deps.nix diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/unit/co/consul-alerts/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/consul-alerts/default.nix rename to pkgs/unit/co/consul-alerts/pkg-fun.nix diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/unit/co/consul-template/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/consul-template/default.nix rename to pkgs/unit/co/consul-template/pkg-fun.nix diff --git a/pkgs/servers/consul/default.nix b/pkgs/unit/co/consul/pkg-fun.nix similarity index 100% rename from pkgs/servers/consul/default.nix rename to pkgs/unit/co/consul/pkg-fun.nix diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/unit/co/containerd/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/containerd/default.nix rename to pkgs/unit/co/containerd/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/containerpilot/deps.nix b/pkgs/unit/co/containerpilot/deps.nix similarity index 100% rename from pkgs/applications/networking/cluster/containerpilot/deps.nix rename to pkgs/unit/co/containerpilot/deps.nix diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/unit/co/containerpilot/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/containerpilot/default.nix rename to pkgs/unit/co/containerpilot/pkg-fun.nix diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/unit/co/contrast/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/contrast/default.nix rename to pkgs/unit/co/contrast/pkg-fun.nix diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/unit/co/convbin/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/convbin/default.nix rename to pkgs/unit/co/convbin/pkg-fun.nix diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/unit/co/convchain/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/convchain/default.nix rename to pkgs/unit/co/convchain/pkg-fun.nix diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/unit/co/convertlit/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/convertlit/default.nix rename to pkgs/unit/co/convertlit/pkg-fun.nix diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/unit/co/convfont/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/convfont/default.nix rename to pkgs/unit/co/convfont/pkg-fun.nix diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/unit/co/convimg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/convimg/default.nix rename to pkgs/unit/co/convimg/pkg-fun.nix diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/unit/co/convmv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/convmv/default.nix rename to pkgs/unit/co/convmv/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/unit/co/convos/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/convos/default.nix rename to pkgs/unit/co/convos/pkg-fun.nix diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/unit/co/convoy/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/convoy/default.nix rename to pkgs/unit/co/convoy/pkg-fun.nix diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/unit/co/conway_polynomials/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/conway_polynomials/default.nix rename to pkgs/unit/co/conway_polynomials/pkg-fun.nix diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/unit/co/cooper-hewitt/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cooper-hewitt/default.nix rename to pkgs/unit/co/cooper-hewitt/pkg-fun.nix diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/unit/co/coordgenlibs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/coordgenlibs/default.nix rename to pkgs/unit/co/coordgenlibs/pkg-fun.nix diff --git a/pkgs/development/libraries/coost/default.nix b/pkgs/unit/co/coost/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/coost/default.nix rename to pkgs/unit/co/coost/pkg-fun.nix diff --git a/pkgs/tools/misc/cope/default.nix b/pkgs/unit/co/cope/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cope/default.nix rename to pkgs/unit/co/cope/pkg-fun.nix diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/unit/co/copilot-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/copilot-cli/default.nix rename to pkgs/unit/co/copilot-cli/pkg-fun.nix diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/unit/co/copper/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/copper/default.nix rename to pkgs/unit/co/copper/pkg-fun.nix diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/unit/co/copyright-update/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/copyright-update/default.nix rename to pkgs/unit/co/copyright-update/pkg-fun.nix diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/unit/co/coq2html/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/coq2html/default.nix rename to pkgs/unit/co/coq2html/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/unit/co/cordless/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/cordless/default.nix rename to pkgs/unit/co/cordless/pkg-fun.nix diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/unit/co/coredns/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/coredns/default.nix rename to pkgs/unit/co/coredns/pkg-fun.nix diff --git a/pkgs/data/fonts/corefonts/no-op.conf b/pkgs/unit/co/corefonts/no-op.conf similarity index 100% rename from pkgs/data/fonts/corefonts/no-op.conf rename to pkgs/unit/co/corefonts/no-op.conf diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/unit/co/corefonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/corefonts/default.nix rename to pkgs/unit/co/corefonts/pkg-fun.nix diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/unit/co/corerad/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/corerad/default.nix rename to pkgs/unit/co/corerad/pkg-fun.nix diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/unit/co/coreth/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/coreth/default.nix rename to pkgs/unit/co/coreth/pkg-fun.nix diff --git a/pkgs/tools/misc/coreutils/disable-seek-hole.patch b/pkgs/unit/co/coreutils/disable-seek-hole.patch similarity index 100% rename from pkgs/tools/misc/coreutils/disable-seek-hole.patch rename to pkgs/unit/co/coreutils/disable-seek-hole.patch diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/unit/co/coreutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/coreutils/default.nix rename to pkgs/unit/co/coreutils/pkg-fun.nix diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/unit/co/corkscrew/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/corkscrew/default.nix rename to pkgs/unit/co/corkscrew/pkg-fun.nix diff --git a/pkgs/servers/corosync/default.nix b/pkgs/unit/co/corosync/pkg-fun.nix similarity index 100% rename from pkgs/servers/corosync/default.nix rename to pkgs/unit/co/corosync/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch b/pkgs/unit/co/corrosion/cmake-install-full-dir.patch similarity index 100% rename from pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch rename to pkgs/unit/co/corrosion/cmake-install-full-dir.patch diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/unit/co/corrosion/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/corrosion/default.nix rename to pkgs/unit/co/corrosion/pkg-fun.nix diff --git a/pkgs/development/tools/corundum/Gemfile b/pkgs/unit/co/corundum/Gemfile similarity index 100% rename from pkgs/development/tools/corundum/Gemfile rename to pkgs/unit/co/corundum/Gemfile diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/unit/co/corundum/Gemfile.lock similarity index 100% rename from pkgs/development/tools/corundum/Gemfile.lock rename to pkgs/unit/co/corundum/Gemfile.lock diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/unit/co/corundum/gemset.nix similarity index 100% rename from pkgs/development/tools/corundum/gemset.nix rename to pkgs/unit/co/corundum/gemset.nix diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/unit/co/corundum/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/corundum/default.nix rename to pkgs/unit/co/corundum/pkg-fun.nix diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/unit/co/cosmoc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cosmoc/default.nix rename to pkgs/unit/co/cosmoc/pkg-fun.nix diff --git a/pkgs/development/libraries/cosmopolitan/fix-paths.patch b/pkgs/unit/co/cosmopolitan/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/cosmopolitan/fix-paths.patch rename to pkgs/unit/co/cosmopolitan/fix-paths.patch diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/unit/co/cosmopolitan/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cosmopolitan/default.nix rename to pkgs/unit/co/cosmopolitan/pkg-fun.nix diff --git a/pkgs/servers/coturn/default.nix b/pkgs/unit/co/coturn/pkg-fun.nix similarity index 100% rename from pkgs/servers/coturn/default.nix rename to pkgs/unit/co/coturn/pkg-fun.nix diff --git a/pkgs/servers/coturn/pure-configure.patch b/pkgs/unit/co/coturn/pure-configure.patch similarity index 100% rename from pkgs/servers/coturn/pure-configure.patch rename to pkgs/unit/co/coturn/pure-configure.patch diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/unit/co/couchdb3/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/couchdb/3.nix rename to pkgs/unit/co/couchdb3/pkg-fun.nix diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/unit/co/courier-prime/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/courier-prime/default.nix rename to pkgs/unit/co/courier-prime/pkg-fun.nix diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/unit/co/coursera-dl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/coursera-dl/default.nix rename to pkgs/unit/co/coursera-dl/pkg-fun.nix diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/unit/co/coursier/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/coursier/default.nix rename to pkgs/unit/co/coursier/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/unit/co/cov-build/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/cov-build/default.nix rename to pkgs/unit/co/cov-build/pkg-fun.nix diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/unit/co/cowpatty/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cowpatty/default.nix rename to pkgs/unit/co/cowpatty/pkg-fun.nix diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/unit/co/cowsay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cowsay/default.nix rename to pkgs/unit/co/cowsay/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/unit/co/coyim/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/coyim/default.nix rename to pkgs/unit/co/coyim/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/unit/co/coz/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/coz/default.nix rename to pkgs/unit/co/coz/pkg-fun.nix diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/unit/co/cozette/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/cozette/default.nix rename to pkgs/unit/co/cozette/pkg-fun.nix diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/unit/co/cozy-drive/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cozy-drive/default.nix rename to pkgs/unit/co/cozy-drive/pkg-fun.nix diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/unit/co/cozy/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cozy/default.nix rename to pkgs/unit/co/cozy/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/unit/cp/cp2k/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/cp2k/default.nix rename to pkgs/unit/cp/cp2k/pkg-fun.nix diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/unit/cp/cp437/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cp437/default.nix rename to pkgs/unit/cp/cp437/pkg-fun.nix diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/unit/cp/cpcfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/cpcfs/default.nix rename to pkgs/unit/cp/cpcfs/pkg-fun.nix diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/unit/cp/cpio/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/cpio/default.nix rename to pkgs/unit/cp/cpio/pkg-fun.nix diff --git a/pkgs/applications/audio/cplay-ng/default.nix b/pkgs/unit/cp/cplay-ng/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cplay-ng/default.nix rename to pkgs/unit/cp/cplay-ng/pkg-fun.nix diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/unit/cp/cpm-cmake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cpm-cmake/default.nix rename to pkgs/unit/cp/cpm-cmake/pkg-fun.nix diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/unit/cp/cpp-hocon/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpp-hocon/default.nix rename to pkgs/unit/cp/cpp-hocon/pkg-fun.nix diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/unit/cp/cpp-ipfs-http-client/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpp-ipfs-http-client/default.nix rename to pkgs/unit/cp/cpp-ipfs-http-client/pkg-fun.nix diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/pkgs/unit/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch similarity index 100% rename from pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch rename to pkgs/unit/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch diff --git a/pkgs/development/libraries/cpp-jwt/default.nix b/pkgs/unit/cp/cpp-jwt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpp-jwt/default.nix rename to pkgs/unit/cp/cpp-jwt/pkg-fun.nix diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/unit/cp/cpp-utilities/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpp-utilities/default.nix rename to pkgs/unit/cp/cpp-utilities/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/unit/cp/cppcheck/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/cppcheck/default.nix rename to pkgs/unit/cp/cppcheck/pkg-fun.nix diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/unit/cp/cppclean/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cppclean/default.nix rename to pkgs/unit/cp/cppclean/pkg-fun.nix diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/unit/cp/cppcms/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cppcms/default.nix rename to pkgs/unit/cp/cppcms/pkg-fun.nix diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/unit/cp/cppdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cppdb/default.nix rename to pkgs/unit/cp/cppdb/pkg-fun.nix diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/unit/cp/cppe/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/cppe/default.nix rename to pkgs/unit/cp/cppe/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/unit/cp/cppi/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cppi/default.nix rename to pkgs/unit/cp/cppi/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch b/pkgs/unit/cp/cpplint/0001-Remove-pytest-runner-version-pin.patch similarity index 100% rename from pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch rename to pkgs/unit/cp/cpplint/0001-Remove-pytest-runner-version-pin.patch diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/unit/cp/cpplint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/cpplint/default.nix rename to pkgs/unit/cp/cpplint/pkg-fun.nix diff --git a/pkgs/development/misc/cppreference-doc/default.nix b/pkgs/unit/cp/cppreference-doc/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/cppreference-doc/default.nix rename to pkgs/unit/cp/cppreference-doc/pkg-fun.nix diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/unit/cp/cpptest/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpptest/default.nix rename to pkgs/unit/cp/cpptest/pkg-fun.nix diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/unit/cp/cpptoml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpptoml/default.nix rename to pkgs/unit/cp/cpptoml/pkg-fun.nix diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/unit/cp/cppunit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cppunit/default.nix rename to pkgs/unit/cp/cppunit/pkg-fun.nix diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/unit/cp/cpputest/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cpputest/default.nix rename to pkgs/unit/cp/cpputest/pkg-fun.nix diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/unit/cp/cppzmq/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cppzmq/default.nix rename to pkgs/unit/cp/cppzmq/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cproto/cproto.patch b/pkgs/unit/cp/cproto/cproto.patch similarity index 100% rename from pkgs/development/tools/misc/cproto/cproto.patch rename to pkgs/unit/cp/cproto/cproto.patch diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/unit/cp/cproto/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cproto/default.nix rename to pkgs/unit/cp/cproto/pkg-fun.nix diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/unit/cp/cpu-x/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cpu-x/default.nix rename to pkgs/unit/cp/cpu-x/pkg-fun.nix diff --git a/pkgs/tools/misc/cpufetch/default.nix b/pkgs/unit/cp/cpufetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cpufetch/default.nix rename to pkgs/unit/cp/cpufetch/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/unit/cp/cpufrequtils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cpufrequtils/default.nix rename to pkgs/unit/cp/cpufrequtils/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch b/pkgs/unit/cp/cpufrequtils/remove-pot-creation-date.patch similarity index 100% rename from pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch rename to pkgs/unit/cp/cpufrequtils/remove-pot-creation-date.patch diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/unit/cp/cpuid/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cpuid/default.nix rename to pkgs/unit/cp/cpuid/pkg-fun.nix diff --git a/pkgs/tools/misc/cpulimit/get-missing-basename.patch b/pkgs/unit/cp/cpulimit/get-missing-basename.patch similarity index 100% rename from pkgs/tools/misc/cpulimit/get-missing-basename.patch rename to pkgs/unit/cp/cpulimit/get-missing-basename.patch diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/unit/cp/cpulimit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cpulimit/default.nix rename to pkgs/unit/cp/cpulimit/pkg-fun.nix diff --git a/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch b/pkgs/unit/cp/cpulimit/remove-sys-sysctl.h.patch similarity index 100% rename from pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch rename to pkgs/unit/cp/cpulimit/remove-sys-sysctl.h.patch diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/unit/cp/cpuminer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cpuminer/default.nix rename to pkgs/unit/cp/cpuminer/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/unit/cp/cpustat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cpustat/default.nix rename to pkgs/unit/cp/cpustat/pkg-fun.nix diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch b/pkgs/unit/cr/crack_attack/crack-attack-1.1.14-gcc43.patch similarity index 100% rename from pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch rename to pkgs/unit/cr/crack_attack/crack-attack-1.1.14-gcc43.patch diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch b/pkgs/unit/cr/crack_attack/crack-attack-1.1.14-glut.patch similarity index 100% rename from pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch rename to pkgs/unit/cr/crack_attack/crack-attack-1.1.14-glut.patch diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/unit/cr/crack_attack/pkg-fun.nix similarity index 100% rename from pkgs/games/crack-attack/default.nix rename to pkgs/unit/cr/crack_attack/pkg-fun.nix diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/unit/cr/crackle/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/crackle/default.nix rename to pkgs/unit/cr/crackle/pkg-fun.nix diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/unit/cr/cracklib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cracklib/default.nix rename to pkgs/unit/cr/cracklib/pkg-fun.nix diff --git a/pkgs/tools/security/crackmapexec/default.nix b/pkgs/unit/cr/crackmapexec/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crackmapexec/default.nix rename to pkgs/unit/cr/crackmapexec/pkg-fun.nix diff --git a/pkgs/tools/security/crackql/default.nix b/pkgs/unit/cr/crackql/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crackql/default.nix rename to pkgs/unit/cr/crackql/pkg-fun.nix diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/unit/cr/crackxls/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crackxls/default.nix rename to pkgs/unit/cr/crackxls/pkg-fun.nix diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/unit/cr/craftos-pc/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/craftos-pc/default.nix rename to pkgs/unit/cr/craftos-pc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch b/pkgs/unit/cr/cramfsprogs/include-sysmacros.patch similarity index 100% rename from pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch rename to pkgs/unit/cr/cramfsprogs/include-sysmacros.patch diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/unit/cr/cramfsprogs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cramfsprogs/default.nix rename to pkgs/unit/cr/cramfsprogs/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cramfsswap/parallel-make.patch b/pkgs/unit/cr/cramfsswap/parallel-make.patch similarity index 100% rename from pkgs/os-specific/linux/cramfsswap/parallel-make.patch rename to pkgs/unit/cr/cramfsswap/parallel-make.patch diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/unit/cr/cramfsswap/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cramfsswap/default.nix rename to pkgs/unit/cr/cramfsswap/pkg-fun.nix diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/unit/cr/crate2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/crate2nix/default.nix rename to pkgs/unit/cr/crate2nix/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/unit/cr/crc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/crc/default.nix rename to pkgs/unit/cr/crc/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/crc/update.sh b/pkgs/unit/cr/crc/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/crc/update.sh rename to pkgs/unit/cr/crc/update.sh diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/unit/cr/crc32c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/crc32c/default.nix rename to pkgs/unit/cr/crc32c/pkg-fun.nix diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/unit/cr/crcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/crcpp/default.nix rename to pkgs/unit/cr/crcpp/pkg-fun.nix diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/unit/cr/crd2pulumi/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/crd2pulumi/default.nix rename to pkgs/unit/cr/crd2pulumi/pkg-fun.nix diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/unit/cr/crda/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/crda/default.nix rename to pkgs/unit/cr/crda/pkg-fun.nix diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/unit/cr/cre2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cre2/default.nix rename to pkgs/unit/cr/cre2/pkg-fun.nix diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/unit/cr/createrepo_c/fix-bash-completion-path.patch similarity index 100% rename from pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch rename to pkgs/unit/cr/createrepo_c/fix-bash-completion-path.patch diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/unit/cr/createrepo_c/fix-python-install-path.patch similarity index 100% rename from pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch rename to pkgs/unit/cr/createrepo_c/fix-python-install-path.patch diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/unit/cr/createrepo_c/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/createrepo_c/default.nix rename to pkgs/unit/cr/createrepo_c/pkg-fun.nix diff --git a/pkgs/tools/security/credential-detector/default.nix b/pkgs/unit/cr/credential-detector/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/credential-detector/default.nix rename to pkgs/unit/cr/credential-detector/pkg-fun.nix diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/unit/cr/credhub-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/credhub-cli/default.nix rename to pkgs/unit/cr/credhub-cli/pkg-fun.nix diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/unit/cr/credslayer/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/credslayer/default.nix rename to pkgs/unit/cr/credslayer/pkg-fun.nix diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/unit/cr/creep/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/creep/default.nix rename to pkgs/unit/cr/creep/pkg-fun.nix diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/unit/cr/crex/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/crex/default.nix rename to pkgs/unit/cr/crex/pkg-fun.nix diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/unit/cr/cri-o-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/cri-o/default.nix rename to pkgs/unit/cr/cri-o-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/unit/cr/cri-o/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/cri-o/wrapper.nix rename to pkgs/unit/cr/cri-o/pkg-fun.nix diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/unit/cr/cri-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/cri-tools/default.nix rename to pkgs/unit/cr/cri-tools/pkg-fun.nix diff --git a/pkgs/data/fonts/crimson-pro/default.nix b/pkgs/unit/cr/crimson-pro/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/crimson-pro/default.nix rename to pkgs/unit/cr/crimson-pro/pkg-fun.nix diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/unit/cr/crimson/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/crimson/default.nix rename to pkgs/unit/cr/crimson/pkg-fun.nix diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/unit/cr/crip/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/crip/default.nix rename to pkgs/unit/cr/crip/pkg-fun.nix diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/unit/cr/crispyDoom/pkg-fun.nix similarity index 100% rename from pkgs/games/crispy-doom/default.nix rename to pkgs/unit/cr/crispyDoom/pkg-fun.nix diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/unit/cr/criterion/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/criterion/default.nix rename to pkgs/unit/cr/criterion/pkg-fun.nix diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/unit/cr/criu/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/criu/default.nix rename to pkgs/unit/cr/criu/pkg-fun.nix diff --git a/pkgs/tools/security/crlfsuite/default.nix b/pkgs/unit/cr/crlfsuite/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crlfsuite/default.nix rename to pkgs/unit/cr/crlfsuite/pkg-fun.nix diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/unit/cr/crlfuzz/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crlfuzz/default.nix rename to pkgs/unit/cr/crlfuzz/pkg-fun.nix diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/unit/cr/croaring/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/croaring/default.nix rename to pkgs/unit/cr/croaring/pkg-fun.nix diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/unit/cr/croc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/croc/default.nix rename to pkgs/unit/cr/croc/pkg-fun.nix diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/unit/cr/croc/test-local-relay.nix similarity index 100% rename from pkgs/tools/networking/croc/test-local-relay.nix rename to pkgs/unit/cr/croc/test-local-relay.nix diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/unit/cr/cron/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/cron/default.nix rename to pkgs/unit/cr/cron/pkg-fun.nix diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/unit/cr/crossguid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/crossguid/default.nix rename to pkgs/unit/cr/crossguid/pkg-fun.nix diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/unit/cr/crosvm/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/crosvm/default.nix rename to pkgs/unit/cr/crosvm/pkg-fun.nix diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/unit/cr/crosvm/update.py similarity index 100% rename from pkgs/applications/virtualization/crosvm/update.py rename to pkgs/unit/cr/crosvm/update.py diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/unit/cr/crowbar/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crowbar/default.nix rename to pkgs/unit/cr/crowbar/pkg-fun.nix diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/unit/cr/crowdin-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/crowdin-cli/default.nix rename to pkgs/unit/cr/crowdin-cli/pkg-fun.nix diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/unit/cr/crowdsec/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crowdsec/default.nix rename to pkgs/unit/cr/crowdsec/pkg-fun.nix diff --git a/pkgs/games/crrcsim/gcc6.patch b/pkgs/unit/cr/crrcsim/gcc6.patch similarity index 100% rename from pkgs/games/crrcsim/gcc6.patch rename to pkgs/unit/cr/crrcsim/gcc6.patch diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/unit/cr/crrcsim/pkg-fun.nix similarity index 100% rename from pkgs/games/crrcsim/default.nix rename to pkgs/unit/cr/crrcsim/pkg-fun.nix diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/unit/cr/crudini/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/crudini/default.nix rename to pkgs/unit/cr/crudini/pkg-fun.nix diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/unit/cr/crumbs/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/crumbs/default.nix rename to pkgs/unit/cr/crumbs/pkg-fun.nix diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/unit/cr/crun/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/crun/default.nix rename to pkgs/unit/cr/crun/pkg-fun.nix diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/unit/cr/crunch/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/crunch/default.nix rename to pkgs/unit/cr/crunch/pkg-fun.nix diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/unit/cr/cryfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/cryfs/default.nix rename to pkgs/unit/cr/cryfs/pkg-fun.nix diff --git a/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/pkgs/unit/cr/crypto-org-wallet/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/crypto-org-wallet/default.nix rename to pkgs/unit/cr/crypto-org-wallet/pkg-fun.nix diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/unit/cr/cryptomator/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cryptomator/default.nix rename to pkgs/unit/cr/cryptomator/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/unit/cr/cryptominisat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cryptominisat/default.nix rename to pkgs/unit/cr/cryptominisat/pkg-fun.nix diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/unit/cr/cryptopp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/crypto++/default.nix rename to pkgs/unit/cr/cryptopp/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/unit/cr/cryptoverif/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cryptoverif/default.nix rename to pkgs/unit/cr/cryptoverif/pkg-fun.nix diff --git a/pkgs/applications/finance/cryptowatch/default.nix b/pkgs/unit/cr/cryptowatch-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/finance/cryptowatch/default.nix rename to pkgs/unit/cr/cryptowatch-desktop/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/unit/cr/cryptsetup/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cryptsetup/default.nix rename to pkgs/unit/cr/cryptsetup/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch b/pkgs/unit/cr/cryptsetup/relative-token-path.patch similarity index 100% rename from pkgs/os-specific/linux/cryptsetup/relative-token-path.patch rename to pkgs/unit/cr/cryptsetup/relative-token-path.patch diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/unit/cr/crystal2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/crystal2nix/default.nix rename to pkgs/unit/cr/crystal2nix/pkg-fun.nix diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/unit/cr/crystal2nix/shards.nix similarity index 100% rename from pkgs/development/compilers/crystal2nix/shards.nix rename to pkgs/unit/cr/crystal2nix/shards.nix diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/unit/cs/csa/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/csa/default.nix rename to pkgs/unit/cs/csa/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/unit/cs/cscope/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cscope/default.nix rename to pkgs/unit/cs/cscope/pkg-fun.nix diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/unit/cs/csdp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/csdp/default.nix rename to pkgs/unit/cs/csdp/pkg-fun.nix diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/unit/cs/csdr/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/csdr/default.nix rename to pkgs/unit/cs/csdr/pkg-fun.nix diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/unit/cs/csfml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/csfml/default.nix rename to pkgs/unit/cs/csfml/pkg-fun.nix diff --git a/pkgs/os-specific/linux/cshatag/default.nix b/pkgs/unit/cs/cshatag/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/cshatag/default.nix rename to pkgs/unit/cs/cshatag/pkg-fun.nix diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/unit/cs/csmith/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/csmith/default.nix rename to pkgs/unit/cs/csmith/pkg-fun.nix diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/unit/cs/csound-manual/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/csound/csound-manual/default.nix rename to pkgs/unit/cs/csound-manual/pkg-fun.nix diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/unit/cs/csslint/pkg-fun.nix similarity index 100% rename from pkgs/development/web/csslint/default.nix rename to pkgs/unit/cs/csslint/pkg-fun.nix diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/unit/cs/csv2latex/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/csv2latex/default.nix rename to pkgs/unit/cs/csv2latex/pkg-fun.nix diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/unit/cs/csv2odf/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/csv2odf/default.nix rename to pkgs/unit/cs/csv2odf/pkg-fun.nix diff --git a/pkgs/tools/misc/csv2parquet/default.nix b/pkgs/unit/cs/csv2parquet/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/csv2parquet/default.nix rename to pkgs/unit/cs/csv2parquet/pkg-fun.nix diff --git a/pkgs/tools/text/csvdiff/default.nix b/pkgs/unit/cs/csvdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/csvdiff/default.nix rename to pkgs/unit/cs/csvdiff/pkg-fun.nix diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/unit/cs/csview/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/csview/default.nix rename to pkgs/unit/cs/csview/pkg-fun.nix diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/unit/cs/csvkit/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/csvkit/default.nix rename to pkgs/unit/cs/csvkit/pkg-fun.nix diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/unit/cs/csvs-to-sqlite/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/csvs-to-sqlite/default.nix rename to pkgs/unit/cs/csvs-to-sqlite/pkg-fun.nix diff --git a/pkgs/development/ocaml-modules/csv/csvtool.nix b/pkgs/unit/cs/csvtool/pkg-fun.nix similarity index 100% rename from pkgs/development/ocaml-modules/csv/csvtool.nix rename to pkgs/unit/cs/csvtool/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/unit/cs/csxcad/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/csxcad/default.nix rename to pkgs/unit/cs/csxcad/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/csxcad/searchPath.patch b/pkgs/unit/cs/csxcad/searchPath.patch similarity index 100% rename from pkgs/applications/science/electronics/csxcad/searchPath.patch rename to pkgs/unit/cs/csxcad/searchPath.patch diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/unit/ct/ctags/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ctags/default.nix rename to pkgs/unit/ct/ctags/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ctags/unused-collision.patch b/pkgs/unit/ct/ctags/unused-collision.patch similarity index 100% rename from pkgs/development/tools/misc/ctags/unused-collision.patch rename to pkgs/unit/ct/ctags/unused-collision.patch diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/unit/ct/ctagsWrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ctags/wrapped.nix rename to pkgs/unit/ct/ctagsWrapped/pkg-fun.nix diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/unit/ct/ctlptl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ctlptl/default.nix rename to pkgs/unit/ct/ctlptl/pkg-fun.nix diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/unit/ct/ctmg/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ctmg/default.nix rename to pkgs/unit/ct/ctmg/pkg-fun.nix diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/unit/ct/ctodo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ctodo/default.nix rename to pkgs/unit/ct/ctodo/pkg-fun.nix diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/unit/ct/ctop/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ctop/default.nix rename to pkgs/unit/ct/ctop/pkg-fun.nix diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/unit/ct/ctpl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ctpl/default.nix rename to pkgs/unit/ct/ctpl/pkg-fun.nix diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/unit/ct/ctpp2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ctpp2/default.nix rename to pkgs/unit/ct/ctpp2/pkg-fun.nix diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/unit/ct/ctre/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ctre/default.nix rename to pkgs/unit/ct/ctre/pkg-fun.nix diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/unit/ct/ctrtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/ctrtool/default.nix rename to pkgs/unit/ct/ctrtool/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/unit/ct/ctx/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/ctx/default.nix rename to pkgs/unit/ct/ctx/pkg-fun.nix diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/unit/ct/ctypes_sh/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ctypes_sh/default.nix rename to pkgs/unit/ct/ctypes_sh/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/unit/cu/cubicle/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cubicle/default.nix rename to pkgs/unit/cu/cubicle/pkg-fun.nix diff --git a/pkgs/development/tools/cucumber/Gemfile b/pkgs/unit/cu/cucumber/Gemfile similarity index 100% rename from pkgs/development/tools/cucumber/Gemfile rename to pkgs/unit/cu/cucumber/Gemfile diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/unit/cu/cucumber/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cucumber/Gemfile.lock rename to pkgs/unit/cu/cucumber/Gemfile.lock diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/unit/cu/cucumber/gemset.nix similarity index 100% rename from pkgs/development/tools/cucumber/gemset.nix rename to pkgs/unit/cu/cucumber/gemset.nix diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/unit/cu/cucumber/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cucumber/default.nix rename to pkgs/unit/cu/cucumber/pkg-fun.nix diff --git a/pkgs/development/libraries/cudd/cudd.patch b/pkgs/unit/cu/cudd/cudd.patch similarity index 100% rename from pkgs/development/libraries/cudd/cudd.patch rename to pkgs/unit/cu/cudd/cudd.patch diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/unit/cu/cudd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cudd/default.nix rename to pkgs/unit/cu/cudd/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/unit/cu/cue2pops/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/cue2pops/default.nix rename to pkgs/unit/cu/cue2pops/pkg-fun.nix diff --git a/pkgs/development/tools/cuelsp/default.nix b/pkgs/unit/cu/cuelsp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cuelsp/default.nix rename to pkgs/unit/cu/cuelsp/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/unit/cu/cuetools/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/cuetools/default.nix rename to pkgs/unit/cu/cuetools/pkg-fun.nix diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/unit/cu/culmus/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/culmus/default.nix rename to pkgs/unit/cu/culmus/pkg-fun.nix diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/unit/cu/cum/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cum/default.nix rename to pkgs/unit/cu/cum/pkg-fun.nix diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/unit/cu/cuneiform/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/cuneiform/default.nix rename to pkgs/unit/cu/cuneiform/pkg-fun.nix diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/unit/cu/cunit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cunit/default.nix rename to pkgs/unit/cu/cunit/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/unit/cu/cups-bjnp/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/cups-bjnp/default.nix rename to pkgs/unit/cu/cups-bjnp/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/hll2350dw/default.nix b/pkgs/unit/cu/cups-brother-hll2350dw/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/hll2350dw/default.nix rename to pkgs/unit/cu/cups-brother-hll2350dw/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch b/pkgs/unit/cu/cups-brother-hll2375dw/fix-perm.patch similarity index 100% rename from pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch rename to pkgs/unit/cu/cups-brother-hll2375dw/fix-perm.patch diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix b/pkgs/unit/cu/cups-brother-hll2375dw/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/brother/hll2375dw/default.nix rename to pkgs/unit/cu/cups-brother-hll2375dw/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/pkgs/unit/cu/cups-brother-mfcl2750dw/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2750dw/default.nix rename to pkgs/unit/cu/cups-brother-mfcl2750dw/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix b/pkgs/unit/cu/cups-drv-rastertosag-gdi/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix rename to pkgs/unit/cu/cups-drv-rastertosag-gdi/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/unit/cu/cups-dymo/fix-includes.patch similarity index 100% rename from pkgs/misc/cups/drivers/dymo/fix-includes.patch rename to pkgs/unit/cu/cups-dymo/fix-includes.patch diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/unit/cu/cups-dymo/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/dymo/default.nix rename to pkgs/unit/cu/cups-dymo/pkg-fun.nix diff --git a/pkgs/misc/cups/filters.nix b/pkgs/unit/cu/cups-filters/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/filters.nix rename to pkgs/unit/cu/cups-filters/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix b/pkgs/unit/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix rename to pkgs/unit/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix b/pkgs/unit/cu/cups-kyocera-ecosys-m552x-p502x/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix rename to pkgs/unit/cu/cups-kyocera-ecosys-m552x-p502x/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/unit/cu/cups-kyocera/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyocera/default.nix rename to pkgs/unit/cu/cups-kyocera/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/kyodialog/default.nix b/pkgs/unit/cu/cups-kyodialog/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/kyodialog/default.nix rename to pkgs/unit/cu/cups-kyodialog/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/unit/cu/cups-pdf-to-pdf/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix rename to pkgs/unit/cu/cups-pdf-to-pdf/pkg-fun.nix diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/unit/cu/cups-pk-helper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/cups-pk-helper.nix rename to pkgs/unit/cu/cups-pk-helper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/unit/cu/cups-toshiba-estudio/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/estudio/default.nix rename to pkgs/unit/cu/cups-toshiba-estudio/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/unit/cu/cups-zj-58/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/zj-58/default.nix rename to pkgs/unit/cu/cups-zj-58/pkg-fun.nix diff --git a/pkgs/misc/cups/default.nix b/pkgs/unit/cu/cups/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/default.nix rename to pkgs/unit/cu/cups/pkg-fun.nix diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/unit/cu/curaPlugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/cura/plugins.nix rename to pkgs/unit/cu/curaPlugins/pkg-fun.nix diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/unit/cu/curaengine_stable/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/curaengine/stable.nix rename to pkgs/unit/cu/curaengine_stable/pkg-fun.nix diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/unit/cu/curie/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/curie/default.nix rename to pkgs/unit/cu/curie/pkg-fun.nix diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/unit/cu/curl-impersonate-bin/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/curl-impersonate/default.nix rename to pkgs/unit/cu/curl-impersonate-bin/pkg-fun.nix diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/unit/cu/curlMinimal/7.79.1-darwin-no-systemconfiguration.patch similarity index 100% rename from pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch rename to pkgs/unit/cu/curlMinimal/7.79.1-darwin-no-systemconfiguration.patch diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/unit/cu/curlMinimal/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/curl/default.nix rename to pkgs/unit/cu/curlMinimal/pkg-fun.nix diff --git a/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch b/pkgs/unit/cu/curlftpfs/fix-rpl_malloc.patch similarity index 100% rename from pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch rename to pkgs/unit/cu/curlftpfs/fix-rpl_malloc.patch diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/unit/cu/curlftpfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/curlftpfs/default.nix rename to pkgs/unit/cu/curlftpfs/pkg-fun.nix diff --git a/pkgs/tools/networking/curlie/bump-golang-x-sys.patch b/pkgs/unit/cu/curlie/bump-golang-x-sys.patch similarity index 100% rename from pkgs/tools/networking/curlie/bump-golang-x-sys.patch rename to pkgs/unit/cu/curlie/bump-golang-x-sys.patch diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/unit/cu/curlie/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/curlie/default.nix rename to pkgs/unit/cu/curlie/pkg-fun.nix diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/unit/cu/curlpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/curlpp/default.nix rename to pkgs/unit/cu/curlpp/pkg-fun.nix diff --git a/pkgs/applications/audio/curseradio/mpv.patch b/pkgs/unit/cu/curseradio/mpv.patch similarity index 100% rename from pkgs/applications/audio/curseradio/mpv.patch rename to pkgs/unit/cu/curseradio/mpv.patch diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/unit/cu/curseradio/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/curseradio/default.nix rename to pkgs/unit/cu/curseradio/pkg-fun.nix diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/unit/cu/curtail/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/curtail/default.nix rename to pkgs/unit/cu/curtail/pkg-fun.nix diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/unit/cu/cutee/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cutee/default.nix rename to pkgs/unit/cu/cutee/pkg-fun.nix diff --git a/pkgs/games/cuyo/default.nix b/pkgs/unit/cu/cuyo/pkg-fun.nix similarity index 100% rename from pkgs/games/cuyo/default.nix rename to pkgs/unit/cu/cuyo/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/pkgs/unit/cv/cvc4/minisat-fenv.patch similarity index 100% rename from pkgs/applications/science/logic/cvc4/minisat-fenv.patch rename to pkgs/unit/cv/cvc4/minisat-fenv.patch diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/unit/cv/cvc4/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cvc4/default.nix rename to pkgs/unit/cv/cvc4/pkg-fun.nix diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/unit/cv/cvc5/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/cvc5/default.nix rename to pkgs/unit/cv/cvc5/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/unit/cv/cvehound/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/cvehound/default.nix rename to pkgs/unit/cv/cvehound/pkg-fun.nix diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/unit/cv/cvs-fast-export/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/cvs-fast-export/default.nix rename to pkgs/unit/cv/cvs-fast-export/pkg-fun.nix diff --git a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/pkgs/unit/cv/cvs/CVE-2012-0804.patch similarity index 100% rename from pkgs/applications/version-management/cvs/CVE-2012-0804.patch rename to pkgs/unit/cv/cvs/CVE-2012-0804.patch diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/pkgs/unit/cv/cvs/CVE-2017-12836.patch similarity index 100% rename from pkgs/applications/version-management/cvs/CVE-2017-12836.patch rename to pkgs/unit/cv/cvs/CVE-2017-12836.patch diff --git a/pkgs/applications/version-management/cvs/getcwd-chroot.patch b/pkgs/unit/cv/cvs/getcwd-chroot.patch similarity index 100% rename from pkgs/applications/version-management/cvs/getcwd-chroot.patch rename to pkgs/unit/cv/cvs/getcwd-chroot.patch diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/unit/cv/cvs/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/cvs/default.nix rename to pkgs/unit/cv/cvs/pkg-fun.nix diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/unit/cv/cvs2svn/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/cvs2svn/default.nix rename to pkgs/unit/cv/cvs2svn/pkg-fun.nix diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/unit/cv/cvsps/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/cvsps/default.nix rename to pkgs/unit/cv/cvsps/pkg-fun.nix diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/unit/cv/cvsq/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/cvsq/default.nix rename to pkgs/unit/cv/cvsq/pkg-fun.nix diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/unit/cw/cw/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/cw/default.nix rename to pkgs/unit/cw/cw/pkg-fun.nix diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/unit/cw/cwebbin/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/cwebbin/default.nix rename to pkgs/unit/cw/cwebbin/pkg-fun.nix diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/unit/cw/cwiid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cwiid/default.nix rename to pkgs/unit/cw/cwiid/pkg-fun.nix diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/unit/cw/cwltool/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/cwltool/default.nix rename to pkgs/unit/cw/cwltool/pkg-fun.nix diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/unit/cw/cwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/cwm/default.nix rename to pkgs/unit/cw/cwm/pkg-fun.nix diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/unit/cx/cxx-prettyprint/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cxx-prettyprint/default.nix rename to pkgs/unit/cx/cxx-prettyprint/pkg-fun.nix diff --git a/pkgs/development/libraries/cxx-rs/Cargo.lock b/pkgs/unit/cx/cxx-rs/Cargo.lock similarity index 100% rename from pkgs/development/libraries/cxx-rs/Cargo.lock rename to pkgs/unit/cx/cxx-rs/Cargo.lock diff --git a/pkgs/development/libraries/cxx-rs/default.nix b/pkgs/unit/cx/cxx-rs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cxx-rs/default.nix rename to pkgs/unit/cx/cxx-rs/pkg-fun.nix diff --git a/pkgs/development/libraries/cxxopts/fix-install-path.patch b/pkgs/unit/cx/cxxopts/fix-install-path.patch similarity index 100% rename from pkgs/development/libraries/cxxopts/fix-install-path.patch rename to pkgs/unit/cx/cxxopts/fix-install-path.patch diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/unit/cx/cxxopts/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/cxxopts/default.nix rename to pkgs/unit/cx/cxxopts/pkg-fun.nix diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/unit/cy/cyan/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/cyan/default.nix rename to pkgs/unit/cy/cyan/pkg-fun.nix diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/unit/cy/cyanrip/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/cyanrip/default.nix rename to pkgs/unit/cy/cyanrip/pkg-fun.nix diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/unit/cy/cyberchef/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cyberchef/default.nix rename to pkgs/unit/cy/cyberchef/pkg-fun.nix diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/unit/cy/cyclone-scheme/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/cyclone/default.nix rename to pkgs/unit/cy/cyclone-scheme/pkg-fun.nix diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/unit/cy/cyclone/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/cyclone/default.nix rename to pkgs/unit/cy/cyclone/pkg-fun.nix diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/unit/cy/cyclonedx-gomod/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/cyclonedx-gomod/default.nix rename to pkgs/unit/cy/cyclonedx-gomod/pkg-fun.nix diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/unit/cy/cyclonedx-python/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/cyclonedx-python/default.nix rename to pkgs/unit/cy/cyclonedx-python/pkg-fun.nix diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/unit/cz/cz-cli/node-composition.nix similarity index 100% rename from pkgs/applications/version-management/cz-cli/node-composition.nix rename to pkgs/unit/cz/cz-cli/node-composition.nix diff --git a/pkgs/applications/version-management/cz-cli/node-env.nix b/pkgs/unit/cz/cz-cli/node-env.nix similarity index 100% rename from pkgs/applications/version-management/cz-cli/node-env.nix rename to pkgs/unit/cz/cz-cli/node-env.nix diff --git a/pkgs/applications/version-management/cz-cli/node-packages.nix b/pkgs/unit/cz/cz-cli/node-packages.nix similarity index 100% rename from pkgs/applications/version-management/cz-cli/node-packages.nix rename to pkgs/unit/cz/cz-cli/node-packages.nix diff --git a/pkgs/applications/version-management/cz-cli/default.nix b/pkgs/unit/cz/cz-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/cz-cli/default.nix rename to pkgs/unit/cz/cz-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/unit/cz/czkawka/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/czkawka/default.nix rename to pkgs/unit/cz/czkawka/pkg-fun.nix diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/unit/cz/czmq/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/czmq/default.nix rename to pkgs/unit/cz/czmq/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/unit/d-/d-seams/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/d-seams/default.nix rename to pkgs/unit/d-/d-seams/pkg-fun.nix diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/unit/d-/d-spy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/d-spy/default.nix rename to pkgs/unit/d-/d-spy/pkg-fun.nix diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/unit/d2/d2/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/d2/default.nix rename to pkgs/unit/d2/d2/pkg-fun.nix diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/unit/d2/d2coding/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/d2coding/default.nix rename to pkgs/unit/d2/d2coding/pkg-fun.nix diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/unit/da/dab_lib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dab_lib/default.nix rename to pkgs/unit/da/dab_lib/pkg-fun.nix diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/unit/da/dabet/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dabet/default.nix rename to pkgs/unit/da/dabet/pkg-fun.nix diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/unit/da/dablin/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/dablin/default.nix rename to pkgs/unit/da/dablin/pkg-fun.nix diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/unit/da/dabtools/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/dabtools/default.nix rename to pkgs/unit/da/dabtools/pkg-fun.nix diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/unit/da/dadadodo/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/dadadodo/default.nix rename to pkgs/unit/da/dadadodo/pkg-fun.nix diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/unit/da/daemon/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/daemon/default.nix rename to pkgs/unit/da/daemon/pkg-fun.nix diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/unit/da/daemonize/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/daemonize/default.nix rename to pkgs/unit/da/daemonize/pkg-fun.nix diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/unit/da/daemontools/fix-nix-usernamespace-build.patch similarity index 100% rename from pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch rename to pkgs/unit/da/daemontools/fix-nix-usernamespace-build.patch diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/unit/da/daemontools/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/daemontools/default.nix rename to pkgs/unit/da/daemontools/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/unit/da/dagger/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/dagger/default.nix rename to pkgs/unit/da/dagger/pkg-fun.nix diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/unit/da/dale/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/dale/default.nix rename to pkgs/unit/da/dale/pkg-fun.nix diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/unit/da/dalfox/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dalfox/default.nix rename to pkgs/unit/da/dalfox/pkg-fun.nix diff --git a/pkgs/tools/admin/damon/default.nix b/pkgs/unit/da/damon/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/damon/default.nix rename to pkgs/unit/da/damon/pkg-fun.nix diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/unit/da/dancing-script/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/dancing-script/default.nix rename to pkgs/unit/da/dancing-script/pkg-fun.nix diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile b/pkgs/unit/da/danger-gitlab/Gemfile similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/Gemfile rename to pkgs/unit/da/danger-gitlab/Gemfile diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile.lock b/pkgs/unit/da/danger-gitlab/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/Gemfile.lock rename to pkgs/unit/da/danger-gitlab/Gemfile.lock diff --git a/pkgs/applications/version-management/danger-gitlab/gemset.nix b/pkgs/unit/da/danger-gitlab/gemset.nix similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/gemset.nix rename to pkgs/unit/da/danger-gitlab/gemset.nix diff --git a/pkgs/applications/version-management/danger-gitlab/default.nix b/pkgs/unit/da/danger-gitlab/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/default.nix rename to pkgs/unit/da/danger-gitlab/pkg-fun.nix diff --git a/pkgs/servers/dante/default.nix b/pkgs/unit/da/dante/pkg-fun.nix similarity index 100% rename from pkgs/servers/dante/default.nix rename to pkgs/unit/da/dante/pkg-fun.nix diff --git a/pkgs/applications/science/math/dap/default.nix b/pkgs/unit/da/dap/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/dap/default.nix rename to pkgs/unit/da/dap/pkg-fun.nix diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/unit/da/dapper/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dapper/default.nix rename to pkgs/unit/da/dapper/pkg-fun.nix diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/unit/da/dapr-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dapr/cli/default.nix rename to pkgs/unit/da/dapr-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/unit/da/daq/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ids/daq/default.nix rename to pkgs/unit/da/daq/pkg-fun.nix diff --git a/pkgs/applications/emulators/darcnes/label.patch b/pkgs/unit/da/darcnes/label.patch similarity index 100% rename from pkgs/applications/emulators/darcnes/label.patch rename to pkgs/unit/da/darcnes/label.patch diff --git a/pkgs/applications/emulators/darcnes/default.nix b/pkgs/unit/da/darcnes/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/darcnes/default.nix rename to pkgs/unit/da/darcnes/pkg-fun.nix diff --git a/pkgs/applications/version-management/darcs-to-git/default.nix b/pkgs/unit/da/darcs-to-git/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/darcs-to-git/default.nix rename to pkgs/unit/da/darcs-to-git/pkg-fun.nix diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/unit/da/darkhttpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/darkhttpd/default.nix rename to pkgs/unit/da/darkhttpd/pkg-fun.nix diff --git a/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch b/pkgs/unit/da/darkice/fix-undeclared-memmove.patch similarity index 100% rename from pkgs/tools/audio/darkice/fix-undeclared-memmove.patch rename to pkgs/unit/da/darkice/fix-undeclared-memmove.patch diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/unit/da/darkice/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/darkice/default.nix rename to pkgs/unit/da/darkice/pkg-fun.nix diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/unit/da/darkman/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/darkman/default.nix rename to pkgs/unit/da/darkman/pkg-fun.nix diff --git a/pkgs/games/darkplaces/default.nix b/pkgs/unit/da/darkplaces/pkg-fun.nix similarity index 100% rename from pkgs/games/darkplaces/default.nix rename to pkgs/unit/da/darkplaces/pkg-fun.nix diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/unit/da/darkstat/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/darkstat/default.nix rename to pkgs/unit/da/darkstat/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/unit/da/darktile/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/darktile/default.nix rename to pkgs/unit/da/darktile/pkg-fun.nix diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/unit/da/darling-dmg/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/darling-dmg/default.nix rename to pkgs/unit/da/darling-dmg/pkg-fun.nix diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/unit/da/dart/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/dart/default.nix rename to pkgs/unit/da/dart/pkg-fun.nix diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/unit/da/das_watchdog/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/das_watchdog/default.nix rename to pkgs/unit/da/das_watchdog/pkg-fun.nix diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/unit/da/dasel/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dasel/default.nix rename to pkgs/unit/da/dasel/pkg-fun.nix diff --git a/pkgs/shells/dash/default.nix b/pkgs/unit/da/dash/pkg-fun.nix similarity index 100% rename from pkgs/shells/dash/default.nix rename to pkgs/unit/da/dash/pkg-fun.nix diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/unit/da/dasher/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/dasher/default.nix rename to pkgs/unit/da/dasher/pkg-fun.nix diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/unit/da/dashing/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dashing/default.nix rename to pkgs/unit/da/dashing/pkg-fun.nix diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/unit/da/dasht/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dasht/default.nix rename to pkgs/unit/da/dasht/pkg-fun.nix diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/unit/da/dasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/dasm/default.nix rename to pkgs/unit/da/dasm/pkg-fun.nix diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/unit/da/datadog-process-agent/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dd-agent/datadog-process-agent.nix rename to pkgs/unit/da/datadog-process-agent/pkg-fun.nix diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/unit/da/datafusion-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/datafusion/default.nix rename to pkgs/unit/da/datafusion-cli/pkg-fun.nix diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/unit/da/datalad/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/datalad/default.nix rename to pkgs/unit/da/datalad/pkg-fun.nix diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/unit/da/datamash/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/datamash/default.nix rename to pkgs/unit/da/datamash/pkg-fun.nix diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/unit/da/datefmt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/datefmt/default.nix rename to pkgs/unit/da/datefmt/pkg-fun.nix diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/unit/da/datefudge/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/datefudge/default.nix rename to pkgs/unit/da/datefudge/pkg-fun.nix diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/unit/da/dateutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dateutils/default.nix rename to pkgs/unit/da/dateutils/pkg-fun.nix diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/unit/da/datree/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/datree/default.nix rename to pkgs/unit/da/datree/pkg-fun.nix diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/unit/da/dav1d/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dav1d/default.nix rename to pkgs/unit/da/dav1d/pkg-fun.nix diff --git a/pkgs/servers/http/dave/default.nix b/pkgs/unit/da/dave/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/dave/default.nix rename to pkgs/unit/da/dave/pkg-fun.nix diff --git a/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch b/pkgs/unit/da/davfs2/0001-umount_davfs-substitute-ps-command.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch rename to pkgs/unit/da/davfs2/0001-umount_davfs-substitute-ps-command.patch diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/unit/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch rename to pkgs/unit/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/pkgs/unit/da/davfs2/fix-sysconfdir.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch rename to pkgs/unit/da/davfs2/fix-sysconfdir.patch diff --git a/pkgs/tools/filesystems/davfs2/isdir.patch b/pkgs/unit/da/davfs2/isdir.patch similarity index 100% rename from pkgs/tools/filesystems/davfs2/isdir.patch rename to pkgs/unit/da/davfs2/isdir.patch diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/unit/da/davfs2/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/davfs2/default.nix rename to pkgs/unit/da/davfs2/pkg-fun.nix diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/unit/da/davinci-resolve/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/davinci-resolve/default.nix rename to pkgs/unit/da/davinci-resolve/pkg-fun.nix diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/unit/da/davmail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/davmail/default.nix rename to pkgs/unit/da/davmail/pkg-fun.nix diff --git a/pkgs/tools/security/davtest/default.nix b/pkgs/unit/da/davtest/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/davtest/default.nix rename to pkgs/unit/da/davtest/pkg-fun.nix diff --git a/pkgs/applications/science/physics/dawn/default.nix b/pkgs/unit/da/dawn/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/dawn/default.nix rename to pkgs/unit/da/dawn/pkg-fun.nix diff --git a/pkgs/applications/science/physics/dawncut/default.nix b/pkgs/unit/da/dawncut/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/dawncut/default.nix rename to pkgs/unit/da/dawncut/pkg-fun.nix diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/unit/db/dbacl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dbacl/default.nix rename to pkgs/unit/db/dbacl/pkg-fun.nix diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/unit/db/dbeaver/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dbeaver/default.nix rename to pkgs/unit/db/dbeaver/pkg-fun.nix diff --git a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch b/pkgs/unit/db/dbench/fix-missing-stdint.patch similarity index 100% rename from pkgs/development/tools/misc/dbench/fix-missing-stdint.patch rename to pkgs/unit/db/dbench/fix-missing-stdint.patch diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/unit/db/dbench/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/dbench/default.nix rename to pkgs/unit/db/dbench/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/unit/db/dblatex/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/dblatex/default.nix rename to pkgs/unit/db/dblatex/pkg-fun.nix diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/unit/db/dbmate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/dbmate/default.nix rename to pkgs/unit/db/dbmate/pkg-fun.nix diff --git a/pkgs/tools/security/dbmonster/default.nix b/pkgs/unit/db/dbmonster/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dbmonster/default.nix rename to pkgs/unit/db/dbmonster/pkg-fun.nix diff --git a/pkgs/os-specific/linux/dbus-broker/paths.patch b/pkgs/unit/db/dbus-broker/paths.patch similarity index 100% rename from pkgs/os-specific/linux/dbus-broker/paths.patch rename to pkgs/unit/db/dbus-broker/paths.patch diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/unit/db/dbus-broker/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/dbus-broker/default.nix rename to pkgs/unit/db/dbus-broker/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/unit/db/dbus-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus-glib/default.nix rename to pkgs/unit/db/dbus-glib/pkg-fun.nix diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/unit/db/dbus-map/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dbus-map/default.nix rename to pkgs/unit/db/dbus-map/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/unit/db/dbus-sharp-1_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix rename to pkgs/unit/db/dbus-sharp-1_0/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/unit/db/dbus-sharp-2_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus-sharp/default.nix rename to pkgs/unit/db/dbus-sharp-2_0/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/unit/db/dbus-sharp-glib-1_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix rename to pkgs/unit/db/dbus-sharp-glib-1_0/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/unit/db/dbus-sharp-glib-2_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus-sharp-glib/default.nix rename to pkgs/unit/db/dbus-sharp-glib-2_0/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus/implement-getgrouplist.patch b/pkgs/unit/db/dbus/implement-getgrouplist.patch similarity index 100% rename from pkgs/development/libraries/dbus/implement-getgrouplist.patch rename to pkgs/unit/db/dbus/implement-getgrouplist.patch diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/unit/db/dbus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus/default.nix rename to pkgs/unit/db/dbus/pkg-fun.nix diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/unit/db/dbus_cplusplus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbus-cplusplus/default.nix rename to pkgs/unit/db/dbus_cplusplus/pkg-fun.nix diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/unit/db/dbus_java/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/dbus-java/default.nix rename to pkgs/unit/db/dbus_java/pkg-fun.nix diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/unit/db/dbx/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dbx/default.nix rename to pkgs/unit/db/dbx/pkg-fun.nix diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/unit/db/dbxml/cxx11.patch similarity index 100% rename from pkgs/development/libraries/dbxml/cxx11.patch rename to pkgs/unit/db/dbxml/cxx11.patch diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/pkgs/unit/db/dbxml/incorrect-optimization.patch similarity index 100% rename from pkgs/development/libraries/dbxml/incorrect-optimization.patch rename to pkgs/unit/db/dbxml/incorrect-optimization.patch diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/unit/db/dbxml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dbxml/default.nix rename to pkgs/unit/db/dbxml/pkg-fun.nix diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/unit/dc/dcadec/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dcadec/default.nix rename to pkgs/unit/dc/dcadec/pkg-fun.nix diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/unit/dc/dcap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dcap/default.nix rename to pkgs/unit/dc/dcap/pkg-fun.nix diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/unit/dc/dcfldd/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/dcfldd/default.nix rename to pkgs/unit/dc/dcfldd/pkg-fun.nix diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/unit/dc/dclib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dclib/default.nix rename to pkgs/unit/dc/dclib/pkg-fun.nix diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/unit/dc/dclxvi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dclxvi/default.nix rename to pkgs/unit/dc/dclxvi/pkg-fun.nix diff --git a/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch b/pkgs/unit/dc/dcm2niix/dont-fetch-external-libs.patch similarity index 100% rename from pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch rename to pkgs/unit/dc/dcm2niix/dont-fetch-external-libs.patch diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/unit/dc/dcm2niix/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/dcm2niix/default.nix rename to pkgs/unit/dc/dcm2niix/pkg-fun.nix diff --git a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch b/pkgs/unit/dc/dcmtk/0001-Fix-cmake.patch similarity index 100% rename from pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch rename to pkgs/unit/dc/dcmtk/0001-Fix-cmake.patch diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/unit/dc/dcmtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/medicine/dcmtk/default.nix rename to pkgs/unit/dc/dcmtk/pkg-fun.nix diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/unit/dc/dconf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dconf/default.nix rename to pkgs/unit/dc/dconf/pkg-fun.nix diff --git a/pkgs/development/tools/haskell/dconf2nix/default.nix b/pkgs/unit/dc/dconf2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/haskell/dconf2nix/default.nix rename to pkgs/unit/dc/dconf2nix/pkg-fun.nix diff --git a/pkgs/development/tools/haskell/dconf2nix/update.sh b/pkgs/unit/dc/dconf2nix/update.sh similarity index 100% rename from pkgs/development/tools/haskell/dconf2nix/update.sh rename to pkgs/unit/dc/dconf2nix/update.sh diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/unit/dc/dcraw/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/dcraw/default.nix rename to pkgs/unit/dc/dcraw/pkg-fun.nix diff --git a/pkgs/applications/blockchains/dcrd/default.nix b/pkgs/unit/dc/dcrd/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/dcrd/default.nix rename to pkgs/unit/dc/dcrd/pkg-fun.nix diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/unit/dc/dcrwallet/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/dcrwallet/default.nix rename to pkgs/unit/dc/dcrwallet/pkg-fun.nix diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/unit/dc/dcs/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/dcs/default.nix rename to pkgs/unit/dc/dcs/pkg-fun.nix diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/unit/dc/dcw-gmt/pkg-fun.nix similarity index 100% rename from pkgs/applications/gis/gmt/dcw.nix rename to pkgs/unit/dc/dcw-gmt/pkg-fun.nix diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/unit/dd/dd_rescue/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/dd_rescue/default.nix rename to pkgs/unit/dd/dd_rescue/pkg-fun.nix diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/unit/dd/ddate/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ddate/default.nix rename to pkgs/unit/dd/ddate/pkg-fun.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/unit/dd/ddccontrol-db/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/ddccontrol-db/default.nix rename to pkgs/unit/dd/ddccontrol-db/pkg-fun.nix diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/unit/dd/ddccontrol/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ddccontrol/default.nix rename to pkgs/unit/dd/ddccontrol/pkg-fun.nix diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/unit/dd/ddclient/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ddclient/default.nix rename to pkgs/unit/dd/ddclient/pkg-fun.nix diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/unit/dd/ddcutil/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ddcutil/default.nix rename to pkgs/unit/dd/ddcutil/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ddd/gcc44.patch b/pkgs/unit/dd/ddd/gcc44.patch similarity index 100% rename from pkgs/development/tools/misc/ddd/gcc44.patch rename to pkgs/unit/dd/ddd/gcc44.patch diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/unit/dd/ddd/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ddd/default.nix rename to pkgs/unit/dd/ddd/pkg-fun.nix diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/unit/dd/ddgr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ddgr/default.nix rename to pkgs/unit/dd/ddgr/pkg-fun.nix diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/unit/dd/ddh/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ddh/default.nix rename to pkgs/unit/dd/ddh/pkg-fun.nix diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/unit/dd/ddosify/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ddosify/default.nix rename to pkgs/unit/dd/ddosify/pkg-fun.nix diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/unit/dd/ddrescue/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ddrescue/default.nix rename to pkgs/unit/dd/ddrescue/pkg-fun.nix diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/unit/dd/ddrescueview/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ddrescueview/default.nix rename to pkgs/unit/dd/ddrescueview/pkg-fun.nix diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/unit/dd/ddrutility/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ddrutility/default.nix rename to pkgs/unit/dd/ddrutility/pkg-fun.nix diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/unit/dd/dduper/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/dduper/default.nix rename to pkgs/unit/dd/dduper/pkg-fun.nix diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/unit/de/deadbeef/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/deadbeef/default.nix rename to pkgs/unit/de/deadbeef/pkg-fun.nix diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/unit/de/deadcode/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/deadcode/default.nix rename to pkgs/unit/de/deadcode/pkg-fun.nix diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/unit/de/deadd-notification-center/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/deadd-notification-center/default.nix rename to pkgs/unit/de/deadd-notification-center/pkg-fun.nix diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/unit/de/deadnix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/deadnix/default.nix rename to pkgs/unit/de/deadnix/pkg-fun.nix diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/unit/de/deadpixi-sam-unstable/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/deadpixi-sam/default.nix rename to pkgs/unit/de/deadpixi-sam-unstable/pkg-fun.nix diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/unit/de/debian-devscripts/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/debian-devscripts/default.nix rename to pkgs/unit/de/debian-devscripts/pkg-fun.nix diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/unit/de/debian-goodies/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/debian-goodies/default.nix rename to pkgs/unit/de/debian-goodies/pkg-fun.nix diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/unit/de/debianutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/debianutils/default.nix rename to pkgs/unit/de/debianutils/pkg-fun.nix diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/unit/de/debootstrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/debootstrap/default.nix rename to pkgs/unit/de/debootstrap/pkg-fun.nix diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/unit/de/debugedit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/debugedit/default.nix rename to pkgs/unit/de/debugedit/pkg-fun.nix diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/unit/de/deckmaster/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/deckmaster/default.nix rename to pkgs/unit/de/deckmaster/pkg-fun.nix diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/unit/de/deco/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/deco/default.nix rename to pkgs/unit/de/deco/pkg-fun.nix diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/unit/de/decoder/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/decoder/default.nix rename to pkgs/unit/de/decoder/pkg-fun.nix diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/unit/de/dedup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/dedup/default.nix rename to pkgs/unit/de/dedup/pkg-fun.nix diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/unit/de/deepgit/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/deepgit/default.nix rename to pkgs/unit/de/deepgit/pkg-fun.nix diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/unit/de/deepsea/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/deepsea/default.nix rename to pkgs/unit/de/deepsea/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/unit/de/deer/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-deer/default.nix rename to pkgs/unit/de/deer/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-deer/realpath.patch b/pkgs/unit/de/deer/realpath.patch similarity index 100% rename from pkgs/shells/zsh/zsh-deer/realpath.patch rename to pkgs/unit/de/deer/realpath.patch diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/unit/de/defaultCrateOverrides/pkg-fun.nix similarity index 100% rename from pkgs/build-support/rust/default-crate-overrides.nix rename to pkgs/unit/de/defaultCrateOverrides/pkg-fun.nix diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/unit/de/deheader/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/deheader/default.nix rename to pkgs/unit/de/deheader/pkg-fun.nix diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/unit/de/dehydrated/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/dehydrated/default.nix rename to pkgs/unit/de/dehydrated/pkg-fun.nix diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/unit/de/deja-dup/fix-paths.patch similarity index 100% rename from pkgs/applications/backup/deja-dup/fix-paths.patch rename to pkgs/unit/de/deja-dup/fix-paths.patch diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/unit/de/deja-dup/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/deja-dup/default.nix rename to pkgs/unit/de/deja-dup/pkg-fun.nix diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/unit/de/dejagnu/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/dejagnu/default.nix rename to pkgs/unit/de/dejagnu/pkg-fun.nix diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/unit/de/dejsonlz4/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/dejsonlz4/default.nix rename to pkgs/unit/de/dejsonlz4/pkg-fun.nix diff --git a/pkgs/applications/audio/delayarchitect/default.nix b/pkgs/unit/de/delayarchitect/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/delayarchitect/default.nix rename to pkgs/unit/de/delayarchitect/pkg-fun.nix diff --git a/pkgs/misc/drivers/dell-530cdn/default.nix b/pkgs/unit/de/dell-530cdn/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/dell-530cdn/default.nix rename to pkgs/unit/de/dell-530cdn/pkg-fun.nix diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/unit/de/delly/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/delly/default.nix rename to pkgs/unit/de/delly/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/unit/de/deltachat-cursed/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix rename to pkgs/unit/de/deltachat-cursed/pkg-fun.nix diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/unit/de/delve/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/delve/default.nix rename to pkgs/unit/de/delve/pkg-fun.nix diff --git a/pkgs/servers/demoit/default.nix b/pkgs/unit/de/demoit/pkg-fun.nix similarity index 100% rename from pkgs/servers/demoit/default.nix rename to pkgs/unit/de/demoit/pkg-fun.nix diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/unit/de/dendrite/pkg-fun.nix similarity index 100% rename from pkgs/servers/dendrite/default.nix rename to pkgs/unit/de/dendrite/pkg-fun.nix diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/unit/de/denemo/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/denemo/default.nix rename to pkgs/unit/de/denemo/pkg-fun.nix diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/unit/de/dep/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dep/default.nix rename to pkgs/unit/de/dep/pkg-fun.nix diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/unit/de/dep2nix/deps.nix similarity index 100% rename from pkgs/development/tools/dep2nix/deps.nix rename to pkgs/unit/de/dep2nix/deps.nix diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/unit/de/dep2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dep2nix/default.nix rename to pkgs/unit/de/dep2nix/pkg-fun.nix diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/unit/de/depotdownloader/deps.nix similarity index 100% rename from pkgs/tools/misc/depotdownloader/deps.nix rename to pkgs/unit/de/depotdownloader/deps.nix diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/unit/de/depotdownloader/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/depotdownloader/default.nix rename to pkgs/unit/de/depotdownloader/pkg-fun.nix diff --git a/pkgs/tools/misc/depotdownloader/update.sh b/pkgs/unit/de/depotdownloader/update.sh similarity index 100% rename from pkgs/tools/misc/depotdownloader/update.sh rename to pkgs/unit/de/depotdownloader/update.sh diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/unit/de/deskew/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/deskew/default.nix rename to pkgs/unit/de/deskew/pkg-fun.nix diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/unit/de/desktop-file-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/desktop-file-utils/default.nix rename to pkgs/unit/de/desktop-file-utils/pkg-fun.nix diff --git a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/pkgs/unit/de/desktop-file-utils/setup-hook.sh similarity index 100% rename from pkgs/tools/misc/desktop-file-utils/setup-hook.sh rename to pkgs/unit/de/desktop-file-utils/setup-hook.sh diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/unit/de/desmume/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/desmume/default.nix rename to pkgs/unit/de/desmume/pkg-fun.nix diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/unit/de/desync/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sync/desync/default.nix rename to pkgs/unit/de/desync/pkg-fun.nix diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/unit/de/deterministic-uname/deterministic-uname.sh similarity index 100% rename from pkgs/build-support/deterministic-uname/deterministic-uname.sh rename to pkgs/unit/de/deterministic-uname/deterministic-uname.sh diff --git a/pkgs/build-support/deterministic-uname/default.nix b/pkgs/unit/de/deterministic-uname/pkg-fun.nix similarity index 100% rename from pkgs/build-support/deterministic-uname/default.nix rename to pkgs/unit/de/deterministic-uname/pkg-fun.nix diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/unit/de/detox/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/detox/default.nix rename to pkgs/unit/de/detox/pkg-fun.nix diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/unit/de/dev86/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/dev86/default.nix rename to pkgs/unit/de/dev86/pkg-fun.nix diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/unit/de/devbox/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/devbox/default.nix rename to pkgs/unit/de/devbox/pkg-fun.nix diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/unit/de/devd/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/devd/default.nix rename to pkgs/unit/de/devd/pkg-fun.nix diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/unit/de/devdocs-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/devdocs-desktop/default.nix rename to pkgs/unit/de/devdocs-desktop/pkg-fun.nix diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/unit/de/devede/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/devede/default.nix rename to pkgs/unit/de/devede/pkg-fun.nix diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/unit/de/device-tree_rpi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/device-tree/raspberrypi.nix rename to pkgs/unit/de/device-tree_rpi/pkg-fun.nix diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/unit/de/deviceTree/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/device-tree/default.nix rename to pkgs/unit/de/deviceTree/pkg-fun.nix diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/unit/de/devmem2/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/devmem2/default.nix rename to pkgs/unit/de/devmem2/pkg-fun.nix diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/unit/de/devour/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/devour/default.nix rename to pkgs/unit/de/devour/pkg-fun.nix diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/unit/de/devspace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/devspace/default.nix rename to pkgs/unit/de/devspace/pkg-fun.nix diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/unit/de/devtodo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/devtodo/default.nix rename to pkgs/unit/de/devtodo/pkg-fun.nix diff --git a/pkgs/servers/dex/default.nix b/pkgs/unit/de/dex-oidc/pkg-fun.nix similarity index 100% rename from pkgs/servers/dex/default.nix rename to pkgs/unit/de/dex-oidc/pkg-fun.nix diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/unit/de/dex/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/dex/default.nix rename to pkgs/unit/de/dex/pkg-fun.nix diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/unit/de/dex2jar/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/dex2jar/default.nix rename to pkgs/unit/de/dex2jar/pkg-fun.nix diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/unit/df/dfc/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/dfc/default.nix rename to pkgs/unit/df/dfc/pkg-fun.nix diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/unit/df/dfeet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/d-feet/default.nix rename to pkgs/unit/df/dfeet/pkg-fun.nix diff --git a/pkgs/tools/text/dfmt/default.nix b/pkgs/unit/df/dfmt/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/dfmt/default.nix rename to pkgs/unit/df/dfmt/pkg-fun.nix diff --git a/pkgs/tools/system/dfrs/default.nix b/pkgs/unit/df/dfrs/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/dfrs/default.nix rename to pkgs/unit/df/dfrs/pkg-fun.nix diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/unit/df/dfu-programmer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/dfu-programmer/default.nix rename to pkgs/unit/df/dfu-programmer/pkg-fun.nix diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/unit/df/dfu-util/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/dfu-util/default.nix rename to pkgs/unit/df/dfu-util/pkg-fun.nix diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/unit/dg/dgen-sdl/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/dgen-sdl/default.nix rename to pkgs/unit/dg/dgen-sdl/pkg-fun.nix diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/unit/dg/dgoss/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dgoss/default.nix rename to pkgs/unit/dg/dgoss/pkg-fun.nix diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/unit/dg/dgraph/pkg-fun.nix similarity index 100% rename from pkgs/servers/dgraph/default.nix rename to pkgs/unit/dg/dgraph/pkg-fun.nix diff --git a/pkgs/shells/dgsh/glibc-2.26.patch b/pkgs/unit/dg/dgsh/glibc-2.26.patch similarity index 100% rename from pkgs/shells/dgsh/glibc-2.26.patch rename to pkgs/unit/dg/dgsh/glibc-2.26.patch diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/unit/dg/dgsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/dgsh/default.nix rename to pkgs/unit/dg/dgsh/pkg-fun.nix diff --git a/pkgs/build-support/dhall/directory-to-nix.nix b/pkgs/unit/dh/dhallDirectoryToNix/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dhall/directory-to-nix.nix rename to pkgs/unit/dh/dhallDirectoryToNix/pkg-fun.nix diff --git a/pkgs/build-support/dhall/package-to-nix.nix b/pkgs/unit/dh/dhallPackageToNix/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dhall/package-to-nix.nix rename to pkgs/unit/dh/dhallPackageToNix/pkg-fun.nix diff --git a/pkgs/build-support/dhall/to-nix.nix b/pkgs/unit/dh/dhallToNix/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dhall/to-nix.nix rename to pkgs/unit/dh/dhallToNix/pkg-fun.nix diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/unit/dh/dhcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dhcp/default.nix rename to pkgs/unit/dh/dhcp/pkg-fun.nix diff --git a/pkgs/tools/networking/dhcp/set-hostname.patch b/pkgs/unit/dh/dhcp/set-hostname.patch similarity index 100% rename from pkgs/tools/networking/dhcp/set-hostname.patch rename to pkgs/unit/dh/dhcp/set-hostname.patch diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/unit/dh/dhcpcd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dhcpcd/default.nix rename to pkgs/unit/dh/dhcpcd/pkg-fun.nix diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/unit/dh/dhcpdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dhcpdump/default.nix rename to pkgs/unit/dh/dhcpdump/pkg-fun.nix diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/unit/dh/dhcping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dhcping/default.nix rename to pkgs/unit/dh/dhcping/pkg-fun.nix diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/unit/dh/dhewm3/pkg-fun.nix similarity index 100% rename from pkgs/games/dhewm3/default.nix rename to pkgs/unit/dh/dhewm3/pkg-fun.nix diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/unit/dh/dhex/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/dhex/default.nix rename to pkgs/unit/dh/dhex/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/unit/dh/dht/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/dht/default.nix rename to pkgs/unit/dh/dht/pkg-fun.nix diff --git a/pkgs/tools/system/di/default.nix b/pkgs/unit/di/di/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/di/default.nix rename to pkgs/unit/di/di/pkg-fun.nix diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/unit/di/dia/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/dia/default.nix rename to pkgs/unit/di/dia/pkg-fun.nix diff --git a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch b/pkgs/unit/di/dia/poppler-22_09-build-fix.patch similarity index 100% rename from pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch rename to pkgs/unit/di/dia/poppler-22_09-build-fix.patch diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/unit/di/dialect/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dialect/default.nix rename to pkgs/unit/di/dialect/pkg-fun.nix diff --git a/pkgs/tools/misc/dialog/default.nix b/pkgs/unit/di/dialog/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dialog/default.nix rename to pkgs/unit/di/dialog/pkg-fun.nix diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/unit/di/diamond/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/diamond/default.nix rename to pkgs/unit/di/diamond/pkg-fun.nix diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/unit/di/dibbler/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dibbler/default.nix rename to pkgs/unit/di/dibbler/pkg-fun.nix diff --git a/pkgs/servers/dico/default.nix b/pkgs/unit/di/dico/pkg-fun.nix similarity index 100% rename from pkgs/servers/dico/default.nix rename to pkgs/unit/di/dico/pkg-fun.nix diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/unit/di/dictDBCollector/pkg-fun.nix similarity index 100% rename from pkgs/servers/dict/dictd-db-collector.nix rename to pkgs/unit/di/dictDBCollector/pkg-fun.nix diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/unit/di/diction/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/diction/default.nix rename to pkgs/unit/di/diction/pkg-fun.nix diff --git a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/pkgs/unit/di/dictu/0001-force-sqlite-to-be-found.patch similarity index 100% rename from pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch rename to pkgs/unit/di/dictu/0001-force-sqlite-to-be-found.patch diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/unit/di/dictu/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/dictu/default.nix rename to pkgs/unit/di/dictu/pkg-fun.nix diff --git a/pkgs/tools/misc/didu/default.nix b/pkgs/unit/di/didu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/didu/default.nix rename to pkgs/unit/di/didu/pkg-fun.nix diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/unit/di/dieharder/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dieharder/default.nix rename to pkgs/unit/di/dieharder/pkg-fun.nix diff --git a/pkgs/tools/security/dieharder/stdint.patch b/pkgs/unit/di/dieharder/stdint.patch similarity index 100% rename from pkgs/tools/security/dieharder/stdint.patch rename to pkgs/unit/di/dieharder/stdint.patch diff --git a/pkgs/applications/version-management/diff-so-fancy/default.nix b/pkgs/unit/di/diff-so-fancy/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/diff-so-fancy/default.nix rename to pkgs/unit/di/diff-so-fancy/pkg-fun.nix diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/unit/di/diffsitter/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/diffsitter/default.nix rename to pkgs/unit/di/diffsitter/pkg-fun.nix diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/unit/di/diffstat/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/diffstat/default.nix rename to pkgs/unit/di/diffstat/pkg-fun.nix diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/unit/di/difftastic/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/difftastic/default.nix rename to pkgs/unit/di/difftastic/pkg-fun.nix diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/unit/di/diffuse/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/diffuse/default.nix rename to pkgs/unit/di/diffuse/pkg-fun.nix diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/unit/di/diffutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/diffutils/default.nix rename to pkgs/unit/di/diffutils/pkg-fun.nix diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/unit/di/digiham/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/digiham/default.nix rename to pkgs/unit/di/digiham/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/unit/di/digital/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/digital/default.nix rename to pkgs/unit/di/digital/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/unit/di/digital/pom.xml.patch similarity index 100% rename from pkgs/applications/science/electronics/digital/pom.xml.patch rename to pkgs/unit/di/digital/pom.xml.patch diff --git a/pkgs/tools/misc/digitemp/default.nix b/pkgs/unit/di/digitemp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/digitemp/default.nix rename to pkgs/unit/di/digitemp/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/dillong/default.nix b/pkgs/unit/di/dillong/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/dillong/default.nix rename to pkgs/unit/di/dillong/pkg-fun.nix diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/unit/di/dina-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/dina/default.nix rename to pkgs/unit/di/dina-font/pkg-fun.nix diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/unit/di/ding-libs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ding-libs/default.nix rename to pkgs/unit/di/ding-libs/pkg-fun.nix diff --git a/pkgs/tools/graphics/dippi/default.nix b/pkgs/unit/di/dippi/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/dippi/default.nix rename to pkgs/unit/di/dippi/pkg-fun.nix diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/unit/di/dirb/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dirb/default.nix rename to pkgs/unit/di/dirb/pkg-fun.nix diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/unit/di/directfb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/directfb/default.nix rename to pkgs/unit/di/directfb/pkg-fun.nix diff --git a/pkgs/common-updater/directory-listing-updater.nix b/pkgs/unit/di/directoryListingUpdater/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/directory-listing-updater.nix rename to pkgs/unit/di/directoryListingUpdater/pkg-fun.nix diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/unit/di/directvnc/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/directvnc/default.nix rename to pkgs/unit/di/directvnc/pkg-fun.nix diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/unit/di/directx-shader-compiler/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/directx-shader-compiler/default.nix rename to pkgs/unit/di/directx-shader-compiler/pkg-fun.nix diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/unit/di/direnv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/direnv/default.nix rename to pkgs/unit/di/direnv/pkg-fun.nix diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/unit/di/direvent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/direvent/default.nix rename to pkgs/unit/di/direvent/pkg-fun.nix diff --git a/pkgs/tools/security/dirstalk/default.nix b/pkgs/unit/di/dirstalk/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dirstalk/default.nix rename to pkgs/unit/di/dirstalk/pkg-fun.nix diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/unit/di/dirt/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/dirt/default.nix rename to pkgs/unit/di/dirt/pkg-fun.nix diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/unit/di/dirvish/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/dirvish/default.nix rename to pkgs/unit/di/dirvish/pkg-fun.nix diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/unit/di/discocss/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/discocss/default.nix rename to pkgs/unit/di/discocss/pkg-fun.nix diff --git a/pkgs/tools/networking/discord-sh/default.nix b/pkgs/unit/di/discord-sh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/discord-sh/default.nix rename to pkgs/unit/di/discord-sh/pkg-fun.nix diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/unit/di/discordchatexporter-cli/deps.nix similarity index 100% rename from pkgs/tools/backup/discordchatexporter-cli/deps.nix rename to pkgs/unit/di/discordchatexporter-cli/deps.nix diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/unit/di/discordchatexporter-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/discordchatexporter-cli/default.nix rename to pkgs/unit/di/discordchatexporter-cli/pkg-fun.nix diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/unit/di/discordchatexporter-cli/updater.sh similarity index 100% rename from pkgs/tools/backup/discordchatexporter-cli/updater.sh rename to pkgs/unit/di/discordchatexporter-cli/updater.sh diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/unit/di/discount/fix-configure-path.patch similarity index 100% rename from pkgs/tools/text/discount/fix-configure-path.patch rename to pkgs/unit/di/discount/fix-configure-path.patch diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/unit/di/discount/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/discount/default.nix rename to pkgs/unit/di/discount/pkg-fun.nix diff --git a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/pkgs/unit/di/discourse-mail-receiver/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/discourse/mail_receiver/default.nix rename to pkgs/unit/di/discourse-mail-receiver/pkg-fun.nix diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/unit/di/disfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/disfetch/default.nix rename to pkgs/unit/di/disfetch/pkg-fun.nix diff --git a/pkgs/tools/system/disk-filltest/default.nix b/pkgs/unit/di/disk-filltest/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/disk-filltest/default.nix rename to pkgs/unit/di/disk-filltest/pkg-fun.nix diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/unit/di/disk_indicator/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/disk-indicator/default.nix rename to pkgs/unit/di/disk_indicator/pkg-fun.nix diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/unit/di/diskonaut/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/diskonaut/default.nix rename to pkgs/unit/di/diskonaut/pkg-fun.nix diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/unit/di/diskrsync/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/diskrsync/default.nix rename to pkgs/unit/di/diskrsync/pkg-fun.nix diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/unit/di/diskscan/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/diskscan/default.nix rename to pkgs/unit/di/diskscan/pkg-fun.nix diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/unit/di/dislocker/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/dislocker/default.nix rename to pkgs/unit/di/dislocker/pkg-fun.nix diff --git a/pkgs/tools/security/dismap/default.nix b/pkgs/unit/di/dismap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dismap/default.nix rename to pkgs/unit/di/dismap/pkg-fun.nix diff --git a/pkgs/tools/security/dismember/default.nix b/pkgs/unit/di/dismember/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dismember/default.nix rename to pkgs/unit/di/dismember/pkg-fun.nix diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/unit/di/disnix/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/disnix/default.nix rename to pkgs/unit/di/disnix/pkg-fun.nix diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/unit/di/disnixos/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/disnix/disnixos/default.nix rename to pkgs/unit/di/disnixos/pkg-fun.nix diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/unit/di/dispad/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/dispad/default.nix rename to pkgs/unit/di/dispad/pkg-fun.nix diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/unit/di/distgen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/distgen/default.nix rename to pkgs/unit/di/distgen/pkg-fun.nix diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/unit/di/distrho/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/distrho/default.nix rename to pkgs/unit/di/distrho/pkg-fun.nix diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/unit/di/distrobox/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/distrobox/default.nix rename to pkgs/unit/di/distrobox/pkg-fun.nix diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/unit/di/distrobuilder/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/distrobuilder/default.nix rename to pkgs/unit/di/distrobuilder/pkg-fun.nix diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/unit/di/diswall/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/diswall/default.nix rename to pkgs/unit/di/diswall/pkg-fun.nix diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/unit/di/dit/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/dit/default.nix rename to pkgs/unit/di/dit/pkg-fun.nix diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/unit/di/ditaa/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/ditaa/default.nix rename to pkgs/unit/di/ditaa/pkg-fun.nix diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/unit/di/dive/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dive/default.nix rename to pkgs/unit/di/dive/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/unit/di/diylc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/diylc/default.nix rename to pkgs/unit/di/diylc/pkg-fun.nix diff --git a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/pkgs/unit/dj/djbdns/fix-nix-usernamespace-build.patch similarity index 100% rename from pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch rename to pkgs/unit/dj/djbdns/fix-nix-usernamespace-build.patch diff --git a/pkgs/tools/networking/djbdns/hier.patch b/pkgs/unit/dj/djbdns/hier.patch similarity index 100% rename from pkgs/tools/networking/djbdns/hier.patch rename to pkgs/unit/dj/djbdns/hier.patch diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/unit/dj/djbdns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/djbdns/default.nix rename to pkgs/unit/dj/djbdns/pkg-fun.nix diff --git a/pkgs/tools/networking/djbdns/softlimit.patch b/pkgs/unit/dj/djbdns/softlimit.patch similarity index 100% rename from pkgs/tools/networking/djbdns/softlimit.patch rename to pkgs/unit/dj/djbdns/softlimit.patch diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/unit/dj/djmount/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/djmount/default.nix rename to pkgs/unit/dj/djmount/pkg-fun.nix diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/unit/dj/djv/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/djv/default.nix rename to pkgs/unit/dj/djv/pkg-fun.nix diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/unit/dj/djvu2pdf/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/djvu2pdf/default.nix rename to pkgs/unit/dj/djvu2pdf/pkg-fun.nix diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/unit/dj/djvulibre/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/djvulibre/default.nix rename to pkgs/unit/dj/djvulibre/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/dkh/default.nix b/pkgs/unit/dk/dkh/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/dkh/default.nix rename to pkgs/unit/dk/dkh/pkg-fun.nix diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/unit/dk/dkimproxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/dkimproxy/default.nix rename to pkgs/unit/dk/dkimproxy/pkg-fun.nix diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/unit/dl/dleyna-connector-dbus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dleyna-connector-dbus/default.nix rename to pkgs/unit/dl/dleyna-connector-dbus/pkg-fun.nix diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/unit/dl/dleyna-core/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dleyna-core/default.nix rename to pkgs/unit/dl/dleyna-core/pkg-fun.nix diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/unit/dl/dleyna-core/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/dleyna-core/setup-hook.sh rename to pkgs/unit/dl/dleyna-core/setup-hook.sh diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/unit/dl/dleyna-renderer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dleyna-renderer/default.nix rename to pkgs/unit/dl/dleyna-renderer/pkg-fun.nix diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/unit/dl/dleyna-server/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dleyna-server/default.nix rename to pkgs/unit/dl/dleyna-server/pkg-fun.nix diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/unit/dl/dlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dlib/default.nix rename to pkgs/unit/dl/dlib/pkg-fun.nix diff --git a/pkgs/applications/emulators/dlx/default.nix b/pkgs/unit/dl/dlx/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/dlx/default.nix rename to pkgs/unit/dl/dlx/pkg-fun.nix diff --git a/pkgs/data/fonts/dm-sans/default.nix b/pkgs/unit/dm/dm-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/dm-sans/default.nix rename to pkgs/unit/dm/dm-sans/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/unit/dm/dmarc-metrics-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix rename to pkgs/unit/dm/dmarc-metrics-exporter/pkg-fun.nix diff --git a/pkgs/applications/misc/dmenu-rs/Cargo.lock b/pkgs/unit/dm/dmenu-rs/Cargo.lock similarity index 100% rename from pkgs/applications/misc/dmenu-rs/Cargo.lock rename to pkgs/unit/dm/dmenu-rs/Cargo.lock diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/unit/dm/dmenu-rs/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dmenu-rs/default.nix rename to pkgs/unit/dm/dmenu-rs/pkg-fun.nix diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/unit/dm/dmenu-wayland/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dmenu/wayland.nix rename to pkgs/unit/dm/dmenu-wayland/pkg-fun.nix diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/unit/dm/dmenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dmenu/default.nix rename to pkgs/unit/dm/dmenu/pkg-fun.nix diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/unit/dm/dmg2img/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dmg2img/default.nix rename to pkgs/unit/dm/dmg2img/pkg-fun.nix diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/unit/dm/dmidecode/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/dmidecode/default.nix rename to pkgs/unit/dm/dmidecode/pkg-fun.nix diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/unit/dm/dmrconfig/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/dmrconfig/default.nix rename to pkgs/unit/dm/dmrconfig/pkg-fun.nix diff --git a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/pkgs/unit/dm/dmtcp/ld-linux-so-buffer-size.patch similarity index 100% rename from pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch rename to pkgs/unit/dm/dmtcp/ld-linux-so-buffer-size.patch diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/unit/dm/dmtcp/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/dmtcp/default.nix rename to pkgs/unit/dm/dmtcp/pkg-fun.nix diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/unit/dn/dnadd/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/dnadd/default.nix rename to pkgs/unit/dn/dnadd/pkg-fun.nix diff --git a/pkgs/applications/misc/dnd-tools/default.nix b/pkgs/unit/dn/dnd-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dnd-tools/default.nix rename to pkgs/unit/dn/dnd-tools/pkg-fun.nix diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/unit/dn/dns-root-data/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/dns-root-data/default.nix rename to pkgs/unit/dn/dns-root-data/pkg-fun.nix diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/unit/dn/dns-root-data/root.ds similarity index 100% rename from pkgs/data/misc/dns-root-data/root.ds rename to pkgs/unit/dn/dns-root-data/root.ds diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/unit/dn/dns-root-data/root.key similarity index 100% rename from pkgs/data/misc/dns-root-data/root.key rename to pkgs/unit/dn/dns-root-data/root.key diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/unit/dn/dns-root-data/update-root-key.sh similarity index 100% rename from pkgs/data/misc/dns-root-data/update-root-key.sh rename to pkgs/unit/dn/dns-root-data/update-root-key.sh diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/unit/dn/dnscontrol/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/dnscontrol/default.nix rename to pkgs/unit/dn/dnscontrol/pkg-fun.nix diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/unit/dn/dnscrypt-proxy2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnscrypt-proxy2/default.nix rename to pkgs/unit/dn/dnscrypt-proxy2/pkg-fun.nix diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/unit/dn/dnscrypt-wrapper/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnscrypt-wrapper/default.nix rename to pkgs/unit/dn/dnscrypt-wrapper/pkg-fun.nix diff --git a/pkgs/servers/dns/dnsdist/disable-network-tests.patch b/pkgs/unit/dn/dnsdist/disable-network-tests.patch similarity index 100% rename from pkgs/servers/dns/dnsdist/disable-network-tests.patch rename to pkgs/unit/dn/dnsdist/disable-network-tests.patch diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/unit/dn/dnsdist/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/dnsdist/default.nix rename to pkgs/unit/dn/dnsdist/pkg-fun.nix diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/unit/dn/dnsenum/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dnsenum/default.nix rename to pkgs/unit/dn/dnsenum/pkg-fun.nix diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/unit/dn/dnsmasq/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnsmasq/default.nix rename to pkgs/unit/dn/dnsmasq/pkg-fun.nix diff --git a/pkgs/tools/networking/dnsmon-go/default.nix b/pkgs/unit/dn/dnsmon-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnsmon-go/default.nix rename to pkgs/unit/dn/dnsmon-go/pkg-fun.nix diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/unit/dn/dnsmonster/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnsmonster/default.nix rename to pkgs/unit/dn/dnsmonster/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/unit/dn/dnsname-cni/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/dnsname-cni/default.nix rename to pkgs/unit/dn/dnsname-cni/pkg-fun.nix diff --git a/pkgs/tools/security/dnspeep/default.nix b/pkgs/unit/dn/dnspeep/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dnspeep/default.nix rename to pkgs/unit/dn/dnspeep/pkg-fun.nix diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/unit/dn/dnsperf/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnsperf/default.nix rename to pkgs/unit/dn/dnsperf/pkg-fun.nix diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/unit/dn/dnsproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnsproxy/default.nix rename to pkgs/unit/dn/dnsproxy/pkg-fun.nix diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/unit/dn/dnsrecon/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dnsrecon/default.nix rename to pkgs/unit/dn/dnsrecon/pkg-fun.nix diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/unit/dn/dnstake/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnstake/default.nix rename to pkgs/unit/dn/dnstake/pkg-fun.nix diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/unit/dn/dnstop/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnstop/default.nix rename to pkgs/unit/dn/dnstop/pkg-fun.nix diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/unit/dn/dnstwist/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dnstwist/default.nix rename to pkgs/unit/dn/dnstwist/pkg-fun.nix diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/unit/dn/dnsx/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dnsx/default.nix rename to pkgs/unit/dn/dnsx/pkg-fun.nix diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/unit/do/do-agent/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/do-agent/default.nix rename to pkgs/unit/do/do-agent/pkg-fun.nix diff --git a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/pkgs/unit/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch similarity index 100% rename from pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch rename to pkgs/unit/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch diff --git a/pkgs/tools/security/doas/disable-shared.patch b/pkgs/unit/do/doas/disable-shared.patch similarity index 100% rename from pkgs/tools/security/doas/disable-shared.patch rename to pkgs/unit/do/doas/disable-shared.patch diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/unit/do/doas/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/doas/default.nix rename to pkgs/unit/do/doas/pkg-fun.nix diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/unit/do/docbook2mdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/docbook2mdoc/default.nix rename to pkgs/unit/do/docbook2mdoc/pkg-fun.nix diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/unit/do/docbook2odf/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/docbook2odf/default.nix rename to pkgs/unit/do/docbook2odf/pkg-fun.nix diff --git a/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch b/pkgs/unit/do/docbook2x/db2x_texixml-to-stdout.patch similarity index 100% rename from pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch rename to pkgs/unit/do/docbook2x/db2x_texixml-to-stdout.patch diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/unit/do/docbook2x/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/docbook2x/default.nix rename to pkgs/unit/do/docbook2x/pkg-fun.nix diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/unit/do/docbook5/pkg-fun.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix rename to pkgs/unit/do/docbook5/pkg-fun.nix diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/unit/do/docbook_sgml_dtd_31/pkg-fun.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix rename to pkgs/unit/do/docbook_sgml_dtd_31/pkg-fun.nix diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/unit/do/docbook_sgml_dtd_41/pkg-fun.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix rename to pkgs/unit/do/docbook_sgml_dtd_41/pkg-fun.nix diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat b/pkgs/unit/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat similarity index 100% rename from pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat rename to pkgs/unit/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/unit/do/docbook_xml_ebnf_dtd/pkg-fun.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix rename to pkgs/unit/do/docbook_xml_ebnf_dtd/pkg-fun.nix diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/unit/do/docear/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/docear/default.nix rename to pkgs/unit/do/docear/pkg-fun.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/unit/do/dockapps/AlsaMixer-app.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix rename to pkgs/unit/do/dockapps/AlsaMixer-app.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/unit/do/dockapps/libdockapp.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix rename to pkgs/unit/do/dockapps/libdockapp.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/unit/do/dockapps/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/dockapps/default.nix rename to pkgs/unit/do/dockapps/pkg-fun.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/unit/do/dockapps/wmCalClock.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix rename to pkgs/unit/do/dockapps/wmCalClock.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/unit/do/dockapps/wmsm-app.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix rename to pkgs/unit/do/dockapps/wmsm-app.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/unit/do/dockapps/wmsystemtray.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix rename to pkgs/unit/do/dockapps/wmsystemtray.nix diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/unit/do/dockbarx/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dockbarx/default.nix rename to pkgs/unit/do/dockbarx/pkg-fun.nix diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/unit/do/docker-buildx/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/docker/buildx.nix rename to pkgs/unit/do/docker-buildx/pkg-fun.nix diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/unit/do/docker-compose/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/docker/compose.nix rename to pkgs/unit/do/docker-compose/pkg-fun.nix diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/unit/do/docker-credential-gcr/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/docker-credential-gcr/default.nix rename to pkgs/unit/do/docker-credential-gcr/pkg-fun.nix diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/unit/do/docker-credential-helpers/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/docker-credential-helpers/default.nix rename to pkgs/unit/do/docker-credential-helpers/pkg-fun.nix diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/unit/do/docker-distribution/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/docker/distribution.nix rename to pkgs/unit/do/docker-distribution/pkg-fun.nix diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/unit/do/docker-gc/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/docker/gc.nix rename to pkgs/unit/do/docker-gc/pkg-fun.nix diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/unit/do/docker-ls/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/docker-ls/default.nix rename to pkgs/unit/do/docker-ls/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/unit/do/docker-machine-hyperkit/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/docker-machine/hyperkit.nix rename to pkgs/unit/do/docker-machine-hyperkit/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/unit/do/docker-machine-kvm/kvm-deps.nix similarity index 100% rename from pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix rename to pkgs/unit/do/docker-machine-kvm/kvm-deps.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/unit/do/docker-machine-kvm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/docker-machine/kvm.nix rename to pkgs/unit/do/docker-machine-kvm/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/unit/do/docker-machine-kvm2/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/docker-machine/kvm2.nix rename to pkgs/unit/do/docker-machine-kvm2/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/unit/do/docker-machine/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/docker-machine/default.nix rename to pkgs/unit/do/docker-machine/pkg-fun.nix diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/unit/do/docker-proxy/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/docker/proxy.nix rename to pkgs/unit/do/docker-proxy/pkg-fun.nix diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/unit/do/docker-slim/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/docker-slim/default.nix rename to pkgs/unit/do/docker-slim/pkg-fun.nix diff --git a/pkgs/tools/misc/docker-sync/Gemfile b/pkgs/unit/do/docker-sync/Gemfile similarity index 100% rename from pkgs/tools/misc/docker-sync/Gemfile rename to pkgs/unit/do/docker-sync/Gemfile diff --git a/pkgs/tools/misc/docker-sync/Gemfile.lock b/pkgs/unit/do/docker-sync/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/docker-sync/Gemfile.lock rename to pkgs/unit/do/docker-sync/Gemfile.lock diff --git a/pkgs/tools/misc/docker-sync/gemset.nix b/pkgs/unit/do/docker-sync/gemset.nix similarity index 100% rename from pkgs/tools/misc/docker-sync/gemset.nix rename to pkgs/unit/do/docker-sync/gemset.nix diff --git a/pkgs/tools/misc/docker-sync/default.nix b/pkgs/unit/do/docker-sync/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/docker-sync/default.nix rename to pkgs/unit/do/docker-sync/pkg-fun.nix diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/unit/do/dockfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dockfmt/default.nix rename to pkgs/unit/do/dockfmt/pkg-fun.nix diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/unit/do/dockle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dockle/default.nix rename to pkgs/unit/do/dockle/pkg-fun.nix diff --git a/pkgs/tools/virtualization/dockstarter/default.nix b/pkgs/unit/do/dockstarter/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/dockstarter/default.nix rename to pkgs/unit/do/dockstarter/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/unit/do/dockutil/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/dockutil/default.nix rename to pkgs/unit/do/dockutil/pkg-fun.nix diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/unit/do/doclifter/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/doclifter/default.nix rename to pkgs/unit/do/doclifter/pkg-fun.nix diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/unit/do/docopt_cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/docopt_cpp/default.nix rename to pkgs/unit/do/docopt_cpp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/docopts/deps.nix b/pkgs/unit/do/docopts/deps.nix similarity index 100% rename from pkgs/development/tools/misc/docopts/deps.nix rename to pkgs/unit/do/docopts/deps.nix diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/unit/do/docopts/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/docopts/default.nix rename to pkgs/unit/do/docopts/pkg-fun.nix diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/unit/do/doctest/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/doctest/default.nix rename to pkgs/unit/do/doctest/pkg-fun.nix diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/unit/do/doctl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/doctl/default.nix rename to pkgs/unit/do/doctl/pkg-fun.nix diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/unit/do/docui/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/docui/default.nix rename to pkgs/unit/do/docui/pkg-fun.nix diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/pkgs/unit/do/documentation-highlighter/LICENSE similarity index 100% rename from pkgs/misc/documentation-highlighter/LICENSE rename to pkgs/unit/do/documentation-highlighter/LICENSE diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/unit/do/documentation-highlighter/README.md similarity index 100% rename from pkgs/misc/documentation-highlighter/README.md rename to pkgs/unit/do/documentation-highlighter/README.md diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/unit/do/documentation-highlighter/highlight.pack.js similarity index 100% rename from pkgs/misc/documentation-highlighter/highlight.pack.js rename to pkgs/unit/do/documentation-highlighter/highlight.pack.js diff --git a/pkgs/misc/documentation-highlighter/loader.js b/pkgs/unit/do/documentation-highlighter/loader.js similarity index 100% rename from pkgs/misc/documentation-highlighter/loader.js rename to pkgs/unit/do/documentation-highlighter/loader.js diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/unit/do/documentation-highlighter/mono-blue.css similarity index 100% rename from pkgs/misc/documentation-highlighter/mono-blue.css rename to pkgs/unit/do/documentation-highlighter/mono-blue.css diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/unit/do/documentation-highlighter/pkg-fun.nix similarity index 100% rename from pkgs/misc/documentation-highlighter/default.nix rename to pkgs/unit/do/documentation-highlighter/pkg-fun.nix diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/unit/do/documentation-highlighter/update.sh similarity index 100% rename from pkgs/misc/documentation-highlighter/update.sh rename to pkgs/unit/do/documentation-highlighter/update.sh diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/unit/do/documize-community/pkg-fun.nix similarity index 100% rename from pkgs/servers/documize-community/default.nix rename to pkgs/unit/do/documize-community/pkg-fun.nix diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/unit/do/dog/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/dog/default.nix rename to pkgs/unit/do/dog/pkg-fun.nix diff --git a/pkgs/misc/doge/default.nix b/pkgs/unit/do/doge/pkg-fun.nix similarity index 100% rename from pkgs/misc/doge/default.nix rename to pkgs/unit/do/doge/pkg-fun.nix diff --git a/pkgs/applications/misc/doing/Gemfile b/pkgs/unit/do/doing/Gemfile similarity index 100% rename from pkgs/applications/misc/doing/Gemfile rename to pkgs/unit/do/doing/Gemfile diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/unit/do/doing/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/doing/Gemfile.lock rename to pkgs/unit/do/doing/Gemfile.lock diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/unit/do/doing/gemset.nix similarity index 100% rename from pkgs/applications/misc/doing/gemset.nix rename to pkgs/unit/do/doing/gemset.nix diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/unit/do/doing/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/doing/default.nix rename to pkgs/unit/do/doing/pkg-fun.nix diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/unit/do/doitlive/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/doitlive/default.nix rename to pkgs/unit/do/doitlive/pkg-fun.nix diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/unit/do/dokuwiki/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/dokuwiki/default.nix rename to pkgs/unit/do/dokuwiki/pkg-fun.nix diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/unit/do/dolbybcsoftwaredecode/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/dolbybcsoftwaredecode/default.nix rename to pkgs/unit/do/dolbybcsoftwaredecode/pkg-fun.nix diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/unit/do/dolibarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/dolibarr/default.nix rename to pkgs/unit/do/dolibarr/pkg-fun.nix diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/unit/do/dolphin-emu/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/dolphin-emu/default.nix rename to pkgs/unit/do/dolphin-emu/pkg-fun.nix diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/unit/do/dolt/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/dolt/default.nix rename to pkgs/unit/do/dolt/pkg-fun.nix diff --git a/pkgs/games/domination/default.nix b/pkgs/unit/do/domination/pkg-fun.nix similarity index 100% rename from pkgs/games/domination/default.nix rename to pkgs/unit/do/domination/pkg-fun.nix diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/unit/do/domoticz/pkg-fun.nix similarity index 100% rename from pkgs/servers/domoticz/default.nix rename to pkgs/unit/do/domoticz/pkg-fun.nix diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/unit/do/dontgo403/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dontgo403/default.nix rename to pkgs/unit/do/dontgo403/pkg-fun.nix diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/unit/do/doodle/pkg-fun.nix similarity index 100% rename from pkgs/applications/search/doodle/default.nix rename to pkgs/unit/do/doodle/pkg-fun.nix diff --git a/pkgs/games/zdoom/bcc-warning-fix.patch b/pkgs/unit/do/doom-bcc/bcc-warning-fix.patch similarity index 100% rename from pkgs/games/zdoom/bcc-warning-fix.patch rename to pkgs/unit/do/doom-bcc/bcc-warning-fix.patch diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/unit/do/doom-bcc/pkg-fun.nix similarity index 100% rename from pkgs/games/zdoom/bcc-git.nix rename to pkgs/unit/do/doom-bcc/pkg-fun.nix diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/unit/do/doona/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/doona/default.nix rename to pkgs/unit/do/doona/pkg-fun.nix diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/unit/do/doppler/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/doppler/default.nix rename to pkgs/unit/do/doppler/pkg-fun.nix diff --git a/pkgs/tools/security/dorkscout/default.nix b/pkgs/unit/do/dorkscout/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/dorkscout/default.nix rename to pkgs/unit/do/dorkscout/pkg-fun.nix diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/unit/do/dos2unix/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/dos2unix/default.nix rename to pkgs/unit/do/dos2unix/pkg-fun.nix diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/unit/do/dosage/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/dosage/default.nix rename to pkgs/unit/do/dosage/pkg-fun.nix diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/unit/do/dosbox-staging/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/dosbox-staging/default.nix rename to pkgs/unit/do/dosbox-staging/pkg-fun.nix diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/unit/do/dosemu_fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/dosemu-fonts/default.nix rename to pkgs/unit/do/dosemu_fonts/pkg-fun.nix diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/unit/do/dosfstools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/dosfstools/default.nix rename to pkgs/unit/do/dosfstools/pkg-fun.nix diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/unit/do/dosis/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/dosis/default.nix rename to pkgs/unit/do/dosis/pkg-fun.nix diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/unit/do/dotconf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dotconf/default.nix rename to pkgs/unit/do/dotconf/pkg-fun.nix diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/unit/do/dotfiles/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dotfiles/default.nix rename to pkgs/unit/do/dotfiles/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/unit/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh rename to pkgs/unit/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/unit/do/dotnetbuildhelpers/patch-fsharp-targets.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh rename to pkgs/unit/do/dotnetbuildhelpers/patch-fsharp-targets.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix b/pkgs/unit/do/dotnetbuildhelpers/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix rename to pkgs/unit/do/dotnetbuildhelpers/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh b/pkgs/unit/do/dotnetbuildhelpers/placate-nuget.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh rename to pkgs/unit/do/dotnetbuildhelpers/placate-nuget.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh b/pkgs/unit/do/dotnetbuildhelpers/placate-paket.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh rename to pkgs/unit/do/dotnetbuildhelpers/placate-paket.sh diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/unit/do/dotnetbuildhelpers/remove-duplicated-dlls.sh similarity index 100% rename from pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh rename to pkgs/unit/do/dotnetbuildhelpers/remove-duplicated-dlls.sh diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/unit/do/dotnetfx35/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dotnetfx35/default.nix rename to pkgs/unit/do/dotnetfx35/pkg-fun.nix diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/unit/do/dotnetfx40/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dotnetfx40/default.nix rename to pkgs/unit/do/dotnetfx40/pkg-fun.nix diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/unit/do/double-conversion/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/double-conversion/default.nix rename to pkgs/unit/do/double-conversion/pkg-fun.nix diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/unit/do/doulos-sil/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/doulos-sil/default.nix rename to pkgs/unit/do/doulos-sil/pkg-fun.nix diff --git a/pkgs/servers/mail/dovecot/2.3.x-module_dir.patch b/pkgs/unit/do/dovecot/2.3.x-module_dir.patch similarity index 100% rename from pkgs/servers/mail/dovecot/2.3.x-module_dir.patch rename to pkgs/unit/do/dovecot/2.3.x-module_dir.patch diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/unit/do/dovecot/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/dovecot/default.nix rename to pkgs/unit/do/dovecot/pkg-fun.nix diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/unit/do/dovecot_fts_xapian/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix rename to pkgs/unit/do/dovecot_fts_xapian/pkg-fun.nix diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/unit/do/dovecot_pigeonhole/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix rename to pkgs/unit/do/dovecot_pigeonhole/pkg-fun.nix diff --git a/pkgs/applications/misc/downonspot/default.nix b/pkgs/unit/do/downonspot/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/downonspot/default.nix rename to pkgs/unit/do/downonspot/pkg-fun.nix diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/pkgs/unit/do/dozenal/lua-header.patch similarity index 100% rename from pkgs/applications/misc/dozenal/lua-header.patch rename to pkgs/unit/do/dozenal/lua-header.patch diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/unit/do/dozenal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dozenal/default.nix rename to pkgs/unit/do/dozenal/pkg-fun.nix diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/unit/dp/dpic/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/dpic/default.nix rename to pkgs/unit/dp/dpic/pkg-fun.nix diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/unit/dp/dpkg/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/dpkg/default.nix rename to pkgs/unit/dp/dpkg/pkg-fun.nix diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/unit/dp/dpt-rp1-py/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dpt-rp1-py/default.nix rename to pkgs/unit/dp/dpt-rp1-py/pkg-fun.nix diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/unit/dq/dqlite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dqlite/default.nix rename to pkgs/unit/dq/dqlite/pkg-fun.nix diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/unit/dr/dr14_tmeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/dr14_tmeter/default.nix rename to pkgs/unit/dr/dr14_tmeter/pkg-fun.nix diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/unit/dr/draco/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/draco/default.nix rename to pkgs/unit/dr/draco/pkg-fun.nix diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/unit/dr/dracula-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/dracula-theme/default.nix rename to pkgs/unit/dr/dracula-theme/pkg-fun.nix diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/unit/dr/dracut/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/dracut/default.nix rename to pkgs/unit/dr/dracut/pkg-fun.nix diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/unit/dr/dragonfly-reverb/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/dragonfly-reverb/default.nix rename to pkgs/unit/dr/dragonfly-reverb/pkg-fun.nix diff --git a/pkgs/servers/nosql/dragonflydb/fixes.patch b/pkgs/unit/dr/dragonflydb/fixes.patch similarity index 100% rename from pkgs/servers/nosql/dragonflydb/fixes.patch rename to pkgs/unit/dr/dragonflydb/fixes.patch diff --git a/pkgs/servers/nosql/dragonflydb/glog.patch b/pkgs/unit/dr/dragonflydb/glog.patch similarity index 100% rename from pkgs/servers/nosql/dragonflydb/glog.patch rename to pkgs/unit/dr/dragonflydb/glog.patch diff --git a/pkgs/servers/nosql/dragonflydb/default.nix b/pkgs/unit/dr/dragonflydb/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/dragonflydb/default.nix rename to pkgs/unit/dr/dragonflydb/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/drake/Gemfile b/pkgs/unit/dr/drake/Gemfile similarity index 100% rename from pkgs/development/tools/build-managers/drake/Gemfile rename to pkgs/unit/dr/drake/Gemfile diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/unit/dr/drake/Gemfile.lock similarity index 100% rename from pkgs/development/tools/build-managers/drake/Gemfile.lock rename to pkgs/unit/dr/drake/Gemfile.lock diff --git a/pkgs/development/tools/build-managers/drake/gemset.nix b/pkgs/unit/dr/drake/gemset.nix similarity index 100% rename from pkgs/development/tools/build-managers/drake/gemset.nix rename to pkgs/unit/dr/drake/gemset.nix diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/unit/dr/drake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/drake/default.nix rename to pkgs/unit/dr/drake/pkg-fun.nix diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/unit/dr/drat-trim/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/drat-trim/default.nix rename to pkgs/unit/dr/drat-trim/pkg-fun.nix diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/unit/dr/drawing/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/drawing/default.nix rename to pkgs/unit/dr/drawing/pkg-fun.nix diff --git a/pkgs/applications/graphics/drawio/headless.nix b/pkgs/unit/dr/drawio-headless/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/drawio/headless.nix rename to pkgs/unit/dr/drawio-headless/pkg-fun.nix diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/unit/dr/drawio/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/drawio/default.nix rename to pkgs/unit/dr/drawio/pkg-fun.nix diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/unit/dr/drawterm/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/drawterm/default.nix rename to pkgs/unit/dr/drawterm/pkg-fun.nix diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/unit/dr/drbd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/drbd/default.nix rename to pkgs/unit/dr/drbd/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/unit/dr/driftctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/driftctl/default.nix rename to pkgs/unit/dr/driftctl/pkg-fun.nix diff --git a/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch b/pkgs/unit/dr/driftnet/libwebsockets-4.3.0.patch similarity index 100% rename from pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch rename to pkgs/unit/dr/driftnet/libwebsockets-4.3.0.patch diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/unit/dr/driftnet/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/driftnet/default.nix rename to pkgs/unit/dr/driftnet/pkg-fun.nix diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/unit/dr/drip/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/drip/default.nix rename to pkgs/unit/dr/drip/pkg-fun.nix diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/unit/dr/drive/deps.nix similarity index 100% rename from pkgs/applications/networking/drive/deps.nix rename to pkgs/unit/dr/drive/deps.nix diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/unit/dr/drive/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/drive/default.nix rename to pkgs/unit/dr/drive/pkg-fun.nix diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/unit/dr/drm_info/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/drm_info/default.nix rename to pkgs/unit/dr/drm_info/pkg-fun.nix diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/unit/dr/drogon/fix_find_package.patch similarity index 100% rename from pkgs/development/libraries/drogon/fix_find_package.patch rename to pkgs/unit/dr/drogon/fix_find_package.patch diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/unit/dr/drogon/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/drogon/default.nix rename to pkgs/unit/dr/drogon/pkg-fun.nix diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/unit/dr/droidcam/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/droidcam/default.nix rename to pkgs/unit/dr/droidcam/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/droidmote/default.nix b/pkgs/unit/dr/droidmote/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/droidmote/default.nix rename to pkgs/unit/dr/droidmote/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch b/pkgs/unit/dr/drone-cli/0001-use-different-upstream-for-gomod.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch rename to pkgs/unit/dr/drone-cli/0001-use-different-upstream-for-gomod.patch diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/unit/dr/drone-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-cli/default.nix rename to pkgs/unit/dr/drone-cli/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/unit/dr/drone-runner-docker/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix rename to pkgs/unit/dr/drone-runner-docker/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/unit/dr/drone-runner-exec/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix rename to pkgs/unit/dr/drone-runner-exec/pkg-fun.nix diff --git a/pkgs/tools/networking/dropbear/pass-path.patch b/pkgs/unit/dr/dropbear/pass-path.patch similarity index 100% rename from pkgs/tools/networking/dropbear/pass-path.patch rename to pkgs/unit/dr/dropbear/pass-path.patch diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/unit/dr/dropbear/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dropbear/default.nix rename to pkgs/unit/dr/dropbear/pkg-fun.nix diff --git a/pkgs/applications/networking/dropbox/fix-cli-paths.patch b/pkgs/unit/dr/dropbox-cli/fix-cli-paths.patch similarity index 100% rename from pkgs/applications/networking/dropbox/fix-cli-paths.patch rename to pkgs/unit/dr/dropbox-cli/fix-cli-paths.patch diff --git a/pkgs/applications/networking/dropbox/nautilus-43.patch b/pkgs/unit/dr/dropbox-cli/nautilus-43.patch similarity index 100% rename from pkgs/applications/networking/dropbox/nautilus-43.patch rename to pkgs/unit/dr/dropbox-cli/nautilus-43.patch diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/unit/dr/dropbox-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/dropbox/cli.nix rename to pkgs/unit/dr/dropbox-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/unit/dr/dropbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/dropbox/default.nix rename to pkgs/unit/dr/dropbox/pkg-fun.nix diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/unit/dr/dropwatch/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/dropwatch/default.nix rename to pkgs/unit/dr/dropwatch/pkg-fun.nix diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/unit/dr/drush/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/drush/default.nix rename to pkgs/unit/dr/drush/pkg-fun.nix diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/unit/ds/dsd/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/dsd/default.nix rename to pkgs/unit/ds/dsd/pkg-fun.nix diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/unit/ds/dsdcc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dsdcc/default.nix rename to pkgs/unit/ds/dsdcc/pkg-fun.nix diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/unit/ds/dsf2flac/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/dsf2flac/default.nix rename to pkgs/unit/ds/dsf2flac/pkg-fun.nix diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/unit/ds/dsniff/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/dsniff/default.nix rename to pkgs/unit/ds/dsniff/pkg-fun.nix diff --git a/pkgs/tools/audio/dsp/default.nix b/pkgs/unit/ds/dsp/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/dsp/default.nix rename to pkgs/unit/ds/dsp/pkg-fun.nix diff --git a/pkgs/servers/mail/dspam/mariadb.patch b/pkgs/unit/ds/dspam/mariadb.patch similarity index 100% rename from pkgs/servers/mail/dspam/mariadb.patch rename to pkgs/unit/ds/dspam/mariadb.patch diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/unit/ds/dspam/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/dspam/default.nix rename to pkgs/unit/ds/dspam/pkg-fun.nix diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/unit/ds/dsq/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dsq/default.nix rename to pkgs/unit/ds/dsq/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/unit/ds/dsseries/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/dsseries/default.nix rename to pkgs/unit/ds/dsseries/pkg-fun.nix diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/unit/ds/dssi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dssi/default.nix rename to pkgs/unit/ds/dssi/pkg-fun.nix diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/unit/ds/dssp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/dssp/default.nix rename to pkgs/unit/ds/dssp/pkg-fun.nix diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/unit/ds/dstask/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dstask/default.nix rename to pkgs/unit/ds/dstask/pkg-fun.nix diff --git a/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/pkgs/unit/ds/dstat/fix_pluginpath.patch similarity index 100% rename from pkgs/os-specific/linux/dstat/fix_pluginpath.patch rename to pkgs/unit/ds/dstat/fix_pluginpath.patch diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/unit/ds/dstat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/dstat/default.nix rename to pkgs/unit/ds/dstat/pkg-fun.nix diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/unit/ds/dstp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dstp/default.nix rename to pkgs/unit/ds/dstp/pkg-fun.nix diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/unit/ds/dsvpn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/dsvpn/default.nix rename to pkgs/unit/ds/dsvpn/pkg-fun.nix diff --git a/pkgs/tools/misc/dt-shell-color-scripts/default.nix b/pkgs/unit/dt/dt-shell-color-scripts/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dt-shell-color-scripts/default.nix rename to pkgs/unit/dt/dt-shell-color-scripts/pkg-fun.nix diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/unit/dt/dtach/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dtach/default.nix rename to pkgs/unit/dt/dtach/pkg-fun.nix diff --git a/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch b/pkgs/unit/dt/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch similarity index 100% rename from pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch rename to pkgs/unit/dt/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/unit/dt/dtc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/dtc/default.nix rename to pkgs/unit/dt/dtc/pkg-fun.nix diff --git a/pkgs/development/compilers/dtc/python-3.10.patch b/pkgs/unit/dt/dtc/python-3.10.patch similarity index 100% rename from pkgs/development/compilers/dtc/python-3.10.patch rename to pkgs/unit/dt/dtc/python-3.10.patch diff --git a/pkgs/applications/terminal-emulators/dterm/default.nix b/pkgs/unit/dt/dterm/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/dterm/default.nix rename to pkgs/unit/dt/dterm/pkg-fun.nix diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/unit/dt/dtools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dtools/default.nix rename to pkgs/unit/dt/dtools/pkg-fun.nix diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/unit/dt/dtrx/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/dtrx/default.nix rename to pkgs/unit/dt/dtrx/pkg-fun.nix diff --git a/pkgs/data/misc/dtv-scan-tables/linuxtv.nix b/pkgs/unit/dt/dtv-scan-tables_linuxtv/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/dtv-scan-tables/linuxtv.nix rename to pkgs/unit/dt/dtv-scan-tables_linuxtv/pkg-fun.nix diff --git a/pkgs/data/misc/dtv-scan-tables/tvheadend.nix b/pkgs/unit/dt/dtv-scan-tables_tvheadend/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/dtv-scan-tables/tvheadend.nix rename to pkgs/unit/dt/dtv-scan-tables_tvheadend/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/unit/du/dub/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/dub/default.nix rename to pkgs/unit/du/dub/pkg-fun.nix diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/unit/du/duc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/duc/default.nix rename to pkgs/unit/du/duc/pkg-fun.nix diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/unit/du/duckdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/duckdb/default.nix rename to pkgs/unit/du/duckdb/pkg-fun.nix diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/unit/du/duckdb/version.patch similarity index 100% rename from pkgs/development/libraries/duckdb/version.patch rename to pkgs/unit/du/duckdb/version.patch diff --git a/pkgs/servers/duckling-proxy/default.nix b/pkgs/unit/du/duckling-proxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/duckling-proxy/default.nix rename to pkgs/unit/du/duckling-proxy/pkg-fun.nix diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/unit/du/duf/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/duf/default.nix rename to pkgs/unit/du/duf/pkg-fun.nix diff --git a/pkgs/development/interpreters/duktape/duktape.pc.in b/pkgs/unit/du/duktape/duktape.pc.in similarity index 100% rename from pkgs/development/interpreters/duktape/duktape.pc.in rename to pkgs/unit/du/duktape/duktape.pc.in diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/unit/du/duktape/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/duktape/default.nix rename to pkgs/unit/du/duktape/pkg-fun.nix diff --git a/pkgs/development/tools/dum/default.nix b/pkgs/unit/du/dum/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dum/default.nix rename to pkgs/unit/du/dum/pkg-fun.nix diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/unit/du/dumb-init/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/dumb-init/default.nix rename to pkgs/unit/du/dumb-init/pkg-fun.nix diff --git a/pkgs/misc/dumb/default.nix b/pkgs/unit/du/dumb/pkg-fun.nix similarity index 100% rename from pkgs/misc/dumb/default.nix rename to pkgs/unit/du/dumb/pkg-fun.nix diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/unit/du/dump/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/dump/default.nix rename to pkgs/unit/du/dump/pkg-fun.nix diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/unit/du/dump1090/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/dump1090/default.nix rename to pkgs/unit/du/dump1090/pkg-fun.nix diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/unit/du/dumptorrent/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dumptorrent/default.nix rename to pkgs/unit/du/dumptorrent/pkg-fun.nix diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/unit/du/dunst/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dunst/default.nix rename to pkgs/unit/du/dunst/pkg-fun.nix diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/unit/du/duo-unix/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/duo-unix/default.nix rename to pkgs/unit/du/duo-unix/pkg-fun.nix diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/unit/du/dupd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dupd/default.nix rename to pkgs/unit/du/dupd/pkg-fun.nix diff --git a/pkgs/tools/filesystems/dupe-krill/Cargo.lock b/pkgs/unit/du/dupe-krill/Cargo.lock similarity index 100% rename from pkgs/tools/filesystems/dupe-krill/Cargo.lock rename to pkgs/unit/du/dupe-krill/Cargo.lock diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/unit/du/dupe-krill/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/dupe-krill/default.nix rename to pkgs/unit/du/dupe-krill/pkg-fun.nix diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/unit/du/dupeguru/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dupeguru/default.nix rename to pkgs/unit/du/dupeguru/pkg-fun.nix diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/unit/du/duperemove/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/duperemove/default.nix rename to pkgs/unit/du/duperemove/pkg-fun.nix diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/unit/du/duplicacy/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/duplicacy/default.nix rename to pkgs/unit/du/duplicacy/pkg-fun.nix diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/unit/du/duplicati/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/duplicati/default.nix rename to pkgs/unit/du/duplicati/pkg-fun.nix diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/unit/du/duplicity/gnutar-in-test.patch similarity index 100% rename from pkgs/tools/backup/duplicity/gnutar-in-test.patch rename to pkgs/unit/du/duplicity/gnutar-in-test.patch diff --git a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/pkgs/unit/du/duplicity/linux-disable-timezone-test.patch similarity index 100% rename from pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch rename to pkgs/unit/du/duplicity/linux-disable-timezone-test.patch diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/unit/du/duplicity/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/duplicity/default.nix rename to pkgs/unit/du/duplicity/pkg-fun.nix diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/unit/du/duplicity/use-installed-scripts-in-test.patch similarity index 100% rename from pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch rename to pkgs/unit/du/duplicity/use-installed-scripts-in-test.patch diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/unit/du/duply/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/duply/default.nix rename to pkgs/unit/du/duply/pkg-fun.nix diff --git a/pkgs/tools/misc/dutree/default.nix b/pkgs/unit/du/dutree/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dutree/default.nix rename to pkgs/unit/du/dutree/pkg-fun.nix diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/unit/dv/dvd-slideshow/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/dvd-slideshow/default.nix rename to pkgs/unit/dv/dvd-slideshow/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/unit/dv/dvd-vr/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/dvd-vr/default.nix rename to pkgs/unit/dv/dvd-vr/pkg-fun.nix diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/pkgs/unit/dv/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch similarity index 100% rename from pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch rename to pkgs/unit/dv/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/pkgs/unit/dv/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch similarity index 100% rename from pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch rename to pkgs/unit/dv/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/pkgs/unit/dv/dvdauthor/dvdauthor-imagemagick-0.7.0.patch similarity index 100% rename from pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch rename to pkgs/unit/dv/dvdauthor/dvdauthor-imagemagick-0.7.0.patch diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/unit/dv/dvdauthor/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/dvdauthor/default.nix rename to pkgs/unit/dv/dvdauthor/pkg-fun.nix diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/unit/dv/dvdbackup/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/dvdbackup/default.nix rename to pkgs/unit/dv/dvdbackup/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/pkgs/unit/dv/dvdisaster/dvdrom.patch similarity index 100% rename from pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch rename to pkgs/unit/dv/dvdisaster/dvdrom.patch diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/unit/dv/dvdisaster/encryption.patch similarity index 100% rename from pkgs/tools/cd-dvd/dvdisaster/encryption.patch rename to pkgs/unit/dv/dvdisaster/encryption.patch diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/unit/dv/dvdisaster/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/dvdisaster/default.nix rename to pkgs/unit/dv/dvdisaster/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/unit/dv/dvdplusrwtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/dvd+rw-tools/default.nix rename to pkgs/unit/dv/dvdplusrwtools/pkg-fun.nix diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/unit/dv/dvgrab/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/dvgrab/default.nix rename to pkgs/unit/dv/dvgrab/pkg-fun.nix diff --git a/pkgs/tools/misc/dwarf2json/default.nix b/pkgs/unit/dw/dwarf2json/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dwarf2json/default.nix rename to pkgs/unit/dw/dwarf2json/pkg-fun.nix diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/unit/dw/dwarfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/dwarfs/default.nix rename to pkgs/unit/dw/dwarfs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/dwarfs/version_info.patch b/pkgs/unit/dw/dwarfs/version_info.patch similarity index 100% rename from pkgs/tools/filesystems/dwarfs/version_info.patch rename to pkgs/unit/dw/dwarfs/version_info.patch diff --git a/pkgs/applications/misc/dwdiff/default.nix b/pkgs/unit/dw/dwdiff/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dwdiff/default.nix rename to pkgs/unit/dw/dwdiff/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/unit/dw/dwfv/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/dwfv/default.nix rename to pkgs/unit/dw/dwfv/pkg-fun.nix diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/unit/dw/dwl/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/dwl/default.nix rename to pkgs/unit/dw/dwl/pkg-fun.nix diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/unit/dw/dwm-status/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/dwm/dwm-status.nix rename to pkgs/unit/dw/dwm-status/pkg-fun.nix diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/unit/dw/dwmbar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dwmbar/default.nix rename to pkgs/unit/dw/dwmbar/pkg-fun.nix diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/unit/dw/dwmblocks/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/dwmblocks/default.nix rename to pkgs/unit/dw/dwmblocks/pkg-fun.nix diff --git a/pkgs/development/tools/misc/dwz/default.nix b/pkgs/unit/dw/dwz/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/dwz/default.nix rename to pkgs/unit/dw/dwz/pkg-fun.nix diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/unit/dx/dxa/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/xa/dxa.nix rename to pkgs/unit/dx/dxa/pkg-fun.nix diff --git a/pkgs/misc/dxvk/darwin-dxvk-compat.patch b/pkgs/unit/dx/dxvk/darwin-dxvk-compat.patch similarity index 100% rename from pkgs/misc/dxvk/darwin-dxvk-compat.patch rename to pkgs/unit/dx/dxvk/darwin-dxvk-compat.patch diff --git a/pkgs/misc/dxvk/darwin-thread-primitives.patch b/pkgs/unit/dx/dxvk/darwin-thread-primitives.patch similarity index 100% rename from pkgs/misc/dxvk/darwin-thread-primitives.patch rename to pkgs/unit/dx/dxvk/darwin-thread-primitives.patch diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/unit/dx/dxvk/dxvk.nix similarity index 100% rename from pkgs/misc/dxvk/dxvk.nix rename to pkgs/unit/dx/dxvk/dxvk.nix diff --git a/pkgs/misc/dxvk/mcfgthread.patch b/pkgs/unit/dx/dxvk/mcfgthread.patch similarity index 100% rename from pkgs/misc/dxvk/mcfgthread.patch rename to pkgs/unit/dx/dxvk/mcfgthread.patch diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/unit/dx/dxvk/pkg-fun.nix similarity index 100% rename from pkgs/misc/dxvk/default.nix rename to pkgs/unit/dx/dxvk/pkg-fun.nix diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/unit/dx/dxx-rebirth/pkg-fun.nix similarity index 100% rename from pkgs/games/dxx-rebirth/default.nix rename to pkgs/unit/dx/dxx-rebirth/pkg-fun.nix diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/unit/dy/dydisnix/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/disnix/dydisnix/default.nix rename to pkgs/unit/dy/dydisnix/pkg-fun.nix diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/unit/dy/dyff/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/dyff/default.nix rename to pkgs/unit/dy/dyff/pkg-fun.nix diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/unit/dy/dynamic-colors/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/dynamic-colors/default.nix rename to pkgs/unit/dy/dynamic-colors/pkg-fun.nix diff --git a/pkgs/tools/graphics/dynamic-wallpaper/default.nix b/pkgs/unit/dy/dynamic-wallpaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/dynamic-wallpaper/default.nix rename to pkgs/unit/dy/dynamic-wallpaper/pkg-fun.nix diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/unit/dy/dynamips/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/dynamips/default.nix rename to pkgs/unit/dy/dynamips/pkg-fun.nix diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/unit/dy/dyncall/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/dyncall/default.nix rename to pkgs/unit/dy/dyncall/pkg-fun.nix diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/unit/dy/dyndnsc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/dyndns/dyndnsc/default.nix rename to pkgs/unit/dy/dyndnsc/pkg-fun.nix diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/unit/dz/dzen2/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/dzen2/default.nix rename to pkgs/unit/dz/dzen2/pkg-fun.nix diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/unit/e1/e16/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/e16/default.nix rename to pkgs/unit/e1/e16/pkg-fun.nix diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/unit/e1/e17gtk/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/e17gtk/default.nix rename to pkgs/unit/e1/e17gtk/pkg-fun.nix diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/unit/e2/e2fsprogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/e2fsprogs/default.nix rename to pkgs/unit/e2/e2fsprogs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/unit/e2/e2tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/e2tools/default.nix rename to pkgs/unit/e2/e2tools/pkg-fun.nix diff --git a/pkgs/tools/misc/ea/default.nix b/pkgs/unit/ea/ea/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ea/default.nix rename to pkgs/unit/ea/ea/pkg-fun.nix diff --git a/pkgs/tools/text/each/default.nix b/pkgs/unit/ea/each/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/each/default.nix rename to pkgs/unit/ea/each/pkg-fun.nix diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/unit/ea/eaglemode/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/eaglemode/default.nix rename to pkgs/unit/ea/eaglemode/pkg-fun.nix diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/unit/ea/earlybird/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/earlybird/default.nix rename to pkgs/unit/ea/earlybird/pkg-fun.nix diff --git a/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch b/pkgs/unit/ea/earlyoom/fix-dbus-path.patch similarity index 100% rename from pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch rename to pkgs/unit/ea/earlyoom/fix-dbus-path.patch diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/unit/ea/earlyoom/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/earlyoom/default.nix rename to pkgs/unit/ea/earlyoom/pkg-fun.nix diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/unit/ea/eartag/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/eartag/default.nix rename to pkgs/unit/ea/eartag/pkg-fun.nix diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/unit/ea/earthly/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/earthly/default.nix rename to pkgs/unit/ea/earthly/pkg-fun.nix diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/unit/ea/easeprobe/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/easeprobe/default.nix rename to pkgs/unit/ea/easeprobe/pkg-fun.nix diff --git a/pkgs/applications/science/logic/easycrypt/runtest.nix b/pkgs/unit/ea/easycrypt-runtest/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/easycrypt/runtest.nix rename to pkgs/unit/ea/easycrypt-runtest/pkg-fun.nix diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/unit/ea/easycrypt/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/easycrypt/default.nix rename to pkgs/unit/ea/easycrypt/pkg-fun.nix diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/unit/ea/easyeffects/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/easyeffects/default.nix rename to pkgs/unit/ea/easyeffects/pkg-fun.nix diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/unit/ea/easyjson/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/easyjson/default.nix rename to pkgs/unit/ea/easyjson/pkg-fun.nix diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/unit/ea/easyloggingpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/easyloggingpp/default.nix rename to pkgs/unit/ea/easyloggingpp/pkg-fun.nix diff --git a/pkgs/development/embedded/easypdkprog/default.nix b/pkgs/unit/ea/easypdkprog/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/easypdkprog/default.nix rename to pkgs/unit/ea/easypdkprog/pkg-fun.nix diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/unit/ea/easyrpg-player/pkg-fun.nix similarity index 100% rename from pkgs/games/easyrpg-player/default.nix rename to pkgs/unit/ea/easyrpg-player/pkg-fun.nix diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/unit/ea/easyrsa/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/easyrsa/default.nix rename to pkgs/unit/ea/easyrsa/pkg-fun.nix diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/unit/ea/easysnap/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/easysnap/default.nix rename to pkgs/unit/ea/easysnap/pkg-fun.nix diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/unit/ea/easytag/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/easytag/default.nix rename to pkgs/unit/ea/easytag/pkg-fun.nix diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/unit/eb/EBTKS/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/biology/EBTKS/default.nix rename to pkgs/unit/eb/EBTKS/pkg-fun.nix diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/unit/eb/eb-garamond/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/eb-garamond/default.nix rename to pkgs/unit/eb/eb-garamond/pkg-fun.nix diff --git a/pkgs/games/eboard/eboard.patch b/pkgs/unit/eb/eboard/eboard.patch similarity index 100% rename from pkgs/games/eboard/eboard.patch rename to pkgs/unit/eb/eboard/eboard.patch diff --git a/pkgs/games/eboard/default.nix b/pkgs/unit/eb/eboard/pkg-fun.nix similarity index 100% rename from pkgs/games/eboard/default.nix rename to pkgs/unit/eb/eboard/pkg-fun.nix diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/unit/eb/ebook2cw/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/ebook2cw/default.nix rename to pkgs/unit/eb/ebook2cw/pkg-fun.nix diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/unit/eb/ebook_tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ebook-tools/default.nix rename to pkgs/unit/eb/ebook_tools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/unit/eb/ebtables/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ebtables/default.nix rename to pkgs/unit/eb/ebtables/pkg-fun.nix diff --git a/pkgs/applications/audio/ebumeter/default.nix b/pkgs/unit/eb/ebumeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ebumeter/default.nix rename to pkgs/unit/eb/ebumeter/pkg-fun.nix diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/unit/ec/ec2-ami-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/ec2-ami-tools/default.nix rename to pkgs/unit/ec/ec2-ami-tools/pkg-fun.nix diff --git a/pkgs/tools/virtualization/ec2-ami-tools/writable.patch b/pkgs/unit/ec/ec2-ami-tools/writable.patch similarity index 100% rename from pkgs/tools/virtualization/ec2-ami-tools/writable.patch rename to pkgs/unit/ec/ec2-ami-tools/writable.patch diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/unit/ec/ec2-api-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/ec2-api-tools/default.nix rename to pkgs/unit/ec/ec2-api-tools/pkg-fun.nix diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/unit/ec/ec2-metadata-mock/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ec2-metadata-mock/default.nix rename to pkgs/unit/ec/ec2-metadata-mock/pkg-fun.nix diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/unit/ec/ecasound/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ecasound/default.nix rename to pkgs/unit/ec/ecasound/pkg-fun.nix diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/unit/ec/ecdsatool/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ecdsatool/default.nix rename to pkgs/unit/ec/ecdsatool/pkg-fun.nix diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/unit/ec/ecdsautils/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ecdsautils/default.nix rename to pkgs/unit/ec/ecdsautils/pkg-fun.nix diff --git a/pkgs/servers/echoip/default.nix b/pkgs/unit/ec/echoip/pkg-fun.nix similarity index 100% rename from pkgs/servers/echoip/default.nix rename to pkgs/unit/ec/echoip/pkg-fun.nix diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/unit/ec/ecl/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ecl/default.nix rename to pkgs/unit/ec/ecl/pkg-fun.nix diff --git a/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch b/pkgs/unit/ec/ecl_16_1_2/ecl-1.16.2-libffi-3.3-abi.patch similarity index 100% rename from pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch rename to pkgs/unit/ec/ecl_16_1_2/ecl-1.16.2-libffi-3.3-abi.patch diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/unit/ec/ecl_16_1_2/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ecl/16.1.2.nix rename to pkgs/unit/ec/ecl_16_1_2/pkg-fun.nix diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/unit/ec/eclair/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/eclair/default.nix rename to pkgs/unit/ec/eclair/pkg-fun.nix diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/unit/ec/eclib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/eclib/default.nix rename to pkgs/unit/ec/eclib/pkg-fun.nix diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/unit/ec/eclint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/eclint/default.nix rename to pkgs/unit/ec/eclint/pkg-fun.nix diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/unit/ec/eclipse-mat/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/eclipse-mat/default.nix rename to pkgs/unit/ec/eclipse-mat/pkg-fun.nix diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/unit/ec/ecm/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/ecm/default.nix rename to pkgs/unit/ec/ecm/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/unit/ec/ecmtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/ecm-tools/default.nix rename to pkgs/unit/ec/ecmtools/pkg-fun.nix diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/unit/ec/ecopcr/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/ecopcr/default.nix rename to pkgs/unit/ec/ecopcr/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/unit/ec/ecos/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/ecos/default.nix rename to pkgs/unit/ec/ecos/pkg-fun.nix diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/unit/ec/ecryptfs-helper/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ecryptfs/helper.nix rename to pkgs/unit/ec/ecryptfs-helper/pkg-fun.nix diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/unit/ec/ecryptfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ecryptfs/default.nix rename to pkgs/unit/ec/ecryptfs/pkg-fun.nix diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/unit/ec/ecs-agent/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/ecs-agent/default.nix rename to pkgs/unit/ec/ecs-agent/pkg-fun.nix diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/unit/ec/ecwolf/pkg-fun.nix similarity index 100% rename from pkgs/games/ecwolf/default.nix rename to pkgs/unit/ec/ecwolf/pkg-fun.nix diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/unit/ed/ed/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/ed/default.nix rename to pkgs/unit/ed/ed/pkg-fun.nix diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/unit/ed/edac-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/edac-utils/default.nix rename to pkgs/unit/ed/edac-utils/pkg-fun.nix diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/unit/ed/edbrowse/0001-small-fixes.patch similarity index 100% rename from pkgs/applications/editors/edbrowse/0001-small-fixes.patch rename to pkgs/unit/ed/edbrowse/0001-small-fixes.patch diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/unit/ed/edbrowse/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/edbrowse/default.nix rename to pkgs/unit/ed/edbrowse/pkg-fun.nix diff --git a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/pkgs/unit/ed/edgetpu-compiler/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix rename to pkgs/unit/ed/edgetpu-compiler/pkg-fun.nix diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/unit/ed/edid-decode/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/edid-decode/default.nix rename to pkgs/unit/ed/edid-decode/pkg-fun.nix diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/unit/ed/edid-generator/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/edid-generator/default.nix rename to pkgs/unit/ed/edid-generator/pkg-fun.nix diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/unit/ed/edir/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/edir/default.nix rename to pkgs/unit/ed/edir/pkg-fun.nix diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/unit/ed/edit/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/edit/default.nix rename to pkgs/unit/ed/edit/pkg-fun.nix diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/unit/ed/editline/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/editline/default.nix rename to pkgs/unit/ed/editline/pkg-fun.nix diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/unit/ed/editorconfig-checker/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/editorconfig-checker/default.nix rename to pkgs/unit/ed/editorconfig-checker/pkg-fun.nix diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/unit/ed/editorconfig-core-c/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/editorconfig-core-c/default.nix rename to pkgs/unit/ed/editorconfig-core-c/pkg-fun.nix diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/unit/ed/editres/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/editres/default.nix rename to pkgs/unit/ed/editres/pkg-fun.nix diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/unit/ed/edk2-uefi-shell/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/edk2-uefi-shell/default.nix rename to pkgs/unit/ed/edk2-uefi-shell/pkg-fun.nix diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/unit/ed/edk2/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/edk2/default.nix rename to pkgs/unit/ed/edk2/pkg-fun.nix diff --git a/pkgs/applications/editors/edlin/default.nix b/pkgs/unit/ed/edlin/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/edlin/default.nix rename to pkgs/unit/ed/edlin/pkg-fun.nix diff --git a/pkgs/data/fonts/edukai/default.nix b/pkgs/unit/ed/edukai/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/edukai/default.nix rename to pkgs/unit/ed/edukai/pkg-fun.nix diff --git a/pkgs/data/fonts/eduli/default.nix b/pkgs/unit/ed/eduli/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/eduli/default.nix rename to pkgs/unit/ed/eduli/pkg-fun.nix diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/unit/ed/edusong/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/edusong/default.nix rename to pkgs/unit/ed/edusong/pkg-fun.nix diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/unit/ed/edwin/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/edwin/default.nix rename to pkgs/unit/ed/edwin/pkg-fun.nix diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/unit/ef/eff/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/eff/default.nix rename to pkgs/unit/ef/eff/pkg-fun.nix diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/unit/ef/efficient-compression-tool/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/efficient-compression-tool/default.nix rename to pkgs/unit/ef/efficient-compression-tool/pkg-fun.nix diff --git a/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/unit/ef/efficient-compression-tool/use-nixpkgs-libpng.patch similarity index 100% rename from pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch rename to pkgs/unit/ef/efficient-compression-tool/use-nixpkgs-libpng.patch diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/unit/ef/effitask/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/effitask/default.nix rename to pkgs/unit/ef/effitask/pkg-fun.nix diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/unit/ef/efibootmgr/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/efibootmgr/default.nix rename to pkgs/unit/ef/efibootmgr/pkg-fun.nix diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/unit/ef/efitools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/efitools/default.nix rename to pkgs/unit/ef/efitools/pkg-fun.nix diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/unit/ef/efivar/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/efivar/default.nix rename to pkgs/unit/ef/efivar/pkg-fun.nix diff --git a/pkgs/applications/audio/eflite/format.patch b/pkgs/unit/ef/eflite/format.patch similarity index 100% rename from pkgs/applications/audio/eflite/format.patch rename to pkgs/unit/ef/eflite/format.patch diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/unit/ef/eflite/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/eflite/default.nix rename to pkgs/unit/ef/eflite/pkg-fun.nix diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/unit/ef/efm-langserver/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/efm-langserver/default.nix rename to pkgs/unit/ef/efm-langserver/pkg-fun.nix diff --git a/pkgs/data/fonts/efont-unicode/default.nix b/pkgs/unit/ef/efont-unicode/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/efont-unicode/default.nix rename to pkgs/unit/ef/efont-unicode/pkg-fun.nix diff --git a/pkgs/tools/misc/eget/default.nix b/pkgs/unit/eg/eget/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/eget/default.nix rename to pkgs/unit/eg/eget/pkg-fun.nix diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/unit/eg/eggdbus/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/eggdbus/default.nix rename to pkgs/unit/eg/eggdbus/pkg-fun.nix diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/unit/eg/eggdrop/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/eggdrop/default.nix rename to pkgs/unit/eg/eggdrop/pkg-fun.nix diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/unit/eg/eggnog-mapper/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/eggnog-mapper/default.nix rename to pkgs/unit/eg/eggnog-mapper/pkg-fun.nix diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/unit/eg/egl-wayland/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/egl-wayland/default.nix rename to pkgs/unit/eg/egl-wayland/pkg-fun.nix diff --git a/pkgs/games/egoboo/default.nix b/pkgs/unit/eg/egoboo/pkg-fun.nix similarity index 100% rename from pkgs/games/egoboo/default.nix rename to pkgs/unit/eg/egoboo/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/unit/eg/egypt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/egypt/default.nix rename to pkgs/unit/eg/egypt/pkg-fun.nix diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/unit/ei/eiciel/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/eiciel/default.nix rename to pkgs/unit/ei/eiciel/pkg-fun.nix diff --git a/pkgs/games/eidolon/cargo-lock.patch b/pkgs/unit/ei/eidolon/cargo-lock.patch similarity index 100% rename from pkgs/games/eidolon/cargo-lock.patch rename to pkgs/unit/ei/eidolon/cargo-lock.patch diff --git a/pkgs/games/eidolon/default.nix b/pkgs/unit/ei/eidolon/pkg-fun.nix similarity index 100% rename from pkgs/games/eidolon/default.nix rename to pkgs/unit/ei/eidolon/pkg-fun.nix diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/unit/ei/eigen/include-dir.patch similarity index 100% rename from pkgs/development/libraries/eigen/include-dir.patch rename to pkgs/unit/ei/eigen/include-dir.patch diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/unit/ei/eigen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/eigen/default.nix rename to pkgs/unit/ei/eigen/pkg-fun.nix diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/unit/ei/eigen2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/eigen/2.0.nix rename to pkgs/unit/ei/eigen2/pkg-fun.nix diff --git a/pkgs/development/tools/ejson/Gemfile b/pkgs/unit/ej/ejson/Gemfile similarity index 100% rename from pkgs/development/tools/ejson/Gemfile rename to pkgs/unit/ej/ejson/Gemfile diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/unit/ej/ejson/Gemfile.lock similarity index 100% rename from pkgs/development/tools/ejson/Gemfile.lock rename to pkgs/unit/ej/ejson/Gemfile.lock diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/unit/ej/ejson/gemset.nix similarity index 100% rename from pkgs/development/tools/ejson/gemset.nix rename to pkgs/unit/ej/ejson/gemset.nix diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/unit/ej/ejson/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ejson/default.nix rename to pkgs/unit/ej/ejson/pkg-fun.nix diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/unit/ej/ejson2env/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/ejson2env/default.nix rename to pkgs/unit/ej/ejson2env/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/ekam/default.nix b/pkgs/unit/ek/ekam/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/ekam/default.nix rename to pkgs/unit/ek/ekam/pkg-fun.nix diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/unit/ek/ekho/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ekho/default.nix rename to pkgs/unit/ek/ekho/pkg-fun.nix diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/unit/ek/eksctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/eksctl/default.nix rename to pkgs/unit/ek/eksctl/pkg-fun.nix diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/unit/el/elan/0001-dynamically-patchelf-binaries.patch similarity index 100% rename from pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch rename to pkgs/unit/el/elan/0001-dynamically-patchelf-binaries.patch diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/unit/el/elan/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/elan/default.nix rename to pkgs/unit/el/elan/pkg-fun.nix diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/unit/el/elasticsearch-curator/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/elasticsearch-curator/default.nix rename to pkgs/unit/el/elasticsearch-curator/pkg-fun.nix diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/unit/el/electricsheep/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/electricsheep/default.nix rename to pkgs/unit/el/electricsheep/pkg-fun.nix diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/unit/el/electron-fiddle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/electron-fiddle/default.nix rename to pkgs/unit/el/electron-fiddle/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/unit/el/electron-mail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/electron-mail/default.nix rename to pkgs/unit/el/electron-mail/pkg-fun.nix diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/unit/el/electronplayer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/electronplayer/electronplayer.nix rename to pkgs/unit/el/electronplayer/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/unit/el/element/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/element/default.nix rename to pkgs/unit/el/element/pkg-fun.nix diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/unit/el/elementary-cmake-modules/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/elementary-cmake-modules/default.nix rename to pkgs/unit/el/elementary-cmake-modules/pkg-fun.nix diff --git a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/pkgs/unit/el/elementary-cmake-modules/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh rename to pkgs/unit/el/elementary-cmake-modules/setup-hook.sh diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/unit/el/elementary-planner/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/elementary-planner/default.nix rename to pkgs/unit/el/elementary-planner/pkg-fun.nix diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/unit/el/elementary-xfce-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/elementary-xfce-icon-theme/default.nix rename to pkgs/unit/el/elementary-xfce-icon-theme/pkg-fun.nix diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/unit/el/elf-header-real/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/elf-header/default.nix rename to pkgs/unit/el/elf-header-real/pkg-fun.nix diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/unit/el/elf2uf2-rs/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/elf2uf2-rs/default.nix rename to pkgs/unit/el/elf2uf2-rs/pkg-fun.nix diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/unit/el/elfcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/elfcat/default.nix rename to pkgs/unit/el/elfcat/pkg-fun.nix diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/unit/el/elfinfo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/elfinfo/default.nix rename to pkgs/unit/el/elfinfo/pkg-fun.nix diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/unit/el/elfio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/elfio/default.nix rename to pkgs/unit/el/elfio/pkg-fun.nix diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/unit/el/elfkickers/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/elfkickers/default.nix rename to pkgs/unit/el/elfkickers/pkg-fun.nix diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/pkgs/unit/el/elfutils/debug-info-from-env.patch similarity index 100% rename from pkgs/development/tools/misc/elfutils/debug-info-from-env.patch rename to pkgs/unit/el/elfutils/debug-info-from-env.patch diff --git a/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/pkgs/unit/el/elfutils/musl-error_h.patch similarity index 100% rename from pkgs/development/tools/misc/elfutils/musl-error_h.patch rename to pkgs/unit/el/elfutils/musl-error_h.patch diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/unit/el/elfutils/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/elfutils/default.nix rename to pkgs/unit/el/elfutils/pkg-fun.nix diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/unit/el/elfx86exts/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/elfx86exts/default.nix rename to pkgs/unit/el/elfx86exts/pkg-fun.nix diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/unit/el/eli/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/eli/default.nix rename to pkgs/unit/el/eli/pkg-fun.nix diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/unit/el/eliot-tree/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/eliot-tree/default.nix rename to pkgs/unit/el/eliot-tree/pkg-fun.nix diff --git a/pkgs/development/tools/elkhound/default.nix b/pkgs/unit/el/elkhound/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/elkhound/default.nix rename to pkgs/unit/el/elkhound/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/unit/el/ell/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ell/default.nix rename to pkgs/unit/el/ell/pkg-fun.nix diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/unit/el/elliptic_curves/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/elliptic_curves/default.nix rename to pkgs/unit/el/elliptic_curves/pkg-fun.nix diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile b/pkgs/unit/el/elm-github-install/Gemfile similarity index 100% rename from pkgs/tools/package-management/elm-github-install/Gemfile rename to pkgs/unit/el/elm-github-install/Gemfile diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/pkgs/unit/el/elm-github-install/Gemfile.lock similarity index 100% rename from pkgs/tools/package-management/elm-github-install/Gemfile.lock rename to pkgs/unit/el/elm-github-install/Gemfile.lock diff --git a/pkgs/tools/package-management/elm-github-install/gemset.nix b/pkgs/unit/el/elm-github-install/gemset.nix similarity index 100% rename from pkgs/tools/package-management/elm-github-install/gemset.nix rename to pkgs/unit/el/elm-github-install/gemset.nix diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/unit/el/elm-github-install/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/elm-github-install/default.nix rename to pkgs/unit/el/elm-github-install/pkg-fun.nix diff --git a/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch b/pkgs/unit/el/elmerfem/patches/0001-fix-import-of-QPainterPath.patch similarity index 100% rename from pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch rename to pkgs/unit/el/elmerfem/patches/0001-fix-import-of-QPainterPath.patch diff --git a/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch b/pkgs/unit/el/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch similarity index 100% rename from pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch rename to pkgs/unit/el/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch diff --git a/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch b/pkgs/unit/el/elmerfem/patches/0003-ignore-qwt_compat.patch similarity index 100% rename from pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch rename to pkgs/unit/el/elmerfem/patches/0003-ignore-qwt_compat.patch diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/unit/el/elmerfem/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/elmerfem/default.nix rename to pkgs/unit/el/elmerfem/pkg-fun.nix diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/unit/el/elogind/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/elogind/default.nix rename to pkgs/unit/el/elogind/pkg-fun.nix diff --git a/pkgs/development/libraries/elpa/pkg-config.patch b/pkgs/unit/el/elpa/pkg-config.patch similarity index 100% rename from pkgs/development/libraries/elpa/pkg-config.patch rename to pkgs/unit/el/elpa/pkg-config.patch diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/unit/el/elpa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/elpa/default.nix rename to pkgs/unit/el/elpa/pkg-fun.nix diff --git a/pkgs/development/tools/eltclsh/default.nix b/pkgs/unit/el/eltclsh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/eltclsh/default.nix rename to pkgs/unit/el/eltclsh/pkg-fun.nix diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/unit/el/elvis/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/elvis/default.nix rename to pkgs/unit/el/elvis/pkg-fun.nix diff --git a/pkgs/shells/elvish/default.nix b/pkgs/unit/el/elvish/pkg-fun.nix similarity index 100% rename from pkgs/shells/elvish/default.nix rename to pkgs/unit/el/elvish/pkg-fun.nix diff --git a/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch b/pkgs/unit/em/EmptyEpsilon/0001-bundle-system-glm-in-seriousproton.patch similarity index 100% rename from pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch rename to pkgs/unit/em/EmptyEpsilon/0001-bundle-system-glm-in-seriousproton.patch diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/unit/em/EmptyEpsilon/pkg-fun.nix similarity index 100% rename from pkgs/games/empty-epsilon/default.nix rename to pkgs/unit/em/EmptyEpsilon/pkg-fun.nix diff --git a/pkgs/applications/editors/em/default.nix b/pkgs/unit/em/em/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/em/default.nix rename to pkgs/unit/em/em/pkg-fun.nix diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/unit/em/emacs-all-the-icons-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix rename to pkgs/unit/em/emacs-all-the-icons-fonts/pkg-fun.nix diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/unit/em/email/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/email/default.nix rename to pkgs/unit/em/email/pkg-fun.nix diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/unit/em/emboss/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/emboss/default.nix rename to pkgs/unit/em/emboss/pkg-fun.nix diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/unit/em/embree/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/embree/default.nix rename to pkgs/unit/em/embree/pkg-fun.nix diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/unit/em/embree2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/embree/2.x.nix rename to pkgs/unit/em/embree2/pkg-fun.nix diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/unit/em/emem/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/emem/default.nix rename to pkgs/unit/em/emem/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/unit/em/emma/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/emma/default.nix rename to pkgs/unit/em/emma/pkg-fun.nix diff --git a/pkgs/applications/misc/emoji-picker/default.nix b/pkgs/unit/em/emoji-picker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/emoji-picker/default.nix rename to pkgs/unit/em/emoji-picker/pkg-fun.nix diff --git a/pkgs/applications/misc/emoji-picker/xsys.patch b/pkgs/unit/em/emoji-picker/xsys.patch similarity index 100% rename from pkgs/applications/misc/emoji-picker/xsys.patch rename to pkgs/unit/em/emoji-picker/xsys.patch diff --git a/pkgs/applications/misc/emojipick/default.nix b/pkgs/unit/em/emojipick/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/emojipick/default.nix rename to pkgs/unit/em/emojipick/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/unit/em/emote/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/emote/default.nix rename to pkgs/unit/em/emote/pkg-fun.nix diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/unit/em/emplace/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/emplace/default.nix rename to pkgs/unit/em/emplace/pkg-fun.nix diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/unit/em/emptty/pkg-fun.nix similarity index 100% rename from pkgs/applications/display-managers/emptty/default.nix rename to pkgs/unit/em/emptty/pkg-fun.nix diff --git a/pkgs/tools/misc/empty/0.6-Makefile.patch b/pkgs/unit/em/empty/0.6-Makefile.patch similarity index 100% rename from pkgs/tools/misc/empty/0.6-Makefile.patch rename to pkgs/unit/em/empty/0.6-Makefile.patch diff --git a/pkgs/tools/misc/empty/default.nix b/pkgs/unit/em/empty/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/empty/default.nix rename to pkgs/unit/em/empty/pkg-fun.nix diff --git a/pkgs/applications/emulators/emu2/default.nix b/pkgs/unit/em/emu2/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/emu2/default.nix rename to pkgs/unit/em/emu2/pkg-fun.nix diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/unit/em/emuflight-configurator/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/robotics/emuflight-configurator/default.nix rename to pkgs/unit/em/emuflight-configurator/pkg-fun.nix diff --git a/pkgs/applications/emulators/emulationstation/default.nix b/pkgs/unit/em/emulationstation/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/emulationstation/default.nix rename to pkgs/unit/em/emulationstation/pkg-fun.nix diff --git a/pkgs/applications/graphics/emulsion-palette/default.nix b/pkgs/unit/em/emulsion-palette/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/emulsion-palette/default.nix rename to pkgs/unit/em/emulsion-palette/pkg-fun.nix diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/unit/em/emv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/emv/default.nix rename to pkgs/unit/em/emv/pkg-fun.nix diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/unit/en/enca/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/enca/default.nix rename to pkgs/unit/en/enca/pkg-fun.nix diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/unit/en/enchant2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/enchant/2.x.nix rename to pkgs/unit/en/enchant2/pkg-fun.nix diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/unit/en/enchive/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/enchive/default.nix rename to pkgs/unit/en/enchive/pkg-fun.nix diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/unit/en/encode-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/encode-sans/default.nix rename to pkgs/unit/en/encode-sans/pkg-fun.nix diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/unit/en/endeavour/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/endeavour/default.nix rename to pkgs/unit/en/endeavour/pkg-fun.nix diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/unit/en/endgame-singularity/pkg-fun.nix similarity index 100% rename from pkgs/games/endgame-singularity/default.nix rename to pkgs/unit/en/endgame-singularity/pkg-fun.nix diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/unit/en/endless-sky/fixes.patch similarity index 100% rename from pkgs/games/endless-sky/fixes.patch rename to pkgs/unit/en/endless-sky/fixes.patch diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/unit/en/endless-sky/pkg-fun.nix similarity index 100% rename from pkgs/games/endless-sky/default.nix rename to pkgs/unit/en/endless-sky/pkg-fun.nix diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/unit/en/endlessh-go/pkg-fun.nix similarity index 100% rename from pkgs/servers/endlessh-go/default.nix rename to pkgs/unit/en/endlessh-go/pkg-fun.nix diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/unit/en/endlessh/pkg-fun.nix similarity index 100% rename from pkgs/servers/endlessh/default.nix rename to pkgs/unit/en/endlessh/pkg-fun.nix diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/unit/en/enet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/enet/default.nix rename to pkgs/unit/en/enet/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/pkgs/unit/en/enhanced-ctorrent/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix rename to pkgs/unit/en/enhanced-ctorrent/pkg-fun.nix diff --git a/pkgs/games/enigma/default.nix b/pkgs/unit/en/enigma/pkg-fun.nix similarity index 100% rename from pkgs/games/enigma/default.nix rename to pkgs/unit/en/enigma/pkg-fun.nix diff --git a/pkgs/tools/misc/enjarify/default.nix b/pkgs/unit/en/enjarify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/enjarify/default.nix rename to pkgs/unit/en/enjarify/pkg-fun.nix diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/unit/en/enpass/data.json similarity index 100% rename from pkgs/tools/security/enpass/data.json rename to pkgs/unit/en/enpass/data.json diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/unit/en/enpass/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/enpass/default.nix rename to pkgs/unit/en/enpass/pkg-fun.nix diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/unit/en/enpass/update_script.py similarity index 100% rename from pkgs/tools/security/enpass/update_script.py rename to pkgs/unit/en/enpass/update_script.py diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/unit/en/enscript/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/enscript/default.nix rename to pkgs/unit/en/enscript/pkg-fun.nix diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/unit/en/ent-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ent/default.nix rename to pkgs/unit/en/ent-go/pkg-fun.nix diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/unit/en/ent/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ent/default.nix rename to pkgs/unit/en/ent/pkg-fun.nix diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/unit/en/entr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/entr/default.nix rename to pkgs/unit/en/entr/pkg-fun.nix diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/unit/en/entt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/entt/default.nix rename to pkgs/unit/en/entt/pkg-fun.nix diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/unit/en/entwine/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/entwine/default.nix rename to pkgs/unit/en/entwine/pkg-fun.nix diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/unit/en/enum4linux/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/enum4linux/default.nix rename to pkgs/unit/en/enum4linux/pkg-fun.nix diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/unit/en/enumer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/enumer/default.nix rename to pkgs/unit/en/enumer/pkg-fun.nix diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/unit/en/envconsul/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/envconsul/default.nix rename to pkgs/unit/en/envconsul/pkg-fun.nix diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/unit/en/envfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/envfs/default.nix rename to pkgs/unit/en/envfs/pkg-fun.nix diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/unit/en/envsubst/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/envsubst/default.nix rename to pkgs/unit/en/envsubst/pkg-fun.nix diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/unit/en/envypn-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/envypn-font/default.nix rename to pkgs/unit/en/envypn-font/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/unit/eo/eolie/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/eolie/default.nix rename to pkgs/unit/eo/eolie/pkg-fun.nix diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/unit/eo/eos-installer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/eos-installer/default.nix rename to pkgs/unit/eo/eos-installer/pkg-fun.nix diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/unit/eo/eot_utilities/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/eot-utilities/default.nix rename to pkgs/unit/eo/eot_utilities/pkg-fun.nix diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/unit/ep/epdfview/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/epdfview/default.nix rename to pkgs/unit/ep/epdfview/pkg-fun.nix diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/unit/ep/epeg/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/epeg/default.nix rename to pkgs/unit/ep/epeg/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/unit/ep/ephemeral/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/ephemeral/default.nix rename to pkgs/unit/ep/ephemeral/pkg-fun.nix diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/unit/ep/ephemeralpg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/ephemeralpg/default.nix rename to pkgs/unit/ep/ephemeralpg/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/unit/ep/epic5/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/epic5/default.nix rename to pkgs/unit/ep/epic5/pkg-fun.nix diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/unit/ep/epkowa/firmware_location.patch similarity index 100% rename from pkgs/misc/drivers/epkowa/firmware_location.patch rename to pkgs/unit/ep/epkowa/firmware_location.patch diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/unit/ep/epkowa/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epkowa/default.nix rename to pkgs/unit/ep/epkowa/pkg-fun.nix diff --git a/pkgs/misc/drivers/epkowa/sscanf.patch b/pkgs/unit/ep/epkowa/sscanf.patch similarity index 100% rename from pkgs/misc/drivers/epkowa/sscanf.patch rename to pkgs/unit/ep/epkowa/sscanf.patch diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/unit/ep/eplot/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/eplot/default.nix rename to pkgs/unit/ep/eplot/pkg-fun.nix diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/unit/ep/epm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/epm/default.nix rename to pkgs/unit/ep/epm/pkg-fun.nix diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/unit/ep/epr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/epr/default.nix rename to pkgs/unit/ep/epr/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/unit/ep/epson-201106w/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson-201106w/default.nix rename to pkgs/unit/ep/epson-201106w/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson-201401w/fixbuild.patch b/pkgs/unit/ep/epson-201401w/fixbuild.patch similarity index 100% rename from pkgs/misc/drivers/epson-201401w/fixbuild.patch rename to pkgs/unit/ep/epson-201401w/fixbuild.patch diff --git a/pkgs/misc/drivers/epson-201401w/default.nix b/pkgs/unit/ep/epson-201401w/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson-201401w/default.nix rename to pkgs/unit/ep/epson-201401w/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/pkgs/unit/ep/epson-alc1100/cups-data-dir.patch similarity index 100% rename from pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch rename to pkgs/unit/ep/epson-alc1100/cups-data-dir.patch diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/unit/ep/epson-alc1100/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson-alc1100/default.nix rename to pkgs/unit/ep/epson-alc1100/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson-alc1100/ppd.patch b/pkgs/unit/ep/epson-alc1100/ppd.patch similarity index 100% rename from pkgs/misc/drivers/epson-alc1100/ppd.patch rename to pkgs/unit/ep/epson-alc1100/ppd.patch diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/unit/ep/epson-escpr/cups-filter-ppd-dirs.patch similarity index 100% rename from pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch rename to pkgs/unit/ep/epson-escpr/cups-filter-ppd-dirs.patch diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/unit/ep/epson-escpr/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson-escpr/default.nix rename to pkgs/unit/ep/epson-escpr/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch b/pkgs/unit/ep/epson-escpr2/cups-filter-ppd-dirs.patch similarity index 100% rename from pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch rename to pkgs/unit/ep/epson-escpr2/cups-filter-ppd-dirs.patch diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/unit/ep/epson-escpr2/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson-escpr2/default.nix rename to pkgs/unit/ep/epson-escpr2/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/unit/ep/epson-workforce-635-nx625-series/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix rename to pkgs/unit/ep/epson-workforce-635-nx625-series/pkg-fun.nix diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/unit/ep/epson_201207w/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/epson_201207w/default.nix rename to pkgs/unit/ep/epson_201207w/pkg-fun.nix diff --git a/pkgs/tools/graphics/epstool/gcc43.patch b/pkgs/unit/ep/epstool/gcc43.patch similarity index 100% rename from pkgs/tools/graphics/epstool/gcc43.patch rename to pkgs/unit/ep/epstool/gcc43.patch diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/unit/ep/epstool/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/epstool/default.nix rename to pkgs/unit/ep/epstool/pkg-fun.nix diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/unit/ep/epubcheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/epubcheck/default.nix rename to pkgs/unit/ep/epubcheck/pkg-fun.nix diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/unit/eq/eq10q/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/eq10q/default.nix rename to pkgs/unit/eq/eq10q/pkg-fun.nix diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/unit/eq/eql/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/eql/default.nix rename to pkgs/unit/eq/eql/pkg-fun.nix diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/unit/eq/equilux-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/equilux-theme/default.nix rename to pkgs/unit/eq/equilux-theme/pkg-fun.nix diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/unit/er/er-patcher/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/er-patcher/default.nix rename to pkgs/unit/er/er-patcher/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/unit/er/eresi/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/eresi/default.nix rename to pkgs/unit/er/eresi/pkg-fun.nix diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/unit/er/ergo/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/ergo/default.nix rename to pkgs/unit/er/ergo/pkg-fun.nix diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/unit/er/ergochat/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/ergochat/default.nix rename to pkgs/unit/er/ergochat/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/ergoscf/math-constants.patch b/pkgs/unit/er/ergoscf/math-constants.patch similarity index 100% rename from pkgs/applications/science/chemistry/ergoscf/math-constants.patch rename to pkgs/unit/er/ergoscf/math-constants.patch diff --git a/pkgs/applications/science/chemistry/ergoscf/default.nix b/pkgs/unit/er/ergoscf/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/ergoscf/default.nix rename to pkgs/unit/er/ergoscf/pkg-fun.nix diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/unit/er/erigon/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/erigon/default.nix rename to pkgs/unit/er/erigon/pkg-fun.nix diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/unit/er/eris-go/pkg-fun.nix similarity index 100% rename from pkgs/servers/eris-go/default.nix rename to pkgs/unit/er/eris-go/pkg-fun.nix diff --git a/pkgs/os-specific/linux/erofs-utils/default.nix b/pkgs/unit/er/erofs-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/erofs-utils/default.nix rename to pkgs/unit/er/erofs-utils/pkg-fun.nix diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/unit/er/erosmb/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/erosmb/default.nix rename to pkgs/unit/er/erosmb/pkg-fun.nix diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/unit/er/errbot/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/errbot/default.nix rename to pkgs/unit/er/errbot/pkg-fun.nix diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/unit/er/errcheck/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/errcheck/default.nix rename to pkgs/unit/er/errcheck/pkg-fun.nix diff --git a/pkgs/shells/es/default.nix b/pkgs/unit/es/es/pkg-fun.nix similarity index 100% rename from pkgs/shells/es/default.nix rename to pkgs/unit/es/es/pkg-fun.nix diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/unit/es/esbuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/esbuild/default.nix rename to pkgs/unit/es/esbuild/pkg-fun.nix diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/unit/es/esbuild_netlify/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/esbuild/netlify.nix rename to pkgs/unit/es/esbuild_netlify/pkg-fun.nix diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/unit/es/eschalot/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/eschalot/default.nix rename to pkgs/unit/es/eschalot/pkg-fun.nix diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/unit/es/escrotum/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/escrotum/default.nix rename to pkgs/unit/es/escrotum/pkg-fun.nix diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/unit/es/esh/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/esh/default.nix rename to pkgs/unit/es/esh/pkg-fun.nix diff --git a/pkgs/applications/audio/espeak-ng/mbrola.patch b/pkgs/unit/es/espeak-ng/mbrola.patch similarity index 100% rename from pkgs/applications/audio/espeak-ng/mbrola.patch rename to pkgs/unit/es/espeak-ng/mbrola.patch diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/unit/es/espeak-ng/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/espeak-ng/default.nix rename to pkgs/unit/es/espeak-ng/pkg-fun.nix diff --git a/pkgs/applications/accessibility/espeakup/default.nix b/pkgs/unit/es/espeakup/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/espeakup/default.nix rename to pkgs/unit/es/espeakup/pkg-fun.nix diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/unit/es/esphome/dashboard.nix similarity index 100% rename from pkgs/tools/misc/esphome/dashboard.nix rename to pkgs/unit/es/esphome/dashboard.nix diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/unit/es/esphome/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/esphome/default.nix rename to pkgs/unit/es/esphome/pkg-fun.nix diff --git a/pkgs/tools/misc/esphome/update.nix b/pkgs/unit/es/esphome/update.nix similarity index 100% rename from pkgs/tools/misc/esphome/update.nix rename to pkgs/unit/es/esphome/update.nix diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/unit/es/esptool-ck/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/esptool-ck/default.nix rename to pkgs/unit/es/esptool-ck/pkg-fun.nix diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/unit/es/esptool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/esptool/default.nix rename to pkgs/unit/es/esptool/pkg-fun.nix diff --git a/pkgs/tools/misc/esptool/test-call-bin-directly.patch b/pkgs/unit/es/esptool/test-call-bin-directly.patch similarity index 100% rename from pkgs/tools/misc/esptool/test-call-bin-directly.patch rename to pkgs/unit/es/esptool/test-call-bin-directly.patch diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/unit/es/esptool_3/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/esptool/3.nix rename to pkgs/unit/es/esptool_3/pkg-fun.nix diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/unit/es/essentia-extractor/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/essentia-extractor/default.nix rename to pkgs/unit/es/essentia-extractor/pkg-fun.nix diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/unit/es/esshader/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/esshader/default.nix rename to pkgs/unit/es/esshader/pkg-fun.nix diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/unit/es/est-sfs/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/est-sfs/default.nix rename to pkgs/unit/es/est-sfs/pkg-fun.nix diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/unit/et/et/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/et/default.nix rename to pkgs/unit/et/et/pkg-fun.nix diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/unit/et/etBook/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/et-book/default.nix rename to pkgs/unit/et/etBook/pkg-fun.nix diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/unit/et/etcd_3_3/pkg-fun.nix similarity index 100% rename from pkgs/servers/etcd/3.3.nix rename to pkgs/unit/et/etcd_3_3/pkg-fun.nix diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/unit/et/etcd_3_4/pkg-fun.nix similarity index 100% rename from pkgs/servers/etcd/3.4.nix rename to pkgs/unit/et/etcd_3_4/pkg-fun.nix diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/unit/et/etcd_3_5/pkg-fun.nix similarity index 100% rename from pkgs/servers/etcd/3.5.nix rename to pkgs/unit/et/etcd_3_5/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/unit/et/eterm/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/eterm/default.nix rename to pkgs/unit/et/eterm/pkg-fun.nix diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/unit/et/eternal-terminal/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/eternal-terminal/default.nix rename to pkgs/unit/et/eternal-terminal/pkg-fun.nix diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/unit/et/eternity/pkg-fun.nix similarity index 100% rename from pkgs/games/eternity-engine/default.nix rename to pkgs/unit/et/eternity/pkg-fun.nix diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/unit/et/etesync-dav/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/etesync-dav/default.nix rename to pkgs/unit/et/etesync-dav/pkg-fun.nix diff --git a/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch b/pkgs/unit/et/ethabi/add-Cargo-lock.patch similarity index 100% rename from pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch rename to pkgs/unit/et/ethabi/add-Cargo-lock.patch diff --git a/pkgs/applications/blockchains/ethabi/default.nix b/pkgs/unit/et/ethabi/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/ethabi/default.nix rename to pkgs/unit/et/ethabi/pkg-fun.nix diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/unit/et/ethash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ethash/default.nix rename to pkgs/unit/et/ethash/pkg-fun.nix diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/unit/et/etherape/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniffers/etherape/default.nix rename to pkgs/unit/et/etherape/pkg-fun.nix diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/unit/et/ethtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ethtool/default.nix rename to pkgs/unit/et/ethtool/pkg-fun.nix diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/unit/et/ets/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ets/default.nix rename to pkgs/unit/et/ets/pkg-fun.nix diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/unit/et/ettercap/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniffers/ettercap/default.nix rename to pkgs/unit/et/ettercap/pkg-fun.nix diff --git a/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/pkgs/unit/eu/eukleides/gs-allowpstransparency.patch similarity index 100% rename from pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch rename to pkgs/unit/eu/eukleides/gs-allowpstransparency.patch diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/unit/eu/eukleides/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/eukleides/default.nix rename to pkgs/unit/eu/eukleides/pkg-fun.nix diff --git a/pkgs/applications/science/math/eukleides/use-CC.patch b/pkgs/unit/eu/eukleides/use-CC.patch similarity index 100% rename from pkgs/applications/science/math/eukleides/use-CC.patch rename to pkgs/unit/eu/eukleides/use-CC.patch diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/unit/eu/eunomia/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/eunomia/default.nix rename to pkgs/unit/eu/eunomia/pkg-fun.nix diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/unit/eu/eureka-editor/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/eureka-editor/default.nix rename to pkgs/unit/eu/eureka-editor/pkg-fun.nix diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/unit/ev/eva/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/eva/default.nix rename to pkgs/unit/ev/eva/pkg-fun.nix diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/unit/ev/evans/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/evans/default.nix rename to pkgs/unit/ev/evans/pkg-fun.nix diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/unit/ev/evcc/pkg-fun.nix similarity index 100% rename from pkgs/servers/home-automation/evcc/default.nix rename to pkgs/unit/ev/evcc/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/unit/ev/evdevremapkeys/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/evdevremapkeys/default.nix rename to pkgs/unit/ev/evdevremapkeys/pkg-fun.nix diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/unit/ev/evemu/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/evemu/default.nix rename to pkgs/unit/ev/evemu/pkg-fun.nix diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/unit/ev/eventlog/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/eventlog/default.nix rename to pkgs/unit/ev/eventlog/pkg-fun.nix diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/unit/ev/eventstat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/eventstat/default.nix rename to pkgs/unit/ev/eventstat/pkg-fun.nix diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/pkgs/unit/ev/eventstore/deps.nix similarity index 100% rename from pkgs/servers/nosql/eventstore/deps.nix rename to pkgs/unit/ev/eventstore/deps.nix diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/unit/ev/eventstore/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/eventstore/default.nix rename to pkgs/unit/ev/eventstore/pkg-fun.nix diff --git a/pkgs/servers/nosql/eventstore/updater.sh b/pkgs/unit/ev/eventstore/updater.sh similarity index 100% rename from pkgs/servers/nosql/eventstore/updater.sh rename to pkgs/unit/ev/eventstore/updater.sh diff --git a/pkgs/games/everspace/default.nix b/pkgs/unit/ev/everspace/pkg-fun.nix similarity index 100% rename from pkgs/games/everspace/default.nix rename to pkgs/unit/ev/everspace/pkg-fun.nix diff --git a/pkgs/tools/security/evil-winrm/Gemfile b/pkgs/unit/ev/evil-winrm/Gemfile similarity index 100% rename from pkgs/tools/security/evil-winrm/Gemfile rename to pkgs/unit/ev/evil-winrm/Gemfile diff --git a/pkgs/tools/security/evil-winrm/Gemfile.lock b/pkgs/unit/ev/evil-winrm/Gemfile.lock similarity index 100% rename from pkgs/tools/security/evil-winrm/Gemfile.lock rename to pkgs/unit/ev/evil-winrm/Gemfile.lock diff --git a/pkgs/tools/security/evil-winrm/gemset.nix b/pkgs/unit/ev/evil-winrm/gemset.nix similarity index 100% rename from pkgs/tools/security/evil-winrm/gemset.nix rename to pkgs/unit/ev/evil-winrm/gemset.nix diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/unit/ev/evil-winrm/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/evil-winrm/default.nix rename to pkgs/unit/ev/evil-winrm/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/evmdis/go.mod b/pkgs/unit/ev/evmdis/go.mod similarity index 100% rename from pkgs/development/tools/analysis/evmdis/go.mod rename to pkgs/unit/ev/evmdis/go.mod diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/unit/ev/evmdis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/evmdis/default.nix rename to pkgs/unit/ev/evmdis/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/unit/ev/evolution-ews/hardcode-gsettings.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch rename to pkgs/unit/ev/evolution-ews/hardcode-gsettings.patch diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/unit/ev/evolution-ews/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix rename to pkgs/unit/ev/evolution-ews/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/unit/ev/evolution/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution/default.nix rename to pkgs/unit/ev/evolution/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/unit/ev/evscript/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/evscript/default.nix rename to pkgs/unit/ev/evscript/pkg-fun.nix diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/unit/ev/evtest/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/evtest/default.nix rename to pkgs/unit/ev/evtest/pkg-fun.nix diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/unit/ev/evtx/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/evtx/default.nix rename to pkgs/unit/ev/evtx/pkg-fun.nix diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/unit/ew/eweb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/literate-programming/eweb/default.nix rename to pkgs/unit/ew/eweb/pkg-fun.nix diff --git a/pkgs/applications/audio/exact-audio-copy/default.nix b/pkgs/unit/ex/exactaudiocopy/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/exact-audio-copy/default.nix rename to pkgs/unit/ex/exactaudiocopy/pkg-fun.nix diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/unit/ex/exaile/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/exaile/default.nix rename to pkgs/unit/ex/exaile/pkg-fun.nix diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/unit/ex/example-robot-data/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/example-robot-data/default.nix rename to pkgs/unit/ex/example-robot-data/pkg-fun.nix diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/unit/ex/exempi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/exempi/default.nix rename to pkgs/unit/ex/exempi/pkg-fun.nix diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/unit/ex/exercism/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/exercism/default.nix rename to pkgs/unit/ex/exercism/pkg-fun.nix diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/unit/ex/exfat/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/exfat/default.nix rename to pkgs/unit/ex/exfat/pkg-fun.nix diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/unit/ex/exfatprogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/exfatprogs/default.nix rename to pkgs/unit/ex/exfatprogs/pkg-fun.nix diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/unit/ex/exhibitor/pkg-fun.nix similarity index 100% rename from pkgs/servers/exhibitor/default.nix rename to pkgs/unit/ex/exhibitor/pkg-fun.nix diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/unit/ex/exif/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/exif/default.nix rename to pkgs/unit/ex/exif/pkg-fun.nix diff --git a/pkgs/tools/graphics/exifprobe/default.nix b/pkgs/unit/ex/exifprobe/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/exifprobe/default.nix rename to pkgs/unit/ex/exifprobe/pkg-fun.nix diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/unit/ex/exiftags/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/exiftags/default.nix rename to pkgs/unit/ex/exiftags/pkg-fun.nix diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/unit/ex/exim/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/exim/default.nix rename to pkgs/unit/ex/exim/pkg-fun.nix diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/unit/ex/exiv2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/exiv2/default.nix rename to pkgs/unit/ex/exiv2/pkg-fun.nix diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/unit/ex/exodus/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/exodus/default.nix rename to pkgs/unit/ex/exodus/pkg-fun.nix diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/unit/ex/exonerate/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/exonerate/default.nix rename to pkgs/unit/ex/exonerate/pkg-fun.nix diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/unit/ex/exoscale-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/exoscale-cli/default.nix rename to pkgs/unit/ex/exoscale-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/unit/ex/expat/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/expat/default.nix rename to pkgs/unit/ex/expat/pkg-fun.nix diff --git a/pkgs/tools/misc/expect/fix-cross-compilation.patch b/pkgs/unit/ex/expect/fix-cross-compilation.patch similarity index 100% rename from pkgs/tools/misc/expect/fix-cross-compilation.patch rename to pkgs/unit/ex/expect/fix-cross-compilation.patch diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/unit/ex/expect/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/expect/default.nix rename to pkgs/unit/ex/expect/pkg-fun.nix diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/unit/ex/expected-lite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/expected-lite/default.nix rename to pkgs/unit/ex/expected-lite/pkg-fun.nix diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/unit/ex/expenses/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/expenses/default.nix rename to pkgs/unit/ex/expenses/pkg-fun.nix diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/unit/ex/explain/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/explain/default.nix rename to pkgs/unit/ex/explain/pkg-fun.nix diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/unit/ex/expliot/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/expliot/default.nix rename to pkgs/unit/ex/expliot/pkg-fun.nix diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/unit/ex/exploitdb/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/exploitdb/default.nix rename to pkgs/unit/ex/exploitdb/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/unit/ex/exportarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/exportarr/default.nix rename to pkgs/unit/ex/exportarr/pkg-fun.nix diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/unit/ex/expressvpn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/expressvpn/default.nix rename to pkgs/unit/ex/expressvpn/pkg-fun.nix diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/unit/ex/exrtools/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/exrtools/default.nix rename to pkgs/unit/ex/exrtools/pkg-fun.nix diff --git a/pkgs/tools/filesystems/ext4magic/glibc-fix.patch b/pkgs/unit/ex/ext4magic/glibc-fix.patch similarity index 100% rename from pkgs/tools/filesystems/ext4magic/glibc-fix.patch rename to pkgs/unit/ex/ext4magic/glibc-fix.patch diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/unit/ex/ext4magic/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/ext4magic/default.nix rename to pkgs/unit/ex/ext4magic/pkg-fun.nix diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/unit/ex/extism-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/extism-cli/default.nix rename to pkgs/unit/ex/extism-cli/pkg-fun.nix diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/unit/ex/extra-container/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/extra-container/default.nix rename to pkgs/unit/ex/extra-container/pkg-fun.nix diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/unit/ex/extrace/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/extrace/default.nix rename to pkgs/unit/ex/extrace/pkg-fun.nix diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/unit/ex/extract_url/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/extract_url/default.nix rename to pkgs/unit/ex/extract_url/pkg-fun.nix diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/unit/ex/extrude/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/extrude/default.nix rename to pkgs/unit/ex/extrude/pkg-fun.nix diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/unit/ex/extundelete/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/extundelete/default.nix rename to pkgs/unit/ex/extundelete/pkg-fun.nix diff --git a/pkgs/games/exult/default.nix b/pkgs/unit/ex/exult/pkg-fun.nix similarity index 100% rename from pkgs/games/exult/default.nix rename to pkgs/unit/ex/exult/pkg-fun.nix diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/unit/ey/eyedropper/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/eyedropper/default.nix rename to pkgs/unit/ey/eyedropper/pkg-fun.nix diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/unit/ez/ezminc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/EZminc/default.nix rename to pkgs/unit/ez/ezminc/pkg-fun.nix diff --git a/pkgs/games/ezquake/default.nix b/pkgs/unit/ez/ezquake/pkg-fun.nix similarity index 100% rename from pkgs/games/ezquake/default.nix rename to pkgs/unit/ez/ezquake/pkg-fun.nix diff --git a/pkgs/data/fonts/ezra-sil/default.nix b/pkgs/unit/ez/ezra-sil/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ezra-sil/default.nix rename to pkgs/unit/ez/ezra-sil/pkg-fun.nix diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/unit/ez/ezstream/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/ezstream/default.nix rename to pkgs/unit/ez/ezstream/pkg-fun.nix diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/unit/ez/eztrace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/profiling/EZTrace/default.nix rename to pkgs/unit/ez/eztrace/pkg-fun.nix diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/unit/f1/f1viewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/f1viewer/default.nix rename to pkgs/unit/f1/f1viewer/pkg-fun.nix diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/unit/f2/f2/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/f2/default.nix rename to pkgs/unit/f2/f2/pkg-fun.nix diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/unit/f2/f2c/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/f2c/default.nix rename to pkgs/unit/f2/f2c/pkg-fun.nix diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/unit/f2/f2fs-tools/f2fs-tools-cross-fix.patch similarity index 100% rename from pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch rename to pkgs/unit/f2/f2fs-tools/f2fs-tools-cross-fix.patch diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/unit/f2/f2fs-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/f2fs-tools/default.nix rename to pkgs/unit/f2/f2fs-tools/pkg-fun.nix diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/unit/f3/f3/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/f3/default.nix rename to pkgs/unit/f3/f3/pkg-fun.nix diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/unit/f5/f5_6/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/f5_6/default.nix rename to pkgs/unit/f5/f5_6/pkg-fun.nix diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/unit/fa/faac/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/faac/default.nix rename to pkgs/unit/fa/faac/pkg-fun.nix diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/unit/fa/faad2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/faad2/default.nix rename to pkgs/unit/fa/faad2/pkg-fun.nix diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/unit/fa/faas-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/faas-cli/default.nix rename to pkgs/unit/fa/faas-cli/pkg-fun.nix diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/unit/fa/faba-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/faba-icon-theme/default.nix rename to pkgs/unit/fa/faba-icon-theme/pkg-fun.nix diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/unit/fa/faba-mono-icons/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/faba-mono-icons/default.nix rename to pkgs/unit/fa/faba-mono-icons/pkg-fun.nix diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/unit/fa/fabric-installer/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/minecraft/fabric-installer/default.nix rename to pkgs/unit/fa/fabric-installer/pkg-fun.nix diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/unit/fa/fac/deps.nix similarity index 100% rename from pkgs/development/tools/fac/deps.nix rename to pkgs/unit/fa/fac/deps.nix diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/unit/fa/fac/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fac/default.nix rename to pkgs/unit/fa/fac/pkg-fun.nix diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/unit/fa/facedetect/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/facedetect/default.nix rename to pkgs/unit/fa/facedetect/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/unit/fa/facetimehd-calibration/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix rename to pkgs/unit/fa/facetimehd-calibration/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/unit/fa/facetimehd-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix rename to pkgs/unit/fa/facetimehd-firmware/pkg-fun.nix diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/unit/fa/facter/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/facter/default.nix rename to pkgs/unit/fa/facter/pkg-fun.nix diff --git a/pkgs/development/compilers/factor-lang/adjust-paths-in-unit-tests.patch b/pkgs/unit/fa/factor-lang-scope/adjust-paths-in-unit-tests.patch similarity index 100% rename from pkgs/development/compilers/factor-lang/adjust-paths-in-unit-tests.patch rename to pkgs/unit/fa/factor-lang-scope/adjust-paths-in-unit-tests.patch diff --git a/pkgs/development/compilers/factor-lang/factor98.nix b/pkgs/unit/fa/factor-lang-scope/factor98.nix similarity index 100% rename from pkgs/development/compilers/factor-lang/factor98.nix rename to pkgs/unit/fa/factor-lang-scope/factor98.nix diff --git a/pkgs/development/compilers/factor-lang/scope.nix b/pkgs/unit/fa/factor-lang-scope/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/factor-lang/scope.nix rename to pkgs/unit/fa/factor-lang-scope/pkg-fun.nix diff --git a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch b/pkgs/unit/fa/factor-lang-scope/staging-command-line-0.98-pre.patch similarity index 100% rename from pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch rename to pkgs/unit/fa/factor-lang-scope/staging-command-line-0.98-pre.patch diff --git a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch b/pkgs/unit/fa/factor-lang-scope/workdir-0.98-pre.patch similarity index 100% rename from pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch rename to pkgs/unit/fa/factor-lang-scope/workdir-0.98-pre.patch diff --git a/pkgs/games/factorio/mods.nix b/pkgs/unit/fa/factorio-mods/pkg-fun.nix similarity index 100% rename from pkgs/games/factorio/mods.nix rename to pkgs/unit/fa/factorio-mods/pkg-fun.nix diff --git a/pkgs/games/factorio/utils.nix b/pkgs/unit/fa/factorio-utils/pkg-fun.nix similarity index 100% rename from pkgs/games/factorio/utils.nix rename to pkgs/unit/fa/factorio-utils/pkg-fun.nix diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/unit/fa/fahclient/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/foldingathome/client.nix rename to pkgs/unit/fa/fahclient/pkg-fun.nix diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/unit/fa/fahcontrol/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/foldingathome/control.nix rename to pkgs/unit/fa/fahcontrol/pkg-fun.nix diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/unit/fa/fahviewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/foldingathome/viewer.nix rename to pkgs/unit/fa/fahviewer/pkg-fun.nix diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/unit/fa/fail2ban/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fail2ban/default.nix rename to pkgs/unit/fa/fail2ban/pkg-fun.nix diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/unit/fa/faircamp/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/faircamp/default.nix rename to pkgs/unit/fa/faircamp/pkg-fun.nix diff --git a/pkgs/applications/misc/faircamp/test-wav.nix b/pkgs/unit/fa/faircamp/test-wav.nix similarity index 100% rename from pkgs/applications/misc/faircamp/test-wav.nix rename to pkgs/unit/fa/faircamp/test-wav.nix diff --git a/pkgs/games/fairymax/default.nix b/pkgs/unit/fa/fairymax/pkg-fun.nix similarity index 100% rename from pkgs/games/fairymax/default.nix rename to pkgs/unit/fa/fairymax/pkg-fun.nix diff --git a/pkgs/build-support/fake-nss/default.nix b/pkgs/unit/fa/fakeNss/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fake-nss/default.nix rename to pkgs/unit/fa/fakeNss/pkg-fun.nix diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/unit/fa/fakechroot/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/fakechroot/default.nix rename to pkgs/unit/fa/fakechroot/pkg-fun.nix diff --git a/pkgs/tools/system/fakeroot/einval.patch b/pkgs/unit/fa/fakeroot/einval.patch similarity index 100% rename from pkgs/tools/system/fakeroot/einval.patch rename to pkgs/unit/fa/fakeroot/einval.patch diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/unit/fa/fakeroot/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/fakeroot/default.nix rename to pkgs/unit/fa/fakeroot/pkg-fun.nix diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/unit/fa/fakeroute/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/fakeroute/default.nix rename to pkgs/unit/fa/fakeroute/pkg-fun.nix diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/unit/fa/faketty/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/faketty/default.nix rename to pkgs/unit/fa/faketty/pkg-fun.nix diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/unit/fa/famistudio/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/famistudio/default.nix rename to pkgs/unit/fa/famistudio/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/unit/fa/fan2go/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fan2go/default.nix rename to pkgs/unit/fa/fan2go/pkg-fun.nix diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/unit/fa/fancy-motd/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/fancy-motd/default.nix rename to pkgs/unit/fa/fancy-motd/pkg-fun.nix diff --git a/pkgs/development/libraries/fancypp/default.nix b/pkgs/unit/fa/fancypp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fancypp/default.nix rename to pkgs/unit/fa/fancypp/pkg-fun.nix diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/unit/fa/fanficfare/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/fanficfare/default.nix rename to pkgs/unit/fa/fanficfare/pkg-fun.nix diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/unit/fa/fantasque-sans-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fantasque-sans-mono/default.nix rename to pkgs/unit/fa/fantasque-sans-mono/pkg-fun.nix diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/unit/fa/faraday-agent-dispatcher/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/faraday-agent-dispatcher/default.nix rename to pkgs/unit/fa/faraday-agent-dispatcher/pkg-fun.nix diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/unit/fa/faraday-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/faraday-cli/default.nix rename to pkgs/unit/fa/faraday-cli/pkg-fun.nix diff --git a/pkgs/applications/blockchains/faraday/default.nix b/pkgs/unit/fa/faraday/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/faraday/default.nix rename to pkgs/unit/fa/faraday/pkg-fun.nix diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/unit/fa/farbfeld/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/farbfeld/default.nix rename to pkgs/unit/fa/farbfeld/pkg-fun.nix diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/unit/fa/fasd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fasd/default.nix rename to pkgs/unit/fa/fasd/pkg-fun.nix diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/unit/fa/fasm-bin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/fasm/bin.nix rename to pkgs/unit/fa/fasm-bin/pkg-fun.nix diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/unit/fa/fasmg/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/fasmg/default.nix rename to pkgs/unit/fa/fasmg/pkg-fun.nix diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/unit/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in similarity index 100% rename from pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in rename to pkgs/unit/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/unit/fa/fast-cpp-csv-parser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fast-cpp-csv-parser/default.nix rename to pkgs/unit/fa/fast-cpp-csv-parser/pkg-fun.nix diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/unit/fa/fast-downward/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/fast-downward/default.nix rename to pkgs/unit/fa/fast-downward/pkg-fun.nix diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/unit/fa/fastJson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fastjson/default.nix rename to pkgs/unit/fa/fastJson/pkg-fun.nix diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/unit/fa/fastd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/fastd/default.nix rename to pkgs/unit/fa/fastd/pkg-fun.nix diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/unit/fa/fastddsgen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fastddsgen/default.nix rename to pkgs/unit/fa/fastddsgen/pkg-fun.nix diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/unit/fa/fastjar/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/fastjar/default.nix rename to pkgs/unit/fa/fastjar/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/unit/fa/fastjet-contrib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/fastjet-contrib/default.nix rename to pkgs/unit/fa/fastjet-contrib/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/unit/fa/fastjet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/fastjet/default.nix rename to pkgs/unit/fa/fastjet/pkg-fun.nix diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/unit/fa/fastlane/Gemfile similarity index 100% rename from pkgs/tools/admin/fastlane/Gemfile rename to pkgs/unit/fa/fastlane/Gemfile diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/unit/fa/fastlane/Gemfile.lock similarity index 100% rename from pkgs/tools/admin/fastlane/Gemfile.lock rename to pkgs/unit/fa/fastlane/Gemfile.lock diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/unit/fa/fastlane/gemset.nix similarity index 100% rename from pkgs/tools/admin/fastlane/gemset.nix rename to pkgs/unit/fa/fastlane/gemset.nix diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/unit/fa/fastlane/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/fastlane/default.nix rename to pkgs/unit/fa/fastlane/pkg-fun.nix diff --git a/pkgs/misc/fastly/default.nix b/pkgs/unit/fa/fastly/pkg-fun.nix similarity index 100% rename from pkgs/misc/fastly/default.nix rename to pkgs/unit/fa/fastly/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/unit/fa/fastnlo_toolkit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/fastnlo_toolkit/default.nix rename to pkgs/unit/fa/fastnlo_toolkit/pkg-fun.nix diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/unit/fa/fastp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/fastp/default.nix rename to pkgs/unit/fa/fastp/pkg-fun.nix diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/unit/fa/fastpbkdf2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fastpbkdf2/default.nix rename to pkgs/unit/fa/fastpbkdf2/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/unit/fa/fasttext/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/fasttext/default.nix rename to pkgs/unit/fa/fasttext/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/unit/fa/fatrace/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fatrace/default.nix rename to pkgs/unit/fa/fatrace/pkg-fun.nix diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/unit/fa/fatresize/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/fatresize/default.nix rename to pkgs/unit/fa/fatresize/pkg-fun.nix diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/unit/fa/fatsort/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/fatsort/default.nix rename to pkgs/unit/fa/fatsort/pkg-fun.nix diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/unit/fa/faudio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/faudio/default.nix rename to pkgs/unit/fa/faudio/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/unit/fa/faust1/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust1.nix rename to pkgs/unit/fa/faust1/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/unit/fa/faust2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2.nix rename to pkgs/unit/fa/faust2/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/unit/fa/faust2alqt/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2alqt.nix rename to pkgs/unit/fa/faust2alqt/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/unit/fa/faust2alsa/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2alsa.nix rename to pkgs/unit/fa/faust2alsa/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2csound.nix b/pkgs/unit/fa/faust2csound/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2csound.nix rename to pkgs/unit/fa/faust2csound/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/pkgs/unit/fa/faust2firefox/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2firefox.nix rename to pkgs/unit/fa/faust2firefox/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/unit/fa/faust2jack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jack.nix rename to pkgs/unit/fa/faust2jack/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/unit/fa/faust2jackrust/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jackrust.nix rename to pkgs/unit/fa/faust2jackrust/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/unit/fa/faust2jaqt/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jaqt.nix rename to pkgs/unit/fa/faust2jaqt/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/unit/fa/faust2ladspa/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2ladspa.nix rename to pkgs/unit/fa/faust2ladspa/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/unit/fa/faust2lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2lv2.nix rename to pkgs/unit/fa/faust2lv2/pkg-fun.nix diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/unit/fa/faustPhysicalModeling/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faustPhysicalModeling/default.nix rename to pkgs/unit/fa/faustPhysicalModeling/pkg-fun.nix diff --git a/pkgs/applications/audio/faustStk/default.nix b/pkgs/unit/fa/faustStk/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faustStk/default.nix rename to pkgs/unit/fa/faustStk/pkg-fun.nix diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/unit/fa/faustlive/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/faust/faustlive.nix rename to pkgs/unit/fa/faustlive/pkg-fun.nix diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/unit/fa/fava/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/fava/default.nix rename to pkgs/unit/fa/fava/pkg-fun.nix diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/unit/fb/fbcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fbcat/default.nix rename to pkgs/unit/fb/fbcat/pkg-fun.nix diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/unit/fb/fbida/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/fbida/default.nix rename to pkgs/unit/fb/fbida/pkg-fun.nix diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/unit/fb/fblog/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fblog/default.nix rename to pkgs/unit/fb/fblog/pkg-fun.nix diff --git a/pkgs/tools/misc/fbmark/default.nix b/pkgs/unit/fb/fbmark/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fbmark/default.nix rename to pkgs/unit/fb/fbmark/pkg-fun.nix diff --git a/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/pkgs/unit/fb/fbmenugen/0001-Fix-paths.patch similarity index 100% rename from pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch rename to pkgs/unit/fb/fbmenugen/0001-Fix-paths.patch diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/unit/fb/fbmenugen/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fbmenugen/default.nix rename to pkgs/unit/fb/fbmenugen/pkg-fun.nix diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/unit/fb/fbpanel/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/fbpanel/default.nix rename to pkgs/unit/fb/fbpanel/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/unit/fb/fbterm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fbterm/default.nix rename to pkgs/unit/fb/fbterm/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/pkgs/unit/fb/fbterm/select.patch similarity index 100% rename from pkgs/os-specific/linux/fbterm/select.patch rename to pkgs/unit/fb/fbterm/select.patch diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/unit/fb/fbv/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/fbv/default.nix rename to pkgs/unit/fb/fbv/pkg-fun.nix diff --git a/pkgs/tools/admin/fbvnc/default.nix b/pkgs/unit/fb/fbvnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/fbvnc/default.nix rename to pkgs/unit/fb/fbvnc/pkg-fun.nix diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/unit/fc/fcft/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fcft/default.nix rename to pkgs/unit/fc/fcft/pkg-fun.nix diff --git a/pkgs/development/libraries/fcgi/gcc-4.4.diff b/pkgs/unit/fc/fcgi/gcc-4.4.diff similarity index 100% rename from pkgs/development/libraries/fcgi/gcc-4.4.diff rename to pkgs/unit/fc/fcgi/gcc-4.4.diff diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/unit/fc/fcgi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fcgi/default.nix rename to pkgs/unit/fc/fcgi/pkg-fun.nix diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/unit/fc/fcgiwrap/pkg-fun.nix similarity index 100% rename from pkgs/servers/fcgiwrap/default.nix rename to pkgs/unit/fc/fcgiwrap/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/unit/fc/fcitx-configtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix rename to pkgs/unit/fc/fcitx-configtool/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/unit/fc/fcitx5-anthy/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix rename to pkgs/unit/fc/fcitx5-anthy/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/unit/fc/fcitx5-chewing/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix rename to pkgs/unit/fc/fcitx5-chewing/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/unit/fc/fcitx5-gtk/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix rename to pkgs/unit/fc/fcitx5-gtk/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/unit/fc/fcitx5-hangul/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix rename to pkgs/unit/fc/fcitx5-hangul/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/unit/fc/fcitx5-m17n/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix rename to pkgs/unit/fc/fcitx5-m17n/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch b/pkgs/unit/fc/fcitx5-rime/fcitx5-rime-with-nix-env-variable.patch similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch rename to pkgs/unit/fc/fcitx5-rime/fcitx5-rime-with-nix-env-variable.patch diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/unit/fc/fcitx5-rime/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix rename to pkgs/unit/fc/fcitx5-rime/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/unit/fc/fcitx5-table-extra/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix rename to pkgs/unit/fc/fcitx5-table-extra/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/unit/fc/fcitx5-table-other/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix rename to pkgs/unit/fc/fcitx5-table-other/pkg-fun.nix diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/unit/fc/fcl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fcl/default.nix rename to pkgs/unit/fc/fcl/pkg-fun.nix diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/unit/fc/fcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fcp/default.nix rename to pkgs/unit/fc/fcp/pkg-fun.nix diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/unit/fc/fcppt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fcppt/default.nix rename to pkgs/unit/fc/fcppt/pkg-fun.nix diff --git a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/pkgs/unit/fc/fcrackzip/fcrackzip_forkexec.patch similarity index 100% rename from pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch rename to pkgs/unit/fc/fcrackzip/fcrackzip_forkexec.patch diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/unit/fc/fcrackzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fcrackzip/default.nix rename to pkgs/unit/fc/fcrackzip/pkg-fun.nix diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/unit/fc/fcron/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/fcron/default.nix rename to pkgs/unit/fc/fcron/pkg-fun.nix diff --git a/pkgs/tools/system/fcron/relative-fcronsighup.patch b/pkgs/unit/fc/fcron/relative-fcronsighup.patch similarity index 100% rename from pkgs/tools/system/fcron/relative-fcronsighup.patch rename to pkgs/unit/fc/fcron/relative-fcronsighup.patch diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/unit/fd/fd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fd/default.nix rename to pkgs/unit/fd/fd/pkg-fun.nix diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/unit/fd/fdk-aac-encoder/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/fdkaac/default.nix rename to pkgs/unit/fd/fdk-aac-encoder/pkg-fun.nix diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/unit/fd/fdk_aac/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fdk-aac/default.nix rename to pkgs/unit/fd/fdk_aac/pkg-fun.nix diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/unit/fd/fdm/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/fdm/default.nix rename to pkgs/unit/fd/fdm/pkg-fun.nix diff --git a/pkgs/tools/misc/fdtools/new-skalibs.patch b/pkgs/unit/fd/fdtools/new-skalibs.patch similarity index 100% rename from pkgs/tools/misc/fdtools/new-skalibs.patch rename to pkgs/unit/fd/fdtools/new-skalibs.patch diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/unit/fd/fdtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fdtools/default.nix rename to pkgs/unit/fd/fdtools/pkg-fun.nix diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/unit/fd/fdupes/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fdupes/default.nix rename to pkgs/unit/fd/fdupes/pkg-fun.nix diff --git a/pkgs/development/libraries/febio/fix-cmake.patch b/pkgs/unit/fe/febio/fix-cmake.patch similarity index 100% rename from pkgs/development/libraries/febio/fix-cmake.patch rename to pkgs/unit/fe/febio/fix-cmake.patch diff --git a/pkgs/development/libraries/febio/default.nix b/pkgs/unit/fe/febio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/febio/default.nix rename to pkgs/unit/fe/febio/pkg-fun.nix diff --git a/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch b/pkgs/unit/fe/fedora-backgrounds/f33-fix-xfce-path.patch similarity index 100% rename from pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch rename to pkgs/unit/fe/fedora-backgrounds/f33-fix-xfce-path.patch diff --git a/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch b/pkgs/unit/fe/fedora-backgrounds/f34-fix-xfce-path.patch similarity index 100% rename from pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch rename to pkgs/unit/fe/fedora-backgrounds/f34-fix-xfce-path.patch diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/unit/fe/fedora-backgrounds/generic.nix similarity index 100% rename from pkgs/data/misc/fedora-backgrounds/generic.nix rename to pkgs/unit/fe/fedora-backgrounds/generic.nix diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/unit/fe/fedora-backgrounds/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/fedora-backgrounds/default.nix rename to pkgs/unit/fe/fedora-backgrounds/pkg-fun.nix diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/unit/fe/feedbackd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/feedbackd/default.nix rename to pkgs/unit/fe/feedbackd/pkg-fun.nix diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/unit/fe/feedgnuplot/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/feedgnuplot/default.nix rename to pkgs/unit/fe/feedgnuplot/pkg-fun.nix diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/unit/fe/fehlstart/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fehlstart/default.nix rename to pkgs/unit/fe/fehlstart/pkg-fun.nix diff --git a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/pkgs/unit/fe/fehlstart/use-nix-profiles.patch similarity index 100% rename from pkgs/applications/misc/fehlstart/use-nix-profiles.patch rename to pkgs/unit/fe/fehlstart/use-nix-profiles.patch diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/unit/fe/feishu/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/feishu/default.nix rename to pkgs/unit/fe/feishu/pkg-fun.nix diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/unit/fe/felix-fm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/felix-fm/default.nix rename to pkgs/unit/fe/felix-fm/pkg-fun.nix diff --git a/pkgs/servers/felix/default.nix b/pkgs/unit/fe/felix/pkg-fun.nix similarity index 100% rename from pkgs/servers/felix/default.nix rename to pkgs/unit/fe/felix/pkg-fun.nix diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/unit/fe/felix_remoteshell/pkg-fun.nix similarity index 100% rename from pkgs/servers/felix/remoteshell.nix rename to pkgs/unit/fe/felix_remoteshell/pkg-fun.nix diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/unit/fe/fend/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fend/default.nix rename to pkgs/unit/fe/fend/pkg-fun.nix diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/unit/fe/ferm/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ferm/default.nix rename to pkgs/unit/fe/ferm/pkg-fun.nix diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/unit/fe/ferretdb/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/ferretdb/default.nix rename to pkgs/unit/fe/ferretdb/pkg-fun.nix diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/unit/fe/ferrum/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ferrum/default.nix rename to pkgs/unit/fe/ferrum/pkg-fun.nix diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/unit/fe/fet-sh/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fet-sh/default.nix rename to pkgs/unit/fe/fet-sh/pkg-fun.nix diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/unit/fe/fetchCrate/pkg-fun.nix similarity index 100% rename from pkgs/build-support/rust/fetchcrate.nix rename to pkgs/unit/fe/fetchCrate/pkg-fun.nix diff --git a/pkgs/build-support/fetchbitbucket/default.nix b/pkgs/unit/fe/fetchFromBitbucket/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchbitbucket/default.nix rename to pkgs/unit/fe/fetchFromBitbucket/pkg-fun.nix diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/unit/fe/fetchFromGitHub/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchgithub/default.nix rename to pkgs/unit/fe/fetchFromGitHub/pkg-fun.nix diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/unit/fe/fetchFromGitLab/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchgitlab/default.nix rename to pkgs/unit/fe/fetchFromGitLab/pkg-fun.nix diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/unit/fe/fetchFromGitea/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchgitea/default.nix rename to pkgs/unit/fe/fetchFromGitea/pkg-fun.nix diff --git a/pkgs/build-support/fetchgitiles/default.nix b/pkgs/unit/fe/fetchFromGitiles/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchgitiles/default.nix rename to pkgs/unit/fe/fetchFromGitiles/pkg-fun.nix diff --git a/pkgs/build-support/fetchrepoorcz/default.nix b/pkgs/unit/fe/fetchFromRepoOrCz/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchrepoorcz/default.nix rename to pkgs/unit/fe/fetchFromRepoOrCz/pkg-fun.nix diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/unit/fe/fetchFromSavannah/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchsavannah/default.nix rename to pkgs/unit/fe/fetchFromSavannah/pkg-fun.nix diff --git a/pkgs/build-support/fetchsourcehut/default.nix b/pkgs/unit/fe/fetchFromSourcehut/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchsourcehut/default.nix rename to pkgs/unit/fe/fetchFromSourcehut/pkg-fun.nix diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/unit/fe/fetchMavenArtifact/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchmavenartifact/default.nix rename to pkgs/unit/fe/fetchMavenArtifact/pkg-fun.nix diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/unit/fe/fetchNextcloudApp/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchnextcloudapp/default.nix rename to pkgs/unit/fe/fetchNextcloudApp/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/fetchnuget/default.nix b/pkgs/unit/fe/fetchNuGet/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/fetchnuget/default.nix rename to pkgs/unit/fe/fetchNuGet/pkg-fun.nix diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/unit/fe/fetchPypi/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchpypi/default.nix rename to pkgs/unit/fe/fetchPypi/pkg-fun.nix diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/unit/fe/fetchRepoProject/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchrepoproject/default.nix rename to pkgs/unit/fe/fetchRepoProject/pkg-fun.nix diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/unit/fe/fetchbzr/builder.sh similarity index 100% rename from pkgs/build-support/fetchbzr/builder.sh rename to pkgs/unit/fe/fetchbzr/builder.sh diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/unit/fe/fetchbzr/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchbzr/default.nix rename to pkgs/unit/fe/fetchbzr/pkg-fun.nix diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/unit/fe/fetchdarcs/builder.sh similarity index 100% rename from pkgs/build-support/fetchdarcs/builder.sh rename to pkgs/unit/fe/fetchdarcs/builder.sh diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/unit/fe/fetchdarcs/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchdarcs/default.nix rename to pkgs/unit/fe/fetchdarcs/pkg-fun.nix diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/unit/fe/fetchdocker/fetchdocker-builder.sh similarity index 100% rename from pkgs/build-support/fetchdocker/fetchdocker-builder.sh rename to pkgs/unit/fe/fetchdocker/fetchdocker-builder.sh diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/unit/fe/fetchdocker/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchdocker/default.nix rename to pkgs/unit/fe/fetchdocker/pkg-fun.nix diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/unit/fe/fetchfossil/builder.sh similarity index 100% rename from pkgs/build-support/fetchfossil/builder.sh rename to pkgs/unit/fe/fetchfossil/builder.sh diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/unit/fe/fetchfossil/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchfossil/default.nix rename to pkgs/unit/fe/fetchfossil/pkg-fun.nix diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/unit/fe/fetchgitLocal/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchgitlocal/default.nix rename to pkgs/unit/fe/fetchgitLocal/pkg-fun.nix diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/unit/fe/fetchgx/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchgx/default.nix rename to pkgs/unit/fe/fetchgx/pkg-fun.nix diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/unit/fe/fetchhg/builder.sh similarity index 100% rename from pkgs/build-support/fetchhg/builder.sh rename to pkgs/unit/fe/fetchhg/builder.sh diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/unit/fe/fetchhg/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchhg/default.nix rename to pkgs/unit/fe/fetchhg/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/unit/fe/fetchit/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/fetchit/default.nix rename to pkgs/unit/fe/fetchit/pkg-fun.nix diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/unit/fe/fetchmail/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fetchmail/default.nix rename to pkgs/unit/fe/fetchmail/pkg-fun.nix diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/unit/fe/fetchmail_7/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fetchmail/v7.nix rename to pkgs/unit/fe/fetchmail_7/pkg-fun.nix diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/unit/fe/fetchs3/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchs3/default.nix rename to pkgs/unit/fe/fetchs3/pkg-fun.nix diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/unit/fe/fetchsvnssh/builder.sh similarity index 100% rename from pkgs/build-support/fetchsvnssh/builder.sh rename to pkgs/unit/fe/fetchsvnssh/builder.sh diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/unit/fe/fetchsvnssh/pkg-fun.nix similarity index 100% rename from pkgs/build-support/fetchsvnssh/default.nix rename to pkgs/unit/fe/fetchsvnssh/pkg-fun.nix diff --git a/pkgs/build-support/fetchsvnssh/sshsubversion.exp b/pkgs/unit/fe/fetchsvnssh/sshsubversion.exp similarity index 100% rename from pkgs/build-support/fetchsvnssh/sshsubversion.exp rename to pkgs/unit/fe/fetchsvnssh/sshsubversion.exp diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/unit/fe/fetchutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fetchutils/default.nix rename to pkgs/unit/fe/fetchutils/pkg-fun.nix diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/unit/ff/ff2mpv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ff2mpv/default.nix rename to pkgs/unit/ff/ff2mpv/pkg-fun.nix diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/unit/ff/ffcast/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/ffcast/default.nix rename to pkgs/unit/ff/ffcast/pkg-fun.nix diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/unit/ff/fff/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fff/default.nix rename to pkgs/unit/ff/fff/pkg-fun.nix diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/unit/ff/fflas-ffpack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fflas-ffpack/default.nix rename to pkgs/unit/ff/fflas-ffpack/pkg-fun.nix diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/unit/ff/ffmpegthumbnailer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ffmpegthumbnailer/default.nix rename to pkgs/unit/ff/ffmpegthumbnailer/pkg-fun.nix diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/unit/ff/ffms/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ffms/default.nix rename to pkgs/unit/ff/ffms/pkg-fun.nix diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/unit/ff/fftw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fftw/default.nix rename to pkgs/unit/ff/fftw/pkg-fun.nix diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/unit/ff/ffuf/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ffuf/default.nix rename to pkgs/unit/ff/ffuf/pkg-fun.nix diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/unit/fg/fgallery/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/fgallery/default.nix rename to pkgs/unit/fg/fgallery/pkg-fun.nix diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/unit/fh/fheroes2/pkg-fun.nix similarity index 100% rename from pkgs/games/fheroes2/default.nix rename to pkgs/unit/fh/fheroes2/pkg-fun.nix diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/unit/fi/FIL-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/FIL-plugins/default.nix rename to pkgs/unit/fi/FIL-plugins/pkg-fun.nix diff --git a/pkgs/servers/fiche/default.nix b/pkgs/unit/fi/fiche/pkg-fun.nix similarity index 100% rename from pkgs/servers/fiche/default.nix rename to pkgs/unit/fi/fiche/pkg-fun.nix diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/unit/fi/fido2luks/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fido2luks/default.nix rename to pkgs/unit/fi/fido2luks/pkg-fun.nix diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/unit/fi/fierce/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fierce/default.nix rename to pkgs/unit/fi/fierce/pkg-fun.nix diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/unit/fi/fig2dev/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/fig2dev/default.nix rename to pkgs/unit/fi/fig2dev/pkg-fun.nix diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/unit/fi/figlet/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/figlet/default.nix rename to pkgs/unit/fi/figlet/pkg-fun.nix diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/unit/fi/figma-linux/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/figma-linux/default.nix rename to pkgs/unit/fi/figma-linux/pkg-fun.nix diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/unit/fi/fiji/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/fiji/default.nix rename to pkgs/unit/fi/fiji/pkg-fun.nix diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/unit/fi/file-rename/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/file-rename/default.nix rename to pkgs/unit/fi/file-rename/pkg-fun.nix diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/unit/fi/filebench/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/filebench/default.nix rename to pkgs/unit/fi/filebench/pkg-fun.nix diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/unit/fi/filebot/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/filebot/default.nix rename to pkgs/unit/fi/filebot/pkg-fun.nix diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/unit/fi/filegive/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/filegive/default.nix rename to pkgs/unit/fi/filegive/pkg-fun.nix diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/unit/fi/fileschanged/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fileschanged/default.nix rename to pkgs/unit/fi/fileschanged/pkg-fun.nix diff --git a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch b/pkgs/unit/fi/fileschanged/unused-variables.debian.patch similarity index 100% rename from pkgs/tools/misc/fileschanged/unused-variables.debian.patch rename to pkgs/unit/fi/fileschanged/unused-variables.debian.patch diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/unit/fi/fileshare/pkg-fun.nix similarity index 100% rename from pkgs/servers/fileshare/default.nix rename to pkgs/unit/fi/fileshare/pkg-fun.nix diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/unit/fi/fileshelter/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/fileshelter/default.nix rename to pkgs/unit/fi/fileshelter/pkg-fun.nix diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/unit/fi/filet/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/filet/default.nix rename to pkgs/unit/fi/filet/pkg-fun.nix diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/unit/fi/filezilla/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ftp/filezilla/default.nix rename to pkgs/unit/fi/filezilla/pkg-fun.nix diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/unit/fi/filter-audio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/filter-audio/default.nix rename to pkgs/unit/fi/filter-audio/pkg-fun.nix diff --git a/pkgs/servers/filtron/deps.nix b/pkgs/unit/fi/filtron/deps.nix similarity index 100% rename from pkgs/servers/filtron/deps.nix rename to pkgs/unit/fi/filtron/deps.nix diff --git a/pkgs/servers/filtron/default.nix b/pkgs/unit/fi/filtron/pkg-fun.nix similarity index 100% rename from pkgs/servers/filtron/default.nix rename to pkgs/unit/fi/filtron/pkg-fun.nix diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/unit/fi/fim/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/fim/default.nix rename to pkgs/unit/fi/fim/pkg-fun.nix diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/unit/fi/find-cursor/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/find-cursor/default.nix rename to pkgs/unit/fi/find-cursor/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/unit/fi/findbugs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/findbugs/default.nix rename to pkgs/unit/fi/findbugs/pkg-fun.nix diff --git a/pkgs/tools/graphics/findimagedupes/default.nix b/pkgs/unit/fi/findimagedupes/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/findimagedupes/default.nix rename to pkgs/unit/fi/findimagedupes/pkg-fun.nix diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/unit/fi/findnewest/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/findnewest/default.nix rename to pkgs/unit/fi/findnewest/pkg-fun.nix diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/unit/fi/findup/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/findup/default.nix rename to pkgs/unit/fi/findup/pkg-fun.nix diff --git a/pkgs/tools/misc/findutils/no-install-statedir.patch b/pkgs/unit/fi/findutils/no-install-statedir.patch similarity index 100% rename from pkgs/tools/misc/findutils/no-install-statedir.patch rename to pkgs/unit/fi/findutils/no-install-statedir.patch diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/unit/fi/findutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/findutils/default.nix rename to pkgs/unit/fi/findutils/pkg-fun.nix diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/unit/fi/fio/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/fio/default.nix rename to pkgs/unit/fi/fio/pkg-fun.nix diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/unit/fi/fioctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/fioctl/default.nix rename to pkgs/unit/fi/fioctl/pkg-fun.nix diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/unit/fi/fira-code-symbols/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fira-code/symbols.nix rename to pkgs/unit/fi/fira-code-symbols/pkg-fun.nix diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/unit/fi/fira-code/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fira-code/default.nix rename to pkgs/unit/fi/fira-code/pkg-fun.nix diff --git a/pkgs/data/fonts/fira-go/default.nix b/pkgs/unit/fi/fira-go/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fira-go/default.nix rename to pkgs/unit/fi/fira-go/pkg-fun.nix diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/unit/fi/fira-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fira-mono/default.nix rename to pkgs/unit/fi/fira-mono/pkg-fun.nix diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/unit/fi/fira/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fira/default.nix rename to pkgs/unit/fi/fira/pkg-fun.nix diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/unit/fi/firecracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/firecracker/default.nix rename to pkgs/unit/fi/firecracker/pkg-fun.nix diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/unit/fi/firectl/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/firectl/default.nix rename to pkgs/unit/fi/firectl/pkg-fun.nix diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/unit/fi/firefly-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/firefly-desktop/default.nix rename to pkgs/unit/fi/firefly-desktop/pkg-fun.nix diff --git a/pkgs/applications/networking/firehol/firehol-ping6.patch b/pkgs/unit/fi/firehol/firehol-ping6.patch similarity index 100% rename from pkgs/applications/networking/firehol/firehol-ping6.patch rename to pkgs/unit/fi/firehol/firehol-ping6.patch diff --git a/pkgs/applications/networking/firehol/firehol-sysconfdir.patch b/pkgs/unit/fi/firehol/firehol-sysconfdir.patch similarity index 100% rename from pkgs/applications/networking/firehol/firehol-sysconfdir.patch rename to pkgs/unit/fi/firehol/firehol-sysconfdir.patch diff --git a/pkgs/applications/networking/firehol/firehol-uname-command.patch b/pkgs/unit/fi/firehol/firehol-uname-command.patch similarity index 100% rename from pkgs/applications/networking/firehol/firehol-uname-command.patch rename to pkgs/unit/fi/firehol/firehol-uname-command.patch diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/unit/fi/firehol/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/firehol/default.nix rename to pkgs/unit/fi/firehol/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/unit/fi/firejail/fbuilder-call-firejail-on-path.patch similarity index 100% rename from pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch rename to pkgs/unit/fi/firejail/fbuilder-call-firejail-on-path.patch diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/unit/fi/firejail/mount-nix-dir-on-overlay.patch similarity index 100% rename from pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch rename to pkgs/unit/fi/firejail/mount-nix-dir-on-overlay.patch diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/unit/fi/firejail/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firejail/default.nix rename to pkgs/unit/fi/firejail/pkg-fun.nix diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/unit/fi/firestarter/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/firestarter/default.nix rename to pkgs/unit/fi/firestarter/pkg-fun.nix diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/unit/fi/firewalld/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/firewalld/default.nix rename to pkgs/unit/fi/firewalld/pkg-fun.nix diff --git a/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/pkgs/unit/fi/firewalld/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch rename to pkgs/unit/fi/firewalld/respect-xml-catalog-files-var.patch diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/unit/fi/firmware-updater/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/firmware-updater/default.nix rename to pkgs/unit/fi/firmware-updater/pkg-fun.nix diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/unit/fi/firrtl/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/firrtl/default.nix rename to pkgs/unit/fi/firrtl/pkg-fun.nix diff --git a/pkgs/games/fish-fillets-ng/icon.xpm b/pkgs/unit/fi/fish-fillets-ng/icon.xpm similarity index 100% rename from pkgs/games/fish-fillets-ng/icon.xpm rename to pkgs/unit/fi/fish-fillets-ng/icon.xpm diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/unit/fi/fish-fillets-ng/pkg-fun.nix similarity index 100% rename from pkgs/games/fish-fillets-ng/default.nix rename to pkgs/unit/fi/fish-fillets-ng/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/pkgs/unit/fi/fish-irssi/irssi-include-dir.patch similarity index 100% rename from pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch rename to pkgs/unit/fi/fish-irssi/irssi-include-dir.patch diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/unit/fi/fish-irssi/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/irssi/fish/default.nix rename to pkgs/unit/fi/fish-irssi/pkg-fun.nix diff --git a/pkgs/shells/fish/default.nix b/pkgs/unit/fi/fish/pkg-fun.nix similarity index 100% rename from pkgs/shells/fish/default.nix rename to pkgs/unit/fi/fish/pkg-fun.nix diff --git a/pkgs/servers/fishnet/Cargo.lock.patch b/pkgs/unit/fi/fishnet/Cargo.lock.patch similarity index 100% rename from pkgs/servers/fishnet/Cargo.lock.patch rename to pkgs/unit/fi/fishnet/Cargo.lock.patch diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/unit/fi/fishnet/pkg-fun.nix similarity index 100% rename from pkgs/servers/fishnet/default.nix rename to pkgs/unit/fi/fishnet/pkg-fun.nix diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/unit/fi/fission/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fission/default.nix rename to pkgs/unit/fi/fission/pkg-fun.nix diff --git a/pkgs/applications/misc/fitnesstrax/default.nix b/pkgs/unit/fi/fitnesstrax/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fitnesstrax/default.nix rename to pkgs/unit/fi/fitnesstrax/pkg-fun.nix diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/unit/fi/fits-cloudctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/fits-cloudctl/default.nix rename to pkgs/unit/fi/fits-cloudctl/pkg-fun.nix diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/unit/fi/fityk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/fityk/default.nix rename to pkgs/unit/fi/fityk/pkg-fun.nix diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/unit/fi/fixedsys-excelsior/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fixedsys-excelsior/default.nix rename to pkgs/unit/fi/fixedsys-excelsior/pkg-fun.nix diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/unit/fl/flac/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/flac/default.nix rename to pkgs/unit/fl/flac/pkg-fun.nix diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/unit/fl/flac123/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/flac123/default.nix rename to pkgs/unit/fl/flac123/pkg-fun.nix diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/unit/fl/flam3/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/flam3/default.nix rename to pkgs/unit/fl/flam3/pkg-fun.nix diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/unit/fl/flamegraph/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/flamegraph/default.nix rename to pkgs/unit/fl/flamegraph/pkg-fun.nix diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/unit/fl/flamerobin/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/flamerobin/default.nix rename to pkgs/unit/fl/flamerobin/pkg-fun.nix diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/unit/fl/flann/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/flann/default.nix rename to pkgs/unit/fl/flann/pkg-fun.nix diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/unit/fl/flannel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/flannel/default.nix rename to pkgs/unit/fl/flannel/pkg-fun.nix diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/unit/fl/flare-floss/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/flare-floss/default.nix rename to pkgs/unit/fl/flare-floss/pkg-fun.nix diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/unit/fl/flashbench/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/flashbench/default.nix rename to pkgs/unit/fl/flashbench/pkg-fun.nix diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/unit/fl/flashfocus/pkg-fun.nix similarity index 100% rename from pkgs/misc/flashfocus/default.nix rename to pkgs/unit/fl/flashfocus/pkg-fun.nix diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/unit/fl/flashrom/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/flashrom/default.nix rename to pkgs/unit/fl/flashrom/pkg-fun.nix diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/unit/fl/flasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/flasm/default.nix rename to pkgs/unit/fl/flasm/pkg-fun.nix diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/unit/fl/flat-remix-gnome/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/flat-remix-gnome/default.nix rename to pkgs/unit/fl/flat-remix-gnome/pkg-fun.nix diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/unit/fl/flat-remix-gtk/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/flat-remix-gtk/default.nix rename to pkgs/unit/fl/flat-remix-gtk/pkg-fun.nix diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/unit/fl/flatbuffers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/flatbuffers/default.nix rename to pkgs/unit/fl/flatbuffers/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/unit/fl/flatcam/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/flatcam/default.nix rename to pkgs/unit/fl/flatcam/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/flatcam/release.patch b/pkgs/unit/fl/flatcam/release.patch similarity index 100% rename from pkgs/applications/science/electronics/flatcam/release.patch rename to pkgs/unit/fl/flatcam/release.patch diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/unit/fl/flatcc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/flatcc/default.nix rename to pkgs/unit/fl/flatcc/pkg-fun.nix diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/unit/fl/flavours/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/flavours/default.nix rename to pkgs/unit/fl/flavours/pkg-fun.nix diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/unit/fl/flawfinder/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/flawfinder/default.nix rename to pkgs/unit/fl/flawfinder/pkg-fun.nix diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/unit/fl/flex-ncat/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/flex-ncat/default.nix rename to pkgs/unit/fl/flex-ncat/pkg-fun.nix diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/unit/fl/flex-ndax/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/flex-ndax/default.nix rename to pkgs/unit/fl/flex-ndax/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/unit/fl/flex/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/flex/default.nix rename to pkgs/unit/fl/flex/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/unit/fl/flex_2_5_35/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/flex/2.5.35.nix rename to pkgs/unit/fl/flex_2_5_35/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/unit/fl/flexcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/flexc++/default.nix rename to pkgs/unit/fl/flexcpp/pkg-fun.nix diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/unit/fl/flexget/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/flexget/default.nix rename to pkgs/unit/fl/flexget/pkg-fun.nix diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/unit/fl/flexibee/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/flexibee/default.nix rename to pkgs/unit/fl/flexibee/pkg-fun.nix diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/unit/fl/flexoptix-app/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/flexoptix-app/default.nix rename to pkgs/unit/fl/flexoptix-app/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/unit/fl/flink/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/flink/default.nix rename to pkgs/unit/fl/flink/pkg-fun.nix diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/unit/fl/flint/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/flint/default.nix rename to pkgs/unit/fl/flint/pkg-fun.nix diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/unit/fl/flintlock/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/flintlock/default.nix rename to pkgs/unit/fl/flintlock/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/unit/fl/flintqs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/flintqs/default.nix rename to pkgs/unit/fl/flintqs/pkg-fun.nix diff --git a/pkgs/development/tools/flip-link/default.nix b/pkgs/unit/fl/flip-link/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/flip-link/default.nix rename to pkgs/unit/fl/flip-link/pkg-fun.nix diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/unit/fl/flips/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/flips/default.nix rename to pkgs/unit/fl/flips/pkg-fun.nix diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/unit/fl/flips/use-system-libdivsufsort.patch similarity index 100% rename from pkgs/tools/compression/flips/use-system-libdivsufsort.patch rename to pkgs/unit/fl/flips/use-system-libdivsufsort.patch diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/unit/fl/flite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/flite/default.nix rename to pkgs/unit/fl/flite/pkg-fun.nix diff --git a/pkgs/tools/misc/flitter/flitter.patch b/pkgs/unit/fl/flitter/flitter.patch similarity index 100% rename from pkgs/tools/misc/flitter/flitter.patch rename to pkgs/unit/fl/flitter/flitter.patch diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/unit/fl/flitter/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/flitter/default.nix rename to pkgs/unit/fl/flitter/pkg-fun.nix diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/unit/fl/fllog/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/fllog/default.nix rename to pkgs/unit/fl/fllog/pkg-fun.nix diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/unit/fl/flmsg/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/flmsg/default.nix rename to pkgs/unit/fl/flmsg/pkg-fun.nix diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/unit/fl/flock/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/flock/default.nix rename to pkgs/unit/fl/flock/pkg-fun.nix diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/unit/fl/flockit/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/flockit/default.nix rename to pkgs/unit/fl/flockit/pkg-fun.nix diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/unit/fl/flootty/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/flootty/default.nix rename to pkgs/unit/fl/flootty/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/unit/fl/flopoco/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/flopoco/default.nix rename to pkgs/unit/fl/flopoco/pkg-fun.nix diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/unit/fl/flowblade/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/flowblade/default.nix rename to pkgs/unit/fl/flowblade/pkg-fun.nix diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/unit/fl/flpsed/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/flpsed/default.nix rename to pkgs/unit/fl/flpsed/pkg-fun.nix diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/unit/fl/flrig/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/flrig/default.nix rename to pkgs/unit/fl/flrig/pkg-fun.nix diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/unit/fl/fluent-bit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fluent-bit/default.nix rename to pkgs/unit/fl/fluent-bit/pkg-fun.nix diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/unit/fl/fluent-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/fluent-gtk-theme/default.nix rename to pkgs/unit/fl/fluent-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/unit/fl/fluent-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/fluent-icon-theme/default.nix rename to pkgs/unit/fl/fluent-icon-theme/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/unit/fl/fluent-reader/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/fluent-reader/default.nix rename to pkgs/unit/fl/fluent-reader/pkg-fun.nix diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/unit/fl/fluentd/Gemfile similarity index 100% rename from pkgs/tools/misc/fluentd/Gemfile rename to pkgs/unit/fl/fluentd/Gemfile diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/unit/fl/fluentd/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/fluentd/Gemfile.lock rename to pkgs/unit/fl/fluentd/Gemfile.lock diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/unit/fl/fluentd/gemset.nix similarity index 100% rename from pkgs/tools/misc/fluentd/gemset.nix rename to pkgs/unit/fl/fluentd/gemset.nix diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/unit/fl/fluentd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fluentd/default.nix rename to pkgs/unit/fl/fluentd/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/unit/fl/fluffychat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/fluffychat/default.nix rename to pkgs/unit/fl/fluffychat/pkg-fun.nix diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/unit/fl/fluidd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fluidd/default.nix rename to pkgs/unit/fl/fluidd/pkg-fun.nix diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/unit/fl/flux/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/flux/default.nix rename to pkgs/unit/fl/flux/pkg-fun.nix diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/unit/fl/fluxbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/fluxbox/default.nix rename to pkgs/unit/fl/fluxbox/pkg-fun.nix diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/unit/fl/fluxboxlauncher/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fluxboxlauncher/default.nix rename to pkgs/unit/fl/fluxboxlauncher/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch b/pkgs/unit/fl/fluxcd/patches/disable-tests-ssh_key.patch similarity index 100% rename from pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch rename to pkgs/unit/fl/fluxcd/patches/disable-tests-ssh_key.patch diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/unit/fl/fluxcd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/fluxcd/default.nix rename to pkgs/unit/fl/fluxcd/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/unit/fl/fluxcd/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/fluxcd/update.sh rename to pkgs/unit/fl/fluxcd/update.sh diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/unit/fl/fluxctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/fluxctl/default.nix rename to pkgs/unit/fl/fluxctl/pkg-fun.nix diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/unit/fl/flvstreamer/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/flvstreamer/default.nix rename to pkgs/unit/fl/flvstreamer/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/unit/fl/fly/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/fly/default.nix rename to pkgs/unit/fl/fly/pkg-fun.nix diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/unit/fl/flycast/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/flycast/default.nix rename to pkgs/unit/fl/flycast/pkg-fun.nix diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/unit/fl/flyctl/pkg-fun.nix similarity index 100% rename from pkgs/development/web/flyctl/default.nix rename to pkgs/unit/fl/flyctl/pkg-fun.nix diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/unit/fl/flyway/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/flyway/default.nix rename to pkgs/unit/fl/flyway/pkg-fun.nix diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/unit/fl/flywheel-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/flywheel-cli/default.nix rename to pkgs/unit/fl/flywheel-cli/pkg-fun.nix diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/unit/fm/fmsynth/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/fmsynth/default.nix rename to pkgs/unit/fm/fmsynth/pkg-fun.nix diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/unit/fm/fmtoy/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/fmtoy/default.nix rename to pkgs/unit/fm/fmtoy/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/unit/fn/fn-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/fn-cli/default.nix rename to pkgs/unit/fn/fn-cli/pkg-fun.nix diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/unit/fn/fnc/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/fnc/default.nix rename to pkgs/unit/fn/fnc/pkg-fun.nix diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/unit/fn/fnlfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fnlfmt/default.nix rename to pkgs/unit/fn/fnlfmt/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/unit/fn/fnotifystat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fnotifystat/default.nix rename to pkgs/unit/fn/fnotifystat/pkg-fun.nix diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/unit/fn/fnott/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fnott/default.nix rename to pkgs/unit/fn/fnott/pkg-fun.nix diff --git a/pkgs/tools/misc/fntsample/default.nix b/pkgs/unit/fn/fntsample/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fntsample/default.nix rename to pkgs/unit/fn/fntsample/pkg-fun.nix diff --git a/pkgs/tools/X11/focus/default.nix b/pkgs/unit/fo/focus/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/focus/default.nix rename to pkgs/unit/fo/focus/pkg-fun.nix diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/unit/fo/foliate/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/foliate/default.nix rename to pkgs/unit/fo/foliate/pkg-fun.nix diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/unit/fo/folks/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/folks/default.nix rename to pkgs/unit/fo/folks/pkg-fun.nix diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/unit/fo/folly/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/folly/default.nix rename to pkgs/unit/fo/folly/pkg-fun.nix diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/unit/fo/foma/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/foma/default.nix rename to pkgs/unit/fo/foma/pkg-fun.nix diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/unit/fo/fomp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/fomp/default.nix rename to pkgs/unit/fo/fomp/pkg-fun.nix diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/unit/fo/fondo/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/fondo/default.nix rename to pkgs/unit/fo/fondo/pkg-fun.nix diff --git a/pkgs/tools/misc/font-config-info/default.nix b/pkgs/unit/fo/font-config-info/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/font-config-info/default.nix rename to pkgs/unit/fo/font-config-info/pkg-fun.nix diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/unit/fo/font-manager/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/font-manager/default.nix rename to pkgs/unit/fo/font-manager/pkg-fun.nix diff --git a/pkgs/tools/misc/fontfor/default.nix b/pkgs/unit/fo/fontfor/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fontfor/default.nix rename to pkgs/unit/fo/fontfor/pkg-fun.nix diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/unit/fo/fontforge-fonttools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fontforge/fontforge-fonttools.nix rename to pkgs/unit/fo/fontforge-fonttools/pkg-fun.nix diff --git a/pkgs/applications/misc/fontpreview/default.nix b/pkgs/unit/fo/fontpreview/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fontpreview/default.nix rename to pkgs/unit/fo/fontpreview/pkg-fun.nix diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/unit/fo/foo2zjs/dell1250c-color-fix.patch similarity index 100% rename from pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch rename to pkgs/unit/fo/foo2zjs/dell1250c-color-fix.patch diff --git a/pkgs/misc/drivers/foo2zjs/hbpl1.patch b/pkgs/unit/fo/foo2zjs/hbpl1.patch similarity index 100% rename from pkgs/misc/drivers/foo2zjs/hbpl1.patch rename to pkgs/unit/fo/foo2zjs/hbpl1.patch diff --git a/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff b/pkgs/unit/fo/foo2zjs/no-hardcode-fw.diff similarity index 100% rename from pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff rename to pkgs/unit/fo/foo2zjs/no-hardcode-fw.diff diff --git a/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch b/pkgs/unit/fo/foo2zjs/papercode-format-fix.patch similarity index 100% rename from pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch rename to pkgs/unit/fo/foo2zjs/papercode-format-fix.patch diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/unit/fo/foo2zjs/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/foo2zjs/default.nix rename to pkgs/unit/fo/foo2zjs/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix b/pkgs/unit/fo/foomatic-db-engine/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db-engine/default.nix rename to pkgs/unit/fo/foomatic-db-engine/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix b/pkgs/unit/fo/foomatic-db-nonfree/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix rename to pkgs/unit/fo/foomatic-db-nonfree/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/unit/fo/foomatic-db/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db/default.nix rename to pkgs/unit/fo/foomatic-db/pkg-fun.nix diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/unit/fo/foomatic-filters/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/foomatic-filters/default.nix rename to pkgs/unit/fo/foomatic-filters/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/unit/fo/foot/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/foot/default.nix rename to pkgs/unit/fo/foot/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/footswitch/default.nix b/pkgs/unit/fo/footswitch/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/footswitch/default.nix rename to pkgs/unit/fo/footswitch/pkg-fun.nix diff --git a/pkgs/tools/system/foreman/Gemfile b/pkgs/unit/fo/foreman/Gemfile similarity index 100% rename from pkgs/tools/system/foreman/Gemfile rename to pkgs/unit/fo/foreman/Gemfile diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/unit/fo/foreman/Gemfile.lock similarity index 100% rename from pkgs/tools/system/foreman/Gemfile.lock rename to pkgs/unit/fo/foreman/Gemfile.lock diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/unit/fo/foreman/gemset.nix similarity index 100% rename from pkgs/tools/system/foreman/gemset.nix rename to pkgs/unit/fo/foreman/gemset.nix diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/unit/fo/foreman/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/foreman/default.nix rename to pkgs/unit/fo/foreman/pkg-fun.nix diff --git a/pkgs/tools/system/foremost/makefile.patch b/pkgs/unit/fo/foremost/makefile.patch similarity index 100% rename from pkgs/tools/system/foremost/makefile.patch rename to pkgs/unit/fo/foremost/makefile.patch diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/unit/fo/foremost/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/foremost/default.nix rename to pkgs/unit/fo/foremost/pkg-fun.nix diff --git a/pkgs/games/forge-mtg/no-launch4j.patch b/pkgs/unit/fo/forge-mtg/no-launch4j.patch similarity index 100% rename from pkgs/games/forge-mtg/no-launch4j.patch rename to pkgs/unit/fo/forge-mtg/no-launch4j.patch diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/unit/fo/forge-mtg/pkg-fun.nix similarity index 100% rename from pkgs/games/forge-mtg/default.nix rename to pkgs/unit/fo/forge-mtg/pkg-fun.nix diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/unit/fo/forkstat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/forkstat/default.nix rename to pkgs/unit/fo/forkstat/pkg-fun.nix diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/unit/fo/forktty/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/forktty/default.nix rename to pkgs/unit/fo/forktty/pkg-fun.nix diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/unit/fo/form/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/form/default.nix rename to pkgs/unit/fo/form/pkg-fun.nix diff --git a/pkgs/applications/misc/formatter/fix-paths.patch b/pkgs/unit/fo/formatter/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/formatter/fix-paths.patch rename to pkgs/unit/fo/formatter/fix-paths.patch diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/unit/fo/formatter/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/formatter/default.nix rename to pkgs/unit/fo/formatter/pkg-fun.nix diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/unit/fo/formula/nuget.nix similarity index 100% rename from pkgs/applications/science/logic/formula/nuget.nix rename to pkgs/unit/fo/formula/nuget.nix diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/unit/fo/formula/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/formula/default.nix rename to pkgs/unit/fo/formula/pkg-fun.nix diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/unit/fo/fornalder/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/fornalder/default.nix rename to pkgs/unit/fo/fornalder/pkg-fun.nix diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/unit/fo/fortune/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fortune/default.nix rename to pkgs/unit/fo/fortune/pkg-fun.nix diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/unit/fo/foxtrotgps/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/foxtrotgps/default.nix rename to pkgs/unit/fo/foxtrotgps/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/unit/fp/fparser/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/fparser/default.nix rename to pkgs/unit/fp/fparser/pkg-fun.nix diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/unit/fp/fpart/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fpart/default.nix rename to pkgs/unit/fp/fpart/pkg-fun.nix diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/unit/fp/fpc/binary-builder-darwin.sh similarity index 100% rename from pkgs/development/compilers/fpc/binary-builder-darwin.sh rename to pkgs/unit/fp/fpc/binary-builder-darwin.sh diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/unit/fp/fpc/binary-builder.sh similarity index 100% rename from pkgs/development/compilers/fpc/binary-builder.sh rename to pkgs/unit/fp/fpc/binary-builder.sh diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/unit/fp/fpc/binary.nix similarity index 100% rename from pkgs/development/compilers/fpc/binary.nix rename to pkgs/unit/fp/fpc/binary.nix diff --git a/pkgs/development/compilers/fpc/mark-paths.patch b/pkgs/unit/fp/fpc/mark-paths.patch similarity index 100% rename from pkgs/development/compilers/fpc/mark-paths.patch rename to pkgs/unit/fp/fpc/mark-paths.patch diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/unit/fp/fpc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/fpc/default.nix rename to pkgs/unit/fp/fpc/pkg-fun.nix diff --git a/pkgs/development/compilers/fpc/remove-signature.sh b/pkgs/unit/fp/fpc/remove-signature.sh similarity index 100% rename from pkgs/development/compilers/fpc/remove-signature.sh rename to pkgs/unit/fp/fpc/remove-signature.sh diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/unit/fp/fped/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/fped/default.nix rename to pkgs/unit/fp/fped/pkg-fun.nix diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/unit/fp/fping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/fping/default.nix rename to pkgs/unit/fp/fping/pkg-fun.nix diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/unit/fp/fplll/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fplll/default.nix rename to pkgs/unit/fp/fplll/pkg-fun.nix diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/unit/fp/fplll_20160331/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fplll/20160331.nix rename to pkgs/unit/fp/fplll_20160331/pkg-fun.nix diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/unit/fp/fpm/Gemfile similarity index 100% rename from pkgs/tools/package-management/fpm/Gemfile rename to pkgs/unit/fp/fpm/Gemfile diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/unit/fp/fpm/Gemfile.lock similarity index 100% rename from pkgs/tools/package-management/fpm/Gemfile.lock rename to pkgs/unit/fp/fpm/Gemfile.lock diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/unit/fp/fpm/gemset.nix similarity index 100% rename from pkgs/tools/package-management/fpm/gemset.nix rename to pkgs/unit/fp/fpm/gemset.nix diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/unit/fp/fpm/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/fpm/default.nix rename to pkgs/unit/fp/fpm/pkg-fun.nix diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/unit/fp/fpm2/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fpm2/default.nix rename to pkgs/unit/fp/fpm2/pkg-fun.nix diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/unit/fp/fpp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fpp/default.nix rename to pkgs/unit/fp/fpp/pkg-fun.nix diff --git a/pkgs/development/tools/fprettify/default.nix b/pkgs/unit/fp/fprettify/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fprettify/default.nix rename to pkgs/unit/fp/fprettify/pkg-fun.nix diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/unit/fp/fprintd-tod/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fprintd/tod.nix rename to pkgs/unit/fp/fprintd-tod/pkg-fun.nix diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/unit/fp/fprintd/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fprintd/default.nix rename to pkgs/unit/fp/fprintd/pkg-fun.nix diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/unit/fq/fq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fq/default.nix rename to pkgs/unit/fq/fq/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/unit/fr/fragments/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/fragments/default.nix rename to pkgs/unit/fr/fragments/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/unit/fr/framac/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/frama-c/default.nix rename to pkgs/unit/fr/framac/pkg-fun.nix diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/unit/fr/frame/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/frame/default.nix rename to pkgs/unit/fr/frame/pkg-fun.nix diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/unit/fr/framesh/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/framesh/default.nix rename to pkgs/unit/fr/framesh/pkg-fun.nix diff --git a/pkgs/tools/text/frangipanni/default.nix b/pkgs/unit/fr/frangipanni/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/frangipanni/default.nix rename to pkgs/unit/fr/frangipanni/pkg-fun.nix diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/unit/fr/fraunces/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/fraunces/default.nix rename to pkgs/unit/fr/fraunces/pkg-fun.nix diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/unit/fr/frawk/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/frawk/default.nix rename to pkgs/unit/fr/frawk/pkg-fun.nix diff --git a/pkgs/applications/audio/freac/default.nix b/pkgs/unit/fr/freac/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/freac/default.nix rename to pkgs/unit/fr/freac/pkg-fun.nix diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/unit/fr/frece/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/frece/default.nix rename to pkgs/unit/fr/frece/pkg-fun.nix diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/unit/fr/free42/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/free42/default.nix rename to pkgs/unit/fr/free42/pkg-fun.nix diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/unit/fr/freealut/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/freealut/default.nix rename to pkgs/unit/fr/freealut/pkg-fun.nix diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/unit/fr/freebayes/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/freebayes/default.nix rename to pkgs/unit/fr/freebayes/pkg-fun.nix diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/unit/fr/freebind/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/freebind/default.nix rename to pkgs/unit/fr/freebind/pkg-fun.nix diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/unit/fr/freecell-solver/pkg-fun.nix similarity index 100% rename from pkgs/games/freecell-solver/default.nix rename to pkgs/unit/fr/freecell-solver/pkg-fun.nix diff --git a/pkgs/games/freedink/default.nix b/pkgs/unit/fr/freedink/pkg-fun.nix similarity index 100% rename from pkgs/games/freedink/default.nix rename to pkgs/unit/fr/freedink/pkg-fun.nix diff --git a/pkgs/games/freedroid/default.nix b/pkgs/unit/fr/freedroid/pkg-fun.nix similarity index 100% rename from pkgs/games/freedroid/default.nix rename to pkgs/unit/fr/freedroid/pkg-fun.nix diff --git a/pkgs/games/freedroidrpg/drop-build-deps.patch b/pkgs/unit/fr/freedroidrpg/drop-build-deps.patch similarity index 100% rename from pkgs/games/freedroidrpg/drop-build-deps.patch rename to pkgs/unit/fr/freedroidrpg/drop-build-deps.patch diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/unit/fr/freedroidrpg/pkg-fun.nix similarity index 100% rename from pkgs/games/freedroidrpg/default.nix rename to pkgs/unit/fr/freedroidrpg/pkg-fun.nix diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/unit/fr/freefilesync/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/freefilesync/default.nix rename to pkgs/unit/fr/freefilesync/pkg-fun.nix diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/unit/fr/freefont_ttf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/freefont-ttf/default.nix rename to pkgs/unit/fr/freefont_ttf/pkg-fun.nix diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/unit/fr/freeglut/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/freeglut/default.nix rename to pkgs/unit/fr/freeglut/pkg-fun.nix diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/unit/fr/freeipmi/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/freeipmi/default.nix rename to pkgs/unit/fr/freeipmi/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/unit/fr/freenet/freenetWrapper similarity index 100% rename from pkgs/applications/networking/p2p/freenet/freenetWrapper rename to pkgs/unit/fr/freenet/freenetWrapper diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/unit/fr/freenet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/freenet/default.nix rename to pkgs/unit/fr/freenet/pkg-fun.nix diff --git a/pkgs/games/freenukum/default.nix b/pkgs/unit/fr/freenukum/pkg-fun.nix similarity index 100% rename from pkgs/games/freenukum/default.nix rename to pkgs/unit/fr/freenukum/pkg-fun.nix diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/unit/fr/freeorion/fix-paths.sh similarity index 100% rename from pkgs/games/freeorion/fix-paths.sh rename to pkgs/unit/fr/freeorion/fix-paths.sh diff --git a/pkgs/games/freeorion/fix-paths.xslt b/pkgs/unit/fr/freeorion/fix-paths.xslt similarity index 100% rename from pkgs/games/freeorion/fix-paths.xslt rename to pkgs/unit/fr/freeorion/fix-paths.xslt diff --git a/pkgs/games/freeorion/default.nix b/pkgs/unit/fr/freeorion/pkg-fun.nix similarity index 100% rename from pkgs/games/freeorion/default.nix rename to pkgs/unit/fr/freeorion/pkg-fun.nix diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/unit/fr/freepats/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/freepats/default.nix rename to pkgs/unit/fr/freepats/pkg-fun.nix diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/unit/fr/freeplane/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/freeplane/default.nix rename to pkgs/unit/fr/freeplane/pkg-fun.nix diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/unit/fr/freepv/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/freepv/default.nix rename to pkgs/unit/fr/freepv/pkg-fun.nix diff --git a/pkgs/games/freesweep/default.nix b/pkgs/unit/fr/freesweep/pkg-fun.nix similarity index 100% rename from pkgs/games/freesweep/default.nix rename to pkgs/unit/fr/freesweep/pkg-fun.nix diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/unit/fr/freetds/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/freetds/default.nix rename to pkgs/unit/fr/freetds/pkg-fun.nix diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/unit/fr/freetube/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/freetube/default.nix rename to pkgs/unit/fr/freetube/pkg-fun.nix diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/unit/fr/freetype/enable-subpixel-rendering.patch similarity index 100% rename from pkgs/development/libraries/freetype/enable-subpixel-rendering.patch rename to pkgs/unit/fr/freetype/enable-subpixel-rendering.patch diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/unit/fr/freetype/enable-table-validation.patch similarity index 100% rename from pkgs/development/libraries/freetype/enable-table-validation.patch rename to pkgs/unit/fr/freetype/enable-table-validation.patch diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/unit/fr/freetype/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/freetype/default.nix rename to pkgs/unit/fr/freetype/pkg-fun.nix diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/unit/fr/freewheeling/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/freewheeling/default.nix rename to pkgs/unit/fr/freewheeling/pkg-fun.nix diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/unit/fr/freexl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/freexl/default.nix rename to pkgs/unit/fr/freexl/pkg-fun.nix diff --git a/pkgs/tools/security/freeze/default.nix b/pkgs/unit/fr/freeze/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/freeze/default.nix rename to pkgs/unit/fr/freeze/pkg-fun.nix diff --git a/pkgs/tools/misc/frei/default.nix b/pkgs/unit/fr/frei/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/frei/default.nix rename to pkgs/unit/fr/frei/pkg-fun.nix diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/unit/fr/frei0r/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/frei0r/default.nix rename to pkgs/unit/fr/frei0r/pkg-fun.nix diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/unit/fr/freshrss/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/freshrss/default.nix rename to pkgs/unit/fr/freshrss/pkg-fun.nix diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/unit/fr/fribidi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fribidi/default.nix rename to pkgs/unit/fr/fribidi/pkg-fun.nix diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/unit/fr/fricas/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/fricas/default.nix rename to pkgs/unit/fr/fricas/pkg-fun.nix diff --git a/pkgs/games/frogatto/data.nix b/pkgs/unit/fr/frogatto/data.nix similarity index 100% rename from pkgs/games/frogatto/data.nix rename to pkgs/unit/fr/frogatto/data.nix diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/unit/fr/frogatto/engine.nix similarity index 100% rename from pkgs/games/frogatto/engine.nix rename to pkgs/unit/fr/frogatto/engine.nix diff --git a/pkgs/games/frogatto/default.nix b/pkgs/unit/fr/frogatto/pkg-fun.nix similarity index 100% rename from pkgs/games/frogatto/default.nix rename to pkgs/unit/fr/frogatto/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/unit/fr/frostwire-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix rename to pkgs/unit/fr/frostwire-bin/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/unit/fr/frostwire/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/frostwire/default.nix rename to pkgs/unit/fr/frostwire/pkg-fun.nix diff --git a/pkgs/games/frotz/default.nix b/pkgs/unit/fr/frotz/pkg-fun.nix similarity index 100% rename from pkgs/games/frotz/default.nix rename to pkgs/unit/fr/frotz/pkg-fun.nix diff --git a/pkgs/games/frozen-bubble/fix-compilation.patch b/pkgs/unit/fr/frozen-bubble/fix-compilation.patch similarity index 100% rename from pkgs/games/frozen-bubble/fix-compilation.patch rename to pkgs/unit/fr/frozen-bubble/fix-compilation.patch diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/unit/fr/frozen-bubble/pkg-fun.nix similarity index 100% rename from pkgs/games/frozen-bubble/default.nix rename to pkgs/unit/fr/frozen-bubble/pkg-fun.nix diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/unit/fr/frp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/frp/default.nix rename to pkgs/unit/fr/frp/pkg-fun.nix diff --git a/pkgs/servers/frr/default.nix b/pkgs/unit/fr/frr/pkg-fun.nix similarity index 100% rename from pkgs/servers/frr/default.nix rename to pkgs/unit/fr/frr/pkg-fun.nix diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/unit/fr/frugal/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/frugal/default.nix rename to pkgs/unit/fr/frugal/pkg-fun.nix diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/unit/fs/fsarchiver/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/fsarchiver/default.nix rename to pkgs/unit/fs/fsarchiver/pkg-fun.nix diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/unit/fs/fsatrace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/fsatrace/default.nix rename to pkgs/unit/fs/fsatrace/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/unit/fs/fscrypt-experimental/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fscrypt/default.nix rename to pkgs/unit/fs/fscrypt-experimental/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/unit/fs/fscryptctl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fscryptctl/default.nix rename to pkgs/unit/fs/fscryptctl/pkg-fun.nix diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/unit/fs/fsearch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fsearch/default.nix rename to pkgs/unit/fs/fsearch/pkg-fun.nix diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/unit/fs/fselect/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fselect/default.nix rename to pkgs/unit/fs/fselect/pkg-fun.nix diff --git a/pkgs/games/fsg/default.nix b/pkgs/unit/fs/fsg/pkg-fun.nix similarity index 100% rename from pkgs/games/fsg/default.nix rename to pkgs/unit/fs/fsg/pkg-fun.nix diff --git a/pkgs/games/fsg/wxgtk-3.2.patch b/pkgs/unit/fs/fsg/wxgtk-3.2.patch similarity index 100% rename from pkgs/games/fsg/wxgtk-3.2.patch rename to pkgs/unit/fs/fsg/wxgtk-3.2.patch diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/unit/fs/fsharp/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/fsharp/default.nix rename to pkgs/unit/fs/fsharp/pkg-fun.nix diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/unit/fs/fsmark/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fsmark/default.nix rename to pkgs/unit/fs/fsmark/pkg-fun.nix diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/unit/fs/fsmon/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fsmon/default.nix rename to pkgs/unit/fs/fsmon/pkg-fun.nix diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/unit/fs/fspy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fspy/default.nix rename to pkgs/unit/fs/fspy/pkg-fun.nix diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/unit/fs/fsql/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fsql/default.nix rename to pkgs/unit/fs/fsql/pkg-fun.nix diff --git a/pkgs/tools/misc/fsrx/default.nix b/pkgs/unit/fs/fsrx/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fsrx/default.nix rename to pkgs/unit/fs/fsrx/pkg-fun.nix diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/unit/fs/fst/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/fst/default.nix rename to pkgs/unit/fs/fst/pkg-fun.nix diff --git a/pkgs/development/libraries/fstrcmp/cross.patch b/pkgs/unit/fs/fstrcmp/cross.patch similarity index 100% rename from pkgs/development/libraries/fstrcmp/cross.patch rename to pkgs/unit/fs/fstrcmp/cross.patch diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/unit/fs/fstrcmp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fstrcmp/default.nix rename to pkgs/unit/fs/fstrcmp/pkg-fun.nix diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/unit/fs/fstrm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/fstrm/default.nix rename to pkgs/unit/fs/fstrm/pkg-fun.nix diff --git a/pkgs/applications/emulators/fs-uae/default.nix b/pkgs/unit/fs/fsuae/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/fs-uae/default.nix rename to pkgs/unit/fs/fsuae/pkg-fun.nix diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/unit/fs/fsv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fsv/default.nix rename to pkgs/unit/fs/fsv/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fsverity-utils/default.nix b/pkgs/unit/fs/fsverity-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fsverity-utils/default.nix rename to pkgs/unit/fs/fsverity-utils/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch b/pkgs/unit/fs/fsverity-utils/remove-dynamic-libs.patch similarity index 100% rename from pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch rename to pkgs/unit/fs/fsverity-utils/remove-dynamic-libs.patch diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/unit/fs/fswebcam/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fswebcam/default.nix rename to pkgs/unit/fs/fswebcam/pkg-fun.nix diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/unit/ft/fte/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/fte/default.nix rename to pkgs/unit/ft/fte/pkg-fun.nix diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/unit/ft/ftgl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ftgl/default.nix rename to pkgs/unit/ft/ftgl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/pkgs/unit/ft/ftop/ftop-fix_buffer_overflow.patch similarity index 100% rename from pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch rename to pkgs/unit/ft/ftop/ftop-fix_buffer_overflow.patch diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/pkgs/unit/ft/ftop/ftop-fix_printf_format.patch similarity index 100% rename from pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch rename to pkgs/unit/ft/ftop/ftop-fix_printf_format.patch diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/unit/ft/ftop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ftop/default.nix rename to pkgs/unit/ft/ftop/pkg-fun.nix diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/unit/ft/ftxui/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ftxui/default.nix rename to pkgs/unit/ft/ftxui/pkg-fun.nix diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/unit/fu/fulcio/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/fulcio/default.nix rename to pkgs/unit/fu/fulcio/pkg-fun.nix diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/unit/fu/funambol/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/funambol/default.nix rename to pkgs/unit/fu/funambol/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/unit/fu/func/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/func/default.nix rename to pkgs/unit/fu/func/pkg-fun.nix diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/unit/fu/fundoc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fundoc/default.nix rename to pkgs/unit/fu/fundoc/pkg-fun.nix diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/unit/fu/funnelweb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/literate-programming/funnelweb/default.nix rename to pkgs/unit/fu/funnelweb/pkg-fun.nix diff --git a/pkgs/applications/misc/furtherance/default.nix b/pkgs/unit/fu/furtherance/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/furtherance/default.nix rename to pkgs/unit/fu/furtherance/pkg-fun.nix diff --git a/pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch b/pkgs/unit/fu/fuse-7z-ng/no-pthread.patch similarity index 100% rename from pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch rename to pkgs/unit/fu/fuse-7z-ng/no-pthread.patch diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/unit/fu/fuse-7z-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/fuse-7z-ng/default.nix rename to pkgs/unit/fu/fuse-7z-ng/pkg-fun.nix diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/unit/fu/fuse-emulator/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/fuse-emulator/default.nix rename to pkgs/unit/fu/fuse-emulator/pkg-fun.nix diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/unit/fu/fuse-overlayfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/fuse-overlayfs/default.nix rename to pkgs/unit/fu/fuse-overlayfs/pkg-fun.nix diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/unit/fu/fusee-interfacee-tk/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fusee-interfacee-tk/default.nix rename to pkgs/unit/fu/fusee-interfacee-tk/pkg-fun.nix diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/unit/fu/fusee-launcher/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fusee-launcher/default.nix rename to pkgs/unit/fu/fusee-launcher/pkg-fun.nix diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/unit/fu/fuseiso/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/fuseiso/default.nix rename to pkgs/unit/fu/fuseiso/pkg-fun.nix diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/unit/fu/fusionInventory/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/fusion-inventory/default.nix rename to pkgs/unit/fu/fusionInventory/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile b/pkgs/unit/fu/fusuma/Gemfile similarity index 100% rename from pkgs/tools/inputmethods/fusuma/Gemfile rename to pkgs/unit/fu/fusuma/Gemfile diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/unit/fu/fusuma/Gemfile.lock similarity index 100% rename from pkgs/tools/inputmethods/fusuma/Gemfile.lock rename to pkgs/unit/fu/fusuma/Gemfile.lock diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/unit/fu/fusuma/gemset.nix similarity index 100% rename from pkgs/tools/inputmethods/fusuma/gemset.nix rename to pkgs/unit/fu/fusuma/gemset.nix diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/unit/fu/fusuma/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/fusuma/default.nix rename to pkgs/unit/fu/fusuma/pkg-fun.nix diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/unit/fu/fuzzel/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/fuzzel/default.nix rename to pkgs/unit/fu/fuzzel/pkg-fun.nix diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/unit/fv/fverb/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/fverb/default.nix rename to pkgs/unit/fv/fverb/pkg-fun.nix diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/unit/fv/fvwm2/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/fvwm/2.6.nix rename to pkgs/unit/fv/fvwm2/pkg-fun.nix diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/unit/fv/fvwm3/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/fvwm/3.nix rename to pkgs/unit/fv/fvwm3/pkg-fun.nix diff --git a/pkgs/tools/filesystems/fwanalyzer/default.nix b/pkgs/unit/fw/fwanalyzer/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/fwanalyzer/default.nix rename to pkgs/unit/fw/fwanalyzer/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/unit/fw/fwts/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fwts/default.nix rename to pkgs/unit/fw/fwts/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/unit/fw/fwupd-efi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd-efi/default.nix rename to pkgs/unit/fw/fwupd-efi/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/unit/fw/fwupd/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch rename to pkgs/unit/fw/fwupd/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/unit/fw/fwupd/efi-app-path.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch rename to pkgs/unit/fw/fwupd/efi-app-path.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/unit/fw/fwupd/install-fwupdplugin-to-out.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch rename to pkgs/unit/fw/fwupd/install-fwupdplugin-to-out.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/unit/fw/fwupd/installed-tests-path.patch similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch rename to pkgs/unit/fw/fwupd/installed-tests-path.patch diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/unit/fw/fwupd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/fwupd/default.nix rename to pkgs/unit/fw/fwupd/pkg-fun.nix diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/unit/fx/fx/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/fx/default.nix rename to pkgs/unit/fx/fx/pkg-fun.nix diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/unit/fx/fx_cast_bridge/node-env.nix similarity index 100% rename from pkgs/applications/networking/n8n/node-env.nix rename to pkgs/unit/fx/fx_cast_bridge/node-env.nix diff --git a/pkgs/tools/misc/fx_cast/node-packages.nix b/pkgs/unit/fx/fx_cast_bridge/node-packages.nix similarity index 100% rename from pkgs/tools/misc/fx_cast/node-packages.nix rename to pkgs/unit/fx/fx_cast_bridge/node-packages.nix diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/unit/fx/fx_cast_bridge/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fx_cast/default.nix rename to pkgs/unit/fx/fx_cast_bridge/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/unit/fx/fxlinuxprint/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/fxlinuxprint/default.nix rename to pkgs/unit/fx/fxlinuxprint/pkg-fun.nix diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch b/pkgs/unit/fx/fxlinuxprintutil/fxlocalechk.tcl.patch similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch rename to pkgs/unit/fx/fxlinuxprintutil/fxlocalechk.tcl.patch diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch b/pkgs/unit/fx/fxlinuxprintutil/fxlputil.patch similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch rename to pkgs/unit/fx/fxlinuxprintutil/fxlputil.patch diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch b/pkgs/unit/fx/fxlinuxprintutil/fxlputil.tcl.patch similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch rename to pkgs/unit/fx/fxlinuxprintutil/fxlputil.tcl.patch diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/unit/fx/fxlinuxprintutil/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fxlinuxprintutil/default.nix rename to pkgs/unit/fx/fxlinuxprintutil/pkg-fun.nix diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/unit/fx/fxload/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/fxload/default.nix rename to pkgs/unit/fx/fxload/pkg-fun.nix diff --git a/pkgs/shells/fzf-git-sh/default.nix b/pkgs/unit/fz/fzf-git-sh/pkg-fun.nix similarity index 100% rename from pkgs/shells/fzf-git-sh/default.nix rename to pkgs/unit/fz/fzf-git-sh/pkg-fun.nix diff --git a/pkgs/shells/bash/fzf-obc/default.nix b/pkgs/unit/fz/fzf-obc/pkg-fun.nix similarity index 100% rename from pkgs/shells/bash/fzf-obc/default.nix rename to pkgs/unit/fz/fzf-obc/pkg-fun.nix diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/unit/fz/fzf-zsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/fzf-zsh/default.nix rename to pkgs/unit/fz/fzf-zsh/pkg-fun.nix diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/unit/fz/fzf/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fzf/default.nix rename to pkgs/unit/fz/fzf/pkg-fun.nix diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/unit/fz/fzy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/fzy/default.nix rename to pkgs/unit/fz/fzy/pkg-fun.nix diff --git a/pkgs/os-specific/linux/g15daemon/pid_location.patch b/pkgs/unit/g1/g15daemon/pid_location.patch similarity index 100% rename from pkgs/os-specific/linux/g15daemon/pid_location.patch rename to pkgs/unit/g1/g15daemon/pid_location.patch diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/unit/g1/g15daemon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/g15daemon/default.nix rename to pkgs/unit/g1/g15daemon/pkg-fun.nix diff --git a/pkgs/tools/misc/g203-led/default.nix b/pkgs/unit/g2/g203-led/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/g203-led/default.nix rename to pkgs/unit/g2/g203-led/pkg-fun.nix diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/unit/g9/g933-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/g933-utils/default.nix rename to pkgs/unit/g9/g933-utils/pkg-fun.nix diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/unit/ga/galario/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/galario/default.nix rename to pkgs/unit/ga/galario/pkg-fun.nix diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/unit/ga/galatia-sil/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/galatia-sil/default.nix rename to pkgs/unit/ga/galatia-sil/pkg-fun.nix diff --git a/pkgs/games/galaxis/default.nix b/pkgs/unit/ga/galaxis/pkg-fun.nix similarity index 100% rename from pkgs/games/galaxis/default.nix rename to pkgs/unit/ga/galaxis/pkg-fun.nix diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/unit/ga/galaxy-buds-client/deps.nix similarity index 100% rename from pkgs/applications/audio/galaxy-buds-client/deps.nix rename to pkgs/unit/ga/galaxy-buds-client/deps.nix diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/unit/ga/galaxy-buds-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/galaxy-buds-client/default.nix rename to pkgs/unit/ga/galaxy-buds-client/pkg-fun.nix diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/unit/ga/galen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/galen/default.nix rename to pkgs/unit/ga/galen/pkg-fun.nix diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/unit/ga/galene/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/galene/default.nix rename to pkgs/unit/ga/galene/pkg-fun.nix diff --git a/pkgs/tools/security/galer/default.nix b/pkgs/unit/ga/galer/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/galer/default.nix rename to pkgs/unit/ga/galer/pkg-fun.nix diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/unit/ga/gallia/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gallia/default.nix rename to pkgs/unit/ga/gallia/pkg-fun.nix diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/unit/ga/gam/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/gam/default.nix rename to pkgs/unit/ga/gam/pkg-fun.nix diff --git a/pkgs/tools/admin/gam/signal_files_as_env_vars.patch b/pkgs/unit/ga/gam/signal_files_as_env_vars.patch similarity index 100% rename from pkgs/tools/admin/gam/signal_files_as_env_vars.patch rename to pkgs/unit/ga/gam/signal_files_as_env_vars.patch diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/unit/ga/gama/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/geometry/gama/default.nix rename to pkgs/unit/ga/gama/pkg-fun.nix diff --git a/pkgs/games/gambatte/fix-scons-paths.patch b/pkgs/unit/ga/gambatte/fix-scons-paths.patch similarity index 100% rename from pkgs/games/gambatte/fix-scons-paths.patch rename to pkgs/unit/ga/gambatte/fix-scons-paths.patch diff --git a/pkgs/games/gambatte/default.nix b/pkgs/unit/ga/gambatte/pkg-fun.nix similarity index 100% rename from pkgs/games/gambatte/default.nix rename to pkgs/unit/ga/gambatte/pkg-fun.nix diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/unit/ga/gambit-support/bootstrap.nix similarity index 100% rename from pkgs/development/compilers/gambit/bootstrap.nix rename to pkgs/unit/ga/gambit-support/bootstrap.nix diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/unit/ga/gambit-support/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gambit/gambit-support.nix rename to pkgs/unit/ga/gambit-support/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/unit/ga/game-music-emu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/game-music-emu/default.nix rename to pkgs/unit/ga/game-music-emu/pkg-fun.nix diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/unit/ga/gamecube-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gamecube-tools/default.nix rename to pkgs/unit/ga/gamecube-tools/pkg-fun.nix diff --git a/pkgs/games/gamehub/default.nix b/pkgs/unit/ga/gamehub/pkg-fun.nix similarity index 100% rename from pkgs/games/gamehub/default.nix rename to pkgs/unit/ga/gamehub/pkg-fun.nix diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/unit/ga/gamenetworkingsockets/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gamenetworkingsockets/default.nix rename to pkgs/unit/ga/gamenetworkingsockets/pkg-fun.nix diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/unit/ga/gamescope/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/gamescope/default.nix rename to pkgs/unit/ga/gamescope/pkg-fun.nix diff --git a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/pkgs/unit/ga/gamescope/use-pkgconfig.patch similarity index 100% rename from pkgs/applications/window-managers/gamescope/use-pkgconfig.patch rename to pkgs/unit/ga/gamescope/use-pkgconfig.patch diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/unit/ga/gamin/abstract-socket-namespace.patch similarity index 100% rename from pkgs/development/libraries/gamin/abstract-socket-namespace.patch rename to pkgs/unit/ga/gamin/abstract-socket-namespace.patch diff --git a/pkgs/development/libraries/gamin/deadlock.patch b/pkgs/unit/ga/gamin/deadlock.patch similarity index 100% rename from pkgs/development/libraries/gamin/deadlock.patch rename to pkgs/unit/ga/gamin/deadlock.patch diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/unit/ga/gamin/debian-patches.nix similarity index 100% rename from pkgs/development/libraries/gamin/debian-patches.nix rename to pkgs/unit/ga/gamin/debian-patches.nix diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/pkgs/unit/ga/gamin/debian-patches.txt similarity index 100% rename from pkgs/development/libraries/gamin/debian-patches.txt rename to pkgs/unit/ga/gamin/debian-patches.txt diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/unit/ga/gamin/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gamin/default.nix rename to pkgs/unit/ga/gamin/pkg-fun.nix diff --git a/pkgs/development/libraries/gamin/returnval.patch b/pkgs/unit/ga/gamin/returnval.patch similarity index 100% rename from pkgs/development/libraries/gamin/returnval.patch rename to pkgs/unit/ga/gamin/returnval.patch diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/unit/ga/gammu/bashcomp-dir.patch similarity index 100% rename from pkgs/applications/misc/gammu/bashcomp-dir.patch rename to pkgs/unit/ga/gammu/bashcomp-dir.patch diff --git a/pkgs/applications/misc/gammu/gammu-config-dialog.patch b/pkgs/unit/ga/gammu/gammu-config-dialog.patch similarity index 100% rename from pkgs/applications/misc/gammu/gammu-config-dialog.patch rename to pkgs/unit/ga/gammu/gammu-config-dialog.patch diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/unit/ga/gammu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gammu/default.nix rename to pkgs/unit/ga/gammu/pkg-fun.nix diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/unit/ga/gammu/systemd.patch similarity index 100% rename from pkgs/applications/misc/gammu/systemd.patch rename to pkgs/unit/ga/gammu/systemd.patch diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/unit/ga/gandom-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gandom-fonts/default.nix rename to pkgs/unit/ga/gandom-fonts/pkg-fun.nix diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/unit/ga/ganttproject-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ganttproject-bin/default.nix rename to pkgs/unit/ga/ganttproject-bin/pkg-fun.nix diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/unit/ga/ganv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ganv/default.nix rename to pkgs/unit/ga/ganv/pkg-fun.nix diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/unit/ga/gap/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/gap/default.nix rename to pkgs/unit/ga/gap/pkg-fun.nix diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/unit/ga/gappa/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/gappa/default.nix rename to pkgs/unit/ga/gappa/pkg-fun.nix diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/unit/ga/garamond-libre/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/garamond-libre/default.nix rename to pkgs/unit/ga/garamond-libre/pkg-fun.nix diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/unit/ga/garble/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/garble/default.nix rename to pkgs/unit/ga/garble/pkg-fun.nix diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/unit/ga/garmin-plugin/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/garmin-plugin/default.nix rename to pkgs/unit/ga/garmin-plugin/pkg-fun.nix diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/unit/ga/garmindev/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/qlandkartegt/garmindev.nix rename to pkgs/unit/ga/garmindev/pkg-fun.nix diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/unit/ga/garmintools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/garmintools/default.nix rename to pkgs/unit/ga/garmintools/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/unit/ga/gatekeeper/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/gatekeeper/default.nix rename to pkgs/unit/ga/gatekeeper/pkg-fun.nix diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/unit/ga/gatk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/gatk/default.nix rename to pkgs/unit/ga/gatk/pkg-fun.nix diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/unit/ga/gatling/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/gatling/default.nix rename to pkgs/unit/ga/gatling/pkg-fun.nix diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/unit/ga/gau/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gau/default.nix rename to pkgs/unit/ga/gau/pkg-fun.nix diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/unit/ga/gauche/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/gauche/default.nix rename to pkgs/unit/ga/gauche/pkg-fun.nix diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/unit/ga/gaucheBootstrap/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/gauche/boot.nix rename to pkgs/unit/ga/gaucheBootstrap/pkg-fun.nix diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/unit/ga/gauge/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gauge/default.nix rename to pkgs/unit/ga/gauge/pkg-fun.nix diff --git a/pkgs/games/gav/gcc.patch b/pkgs/unit/ga/gav/gcc.patch similarity index 100% rename from pkgs/games/gav/gcc.patch rename to pkgs/unit/ga/gav/gcc.patch diff --git a/pkgs/games/gav/default.nix b/pkgs/unit/ga/gav/pkg-fun.nix similarity index 100% rename from pkgs/games/gav/default.nix rename to pkgs/unit/ga/gav/pkg-fun.nix diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/unit/ga/gavrasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gavrasm/default.nix rename to pkgs/unit/ga/gavrasm/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/unit/ga/gaw/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/gaw/default.nix rename to pkgs/unit/ga/gaw/pkg-fun.nix diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/unit/ga/gawkextlib/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gawk/gawkextlib.nix rename to pkgs/unit/ga/gawkextlib/pkg-fun.nix diff --git a/pkgs/tools/text/gawk/setup-hook.sh b/pkgs/unit/ga/gawkextlib/setup-hook.sh similarity index 100% rename from pkgs/tools/text/gawk/setup-hook.sh rename to pkgs/unit/ga/gawkextlib/setup-hook.sh diff --git a/pkgs/tools/misc/gay/default.nix b/pkgs/unit/ga/gay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gay/default.nix rename to pkgs/unit/ga/gay/pkg-fun.nix diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/unit/gb/gb-backup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/gamerbackup/default.nix rename to pkgs/unit/gb/gb-backup/pkg-fun.nix diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/unit/gb/gbenchmark/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gbenchmark/default.nix rename to pkgs/unit/gb/gbenchmark/pkg-fun.nix diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/unit/gb/gbsplay/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gbsplay/default.nix rename to pkgs/unit/gb/gbsplay/pkg-fun.nix diff --git a/pkgs/development/libraries/gcab/installed-tests-path.patch b/pkgs/unit/gc/gcab/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/gcab/installed-tests-path.patch rename to pkgs/unit/gc/gcab/installed-tests-path.patch diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/unit/gc/gcab/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gcab/default.nix rename to pkgs/unit/gc/gcab/pkg-fun.nix diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/unit/gc/gcal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gcal/default.nix rename to pkgs/unit/gc/gcal/pkg-fun.nix diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/unit/gc/gcalcli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gcalcli/default.nix rename to pkgs/unit/gc/gcalcli/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/unit/gc/gcc-arm-embedded-10/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/10/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-10/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/unit/gc/gcc-arm-embedded-11/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/11/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-11/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/unit/gc/gcc-arm-embedded-12/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/12/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-12/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/unit/gc/gcc-arm-embedded-6/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/6/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-6/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/unit/gc/gcc-arm-embedded-7/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/7/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-7/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/unit/gc/gcc-arm-embedded-8/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/8/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-8/pkg-fun.nix diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/unit/gc/gcc-arm-embedded-9/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcc-arm-embedded/9/default.nix rename to pkgs/unit/gc/gcc-arm-embedded-9/pkg-fun.nix diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/unit/gc/gci/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gci/default.nix rename to pkgs/unit/gc/gci/pkg-fun.nix diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/unit/gc/gcl_2_6_13_pre/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gcl/2.6.13-pre.nix rename to pkgs/unit/gc/gcl_2_6_13_pre/pkg-fun.nix diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/unit/gc/gcolor2/gcolor2-amd64.patch similarity index 100% rename from pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch rename to pkgs/unit/gc/gcolor2/gcolor2-amd64.patch diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/unit/gc/gcolor2/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gcolor2/default.nix rename to pkgs/unit/gc/gcolor2/pkg-fun.nix diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/unit/gc/gcolor3/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gcolor3/default.nix rename to pkgs/unit/gc/gcolor3/pkg-fun.nix diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/unit/gc/gcr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gcr/default.nix rename to pkgs/unit/gc/gcr/pkg-fun.nix diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/unit/gc/gcr_4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gcr/4.nix rename to pkgs/unit/gc/gcr_4/pkg-fun.nix diff --git a/pkgs/games/gcs/default.nix b/pkgs/unit/gc/gcs/pkg-fun.nix similarity index 100% rename from pkgs/games/gcs/default.nix rename to pkgs/unit/gc/gcs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/unit/gc/gcsfuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/gcsfuse/default.nix rename to pkgs/unit/gc/gcsfuse/pkg-fun.nix diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/unit/gc/gcstar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gcstar/default.nix rename to pkgs/unit/gc/gcstar/pkg-fun.nix diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/unit/gd/gdal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gdal/default.nix rename to pkgs/unit/gd/gdal/pkg-fun.nix diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/unit/gd/gdbm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gdbm/default.nix rename to pkgs/unit/gd/gdbm/pkg-fun.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/unit/gd/gdk-pixbuf-xlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/xlib.nix rename to pkgs/unit/gd/gdk-pixbuf-xlib/pkg-fun.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/unit/gd/gdk-pixbuf/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch rename to pkgs/unit/gd/gdk-pixbuf/installed-tests-path.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/unit/gd/gdk-pixbuf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/default.nix rename to pkgs/unit/gd/gdk-pixbuf/pkg-fun.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/unit/gd/gdk-pixbuf/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/setup-hook.sh rename to pkgs/unit/gd/gdk-pixbuf/setup-hook.sh diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/unit/gd/gdl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gdl/default.nix rename to pkgs/unit/gd/gdl/pkg-fun.nix diff --git a/pkgs/tools/system/gdmap/get_sensitive.patch b/pkgs/unit/gd/gdmap/get_sensitive.patch similarity index 100% rename from pkgs/tools/system/gdmap/get_sensitive.patch rename to pkgs/unit/gd/gdmap/get_sensitive.patch diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/unit/gd/gdmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gdmap/default.nix rename to pkgs/unit/gd/gdmap/pkg-fun.nix diff --git a/pkgs/tools/system/gdmap/set_flags.patch b/pkgs/unit/gd/gdmap/set_flags.patch similarity index 100% rename from pkgs/tools/system/gdmap/set_flags.patch rename to pkgs/unit/gd/gdmap/set_flags.patch diff --git a/pkgs/development/libraries/gdome2/fno-common.patch b/pkgs/unit/gd/gdome2/fno-common.patch similarity index 100% rename from pkgs/development/libraries/gdome2/fno-common.patch rename to pkgs/unit/gd/gdome2/fno-common.patch diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/unit/gd/gdome2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gdome2/default.nix rename to pkgs/unit/gd/gdome2/pkg-fun.nix diff --git a/pkgs/development/libraries/gdome2/xml-document.patch b/pkgs/unit/gd/gdome2/xml-document.patch similarity index 100% rename from pkgs/development/libraries/gdome2/xml-document.patch rename to pkgs/unit/gd/gdome2/xml-document.patch diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/unit/gd/gdrive/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/gdrive/default.nix rename to pkgs/unit/gd/gdrive/pkg-fun.nix diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/unit/gd/gdu/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gdu/default.nix rename to pkgs/unit/gd/gdu/pkg-fun.nix diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/unit/ge/geany-with-vte/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/geany/with-vte.nix rename to pkgs/unit/ge/geany-with-vte/pkg-fun.nix diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/unit/ge/geany/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/geany/default.nix rename to pkgs/unit/ge/geany/pkg-fun.nix diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/unit/ge/geek-life/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/geek-life/default.nix rename to pkgs/unit/ge/geek-life/pkg-fun.nix diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/unit/ge/geekbench4/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/geekbench/4.nix rename to pkgs/unit/ge/geekbench4/pkg-fun.nix diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/unit/ge/geekbench5/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/geekbench/default.nix rename to pkgs/unit/ge/geekbench5/pkg-fun.nix diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/unit/ge/geeqie/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/geeqie/default.nix rename to pkgs/unit/ge/geeqie/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/unit/ge/gef/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gef/default.nix rename to pkgs/unit/ge/gef/pkg-fun.nix diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/unit/ge/geis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/geis/default.nix rename to pkgs/unit/ge/geis/pkg-fun.nix diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/unit/ge/gelasio/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gelasio/default.nix rename to pkgs/unit/ge/gelasio/pkg-fun.nix diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/unit/ge/gem/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/gem/default.nix rename to pkgs/unit/ge/gem/pkg-fun.nix diff --git a/pkgs/tools/networking/gemget/default.nix b/pkgs/unit/ge/gemget/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gemget/default.nix rename to pkgs/unit/ge/gemget/pkg-fun.nix diff --git a/pkgs/games/gemrb/default.nix b/pkgs/unit/ge/gemrb/pkg-fun.nix similarity index 100% rename from pkgs/games/gemrb/default.nix rename to pkgs/unit/ge/gemrb/pkg-fun.nix diff --git a/pkgs/development/tools/gemstash/Gemfile b/pkgs/unit/ge/gemstash/Gemfile similarity index 100% rename from pkgs/development/tools/gemstash/Gemfile rename to pkgs/unit/ge/gemstash/Gemfile diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/unit/ge/gemstash/Gemfile.lock similarity index 100% rename from pkgs/development/tools/gemstash/Gemfile.lock rename to pkgs/unit/ge/gemstash/Gemfile.lock diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/unit/ge/gemstash/gemset.nix similarity index 100% rename from pkgs/development/tools/gemstash/gemset.nix rename to pkgs/unit/ge/gemstash/gemset.nix diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/unit/ge/gemstash/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gemstash/default.nix rename to pkgs/unit/ge/gemstash/pkg-fun.nix diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/unit/ge/gen-oath-safe/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gen-oath-safe/default.nix rename to pkgs/unit/ge/gen-oath-safe/pkg-fun.nix diff --git a/pkgs/tools/networking/gen6dns/default.nix b/pkgs/unit/ge/gen6dns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gen6dns/default.nix rename to pkgs/unit/ge/gen6dns/pkg-fun.nix diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/unit/ge/genact/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/genact/default.nix rename to pkgs/unit/ge/genact/pkg-fun.nix diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/unit/ge/genann/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/genann/default.nix rename to pkgs/unit/ge/genann/pkg-fun.nix diff --git a/pkgs/tools/security/gencfsm/makefile-mkdir.patch b/pkgs/unit/ge/gencfsm/makefile-mkdir.patch similarity index 100% rename from pkgs/tools/security/gencfsm/makefile-mkdir.patch rename to pkgs/unit/ge/gencfsm/makefile-mkdir.patch diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/unit/ge/gencfsm/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gencfsm/default.nix rename to pkgs/unit/ge/gencfsm/pkg-fun.nix diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/unit/ge/genericUpdater/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/generic-updater.nix rename to pkgs/unit/ge/genericUpdater/pkg-fun.nix diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/unit/ge/genext2fs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/genext2fs/default.nix rename to pkgs/unit/ge/genext2fs/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/unit/ge/gengetopt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gengetopt/default.nix rename to pkgs/unit/ge/gengetopt/pkg-fun.nix diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/unit/ge/genimage/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/genimage/default.nix rename to pkgs/unit/ge/genimage/pkg-fun.nix diff --git a/pkgs/applications/science/biology/genmap/gtest.patch b/pkgs/unit/ge/genmap/gtest.patch similarity index 100% rename from pkgs/applications/science/biology/genmap/gtest.patch rename to pkgs/unit/ge/genmap/gtest.patch diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/unit/ge/genmap/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/genmap/default.nix rename to pkgs/unit/ge/genmap/pkg-fun.nix diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/unit/ge/genromfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/genromfs/default.nix rename to pkgs/unit/ge/genromfs/pkg-fun.nix diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/unit/ge/gensio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gensio/default.nix rename to pkgs/unit/ge/gensio/pkg-fun.nix diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/unit/ge/gentium-book-basic/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gentium-book-basic/default.nix rename to pkgs/unit/ge/gentium-book-basic/pkg-fun.nix diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/unit/ge/gentium/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gentium/default.nix rename to pkgs/unit/ge/gentium/pkg-fun.nix diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/unit/ge/genxword/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/genxword/default.nix rename to pkgs/unit/ge/genxword/pkg-fun.nix diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/unit/ge/genymotion/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/genymotion/default.nix rename to pkgs/unit/ge/genymotion/pkg-fun.nix diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/unit/ge/geoclue2/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch rename to pkgs/unit/ge/geoclue2/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/unit/ge/geoclue2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/geoclue/default.nix rename to pkgs/unit/ge/geoclue2/pkg-fun.nix diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/unit/ge/geocode-glib/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/geocode-glib/installed-tests-path.patch rename to pkgs/unit/ge/geocode-glib/installed-tests-path.patch diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/unit/ge/geocode-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/geocode-glib/default.nix rename to pkgs/unit/ge/geocode-glib/pkg-fun.nix diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/unit/ge/geogebra/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/geogebra/default.nix rename to pkgs/unit/ge/geogebra/pkg-fun.nix diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/unit/ge/geographiclib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/geographiclib/default.nix rename to pkgs/unit/ge/geographiclib/pkg-fun.nix diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/unit/ge/geoipjava/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/geoipjava/default.nix rename to pkgs/unit/ge/geoipjava/pkg-fun.nix diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/unit/ge/geoipupdate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/geoipupdate/default.nix rename to pkgs/unit/ge/geoipupdate/pkg-fun.nix diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/unit/ge/geolite-legacy/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/geolite-legacy/default.nix rename to pkgs/unit/ge/geolite-legacy/pkg-fun.nix diff --git a/pkgs/applications/networking/gopher/geomyidae/modification-time.patch b/pkgs/unit/ge/geomyidae/modification-time.patch similarity index 100% rename from pkgs/applications/networking/gopher/geomyidae/modification-time.patch rename to pkgs/unit/ge/geomyidae/modification-time.patch diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/unit/ge/geomyidae/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/gopher/geomyidae/default.nix rename to pkgs/unit/ge/geomyidae/pkg-fun.nix diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/unit/ge/geonkick/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/geonkick/default.nix rename to pkgs/unit/ge/geonkick/pkg-fun.nix diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/unit/ge/geos/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/geos/default.nix rename to pkgs/unit/ge/geos/pkg-fun.nix diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/unit/ge/geos39/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/geos/3.9.nix rename to pkgs/unit/ge/geos39/pkg-fun.nix diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/unit/ge/geoserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/geoserver/default.nix rename to pkgs/unit/ge/geoserver/pkg-fun.nix diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/unit/ge/gephi/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/gephi/default.nix rename to pkgs/unit/ge/gephi/pkg-fun.nix diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/unit/ge/gerbera/pkg-fun.nix similarity index 100% rename from pkgs/servers/gerbera/default.nix rename to pkgs/unit/ge/gerbera/pkg-fun.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/unit/ge/gerbil-support/gerbil-crypto.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-crypto.nix rename to pkgs/unit/ge/gerbil-support/gerbil-crypto.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/unit/ge/gerbil-support/gerbil-ethereum.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-ethereum.nix rename to pkgs/unit/ge/gerbil-support/gerbil-ethereum.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/pkgs/unit/ge/gerbil-support/gerbil-libp2p.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-libp2p.nix rename to pkgs/unit/ge/gerbil-support/gerbil-libp2p.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/unit/ge/gerbil-support/gerbil-persist.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-persist.nix rename to pkgs/unit/ge/gerbil-support/gerbil-persist.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/unit/ge/gerbil-support/gerbil-poo.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-poo.nix rename to pkgs/unit/ge/gerbil-support/gerbil-poo.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/unit/ge/gerbil-support/gerbil-utils.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-utils.nix rename to pkgs/unit/ge/gerbil-support/gerbil-utils.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/unit/ge/gerbil-support/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gerbil/gerbil-support.nix rename to pkgs/unit/ge/gerbil-support/pkg-fun.nix diff --git a/pkgs/development/compilers/gerbil/smug-gerbil.nix b/pkgs/unit/ge/gerbil-support/smug-gerbil.nix similarity index 100% rename from pkgs/development/compilers/gerbil/smug-gerbil.nix rename to pkgs/unit/ge/gerbil-support/smug-gerbil.nix diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/unit/ge/gerbv/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/gerbv/default.nix rename to pkgs/unit/ge/gerbv/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/unit/ge/germinal/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/germinal/default.nix rename to pkgs/unit/ge/germinal/pkg-fun.nix diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/unit/ge/gerrit/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gerrit/default.nix rename to pkgs/unit/ge/gerrit/pkg-fun.nix diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/unit/ge/get_iplayer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/get_iplayer/default.nix rename to pkgs/unit/ge/get_iplayer/pkg-fun.nix diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/unit/ge/getdata/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/getdata/default.nix rename to pkgs/unit/ge/getdata/pkg-fun.nix diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/unit/ge/geteltorito/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/geteltorito/default.nix rename to pkgs/unit/ge/geteltorito/pkg-fun.nix diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/unit/ge/getmail6/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/getmail6/default.nix rename to pkgs/unit/ge/getmail6/pkg-fun.nix diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/unit/ge/getopt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/getopt/default.nix rename to pkgs/unit/ge/getopt/pkg-fun.nix diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/unit/ge/getoptions/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/getoptions/default.nix rename to pkgs/unit/ge/getoptions/pkg-fun.nix diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/unit/ge/getxbook/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/getxbook/default.nix rename to pkgs/unit/ge/getxbook/pkg-fun.nix diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/unit/ge/gex/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gex/default.nix rename to pkgs/unit/ge/gex/pkg-fun.nix diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/unit/ge/gexiv2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gexiv2/default.nix rename to pkgs/unit/ge/gexiv2/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/pkgs/unit/gf/gf/build-use-optional-freetype-with-pkg-config.patch similarity index 100% rename from pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch rename to pkgs/unit/gf/gf/build-use-optional-freetype-with-pkg-config.patch diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/unit/gf/gf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gf/default.nix rename to pkgs/unit/gf/gf/pkg-fun.nix diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/unit/gf/gf2x/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gf2x/default.nix rename to pkgs/unit/gf/gf2x/pkg-fun.nix diff --git a/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch b/pkgs/unit/gf/gfan/gfan-0.6.2-cddlib-prefix.patch similarity index 100% rename from pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch rename to pkgs/unit/gf/gfan/gfan-0.6.2-cddlib-prefix.patch diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/unit/gf/gfan/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/gfan/default.nix rename to pkgs/unit/gf/gfan/pkg-fun.nix diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/unit/gf/gfbgraph/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gfbgraph/default.nix rename to pkgs/unit/gf/gfbgraph/pkg-fun.nix diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/unit/gf/gflags/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gflags/default.nix rename to pkgs/unit/gf/gflags/pkg-fun.nix diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/unit/gf/gforth/boot-forth.nix similarity index 100% rename from pkgs/development/compilers/gforth/boot-forth.nix rename to pkgs/unit/gf/gforth/boot-forth.nix diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/unit/gf/gforth/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gforth/default.nix rename to pkgs/unit/gf/gforth/pkg-fun.nix diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/unit/gf/gforth/swig.nix similarity index 100% rename from pkgs/development/compilers/gforth/swig.nix rename to pkgs/unit/gf/gforth/swig.nix diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/unit/gf/gfs2-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/gfs2-utils/default.nix rename to pkgs/unit/gf/gfs2-utils/pkg-fun.nix diff --git a/pkgs/tools/security/gfshare/default.nix b/pkgs/unit/gf/gfshare/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gfshare/default.nix rename to pkgs/unit/gf/gfshare/pkg-fun.nix diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/unit/gf/gfxreconstruct/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/gfxreconstruct/default.nix rename to pkgs/unit/gf/gfxreconstruct/pkg-fun.nix diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/unit/gf/gfxtablet/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/gfxtablet/default.nix rename to pkgs/unit/gf/gfxtablet/pkg-fun.nix diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/unit/gg/gg-scm/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gg/default.nix rename to pkgs/unit/gg/gg-scm/pkg-fun.nix diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/unit/gg/ggobi/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/ggobi/default.nix rename to pkgs/unit/gg/ggobi/pkg-fun.nix diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/unit/gg/ggz_base_libs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ggz_base_libs/default.nix rename to pkgs/unit/gg/ggz_base_libs/pkg-fun.nix diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/unit/gh/gh-dash/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gh-dash/default.nix rename to pkgs/unit/gh/gh-dash/pkg-fun.nix diff --git a/pkgs/tools/misc/gh-eco/default.nix b/pkgs/unit/gh/gh-eco/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gh-eco/default.nix rename to pkgs/unit/gh/gh-eco/pkg-fun.nix diff --git a/pkgs/tools/misc/gh-markdown-preview/default.nix b/pkgs/unit/gh/gh-markdown-preview/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gh-markdown-preview/default.nix rename to pkgs/unit/gh/gh-markdown-preview/pkg-fun.nix diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/unit/gh/gh-ost/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gh-ost/default.nix rename to pkgs/unit/gh/gh-ost/pkg-fun.nix diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/unit/gh/gh/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gh/default.nix rename to pkgs/unit/gh/gh/pkg-fun.nix diff --git a/pkgs/tools/backup/gh2md/default.nix b/pkgs/unit/gh/gh2md/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/gh2md/default.nix rename to pkgs/unit/gh/gh2md/pkg-fun.nix diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/unit/gh/ghc_filesystem/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ghc_filesystem/default.nix rename to pkgs/unit/gh/ghc_filesystem/pkg-fun.nix diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/unit/gh/ghdorker/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ghdorker/default.nix rename to pkgs/unit/gh/ghdorker/pkg-fun.nix diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/unit/gh/ghidra-bin/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ghidra/default.nix rename to pkgs/unit/gh/ghidra-bin/pkg-fun.nix diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/unit/gh/ghidra/0001-Use-protobuf-gradle-plugin.patch similarity index 100% rename from pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch rename to pkgs/unit/gh/ghidra/0001-Use-protobuf-gradle-plugin.patch diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/unit/gh/ghidra/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ghidra/build.nix rename to pkgs/unit/gh/ghidra/pkg-fun.nix diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/unit/gh/ghorg/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/ghorg/default.nix rename to pkgs/unit/gh/ghorg/pkg-fun.nix diff --git a/pkgs/tools/security/ghost/default.nix b/pkgs/unit/gh/ghost/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ghost/default.nix rename to pkgs/unit/gh/ghost/pkg-fun.nix diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/unit/gh/ghostie/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ghostie/default.nix rename to pkgs/unit/gh/ghostie/pkg-fun.nix diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/pkgs/unit/gh/ghostscript/doc-no-ref.diff similarity index 100% rename from pkgs/misc/ghostscript/doc-no-ref.diff rename to pkgs/unit/gh/ghostscript/doc-no-ref.diff diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/unit/gh/ghostscript/pkg-fun.nix similarity index 100% rename from pkgs/misc/ghostscript/default.nix rename to pkgs/unit/gh/ghostscript/pkg-fun.nix diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/unit/gh/ghostscript/test-corpus-render.nix similarity index 100% rename from pkgs/misc/ghostscript/test-corpus-render.nix rename to pkgs/unit/gh/ghostscript/test-corpus-render.nix diff --git a/pkgs/misc/ghostscript/urw-font-files.patch b/pkgs/unit/gh/ghostscript/urw-font-files.patch similarity index 100% rename from pkgs/misc/ghostscript/urw-font-files.patch rename to pkgs/unit/gh/ghostscript/urw-font-files.patch diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/unit/gh/ghostunnel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ghostunnel/default.nix rename to pkgs/unit/gh/ghostunnel/pkg-fun.nix diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/unit/gh/ghq/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/ghq/default.nix rename to pkgs/unit/gh/ghq/pkg-fun.nix diff --git a/pkgs/applications/version-management/ghr/default.nix b/pkgs/unit/gh/ghr/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/ghr/default.nix rename to pkgs/unit/gh/ghr/pkg-fun.nix diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/unit/gh/ghz/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ghz/default.nix rename to pkgs/unit/gh/ghz/pkg-fun.nix diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/unit/gi/gImageReader/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gImageReader/default.nix rename to pkgs/unit/gi/gImageReader/pkg-fun.nix diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/unit/gi/gi-docgen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/documentation/gi-docgen/default.nix rename to pkgs/unit/gi/gi-docgen/pkg-fun.nix diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/unit/gi/giac/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/giac/default.nix rename to pkgs/unit/gi/giac/pkg-fun.nix diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/unit/gi/giada/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/giada/default.nix rename to pkgs/unit/gi/giada/pkg-fun.nix diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/unit/gi/giara/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/giara/default.nix rename to pkgs/unit/gi/giara/pkg-fun.nix diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/unit/gi/gibo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gibo/default.nix rename to pkgs/unit/gi/gibo/pkg-fun.nix diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/unit/gi/gif-for-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gif-for-cli/default.nix rename to pkgs/unit/gi/gif-for-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/unit/gi/giflib/4.1.nix similarity index 100% rename from pkgs/development/libraries/giflib/4.1.nix rename to pkgs/unit/gi/giflib/4.1.nix diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/unit/gi/giflib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/giflib/default.nix rename to pkgs/unit/gi/giflib/pkg-fun.nix diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/unit/gi/gifsicle/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/gifsicle/default.nix rename to pkgs/unit/gi/gifsicle/pkg-fun.nix diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/unit/gi/gifski/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/gifski/default.nix rename to pkgs/unit/gi/gifski/pkg-fun.nix diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/unit/gi/gifticlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/biology/gifticlib/default.nix rename to pkgs/unit/gi/gifticlib/pkg-fun.nix diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/unit/gi/gigalixir/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gigalixir/default.nix rename to pkgs/unit/gi/gigalixir/pkg-fun.nix diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/unit/gi/gigedit/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gigedit/default.nix rename to pkgs/unit/gi/gigedit/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/pkgs/unit/gi/gildas/aarch64.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/aarch64.patch rename to pkgs/unit/gi/gildas/aarch64.patch diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/unit/gi/gildas/clang.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/clang.patch rename to pkgs/unit/gi/gildas/clang.patch diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/unit/gi/gildas/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/gildas/default.nix rename to pkgs/unit/gi/gildas/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/unit/gi/gildas/python-ldflags.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/python-ldflags.patch rename to pkgs/unit/gi/gildas/python-ldflags.patch diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/unit/gi/gildas/wrapper.patch similarity index 100% rename from pkgs/applications/science/astronomy/gildas/wrapper.patch rename to pkgs/unit/gi/gildas/wrapper.patch diff --git a/pkgs/games/gimx/conf.patch b/pkgs/unit/gi/gimx/conf.patch similarity index 100% rename from pkgs/games/gimx/conf.patch rename to pkgs/unit/gi/gimx/conf.patch diff --git a/pkgs/games/gimx/custom/Dualshock4.xml b/pkgs/unit/gi/gimx/custom/Dualshock4.xml similarity index 100% rename from pkgs/games/gimx/custom/Dualshock4.xml rename to pkgs/unit/gi/gimx/custom/Dualshock4.xml diff --git a/pkgs/games/gimx/default.nix b/pkgs/unit/gi/gimx/pkg-fun.nix similarity index 100% rename from pkgs/games/gimx/default.nix rename to pkgs/unit/gi/gimx/pkg-fun.nix diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/unit/gi/ginac/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/ginac/default.nix rename to pkgs/unit/gi/ginac/pkg-fun.nix diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/unit/gi/ginkgo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ginkgo/default.nix rename to pkgs/unit/gi/ginkgo/pkg-fun.nix diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/unit/gi/gio-sharp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gio-sharp/default.nix rename to pkgs/unit/gi/gio-sharp/pkg-fun.nix diff --git a/pkgs/applications/video/giph/default.nix b/pkgs/unit/gi/giph/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/giph/default.nix rename to pkgs/unit/gi/giph/pkg-fun.nix diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/unit/gi/gir-rs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gir/default.nix rename to pkgs/unit/gi/gir-rs/pkg-fun.nix diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/unit/gi/gist/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gist/default.nix rename to pkgs/unit/gi/gist/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/unit/gi/git-aggregator/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-aggregator/default.nix rename to pkgs/unit/gi/git-aggregator/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-annex-remote-rclone/default.nix b/pkgs/unit/gi/git-annex-remote-rclone/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-annex-remote-rclone/default.nix rename to pkgs/unit/gi/git-annex-remote-rclone/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-annex-utils/default.nix b/pkgs/unit/gi/git-annex-utils/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-annex-utils/default.nix rename to pkgs/unit/gi/git-annex-utils/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-appraise/default.nix b/pkgs/unit/gi/git-appraise/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-appraise/default.nix rename to pkgs/unit/gi/git-appraise/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-big-picture/default.nix b/pkgs/unit/gi/git-big-picture/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-big-picture/default.nix rename to pkgs/unit/gi/git-big-picture/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/unit/gi/git-bug-migration/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-bug-migration/default.nix rename to pkgs/unit/gi/git-bug-migration/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/unit/gi/git-bug/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-bug/default.nix rename to pkgs/unit/gi/git-bug/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-chglog/default.nix b/pkgs/unit/gi/git-chglog/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-chglog/default.nix rename to pkgs/unit/gi/git-chglog/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-codeowners/default.nix b/pkgs/unit/gi/git-codeowners/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-codeowners/default.nix rename to pkgs/unit/gi/git-codeowners/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/unit/gi/git-codereview/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-codereview/default.nix rename to pkgs/unit/gi/git-codereview/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/unit/gi/git-cola/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-cola/default.nix rename to pkgs/unit/gi/git-cola/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/unit/gi/git-crecord/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-crecord/default.nix rename to pkgs/unit/gi/git-crecord/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-credential-1password/default.nix b/pkgs/unit/gi/git-credential-1password/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-credential-1password/default.nix rename to pkgs/unit/gi/git-credential-1password/pkg-fun.nix diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/unit/gi/git-credential-gopass/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gopass/git-credential.nix rename to pkgs/unit/gi/git-credential-gopass/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-crypt/default.nix b/pkgs/unit/gi/git-crypt/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-crypt/default.nix rename to pkgs/unit/gi/git-crypt/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/unit/gi/git-delete-merged-branches/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-delete-merged-branches/default.nix rename to pkgs/unit/gi/git-delete-merged-branches/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/unit/gi/git-extras/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-extras/default.nix rename to pkgs/unit/gi/git-extras/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-fame/Gemfile b/pkgs/unit/gi/git-fame/Gemfile similarity index 100% rename from pkgs/applications/version-management/git-fame/Gemfile rename to pkgs/unit/gi/git-fame/Gemfile diff --git a/pkgs/applications/version-management/git-fame/Gemfile.lock b/pkgs/unit/gi/git-fame/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/git-fame/Gemfile.lock rename to pkgs/unit/gi/git-fame/Gemfile.lock diff --git a/pkgs/applications/version-management/git-fame/gemset.nix b/pkgs/unit/gi/git-fame/gemset.nix similarity index 100% rename from pkgs/applications/version-management/git-fame/gemset.nix rename to pkgs/unit/gi/git-fame/gemset.nix diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/unit/gi/git-fame/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-fame/default.nix rename to pkgs/unit/gi/git-fame/pkg-fun.nix diff --git a/pkgs/applications/version-management/fast-export/default.nix b/pkgs/unit/gi/git-fast-export/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/fast-export/default.nix rename to pkgs/unit/gi/git-fast-export/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-fire/default.nix b/pkgs/unit/gi/git-fire/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-fire/default.nix rename to pkgs/unit/gi/git-fire/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-ftp/default.nix b/pkgs/unit/gi/git-ftp/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-ftp/default.nix rename to pkgs/unit/gi/git-ftp/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/unit/gi/git-hound/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-hound/default.nix rename to pkgs/unit/gi/git-hound/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-hub/default.nix b/pkgs/unit/gi/git-hub/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-hub/default.nix rename to pkgs/unit/gi/git-hub/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/unit/gi/git-ignore/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-ignore/default.nix rename to pkgs/unit/gi/git-ignore/pkg-fun.nix diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/unit/gi/git-latexdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/git-latexdiff/default.nix rename to pkgs/unit/gi/git-latexdiff/pkg-fun.nix diff --git a/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/pkgs/unit/gi/git-latexdiff/version-test.patch similarity index 100% rename from pkgs/tools/typesetting/git-latexdiff/version-test.patch rename to pkgs/unit/gi/git-latexdiff/version-test.patch diff --git a/pkgs/applications/version-management/git-my/default.nix b/pkgs/unit/gi/git-my/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-my/default.nix rename to pkgs/unit/gi/git-my/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/unit/gi/git-nomad/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-nomad/default.nix rename to pkgs/unit/gi/git-nomad/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-octopus/default.nix b/pkgs/unit/gi/git-octopus/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-octopus/default.nix rename to pkgs/unit/gi/git-octopus/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/unit/gi/git-open/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-open/default.nix rename to pkgs/unit/gi/git-open/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-privacy/default.nix b/pkgs/unit/gi/git-privacy/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-privacy/default.nix rename to pkgs/unit/gi/git-privacy/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/unit/gi/git-quick-stats/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-quick-stats/default.nix rename to pkgs/unit/gi/git-quick-stats/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-radar/default.nix b/pkgs/unit/gi/git-radar/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-radar/default.nix rename to pkgs/unit/gi/git-radar/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-remote-gcrypt/default.nix b/pkgs/unit/gi/git-remote-gcrypt/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-remote-gcrypt/default.nix rename to pkgs/unit/gi/git-remote-gcrypt/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-remote-hg/default.nix b/pkgs/unit/gi/git-remote-hg/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-remote-hg/default.nix rename to pkgs/unit/gi/git-remote-hg/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-reparent/default.nix b/pkgs/unit/gi/git-reparent/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-reparent/default.nix rename to pkgs/unit/gi/git-reparent/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/unit/gi/git-repo/import-ssl-module.patch similarity index 100% rename from pkgs/applications/version-management/git-repo/import-ssl-module.patch rename to pkgs/unit/gi/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/unit/gi/git-repo/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-repo/default.nix rename to pkgs/unit/gi/git-repo/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-secret/default.nix b/pkgs/unit/gi/git-secret/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-secret/default.nix rename to pkgs/unit/gi/git-secret/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-secrets/default.nix b/pkgs/unit/gi/git-secrets/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-secrets/default.nix rename to pkgs/unit/gi/git-secrets/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/unit/gi/git-sizer/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-sizer/default.nix rename to pkgs/unit/gi/git-sizer/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-standup/default.nix b/pkgs/unit/gi/git-standup/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-standup/default.nix rename to pkgs/unit/gi/git-standup/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-stree/default.nix b/pkgs/unit/gi/git-stree/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-stree/default.nix rename to pkgs/unit/gi/git-stree/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-subrepo/default.nix b/pkgs/unit/gi/git-subrepo/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-subrepo/default.nix rename to pkgs/unit/gi/git-subrepo/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-subtrac/default.nix b/pkgs/unit/gi/git-subtrac/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-subtrac/default.nix rename to pkgs/unit/gi/git-subtrac/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/unit/gi/git-sync/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-sync/default.nix rename to pkgs/unit/gi/git-sync/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-team/default.nix b/pkgs/unit/gi/git-team/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-team/default.nix rename to pkgs/unit/gi/git-team/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-test/default.nix b/pkgs/unit/gi/git-test/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-test/default.nix rename to pkgs/unit/gi/git-test/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/unit/gi/git-town/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-town/default.nix rename to pkgs/unit/gi/git-town/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-vanity-hash/default.nix b/pkgs/unit/gi/git-vanity-hash/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-vanity-hash/default.nix rename to pkgs/unit/gi/git-vanity-hash/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-vendor/default.nix b/pkgs/unit/gi/git-vendor/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-vendor/default.nix rename to pkgs/unit/gi/git-vendor/pkg-fun.nix diff --git a/pkgs/applications/version-management/git-when-merged/default.nix b/pkgs/unit/gi/git-when-merged/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git-when-merged/default.nix rename to pkgs/unit/gi/git-when-merged/pkg-fun.nix diff --git a/pkgs/development/libraries/git2-cpp/default.nix b/pkgs/unit/gi/git2-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/git2-cpp/default.nix rename to pkgs/unit/gi/git2-cpp/pkg-fun.nix diff --git a/pkgs/applications/version-management/git2cl/default.nix b/pkgs/unit/gi/git2cl/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/git2cl/default.nix rename to pkgs/unit/gi/git2cl/pkg-fun.nix diff --git a/pkgs/common-updater/git-updater.nix b/pkgs/unit/gi/gitUpdater/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/git-updater.nix rename to pkgs/unit/gi/gitUpdater/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/unit/gi/gitaly/Gemfile similarity index 100% rename from pkgs/applications/version-management/gitlab/gitaly/Gemfile rename to pkgs/unit/gi/gitaly/Gemfile diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/unit/gi/gitaly/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock rename to pkgs/unit/gi/gitaly/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/unit/gi/gitaly/gemset.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitaly/gemset.nix rename to pkgs/unit/gi/gitaly/gemset.nix diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/unit/gi/gitaly/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitaly/default.nix rename to pkgs/unit/gi/gitaly/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitbatch/default.nix b/pkgs/unit/gi/gitbatch/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitbatch/default.nix rename to pkgs/unit/gi/gitbatch/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitflow/default.nix b/pkgs/unit/gi/gitflow/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitflow/default.nix rename to pkgs/unit/gi/gitflow/pkg-fun.nix diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/unit/gi/gitfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/gitfs/default.nix rename to pkgs/unit/gi/gitfs/pkg-fun.nix diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/unit/gi/github-backup/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/github-backup/default.nix rename to pkgs/unit/gi/github-backup/pkg-fun.nix diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile b/pkgs/unit/gi/github-changelog-generator/Gemfile similarity index 100% rename from pkgs/development/tools/github-changelog-generator/Gemfile rename to pkgs/unit/gi/github-changelog-generator/Gemfile diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/unit/gi/github-changelog-generator/Gemfile.lock similarity index 100% rename from pkgs/development/tools/github-changelog-generator/Gemfile.lock rename to pkgs/unit/gi/github-changelog-generator/Gemfile.lock diff --git a/pkgs/development/tools/github-changelog-generator/gemset.nix b/pkgs/unit/gi/github-changelog-generator/gemset.nix similarity index 100% rename from pkgs/development/tools/github-changelog-generator/gemset.nix rename to pkgs/unit/gi/github-changelog-generator/gemset.nix diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/unit/gi/github-changelog-generator/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/github-changelog-generator/default.nix rename to pkgs/unit/gi/github-changelog-generator/pkg-fun.nix diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/unit/gi/github-commenter/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/github-commenter/default.nix rename to pkgs/unit/gi/github-commenter/pkg-fun.nix diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/unit/gi/github-release/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/github/github-release/default.nix rename to pkgs/unit/gi/github-release/pkg-fun.nix diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/unit/gi/gitit/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gitit/default.nix rename to pkgs/unit/gi/gitit/pkg-fun.nix diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/unit/gi/gitjacker/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gitjacker/default.nix rename to pkgs/unit/gi/gitjacker/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/unit/gi/gitkraken/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitkraken/default.nix rename to pkgs/unit/gi/gitkraken/pkg-fun.nix diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/unit/gi/gitlab-clippy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/gitlab-clippy/default.nix rename to pkgs/unit/gi/gitlab-clippy/pkg-fun.nix diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/unit/gi/gitlab-pages/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/gitlab-pages/default.nix rename to pkgs/unit/gi/gitlab-pages/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/unit/gi/gitlab-runner/fix-shell-path.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch rename to pkgs/unit/gi/gitlab-runner/fix-shell-path.patch diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/unit/gi/gitlab-runner/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/default.nix rename to pkgs/unit/gi/gitlab-runner/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/pkgs/unit/gi/gitlab-runner/remove-bash-test.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch rename to pkgs/unit/gi/gitlab-runner/remove-bash-test.patch diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/unit/gi/gitlab-shell/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-shell/default.nix rename to pkgs/unit/gi/gitlab-shell/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/unit/gi/gitlab-shell/remove-hardcoded-locations.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch rename to pkgs/unit/gi/gitlab-shell/remove-hardcoded-locations.patch diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile b/pkgs/unit/gi/gitlab-triage/Gemfile similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/Gemfile rename to pkgs/unit/gi/gitlab-triage/Gemfile diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/unit/gi/gitlab-triage/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/Gemfile.lock rename to pkgs/unit/gi/gitlab-triage/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/unit/gi/gitlab-triage/gemset.nix similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/gemset.nix rename to pkgs/unit/gi/gitlab-triage/gemset.nix diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/unit/gi/gitlab-triage/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitlab-triage/default.nix rename to pkgs/unit/gi/gitlab-triage/pkg-fun.nix diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/unit/gi/gitleaks/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gitleaks/default.nix rename to pkgs/unit/gi/gitleaks/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/unit/gi/gitless/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitless/default.nix rename to pkgs/unit/gi/gitless/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitls/default.nix b/pkgs/unit/gi/gitls/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitls/default.nix rename to pkgs/unit/gi/gitls/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/unit/gi/gitmux/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitmux/default.nix rename to pkgs/unit/gi/gitmux/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitnuro/default.nix b/pkgs/unit/gi/gitnuro/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitnuro/default.nix rename to pkgs/unit/gi/gitnuro/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/unit/gi/gitolite/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitolite/default.nix rename to pkgs/unit/gi/gitolite/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/unit/gi/gitprompt-rs/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitprompt-rs/default.nix rename to pkgs/unit/gi/gitprompt-rs/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/unit/gi/gitsign/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitsign/default.nix rename to pkgs/unit/gi/gitsign/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/unit/gi/gitstats/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitstats/default.nix rename to pkgs/unit/gi/gitstats/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/unit/gi/gitstatus/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitstatus/default.nix rename to pkgs/unit/gi/gitstatus/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix b/pkgs/unit/gi/gitstatus/romkatv_libgit2.nix similarity index 100% rename from pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix rename to pkgs/unit/gi/gitstatus/romkatv_libgit2.nix diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/unit/gi/gitter/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/gitter/default.nix rename to pkgs/unit/gi/gitter/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitty/default.nix b/pkgs/unit/gi/gitty/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitty/default.nix rename to pkgs/unit/gi/gitty/pkg-fun.nix diff --git a/pkgs/applications/version-management/gitweb/default.nix b/pkgs/unit/gi/gitweb/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gitweb/default.nix rename to pkgs/unit/gi/gitweb/pkg-fun.nix diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/unit/gi/givaro/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/givaro/default.nix rename to pkgs/unit/gi/givaro/pkg-fun.nix diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/unit/gi/givaro_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/givaro/3.nix rename to pkgs/unit/gi/givaro_3/pkg-fun.nix diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/unit/gi/givaro_3_7/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/givaro/3.7.nix rename to pkgs/unit/gi/givaro_3_7/pkg-fun.nix diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/unit/gi/gixy/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/gixy/default.nix rename to pkgs/unit/gi/gixy/pkg-fun.nix diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/unit/gj/gjay/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gjay/default.nix rename to pkgs/unit/gj/gjay/pkg-fun.nix diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/unit/gj/gjo/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gjo/default.nix rename to pkgs/unit/gj/gjo/pkg-fun.nix diff --git a/pkgs/development/libraries/gjs/fix-paths.patch b/pkgs/unit/gj/gjs/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/gjs/fix-paths.patch rename to pkgs/unit/gj/gjs/fix-paths.patch diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/unit/gj/gjs/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/gjs/installed-tests-path.patch rename to pkgs/unit/gj/gjs/installed-tests-path.patch diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/unit/gj/gjs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gjs/default.nix rename to pkgs/unit/gj/gjs/pkg-fun.nix diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/unit/gk/gkraken/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gkraken/default.nix rename to pkgs/unit/gk/gkraken/pkg-fun.nix diff --git a/pkgs/games/gl-117/default.nix b/pkgs/unit/gl/gl117/pkg-fun.nix similarity index 100% rename from pkgs/games/gl-117/default.nix rename to pkgs/unit/gl/gl117/pkg-fun.nix diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/unit/gl/gl2ps/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gl2ps/default.nix rename to pkgs/unit/gl/gl2ps/pkg-fun.nix diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/unit/gl/gl3w/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gl3w/default.nix rename to pkgs/unit/gl/gl3w/pkg-fun.nix diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/unit/gl/glab/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/glab/default.nix rename to pkgs/unit/gl/glab/pkg-fun.nix diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/unit/gl/glabels/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/glabels/default.nix rename to pkgs/unit/gl/glabels/pkg-fun.nix diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/unit/gl/glade/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/glade/default.nix rename to pkgs/unit/gl/glade/pkg-fun.nix diff --git a/pkgs/data/fonts/glasstty-ttf/default.nix b/pkgs/unit/gl/glasstty-ttf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/glasstty-ttf/default.nix rename to pkgs/unit/gl/glasstty-ttf/pkg-fun.nix diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/unit/gl/glava/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/glava/default.nix rename to pkgs/unit/gl/glava/pkg-fun.nix diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/unit/gl/glbinding/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glbinding/default.nix rename to pkgs/unit/gl/glbinding/pkg-fun.nix diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/unit/gl/gle/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gle/default.nix rename to pkgs/unit/gl/gle/pkg-fun.nix diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/unit/gl/glee/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/glee/default.nix rename to pkgs/unit/gl/glee/pkg-fun.nix diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/unit/gl/glfw2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glfw/2.x.nix rename to pkgs/unit/gl/glfw2/pkg-fun.nix diff --git a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/pkgs/unit/gl/glib-networking/hardcode-gsettings.patch similarity index 100% rename from pkgs/development/libraries/glib-networking/hardcode-gsettings.patch rename to pkgs/unit/gl/glib-networking/hardcode-gsettings.patch diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/unit/gl/glib-networking/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/glib-networking/installed-tests-path.patch rename to pkgs/unit/gl/glib-networking/installed-tests-path.patch diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/unit/gl/glib-networking/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glib-networking/default.nix rename to pkgs/unit/gl/glib-networking/pkg-fun.nix diff --git a/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/pkgs/unit/gl/glib-testing/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/glib-testing/installed-tests-path.patch rename to pkgs/unit/gl/glib-testing/installed-tests-path.patch diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/unit/gl/glib-testing/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glib-testing/default.nix rename to pkgs/unit/gl/glib-testing/pkg-fun.nix diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/unit/gl/glibmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glibmm/default.nix rename to pkgs/unit/gl/glibmm/pkg-fun.nix diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/unit/gl/glide/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/glide/default.nix rename to pkgs/unit/gl/glide/pkg-fun.nix diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/unit/gl/glitter/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/glitter/default.nix rename to pkgs/unit/gl/glitter/pkg-fun.nix diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/unit/gl/gllvm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gllvm/default.nix rename to pkgs/unit/gl/gllvm/pkg-fun.nix diff --git a/pkgs/development/libraries/glm/glm.pc.in b/pkgs/unit/gl/glm/glm.pc.in similarity index 100% rename from pkgs/development/libraries/glm/glm.pc.in rename to pkgs/unit/gl/glm/glm.pc.in diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/unit/gl/glm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glm/default.nix rename to pkgs/unit/gl/glm/pkg-fun.nix diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/unit/gl/glmark2/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/glmark2/default.nix rename to pkgs/unit/gl/glmark2/pkg-fun.nix diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/unit/gl/global-platform-pro/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/global-platform-pro/default.nix rename to pkgs/unit/gl/global-platform-pro/pkg-fun.nix diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/unit/gl/global/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/global/default.nix rename to pkgs/unit/gl/global/pkg-fun.nix diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/unit/gl/globalarrays/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/globalarrays/default.nix rename to pkgs/unit/gl/globalarrays/pkg-fun.nix diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/unit/gl/globe-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/globe-cli/default.nix rename to pkgs/unit/gl/globe-cli/pkg-fun.nix diff --git a/pkgs/games/globulation/header-order.patch b/pkgs/unit/gl/globulation2/header-order.patch similarity index 100% rename from pkgs/games/globulation/header-order.patch rename to pkgs/unit/gl/globulation2/header-order.patch diff --git a/pkgs/games/globulation/default.nix b/pkgs/unit/gl/globulation2/pkg-fun.nix similarity index 100% rename from pkgs/games/globulation/default.nix rename to pkgs/unit/gl/globulation2/pkg-fun.nix diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/unit/gl/globulation2/public-buildproject.patch similarity index 100% rename from pkgs/games/globulation/public-buildproject.patch rename to pkgs/unit/gl/globulation2/public-buildproject.patch diff --git a/pkgs/development/tools/glock/deps.nix b/pkgs/unit/gl/glock/deps.nix similarity index 100% rename from pkgs/development/tools/glock/deps.nix rename to pkgs/unit/gl/glock/deps.nix diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/unit/gl/glock/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/glock/default.nix rename to pkgs/unit/gl/glock/pkg-fun.nix diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/unit/gl/glog/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glog/default.nix rename to pkgs/unit/gl/glog/pkg-fun.nix diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/unit/gl/glom/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/glom/default.nix rename to pkgs/unit/gl/glom/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/unit/gl/glooctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/glooctl/default.nix rename to pkgs/unit/gl/glooctl/pkg-fun.nix diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/unit/gl/gloox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gloox/default.nix rename to pkgs/unit/gl/gloox/pkg-fun.nix diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/unit/gl/glow/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/glow/default.nix rename to pkgs/unit/gl/glow/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/unit/gl/glowing-bear/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/glowing-bear/default.nix rename to pkgs/unit/gl/glowing-bear/pkg-fun.nix diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/unit/gl/glpaper/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/glpaper/default.nix rename to pkgs/unit/gl/glpaper/pkg-fun.nix diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/unit/gl/glpk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glpk/default.nix rename to pkgs/unit/gl/glpk/pkg-fun.nix diff --git a/pkgs/development/libraries/glpng/default.nix b/pkgs/unit/gl/glpng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glpng/default.nix rename to pkgs/unit/gl/glpng/pkg-fun.nix diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/unit/gl/glslang/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/glslang/default.nix rename to pkgs/unit/gl/glslang/pkg-fun.nix diff --git a/pkgs/games/gltron/gentoo-prototypes.patch b/pkgs/unit/gl/gltron/gentoo-prototypes.patch similarity index 100% rename from pkgs/games/gltron/gentoo-prototypes.patch rename to pkgs/unit/gl/gltron/gentoo-prototypes.patch diff --git a/pkgs/games/gltron/default.nix b/pkgs/unit/gl/gltron/pkg-fun.nix similarity index 100% rename from pkgs/games/gltron/default.nix rename to pkgs/unit/gl/gltron/pkg-fun.nix diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/unit/gl/glucose-syrup/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/glucose/syrup.nix rename to pkgs/unit/gl/glucose-syrup/pkg-fun.nix diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/unit/gl/glucose/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/glucose/default.nix rename to pkgs/unit/gl/glucose/pkg-fun.nix diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/unit/gl/glui/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glui/default.nix rename to pkgs/unit/gl/glui/pkg-fun.nix diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/unit/gl/glusterfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/glusterfs/default.nix rename to pkgs/unit/gl/glusterfs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch b/pkgs/unit/gl/glusterfs/ssl_cert_path.patch similarity index 100% rename from pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch rename to pkgs/unit/gl/glusterfs/ssl_cert_path.patch diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/unit/gl/glxinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/glxinfo/default.nix rename to pkgs/unit/gl/glxinfo/pkg-fun.nix diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/unit/gl/glyr/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/glyr/default.nix rename to pkgs/unit/gl/glyr/pkg-fun.nix diff --git a/pkgs/games/gmad/default.nix b/pkgs/unit/gm/gmad/pkg-fun.nix similarity index 100% rename from pkgs/games/gmad/default.nix rename to pkgs/unit/gm/gmad/pkg-fun.nix diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/unit/gm/gmailctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/gmailctl/default.nix rename to pkgs/unit/gm/gmailctl/pkg-fun.nix diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/unit/gm/gmic/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/gmic/default.nix rename to pkgs/unit/gm/gmic/pkg-fun.nix diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/unit/gm/gmid/pkg-fun.nix similarity index 100% rename from pkgs/servers/gemini/gmid/default.nix rename to pkgs/unit/gm/gmid/pkg-fun.nix diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/unit/gm/gmime2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmime/2.nix rename to pkgs/unit/gm/gmime2/pkg-fun.nix diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/unit/gm/gmime3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmime/3.nix rename to pkgs/unit/gm/gmime3/pkg-fun.nix diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/unit/gm/gmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmm/default.nix rename to pkgs/unit/gm/gmm/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/unit/gm/gmni/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/gmni/default.nix rename to pkgs/unit/gm/gmni/pkg-fun.nix diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/unit/gm/gmnitohtml/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gmnitohtml/default.nix rename to pkgs/unit/gm/gmnitohtml/pkg-fun.nix diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/unit/gm/gmp4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmp/4.3.2.nix rename to pkgs/unit/gm/gmp4/pkg-fun.nix diff --git a/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch b/pkgs/unit/gm/gmp5/5.1.3-CVE-2021-43618.patch similarity index 100% rename from pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch rename to pkgs/unit/gm/gmp5/5.1.3-CVE-2021-43618.patch diff --git a/pkgs/development/libraries/gmp/need-size-t.patch b/pkgs/unit/gm/gmp5/need-size-t.patch similarity index 100% rename from pkgs/development/libraries/gmp/need-size-t.patch rename to pkgs/unit/gm/gmp5/need-size-t.patch diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/unit/gm/gmp5/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmp/5.1.x.nix rename to pkgs/unit/gm/gmp5/pkg-fun.nix diff --git a/pkgs/development/libraries/gmp/6.2.1-CVE-2021-43618.patch b/pkgs/unit/gm/gmp6/6.2.1-CVE-2021-43618.patch similarity index 100% rename from pkgs/development/libraries/gmp/6.2.1-CVE-2021-43618.patch rename to pkgs/unit/gm/gmp6/6.2.1-CVE-2021-43618.patch diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/unit/gm/gmp6/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmp/6.x.nix rename to pkgs/unit/gm/gmp6/pkg-fun.nix diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/unit/gm/gmpc/libmpd-11.8.17-remove-strndup.patch similarity index 100% rename from pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch rename to pkgs/unit/gm/gmpc/libmpd-11.8.17-remove-strndup.patch diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/unit/gm/gmpc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gmpc/default.nix rename to pkgs/unit/gm/gmpc/pkg-fun.nix diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/unit/gm/gmqcc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gmqcc/default.nix rename to pkgs/unit/gm/gmqcc/pkg-fun.nix diff --git a/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch b/pkgs/unit/gm/gmrun/find-config-file-in-system-etc-dir.patch similarity index 100% rename from pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch rename to pkgs/unit/gm/gmrun/find-config-file-in-system-etc-dir.patch diff --git a/pkgs/applications/misc/gmrun/gcc43.patch b/pkgs/unit/gm/gmrun/gcc43.patch similarity index 100% rename from pkgs/applications/misc/gmrun/gcc43.patch rename to pkgs/unit/gm/gmrun/gcc43.patch diff --git a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch b/pkgs/unit/gm/gmrun/gmrun-0.9.2-xdg.patch similarity index 100% rename from pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch rename to pkgs/unit/gm/gmrun/gmrun-0.9.2-xdg.patch diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/unit/gm/gmrun/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gmrun/default.nix rename to pkgs/unit/gm/gmrun/pkg-fun.nix diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/unit/gm/gmtk/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/gmtk/fix-paths.patch rename to pkgs/unit/gm/gmtk/fix-paths.patch diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/unit/gm/gmtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gmtk/default.nix rename to pkgs/unit/gm/gmtk/pkg-fun.nix diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/unit/gm/gmtp/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gmtp/default.nix rename to pkgs/unit/gm/gmtp/pkg-fun.nix diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/unit/gm/gmu/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gmu/default.nix rename to pkgs/unit/gm/gmu/pkg-fun.nix diff --git a/pkgs/development/libraries/ada/gnatcoll/core.nix b/pkgs/unit/gn/gnatcoll-core/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ada/gnatcoll/core.nix rename to pkgs/unit/gn/gnatcoll-core/pkg-fun.nix diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/unit/gn/gnaural/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gnaural/default.nix rename to pkgs/unit/gn/gnaural/pkg-fun.nix diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/unit/gn/gnet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gnet/default.nix rename to pkgs/unit/gn/gnet/pkg-fun.nix diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/unit/gn/gnirehtet/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gnirehtet/default.nix rename to pkgs/unit/gn/gnirehtet/pkg-fun.nix diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/unit/gn/gnome-2048/pkg-fun.nix similarity index 100% rename from pkgs/desktops/gnome/games/gnome-2048/default.nix rename to pkgs/unit/gn/gnome-2048/pkg-fun.nix diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/unit/gn/gnome-browser-connector/pkg-fun.nix similarity index 100% rename from pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix rename to pkgs/unit/gn/gnome-browser-connector/pkg-fun.nix diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/unit/gn/gnome-builder/fix-finding-test-typelibs.patch similarity index 100% rename from pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch rename to pkgs/unit/gn/gnome-builder/fix-finding-test-typelibs.patch diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/unit/gn/gnome-builder/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/gnome-builder/default.nix rename to pkgs/unit/gn/gnome-builder/pkg-fun.nix diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/unit/gn/gnome-connections/pkg-fun.nix similarity index 100% rename from pkgs/desktops/gnome/apps/gnome-connections/default.nix rename to pkgs/unit/gn/gnome-connections/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/unit/gn/gnome-console/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/gnome-console/default.nix rename to pkgs/unit/gn/gnome-console/pkg-fun.nix diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/unit/gn/gnome-desktop-testing/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gnome-desktop-testing/default.nix rename to pkgs/unit/gn/gnome-desktop-testing/pkg-fun.nix diff --git a/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch b/pkgs/unit/gn/gnome-desktop/bubblewrap-paths.patch similarity index 100% rename from pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch rename to pkgs/unit/gn/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/unit/gn/gnome-desktop/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gnome-desktop/default.nix rename to pkgs/unit/gn/gnome-desktop/pkg-fun.nix diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/unit/gn/gnome-doc-utils/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/documentation/gnome-doc-utils/default.nix rename to pkgs/unit/gn/gnome-doc-utils/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/pkgs/unit/gn/gnome-epub-thumbnailer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-epub-thumbnailer/default.nix rename to pkgs/unit/gn/gnome-epub-thumbnailer/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/unit/gn/gnome-extension-manager/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-extension-manager/default.nix rename to pkgs/unit/gn/gnome-extension-manager/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix b/pkgs/unit/gn/gnome-feeds/listparser.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix rename to pkgs/unit/gn/gnome-feeds/listparser.nix diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/unit/gn/gnome-feeds/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/gnome-feeds/default.nix rename to pkgs/unit/gn/gnome-feeds/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/unit/gn/gnome-firmware/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-firmware/default.nix rename to pkgs/unit/gn/gnome-firmware/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/unit/gn/gnome-frog/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-frog/default.nix rename to pkgs/unit/gn/gnome-frog/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/pkgs/unit/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch similarity index 100% rename from pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch rename to pkgs/unit/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/unit/gn/gnome-hexgl/pkg-fun.nix similarity index 100% rename from pkgs/games/gnome-hexgl/default.nix rename to pkgs/unit/gn/gnome-hexgl/pkg-fun.nix diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/unit/gn/gnome-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/gnome-icon-theme/default.nix rename to pkgs/unit/gn/gnome-icon-theme/pkg-fun.nix diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/unit/gn/gnome-inform7/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/gnome-inform7/default.nix rename to pkgs/unit/gn/gnome-inform7/pkg-fun.nix diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/unit/gn/gnome-keysign/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gnome-keysign/default.nix rename to pkgs/unit/gn/gnome-keysign/pkg-fun.nix diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/unit/gn/gnome-latex/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/gnome-latex/default.nix rename to pkgs/unit/gn/gnome-latex/pkg-fun.nix diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/unit/gn/gnome-menus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gnome-menus/default.nix rename to pkgs/unit/gn/gnome-menus/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/unit/gn/gnome-multi-writer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-multi-writer/default.nix rename to pkgs/unit/gn/gnome-multi-writer/pkg-fun.nix diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/unit/gn/gnome-network-displays/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/gnome-network-displays/default.nix rename to pkgs/unit/gn/gnome-network-displays/pkg-fun.nix diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/unit/gn/gnome-online-accounts/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gnome-online-accounts/default.nix rename to pkgs/unit/gn/gnome-online-accounts/pkg-fun.nix diff --git a/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch b/pkgs/unit/gn/gnome-photos/installed-tests-path.patch similarity index 100% rename from pkgs/applications/graphics/gnome-photos/installed-tests-path.patch rename to pkgs/unit/gn/gnome-photos/installed-tests-path.patch diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/unit/gn/gnome-photos/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gnome-photos/default.nix rename to pkgs/unit/gn/gnome-photos/pkg-fun.nix diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/unit/gn/gnome-podcasts/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gnome-podcasts/default.nix rename to pkgs/unit/gn/gnome-podcasts/pkg-fun.nix diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/unit/gn/gnome-randr/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/gnome-randr/default.nix rename to pkgs/unit/gn/gnome-randr/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/unit/gn/gnome-secrets/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-secrets/default.nix rename to pkgs/unit/gn/gnome-secrets/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/unit/gn/gnome-solanum/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-solanum/default.nix rename to pkgs/unit/gn/gnome-solanum/pkg-fun.nix diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/unit/gn/gnome-text-editor/pkg-fun.nix similarity index 100% rename from pkgs/desktops/gnome/apps/gnome-text-editor/default.nix rename to pkgs/unit/gn/gnome-text-editor/pkg-fun.nix diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/unit/gn/gnome-tour/pkg-fun.nix similarity index 100% rename from pkgs/desktops/gnome/core/gnome-tour/default.nix rename to pkgs/unit/gn/gnome-tour/pkg-fun.nix diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/unit/gn/gnome-usage/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gnome-usage/default.nix rename to pkgs/unit/gn/gnome-usage/pkg-fun.nix diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/unit/gn/gnome-user-docs/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/gnome-user-docs/default.nix rename to pkgs/unit/gn/gnome-user-docs/pkg-fun.nix diff --git a/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch b/pkgs/unit/gn/gnome-video-effects/fix-pc-file.patch similarity index 100% rename from pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch rename to pkgs/unit/gn/gnome-video-effects/fix-pc-file.patch diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/unit/gn/gnome-video-effects/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gnome-video-effects/default.nix rename to pkgs/unit/gn/gnome-video-effects/pkg-fun.nix diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/unit/gn/gnome_mplayer/fix-paths.patch similarity index 100% rename from pkgs/applications/video/gnome-mplayer/fix-paths.patch rename to pkgs/unit/gn/gnome_mplayer/fix-paths.patch diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/unit/gn/gnome_mplayer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/gnome-mplayer/default.nix rename to pkgs/unit/gn/gnome_mplayer/pkg-fun.nix diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/unit/gn/gnomecast/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/gnomecast/default.nix rename to pkgs/unit/gn/gnomecast/pkg-fun.nix diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/unit/gn/gnonograms/pkg-fun.nix similarity index 100% rename from pkgs/games/gnonograms/default.nix rename to pkgs/unit/gn/gnonograms/pkg-fun.nix diff --git a/pkgs/development/compilers/gnostic/default.nix b/pkgs/unit/gn/gnostic/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gnostic/default.nix rename to pkgs/unit/gn/gnostic/pkg-fun.nix diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/unit/gn/gnss-sdr/fix_libcpu_features_install_path.patch similarity index 100% rename from pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch rename to pkgs/unit/gn/gnss-sdr/fix_libcpu_features_install_path.patch diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/unit/gn/gnss-sdr/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/gnss-sdr/default.nix rename to pkgs/unit/gn/gnss-sdr/pkg-fun.nix diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/unit/gn/gnu-cobol/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gnu-cobol/default.nix rename to pkgs/unit/gn/gnu-cobol/pkg-fun.nix diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/unit/gn/gnu-config/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gnu-config/default.nix rename to pkgs/unit/gn/gnu-config/pkg-fun.nix diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/unit/gn/gnu-pw-mgr/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gnu-pw-mgr/default.nix rename to pkgs/unit/gn/gnu-pw-mgr/pkg-fun.nix diff --git a/pkgs/misc/gnu-shepherd/default.nix b/pkgs/unit/gn/gnu-shepherd/pkg-fun.nix similarity index 100% rename from pkgs/misc/gnu-shepherd/default.nix rename to pkgs/unit/gn/gnu-shepherd/pkg-fun.nix diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/unit/gn/gnu-smalltalk/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gnu-smalltalk/default.nix rename to pkgs/unit/gn/gnu-smalltalk/pkg-fun.nix diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/unit/gn/gnuapl/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/gnu-apl/default.nix rename to pkgs/unit/gn/gnuapl/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/unit/gn/gnuastro/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/gnuastro/default.nix rename to pkgs/unit/gn/gnuastro/pkg-fun.nix diff --git a/pkgs/games/gnubg/default.nix b/pkgs/unit/gn/gnubg/pkg-fun.nix similarity index 100% rename from pkgs/games/gnubg/default.nix rename to pkgs/unit/gn/gnubg/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/gnucap/default.nix b/pkgs/unit/gn/gnucap/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/gnucap/default.nix rename to pkgs/unit/gn/gnucap/pkg-fun.nix diff --git a/pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch b/pkgs/unit/gn/gnucash/0001-disable-date-and-time-tests.patch similarity index 100% rename from pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch rename to pkgs/unit/gn/gnucash/0001-disable-date-and-time-tests.patch diff --git a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch b/pkgs/unit/gn/gnucash/0002-disable-gnc-fq-update.patch similarity index 100% rename from pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch rename to pkgs/unit/gn/gnucash/0002-disable-gnc-fq-update.patch diff --git a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch b/pkgs/unit/gn/gnucash/0003-remove-valgrind.patch similarity index 100% rename from pkgs/applications/office/gnucash/0003-remove-valgrind.patch rename to pkgs/unit/gn/gnucash/0003-remove-valgrind.patch diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/unit/gn/gnucash/0004-exec-fq-helpers.patch similarity index 100% rename from pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch rename to pkgs/unit/gn/gnucash/0004-exec-fq-helpers.patch diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/unit/gn/gnucash/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/gnucash/default.nix rename to pkgs/unit/gn/gnucash/pkg-fun.nix diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/unit/gn/gnuchess/pkg-fun.nix similarity index 100% rename from pkgs/games/gnuchess/default.nix rename to pkgs/unit/gn/gnuchess/pkg-fun.nix diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/unit/gn/gnuclad/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gnuclad/default.nix rename to pkgs/unit/gn/gnuclad/pkg-fun.nix diff --git a/pkgs/games/gnugo/default.nix b/pkgs/unit/gn/gnugo/pkg-fun.nix similarity index 100% rename from pkgs/games/gnugo/default.nix rename to pkgs/unit/gn/gnugo/pkg-fun.nix diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/unit/gn/gnugrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gnugrep/default.nix rename to pkgs/unit/gn/gnugrep/pkg-fun.nix diff --git a/pkgs/games/gnujump/gnujump.xpm b/pkgs/unit/gn/gnujump/gnujump.xpm similarity index 100% rename from pkgs/games/gnujump/gnujump.xpm rename to pkgs/unit/gn/gnujump/gnujump.xpm diff --git a/pkgs/games/gnujump/default.nix b/pkgs/unit/gn/gnujump/pkg-fun.nix similarity index 100% rename from pkgs/games/gnujump/default.nix rename to pkgs/unit/gn/gnujump/pkg-fun.nix diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/unit/gn/gnulib/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gnulib/default.nix rename to pkgs/unit/gn/gnulib/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/unit/gn/gnum4/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gnum4/default.nix rename to pkgs/unit/gn/gnum4/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch b/pkgs/unit/gn/gnumake/0001-No-impure-bin-sh.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch rename to pkgs/unit/gn/gnumake/0001-No-impure-bin-sh.patch diff --git a/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch b/pkgs/unit/gn/gnumake/0002-remove-impure-dirs.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch rename to pkgs/unit/gn/gnumake/0002-remove-impure-dirs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/unit/gn/gnumake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/default.nix rename to pkgs/unit/gn/gnumake/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/unit/gn/gnumake42/glibc-2.27-glob.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch rename to pkgs/unit/gn/gnumake42/glibc-2.27-glob.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/unit/gn/gnumake42/glibc-2.33-glob.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch rename to pkgs/unit/gn/gnumake42/glibc-2.33-glob.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/pkgs/unit/gn/gnumake42/impure-dirs.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch rename to pkgs/unit/gn/gnumake42/impure-dirs.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/unit/gn/gnumake42/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/default.nix rename to pkgs/unit/gn/gnumake42/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/unit/gn/gnumake42/pselect.patch similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch rename to pkgs/unit/gn/gnumake42/pselect.patch diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/unit/gn/gnumeric/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/gnumeric/default.nix rename to pkgs/unit/gn/gnumeric/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/unit/gn/gnunet-gtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/gnunet/gtk.nix rename to pkgs/unit/gn/gnunet-gtk/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/unit/gn/gnunet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/gnunet/default.nix rename to pkgs/unit/gn/gnunet/pkg-fun.nix diff --git a/pkgs/tools/text/gnupatch/Allow_input_files_to_be_missing_for_ed-style_patches.patch b/pkgs/unit/gn/gnupatch/Allow_input_files_to_be_missing_for_ed-style_patches.patch similarity index 100% rename from pkgs/tools/text/gnupatch/Allow_input_files_to_be_missing_for_ed-style_patches.patch rename to pkgs/unit/gn/gnupatch/Allow_input_files_to_be_missing_for_ed-style_patches.patch diff --git a/pkgs/tools/text/gnupatch/CVE-2018-1000156.patch b/pkgs/unit/gn/gnupatch/CVE-2018-1000156.patch similarity index 100% rename from pkgs/tools/text/gnupatch/CVE-2018-1000156.patch rename to pkgs/unit/gn/gnupatch/CVE-2018-1000156.patch diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6951.patch b/pkgs/unit/gn/gnupatch/CVE-2018-6951.patch similarity index 100% rename from pkgs/tools/text/gnupatch/CVE-2018-6951.patch rename to pkgs/unit/gn/gnupatch/CVE-2018-6951.patch diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6952.patch b/pkgs/unit/gn/gnupatch/CVE-2018-6952.patch similarity index 100% rename from pkgs/tools/text/gnupatch/CVE-2018-6952.patch rename to pkgs/unit/gn/gnupatch/CVE-2018-6952.patch diff --git a/pkgs/tools/text/gnupatch/CVE-2019-13636.patch b/pkgs/unit/gn/gnupatch/CVE-2019-13636.patch similarity index 100% rename from pkgs/tools/text/gnupatch/CVE-2019-13636.patch rename to pkgs/unit/gn/gnupatch/CVE-2019-13636.patch diff --git a/pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch b/pkgs/unit/gn/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch similarity index 100% rename from pkgs/tools/text/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch rename to pkgs/unit/gn/gnupatch/CVE-2019-13638-and-CVE-2018-20969.patch diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/unit/gn/gnupatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gnupatch/default.nix rename to pkgs/unit/gn/gnupatch/pkg-fun.nix diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/unit/gn/gnupg-pkcs11-scd/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gnupg-pkcs11-scd/default.nix rename to pkgs/unit/gn/gnupg-pkcs11-scd/pkg-fun.nix diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/unit/gn/gnupg1compat/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gnupg/1compat.nix rename to pkgs/unit/gn/gnupg1compat/pkg-fun.nix diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/unit/gn/gnupg1orig/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gnupg/1.nix rename to pkgs/unit/gn/gnupg1orig/pkg-fun.nix diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/unit/gn/gnupth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pth/default.nix rename to pkgs/unit/gn/gnupth/pkg-fun.nix diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/unit/gn/gnused/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gnused/default.nix rename to pkgs/unit/gn/gnused/pkg-fun.nix diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/unit/gn/gnushogi/pkg-fun.nix similarity index 100% rename from pkgs/games/gnushogi/default.nix rename to pkgs/unit/gn/gnushogi/pkg-fun.nix diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/unit/gn/gnutar/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/gnutar/default.nix rename to pkgs/unit/gn/gnutar/pkg-fun.nix diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/unit/gn/gnvim/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/neovim/gnvim/wrapper.nix rename to pkgs/unit/gn/gnvim/pkg-fun.nix diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/unit/go/go-2fa/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/2fa/default.nix rename to pkgs/unit/go/go-2fa/pkg-fun.nix diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/unit/go/go-audit/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/go-audit/default.nix rename to pkgs/unit/go/go-audit/pkg-fun.nix diff --git a/pkgs/servers/go-autoconfig/default.nix b/pkgs/unit/go/go-autoconfig/pkg-fun.nix similarity index 100% rename from pkgs/servers/go-autoconfig/default.nix rename to pkgs/unit/go/go-autoconfig/pkg-fun.nix diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/unit/go/go-bindata-assetfs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-bindata-assetfs/default.nix rename to pkgs/unit/go/go-bindata-assetfs/pkg-fun.nix diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/unit/go/go-bindata/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-bindata/default.nix rename to pkgs/unit/go/go-bindata/pkg-fun.nix diff --git a/pkgs/servers/http/go-camo/default.nix b/pkgs/unit/go/go-camo/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/go-camo/default.nix rename to pkgs/unit/go/go-camo/pkg-fun.nix diff --git a/pkgs/development/tools/check/default.nix b/pkgs/unit/go/go-check/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/check/default.nix rename to pkgs/unit/go/go-check/pkg-fun.nix diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/unit/go/go-chromecast/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/go-chromecast/default.nix rename to pkgs/unit/go/go-chromecast/pkg-fun.nix diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/unit/go/go-containerregistry/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-containerregistry/default.nix rename to pkgs/unit/go/go-containerregistry/pkg-fun.nix diff --git a/pkgs/servers/go-cqhttp/default.nix b/pkgs/unit/go/go-cqhttp/pkg-fun.nix similarity index 100% rename from pkgs/servers/go-cqhttp/default.nix rename to pkgs/unit/go/go-cqhttp/pkg-fun.nix diff --git a/pkgs/tools/security/go-cve-search/default.nix b/pkgs/unit/go/go-cve-search/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/go-cve-search/default.nix rename to pkgs/unit/go/go-cve-search/pkg-fun.nix diff --git a/pkgs/development/tools/gdm/deps.nix b/pkgs/unit/go/go-dependency-manager/deps.nix similarity index 100% rename from pkgs/development/tools/gdm/deps.nix rename to pkgs/unit/go/go-dependency-manager/deps.nix diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/unit/go/go-dependency-manager/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gdm/default.nix rename to pkgs/unit/go/go-dependency-manager/pkg-fun.nix diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/unit/go/go-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/go-font/default.nix rename to pkgs/unit/go/go-font/pkg-fun.nix diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/unit/go/go-graft/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/go-graft/default.nix rename to pkgs/unit/go/go-graft/pkg-fun.nix diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/unit/go/go-jira/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/go-jira/default.nix rename to pkgs/unit/go/go-jira/pkg-fun.nix diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/unit/go/go-jsonnet/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/go-jsonnet/default.nix rename to pkgs/unit/go/go-jsonnet/pkg-fun.nix diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/unit/go/go-junit-report/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-junit-report/default.nix rename to pkgs/unit/go/go-junit-report/pkg-fun.nix diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/unit/go/go-libp2p-daemon/pkg-fun.nix similarity index 100% rename from pkgs/servers/go-libp2p-daemon/default.nix rename to pkgs/unit/go/go-libp2p-daemon/pkg-fun.nix diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/unit/go/go-license-detector/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/go-license-detector/default.nix rename to pkgs/unit/go/go-license-detector/pkg-fun.nix diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/unit/go/go-md2man/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/go-md2man/default.nix rename to pkgs/unit/go/go-md2man/pkg-fun.nix diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/unit/go/go-migrate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-migrate/default.nix rename to pkgs/unit/go/go-migrate/pkg-fun.nix diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/unit/go/go-minimock/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-minimock/default.nix rename to pkgs/unit/go/go-minimock/pkg-fun.nix diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/unit/go/go-mockery/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-mockery/default.nix rename to pkgs/unit/go/go-mockery/pkg-fun.nix diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/unit/go/go-motion/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-motion/default.nix rename to pkgs/unit/go/go-motion/pkg-fun.nix diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/unit/go/go-mtpfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/go-mtpfs/default.nix rename to pkgs/unit/go/go-mtpfs/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/unit/go/go-neb/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/go-neb/default.nix rename to pkgs/unit/go/go-neb/pkg-fun.nix diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/unit/go/go-org/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/go-org/default.nix rename to pkgs/unit/go/go-org/pkg-fun.nix diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/unit/go/go-outline/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-outline/default.nix rename to pkgs/unit/go/go-outline/pkg-fun.nix diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/unit/go/go-protobuf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-protobuf/default.nix rename to pkgs/unit/go/go-protobuf/pkg-fun.nix diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/unit/go/go-rice/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/go.rice/default.nix rename to pkgs/unit/go/go-rice/pkg-fun.nix diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/unit/go/go-sct/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/go-sct/default.nix rename to pkgs/unit/go/go-sct/pkg-fun.nix diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/unit/go/go-shadowsocks2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/go-shadowsocks2/default.nix rename to pkgs/unit/go/go-shadowsocks2/pkg-fun.nix diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/unit/go/go-swag/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-swag/default.nix rename to pkgs/unit/go/go-swag/pkg-fun.nix diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/unit/go/go-swagger/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-swagger/default.nix rename to pkgs/unit/go/go-swagger/pkg-fun.nix diff --git a/pkgs/development/tools/go-symbols/deps.nix b/pkgs/unit/go/go-symbols/deps.nix similarity index 100% rename from pkgs/development/tools/go-symbols/deps.nix rename to pkgs/unit/go/go-symbols/deps.nix diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/unit/go/go-symbols/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-symbols/default.nix rename to pkgs/unit/go/go-symbols/pkg-fun.nix diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/unit/go/go-task/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-task/default.nix rename to pkgs/unit/go/go-task/pkg-fun.nix diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/unit/go/go-toml/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-toml/default.nix rename to pkgs/unit/go/go-toml/pkg-fun.nix diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/unit/go/go-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go-tools/default.nix rename to pkgs/unit/go/go-tools/pkg-fun.nix diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/pkgs/unit/go/go-upower-notify/deps.nix similarity index 100% rename from pkgs/tools/misc/upower-notify/deps.nix rename to pkgs/unit/go/go-upower-notify/deps.nix diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/unit/go/go-upower-notify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/upower-notify/default.nix rename to pkgs/unit/go/go-upower-notify/pkg-fun.nix diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/unit/go/go2nix/deps.nix similarity index 100% rename from pkgs/development/tools/go2nix/deps.nix rename to pkgs/unit/go/go2nix/deps.nix diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/unit/go/go2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/go2nix/default.nix rename to pkgs/unit/go/go2nix/pkg-fun.nix diff --git a/pkgs/tools/security/go365/default.nix b/pkgs/unit/go/go365/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/go365/default.nix rename to pkgs/unit/go/go365/pkg-fun.nix diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/unit/go/goa/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/goa/default.nix rename to pkgs/unit/go/goa/pkg-fun.nix diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/unit/go/goaccess/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/goaccess/default.nix rename to pkgs/unit/go/goaccess/pkg-fun.nix diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/unit/go/goawk/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/goawk/default.nix rename to pkgs/unit/go/goawk/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/unit/go/gob2/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gob2/default.nix rename to pkgs/unit/go/gob2/pkg-fun.nix diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/unit/go/gobby/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/gobby/default.nix rename to pkgs/unit/go/gobby/pkg-fun.nix diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/unit/go/gobetween/gomod.patch similarity index 100% rename from pkgs/servers/gobetween/gomod.patch rename to pkgs/unit/go/gobetween/gomod.patch diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/unit/go/gobetween/pkg-fun.nix similarity index 100% rename from pkgs/servers/gobetween/default.nix rename to pkgs/unit/go/gobetween/pkg-fun.nix diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/unit/go/gobgp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gobgp/default.nix rename to pkgs/unit/go/gobgp/pkg-fun.nix diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/unit/go/gobgpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/gobgpd/default.nix rename to pkgs/unit/go/gobgpd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/unit/go/gobi_loader/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/gobi_loader/default.nix rename to pkgs/unit/go/gobi_loader/pkg-fun.nix diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/unit/go/gobuster/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gobuster/default.nix rename to pkgs/unit/go/gobuster/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/unit/go/gocd-agent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gocd-agent/default.nix rename to pkgs/unit/go/gocd-agent/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/unit/go/gocd-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gocd-server/default.nix rename to pkgs/unit/go/gocd-server/pkg-fun.nix diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/unit/go/gocode-gomod/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gocode-gomod/default.nix rename to pkgs/unit/go/gocode-gomod/pkg-fun.nix diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/unit/go/gocode/deps.nix similarity index 100% rename from pkgs/development/tools/gocode/deps.nix rename to pkgs/unit/go/gocode/deps.nix diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/unit/go/gocode/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gocode/default.nix rename to pkgs/unit/go/gocode/pkg-fun.nix diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/unit/go/goconst/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/goconst/default.nix rename to pkgs/unit/go/goconst/pkg-fun.nix diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/unit/go/goconvey/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/goconvey/default.nix rename to pkgs/unit/go/goconvey/pkg-fun.nix diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/unit/go/gocr/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gocr/default.nix rename to pkgs/unit/go/gocr/pkg-fun.nix diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/unit/go/gocryptfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/gocryptfs/default.nix rename to pkgs/unit/go/gocryptfs/pkg-fun.nix diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/unit/go/gocyclo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gocyclo/default.nix rename to pkgs/unit/go/gocyclo/pkg-fun.nix diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/unit/go/goda/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/goda/default.nix rename to pkgs/unit/go/goda/pkg-fun.nix diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/unit/go/godef/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/godef/default.nix rename to pkgs/unit/go/godef/pkg-fun.nix diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/unit/go/godns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/godns/default.nix rename to pkgs/unit/go/godns/pkg-fun.nix diff --git a/pkgs/development/tools/godot/3/export-templates.nix b/pkgs/unit/go/godot-export-templates/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/godot/3/export-templates.nix rename to pkgs/unit/go/godot-export-templates/pkg-fun.nix diff --git a/pkgs/development/tools/godot/3/headless.nix b/pkgs/unit/go/godot-headless/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/godot/3/headless.nix rename to pkgs/unit/go/godot-headless/pkg-fun.nix diff --git a/pkgs/development/tools/godot/3/server.nix b/pkgs/unit/go/godot-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/godot/3/server.nix rename to pkgs/unit/go/godot-server/pkg-fun.nix diff --git a/pkgs/development/tools/godot/3/dont_clobber_environment.patch b/pkgs/unit/go/godot/dont_clobber_environment.patch similarity index 100% rename from pkgs/development/tools/godot/3/dont_clobber_environment.patch rename to pkgs/unit/go/godot/dont_clobber_environment.patch diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/unit/go/godot/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/godot/3/default.nix rename to pkgs/unit/go/godot/pkg-fun.nix diff --git a/pkgs/development/tools/godot/3/pkg_config_additions.patch b/pkgs/unit/go/godot/pkg_config_additions.patch similarity index 100% rename from pkgs/development/tools/godot/3/pkg_config_additions.patch rename to pkgs/unit/go/godot/pkg_config_additions.patch diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/unit/go/godot_4/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/godot/4/default.nix rename to pkgs/unit/go/godot_4/pkg-fun.nix diff --git a/pkgs/development/tools/godot/4/xfixes.patch b/pkgs/unit/go/godot_4/xfixes.patch similarity index 100% rename from pkgs/development/tools/godot/4/xfixes.patch rename to pkgs/unit/go/godot_4/xfixes.patch diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/unit/go/godspeed/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/godspeed/default.nix rename to pkgs/unit/go/godspeed/pkg-fun.nix diff --git a/pkgs/tools/misc/godu/default.nix b/pkgs/unit/go/godu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/godu/default.nix rename to pkgs/unit/go/godu/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/unit/go/goeland/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/goeland/default.nix rename to pkgs/unit/go/goeland/pkg-fun.nix diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/unit/go/gof5/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gof5/default.nix rename to pkgs/unit/go/gof5/pkg-fun.nix diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/unit/go/goffice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/goffice/default.nix rename to pkgs/unit/go/goffice/pkg-fun.nix diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/unit/go/gofish/pkg-fun.nix similarity index 100% rename from pkgs/servers/gopher/gofish/default.nix rename to pkgs/unit/go/gofish/pkg-fun.nix diff --git a/pkgs/tools/networking/goflow/default.nix b/pkgs/unit/go/goflow/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/goflow/default.nix rename to pkgs/unit/go/goflow/pkg-fun.nix diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/unit/go/gofu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gofu/default.nix rename to pkgs/unit/go/gofu/pkg-fun.nix diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/unit/go/gofumpt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gofumpt/default.nix rename to pkgs/unit/go/gofumpt/pkg-fun.nix diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/unit/go/gogetdoc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gogetdoc/default.nix rename to pkgs/unit/go/gogetdoc/pkg-fun.nix diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/unit/go/gogs/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gogs/default.nix rename to pkgs/unit/go/gogs/pkg-fun.nix diff --git a/pkgs/games/gogui/default.nix b/pkgs/unit/go/gogui/pkg-fun.nix similarity index 100% rename from pkgs/games/gogui/default.nix rename to pkgs/unit/go/gogui/pkg-fun.nix diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/unit/go/gohai/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gohai/default.nix rename to pkgs/unit/go/gohai/pkg-fun.nix diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/unit/go/gohufont/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gohufont/default.nix rename to pkgs/unit/go/gohufont/pkg-fun.nix diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/unit/go/goimapnotify/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/goimapnotify/default.nix rename to pkgs/unit/go/goimapnotify/pkg-fun.nix diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/unit/go/gojq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gojq/default.nix rename to pkgs/unit/go/gojq/pkg-fun.nix diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/unit/go/gojsontoyaml/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gojsontoyaml/default.nix rename to pkgs/unit/go/gojsontoyaml/pkg-fun.nix diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/unit/go/gokart/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gokart/default.nix rename to pkgs/unit/go/gokart/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/unit/go/goku/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/goku/default.nix rename to pkgs/unit/go/goku/pkg-fun.nix diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/unit/go/golangci-lint-langserver/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/golangci-lint-langserver/default.nix rename to pkgs/unit/go/golangci-lint-langserver/pkg-fun.nix diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/unit/go/golangci-lint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/golangci-lint/default.nix rename to pkgs/unit/go/golangci-lint/pkg-fun.nix diff --git a/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch b/pkgs/unit/go/goldberg-emu/dont-install-unsupported.patch similarity index 100% rename from pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch rename to pkgs/unit/go/goldberg-emu/dont-install-unsupported.patch diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/unit/go/goldberg-emu/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/goldberg-emu/default.nix rename to pkgs/unit/go/goldberg-emu/pkg-fun.nix diff --git a/pkgs/development/tools/golines/default.nix b/pkgs/unit/go/golines/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/golines/default.nix rename to pkgs/unit/go/golines/pkg-fun.nix diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/unit/go/golint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/golint/default.nix rename to pkgs/unit/go/golint/pkg-fun.nix diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/unit/go/gollum/Gemfile similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile rename to pkgs/unit/go/gollum/Gemfile diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/unit/go/gollum/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile.lock rename to pkgs/unit/go/gollum/Gemfile.lock diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/unit/go/gollum/gemset.nix similarity index 100% rename from pkgs/applications/misc/gollum/gemset.nix rename to pkgs/unit/go/gollum/gemset.nix diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/unit/go/gollum/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gollum/default.nix rename to pkgs/unit/go/gollum/pkg-fun.nix diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/pkgs/unit/go/gom/longer-stress-timeout.patch similarity index 100% rename from pkgs/development/libraries/gom/longer-stress-timeout.patch rename to pkgs/unit/go/gom/longer-stress-timeout.patch diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/unit/go/gom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gom/default.nix rename to pkgs/unit/go/gom/pkg-fun.nix diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/unit/go/gomacro/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gomacro/default.nix rename to pkgs/unit/go/gomacro/pkg-fun.nix diff --git a/pkgs/tools/security/gomapenum/default.nix b/pkgs/unit/go/gomapenum/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gomapenum/default.nix rename to pkgs/unit/go/gomapenum/pkg-fun.nix diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/unit/go/gomatrix/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gomatrix/default.nix rename to pkgs/unit/go/gomatrix/pkg-fun.nix diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/unit/go/gometer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gometer/default.nix rename to pkgs/unit/go/gometer/pkg-fun.nix diff --git a/pkgs/tools/misc/gomi/default.nix b/pkgs/unit/go/gomi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gomi/default.nix rename to pkgs/unit/go/gomi/pkg-fun.nix diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/unit/go/gomobile/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/gomobile/default.nix rename to pkgs/unit/go/gomobile/pkg-fun.nix diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/unit/go/gomodifytags/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gomodifytags/default.nix rename to pkgs/unit/go/gomodifytags/pkg-fun.nix diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/unit/go/gomp/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gomp/default.nix rename to pkgs/unit/go/gomp/pkg-fun.nix diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/unit/go/gomplate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gomplate/default.nix rename to pkgs/unit/go/gomplate/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/unit/go/gomuks/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/gomuks/default.nix rename to pkgs/unit/go/gomuks/pkg-fun.nix diff --git a/pkgs/servers/gonic/default.nix b/pkgs/unit/go/gonic/pkg-fun.nix similarity index 100% rename from pkgs/servers/gonic/default.nix rename to pkgs/unit/go/gonic/pkg-fun.nix diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/unit/go/goocanvas/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/goocanvas/default.nix rename to pkgs/unit/go/goocanvas/pkg-fun.nix diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/unit/go/goocanvas2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/goocanvas/2.x.nix rename to pkgs/unit/go/goocanvas2/pkg-fun.nix diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/unit/go/goocanvas3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/goocanvas/3.x.nix rename to pkgs/unit/go/goocanvas3/pkg-fun.nix diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/unit/go/goocanvasmm2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/goocanvasmm/default.nix rename to pkgs/unit/go/goocanvasmm2/pkg-fun.nix diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/unit/go/goodvibes/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/goodvibes/default.nix rename to pkgs/unit/go/goodvibes/pkg-fun.nix diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/unit/go/goofys/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/goofys/default.nix rename to pkgs/unit/go/goofys/pkg-fun.nix diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/unit/go/google-app-engine-go-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/google-app-engine-go-sdk/default.nix rename to pkgs/unit/go/google-app-engine-go-sdk/pkg-fun.nix diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/unit/go/google-authenticator/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/google-authenticator/default.nix rename to pkgs/unit/go/google-authenticator/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/unit/go/google-chrome/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/google-chrome/default.nix rename to pkgs/unit/go/google-chrome/pkg-fun.nix diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/unit/go/google-cloud-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/google-cloud-cpp/default.nix rename to pkgs/unit/go/google-cloud-cpp/pkg-fun.nix diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/unit/go/google-cloud-cpp/skipped_tests.toml similarity index 100% rename from pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml rename to pkgs/unit/go/google-cloud-cpp/skipped_tests.toml diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/unit/go/google-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/google-fonts/default.nix rename to pkgs/unit/go/google-fonts/pkg-fun.nix diff --git a/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch b/pkgs/unit/go/google-guest-agent/disable-etc-mutation.patch similarity index 100% rename from pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch rename to pkgs/unit/go/google-guest-agent/disable-etc-mutation.patch diff --git a/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch b/pkgs/unit/go/google-guest-agent/fix-paths.patch similarity index 100% rename from pkgs/tools/virtualization/google-guest-agent/fix-paths.patch rename to pkgs/unit/go/google-guest-agent/fix-paths.patch diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/unit/go/google-guest-agent/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/google-guest-agent/default.nix rename to pkgs/unit/go/google-guest-agent/pkg-fun.nix diff --git a/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch b/pkgs/unit/go/google-guest-configs/fix-paths.patch similarity index 100% rename from pkgs/tools/virtualization/google-guest-configs/fix-paths.patch rename to pkgs/unit/go/google-guest-configs/fix-paths.patch diff --git a/pkgs/tools/virtualization/google-guest-configs/default.nix b/pkgs/unit/go/google-guest-configs/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/google-guest-configs/default.nix rename to pkgs/unit/go/google-guest-configs/pkg-fun.nix diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/unit/go/google-guest-oslogin/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/google-guest-oslogin/default.nix rename to pkgs/unit/go/google-guest-oslogin/pkg-fun.nix diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/unit/go/google-java-format/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/google-java-format/default.nix rename to pkgs/unit/go/google-java-format/pkg-fun.nix diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/unit/go/gopacked/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gopacked/default.nix rename to pkgs/unit/go/gopacked/pkg-fun.nix diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/unit/go/gopass-hibp/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gopass/hibp.nix rename to pkgs/unit/go/gopass-hibp/pkg-fun.nix diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/unit/go/gopass-jsonapi/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gopass/jsonapi.nix rename to pkgs/unit/go/gopass-jsonapi/pkg-fun.nix diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/unit/go/gopass-summon-provider/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gopass/summon.nix rename to pkgs/unit/go/gopass-summon-provider/pkg-fun.nix diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/unit/go/gopass/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gopass/default.nix rename to pkgs/unit/go/gopass/pkg-fun.nix diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/unit/go/gopher/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/gopher/gopher/default.nix rename to pkgs/unit/go/gopher/pkg-fun.nix diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/unit/go/gophernotes/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/gophernotes/default.nix rename to pkgs/unit/go/gophernotes/pkg-fun.nix diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/unit/go/gopkgs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gopkgs/default.nix rename to pkgs/unit/go/gopkgs/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/unit/go/gopls/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/gopls/default.nix rename to pkgs/unit/go/gopls/pkg-fun.nix diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/unit/go/gopro/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/gopro/default.nix rename to pkgs/unit/go/gopro/pkg-fun.nix diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/unit/go/gops/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gops/default.nix rename to pkgs/unit/go/gops/pkg-fun.nix diff --git a/pkgs/tools/system/gopsuinfo/no_bin_install.patch b/pkgs/unit/go/gopsuinfo/no_bin_install.patch similarity index 100% rename from pkgs/tools/system/gopsuinfo/no_bin_install.patch rename to pkgs/unit/go/gopsuinfo/no_bin_install.patch diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/unit/go/gopsuinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gopsuinfo/default.nix rename to pkgs/unit/go/gopsuinfo/pkg-fun.nix diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/unit/go/gore/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gore/default.nix rename to pkgs/unit/go/gore/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/goredo/fix-tests.diff b/pkgs/unit/go/goredo/fix-tests.diff similarity index 100% rename from pkgs/development/tools/build-managers/goredo/fix-tests.diff rename to pkgs/unit/go/goredo/fix-tests.diff diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/unit/go/goredo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/goredo/default.nix rename to pkgs/unit/go/goredo/pkg-fun.nix diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/unit/go/goreleaser/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/goreleaser/default.nix rename to pkgs/unit/go/goreleaser/pkg-fun.nix diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/unit/go/goreman/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/goreman/default.nix rename to pkgs/unit/go/goreman/pkg-fun.nix diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/unit/go/goreplay/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/goreplay/default.nix rename to pkgs/unit/go/goreplay/pkg-fun.nix diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/unit/go/goresym/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/goresym/default.nix rename to pkgs/unit/go/goresym/pkg-fun.nix diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/unit/go/gorilla-bin/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gorilla-bin/default.nix rename to pkgs/unit/go/gorilla-bin/pkg-fun.nix diff --git a/pkgs/servers/gortr/default.nix b/pkgs/unit/go/gortr/pkg-fun.nix similarity index 100% rename from pkgs/servers/gortr/default.nix rename to pkgs/unit/go/gortr/pkg-fun.nix diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/unit/go/gosec/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gosec/default.nix rename to pkgs/unit/go/gosec/pkg-fun.nix diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/unit/go/gosh/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gosh/default.nix rename to pkgs/unit/go/gosh/pkg-fun.nix diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/unit/go/gospider/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gospider/default.nix rename to pkgs/unit/go/gospider/pkg-fun.nix diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/unit/go/goss/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/goss/default.nix rename to pkgs/unit/go/goss/pkg-fun.nix diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/unit/go/gost/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gost/default.nix rename to pkgs/unit/go/gost/pkg-fun.nix diff --git a/pkgs/applications/misc/gostatic/default.nix b/pkgs/unit/go/gostatic/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gostatic/default.nix rename to pkgs/unit/go/gostatic/pkg-fun.nix diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/unit/go/gosu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gosu/default.nix rename to pkgs/unit/go/gosu/pkg-fun.nix diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/unit/go/gotags/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gotags/default.nix rename to pkgs/unit/go/gotags/pkg-fun.nix diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/unit/go/gotest/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gotest/default.nix rename to pkgs/unit/go/gotest/pkg-fun.nix diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/unit/go/gotestfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gotestfmt/default.nix rename to pkgs/unit/go/gotestfmt/pkg-fun.nix diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/unit/go/gotests/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gotests/default.nix rename to pkgs/unit/go/gotests/pkg-fun.nix diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/unit/go/gotestsum/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gotestsum/default.nix rename to pkgs/unit/go/gotestsum/pkg-fun.nix diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/unit/go/gotestwaf/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gotestwaf/default.nix rename to pkgs/unit/go/gotestwaf/pkg-fun.nix diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/unit/go/gotify-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gotify-cli/default.nix rename to pkgs/unit/go/gotify-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/unit/go/gotify-desktop/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gotify-desktop/default.nix rename to pkgs/unit/go/gotify-desktop/pkg-fun.nix diff --git a/pkgs/servers/gotify/package.json b/pkgs/unit/go/gotify-server/package.json similarity index 100% rename from pkgs/servers/gotify/package.json rename to pkgs/unit/go/gotify-server/package.json diff --git a/pkgs/servers/gotify/default.nix b/pkgs/unit/go/gotify-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/gotify/default.nix rename to pkgs/unit/go/gotify-server/pkg-fun.nix diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/unit/go/gotify-server/source-sha.nix similarity index 100% rename from pkgs/servers/gotify/source-sha.nix rename to pkgs/unit/go/gotify-server/source-sha.nix diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/unit/go/gotify-server/ui.nix similarity index 100% rename from pkgs/servers/gotify/ui.nix rename to pkgs/unit/go/gotify-server/ui.nix diff --git a/pkgs/servers/gotify/update.sh b/pkgs/unit/go/gotify-server/update.sh similarity index 100% rename from pkgs/servers/gotify/update.sh rename to pkgs/unit/go/gotify-server/update.sh diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/unit/go/gotify-server/vendor-sha.nix similarity index 100% rename from pkgs/servers/gotify/vendor-sha.nix rename to pkgs/unit/go/gotify-server/vendor-sha.nix diff --git a/pkgs/servers/gotify/version.nix b/pkgs/unit/go/gotify-server/version.nix similarity index 100% rename from pkgs/servers/gotify/version.nix rename to pkgs/unit/go/gotify-server/version.nix diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/unit/go/gotify-server/yarndeps.nix similarity index 100% rename from pkgs/servers/gotify/yarndeps.nix rename to pkgs/unit/go/gotify-server/yarndeps.nix diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/unit/go/gotktrix/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/gotktrix/default.nix rename to pkgs/unit/go/gotktrix/pkg-fun.nix diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/unit/go/gotools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gotools/default.nix rename to pkgs/unit/go/gotools/pkg-fun.nix diff --git a/pkgs/development/tools/gotools/setup-hook.sh b/pkgs/unit/go/gotools/setup-hook.sh similarity index 100% rename from pkgs/development/tools/gotools/setup-hook.sh rename to pkgs/unit/go/gotools/setup-hook.sh diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/unit/go/gotrue-supabase/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gotrue/supabase.nix rename to pkgs/unit/go/gotrue-supabase/pkg-fun.nix diff --git a/pkgs/tools/security/gotrue/default.nix b/pkgs/unit/go/gotrue/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gotrue/default.nix rename to pkgs/unit/go/gotrue/pkg-fun.nix diff --git a/pkgs/servers/gotty/default.nix b/pkgs/unit/go/gotty/pkg-fun.nix similarity index 100% rename from pkgs/servers/gotty/default.nix rename to pkgs/unit/go/gotty/pkg-fun.nix diff --git a/pkgs/games/gotypist/default.nix b/pkgs/unit/go/gotypist/pkg-fun.nix similarity index 100% rename from pkgs/games/gotypist/default.nix rename to pkgs/unit/go/gotypist/pkg-fun.nix diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/unit/go/gource/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gource/default.nix rename to pkgs/unit/go/gource/pkg-fun.nix diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/unit/go/govc/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/govc/default.nix rename to pkgs/unit/go/govc/pkg-fun.nix diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/unit/go/govendor/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/govendor/default.nix rename to pkgs/unit/go/govendor/pkg-fun.nix diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/unit/go/govers/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/govers/default.nix rename to pkgs/unit/go/govers/pkg-fun.nix diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/unit/go/govulncheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/govulncheck/default.nix rename to pkgs/unit/go/govulncheck/pkg-fun.nix diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/unit/go/gowitness/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/gowitness/default.nix rename to pkgs/unit/go/gowitness/pkg-fun.nix diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/unit/go/gox/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gox/default.nix rename to pkgs/unit/go/gox/pkg-fun.nix diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/unit/go/goxel/disable-imgui_ini.patch similarity index 100% rename from pkgs/applications/graphics/goxel/disable-imgui_ini.patch rename to pkgs/unit/go/goxel/disable-imgui_ini.patch diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/unit/go/goxel/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/goxel/default.nix rename to pkgs/unit/go/goxel/pkg-fun.nix diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/unit/gp/gp2c/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/pari/gp2c.nix rename to pkgs/unit/gp/gp2c/pkg-fun.nix diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/unit/gp/gpa/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gpa/default.nix rename to pkgs/unit/gp/gpa/pkg-fun.nix diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/unit/gp/gpac/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/gpac/default.nix rename to pkgs/unit/gp/gpac/pkg-fun.nix diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/unit/gp/gpart/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/gpart/default.nix rename to pkgs/unit/gp/gpart/pkg-fun.nix diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/unit/gp/gparted/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gparted/default.nix rename to pkgs/unit/gp/gparted/pkg-fun.nix diff --git a/pkgs/tools/misc/gparted/polkit.patch b/pkgs/unit/gp/gparted/polkit.patch similarity index 100% rename from pkgs/tools/misc/gparted/polkit.patch rename to pkgs/unit/gp/gparted/polkit.patch diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/unit/gp/gperf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gperf/default.nix rename to pkgs/unit/gp/gperf/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gperf/gperf-ar-fix.patch b/pkgs/unit/gp/gperf_3_0/gperf-ar-fix.patch similarity index 100% rename from pkgs/development/tools/misc/gperf/gperf-ar-fix.patch rename to pkgs/unit/gp/gperf_3_0/gperf-ar-fix.patch diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/unit/gp/gperf_3_0/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gperf/3.0.x.nix rename to pkgs/unit/gp/gperf_3_0/pkg-fun.nix diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/unit/gp/gperftools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gperftools/default.nix rename to pkgs/unit/gp/gperftools/pkg-fun.nix diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/unit/gp/gpg-mdp/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gpg-mdp/default.nix rename to pkgs/unit/gp/gpg-mdp/pkg-fun.nix diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/unit/gp/gphoto2/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gphoto2/default.nix rename to pkgs/unit/gp/gphoto2/pkg-fun.nix diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/unit/gp/gphoto2fs/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gphoto2/gphotofs.nix rename to pkgs/unit/gp/gphoto2fs/pkg-fun.nix diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/unit/gp/gphotos-sync/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/gphotos-sync/default.nix rename to pkgs/unit/gp/gphotos-sync/pkg-fun.nix diff --git a/pkgs/tools/backup/gphotos-sync/skip-network-tests.patch b/pkgs/unit/gp/gphotos-sync/skip-network-tests.patch similarity index 100% rename from pkgs/tools/backup/gphotos-sync/skip-network-tests.patch rename to pkgs/unit/gp/gphotos-sync/skip-network-tests.patch diff --git a/pkgs/tools/misc/gpick/dot-version.patch b/pkgs/unit/gp/gpick/dot-version.patch similarity index 100% rename from pkgs/tools/misc/gpick/dot-version.patch rename to pkgs/unit/gp/gpick/dot-version.patch diff --git a/pkgs/tools/misc/gpick/default.nix b/pkgs/unit/gp/gpick/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gpick/default.nix rename to pkgs/unit/gp/gpick/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/unit/gp/gpio-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kernel/gpio-utils.nix rename to pkgs/unit/gp/gpio-utils/pkg-fun.nix diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/pkgs/unit/gp/gpodder/disable-autoupdate.patch similarity index 100% rename from pkgs/applications/audio/gpodder/disable-autoupdate.patch rename to pkgs/unit/gp/gpodder/disable-autoupdate.patch diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/unit/gp/gpodder/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gpodder/default.nix rename to pkgs/unit/gp/gpodder/pkg-fun.nix diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/unit/gp/gpp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gpp/default.nix rename to pkgs/unit/gp/gpp/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/unit/gp/gprbuild-boot/gpr-project-path-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh rename to pkgs/unit/gp/gprbuild-boot/gpr-project-path-hook.sh diff --git a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml b/pkgs/unit/gp/gprbuild-boot/nixpkgs-gnat.xml similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml rename to pkgs/unit/gp/gprbuild-boot/nixpkgs-gnat.xml diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/unit/gp/gprbuild-boot/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/boot.nix rename to pkgs/unit/gp/gprbuild-boot/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/gprbuild/default.nix b/pkgs/unit/gp/gprbuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/default.nix rename to pkgs/unit/gp/gprbuild/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/unit/gp/gprojector/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/gprojector/default.nix rename to pkgs/unit/gp/gprojector/pkg-fun.nix diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/unit/gp/gprolog/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gprolog/default.nix rename to pkgs/unit/gp/gprolog/pkg-fun.nix diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/unit/gp/gpscorrelate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gpscorrelate/default.nix rename to pkgs/unit/gp/gpscorrelate/pkg-fun.nix diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/unit/gp/gpsd/pkg-fun.nix similarity index 100% rename from pkgs/servers/gpsd/default.nix rename to pkgs/unit/gp/gpsd/pkg-fun.nix diff --git a/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/pkgs/unit/gp/gpsd/sconstruct-env-fixes.patch similarity index 100% rename from pkgs/servers/gpsd/sconstruct-env-fixes.patch rename to pkgs/unit/gp/gpsd/sconstruct-env-fixes.patch diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/unit/gp/gpsprune/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gpsprune/default.nix rename to pkgs/unit/gp/gpsprune/pkg-fun.nix diff --git a/pkgs/tools/text/gpt2tc/0001-add-python-shebang.patch b/pkgs/unit/gp/gpt2tc/0001-add-python-shebang.patch similarity index 100% rename from pkgs/tools/text/gpt2tc/0001-add-python-shebang.patch rename to pkgs/unit/gp/gpt2tc/0001-add-python-shebang.patch diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/unit/gp/gpt2tc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gpt2tc/default.nix rename to pkgs/unit/gp/gpt2tc/pkg-fun.nix diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/unit/gp/gptfdisk/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gptfdisk/default.nix rename to pkgs/unit/gp/gptfdisk/pkg-fun.nix diff --git a/pkgs/tools/system/gptfdisk/popt-1-19.patch b/pkgs/unit/gp/gptfdisk/popt-1-19.patch similarity index 100% rename from pkgs/tools/system/gptfdisk/popt-1-19.patch rename to pkgs/unit/gp/gptfdisk/popt-1-19.patch diff --git a/pkgs/tools/system/gptfdisk/uuid.patch b/pkgs/unit/gp/gptfdisk/uuid.patch similarity index 100% rename from pkgs/tools/system/gptfdisk/uuid.patch rename to pkgs/unit/gp/gptfdisk/uuid.patch diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/unit/gp/gptman/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gptman/default.nix rename to pkgs/unit/gp/gptman/pkg-fun.nix diff --git a/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch b/pkgs/unit/gp/gpu-screen-recorder-gtk/fix-nvfbc-check.patch similarity index 100% rename from pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch rename to pkgs/unit/gp/gpu-screen-recorder-gtk/fix-nvfbc-check.patch diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/unit/gp/gpu-screen-recorder-gtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix rename to pkgs/unit/gp/gpu-screen-recorder-gtk/pkg-fun.nix diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/unit/gp/gpu-switch/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/gpu-switch/default.nix rename to pkgs/unit/gp/gpu-switch/pkg-fun.nix diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/unit/gp/gputils/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/gputils/default.nix rename to pkgs/unit/gp/gputils/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gpuvis/default.nix b/pkgs/unit/gp/gpuvis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gpuvis/default.nix rename to pkgs/unit/gp/gpuvis/pkg-fun.nix diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/unit/gp/gpx-viewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gpx-viewer/default.nix rename to pkgs/unit/gp/gpx-viewer/pkg-fun.nix diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/unit/gp/gpx/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gpx/default.nix rename to pkgs/unit/gp/gpx/pkg-fun.nix diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/unit/gq/gqview/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gqview/default.nix rename to pkgs/unit/gq/gqview/pkg-fun.nix diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/unit/gr/grab-site/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/grab-site/default.nix rename to pkgs/unit/gr/grab-site/pkg-fun.nix diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/unit/gr/grabserial/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/grabserial/default.nix rename to pkgs/unit/gr/grabserial/pkg-fun.nix diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/unit/gr/gradle-completion/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/gradle-completion/default.nix rename to pkgs/unit/gr/gradle-completion/pkg-fun.nix diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/unit/gr/gradm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/gradm/default.nix rename to pkgs/unit/gr/gradm/pkg-fun.nix diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/unit/gr/grafana-agent/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-agent/default.nix rename to pkgs/unit/gr/grafana-agent/pkg-fun.nix diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/unit/gr/grafana-image-renderer/package.json similarity index 100% rename from pkgs/servers/monitoring/grafana-image-renderer/package.json rename to pkgs/unit/gr/grafana-image-renderer/package.json diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/unit/gr/grafana-image-renderer/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-image-renderer/default.nix rename to pkgs/unit/gr/grafana-image-renderer/pkg-fun.nix diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/unit/gr/grafana-image-renderer/yarn.lock similarity index 100% rename from pkgs/servers/monitoring/grafana-image-renderer/yarn.lock rename to pkgs/unit/gr/grafana-image-renderer/yarn.lock diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/unit/gr/grafana-image-renderer/yarn.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-image-renderer/yarn.nix rename to pkgs/unit/gr/grafana-image-renderer/yarn.nix diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/unit/gr/grafana-loki/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/loki/default.nix rename to pkgs/unit/gr/grafana-loki/pkg-fun.nix diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/unit/gr/grafana/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/grafana/default.nix rename to pkgs/unit/gr/grafana/pkg-fun.nix diff --git a/pkgs/servers/monitoring/grafana/update.sh b/pkgs/unit/gr/grafana/update.sh similarity index 100% rename from pkgs/servers/monitoring/grafana/update.sh rename to pkgs/unit/gr/grafana/update.sh diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/unit/gr/grafana_reporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/grafana-reporter/default.nix rename to pkgs/unit/gr/grafana_reporter/pkg-fun.nix diff --git a/pkgs/tools/misc/grafterm/default.nix b/pkgs/unit/gr/grafterm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/grafterm/default.nix rename to pkgs/unit/gr/grafterm/pkg-fun.nix diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/unit/gr/grafx2/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/grafx2/default.nix rename to pkgs/unit/gr/grafx2/pkg-fun.nix diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/unit/gr/grail/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/grail/default.nix rename to pkgs/unit/gr/grail/pkg-fun.nix diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/unit/gr/grantlee/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/grantlee/default.nix rename to pkgs/unit/gr/grantlee/pkg-fun.nix diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/unit/gr/grap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/grap/default.nix rename to pkgs/unit/gr/grap/pkg-fun.nix diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/unit/gr/graph-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/graph-cli/default.nix rename to pkgs/unit/gr/graph-cli/pkg-fun.nix diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/unit/gr/graph-easy/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/graph-easy/default.nix rename to pkgs/unit/gr/graph-easy/pkg-fun.nix diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/unit/gr/graphene-hardened-malloc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/graphene-hardened-malloc/default.nix rename to pkgs/unit/gr/graphene-hardened-malloc/pkg-fun.nix diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/unit/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch similarity index 100% rename from pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch rename to pkgs/unit/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/unit/gr/graphene/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/graphene/default.nix rename to pkgs/unit/gr/graphene/pkg-fun.nix diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/unit/gr/graphicsmagick-imagemagick-compat/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/graphicsmagick/compat.nix rename to pkgs/unit/gr/graphicsmagick-imagemagick-compat/pkg-fun.nix diff --git a/pkgs/applications/graphics/graphicsmagick/disable-popen.patch b/pkgs/unit/gr/graphicsmagick/disable-popen.patch similarity index 100% rename from pkgs/applications/graphics/graphicsmagick/disable-popen.patch rename to pkgs/unit/gr/graphicsmagick/disable-popen.patch diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/unit/gr/graphicsmagick/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/graphicsmagick/default.nix rename to pkgs/unit/gr/graphicsmagick/pkg-fun.nix diff --git a/pkgs/tools/security/graphinder/default.nix b/pkgs/unit/gr/graphinder/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/graphinder/default.nix rename to pkgs/unit/gr/graphinder/pkg-fun.nix diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/unit/gr/graphite-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/graphite-gtk-theme/default.nix rename to pkgs/unit/gr/graphite-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/unit/gr/graphite-kde-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/graphite-kde-theme/default.nix rename to pkgs/unit/gr/graphite-kde-theme/pkg-fun.nix diff --git a/pkgs/development/libraries/silgraphite/macosx.patch b/pkgs/unit/gr/graphite2/macosx.patch similarity index 100% rename from pkgs/development/libraries/silgraphite/macosx.patch rename to pkgs/unit/gr/graphite2/macosx.patch diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/unit/gr/graphite2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/silgraphite/graphite2.nix rename to pkgs/unit/gr/graphite2/pkg-fun.nix diff --git a/pkgs/tools/security/graphqlmap/default.nix b/pkgs/unit/gr/graphqlmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/graphqlmap/default.nix rename to pkgs/unit/gr/graphqlmap/pkg-fun.nix diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/unit/gr/graphs/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/graphs/default.nix rename to pkgs/unit/gr/graphs/pkg-fun.nix diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/unit/gr/graphw00f/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/graphw00f/default.nix rename to pkgs/unit/gr/graphw00f/pkg-fun.nix diff --git a/pkgs/games/graphwar/default.nix b/pkgs/unit/gr/graphwar/pkg-fun.nix similarity index 100% rename from pkgs/games/graphwar/default.nix rename to pkgs/unit/gr/graphwar/pkg-fun.nix diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/unit/gr/grass/no_symbolic_links.patch similarity index 100% rename from pkgs/applications/gis/grass/no_symbolic_links.patch rename to pkgs/unit/gr/grass/no_symbolic_links.patch diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/unit/gr/grass/pkg-fun.nix similarity index 100% rename from pkgs/applications/gis/grass/default.nix rename to pkgs/unit/gr/grass/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/unit/gr/gravit/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/gravit/default.nix rename to pkgs/unit/gr/gravit/pkg-fun.nix diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/unit/gr/graylog/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/graylog/default.nix rename to pkgs/unit/gr/graylog/pkg-fun.nix diff --git a/pkgs/applications/misc/grb/default.nix b/pkgs/unit/gr/grb/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/grb/default.nix rename to pkgs/unit/gr/grb/pkg-fun.nix diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/unit/gr/grcov/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/grcov/default.nix rename to pkgs/unit/gr/grcov/pkg-fun.nix diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/unit/gr/grepcidr/pkg-fun.nix similarity index 100% rename from pkgs/applications/search/grepcidr/default.nix rename to pkgs/unit/gr/grepcidr/pkg-fun.nix diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/unit/gr/grepm/pkg-fun.nix similarity index 100% rename from pkgs/applications/search/grepm/default.nix rename to pkgs/unit/gr/grepm/pkg-fun.nix diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/unit/gr/gretl/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/gretl/default.nix rename to pkgs/unit/gr/gretl/pkg-fun.nix diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/unit/gr/greybird/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/greybird/default.nix rename to pkgs/unit/gr/greybird/pkg-fun.nix diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/unit/gr/gridtracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/gridtracker/default.nix rename to pkgs/unit/gr/gridtracker/pkg-fun.nix diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/unit/gr/grig/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/grig/default.nix rename to pkgs/unit/gr/grig/pkg-fun.nix diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/unit/gr/grilo-plugins/chromaprint-gst-plugins.patch similarity index 100% rename from pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch rename to pkgs/unit/gr/grilo-plugins/chromaprint-gst-plugins.patch diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/unit/gr/grilo-plugins/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/grilo-plugins/default.nix rename to pkgs/unit/gr/grilo-plugins/pkg-fun.nix diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/unit/gr/grilo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/grilo/default.nix rename to pkgs/unit/gr/grilo/pkg-fun.nix diff --git a/pkgs/development/libraries/grilo/setup-hook.sh b/pkgs/unit/gr/grilo/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/grilo/setup-hook.sh rename to pkgs/unit/gr/grilo/setup-hook.sh diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/unit/gr/grim/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/grim/default.nix rename to pkgs/unit/gr/grim/pkg-fun.nix diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/unit/gr/grin/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/grin/default.nix rename to pkgs/unit/gr/grin/pkg-fun.nix diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/unit/gr/grip-search/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/grip-search/default.nix rename to pkgs/unit/gr/grip-search/pkg-fun.nix diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/unit/gr/grip/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/grip/default.nix rename to pkgs/unit/gr/grip/pkg-fun.nix diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/unit/gr/grit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/grit/default.nix rename to pkgs/unit/gr/grit/pkg-fun.nix diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/unit/gr/grive2/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/grive2/default.nix rename to pkgs/unit/gr/grive2/pkg-fun.nix diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/unit/gr/grml-zsh-config/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/grml-zsh-config/default.nix rename to pkgs/unit/gr/grml-zsh-config/pkg-fun.nix diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/unit/gr/grobi/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/grobi/default.nix rename to pkgs/unit/gr/grobi/pkg-fun.nix diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/unit/gr/grocy/0001-Define-configs-with-env-vars.patch similarity index 100% rename from pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch rename to pkgs/unit/gr/grocy/0001-Define-configs-with-env-vars.patch diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/unit/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch similarity index 100% rename from pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch rename to pkgs/unit/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch diff --git a/pkgs/servers/grocy/default.nix b/pkgs/unit/gr/grocy/pkg-fun.nix similarity index 100% rename from pkgs/servers/grocy/default.nix rename to pkgs/unit/gr/grocy/pkg-fun.nix diff --git a/pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch b/pkgs/unit/gr/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch similarity index 100% rename from pkgs/tools/text/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch rename to pkgs/unit/gr/groff/0001-Fix-cross-compilation-by-looking-for-ar.patch diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/unit/gr/groff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/groff/default.nix rename to pkgs/unit/gr/groff/pkg-fun.nix diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/unit/gr/groff/site.tmac similarity index 100% rename from pkgs/tools/text/groff/site.tmac rename to pkgs/unit/gr/groff/site.tmac diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/unit/gr/gron/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gron/default.nix rename to pkgs/unit/gr/gron/pkg-fun.nix diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/unit/gr/groonga/pkg-fun.nix similarity index 100% rename from pkgs/servers/search/groonga/default.nix rename to pkgs/unit/gr/groonga/pkg-fun.nix diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/unit/gr/groove/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/programming/groove/default.nix rename to pkgs/unit/gr/groove/pkg-fun.nix diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/unit/gr/groovy/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/groovy/default.nix rename to pkgs/unit/gr/groovy/pkg-fun.nix diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/unit/gr/grpc-client-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/grpc-client-cli/default.nix rename to pkgs/unit/gr/grpc-client-cli/pkg-fun.nix diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/unit/gr/grpc-gateway/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/grpc-gateway/default.nix rename to pkgs/unit/gr/grpc-gateway/pkg-fun.nix diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/unit/gr/grpc-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/grpc-tools/default.nix rename to pkgs/unit/gr/grpc-tools/pkg-fun.nix diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/unit/gr/grpcui/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/grpcui/default.nix rename to pkgs/unit/gr/grpcui/pkg-fun.nix diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/unit/gr/grpcurl/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/grpcurl/default.nix rename to pkgs/unit/gr/grpcurl/pkg-fun.nix diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/unit/gr/grsync/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/grsync/default.nix rename to pkgs/unit/gr/grsync/pkg-fun.nix diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/pkgs/unit/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg similarity index 100% rename from pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg rename to pkgs/unit/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/pkgs/unit/gr/grub2_pvgrub_image/configs/grub.cfg similarity index 100% rename from pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg rename to pkgs/unit/gr/grub2_pvgrub_image/configs/grub.cfg diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/unit/gr/grub2_pvgrub_image/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/grub/pvgrub_image/default.nix rename to pkgs/unit/gr/grub2_pvgrub_image/pkg-fun.nix diff --git a/pkgs/data/themes/gruvbox-dark-gtk/default.nix b/pkgs/unit/gr/gruvbox-dark-gtk/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/gruvbox-dark-gtk/default.nix rename to pkgs/unit/gr/gruvbox-dark-gtk/pkg-fun.nix diff --git a/pkgs/data/themes/gruvbox-gtk-theme/default.nix b/pkgs/unit/gr/gruvbox-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/gruvbox-gtk-theme/default.nix rename to pkgs/unit/gr/gruvbox-gtk-theme/pkg-fun.nix diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/unit/gr/grype/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/grype/default.nix rename to pkgs/unit/gr/grype/pkg-fun.nix diff --git a/pkgs/development/libraries/gsasl/gsasl.patch b/pkgs/unit/gs/gsasl/gsasl.patch similarity index 100% rename from pkgs/development/libraries/gsasl/gsasl.patch rename to pkgs/unit/gs/gsasl/gsasl.patch diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/unit/gs/gsasl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsasl/default.nix rename to pkgs/unit/gs/gsasl/pkg-fun.nix diff --git a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch b/pkgs/unit/gs/gscan2pdf/ffmpeg5-compat.patch similarity index 100% rename from pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch rename to pkgs/unit/gs/gscan2pdf/ffmpeg5-compat.patch diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/unit/gs/gscan2pdf/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gscan2pdf/default.nix rename to pkgs/unit/gs/gscan2pdf/pkg-fun.nix diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/unit/gs/gsctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gsctl/default.nix rename to pkgs/unit/gs/gsctl/pkg-fun.nix diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/unit/gs/gsettings-desktop-schemas/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsettings-desktop-schemas/default.nix rename to pkgs/unit/gs/gsettings-desktop-schemas/pkg-fun.nix diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/unit/gs/gshhg-gmt/pkg-fun.nix similarity index 100% rename from pkgs/applications/gis/gmt/gshhg.nix rename to pkgs/unit/gs/gshhg-gmt/pkg-fun.nix diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/unit/gs/gsimplecal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gsimplecal/default.nix rename to pkgs/unit/gs/gsimplecal/pkg-fun.nix diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/unit/gs/gsl-lite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsl-lite/default.nix rename to pkgs/unit/gs/gsl-lite/pkg-fun.nix diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/unit/gs/gsl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsl/default.nix rename to pkgs/unit/gs/gsl/pkg-fun.nix diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/unit/gs/gsm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsm/default.nix rename to pkgs/unit/gs/gsm/pkg-fun.nix diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/unit/gs/gsmartcontrol/fix-paths.patch similarity index 100% rename from pkgs/tools/misc/gsmartcontrol/fix-paths.patch rename to pkgs/unit/gs/gsmartcontrol/fix-paths.patch diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/unit/gs/gsmartcontrol/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gsmartcontrol/default.nix rename to pkgs/unit/gs/gsmartcontrol/pkg-fun.nix diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/unit/gs/gsoap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsoap/default.nix rename to pkgs/unit/gs/gsoap/pkg-fun.nix diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/unit/gs/gsound/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gsound/default.nix rename to pkgs/unit/gs/gsound/pkg-fun.nix diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/unit/gs/gspeech/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gspeech/default.nix rename to pkgs/unit/gs/gspeech/pkg-fun.nix diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/unit/gs/gspell/0001-Darwin-build-fix.patch similarity index 100% rename from pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch rename to pkgs/unit/gs/gspell/0001-Darwin-build-fix.patch diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/unit/gs/gspell/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gspell/default.nix rename to pkgs/unit/gs/gspell/pkg-fun.nix diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/unit/gs/gss/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gss/default.nix rename to pkgs/unit/gs/gss/pkg-fun.nix diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/unit/gs/gssdp-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gssdp/tools.nix rename to pkgs/unit/gs/gssdp-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/gssdp/standalone-tools.patch b/pkgs/unit/gs/gssdp-tools/standalone-tools.patch similarity index 100% rename from pkgs/development/libraries/gssdp/standalone-tools.patch rename to pkgs/unit/gs/gssdp-tools/standalone-tools.patch diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/unit/gs/gssdp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gssdp/default.nix rename to pkgs/unit/gs/gssdp/pkg-fun.nix diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/unit/gs/gssdp_1_6/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gssdp/1.6.nix rename to pkgs/unit/gs/gssdp_1_6/pkg-fun.nix diff --git a/pkgs/applications/version-management/gst/default.nix b/pkgs/unit/gs/gst/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/gst/default.nix rename to pkgs/unit/gs/gst/pkg-fun.nix diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/unit/gt/gt/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/gt/default.nix rename to pkgs/unit/gt/gt/pkg-fun.nix diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/unit/gt/gt5/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/gt5/default.nix rename to pkgs/unit/gt/gt5/pkg-fun.nix diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/unit/gt/gtdialog/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtdialog/default.nix rename to pkgs/unit/gt/gtdialog/pkg-fun.nix diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/unit/gt/gtest/fix-cmake-config-includedir.patch similarity index 100% rename from pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch rename to pkgs/unit/gt/gtest/fix-cmake-config-includedir.patch diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/unit/gt/gtest/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtest/default.nix rename to pkgs/unit/gt/gtest/pkg-fun.nix diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/unit/gt/gtg/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/gtg/default.nix rename to pkgs/unit/gt/gtg/pkg-fun.nix diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/unit/gt/gthree/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gthree/default.nix rename to pkgs/unit/gt/gthree/pkg-fun.nix diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/unit/gt/gthumb/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/gthumb/default.nix rename to pkgs/unit/gt/gthumb/pkg-fun.nix diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/unit/gt/gti/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gti/default.nix rename to pkgs/unit/gt/gti/pkg-fun.nix diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/unit/gt/gtk-doc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/documentation/gtk-doc/default.nix rename to pkgs/unit/gt/gtk-doc/pkg-fun.nix diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/unit/gt/gtk-doc/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch rename to pkgs/unit/gt/gtk-doc/respect-xml-catalog-files-var.patch diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/unit/gt/gtk-engine-bluecurve/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtk-engine-bluecurve/default.nix rename to pkgs/unit/gt/gtk-engine-bluecurve/pkg-fun.nix diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/unit/gt/gtk-engine-murrine/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtk-engine-murrine/default.nix rename to pkgs/unit/gt/gtk-engine-murrine/pkg-fun.nix diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/unit/gt/gtk-frdp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtk-frdp/default.nix rename to pkgs/unit/gt/gtk-frdp/pkg-fun.nix diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/unit/gt/gtk-layer-shell/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtk-layer-shell/default.nix rename to pkgs/unit/gt/gtk-layer-shell/pkg-fun.nix diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/unit/gt/gtk-mac-bundler/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/gtk-mac-bundler/default.nix rename to pkgs/unit/gt/gtk-mac-bundler/pkg-fun.nix diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/unit/gt/gtk-server/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/gtk-server/default.nix rename to pkgs/unit/gt/gtk-server/pkg-fun.nix diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/unit/gt/gtk-sharp-beans/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp-beans/default.nix rename to pkgs/unit/gt/gtk-sharp-beans/pkg-fun.nix diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/unit/gt/gtk-vnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/gtk-vnc/default.nix rename to pkgs/unit/gt/gtk-vnc/pkg-fun.nix diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/unit/gt/gtk2fontsel/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gtk2fontsel/default.nix rename to pkgs/unit/gt/gtk2fontsel/pkg-fun.nix diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/unit/gt/gtk_engines/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtk-engines/default.nix rename to pkgs/unit/gt/gtk_engines/pkg-fun.nix diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/unit/gt/gtkcord4/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gtkcord4/default.nix rename to pkgs/unit/gt/gtkcord4/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/unit/gt/gtkdatabox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkdatabox/default.nix rename to pkgs/unit/gt/gtkdatabox/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/unit/gt/gtkdialog/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gtkdialog/default.nix rename to pkgs/unit/gt/gtkdialog/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/unit/gt/gtkextra/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkextra/default.nix rename to pkgs/unit/gt/gtkextra/pkg-fun.nix diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/unit/gt/gtkgnutella/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/p2p/gtk-gnutella/default.nix rename to pkgs/unit/gt/gtkgnutella/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/unit/gt/gtkimageview/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkimageview/default.nix rename to pkgs/unit/gt/gtkimageview/pkg-fun.nix diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/unit/gt/gtklock/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/gtklock/default.nix rename to pkgs/unit/gt/gtklock/pkg-fun.nix diff --git a/pkgs/tools/misc/gtklp/patches/autoconf.patch b/pkgs/unit/gt/gtklp/patches/autoconf.patch similarity index 100% rename from pkgs/tools/misc/gtklp/patches/autoconf.patch rename to pkgs/unit/gt/gtklp/patches/autoconf.patch diff --git a/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch b/pkgs/unit/gt/gtklp/patches/mdv-fix-str-fmt.patch similarity index 100% rename from pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch rename to pkgs/unit/gt/gtklp/patches/mdv-fix-str-fmt.patch diff --git a/pkgs/tools/misc/gtklp/default.nix b/pkgs/unit/gt/gtklp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gtklp/default.nix rename to pkgs/unit/gt/gtklp/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/unit/gt/gtkmm2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/2.x.nix rename to pkgs/unit/gt/gtkmm2/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/unit/gt/gtkmm3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/3.x.nix rename to pkgs/unit/gt/gtkmm3/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/unit/gt/gtkmm4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/4.x.nix rename to pkgs/unit/gt/gtkmm4/pkg-fun.nix diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/unit/gt/gtkperf/bench.patch similarity index 100% rename from pkgs/development/tools/misc/gtkperf/bench.patch rename to pkgs/unit/gt/gtkperf/bench.patch diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/unit/gt/gtkperf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/gtkperf/default.nix rename to pkgs/unit/gt/gtkperf/pkg-fun.nix diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/unit/gt/gtkpod/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gtkpod/default.nix rename to pkgs/unit/gt/gtkpod/pkg-fun.nix diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/unit/gt/gtkradiant/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gtkradiant/default.nix rename to pkgs/unit/gt/gtkradiant/pkg-fun.nix diff --git a/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch b/pkgs/unit/gt/gtksourceview3/3.x-nix_share_path.patch similarity index 100% rename from pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch rename to pkgs/unit/gt/gtksourceview3/3.x-nix_share_path.patch diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/unit/gt/gtksourceview3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtksourceview/3.x.nix rename to pkgs/unit/gt/gtksourceview3/pkg-fun.nix diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/unit/gt/gtksourceviewmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtksourceviewmm/default.nix rename to pkgs/unit/gt/gtksourceviewmm/pkg-fun.nix diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/unit/gt/gtksourceviewmm4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtksourceviewmm/4.x.nix rename to pkgs/unit/gt/gtksourceviewmm4/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/unit/gt/gtkspell2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkspell/default.nix rename to pkgs/unit/gt/gtkspell2/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/unit/gt/gtkspell3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkspell/3.nix rename to pkgs/unit/gt/gtkspell3/pkg-fun.nix diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/unit/gt/gtkspellmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gtkspellmm/default.nix rename to pkgs/unit/gt/gtkspellmm/pkg-fun.nix diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/unit/gt/gtkterm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gtkterm/default.nix rename to pkgs/unit/gt/gtkterm/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/pkgs/unit/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch similarity index 100% rename from pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch rename to pkgs/unit/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch diff --git a/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/pkgs/unit/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch similarity index 100% rename from pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch rename to pkgs/unit/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/unit/gt/gtkwave/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/gtkwave/default.nix rename to pkgs/unit/gt/gtkwave/pkg-fun.nix diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/unit/gt/gtranslator/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gtranslator/default.nix rename to pkgs/unit/gt/gtranslator/pkg-fun.nix diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/unit/gt/gts/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gts/default.nix rename to pkgs/unit/gt/gts/pkg-fun.nix diff --git a/pkgs/games/gtypist/default.nix b/pkgs/unit/gt/gtypist/pkg-fun.nix similarity index 100% rename from pkgs/games/gtypist/default.nix rename to pkgs/unit/gt/gtypist/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/unit/gu/guake/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/guake/default.nix rename to pkgs/unit/gu/guake/pkg-fun.nix diff --git a/pkgs/tools/networking/guardian-agent/deps.nix b/pkgs/unit/gu/guardian-agent/deps.nix similarity index 100% rename from pkgs/tools/networking/guardian-agent/deps.nix rename to pkgs/unit/gu/guardian-agent/deps.nix diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/unit/gu/guardian-agent/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/guardian-agent/default.nix rename to pkgs/unit/gu/guardian-agent/pkg-fun.nix diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/unit/gu/gubbi-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gubbi/default.nix rename to pkgs/unit/gu/gubbi-font/pkg-fun.nix diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/unit/gu/gucci/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/gucci/default.nix rename to pkgs/unit/gu/gucci/pkg-fun.nix diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/unit/gu/guestfs-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/guestfs-tools/default.nix rename to pkgs/unit/gu/guestfs-tools/pkg-fun.nix diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/unit/gu/guetzli/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/guetzli/default.nix rename to pkgs/unit/gu/guetzli/pkg-fun.nix diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/unit/gu/guff/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/guff/default.nix rename to pkgs/unit/gu/guff/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/unit/gu/guile-cairo/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-cairo/default.nix rename to pkgs/unit/gu/guile-cairo/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/unit/gu/guile-commonmark/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-commonmark/default.nix rename to pkgs/unit/gu/guile-commonmark/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-config/default.nix b/pkgs/unit/gu/guile-config/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-config/default.nix rename to pkgs/unit/gu/guile-config/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/unit/gu/guile-fibers/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-fibers/default.nix rename to pkgs/unit/gu/guile-fibers/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/unit/gu/guile-gcrypt/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-gcrypt/default.nix rename to pkgs/unit/gu/guile-gcrypt/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/unit/gu/guile-git/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-git/default.nix rename to pkgs/unit/gu/guile-git/pkg-fun.nix diff --git a/pkgs/development/tools/guile/guile-hall/default.nix b/pkgs/unit/gu/guile-hall/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/guile/guile-hall/default.nix rename to pkgs/unit/gu/guile-hall/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/unit/gu/guile-json/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-json/default.nix rename to pkgs/unit/gu/guile-json/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/unit/gu/guile-lib/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-lib/default.nix rename to pkgs/unit/gu/guile-lib/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/unit/gu/guile-ncurses/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ncurses/default.nix rename to pkgs/unit/gu/guile-ncurses/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/unit/gu/guile-opengl/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-opengl/default.nix rename to pkgs/unit/gu/guile-opengl/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/unit/gu/guile-reader/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-reader/default.nix rename to pkgs/unit/gu/guile-reader/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/unit/gu/guile-sdl/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-sdl/default.nix rename to pkgs/unit/gu/guile-sdl/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/unit/gu/guile-sdl2/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-sdl2/default.nix rename to pkgs/unit/gu/guile-sdl2/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-sqlite3/default.nix b/pkgs/unit/gu/guile-sqlite3/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-sqlite3/default.nix rename to pkgs/unit/gu/guile-sqlite3/pkg-fun.nix diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/unit/gu/guile-ssh/pkg-fun.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ssh/default.nix rename to pkgs/unit/gu/guile-ssh/pkg-fun.nix diff --git a/pkgs/development/interpreters/guile/CVE-2016-8605.patch b/pkgs/unit/gu/guile_1_8/CVE-2016-8605.patch similarity index 100% rename from pkgs/development/interpreters/guile/CVE-2016-8605.patch rename to pkgs/unit/gu/guile_1_8/CVE-2016-8605.patch diff --git a/pkgs/development/interpreters/guile/cpp-4.5.patch b/pkgs/unit/gu/guile_1_8/cpp-4.5.patch similarity index 100% rename from pkgs/development/interpreters/guile/cpp-4.5.patch rename to pkgs/unit/gu/guile_1_8/cpp-4.5.patch diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/unit/gu/guile_1_8/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/guile/1.8.nix rename to pkgs/unit/gu/guile_1_8/pkg-fun.nix diff --git a/pkgs/development/interpreters/guile/setup-hook-1.8.sh b/pkgs/unit/gu/guile_1_8/setup-hook-1.8.sh similarity index 100% rename from pkgs/development/interpreters/guile/setup-hook-1.8.sh rename to pkgs/unit/gu/guile_1_8/setup-hook-1.8.sh diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/unit/gu/gum/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gum/default.nix rename to pkgs/unit/gu/gum/pkg-fun.nix diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/unit/gu/gumbo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gumbo/default.nix rename to pkgs/unit/gu/gumbo/pkg-fun.nix diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/unit/gu/gummi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gummi/default.nix rename to pkgs/unit/gu/gummi/pkg-fun.nix diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/unit/gu/gummy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/gummy/default.nix rename to pkgs/unit/gu/gummy/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/unit/gu/gup/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/gup/default.nix rename to pkgs/unit/gu/gup/pkg-fun.nix diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/unit/gu/gupnp-av/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gupnp-av/default.nix rename to pkgs/unit/gu/gupnp-av/pkg-fun.nix diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/unit/gu/gupnp-dlna/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gupnp-dlna/default.nix rename to pkgs/unit/gu/gupnp-dlna/pkg-fun.nix diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/unit/gu/gupnp-igd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gupnp-igd/default.nix rename to pkgs/unit/gu/gupnp-igd/pkg-fun.nix diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/unit/gu/gupnp-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gupnp-tools/default.nix rename to pkgs/unit/gu/gupnp-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch b/pkgs/unit/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch similarity index 100% rename from pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch rename to pkgs/unit/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/unit/gu/gupnp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gupnp/default.nix rename to pkgs/unit/gu/gupnp/pkg-fun.nix diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/unit/gu/gupnp_1_6/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gupnp/1.6.nix rename to pkgs/unit/gu/gupnp_1_6/pkg-fun.nix diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/unit/gu/gurobi/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/gurobi/default.nix rename to pkgs/unit/gu/gurobi/pkg-fun.nix diff --git a/pkgs/development/libraries/gusb/fix-python-path.patch b/pkgs/unit/gu/gusb/fix-python-path.patch similarity index 100% rename from pkgs/development/libraries/gusb/fix-python-path.patch rename to pkgs/unit/gu/gusb/fix-python-path.patch diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/unit/gu/gusb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gusb/default.nix rename to pkgs/unit/gu/gusb/pkg-fun.nix diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/unit/gu/gutenprint/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/gutenprint/default.nix rename to pkgs/unit/gu/gutenprint/pkg-fun.nix diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/unit/gu/gutenprintBin/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/gutenprint/bin.nix rename to pkgs/unit/gu/gutenprintBin/pkg-fun.nix diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/unit/gv/gv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gv/default.nix rename to pkgs/unit/gv/gv/pkg-fun.nix diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/unit/gv/gvfs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gvfs/default.nix rename to pkgs/unit/gv/gvfs/pkg-fun.nix diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/unit/gv/gvisor/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/gvisor/default.nix rename to pkgs/unit/gv/gvisor/pkg-fun.nix diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/unit/gv/gvm-libs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gvm-libs/default.nix rename to pkgs/unit/gv/gvm-libs/pkg-fun.nix diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/unit/gv/gvolicon/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/gvolicon/default.nix rename to pkgs/unit/gv/gvolicon/pkg-fun.nix diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/unit/gv/gvpe/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gvpe/default.nix rename to pkgs/unit/gv/gvpe/pkg-fun.nix diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/unit/gv/gvproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/gvproxy/default.nix rename to pkgs/unit/gv/gvproxy/pkg-fun.nix diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/unit/gw/gwc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gwc/default.nix rename to pkgs/unit/gw/gwc/pkg-fun.nix diff --git a/pkgs/games/gweled/default.nix b/pkgs/unit/gw/gweled/pkg-fun.nix similarity index 100% rename from pkgs/games/gweled/default.nix rename to pkgs/unit/gw/gweled/pkg-fun.nix diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/unit/gw/gwt240/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/gwt/2.4.0.nix rename to pkgs/unit/gw/gwt240/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/pkgs/unit/gw/gwyddion/codegen.patch similarity index 100% rename from pkgs/applications/science/chemistry/gwyddion/codegen.patch rename to pkgs/unit/gw/gwyddion/codegen.patch diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/unit/gw/gwyddion/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/gwyddion/default.nix rename to pkgs/unit/gw/gwyddion/pkg-fun.nix diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/unit/gx/gx-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/gx/go/default.nix rename to pkgs/unit/gx/gx-go/pkg-fun.nix diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/unit/gx/gx/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/gx/default.nix rename to pkgs/unit/gx/gx/pkg-fun.nix diff --git a/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch b/pkgs/unit/gx/gxemul/0001-fix-attributes.patch similarity index 100% rename from pkgs/applications/emulators/gxemul/0001-fix-attributes.patch rename to pkgs/unit/gx/gxemul/0001-fix-attributes.patch diff --git a/pkgs/applications/emulators/gxemul/default.nix b/pkgs/unit/gx/gxemul/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/gxemul/default.nix rename to pkgs/unit/gx/gxemul/pkg-fun.nix diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/unit/gx/gxkb/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gxkb/default.nix rename to pkgs/unit/gx/gxkb/pkg-fun.nix diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/unit/gx/gxmatcheq-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gxmatcheq-lv2/default.nix rename to pkgs/unit/gx/gxmatcheq-lv2/pkg-fun.nix diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/unit/gx/gxmessage/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/gxmessage/default.nix rename to pkgs/unit/gx/gxmessage/pkg-fun.nix diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/unit/gx/gxplugins-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/gxplugins-lv2/default.nix rename to pkgs/unit/gx/gxplugins-lv2/pkg-fun.nix diff --git a/pkgs/tools/backup/gyb/default.nix b/pkgs/unit/gy/gyb/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/gyb/default.nix rename to pkgs/unit/gy/gyb/pkg-fun.nix diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/unit/gy/gyre-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/gyre/default.nix rename to pkgs/unit/gy/gyre-fonts/pkg-fun.nix diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/unit/gz/gzdoom/pkg-fun.nix similarity index 100% rename from pkgs/games/gzdoom/default.nix rename to pkgs/unit/gz/gzdoom/pkg-fun.nix diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/unit/gz/gzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/gzip/default.nix rename to pkgs/unit/gz/gzip/pkg-fun.nix diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/unit/gz/gzrt/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/gzrt/default.nix rename to pkgs/unit/gz/gzrt/pkg-fun.nix diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/unit/h/h/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/h/default.nix rename to pkgs/unit/h/h/pkg-fun.nix diff --git a/pkgs/servers/h2/default.nix b/pkgs/unit/h2/h2/pkg-fun.nix similarity index 100% rename from pkgs/servers/h2/default.nix rename to pkgs/unit/h2/h2/pkg-fun.nix diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/unit/h2/h2o/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/h2o/default.nix rename to pkgs/unit/h2/h2o/pkg-fun.nix diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/unit/h3/h3/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/h3/default.nix rename to pkgs/unit/h3/h3/pkg-fun.nix diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/unit/ha/hack-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hack/default.nix rename to pkgs/unit/ha/hack-font/pkg-fun.nix diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/unit/ha/hackedbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/hackedbox/default.nix rename to pkgs/unit/ha/hackedbox/pkg-fun.nix diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/unit/ha/hackertyper/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hackertyper/default.nix rename to pkgs/unit/ha/hackertyper/pkg-fun.nix diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/unit/ha/hackgen-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hackgen/default.nix rename to pkgs/unit/ha/hackgen-font/pkg-fun.nix diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/unit/ha/hackgen-nf-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hackgen/nerdfont.nix rename to pkgs/unit/ha/hackgen-nf-font/pkg-fun.nix diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/unit/ha/hackneyed/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/hackneyed/default.nix rename to pkgs/unit/ha/hackneyed/pkg-fun.nix diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/unit/ha/hackrf/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/hackrf/default.nix rename to pkgs/unit/ha/hackrf/pkg-fun.nix diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/unit/ha/hacksaw/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hacksaw/default.nix rename to pkgs/unit/ha/hacksaw/pkg-fun.nix diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/unit/ha/hacpack/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/hacpack/default.nix rename to pkgs/unit/ha/hacpack/pkg-fun.nix diff --git a/pkgs/tools/compression/hactool/musl-compat.patch b/pkgs/unit/ha/hactool/musl-compat.patch similarity index 100% rename from pkgs/tools/compression/hactool/musl-compat.patch rename to pkgs/unit/ha/hactool/musl-compat.patch diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/unit/ha/hactool/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/hactool/default.nix rename to pkgs/unit/ha/hactool/pkg-fun.nix diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/unit/ha/haguichi/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/haguichi/default.nix rename to pkgs/unit/ha/haguichi/pkg-fun.nix diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/unit/ha/haka/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/haka/default.nix rename to pkgs/unit/ha/haka/pkg-fun.nix diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/unit/ha/hakrawler/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hakrawler/default.nix rename to pkgs/unit/ha/hakrawler/pkg-fun.nix diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/unit/ha/hakuneko/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hakuneko/default.nix rename to pkgs/unit/ha/hakuneko/pkg-fun.nix diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/unit/ha/half/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/half/default.nix rename to pkgs/unit/ha/half/pkg-fun.nix diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/unit/ha/halfempty/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/halfempty/default.nix rename to pkgs/unit/ha/halfempty/pkg-fun.nix diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/unit/ha/halibut/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/halibut/default.nix rename to pkgs/unit/ha/halibut/pkg-fun.nix diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/unit/ha/hamlib_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hamlib/default.nix rename to pkgs/unit/ha/hamlib_3/pkg-fun.nix diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/unit/ha/hamlib_4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hamlib/4.nix rename to pkgs/unit/ha/hamlib_4/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/unit/ha/hammer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/hammer/default.nix rename to pkgs/unit/ha/hammer/pkg-fun.nix diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/unit/ha/hamster/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hamster/default.nix rename to pkgs/unit/ha/hamster/pkg-fun.nix diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/unit/ha/hanazono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hanazono/default.nix rename to pkgs/unit/ha/hanazono/pkg-fun.nix diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/unit/ha/handlr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/handlr/default.nix rename to pkgs/unit/ha/handlr/pkg-fun.nix diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/unit/ha/hannom/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hannom/default.nix rename to pkgs/unit/ha/hannom/pkg-fun.nix diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/unit/ha/hans/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hans/default.nix rename to pkgs/unit/ha/hans/pkg-fun.nix diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/unit/ha/haproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/haproxy/default.nix rename to pkgs/unit/ha/haproxy/pkg-fun.nix diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/unit/ha/hardinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/hardinfo/default.nix rename to pkgs/unit/ha/hardinfo/pkg-fun.nix diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/unit/ha/harmonia/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/harmonia/default.nix rename to pkgs/unit/ha/harmonia/pkg-fun.nix diff --git a/pkgs/games/harmonist/default.nix b/pkgs/unit/ha/harmonist/pkg-fun.nix similarity index 100% rename from pkgs/games/harmonist/default.nix rename to pkgs/unit/ha/harmonist/pkg-fun.nix diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/unit/ha/harvid/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/harvid/default.nix rename to pkgs/unit/ha/harvid/pkg-fun.nix diff --git a/pkgs/tools/security/hash-identifier/default.nix b/pkgs/unit/ha/hash-identifier/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hash-identifier/default.nix rename to pkgs/unit/ha/hash-identifier/pkg-fun.nix diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/unit/ha/hash-slinger/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hash-slinger/default.nix rename to pkgs/unit/ha/hash-slinger/pkg-fun.nix diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/unit/ha/hashcash/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hashcash/default.nix rename to pkgs/unit/ha/hashcash/pkg-fun.nix diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/unit/ha/hashcat-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hashcat-utils/default.nix rename to pkgs/unit/ha/hashcat-utils/pkg-fun.nix diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/unit/ha/hashcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hashcat/default.nix rename to pkgs/unit/ha/hashcat/pkg-fun.nix diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/unit/ha/hashdeep/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hashdeep/default.nix rename to pkgs/unit/ha/hashdeep/pkg-fun.nix diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/unit/ha/hashi-ui/pkg-fun.nix similarity index 100% rename from pkgs/servers/hashi-ui/default.nix rename to pkgs/unit/ha/hashi-ui/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/unit/ha/hashi-up/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/hashi-up/default.nix rename to pkgs/unit/ha/hashi-up/pkg-fun.nix diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/unit/ha/hashit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hashit/default.nix rename to pkgs/unit/ha/hashit/pkg-fun.nix diff --git a/pkgs/development/interpreters/hashlink/hashlink.patch b/pkgs/unit/ha/hashlink/hashlink.patch similarity index 100% rename from pkgs/development/interpreters/hashlink/hashlink.patch rename to pkgs/unit/ha/hashlink/hashlink.patch diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/unit/ha/hashlink/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/hashlink/default.nix rename to pkgs/unit/ha/hashlink/pkg-fun.nix diff --git a/pkgs/tools/security/hashrat/default.nix b/pkgs/unit/ha/hashrat/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hashrat/default.nix rename to pkgs/unit/ha/hashrat/pkg-fun.nix diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/unit/ha/haskell-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix rename to pkgs/unit/ha/haskell-language-server/pkg-fun.nix diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/unit/ha/hasklig/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hasklig/default.nix rename to pkgs/unit/ha/hasklig/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/unit/ha/hasmail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/hasmail/default.nix rename to pkgs/unit/ha/hasmail/pkg-fun.nix diff --git a/pkgs/tools/misc/haste-client/Gemfile b/pkgs/unit/ha/haste-client/Gemfile similarity index 100% rename from pkgs/tools/misc/haste-client/Gemfile rename to pkgs/unit/ha/haste-client/Gemfile diff --git a/pkgs/tools/misc/haste-client/Gemfile.lock b/pkgs/unit/ha/haste-client/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/haste-client/Gemfile.lock rename to pkgs/unit/ha/haste-client/Gemfile.lock diff --git a/pkgs/tools/misc/haste-client/gemset.nix b/pkgs/unit/ha/haste-client/gemset.nix similarity index 100% rename from pkgs/tools/misc/haste-client/gemset.nix rename to pkgs/unit/ha/haste-client/gemset.nix diff --git a/pkgs/tools/misc/haste-client/default.nix b/pkgs/unit/ha/haste-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/haste-client/default.nix rename to pkgs/unit/ha/haste-client/pkg-fun.nix diff --git a/pkgs/servers/haste-server/node-composition.nix b/pkgs/unit/ha/haste-server/node-composition.nix similarity index 100% rename from pkgs/servers/haste-server/node-composition.nix rename to pkgs/unit/ha/haste-server/node-composition.nix diff --git a/pkgs/servers/haste-server/node-deps.nix b/pkgs/unit/ha/haste-server/node-deps.nix similarity index 100% rename from pkgs/servers/haste-server/node-deps.nix rename to pkgs/unit/ha/haste-server/node-deps.nix diff --git a/pkgs/development/web/netlify-cli/node-env.nix b/pkgs/unit/ha/haste-server/node-env.nix similarity index 100% rename from pkgs/development/web/netlify-cli/node-env.nix rename to pkgs/unit/ha/haste-server/node-env.nix diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/unit/ha/haste-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/haste-server/default.nix rename to pkgs/unit/ha/haste-server/pkg-fun.nix diff --git a/pkgs/servers/haste-server/update.sh b/pkgs/unit/ha/haste-server/update.sh similarity index 100% rename from pkgs/servers/haste-server/update.sh rename to pkgs/unit/ha/haste-server/update.sh diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/unit/ha/hasura-cli/pkg-fun.nix similarity index 100% rename from pkgs/servers/hasura/cli.nix rename to pkgs/unit/ha/hasura-cli/pkg-fun.nix diff --git a/pkgs/applications/emulators/hatari/default.nix b/pkgs/unit/ha/hatari/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/hatari/default.nix rename to pkgs/unit/ha/hatari/pkg-fun.nix diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/unit/ha/haunt/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/haunt/default.nix rename to pkgs/unit/ha/haunt/pkg-fun.nix diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/unit/ha/haveged/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/haveged/default.nix rename to pkgs/unit/ha/haveged/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/unit/ha/havoc/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/havoc/default.nix rename to pkgs/unit/ha/havoc/pkg-fun.nix diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/unit/ha/hawknl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hawknl/default.nix rename to pkgs/unit/ha/hawknl/pkg-fun.nix diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/unit/ha/haxor-news/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/haxor-news/default.nix rename to pkgs/unit/ha/haxor-news/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/unit/hc/hci/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/hci/default.nix rename to pkgs/unit/hc/hci/pkg-fun.nix diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/unit/hc/hcl2json/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hcl2json/default.nix rename to pkgs/unit/hc/hcl2json/pkg-fun.nix diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/unit/hc/hclfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hclfmt/default.nix rename to pkgs/unit/hc/hclfmt/pkg-fun.nix diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/unit/hc/hcloud/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hcloud/default.nix rename to pkgs/unit/hc/hcloud/pkg-fun.nix diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/unit/hc/hcxdumptool/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hcxdumptool/default.nix rename to pkgs/unit/hc/hcxdumptool/pkg-fun.nix diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/unit/hc/hcxtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hcxtools/default.nix rename to pkgs/unit/hc/hcxtools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/unit/hd/hd-idle/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/hd-idle/default.nix rename to pkgs/unit/hd/hd-idle/pkg-fun.nix diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/unit/hd/hdaps-gl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hdaps-gl/default.nix rename to pkgs/unit/hd/hdaps-gl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/unit/hd/hdapsd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/hdapsd/default.nix rename to pkgs/unit/hd/hdapsd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hdapsd/postInstall.sh b/pkgs/unit/hd/hdapsd/postInstall.sh similarity index 100% rename from pkgs/os-specific/linux/hdapsd/postInstall.sh rename to pkgs/unit/hd/hdapsd/postInstall.sh diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/unit/hd/hdate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hdate/default.nix rename to pkgs/unit/hd/hdate/pkg-fun.nix diff --git a/pkgs/tools/misc/hddtemp/byteswap.patch b/pkgs/unit/hd/hddtemp/byteswap.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/byteswap.patch rename to pkgs/unit/hd/hddtemp/byteswap.patch diff --git a/pkgs/tools/misc/hddtemp/dontwake.patch b/pkgs/unit/hd/hddtemp/dontwake.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/dontwake.patch rename to pkgs/unit/hd/hddtemp/dontwake.patch diff --git a/pkgs/tools/misc/hddtemp/execinfo.patch b/pkgs/unit/hd/hddtemp/execinfo.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/execinfo.patch rename to pkgs/unit/hd/hddtemp/execinfo.patch diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/unit/hd/hddtemp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hddtemp/default.nix rename to pkgs/unit/hd/hddtemp/pkg-fun.nix diff --git a/pkgs/tools/misc/hddtemp/satacmds.patch b/pkgs/unit/hd/hddtemp/satacmds.patch similarity index 100% rename from pkgs/tools/misc/hddtemp/satacmds.patch rename to pkgs/unit/hd/hddtemp/satacmds.patch diff --git a/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/pkgs/unit/hd/hdf4/darwin-aarch64.patch similarity index 100% rename from pkgs/tools/misc/hdf4/darwin-aarch64.patch rename to pkgs/unit/hd/hdf4/darwin-aarch64.patch diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/unit/hd/hdf4/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hdf4/default.nix rename to pkgs/unit/hd/hdf4/pkg-fun.nix diff --git a/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/pkgs/unit/hd/hdf5-blosc/blosc_filter.pc.in similarity index 100% rename from pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in rename to pkgs/unit/hd/hdf5-blosc/blosc_filter.pc.in diff --git a/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/pkgs/unit/hd/hdf5-blosc/no-external-blosc.patch similarity index 100% rename from pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch rename to pkgs/unit/hd/hdf5-blosc/no-external-blosc.patch diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/unit/hd/hdf5-blosc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hdf5-blosc/default.nix rename to pkgs/unit/hd/hdf5-blosc/pkg-fun.nix diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/unit/hd/hdf5_1_10/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hdf5/1.10.nix rename to pkgs/unit/hd/hdf5_1_10/pkg-fun.nix diff --git a/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch b/pkgs/unit/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch similarity index 100% rename from pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch rename to pkgs/unit/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/unit/hd/hdfview/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hdfview/default.nix rename to pkgs/unit/hd/hdfview/pkg-fun.nix diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/unit/hd/hdhomerun-config-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/hdhomerun-config-gui/default.nix rename to pkgs/unit/hd/hdhomerun-config-gui/pkg-fun.nix diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/unit/hd/hdl-dump/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hdl-dump/default.nix rename to pkgs/unit/hd/hdl-dump/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/unit/hd/hdparm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/hdparm/default.nix rename to pkgs/unit/hd/hdparm/pkg-fun.nix diff --git a/pkgs/misc/hdt/default.nix b/pkgs/unit/hd/hdt/pkg-fun.nix similarity index 100% rename from pkgs/misc/hdt/default.nix rename to pkgs/unit/hd/hdt/pkg-fun.nix diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/unit/he/HentaiAtHome/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/HentaiAtHome/default.nix rename to pkgs/unit/he/HentaiAtHome/pkg-fun.nix diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/unit/he/headlines/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/headlines/default.nix rename to pkgs/unit/he/headlines/pkg-fun.nix diff --git a/pkgs/servers/headphones/default.nix b/pkgs/unit/he/headphones/pkg-fun.nix similarity index 100% rename from pkgs/servers/headphones/default.nix rename to pkgs/unit/he/headphones/pkg-fun.nix diff --git a/pkgs/servers/headscale/default.nix b/pkgs/unit/he/headscale/pkg-fun.nix similarity index 100% rename from pkgs/servers/headscale/default.nix rename to pkgs/unit/he/headscale/pkg-fun.nix diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/unit/he/headset-charge-indicator/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/headset-charge-indicator/default.nix rename to pkgs/unit/he/headset-charge-indicator/pkg-fun.nix diff --git a/pkgs/applications/audio/headset/default.nix b/pkgs/unit/he/headset/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/headset/default.nix rename to pkgs/unit/he/headset/pkg-fun.nix diff --git a/pkgs/tools/audio/headsetcontrol/default.nix b/pkgs/unit/he/headsetcontrol/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/headsetcontrol/default.nix rename to pkgs/unit/he/headsetcontrol/pkg-fun.nix diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/unit/he/health-check/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/health-check/default.nix rename to pkgs/unit/he/health-check/pkg-fun.nix diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/unit/he/healthchecks/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/healthchecks/default.nix rename to pkgs/unit/he/healthchecks/pkg-fun.nix diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/unit/he/heatseeker/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/heatseeker/default.nix rename to pkgs/unit/he/heatseeker/pkg-fun.nix diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/unit/he/heatshrink/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/heatshrink/default.nix rename to pkgs/unit/he/heatshrink/pkg-fun.nix diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/unit/he/hebcal/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hebcal/default.nix rename to pkgs/unit/he/hebcal/pkg-fun.nix diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/unit/he/hecate/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/hecate/default.nix rename to pkgs/unit/he/hecate/pkg-fun.nix diff --git a/pkgs/tools/admin/hedgedoc-cli/default.nix b/pkgs/unit/he/hedgedoc-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/hedgedoc-cli/default.nix rename to pkgs/unit/he/hedgedoc-cli/pkg-fun.nix diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/unit/he/heisenbridge/pkg-fun.nix similarity index 100% rename from pkgs/servers/heisenbridge/default.nix rename to pkgs/unit/he/heisenbridge/pkg-fun.nix diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/unit/he/helio-workstation/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/helio-workstation/default.nix rename to pkgs/unit/he/helio-workstation/pkg-fun.nix diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/unit/he/helix/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/helix/default.nix rename to pkgs/unit/he/helix/pkg-fun.nix diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/unit/he/hello-unfree/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hello-unfree/default.nix rename to pkgs/unit/he/hello-unfree/pkg-fun.nix diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/unit/he/hello-wayland/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/hello-wayland/default.nix rename to pkgs/unit/he/hello-wayland/pkg-fun.nix diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/unit/he/hello/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hello/default.nix rename to pkgs/unit/he/hello/pkg-fun.nix diff --git a/pkgs/applications/misc/hello/test.nix b/pkgs/unit/he/hello/test.nix similarity index 100% rename from pkgs/applications/misc/hello/test.nix rename to pkgs/unit/he/hello/test.nix diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/unit/he/helm-docs/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm-docs/default.nix rename to pkgs/unit/he/helm-docs/pkg-fun.nix diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/unit/he/helm/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/helm/default.nix rename to pkgs/unit/he/helm/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/unit/he/helmfile/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/helmfile/default.nix rename to pkgs/unit/he/helmfile/pkg-fun.nix diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/unit/he/helmholtz/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/helmholtz/default.nix rename to pkgs/unit/he/helmholtz/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/unit/he/helmsman/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/helmsman/default.nix rename to pkgs/unit/he/helmsman/pkg-fun.nix diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/unit/he/help2man/1.40.4-cygwin-nls.patch similarity index 100% rename from pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch rename to pkgs/unit/he/help2man/1.40.4-cygwin-nls.patch diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/unit/he/help2man/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/help2man/default.nix rename to pkgs/unit/he/help2man/pkg-fun.nix diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/unit/he/helvetica-neue-lt-std/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/helvetica-neue-lt-std/default.nix rename to pkgs/unit/he/helvetica-neue-lt-std/pkg-fun.nix diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/unit/he/helvum/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/helvum/default.nix rename to pkgs/unit/he/helvum/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/unit/he/hepmc2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/hepmc2/default.nix rename to pkgs/unit/he/hepmc2/pkg-fun.nix diff --git a/pkgs/development/compilers/heptagon/default.nix b/pkgs/unit/he/heptagon/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/heptagon/default.nix rename to pkgs/unit/he/heptagon/pkg-fun.nix diff --git a/pkgs/applications/misc/herbe/default.nix b/pkgs/unit/he/herbe/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/herbe/default.nix rename to pkgs/unit/he/herbe/pkg-fun.nix diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/unit/he/herbstluftwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/herbstluftwm/default.nix rename to pkgs/unit/he/herbstluftwm/pkg-fun.nix diff --git a/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch b/pkgs/unit/he/herbstluftwm/test-path-environment.patch similarity index 100% rename from pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch rename to pkgs/unit/he/herbstluftwm/test-path-environment.patch diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/unit/he/hercules-ci-agent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix rename to pkgs/unit/he/hercules-ci-agent/pkg-fun.nix diff --git a/pkgs/applications/emulators/hercules/default.nix b/pkgs/unit/he/hercules/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/hercules/default.nix rename to pkgs/unit/he/hercules/pkg-fun.nix diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/unit/he/hermit/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hermit/default.nix rename to pkgs/unit/he/hermit/pkg-fun.nix diff --git a/pkgs/games/heroic/package.json b/pkgs/unit/he/heroic-unwrapped/package.json similarity index 100% rename from pkgs/games/heroic/package.json rename to pkgs/unit/he/heroic-unwrapped/package.json diff --git a/pkgs/games/heroic/default.nix b/pkgs/unit/he/heroic-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/games/heroic/default.nix rename to pkgs/unit/he/heroic-unwrapped/pkg-fun.nix diff --git a/pkgs/games/heroic/yarn.lock b/pkgs/unit/he/heroic-unwrapped/yarn.lock similarity index 100% rename from pkgs/games/heroic/yarn.lock rename to pkgs/unit/he/heroic-unwrapped/yarn.lock diff --git a/pkgs/games/heroic/yarn.nix b/pkgs/unit/he/heroic-unwrapped/yarn.nix similarity index 100% rename from pkgs/games/heroic/yarn.nix rename to pkgs/unit/he/heroic-unwrapped/yarn.nix diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/unit/he/heroku/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/heroku/default.nix rename to pkgs/unit/he/heroku/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/unit/he/herwig/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/herwig/default.nix rename to pkgs/unit/he/herwig/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch b/pkgs/unit/he/hetzner-kube/fix-home.patch similarity index 100% rename from pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch rename to pkgs/unit/he/hetzner-kube/fix-home.patch diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/unit/he/hetzner-kube/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/hetzner-kube/default.nix rename to pkgs/unit/he/hetzner-kube/pkg-fun.nix diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/unit/he/hevea/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/hevea/default.nix rename to pkgs/unit/he/hevea/pkg-fun.nix diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/unit/he/hex/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hex/default.nix rename to pkgs/unit/he/hex/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/unit/he/hexchat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/hexchat/default.nix rename to pkgs/unit/he/hexchat/pkg-fun.nix diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/unit/he/hexcurse/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/hexcurse/default.nix rename to pkgs/unit/he/hexcurse/pkg-fun.nix diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/unit/he/hexd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hexd/default.nix rename to pkgs/unit/he/hexd/pkg-fun.nix diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/unit/he/hexdino/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/hexdino/default.nix rename to pkgs/unit/he/hexdino/pkg-fun.nix diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/unit/he/hexedit/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/hexedit/default.nix rename to pkgs/unit/he/hexedit/pkg-fun.nix diff --git a/pkgs/games/hexgui/default.nix b/pkgs/unit/he/hexgui/pkg-fun.nix similarity index 100% rename from pkgs/games/hexgui/default.nix rename to pkgs/unit/he/hexgui/pkg-fun.nix diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/unit/he/hexio/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hexio/default.nix rename to pkgs/unit/he/hexio/pkg-fun.nix diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/unit/he/hexyl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hexyl/default.nix rename to pkgs/unit/he/hexyl/pkg-fun.nix diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/unit/he/hey/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hey/default.nix rename to pkgs/unit/he/hey/pkg-fun.nix diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/unit/hf/hfinger/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hfinger/default.nix rename to pkgs/unit/hf/hfinger/pkg-fun.nix diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/unit/hf/hfsprogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/hfsprogs/default.nix rename to pkgs/unit/hf/hfsprogs/pkg-fun.nix diff --git a/pkgs/games/hhexen/default.nix b/pkgs/unit/hh/hhexen/pkg-fun.nix similarity index 100% rename from pkgs/games/hhexen/default.nix rename to pkgs/unit/hh/hhexen/pkg-fun.nix diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/unit/hh/hhpc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hhpc/default.nix rename to pkgs/unit/hh/hhpc/pkg-fun.nix diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/unit/hi/hiawatha/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/hiawatha/default.nix rename to pkgs/unit/hi/hiawatha/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hibernate/gen-manpages.patch b/pkgs/unit/hi/hibernate/gen-manpages.patch similarity index 100% rename from pkgs/os-specific/linux/hibernate/gen-manpages.patch rename to pkgs/unit/hi/hibernate/gen-manpages.patch diff --git a/pkgs/os-specific/linux/hibernate/hibernate.patch b/pkgs/unit/hi/hibernate/hibernate.patch similarity index 100% rename from pkgs/os-specific/linux/hibernate/hibernate.patch rename to pkgs/unit/hi/hibernate/hibernate.patch diff --git a/pkgs/os-specific/linux/hibernate/install.patch b/pkgs/unit/hi/hibernate/install.patch similarity index 100% rename from pkgs/os-specific/linux/hibernate/install.patch rename to pkgs/unit/hi/hibernate/install.patch diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/unit/hi/hibernate/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/hibernate/default.nix rename to pkgs/unit/hi/hibernate/pkg-fun.nix diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/unit/hi/hicolor-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/hicolor-icon-theme/default.nix rename to pkgs/unit/hi/hicolor-icon-theme/pkg-fun.nix diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/unit/hi/hicolor-icon-theme/setup-hook.sh similarity index 100% rename from pkgs/data/icons/hicolor-icon-theme/setup-hook.sh rename to pkgs/unit/hi/hicolor-icon-theme/setup-hook.sh diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/unit/hi/hid-listen/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hid-listen/default.nix rename to pkgs/unit/hi/hid-listen/pkg-fun.nix diff --git a/pkgs/tools/misc/hid-tools/default.nix b/pkgs/unit/hi/hid-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hid-tools/default.nix rename to pkgs/unit/hi/hid-tools/pkg-fun.nix diff --git a/pkgs/tools/misc/hidrd/default.nix b/pkgs/unit/hi/hidrd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hidrd/default.nix rename to pkgs/unit/hi/hidrd/pkg-fun.nix diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile b/pkgs/unit/hi/hiera-eyaml/Gemfile similarity index 100% rename from pkgs/tools/system/hiera-eyaml/Gemfile rename to pkgs/unit/hi/hiera-eyaml/Gemfile diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/pkgs/unit/hi/hiera-eyaml/Gemfile.lock similarity index 100% rename from pkgs/tools/system/hiera-eyaml/Gemfile.lock rename to pkgs/unit/hi/hiera-eyaml/Gemfile.lock diff --git a/pkgs/tools/system/hiera-eyaml/gemset.nix b/pkgs/unit/hi/hiera-eyaml/gemset.nix similarity index 100% rename from pkgs/tools/system/hiera-eyaml/gemset.nix rename to pkgs/unit/hi/hiera-eyaml/gemset.nix diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/unit/hi/hiera-eyaml/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/hiera-eyaml/default.nix rename to pkgs/unit/hi/hiera-eyaml/pkg-fun.nix diff --git a/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch b/pkgs/unit/hi/higan/001-include-cmath.patch similarity index 100% rename from pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch rename to pkgs/unit/hi/higan/001-include-cmath.patch diff --git a/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch b/pkgs/unit/hi/higan/002-sips-to-png2icns.patch similarity index 100% rename from pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch rename to pkgs/unit/hi/higan/002-sips-to-png2icns.patch diff --git a/pkgs/applications/emulators/bsnes/higan/default.nix b/pkgs/unit/hi/higan/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/bsnes/higan/default.nix rename to pkgs/unit/hi/higan/pkg-fun.nix diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/unit/hi/highfive/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/highfive/default.nix rename to pkgs/unit/hi/highfive/pkg-fun.nix diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/unit/hi/highlight-assertions/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/highlight-assertions/default.nix rename to pkgs/unit/hi/highlight-assertions/pkg-fun.nix diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/unit/hi/hikounomizu/pkg-fun.nix similarity index 100% rename from pkgs/games/hikounomizu/default.nix rename to pkgs/unit/hi/hikounomizu/pkg-fun.nix diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/unit/hi/hilbish/pkg-fun.nix similarity index 100% rename from pkgs/shells/hilbish/default.nix rename to pkgs/unit/hi/hilbish/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/unit/hi/hime/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/hime/default.nix rename to pkgs/unit/hi/hime/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/unit/hi/hipchat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/hipchat/default.nix rename to pkgs/unit/hi/hipchat/pkg-fun.nix diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/unit/hi/hiredis-vip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hiredis-vip/default.nix rename to pkgs/unit/hi/hiredis-vip/pkg-fun.nix diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/unit/hi/hiredis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hiredis/default.nix rename to pkgs/unit/hi/hiredis/pkg-fun.nix diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/unit/hi/hisat2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/hisat2/default.nix rename to pkgs/unit/hi/hisat2/pkg-fun.nix diff --git a/pkgs/servers/hitch/default.nix b/pkgs/unit/hi/hitch/pkg-fun.nix similarity index 100% rename from pkgs/servers/hitch/default.nix rename to pkgs/unit/hi/hitch/pkg-fun.nix diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/unit/hi/hivelytracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/hivelytracker/default.nix rename to pkgs/unit/hi/hivelytracker/pkg-fun.nix diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/unit/hi/hivemind/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hivemind/default.nix rename to pkgs/unit/hi/hivemind/pkg-fun.nix diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/unit/hj/hjson-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hjson-go/default.nix rename to pkgs/unit/hj/hjson-go/pkg-fun.nix diff --git a/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/pkgs/unit/hl/hledger-check-fancyassertions/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/hledger-check-fancyassertions/default.nix rename to pkgs/unit/hl/hledger-check-fancyassertions/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/unit/hl/hll2390dw-cups/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/hll2390dw-cups/default.nix rename to pkgs/unit/hl/hll2390dw-cups/pkg-fun.nix diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/unit/hm/hmat-oss/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hmat-oss/default.nix rename to pkgs/unit/hm/hmat-oss/pkg-fun.nix diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/unit/hm/hmmer/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/hmmer/default.nix rename to pkgs/unit/hm/hmmer/pkg-fun.nix diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/unit/ho/hol/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/hol/default.nix rename to pkgs/unit/ho/hol/pkg-fun.nix diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/unit/ho/holo-build/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/holo-build/default.nix rename to pkgs/unit/ho/holo-build/pkg-fun.nix diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/unit/ho/holochain-launcher/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/holochain-launcher/default.nix rename to pkgs/unit/ho/holochain-launcher/pkg-fun.nix diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/unit/ho/hologram/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/hologram/default.nix rename to pkgs/unit/ho/hologram/pkg-fun.nix diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/unit/ho/home-assistant-cli/pkg-fun.nix similarity index 100% rename from pkgs/servers/home-assistant/cli.nix rename to pkgs/unit/ho/home-assistant-cli/pkg-fun.nix diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/unit/ho/home-assistant/component-packages.nix similarity index 100% rename from pkgs/servers/home-assistant/component-packages.nix rename to pkgs/unit/ho/home-assistant/component-packages.nix diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/unit/ho/home-assistant/frontend.nix similarity index 100% rename from pkgs/servers/home-assistant/frontend.nix rename to pkgs/unit/ho/home-assistant/frontend.nix diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/unit/ho/home-assistant/patches/ffmpeg-path.patch similarity index 100% rename from pkgs/servers/home-assistant/patches/ffmpeg-path.patch rename to pkgs/unit/ho/home-assistant/patches/ffmpeg-path.patch diff --git a/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch b/pkgs/unit/ho/home-assistant/patches/tests-mock-source-ip.patch similarity index 100% rename from pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch rename to pkgs/unit/ho/home-assistant/patches/tests-mock-source-ip.patch diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/unit/ho/home-assistant/pkg-fun.nix similarity index 100% rename from pkgs/servers/home-assistant/default.nix rename to pkgs/unit/ho/home-assistant/pkg-fun.nix diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/unit/ho/home-assistant/tests.nix similarity index 100% rename from pkgs/servers/home-assistant/tests.nix rename to pkgs/unit/ho/home-assistant/tests.nix diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/unit/ho/home-manager/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/home-manager/default.nix rename to pkgs/unit/ho/home-manager/pkg-fun.nix diff --git a/pkgs/tools/misc/homesick/Gemfile b/pkgs/unit/ho/homesick/Gemfile similarity index 100% rename from pkgs/tools/misc/homesick/Gemfile rename to pkgs/unit/ho/homesick/Gemfile diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/unit/ho/homesick/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/homesick/Gemfile.lock rename to pkgs/unit/ho/homesick/Gemfile.lock diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/unit/ho/homesick/gemset.nix similarity index 100% rename from pkgs/tools/misc/homesick/gemset.nix rename to pkgs/unit/ho/homesick/gemset.nix diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/unit/ho/homesick/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/homesick/default.nix rename to pkgs/unit/ho/homesick/pkg-fun.nix diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/unit/ho/honcho/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/honcho/default.nix rename to pkgs/unit/ho/honcho/pkg-fun.nix diff --git a/pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/pkgs/unit/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch similarity index 100% rename from pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch rename to pkgs/unit/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/unit/ho/honeycomb-refinery/pkg-fun.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/refinery/default.nix rename to pkgs/unit/ho/honeycomb-refinery/pkg-fun.nix diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/unit/ho/honeymarker/pkg-fun.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/honeymarker/default.nix rename to pkgs/unit/ho/honeymarker/pkg-fun.nix diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix b/pkgs/unit/ho/honeymarker/versions.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/honeymarker/versions.nix rename to pkgs/unit/ho/honeymarker/versions.nix diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/unit/ho/honeytail/pkg-fun.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/honeytail/default.nix rename to pkgs/unit/ho/honeytail/pkg-fun.nix diff --git a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix b/pkgs/unit/ho/honeytail/versions.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/honeytail/versions.nix rename to pkgs/unit/ho/honeytail/versions.nix diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/unit/ho/honeytrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/honeytrap/default.nix rename to pkgs/unit/ho/honeytrap/pkg-fun.nix diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/unit/ho/honeyvent/pkg-fun.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/honeyvent/default.nix rename to pkgs/unit/ho/honeyvent/pkg-fun.nix diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix b/pkgs/unit/ho/honeyvent/versions.nix similarity index 100% rename from pkgs/servers/tracing/honeycomb/honeyvent/versions.nix rename to pkgs/unit/ho/honeyvent/versions.nix diff --git a/pkgs/servers/honk/default.nix b/pkgs/unit/ho/honk/pkg-fun.nix similarity index 100% rename from pkgs/servers/honk/default.nix rename to pkgs/unit/ho/honk/pkg-fun.nix diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/unit/ho/hop/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/hop/default.nix rename to pkgs/unit/ho/hop/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/unit/ho/hoppet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/hoppet/default.nix rename to pkgs/unit/ho/hoppet/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/unit/ho/horizon-eda/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/horizon-eda/default.nix rename to pkgs/unit/ho/horizon-eda/pkg-fun.nix diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/unit/ho/horst/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/horst/default.nix rename to pkgs/unit/ho/horst/pkg-fun.nix diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/unit/ho/hostapd-mana/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hostapd-mana/default.nix rename to pkgs/unit/ho/hostapd-mana/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/unit/ho/hostapd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/hostapd/default.nix rename to pkgs/unit/ho/hostapd/pkg-fun.nix diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/unit/ho/hostctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/hostctl/default.nix rename to pkgs/unit/ho/hostctl/pkg-fun.nix diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/unit/ho/hostess/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hostess/default.nix rename to pkgs/unit/ho/hostess/pkg-fun.nix diff --git a/pkgs/tools/networking/hostname-debian/default.nix b/pkgs/unit/ho/hostname-debian/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hostname-debian/default.nix rename to pkgs/unit/ho/hostname-debian/pkg-fun.nix diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/unit/ho/hostsblock/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hostsblock/default.nix rename to pkgs/unit/ho/hostsblock/pkg-fun.nix diff --git a/pkgs/development/libraries/hotpatch/no-loader-test.patch b/pkgs/unit/ho/hotpatch/no-loader-test.patch similarity index 100% rename from pkgs/development/libraries/hotpatch/no-loader-test.patch rename to pkgs/unit/ho/hotpatch/no-loader-test.patch diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/unit/ho/hotpatch/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hotpatch/default.nix rename to pkgs/unit/ho/hotpatch/pkg-fun.nix diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/unit/ho/hottext/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/hottext/default.nix rename to pkgs/unit/ho/hottext/pkg-fun.nix diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/unit/ho/houdini/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/houdini/default.nix rename to pkgs/unit/ho/houdini/pkg-fun.nix diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/unit/ho/houdini/runtime.nix similarity index 100% rename from pkgs/applications/misc/houdini/runtime.nix rename to pkgs/unit/ho/houdini/runtime.nix diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/unit/ho/hound/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/hound/default.nix rename to pkgs/unit/ho/hound/pkg-fun.nix diff --git a/pkgs/development/tools/hover/fix-assets-path.patch b/pkgs/unit/ho/hover/fix-assets-path.patch similarity index 100% rename from pkgs/development/tools/hover/fix-assets-path.patch rename to pkgs/unit/ho/hover/fix-assets-path.patch diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/unit/ho/hover/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hover/default.nix rename to pkgs/unit/ho/hover/pkg-fun.nix diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/unit/ho/howard-hinnant-date/make-zoneinfo-available.diff similarity index 100% rename from pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff rename to pkgs/unit/ho/howard-hinnant-date/make-zoneinfo-available.diff diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/unit/ho/howard-hinnant-date/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/howard-hinnant-date/default.nix rename to pkgs/unit/ho/howard-hinnant-date/pkg-fun.nix diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/unit/ho/howl/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/howl/default.nix rename to pkgs/unit/ho/howl/pkg-fun.nix diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/unit/hp/hp2p/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hp2p/default.nix rename to pkgs/unit/hp/hp2p/pkg-fun.nix diff --git a/pkgs/tools/networking/hp2p/python3.patch b/pkgs/unit/hp/hp2p/python3.patch similarity index 100% rename from pkgs/tools/networking/hp2p/python3.patch rename to pkgs/unit/hp/hp2p/python3.patch diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/unit/hp/hpcg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hpcg/default.nix rename to pkgs/unit/hp/hpcg/pkg-fun.nix diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/unit/hp/hpe-ltfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/hpe-ltfs/default.nix rename to pkgs/unit/hp/hpe-ltfs/pkg-fun.nix diff --git a/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/pkgs/unit/hp/hpe-ltfs/remove-sysctl.patch similarity index 100% rename from pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch rename to pkgs/unit/hp/hpe-ltfs/remove-sysctl.patch diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/unit/hp/hping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hping/default.nix rename to pkgs/unit/hp/hping/pkg-fun.nix diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/unit/hp/hpl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hpl/default.nix rename to pkgs/unit/hp/hpl/pkg-fun.nix diff --git a/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch b/pkgs/unit/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch similarity index 100% rename from pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch rename to pkgs/unit/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/unit/hp/hplip/hplip.state similarity index 100% rename from pkgs/misc/drivers/hplip/hplip.state rename to pkgs/unit/hp/hplip/hplip.state diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/unit/hp/hplip/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/hplip/default.nix rename to pkgs/unit/hp/hplip/pkg-fun.nix diff --git a/pkgs/misc/drivers/hplip/revert-snprintf-change.patch b/pkgs/unit/hp/hplip/revert-snprintf-change.patch similarity index 100% rename from pkgs/misc/drivers/hplip/revert-snprintf-change.patch rename to pkgs/unit/hp/hplip/revert-snprintf-change.patch diff --git a/pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch b/pkgs/unit/hq/hqplayerd/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch rename to pkgs/unit/hq/hqplayerd/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/unit/hq/hqplayerd/pkg-fun.nix similarity index 100% rename from pkgs/servers/hqplayerd/default.nix rename to pkgs/unit/hq/hqplayerd/pkg-fun.nix diff --git a/pkgs/servers/hqplayerd/rygel.nix b/pkgs/unit/hq/hqplayerd/rygel.nix similarity index 100% rename from pkgs/servers/hqplayerd/rygel.nix rename to pkgs/unit/hq/hqplayerd/rygel.nix diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/unit/hr/hr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hr/default.nix rename to pkgs/unit/hr/hr/pkg-fun.nix diff --git a/pkgs/development/tools/hred/default.nix b/pkgs/unit/hr/hred/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/hred/default.nix rename to pkgs/unit/hr/hred/pkg-fun.nix diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/unit/hs/hsetroot/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/hsetroot/default.nix rename to pkgs/unit/hs/hsetroot/pkg-fun.nix diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/unit/hs/hspell/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hspell/default.nix rename to pkgs/unit/hs/hspell/pkg-fun.nix diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/unit/hs/hspellDicts/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hspell/dicts.nix rename to pkgs/unit/hs/hspellDicts/pkg-fun.nix diff --git a/pkgs/servers/pulseaudio/hsphfpd.nix b/pkgs/unit/hs/hsphfpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/pulseaudio/hsphfpd.nix rename to pkgs/unit/hs/hsphfpd/pkg-fun.nix diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/unit/hs/hsqldb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/hsqldb/default.nix rename to pkgs/unit/hs/hsqldb/pkg-fun.nix diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/unit/hs/hss/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hss/default.nix rename to pkgs/unit/hs/hss/pkg-fun.nix diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/unit/hs/hstr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hstr/default.nix rename to pkgs/unit/hs/hstr/pkg-fun.nix diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/unit/ht/ht/gcc7.patch similarity index 100% rename from pkgs/applications/editors/ht/gcc7.patch rename to pkgs/unit/ht/ht/gcc7.patch diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/unit/ht/ht/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/ht/default.nix rename to pkgs/unit/ht/ht/pkg-fun.nix diff --git a/pkgs/tools/misc/html-proofer/Gemfile b/pkgs/unit/ht/html-proofer/Gemfile similarity index 100% rename from pkgs/tools/misc/html-proofer/Gemfile rename to pkgs/unit/ht/html-proofer/Gemfile diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/unit/ht/html-proofer/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/html-proofer/Gemfile.lock rename to pkgs/unit/ht/html-proofer/Gemfile.lock diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/unit/ht/html-proofer/gemset.nix similarity index 100% rename from pkgs/tools/misc/html-proofer/gemset.nix rename to pkgs/unit/ht/html-proofer/gemset.nix diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/unit/ht/html-proofer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/html-proofer/default.nix rename to pkgs/unit/ht/html-proofer/pkg-fun.nix diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/unit/ht/html-tidy/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/html-tidy/default.nix rename to pkgs/unit/ht/html-tidy/pkg-fun.nix diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/unit/ht/html-xml-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/html-xml-utils/default.nix rename to pkgs/unit/ht/html-xml-utils/pkg-fun.nix diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/unit/ht/html2text/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/html2text/default.nix rename to pkgs/unit/ht/html2text/pkg-fun.nix diff --git a/pkgs/development/libraries/htmlcxx/c++17.patch b/pkgs/unit/ht/htmlcxx/c++17.patch similarity index 100% rename from pkgs/development/libraries/htmlcxx/c++17.patch rename to pkgs/unit/ht/htmlcxx/c++17.patch diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/unit/ht/htmlcxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/htmlcxx/default.nix rename to pkgs/unit/ht/htmlcxx/pkg-fun.nix diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/unit/ht/htmlcxx/ptrdiff.patch similarity index 100% rename from pkgs/development/libraries/htmlcxx/ptrdiff.patch rename to pkgs/unit/ht/htmlcxx/ptrdiff.patch diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/unit/ht/htmltest/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/htmltest/default.nix rename to pkgs/unit/ht/htmltest/pkg-fun.nix diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/unit/ht/htmlunit-driver/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/selenium/htmlunit-driver/default.nix rename to pkgs/unit/ht/htmlunit-driver/pkg-fun.nix diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/unit/ht/htop-vim/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/htop/htop-vim.nix rename to pkgs/unit/ht/htop-vim/pkg-fun.nix diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/unit/ht/htpdate/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/htpdate/default.nix rename to pkgs/unit/ht/htpdate/pkg-fun.nix diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/unit/ht/htslib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/biology/htslib/default.nix rename to pkgs/unit/ht/htslib/pkg-fun.nix diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/unit/ht/httm/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/httm/default.nix rename to pkgs/unit/ht/httm/pkg-fun.nix diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/unit/ht/http-getter/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/flent/http-getter.nix rename to pkgs/unit/ht/http-getter/pkg-fun.nix diff --git a/pkgs/development/libraries/http-parser/build-shared.patch b/pkgs/unit/ht/http-parser/build-shared.patch similarity index 100% rename from pkgs/development/libraries/http-parser/build-shared.patch rename to pkgs/unit/ht/http-parser/build-shared.patch diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/unit/ht/http-parser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/http-parser/default.nix rename to pkgs/unit/ht/http-parser/pkg-fun.nix diff --git a/pkgs/tools/networking/http2tcp/default.nix b/pkgs/unit/ht/http2tcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/http2tcp/default.nix rename to pkgs/unit/ht/http2tcp/pkg-fun.nix diff --git a/pkgs/common-updater/http-two-levels-updater.nix b/pkgs/unit/ht/httpTwoLevelsUpdater/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/http-two-levels-updater.nix rename to pkgs/unit/ht/httpTwoLevelsUpdater/pkg-fun.nix diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/unit/ht/httpdirfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/httpdirfs/default.nix rename to pkgs/unit/ht/httpdirfs/pkg-fun.nix diff --git a/pkgs/tools/security/httpdump/default.nix b/pkgs/unit/ht/httpdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/httpdump/default.nix rename to pkgs/unit/ht/httpdump/pkg-fun.nix diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/unit/ht/httperf/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/httperf/default.nix rename to pkgs/unit/ht/httperf/pkg-fun.nix diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/unit/ht/httpfs2/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/httpfs/default.nix rename to pkgs/unit/ht/httpfs2/pkg-fun.nix diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/unit/ht/httping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/httping/default.nix rename to pkgs/unit/ht/httping/pkg-fun.nix diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/unit/ht/httplab/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/httplab/default.nix rename to pkgs/unit/ht/httplab/pkg-fun.nix diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/unit/ht/httplib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/httplib/default.nix rename to pkgs/unit/ht/httplib/pkg-fun.nix diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/unit/ht/https-dns-proxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/https-dns-proxy/default.nix rename to pkgs/unit/ht/https-dns-proxy/pkg-fun.nix diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/unit/ht/httpstat/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/httpstat/default.nix rename to pkgs/unit/ht/httpstat/pkg-fun.nix diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/unit/ht/httptunnel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/httptunnel/default.nix rename to pkgs/unit/ht/httptunnel/pkg-fun.nix diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/unit/ht/httpunit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/httpunit/default.nix rename to pkgs/unit/ht/httpunit/pkg-fun.nix diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/unit/ht/httpx/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/httpx/default.nix rename to pkgs/unit/ht/httpx/pkg-fun.nix diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/unit/ht/httrack/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/httrack/default.nix rename to pkgs/unit/ht/httrack/pkg-fun.nix diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/unit/hu/hub/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/hub/default.nix rename to pkgs/unit/hu/hub/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/unit/hu/hubble/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/hubble/default.nix rename to pkgs/unit/hu/hubble/pkg-fun.nix diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/unit/hu/hubicfuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/hubicfuse/default.nix rename to pkgs/unit/hu/hubicfuse/pkg-fun.nix diff --git a/pkgs/data/fonts/hubot-sans/default.nix b/pkgs/unit/hu/hubot-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hubot-sans/default.nix rename to pkgs/unit/hu/hubot-sans/pkg-fun.nix diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/unit/hu/hubstaff/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hubstaff/default.nix rename to pkgs/unit/hu/hubstaff/pkg-fun.nix diff --git a/pkgs/tools/networking/hue-cli/Gemfile b/pkgs/unit/hu/hue-cli/Gemfile similarity index 100% rename from pkgs/tools/networking/hue-cli/Gemfile rename to pkgs/unit/hu/hue-cli/Gemfile diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/unit/hu/hue-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/networking/hue-cli/Gemfile.lock rename to pkgs/unit/hu/hue-cli/Gemfile.lock diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/unit/hu/hue-cli/gemset.nix similarity index 100% rename from pkgs/tools/networking/hue-cli/gemset.nix rename to pkgs/unit/hu/hue-cli/gemset.nix diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/unit/hu/hue-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hue-cli/default.nix rename to pkgs/unit/hu/hue-cli/pkg-fun.nix diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/unit/hu/hugo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/hugo/default.nix rename to pkgs/unit/hu/hugo/pkg-fun.nix diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/unit/hu/hugs/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/hugs/default.nix rename to pkgs/unit/hu/hugs/pkg-fun.nix diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/unit/hu/humanity-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/humanity-icon-theme/default.nix rename to pkgs/unit/hu/humanity-icon-theme/pkg-fun.nix diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/unit/hu/humioctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/logging/humioctl/default.nix rename to pkgs/unit/hu/humioctl/pkg-fun.nix diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/unit/hu/huniq/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/huniq/default.nix rename to pkgs/unit/hu/huniq/pkg-fun.nix diff --git a/pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch b/pkgs/unit/hu/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch similarity index 100% rename from pkgs/development/libraries/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch rename to pkgs/unit/hu/hunspell/0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/unit/hu/hunspell/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hunspell/default.nix rename to pkgs/unit/hu/hunspell/pkg-fun.nix diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/unit/hu/hunt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hunt/default.nix rename to pkgs/unit/hu/hunt/pkg-fun.nix diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/unit/hu/hurl/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hurl/default.nix rename to pkgs/unit/hu/hurl/pkg-fun.nix diff --git a/pkgs/applications/version-management/hut/default.nix b/pkgs/unit/hu/hut/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/hut/default.nix rename to pkgs/unit/hu/hut/pkg-fun.nix diff --git a/pkgs/development/compilers/hvm/default.nix b/pkgs/unit/hv/hvm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/hvm/default.nix rename to pkgs/unit/hv/hvm/pkg-fun.nix diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/unit/hw/hwatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hwatch/default.nix rename to pkgs/unit/hw/hwatch/pkg-fun.nix diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/unit/hw/hwdata/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/hwdata/default.nix rename to pkgs/unit/hw/hwdata/pkg-fun.nix diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/unit/hw/hwinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/hwinfo/default.nix rename to pkgs/unit/hw/hwinfo/pkg-fun.nix diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/unit/hw/hwloc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hwloc/default.nix rename to pkgs/unit/hw/hwloc/pkg-fun.nix diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/unit/hy/hydraAntLogger/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/hydra-ant-logger/default.nix rename to pkgs/unit/hy/hydraAntLogger/pkg-fun.nix diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/unit/hy/hydrogen_0/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/hydrogen/0.nix rename to pkgs/unit/hy/hydrogen_0/pkg-fun.nix diff --git a/pkgs/servers/hydron/default.nix b/pkgs/unit/hy/hydron/pkg-fun.nix similarity index 100% rename from pkgs/servers/hydron/default.nix rename to pkgs/unit/hy/hydron/pkg-fun.nix diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/unit/hy/hydroxide/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/hydroxide/default.nix rename to pkgs/unit/hy/hydroxide/pkg-fun.nix diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/unit/hy/hyena/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hyena/default.nix rename to pkgs/unit/hy/hyena/pkg-fun.nix diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/unit/hy/hyenae/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hyenae/default.nix rename to pkgs/unit/hy/hyenae/pkg-fun.nix diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/unit/hy/hyfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hyfetch/default.nix rename to pkgs/unit/hy/hyfetch/pkg-fun.nix diff --git a/pkgs/servers/hylafaxplus/config.site b/pkgs/unit/hy/hylafaxplus/config.site similarity index 100% rename from pkgs/servers/hylafaxplus/config.site rename to pkgs/unit/hy/hylafaxplus/config.site diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/unit/hy/hylafaxplus/libtiff-4.patch similarity index 100% rename from pkgs/servers/hylafaxplus/libtiff-4.patch rename to pkgs/unit/hy/hylafaxplus/libtiff-4.patch diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/unit/hy/hylafaxplus/pkg-fun.nix similarity index 100% rename from pkgs/servers/hylafaxplus/default.nix rename to pkgs/unit/hy/hylafaxplus/pkg-fun.nix diff --git a/pkgs/servers/hylafaxplus/post-install-check.sh b/pkgs/unit/hy/hylafaxplus/post-install-check.sh similarity index 100% rename from pkgs/servers/hylafaxplus/post-install-check.sh rename to pkgs/unit/hy/hylafaxplus/post-install-check.sh diff --git a/pkgs/servers/hylafaxplus/post-install.sh b/pkgs/unit/hy/hylafaxplus/post-install.sh similarity index 100% rename from pkgs/servers/hylafaxplus/post-install.sh rename to pkgs/unit/hy/hylafaxplus/post-install.sh diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/pkgs/unit/hy/hylafaxplus/post-patch.sh similarity index 100% rename from pkgs/servers/hylafaxplus/post-patch.sh rename to pkgs/unit/hy/hylafaxplus/post-patch.sh diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/unit/hy/hyp/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/hyp/default.nix rename to pkgs/unit/hy/hyp/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/unit/hy/hyp2mat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/hyp2mat/default.nix rename to pkgs/unit/hy/hyp2mat/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/unit/hy/hyper/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/hyper/default.nix rename to pkgs/unit/hy/hyper/pkg-fun.nix diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/unit/hy/hyperledger-fabric/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/hyperledger-fabric/default.nix rename to pkgs/unit/hy/hyperledger-fabric/pkg-fun.nix diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/unit/hy/hyperrogue/pkg-fun.nix similarity index 100% rename from pkgs/games/hyperrogue/default.nix rename to pkgs/unit/hy/hyperrogue/pkg-fun.nix diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/unit/hy/hyperscan/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hyperscan/default.nix rename to pkgs/unit/hy/hyperscan/pkg-fun.nix diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/unit/hy/hyperscrypt-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/hyperscrypt/default.nix rename to pkgs/unit/hy/hyperscrypt-font/pkg-fun.nix diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/unit/hy/hyphen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/hyphen/default.nix rename to pkgs/unit/hy/hyphen/pkg-fun.nix diff --git a/pkgs/applications/video/hypnotix/libmpv-path.patch b/pkgs/unit/hy/hypnotix/libmpv-path.patch similarity index 100% rename from pkgs/applications/video/hypnotix/libmpv-path.patch rename to pkgs/unit/hy/hypnotix/libmpv-path.patch diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/unit/hy/hypnotix/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/hypnotix/default.nix rename to pkgs/unit/hy/hypnotix/pkg-fun.nix diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/unit/hy/hysteria/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/hysteria/default.nix rename to pkgs/unit/hy/hysteria/pkg-fun.nix diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/unit/hy/hyx/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/hyx/default.nix rename to pkgs/unit/hy/hyx/pkg-fun.nix diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/unit/i-/i-dot-ming/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/i-dot-ming/default.nix rename to pkgs/unit/i-/i-dot-ming/pkg-fun.nix diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/unit/i2/i2c-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/i2c-tools/default.nix rename to pkgs/unit/i2/i2c-tools/pkg-fun.nix diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/unit/i2/i2p/i2p.patch similarity index 100% rename from pkgs/tools/networking/i2p/i2p.patch rename to pkgs/unit/i2/i2p/i2p.patch diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/unit/i2/i2p/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/i2p/default.nix rename to pkgs/unit/i2/i2p/pkg-fun.nix diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/unit/i2/i2pd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/i2pd/default.nix rename to pkgs/unit/i2/i2pd/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/unit/i3/i3-auto-layout/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/auto-layout.nix rename to pkgs/unit/i3/i3-auto-layout/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/unit/i3/i3-easyfocus/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/easyfocus.nix rename to pkgs/unit/i3/i3-easyfocus/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/unit/i3/i3-layout-manager/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/layout-manager.nix rename to pkgs/unit/i3/i3-layout-manager/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/unit/i3/i3-ratiosplit/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/i3-ratiosplit.nix rename to pkgs/unit/i3/i3-ratiosplit/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/unit/i3/i3-rounded/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/rounded.nix rename to pkgs/unit/i3/i3-rounded/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/unit/i3/i3-wk-switch/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/wk-switch.nix rename to pkgs/unit/i3/i3-wk-switch/pkg-fun.nix diff --git a/pkgs/misc/i3a/default.nix b/pkgs/unit/i3/i3a/pkg-fun.nix similarity index 100% rename from pkgs/misc/i3a/default.nix rename to pkgs/unit/i3/i3a/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/unit/i3/i3altlayout/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/altlayout.nix rename to pkgs/unit/i3/i3altlayout/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/unit/i3/i3blocks-gaps/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/blocks-gaps.nix rename to pkgs/unit/i3/i3blocks-gaps/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/unit/i3/i3blocks/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/blocks.nix rename to pkgs/unit/i3/i3blocks/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/unit/i3/i3ipc-glib/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/i3ipc-glib.nix rename to pkgs/unit/i3/i3ipc-glib/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/unit/i3/i3lock-blur/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/lock-blur.nix rename to pkgs/unit/i3/i3lock-blur/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/unit/i3/i3lock-color/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/lock-color.nix rename to pkgs/unit/i3/i3lock-color/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/unit/i3/i3lock-fancy-rapid/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/lock-fancy-rapid.nix rename to pkgs/unit/i3/i3lock-fancy-rapid/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/unit/i3/i3lock-fancy/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/lock-fancy.nix rename to pkgs/unit/i3/i3lock-fancy/pkg-fun.nix diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/unit/i3/i3lock-pixeled/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/i3lock-pixeled/default.nix rename to pkgs/unit/i3/i3lock-pixeled/pkg-fun.nix diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/unit/i3/i3minator/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/i3minator/default.nix rename to pkgs/unit/i3/i3minator/pkg-fun.nix diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/unit/i3/i3nator/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/i3nator/default.nix rename to pkgs/unit/i3/i3nator/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/unit/i3/i3pystatus/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/pystatus.nix rename to pkgs/unit/i3/i3pystatus/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/unit/i3/i3status-rust/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/status-rust.nix rename to pkgs/unit/i3/i3status-rust/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/unit/i3/i3status/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/status.nix rename to pkgs/unit/i3/i3status/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/unit/i3/i3wsr/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/wsr.nix rename to pkgs/unit/i3/i3wsr/pkg-fun.nix diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/unit/i8/i810switch/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/i810switch/default.nix rename to pkgs/unit/i8/i810switch/pkg-fun.nix diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/unit/ia/ia-writer-duospace/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ia-writer-duospace/default.nix rename to pkgs/unit/ia/ia-writer-duospace/pkg-fun.nix diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/unit/ia/iaca_2_1/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/iaca/2.1.nix rename to pkgs/unit/ia/iaca_2_1/pkg-fun.nix diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/unit/ia/iaca_3_0/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/iaca/3.0.nix rename to pkgs/unit/ia/iaca_3_0/pkg-fun.nix diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/unit/ia/iam-policy-json-to-terraform/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/iam-policy-json-to-terraform/default.nix rename to pkgs/unit/ia/iam-policy-json-to-terraform/pkg-fun.nix diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/unit/ia/iamy/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/iamy/default.nix rename to pkgs/unit/ia/iamy/pkg-fun.nix diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/unit/ia/iana-etc/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/iana-etc/default.nix rename to pkgs/unit/ia/iana-etc/pkg-fun.nix diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/unit/ib/ibm-plex/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ibm-plex/default.nix rename to pkgs/unit/ib/ibm-plex/pkg-fun.nix diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/unit/ib/ibm-sw-tpm2/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ibm-sw-tpm2/default.nix rename to pkgs/unit/ib/ibm-sw-tpm2/pkg-fun.nix diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/unit/ib/ibniz/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/ibniz/default.nix rename to pkgs/unit/ib/ibniz/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/unit/ib/ibus-qt/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/ibus/ibus-qt.nix rename to pkgs/unit/ib/ibus-qt/pkg-fun.nix diff --git a/pkgs/tools/misc/ibus-theme-tools/default.nix b/pkgs/unit/ib/ibus-theme-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ibus-theme-tools/default.nix rename to pkgs/unit/ib/ibus-theme-tools/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/unit/ib/ibus-with-plugins/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/ibus/wrapper.nix rename to pkgs/unit/ib/ibus-with-plugins/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/unit/ib/ibus/fix-paths.patch similarity index 100% rename from pkgs/tools/inputmethods/ibus/fix-paths.patch rename to pkgs/unit/ib/ibus/fix-paths.patch diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/unit/ib/ibus/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/ibus/default.nix rename to pkgs/unit/ib/ibus/pkg-fun.nix diff --git a/pkgs/tools/security/ic-keysmith/default.nix b/pkgs/unit/ic/ic-keysmith/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ic-keysmith/default.nix rename to pkgs/unit/ic/ic-keysmith/pkg-fun.nix diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/unit/ic/icbm3d/pkg-fun.nix similarity index 100% rename from pkgs/games/icbm3d/default.nix rename to pkgs/unit/ic/icbm3d/pkg-fun.nix diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/unit/ic/icdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/icdiff/default.nix rename to pkgs/unit/ic/icdiff/pkg-fun.nix diff --git a/pkgs/servers/icecast/default.nix b/pkgs/unit/ic/icecast/pkg-fun.nix similarity index 100% rename from pkgs/servers/icecast/default.nix rename to pkgs/unit/ic/icecast/pkg-fun.nix diff --git a/pkgs/servers/icecream/default.nix b/pkgs/unit/ic/icecream/pkg-fun.nix similarity index 100% rename from pkgs/servers/icecream/default.nix rename to pkgs/unit/ic/icecream/pkg-fun.nix diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/unit/ic/iceshelf/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/iceshelf/default.nix rename to pkgs/unit/ic/iceshelf/pkg-fun.nix diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/unit/ic/icesl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/icesl/default.nix rename to pkgs/unit/ic/icesl/pkg-fun.nix diff --git a/pkgs/development/embedded/fpga/icestorm/default.nix b/pkgs/unit/ic/icestorm/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/fpga/icestorm/default.nix rename to pkgs/unit/ic/icestorm/pkg-fun.nix diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/unit/ic/icewm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/icewm/default.nix rename to pkgs/unit/ic/icewm/pkg-fun.nix diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/unit/ic/icingaweb2-ipl/pkg-fun.nix similarity index 100% rename from pkgs/servers/icingaweb2/ipl.nix rename to pkgs/unit/ic/icingaweb2-ipl/pkg-fun.nix diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/unit/ic/icingaweb2-thirdparty/pkg-fun.nix similarity index 100% rename from pkgs/servers/icingaweb2/thirdparty.nix rename to pkgs/unit/ic/icingaweb2-thirdparty/pkg-fun.nix diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/unit/ic/icingaweb2/pkg-fun.nix similarity index 100% rename from pkgs/servers/icingaweb2/default.nix rename to pkgs/unit/ic/icingaweb2/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/unit/ic/icmake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/icmake/default.nix rename to pkgs/unit/ic/icmake/pkg-fun.nix diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/unit/ic/icon-lang/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/icon-lang/default.nix rename to pkgs/unit/ic/icon-lang/pkg-fun.nix diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/unit/ic/icon-library/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/icon-library/default.nix rename to pkgs/unit/ic/icon-library/pkg-fun.nix diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/unit/ic/icon-slicer/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/icon-slicer/default.nix rename to pkgs/unit/ic/icon-slicer/pkg-fun.nix diff --git a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/unit/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh similarity index 100% rename from pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh rename to pkgs/unit/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh diff --git a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/pkgs/unit/ic/iconConvTools/bin/icoFileToHiColorTheme similarity index 100% rename from pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme rename to pkgs/unit/ic/iconConvTools/bin/icoFileToHiColorTheme diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/unit/ic/iconConvTools/pkg-fun.nix similarity index 100% rename from pkgs/build-support/icon-conv-tools/default.nix rename to pkgs/unit/ic/iconConvTools/pkg-fun.nix diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/unit/ic/iconnamingutils/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/icon-naming-utils/default.nix rename to pkgs/unit/ic/iconnamingutils/pkg-fun.nix diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/unit/ic/iconpack-jade/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/iconpack-jade/default.nix rename to pkgs/unit/ic/iconpack-jade/pkg-fun.nix diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/unit/ic/iconpack-obsidian/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/iconpack-obsidian/default.nix rename to pkgs/unit/ic/iconpack-obsidian/pkg-fun.nix diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/unit/ic/icoutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/icoutils/default.nix rename to pkgs/unit/ic/icoutils/pkg-fun.nix diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/unit/ic/icr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/icr/default.nix rename to pkgs/unit/ic/icr/pkg-fun.nix diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/unit/ic/icr/shards.nix similarity index 100% rename from pkgs/development/tools/icr/shards.nix rename to pkgs/unit/ic/icr/shards.nix diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/pkgs/unit/id/id3lib/id3lib-3.8.3-gcc43-1.patch similarity index 100% rename from pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch rename to pkgs/unit/id/id3lib/id3lib-3.8.3-gcc43-1.patch diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/unit/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff similarity index 100% rename from pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff rename to pkgs/unit/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/unit/id/id3lib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/id3lib/default.nix rename to pkgs/unit/id/id3lib/pkg-fun.nix diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/unit/id/id3v2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/id3v2/default.nix rename to pkgs/unit/id/id3v2/pkg-fun.nix diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/unit/id/ideogram/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/ideogram/default.nix rename to pkgs/unit/id/ideogram/pkg-fun.nix diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/unit/id/ideviceinstaller/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ideviceinstaller/default.nix rename to pkgs/unit/id/ideviceinstaller/pkg-fun.nix diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/unit/id/idevicerestore/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/idevicerestore/default.nix rename to pkgs/unit/id/idevicerestore/pkg-fun.nix diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/unit/id/idle3tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/idle3tools/default.nix rename to pkgs/unit/id/idle3tools/pkg-fun.nix diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/unit/id/idnkit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/idnkit/default.nix rename to pkgs/unit/id/idnkit/pkg-fun.nix diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/unit/id/idris2/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/idris2/default.nix rename to pkgs/unit/id/idris2/pkg-fun.nix diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/unit/id/idris2/tests.nix similarity index 100% rename from pkgs/development/compilers/idris2/tests.nix rename to pkgs/unit/id/idris2/tests.nix diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/pkgs/unit/id/idutils/nix-mapping.patch similarity index 100% rename from pkgs/tools/misc/idutils/nix-mapping.patch rename to pkgs/unit/id/idutils/nix-mapping.patch diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/unit/id/idutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/idutils/default.nix rename to pkgs/unit/id/idutils/pkg-fun.nix diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/unit/if/ifdnfc/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ifdnfc/default.nix rename to pkgs/unit/if/ifdnfc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/unit/if/ifenslave/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ifenslave/default.nix rename to pkgs/unit/if/ifenslave/pkg-fun.nix diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/unit/if/iferr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/iferr/default.nix rename to pkgs/unit/if/iferr/pkg-fun.nix diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/unit/if/ifm/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/ifm/default.nix rename to pkgs/unit/if/ifm/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ifmetric/default.nix b/pkgs/unit/if/ifmetric/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ifmetric/default.nix rename to pkgs/unit/if/ifmetric/pkg-fun.nix diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/unit/if/ifstat-legacy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ifstat-legacy/default.nix rename to pkgs/unit/if/ifstat-legacy/pkg-fun.nix diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/unit/if/iftop/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/iftop/default.nix rename to pkgs/unit/if/iftop/pkg-fun.nix diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/unit/if/ifuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/ifuse/default.nix rename to pkgs/unit/if/ifuse/pkg-fun.nix diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/unit/ig/igmpproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/igmpproxy/default.nix rename to pkgs/unit/ig/igmpproxy/pkg-fun.nix diff --git a/pkgs/applications/virtualization/ignite/default.nix b/pkgs/unit/ig/ignite/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/ignite/default.nix rename to pkgs/unit/ig/ignite/pkg-fun.nix diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/unit/ig/igprof/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/igprof/default.nix rename to pkgs/unit/ig/igprof/pkg-fun.nix diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/unit/ig/igraph/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/igraph/default.nix rename to pkgs/unit/ig/igraph/pkg-fun.nix diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/unit/ig/igv/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/igv/default.nix rename to pkgs/unit/ig/igv/pkg-fun.nix diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/unit/ih/ihp-new/pkg-fun.nix similarity index 100% rename from pkgs/development/web/ihp-new/default.nix rename to pkgs/unit/ih/ihp-new/pkg-fun.nix diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/unit/ii/iina/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/iina/default.nix rename to pkgs/unit/ii/iina/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/unit/ii/iio-sensor-proxy/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iio-sensor-proxy/default.nix rename to pkgs/unit/ii/iio-sensor-proxy/pkg-fun.nix diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/unit/ij/ijq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ijq/default.nix rename to pkgs/unit/ij/ijq/pkg-fun.nix diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/unit/ij/ijs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ijs/default.nix rename to pkgs/unit/ij/ijs/pkg-fun.nix diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/unit/ik/ike-scan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ike-scan/default.nix rename to pkgs/unit/ik/ike-scan/pkg-fun.nix diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/unit/ik/ikill/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ikill/default.nix rename to pkgs/unit/ik/ikill/pkg-fun.nix diff --git a/pkgs/development/libraries/ilbc/CMakeLists.txt b/pkgs/unit/il/ilbc/CMakeLists.txt similarity index 100% rename from pkgs/development/libraries/ilbc/CMakeLists.txt rename to pkgs/unit/il/ilbc/CMakeLists.txt diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/pkgs/unit/il/ilbc/extract-cfile.awk similarity index 100% rename from pkgs/development/libraries/ilbc/extract-cfile.awk rename to pkgs/unit/il/ilbc/extract-cfile.awk diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/unit/il/ilbc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ilbc/default.nix rename to pkgs/unit/il/ilbc/pkg-fun.nix diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/unit/il/ili2c/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ili2c/default.nix rename to pkgs/unit/il/ili2c/pkg-fun.nix diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/unit/il/illum/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/illum/default.nix rename to pkgs/unit/il/illum/pkg-fun.nix diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/unit/il/ilmbase/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ilmbase/default.nix rename to pkgs/unit/il/ilmbase/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/unit/im/ima-evm-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ima-evm-utils/default.nix rename to pkgs/unit/im/ima-evm-utils/pkg-fun.nix diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/unit/im/image-roll/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/image-roll/default.nix rename to pkgs/unit/im/image-roll/pkg-fun.nix diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/unit/im/imagej/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/imagej/default.nix rename to pkgs/unit/im/imagej/pkg-fun.nix diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/unit/im/imagelol/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/imagelol/default.nix rename to pkgs/unit/im/imagelol/pkg-fun.nix diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/unit/im/imageworsener/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/imageworsener/default.nix rename to pkgs/unit/im/imageworsener/pkg-fun.nix diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/unit/im/imaginary/pkg-fun.nix similarity index 100% rename from pkgs/servers/imaginary/default.nix rename to pkgs/unit/im/imaginary/pkg-fun.nix diff --git a/pkgs/applications/video/imagination/default.nix b/pkgs/unit/im/imagination/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/imagination/default.nix rename to pkgs/unit/im/imagination/pkg-fun.nix diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/unit/im/imapsync/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/imapsync/default.nix rename to pkgs/unit/im/imapsync/pkg-fun.nix diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/unit/im/imath/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/imath/default.nix rename to pkgs/unit/im/imath/pkg-fun.nix diff --git a/pkgs/applications/graphics/img-cat/default.nix b/pkgs/unit/im/img-cat/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/img-cat/default.nix rename to pkgs/unit/im/img-cat/pkg-fun.nix diff --git a/pkgs/development/tools/img/default.nix b/pkgs/unit/im/img/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/img/default.nix rename to pkgs/unit/im/img/pkg-fun.nix diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/unit/im/imgcat/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/imgcat/default.nix rename to pkgs/unit/im/imgcat/pkg-fun.nix diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/unit/im/imgcrypt/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/imgcrypt/default.nix rename to pkgs/unit/im/imgcrypt/pkg-fun.nix diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/unit/im/imgpatchtools/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/imgpatchtools/default.nix rename to pkgs/unit/im/imgpatchtools/pkg-fun.nix diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/unit/im/imgproxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/imgproxy/default.nix rename to pkgs/unit/im/imgproxy/pkg-fun.nix diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/unit/im/imgui/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/imgui/default.nix rename to pkgs/unit/im/imgui/pkg-fun.nix diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/unit/im/imgur-screenshot/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/imgur-screenshot/default.nix rename to pkgs/unit/im/imgur-screenshot/pkg-fun.nix diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/unit/im/imgurbash2/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/imgurbash2/default.nix rename to pkgs/unit/im/imgurbash2/pkg-fun.nix diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/unit/im/imhex/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/imhex/default.nix rename to pkgs/unit/im/imhex/pkg-fun.nix diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/unit/im/iml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/iml/default.nix rename to pkgs/unit/im/iml/pkg-fun.nix diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/unit/im/imlib2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/imlib2/default.nix rename to pkgs/unit/im/imlib2/pkg-fun.nix diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/unit/im/immudb/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/immudb/default.nix rename to pkgs/unit/im/immudb/pkg-fun.nix diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/unit/im/impl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/impl/default.nix rename to pkgs/unit/im/impl/pkg-fun.nix diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/unit/im/impy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/impy/default.nix rename to pkgs/unit/im/impy/pkg-fun.nix diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/unit/im/imtui/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/imtui/default.nix rename to pkgs/unit/im/imtui/pkg-fun.nix diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/unit/im/imv/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/imv/default.nix rename to pkgs/unit/im/imv/pkg-fun.nix diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/unit/im/imwheel/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/imwheel/default.nix rename to pkgs/unit/im/imwheel/pkg-fun.nix diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/unit/in/in-formant/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/in-formant/default.nix rename to pkgs/unit/in/in-formant/pkg-fun.nix diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/unit/in/inadyn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/inadyn/default.nix rename to pkgs/unit/in/inadyn/pkg-fun.nix diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/unit/in/inav-blackbox-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/inav-blackbox-tools/default.nix rename to pkgs/unit/in/inav-blackbox-tools/pkg-fun.nix diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/unit/in/inav-configurator/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/robotics/inav-configurator/default.nix rename to pkgs/unit/in/inav-configurator/pkg-fun.nix diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/unit/in/inchi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/inchi/default.nix rename to pkgs/unit/in/inchi/pkg-fun.nix diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/unit/in/inconsolata-lgc/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/inconsolata/lgc.nix rename to pkgs/unit/in/inconsolata-lgc/pkg-fun.nix diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/unit/in/inconsolata/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/inconsolata/default.nix rename to pkgs/unit/in/inconsolata/pkg-fun.nix diff --git a/pkgs/tools/system/incron/default_path.patch b/pkgs/unit/in/incron/default_path.patch similarity index 100% rename from pkgs/tools/system/incron/default_path.patch rename to pkgs/unit/in/incron/default_path.patch diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/unit/in/incron/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/incron/default.nix rename to pkgs/unit/in/incron/pkg-fun.nix diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/unit/in/incrtcl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/incrtcl/default.nix rename to pkgs/unit/in/incrtcl/pkg-fun.nix diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/unit/in/indent/darwin.patch similarity index 100% rename from pkgs/development/tools/misc/indent/darwin.patch rename to pkgs/unit/in/indent/darwin.patch diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/unit/in/indent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/indent/default.nix rename to pkgs/unit/in/indent/pkg-fun.nix diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/unit/in/indi-full/indi-3rdparty.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix rename to pkgs/unit/in/indi-full/indi-3rdparty.nix diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/unit/in/indi-full/indi-firmware.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix rename to pkgs/unit/in/indi-full/indi-firmware.nix diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/pkgs/unit/in/indi-full/indi-with-drivers.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix rename to pkgs/unit/in/indi-full/indi-with-drivers.nix diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/unit/in/indi-full/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/indilib/indi-full.nix rename to pkgs/unit/in/indi-full/pkg-fun.nix diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/unit/in/indicator-application-gtk2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/indicator-application/gtk2.nix rename to pkgs/unit/in/indicator-application-gtk2/pkg-fun.nix diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/unit/in/indicator-application-gtk3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/indicator-application/gtk3.nix rename to pkgs/unit/in/indicator-application-gtk3/pkg-fun.nix diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/unit/in/indicator-sound-switcher/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/indicator-sound-switcher/default.nix rename to pkgs/unit/in/indicator-sound-switcher/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/unit/in/indigenous-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix rename to pkgs/unit/in/indigenous-desktop/pkg-fun.nix diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/unit/in/indilib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/indilib/default.nix rename to pkgs/unit/in/indilib/pkg-fun.nix diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/unit/in/industrializer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/industrializer/default.nix rename to pkgs/unit/in/industrializer/pkg-fun.nix diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/unit/in/ineffassign/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ineffassign/default.nix rename to pkgs/unit/in/ineffassign/pkg-fun.nix diff --git a/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/pkgs/unit/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch similarity index 100% rename from pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch rename to pkgs/unit/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/unit/in/inetutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/inetutils/default.nix rename to pkgs/unit/in/inetutils/pkg-fun.nix diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/unit/in/infamousPlugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/infamousPlugins/default.nix rename to pkgs/unit/in/infamousPlugins/pkg-fun.nix diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/unit/in/inferno/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/inferno/default.nix rename to pkgs/unit/in/inferno/pkg-fun.nix diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/unit/in/influxdb/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/influxdb/default.nix rename to pkgs/unit/in/influxdb/pkg-fun.nix diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/unit/in/influxdb2-cli/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/influxdb2/cli.nix rename to pkgs/unit/in/influxdb2-cli/pkg-fun.nix diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/unit/in/influxdb2-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/influxdb2/default.nix rename to pkgs/unit/in/influxdb2-server/pkg-fun.nix diff --git a/pkgs/servers/nosql/influxdb2/combined.nix b/pkgs/unit/in/influxdb2/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/influxdb2/combined.nix rename to pkgs/unit/in/influxdb2/pkg-fun.nix diff --git a/pkgs/misc/drivers/infnoise/makefile.patch b/pkgs/unit/in/infnoise/makefile.patch similarity index 100% rename from pkgs/misc/drivers/infnoise/makefile.patch rename to pkgs/unit/in/infnoise/makefile.patch diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/unit/in/infnoise/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/infnoise/default.nix rename to pkgs/unit/in/infnoise/pkg-fun.nix diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/unit/in/inform6/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/inform6/default.nix rename to pkgs/unit/in/inform6/pkg-fun.nix diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/unit/in/inform7/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/inform7/default.nix rename to pkgs/unit/in/inform7/pkg-fun.nix diff --git a/pkgs/games/infra-arcana/default.nix b/pkgs/unit/in/infra-arcana/pkg-fun.nix similarity index 100% rename from pkgs/games/infra-arcana/default.nix rename to pkgs/unit/in/infra-arcana/pkg-fun.nix diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/unit/in/infra/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/infra/default.nix rename to pkgs/unit/in/infra/pkg-fun.nix diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/unit/in/infracost/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/infracost/default.nix rename to pkgs/unit/in/infracost/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/inframap/default.nix b/pkgs/unit/in/inframap/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/inframap/default.nix rename to pkgs/unit/in/inframap/pkg-fun.nix diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/unit/in/ingen/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ingen/default.nix rename to pkgs/unit/in/ingen/pkg-fun.nix diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/unit/in/inih/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/inih/default.nix rename to pkgs/unit/in/inih/pkg-fun.nix diff --git a/pkgs/development/libraries/iniparser/iniparser.pc.in b/pkgs/unit/in/iniparser/iniparser.pc.in similarity index 100% rename from pkgs/development/libraries/iniparser/iniparser.pc.in rename to pkgs/unit/in/iniparser/iniparser.pc.in diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/pkgs/unit/in/iniparser/no-usr.patch similarity index 100% rename from pkgs/development/libraries/iniparser/no-usr.patch rename to pkgs/unit/in/iniparser/no-usr.patch diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/unit/in/iniparser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/iniparser/default.nix rename to pkgs/unit/in/iniparser/pkg-fun.nix diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/unit/in/ink/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ink/default.nix rename to pkgs/unit/in/ink/pkg-fun.nix diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/unit/in/inklecate/deps.nix similarity index 100% rename from pkgs/development/compilers/inklecate/deps.nix rename to pkgs/unit/in/inklecate/deps.nix diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/unit/in/inklecate/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/inklecate/default.nix rename to pkgs/unit/in/inklecate/pkg-fun.nix diff --git a/pkgs/tools/misc/inklingreader/default.nix b/pkgs/unit/in/inklingreader/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/inklingreader/default.nix rename to pkgs/unit/in/inklingreader/pkg-fun.nix diff --git a/pkgs/applications/graphics/inkscape/with-extensions.nix b/pkgs/unit/in/inkscape-with-extensions/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/inkscape/with-extensions.nix rename to pkgs/unit/in/inkscape-with-extensions/pkg-fun.nix diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/unit/in/innoextract/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/innoextract/default.nix rename to pkgs/unit/in/innoextract/pkg-fun.nix diff --git a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/pkgs/unit/in/inormalize/lgmask-interp.patch similarity index 100% rename from pkgs/applications/science/biology/inormalize/lgmask-interp.patch rename to pkgs/unit/in/inormalize/lgmask-interp.patch diff --git a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/pkgs/unit/in/inormalize/nu_correct_norm-interp.patch similarity index 100% rename from pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch rename to pkgs/unit/in/inormalize/nu_correct_norm-interp.patch diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/unit/in/inormalize/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/inormalize/default.nix rename to pkgs/unit/in/inormalize/pkg-fun.nix diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/unit/in/inotify-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/inotify-tools/default.nix rename to pkgs/unit/in/inotify-tools/pkg-fun.nix diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/unit/in/input-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/input-fonts/default.nix rename to pkgs/unit/in/input-fonts/pkg-fun.nix diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/unit/in/input-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/input-utils/default.nix rename to pkgs/unit/in/input-utils/pkg-fun.nix diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/unit/in/inputplug/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/inputplug/default.nix rename to pkgs/unit/in/inputplug/pkg-fun.nix diff --git a/pkgs/tools/security/inql/default.nix b/pkgs/unit/in/inql/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/inql/default.nix rename to pkgs/unit/in/inql/pkg-fun.nix diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/unit/in/inriafonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/inriafonts/default.nix rename to pkgs/unit/in/inriafonts/pkg-fun.nix diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/unit/in/insomnia/pkg-fun.nix similarity index 100% rename from pkgs/development/web/insomnia/default.nix rename to pkgs/unit/in/insomnia/pkg-fun.nix diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/unit/in/inspectrum/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/inspectrum/default.nix rename to pkgs/unit/in/inspectrum/pkg-fun.nix diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/unit/in/inspircd/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/inspircd/default.nix rename to pkgs/unit/in/inspircd/pkg-fun.nix diff --git a/pkgs/games/instead-launcher/path.patch b/pkgs/unit/in/instead-launcher/path.patch similarity index 100% rename from pkgs/games/instead-launcher/path.patch rename to pkgs/unit/in/instead-launcher/path.patch diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/unit/in/instead-launcher/pkg-fun.nix similarity index 100% rename from pkgs/games/instead-launcher/default.nix rename to pkgs/unit/in/instead-launcher/pkg-fun.nix diff --git a/pkgs/games/instead/default.nix b/pkgs/unit/in/instead/pkg-fun.nix similarity index 100% rename from pkgs/games/instead/default.nix rename to pkgs/unit/in/instead/pkg-fun.nix diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/unit/in/insync/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/insync/default.nix rename to pkgs/unit/in/insync/pkg-fun.nix diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/unit/in/intel-cmt-cat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/intel-cmt-cat/default.nix rename to pkgs/unit/in/intel-cmt-cat/pkg-fun.nix diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/unit/in/intel-compute-runtime/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/intel-compute-runtime/default.nix rename to pkgs/unit/in/intel-compute-runtime/pkg-fun.nix diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/unit/in/intel-gmmlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/intel-gmmlib/default.nix rename to pkgs/unit/in/intel-gmmlib/pkg-fun.nix diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/unit/in/intel-gpu-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/intel-gpu-tools/default.nix rename to pkgs/unit/in/intel-gpu-tools/pkg-fun.nix diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/unit/in/intel-graphics-compiler/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/intel-graphics-compiler/default.nix rename to pkgs/unit/in/intel-graphics-compiler/pkg-fun.nix diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/unit/in/intel-media-driver/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/intel-media-driver/default.nix rename to pkgs/unit/in/intel-media-driver/pkg-fun.nix diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/unit/in/intel-media-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/intel-media-sdk/default.nix rename to pkgs/unit/in/intel-media-sdk/pkg-fun.nix diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/unit/in/intel-ocl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/intel-ocl/default.nix rename to pkgs/unit/in/intel-ocl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/unit/in/intel2200BGFirmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix rename to pkgs/unit/in/intel2200BGFirmware/pkg-fun.nix diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/unit/in/inter/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/inter/default.nix rename to pkgs/unit/in/inter/pkg-fun.nix diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/unit/in/interactsh/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/interactsh/default.nix rename to pkgs/unit/in/interactsh/pkg-fun.nix diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/unit/in/intercal/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/intercal/default.nix rename to pkgs/unit/in/intercal/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/unit/in/interception-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/interception-tools/default.nix rename to pkgs/unit/in/interception-tools/pkg-fun.nix diff --git a/pkgs/servers/interlock/default.nix b/pkgs/unit/in/interlock/pkg-fun.nix similarity index 100% rename from pkgs/servers/interlock/default.nix rename to pkgs/unit/in/interlock/pkg-fun.nix diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/unit/in/intermodal/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/intermodal/default.nix rename to pkgs/unit/in/intermodal/pkg-fun.nix diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/unit/in/intltool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/intltool/default.nix rename to pkgs/unit/in/intltool/pkg-fun.nix diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/unit/in/invoice2data/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/invoice2data/default.nix rename to pkgs/unit/in/invoice2data/pkg-fun.nix diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/unit/in/invoiceplane/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/invoiceplane/default.nix rename to pkgs/unit/in/invoiceplane/pkg-fun.nix diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/unit/in/inxi/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/inxi/default.nix rename to pkgs/unit/in/inxi/pkg-fun.nix diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/unit/io/io/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/io/default.nix rename to pkgs/unit/io/io/pkg-fun.nix diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/unit/io/ioccheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ioccheck/default.nix rename to pkgs/unit/io/ioccheck/pkg-fun.nix diff --git a/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch b/pkgs/unit/io/iodash/0001-Add-cmake-install-directives.patch similarity index 100% rename from pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch rename to pkgs/unit/io/iodash/0001-Add-cmake-install-directives.patch diff --git a/pkgs/development/libraries/iodash/default.nix b/pkgs/unit/io/iodash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/iodash/default.nix rename to pkgs/unit/io/iodash/pkg-fun.nix diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/unit/io/iodine/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/iodine/default.nix rename to pkgs/unit/io/iodine/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/unit/io/iomelt/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iomelt/default.nix rename to pkgs/unit/io/iomelt/pkg-fun.nix diff --git a/pkgs/shells/ion/build-script.patch b/pkgs/unit/io/ion/build-script.patch similarity index 100% rename from pkgs/shells/ion/build-script.patch rename to pkgs/unit/io/ion/build-script.patch diff --git a/pkgs/shells/ion/default.nix b/pkgs/unit/io/ion/pkg-fun.nix similarity index 100% rename from pkgs/shells/ion/default.nix rename to pkgs/unit/io/ion/pkg-fun.nix diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/unit/io/ioping/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ioping/default.nix rename to pkgs/unit/io/ioping/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/unit/io/ioport/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ioport/default.nix rename to pkgs/unit/io/ioport/pkg-fun.nix diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/unit/io/ioquake3/pkg-fun.nix similarity index 100% rename from pkgs/games/quake3/ioquake/default.nix rename to pkgs/unit/io/ioquake3/pkg-fun.nix diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/unit/io/ior/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ior/default.nix rename to pkgs/unit/io/ior/pkg-fun.nix diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/unit/io/ios-cross-compile/9.2_builder.sh similarity index 100% rename from pkgs/development/compilers/ios-cross-compile/9.2_builder.sh rename to pkgs/unit/io/ios-cross-compile/9.2_builder.sh diff --git a/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c b/pkgs/unit/io/ios-cross-compile/alt_wrapper.c similarity index 100% rename from pkgs/development/compilers/ios-cross-compile/alt_wrapper.c rename to pkgs/unit/io/ios-cross-compile/alt_wrapper.c diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/unit/io/ios-cross-compile/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ios-cross-compile/9.2.nix rename to pkgs/unit/io/ios-cross-compile/pkg-fun.nix diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/unit/io/iosevka-bin/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/iosevka/bin.nix rename to pkgs/unit/io/iosevka-bin/pkg-fun.nix diff --git a/pkgs/data/fonts/iosevka/update-bin.sh b/pkgs/unit/io/iosevka-bin/update-bin.sh similarity index 100% rename from pkgs/data/fonts/iosevka/update-bin.sh rename to pkgs/unit/io/iosevka-bin/update-bin.sh diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/unit/io/iosevka-bin/variants.nix similarity index 100% rename from pkgs/data/fonts/iosevka/variants.nix rename to pkgs/unit/io/iosevka-bin/variants.nix diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/unit/io/iotools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/iotools/default.nix rename to pkgs/unit/io/iotools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/unit/io/iotop-c/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iotop-c/default.nix rename to pkgs/unit/io/iotop-c/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/unit/io/iotop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iotop/default.nix rename to pkgs/unit/io/iotop/pkg-fun.nix diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/unit/io/iouyap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/iouyap/default.nix rename to pkgs/unit/io/iouyap/pkg-fun.nix diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/unit/io/iozone/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/iozone/default.nix rename to pkgs/unit/io/iozone/pkg-fun.nix diff --git a/pkgs/tools/filesystems/ioztat/default.nix b/pkgs/unit/io/ioztat/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/ioztat/default.nix rename to pkgs/unit/io/ioztat/pkg-fun.nix diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/unit/ip/ip2location-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ip2location-c/default.nix rename to pkgs/unit/ip/ip2location-c/pkg-fun.nix diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/unit/ip/ip2location/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ip2location/default.nix rename to pkgs/unit/ip/ip2location/pkg-fun.nix diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/unit/ip/ip2unix/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ip2unix/default.nix rename to pkgs/unit/ip/ip2unix/pkg-fun.nix diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/unit/ip/ipad_charge/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ipad_charge/default.nix rename to pkgs/unit/ip/ipad_charge/pkg-fun.nix diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/unit/ip/ipaexfont/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ipaexfont/default.nix rename to pkgs/unit/ip/ipaexfont/pkg-fun.nix diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/unit/ip/ipafont/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ipafont/default.nix rename to pkgs/unit/ip/ipafont/pkg-fun.nix diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/unit/ip/ipbt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ipbt/default.nix rename to pkgs/unit/ip/ipbt/pkg-fun.nix diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/unit/ip/ipcalc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ipcalc/default.nix rename to pkgs/unit/ip/ipcalc/pkg-fun.nix diff --git a/pkgs/tools/networking/ipcalc/sandbox_tests.patch b/pkgs/unit/ip/ipcalc/sandbox_tests.patch similarity index 100% rename from pkgs/tools/networking/ipcalc/sandbox_tests.patch rename to pkgs/unit/ip/ipcalc/sandbox_tests.patch diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/unit/ip/iperf2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/iperf/2.nix rename to pkgs/unit/ip/iperf2/pkg-fun.nix diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/unit/ip/iperf3/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/iperf/3.nix rename to pkgs/unit/ip/iperf3/pkg-fun.nix diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/unit/ip/ipfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ipfetch/default.nix rename to pkgs/unit/ip/ipfetch/pkg-fun.nix diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/unit/ip/ipfs-cluster/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ipfs-cluster/default.nix rename to pkgs/unit/ip/ipfs-cluster/pkg-fun.nix diff --git a/pkgs/applications/networking/ipfs-upload-client/default.nix b/pkgs/unit/ip/ipfs-upload-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ipfs-upload-client/default.nix rename to pkgs/unit/ip/ipfs-upload-client/pkg-fun.nix diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/unit/ip/ipgrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ipgrep/default.nix rename to pkgs/unit/ip/ipgrep/pkg-fun.nix diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/unit/ip/ipinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ipinfo/default.nix rename to pkgs/unit/ip/ipinfo/pkg-fun.nix diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/unit/ip/ipmicfg/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ipmicfg/default.nix rename to pkgs/unit/ip/ipmicfg/pkg-fun.nix diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/unit/ip/ipmitool/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ipmitool/default.nix rename to pkgs/unit/ip/ipmitool/pkg-fun.nix diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/unit/ip/ipmiutil/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ipmiutil/default.nix rename to pkgs/unit/ip/ipmiutil/pkg-fun.nix diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/unit/ip/ipmiview/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ipmiview/default.nix rename to pkgs/unit/ip/ipmiview/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/unit/ip/ipopt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/ipopt/default.nix rename to pkgs/unit/ip/ipopt/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ipp-usb/default.nix b/pkgs/unit/ip/ipp-usb/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ipp-usb/default.nix rename to pkgs/unit/ip/ipp-usb/pkg-fun.nix diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/unit/ip/iprange/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/firehol/iprange.nix rename to pkgs/unit/ip/iprange/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/unit/ip/iproute2/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iproute/default.nix rename to pkgs/unit/ip/iproute2/pkg-fun.nix diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/unit/ip/iprover/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/iprover/default.nix rename to pkgs/unit/ip/iprover/pkg-fun.nix diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/unit/ip/ipscan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ipscan/default.nix rename to pkgs/unit/ip/ipscan/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/unit/ip/ipset/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ipset/default.nix rename to pkgs/unit/ip/ipset/pkg-fun.nix diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/unit/ip/iptraf-ng/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/iptraf-ng/default.nix rename to pkgs/unit/ip/iptraf-ng/pkg-fun.nix diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/unit/ip/iptsd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/iptsd/default.nix rename to pkgs/unit/ip/iptsd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/unit/ip/iptstate/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iptstate/default.nix rename to pkgs/unit/ip/iptstate/pkg-fun.nix diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/unit/ip/ipv6calc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ipv6calc/default.nix rename to pkgs/unit/ip/ipv6calc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/unit/ip/ipvsadm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ipvsadm/default.nix rename to pkgs/unit/ip/ipvsadm/pkg-fun.nix diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/unit/ip/ipxe/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ipxe/default.nix rename to pkgs/unit/ip/ipxe/pkg-fun.nix diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/unit/iq/iqtree/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/iqtree/default.nix rename to pkgs/unit/iq/iqtree/pkg-fun.nix diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/unit/ir/ir-standard-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ir-standard-fonts/default.nix rename to pkgs/unit/ir/ir-standard-fonts/pkg-fun.nix diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/unit/ir/irccat/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/irccat/default.nix rename to pkgs/unit/ir/irccat/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/unit/ir/irccloud/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/irccloud/default.nix rename to pkgs/unit/ir/irccloud/pkg-fun.nix diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/unit/ir/ircdHybrid/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/ircd-hybrid/default.nix rename to pkgs/unit/ir/ircdHybrid/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/unit/ir/ircdog/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/ircdog/default.nix rename to pkgs/unit/ir/ircdog/pkg-fun.nix diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/unit/ir/iredis/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/iredis/default.nix rename to pkgs/unit/ir/iredis/pkg-fun.nix diff --git a/pkgs/servers/irker/default.nix b/pkgs/unit/ir/irker/pkg-fun.nix similarity index 100% rename from pkgs/servers/irker/default.nix rename to pkgs/unit/ir/irker/pkg-fun.nix diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/unit/ir/irpf/pkg-fun.nix similarity index 100% rename from pkgs/applications/finance/irpf/default.nix rename to pkgs/unit/ir/irpf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/unit/ir/irqbalance/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/irqbalance/default.nix rename to pkgs/unit/ir/irqbalance/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/unit/ir/irssi/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/irssi/default.nix rename to pkgs/unit/ir/irssi/pkg-fun.nix diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile b/pkgs/unit/ir/iruby/Gemfile similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/iruby/Gemfile rename to pkgs/unit/ir/iruby/Gemfile diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock b/pkgs/unit/ir/iruby/Gemfile.lock similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock rename to pkgs/unit/ir/iruby/Gemfile.lock diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix b/pkgs/unit/ir/iruby/gemset.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix rename to pkgs/unit/ir/iruby/gemset.nix diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/default.nix b/pkgs/unit/ir/iruby/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/iruby/default.nix rename to pkgs/unit/ir/iruby/pkg-fun.nix diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/unit/is/isa-l/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/isa-l/default.nix rename to pkgs/unit/is/isa-l/pkg-fun.nix diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/unit/is/ised/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ised/default.nix rename to pkgs/unit/is/ised/pkg-fun.nix diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/unit/is/iso-flags/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/iso-flags/default.nix rename to pkgs/unit/is/iso-flags/pkg-fun.nix diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/unit/is/isocodes/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/iso-codes/default.nix rename to pkgs/unit/is/isocodes/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/unit/is/isolyzer/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/isolyzer/default.nix rename to pkgs/unit/is/isolyzer/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/unit/is/isomd5sum/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/isomd5sum/default.nix rename to pkgs/unit/is/isomd5sum/pkg-fun.nix diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/unit/is/ispell/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ispell/default.nix rename to pkgs/unit/is/ispell/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/unit/is/istioctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/istioctl/default.nix rename to pkgs/unit/is/istioctl/pkg-fun.nix diff --git a/pkgs/games/itch/default.nix b/pkgs/unit/it/itch/pkg-fun.nix similarity index 100% rename from pkgs/games/itch/default.nix rename to pkgs/unit/it/itch/pkg-fun.nix diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/unit/it/itd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/itd/default.nix rename to pkgs/unit/it/itd/pkg-fun.nix diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/unit/it/ite-backlight/pkg-fun.nix similarity index 100% rename from pkgs/misc/ite-backlight/default.nix rename to pkgs/unit/it/ite-backlight/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/unit/it/iterm2/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/iterm2/default.nix rename to pkgs/unit/it/iterm2/pkg-fun.nix diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/unit/it/itktcl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/itktcl/default.nix rename to pkgs/unit/it/itktcl/pkg-fun.nix diff --git a/pkgs/development/tools/misc/itm-tools/cargo-lock.patch b/pkgs/unit/it/itm-tools/cargo-lock.patch similarity index 100% rename from pkgs/development/tools/misc/itm-tools/cargo-lock.patch rename to pkgs/unit/it/itm-tools/cargo-lock.patch diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/unit/it/itm-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/itm-tools/default.nix rename to pkgs/unit/it/itm-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/unit/it/itpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/itpp/default.nix rename to pkgs/unit/it/itpp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/unit/it/itstool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/itstool/default.nix rename to pkgs/unit/it/itstool/pkg-fun.nix diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/unit/it/itsx/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/itsx/default.nix rename to pkgs/unit/it/itsx/pkg-fun.nix diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/unit/iu/iucode-tool/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/microcode/iucode-tool.nix rename to pkgs/unit/iu/iucode-tool/pkg-fun.nix diff --git a/pkgs/games/ivan/default.nix b/pkgs/unit/iv/ivan/pkg-fun.nix similarity index 100% rename from pkgs/games/ivan/default.nix rename to pkgs/unit/iv/ivan/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/unit/iw/iw/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iw/default.nix rename to pkgs/unit/iw/iw/pkg-fun.nix diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/unit/iw/iwd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/iwd/default.nix rename to pkgs/unit/iw/iwd/pkg-fun.nix diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/unit/iw/iwgtk/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/iwgtk/default.nix rename to pkgs/unit/iw/iwgtk/pkg-fun.nix diff --git a/pkgs/tools/networking/iwgtk/systemd-service.patch b/pkgs/unit/iw/iwgtk/systemd-service.patch similarity index 100% rename from pkgs/tools/networking/iwgtk/systemd-service.patch rename to pkgs/unit/iw/iwgtk/systemd-service.patch diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/unit/iw/iwona/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/iwona/default.nix rename to pkgs/unit/iw/iwona/pkg-fun.nix diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/unit/ix/ix/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ix/default.nix rename to pkgs/unit/ix/ix/pkg-fun.nix diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/unit/j4/j4-dmenu-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/j4-dmenu-desktop/default.nix rename to pkgs/unit/j4/j4-dmenu-desktop/pkg-fun.nix diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/unit/ja/jaaa/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jaaa/default.nix rename to pkgs/unit/ja/jaaa/pkg-fun.nix diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/unit/ja/jack1/pkg-fun.nix similarity index 100% rename from pkgs/misc/jackaudio/jack1.nix rename to pkgs/unit/ja/jack1/pkg-fun.nix diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/unit/ja/jack_capture/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jack-capture/default.nix rename to pkgs/unit/ja/jack_capture/pkg-fun.nix diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/unit/ja/jack_oscrolloscope/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jack-oscrolloscope/default.nix rename to pkgs/unit/ja/jack_oscrolloscope/pkg-fun.nix diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/unit/ja/jack_rack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jack-rack/default.nix rename to pkgs/unit/ja/jack_rack/pkg-fun.nix diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/unit/ja/jackett/deps.nix similarity index 100% rename from pkgs/servers/jackett/deps.nix rename to pkgs/unit/ja/jackett/deps.nix diff --git a/pkgs/servers/jackett/default.nix b/pkgs/unit/ja/jackett/pkg-fun.nix similarity index 100% rename from pkgs/servers/jackett/default.nix rename to pkgs/unit/ja/jackett/pkg-fun.nix diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/unit/ja/jackett/updater.sh similarity index 100% rename from pkgs/servers/jackett/updater.sh rename to pkgs/unit/ja/jackett/updater.sh diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/unit/ja/jackline/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/jackline/default.nix rename to pkgs/unit/ja/jackline/pkg-fun.nix diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/unit/ja/jackmeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jackmeter/default.nix rename to pkgs/unit/ja/jackmeter/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/unit/ja/jacoco/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/jacoco/default.nix rename to pkgs/unit/ja/jacoco/pkg-fun.nix diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/unit/ja/jade/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sgml/jade/default.nix rename to pkgs/unit/ja/jade/pkg-fun.nix diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/unit/ja/jadx/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jadx/default.nix rename to pkgs/unit/ja/jadx/pkg-fun.nix diff --git a/pkgs/tools/security/jaeles/default.nix b/pkgs/unit/ja/jaeles/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jaeles/default.nix rename to pkgs/unit/ja/jaeles/pkg-fun.nix diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/unit/ja/jags/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/jags/default.nix rename to pkgs/unit/ja/jags/pkg-fun.nix diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/unit/ja/jalv/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jalv/default.nix rename to pkgs/unit/ja/jalv/pkg-fun.nix diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/unit/ja/jama/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jama/default.nix rename to pkgs/unit/ja/jama/pkg-fun.nix diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/unit/ja/jamin/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jamin/default.nix rename to pkgs/unit/ja/jamin/pkg-fun.nix diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/unit/ja/janet/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/janet/default.nix rename to pkgs/unit/ja/janet/pkg-fun.nix diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/unit/ja/jansson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jansson/default.nix rename to pkgs/unit/ja/jansson/pkg-fun.nix diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/unit/ja/janus-gateway/pkg-fun.nix similarity index 100% rename from pkgs/servers/janus-gateway/default.nix rename to pkgs/unit/ja/janus-gateway/pkg-fun.nix diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/unit/ja/janusgraph/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/janusgraph/default.nix rename to pkgs/unit/ja/janusgraph/pkg-fun.nix diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/unit/ja/japa/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/japa/default.nix rename to pkgs/unit/ja/japa/pkg-fun.nix diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/unit/ja/jarowinkler-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jarowinkler-cpp/default.nix rename to pkgs/unit/ja/jarowinkler-cpp/pkg-fun.nix diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/unit/ja/jasmin-compiler/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/jasmin-compiler/default.nix rename to pkgs/unit/ja/jasmin-compiler/pkg-fun.nix diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/unit/ja/jasmin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/jasmin/default.nix rename to pkgs/unit/ja/jasmin/pkg-fun.nix diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/unit/ja/jasmin/test-assemble-hello-world/HelloWorld.j similarity index 100% rename from pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j rename to pkgs/unit/ja/jasmin/test-assemble-hello-world/HelloWorld.j diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/unit/ja/jasmin/test-assemble-hello-world/default.nix similarity index 100% rename from pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix rename to pkgs/unit/ja/jasmin/test-assemble-hello-world/default.nix diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/unit/ja/jasper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jasper/default.nix rename to pkgs/unit/ja/jasper/pkg-fun.nix diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/unit/ja/java-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/java-language-server/default.nix rename to pkgs/unit/ja/java-language-server/pkg-fun.nix diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/unit/ja/jay/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/jay/default.nix rename to pkgs/unit/ja/jay/pkg-fun.nix diff --git a/pkgs/development/tools/jazzy/Gemfile b/pkgs/unit/ja/jazzy/Gemfile similarity index 100% rename from pkgs/development/tools/jazzy/Gemfile rename to pkgs/unit/ja/jazzy/Gemfile diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/unit/ja/jazzy/Gemfile.lock similarity index 100% rename from pkgs/development/tools/jazzy/Gemfile.lock rename to pkgs/unit/ja/jazzy/Gemfile.lock diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/unit/ja/jazzy/gemset.nix similarity index 100% rename from pkgs/development/tools/jazzy/gemset.nix rename to pkgs/unit/ja/jazzy/gemset.nix diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/unit/ja/jazzy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jazzy/default.nix rename to pkgs/unit/ja/jazzy/pkg-fun.nix diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/unit/jb/jbake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jbake/default.nix rename to pkgs/unit/jb/jbake/pkg-fun.nix diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/unit/jb/jbang/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jbang/default.nix rename to pkgs/unit/jb/jbang/pkg-fun.nix diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/unit/jb/jbig2dec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jbig2dec/default.nix rename to pkgs/unit/jb/jbig2dec/pkg-fun.nix diff --git a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch b/pkgs/unit/jb/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch similarity index 100% rename from pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch rename to pkgs/unit/jb/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/unit/jb/jbig2enc/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/jbig2enc/default.nix rename to pkgs/unit/jb/jbig2enc/pkg-fun.nix diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/unit/jb/jbigkit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jbigkit/default.nix rename to pkgs/unit/jb/jbigkit/pkg-fun.nix diff --git a/pkgs/tools/text/jbofihe/default.nix b/pkgs/unit/jb/jbofihe/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/jbofihe/default.nix rename to pkgs/unit/jb/jbofihe/pkg-fun.nix diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/unit/jb/jboss/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/jboss/default.nix rename to pkgs/unit/jb/jboss/pkg-fun.nix diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/unit/jb/jboss_mysql_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/jboss/jdbc/mysql/default.nix rename to pkgs/unit/jb/jboss_mysql_jdbc/pkg-fun.nix diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/unit/jc/jcal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jcal/default.nix rename to pkgs/unit/jc/jcal/pkg-fun.nix diff --git a/pkgs/applications/audio/jconvolver/default.nix b/pkgs/unit/jc/jconvolver/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jconvolver/default.nix rename to pkgs/unit/jc/jconvolver/pkg-fun.nix diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/unit/jd/jd-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jd-cli/default.nix rename to pkgs/unit/jd/jd-cli/pkg-fun.nix diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/unit/jd/jd-diff-patch/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jd-diff-patch/default.nix rename to pkgs/unit/jd/jd-diff-patch/pkg-fun.nix diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/unit/jd/jd-gui/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jd-gui/default.nix rename to pkgs/unit/jd/jd-gui/pkg-fun.nix diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/unit/jd/jdiskreport/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/jdiskreport/default.nix rename to pkgs/unit/jd/jdiskreport/pkg-fun.nix diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/unit/jd/jdom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/jdom/default.nix rename to pkgs/unit/jd/jdom/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/jdt-language-server/default.nix b/pkgs/unit/jd/jdt-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/jdt-language-server/default.nix rename to pkgs/unit/jd/jdt-language-server/pkg-fun.nix diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/unit/jd/jdupes/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/jdupes/default.nix rename to pkgs/unit/jd/jdupes/pkg-fun.nix diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/unit/je/jed/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jed/default.nix rename to pkgs/unit/je/jed/pkg-fun.nix diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/unit/je/jedit/build.xml.patch similarity index 100% rename from pkgs/applications/editors/jedit/build.xml.patch rename to pkgs/unit/je/jedit/build.xml.patch diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/unit/je/jedit/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jedit/default.nix rename to pkgs/unit/je/jedit/pkg-fun.nix diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/unit/je/jekyll/basic/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile rename to pkgs/unit/je/jekyll/basic/Gemfile diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/unit/je/jekyll/basic/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile.lock rename to pkgs/unit/je/jekyll/basic/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/unit/je/jekyll/basic/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/basic/gemset.nix rename to pkgs/unit/je/jekyll/basic/gemset.nix diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/unit/je/jekyll/full/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile rename to pkgs/unit/je/jekyll/full/Gemfile diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/unit/je/jekyll/full/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile.lock rename to pkgs/unit/je/jekyll/full/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/unit/je/jekyll/full/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/full/gemset.nix rename to pkgs/unit/je/jekyll/full/gemset.nix diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/unit/je/jekyll/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jekyll/default.nix rename to pkgs/unit/je/jekyll/pkg-fun.nix diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/unit/je/jekyll/update.sh similarity index 100% rename from pkgs/applications/misc/jekyll/update.sh rename to pkgs/unit/je/jekyll/update.sh diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/unit/je/jelly/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/jelly/default.nix rename to pkgs/unit/je/jelly/pkg-fun.nix diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/unit/je/jellycli/fix-test-dir.patch similarity index 100% rename from pkgs/applications/audio/jellycli/fix-test-dir.patch rename to pkgs/unit/je/jellycli/fix-test-dir.patch diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/unit/je/jellycli/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jellycli/default.nix rename to pkgs/unit/je/jellycli/pkg-fun.nix diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/unit/je/jellyfin-ffmpeg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jellyfin-ffmpeg/default.nix rename to pkgs/unit/je/jellyfin-ffmpeg/pkg-fun.nix diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/unit/je/jemalloc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jemalloc/default.nix rename to pkgs/unit/je/jemalloc/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/unit/je/jenkins/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/jenkins/default.nix rename to pkgs/unit/je/jenkins/pkg-fun.nix diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/unit/je/jet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jet/default.nix rename to pkgs/unit/je/jet/pkg-fun.nix diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/unit/je/jetbrains-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/jetbrains-mono/default.nix rename to pkgs/unit/je/jetbrains-mono/pkg-fun.nix diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/unit/je/jetty/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/jetty/default.nix rename to pkgs/unit/je/jetty/pkg-fun.nix diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/unit/jf/jffi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/jffi/default.nix rename to pkgs/unit/jf/jffi/pkg-fun.nix diff --git a/pkgs/applications/science/engineering/jflap/default.nix b/pkgs/unit/jf/jflap/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/engineering/jflap/default.nix rename to pkgs/unit/jf/jflap/pkg-fun.nix diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/unit/jf/jflex/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/jflex/default.nix rename to pkgs/unit/jf/jflex/pkg-fun.nix diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/unit/jf/jfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jfmt/default.nix rename to pkgs/unit/jf/jfmt/pkg-fun.nix diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/unit/jf/jfrog-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/jfrog-cli/default.nix rename to pkgs/unit/jf/jfrog-cli/pkg-fun.nix diff --git a/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/pkgs/unit/jf/jfsutils/ar-fix.patch similarity index 100% rename from pkgs/tools/filesystems/jfsutils/ar-fix.patch rename to pkgs/unit/jf/jfsutils/ar-fix.patch diff --git a/pkgs/tools/filesystems/jfsutils/hardening-format.patch b/pkgs/unit/jf/jfsutils/hardening-format.patch similarity index 100% rename from pkgs/tools/filesystems/jfsutils/hardening-format.patch rename to pkgs/unit/jf/jfsutils/hardening-format.patch diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/unit/jf/jfsutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/jfsutils/default.nix rename to pkgs/unit/jf/jfsutils/pkg-fun.nix diff --git a/pkgs/tools/filesystems/jfsutils/types.patch b/pkgs/unit/jf/jfsutils/types.patch similarity index 100% rename from pkgs/tools/filesystems/jfsutils/types.patch rename to pkgs/unit/jf/jfsutils/types.patch diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/unit/jf/jftui/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/jftui/default.nix rename to pkgs/unit/jf/jftui/pkg-fun.nix diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/unit/jg/jgmenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jgmenu/default.nix rename to pkgs/unit/jg/jgmenu/pkg-fun.nix diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/unit/jh/jhead/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/jhead/default.nix rename to pkgs/unit/jh/jhead/pkg-fun.nix diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/unit/jh/jhiccup/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/jhiccup/default.nix rename to pkgs/unit/jh/jhiccup/pkg-fun.nix diff --git a/pkgs/servers/jibri/default.nix b/pkgs/unit/ji/jibri/pkg-fun.nix similarity index 100% rename from pkgs/servers/jibri/default.nix rename to pkgs/unit/ji/jibri/pkg-fun.nix diff --git a/pkgs/servers/jibri/update.sh b/pkgs/unit/ji/jibri/update.sh similarity index 100% rename from pkgs/servers/jibri/update.sh rename to pkgs/unit/ji/jibri/update.sh diff --git a/pkgs/servers/jicofo/logging.properties-journal b/pkgs/unit/ji/jicofo/logging.properties-journal similarity index 100% rename from pkgs/servers/jicofo/logging.properties-journal rename to pkgs/unit/ji/jicofo/logging.properties-journal diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/unit/ji/jicofo/pkg-fun.nix similarity index 100% rename from pkgs/servers/jicofo/default.nix rename to pkgs/unit/ji/jicofo/pkg-fun.nix diff --git a/pkgs/servers/jicofo/update.sh b/pkgs/unit/ji/jicofo/update.sh similarity index 100% rename from pkgs/servers/jicofo/update.sh rename to pkgs/unit/ji/jicofo/update.sh diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/unit/ji/jid/deps.nix similarity index 100% rename from pkgs/development/tools/jid/deps.nix rename to pkgs/unit/ji/jid/deps.nix diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/unit/ji/jid/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jid/default.nix rename to pkgs/unit/ji/jid/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/unit/ji/jikespg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/jikespg/default.nix rename to pkgs/unit/ji/jikespg/pkg-fun.nix diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/unit/ji/jimtcl/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/jimtcl/default.nix rename to pkgs/unit/ji/jimtcl/pkg-fun.nix diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/unit/ji/jiq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/jiq/default.nix rename to pkgs/unit/ji/jiq/pkg-fun.nix diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/unit/ji/jira-cli-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jira-cli-go/default.nix rename to pkgs/unit/ji/jira-cli-go/pkg-fun.nix diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/unit/ji/jira-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jira_cli/default.nix rename to pkgs/unit/ji/jira-cli/pkg-fun.nix diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/unit/ji/jirafeau/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/jirafeau/default.nix rename to pkgs/unit/ji/jirafeau/pkg-fun.nix diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/unit/ji/jiten/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jiten/default.nix rename to pkgs/unit/ji/jiten/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/unit/ji/jitsi-meet-electron/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix rename to pkgs/unit/ji/jitsi-meet-electron/pkg-fun.nix diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/unit/ji/jitsi-meet-prosody/pkg-fun.nix similarity index 100% rename from pkgs/misc/jitsi-meet-prosody/default.nix rename to pkgs/unit/ji/jitsi-meet-prosody/pkg-fun.nix diff --git a/pkgs/misc/jitsi-meet-prosody/update.sh b/pkgs/unit/ji/jitsi-meet-prosody/update.sh similarity index 100% rename from pkgs/misc/jitsi-meet-prosody/update.sh rename to pkgs/unit/ji/jitsi-meet-prosody/update.sh diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/unit/ji/jitsi-meet/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/jitsi-meet/default.nix rename to pkgs/unit/ji/jitsi-meet/pkg-fun.nix diff --git a/pkgs/servers/web-apps/jitsi-meet/update.sh b/pkgs/unit/ji/jitsi-meet/update.sh similarity index 100% rename from pkgs/servers/web-apps/jitsi-meet/update.sh rename to pkgs/unit/ji/jitsi-meet/update.sh diff --git a/pkgs/servers/jitsi-videobridge/logging.properties-journal b/pkgs/unit/ji/jitsi-videobridge/logging.properties-journal similarity index 100% rename from pkgs/servers/jitsi-videobridge/logging.properties-journal rename to pkgs/unit/ji/jitsi-videobridge/logging.properties-journal diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/unit/ji/jitsi-videobridge/pkg-fun.nix similarity index 100% rename from pkgs/servers/jitsi-videobridge/default.nix rename to pkgs/unit/ji/jitsi-videobridge/pkg-fun.nix diff --git a/pkgs/servers/jitsi-videobridge/update.sh b/pkgs/unit/ji/jitsi-videobridge/update.sh similarity index 100% rename from pkgs/servers/jitsi-videobridge/update.sh rename to pkgs/unit/ji/jitsi-videobridge/update.sh diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/unit/ji/jitsi/jitsi.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch rename to pkgs/unit/ji/jitsi/jitsi.patch diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/unit/ji/jitsi/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/jitsi/default.nix rename to pkgs/unit/ji/jitsi/pkg-fun.nix diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/unit/ji/jitterentropy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jitterentropy/default.nix rename to pkgs/unit/ji/jitterentropy/pkg-fun.nix diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/unit/jm/jmespath/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jmespath/default.nix rename to pkgs/unit/jm/jmespath/pkg-fun.nix diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/unit/jm/jmeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/jmeter/default.nix rename to pkgs/unit/jm/jmeter/pkg-fun.nix diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/unit/jm/jmtpfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/jmtpfs/default.nix rename to pkgs/unit/jm/jmtpfs/pkg-fun.nix diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/unit/jm/jmusicbot/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/jmusicbot/default.nix rename to pkgs/unit/jm/jmusicbot/pkg-fun.nix diff --git a/pkgs/development/java-modules/jna/default.nix b/pkgs/unit/jn/jna/pkg-fun.nix similarity index 100% rename from pkgs/development/java-modules/jna/default.nix rename to pkgs/unit/jn/jna/pkg-fun.nix diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/unit/jn/jnetmap/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/jnetmap/default.nix rename to pkgs/unit/jn/jnetmap/pkg-fun.nix diff --git a/pkgs/tools/networking/jnettop/no-dns-resolution.patch b/pkgs/unit/jn/jnettop/no-dns-resolution.patch similarity index 100% rename from pkgs/tools/networking/jnettop/no-dns-resolution.patch rename to pkgs/unit/jn/jnettop/no-dns-resolution.patch diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/unit/jn/jnettop/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/jnettop/default.nix rename to pkgs/unit/jn/jnettop/pkg-fun.nix diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/unit/jo/jo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jo/default.nix rename to pkgs/unit/jo/jo/pkg-fun.nix diff --git a/pkgs/tools/system/jobber/default.nix b/pkgs/unit/jo/jobber/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/jobber/default.nix rename to pkgs/unit/jo/jobber/pkg-fun.nix diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/unit/jo/joe/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/joe/default.nix rename to pkgs/unit/jo/joe/pkg-fun.nix diff --git a/pkgs/tools/security/john/default.nix b/pkgs/unit/jo/john/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/john/default.nix rename to pkgs/unit/jo/john/pkg-fun.nix diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/unit/jo/join-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/join-desktop/default.nix rename to pkgs/unit/jo/join-desktop/pkg-fun.nix diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/unit/jo/joker/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/joker/default.nix rename to pkgs/unit/jo/joker/pkg-fun.nix diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/unit/jo/joplin-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/joplin-desktop/default.nix rename to pkgs/unit/jo/joplin-desktop/pkg-fun.nix diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/unit/jo/jose/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jose/default.nix rename to pkgs/unit/jo/jose/pkg-fun.nix diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/unit/jo/josh/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/josh/default.nix rename to pkgs/unit/jo/josh/pkg-fun.nix diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/unit/jo/josm/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/josm/default.nix rename to pkgs/unit/jo/josm/pkg-fun.nix diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/unit/jo/jost/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/jost/default.nix rename to pkgs/unit/jo/jost/pkg-fun.nix diff --git a/pkgs/applications/misc/jot/default.nix b/pkgs/unit/jo/jot/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jot/default.nix rename to pkgs/unit/jo/jot/pkg-fun.nix diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/unit/jo/jotta-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jotta-cli/default.nix rename to pkgs/unit/jo/jotta-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/unit/jo/journaldriver/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/journaldriver/default.nix rename to pkgs/unit/jo/journaldriver/pkg-fun.nix diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/unit/jo/jove/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jove/default.nix rename to pkgs/unit/jo/jove/pkg-fun.nix diff --git a/pkgs/os-specific/linux/joycond/default.nix b/pkgs/unit/jo/joycond/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/joycond/default.nix rename to pkgs/unit/jo/joycond/pkg-fun.nix diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/unit/jo/joypixels/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/joypixels/default.nix rename to pkgs/unit/jo/joypixels/pkg-fun.nix diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/unit/jo/joystickwake/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/joystickwake/default.nix rename to pkgs/unit/jo/joystickwake/pkg-fun.nix diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/unit/jp/jp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jp/default.nix rename to pkgs/unit/jp/jp/pkg-fun.nix diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/unit/jp/jp2a/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jp2a/default.nix rename to pkgs/unit/jp/jp2a/pkg-fun.nix diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/unit/jp/jpeg-archive/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/jpeg-archive/default.nix rename to pkgs/unit/jp/jpeg-archive/pkg-fun.nix diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/unit/jp/jpegexiforient/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/jpegexiforient/default.nix rename to pkgs/unit/jp/jpegexiforient/pkg-fun.nix diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/unit/jp/jpeginfo/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/jpeginfo/default.nix rename to pkgs/unit/jp/jpeginfo/pkg-fun.nix diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/unit/jp/jpegoptim/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/jpegoptim/default.nix rename to pkgs/unit/jp/jpegoptim/pkg-fun.nix diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/unit/jp/jpegrescan/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/jpegrescan/default.nix rename to pkgs/unit/jp/jpegrescan/pkg-fun.nix diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/unit/jp/jpexs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jpexs/default.nix rename to pkgs/unit/jp/jpexs/pkg-fun.nix diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/unit/jp/jpm/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/janet/jpm.nix rename to pkgs/unit/jp/jpm/pkg-fun.nix diff --git a/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch b/pkgs/unit/jq/jq/fix-tests-when-building-without-regex-supports.patch similarity index 100% rename from pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch rename to pkgs/unit/jq/jq/fix-tests-when-building-without-regex-supports.patch diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/unit/jq/jq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jq/default.nix rename to pkgs/unit/jq/jq/pkg-fun.nix diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/unit/jq/jql/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jql/default.nix rename to pkgs/unit/jq/jql/pkg-fun.nix diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/unit/jq/jqp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jqp/default.nix rename to pkgs/unit/jq/jqp/pkg-fun.nix diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/unit/jq/jquake/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jquake/default.nix rename to pkgs/unit/jq/jquake/pkg-fun.nix diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/unit/jr/jrnl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/jrnl/default.nix rename to pkgs/unit/jr/jrnl/pkg-fun.nix diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/unit/jr/jrsonnet/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/jrsonnet/default.nix rename to pkgs/unit/jr/jrsonnet/pkg-fun.nix diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/unit/js/jsawk/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/jsawk/default.nix rename to pkgs/unit/js/jsawk/pkg-fun.nix diff --git a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch b/pkgs/unit/js/jscoverage/jsfalse_to_null.patch similarity index 100% rename from pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch rename to pkgs/unit/js/jscoverage/jsfalse_to_null.patch diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/unit/js/jscoverage/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/jscoverage/default.nix rename to pkgs/unit/js/jscoverage/pkg-fun.nix diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/unit/js/jsduck/Gemfile similarity index 100% rename from pkgs/development/tools/jsduck/Gemfile rename to pkgs/unit/js/jsduck/Gemfile diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/unit/js/jsduck/Gemfile.lock similarity index 100% rename from pkgs/development/tools/jsduck/Gemfile.lock rename to pkgs/unit/js/jsduck/Gemfile.lock diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/unit/js/jsduck/gemset.nix similarity index 100% rename from pkgs/development/tools/jsduck/gemset.nix rename to pkgs/unit/js/jsduck/gemset.nix diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/unit/js/jsduck/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jsduck/default.nix rename to pkgs/unit/js/jsduck/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/unit/js/jshon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/jshon/default.nix rename to pkgs/unit/js/jshon/pkg-fun.nix diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/unit/js/json-glib/meson-add-installed-tests-prefix-option.patch similarity index 100% rename from pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch rename to pkgs/unit/js/json-glib/meson-add-installed-tests-prefix-option.patch diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/unit/js/json-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/json-glib/default.nix rename to pkgs/unit/js/json-glib/pkg-fun.nix diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/unit/js/json-plot/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/json-plot/default.nix rename to pkgs/unit/js/json-plot/pkg-fun.nix diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/unit/js/json2hcl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/json2hcl/default.nix rename to pkgs/unit/js/json2hcl/pkg-fun.nix diff --git a/pkgs/development/tools/json2tsv/default.nix b/pkgs/unit/js/json2tsv/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/json2tsv/default.nix rename to pkgs/unit/js/json2tsv/pkg-fun.nix diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/unit/js/json_c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/json-c/default.nix rename to pkgs/unit/js/json_c/pkg-fun.nix diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/unit/js/jsoncpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jsoncpp/default.nix rename to pkgs/unit/js/jsoncpp/pkg-fun.nix diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/unit/js/jsonnet-bundler/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jsonnet-bundler/default.nix rename to pkgs/unit/js/jsonnet-bundler/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/unit/js/jsonnet-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/jsonnet-language-server/default.nix rename to pkgs/unit/js/jsonnet-language-server/pkg-fun.nix diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/unit/js/jsonnet/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/jsonnet/default.nix rename to pkgs/unit/js/jsonnet/pkg-fun.nix diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/unit/js/jsonrpc-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jsonrpc-glib/default.nix rename to pkgs/unit/js/jsonrpc-glib/pkg-fun.nix diff --git a/pkgs/tools/misc/jstest-gtk/default.nix b/pkgs/unit/js/jstest-gtk/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/jstest-gtk/default.nix rename to pkgs/unit/js/jstest-gtk/pkg-fun.nix diff --git a/pkgs/tools/security/jsubfinder/default.nix b/pkgs/unit/js/jsubfinder/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jsubfinder/default.nix rename to pkgs/unit/js/jsubfinder/pkg-fun.nix diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/unit/js/jsvc/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/jsvc/default.nix rename to pkgs/unit/js/jsvc/pkg-fun.nix diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/unit/jt/jtag-remote-server/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/jtag-remote-server/default.nix rename to pkgs/unit/jt/jtag-remote-server/pkg-fun.nix diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/unit/jt/jtc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/jtc/default.nix rename to pkgs/unit/jt/jtc/pkg-fun.nix diff --git a/pkgs/servers/sql/mssql/jdbc/jtds.nix b/pkgs/unit/jt/jtds_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/mssql/jdbc/jtds.nix rename to pkgs/unit/jt/jtds_jdbc/pkg-fun.nix diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/unit/ju/jucipp/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jucipp/default.nix rename to pkgs/unit/ju/jucipp/pkg-fun.nix diff --git a/pkgs/development/libraries/judy/cross.patch b/pkgs/unit/ju/judy/cross.patch similarity index 100% rename from pkgs/development/libraries/judy/cross.patch rename to pkgs/unit/ju/judy/cross.patch diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/unit/ju/judy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/judy/default.nix rename to pkgs/unit/ju/judy/pkg-fun.nix diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/unit/ju/jugglinglab/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/jugglinglab/default.nix rename to pkgs/unit/ju/jugglinglab/pkg-fun.nix diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/unit/ju/juicefs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/juicefs/default.nix rename to pkgs/unit/ju/juicefs/pkg-fun.nix diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/unit/ju/juju/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/juju/default.nix rename to pkgs/unit/ju/juju/pkg-fun.nix diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/unit/ju/jujuutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/jujuutils/default.nix rename to pkgs/unit/ju/jujuutils/pkg-fun.nix diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/unit/ju/julia-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/julia-mono/default.nix rename to pkgs/unit/ju/julia-mono/pkg-fun.nix diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/unit/ju/julia_16-bin/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch similarity index 100% rename from pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch rename to pkgs/unit/ju/julia_16-bin/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/unit/ju/julia_16-bin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/julia/1.6-bin.nix rename to pkgs/unit/ju/julia_16-bin/pkg-fun.nix diff --git a/pkgs/development/compilers/julia/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch b/pkgs/unit/ju/julia_18-bin/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch similarity index 100% rename from pkgs/development/compilers/julia/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch rename to pkgs/unit/ju/julia_18-bin/patches/1.8-bin/0001-allow-skipping-internet-required-tests.patch diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/unit/ju/julia_18-bin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/julia/1.8-bin.nix rename to pkgs/unit/ju/julia_18-bin/pkg-fun.nix diff --git a/pkgs/games/julius/default.nix b/pkgs/unit/ju/julius/pkg-fun.nix similarity index 100% rename from pkgs/games/julius/default.nix rename to pkgs/unit/ju/julius/pkg-fun.nix diff --git a/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/unit/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch similarity index 100% rename from pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch rename to pkgs/unit/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/unit/ju/jumanpp/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/jumanpp/default.nix rename to pkgs/unit/ju/jumanpp/pkg-fun.nix diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/unit/ju/jump/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/jump/default.nix rename to pkgs/unit/ju/jump/pkg-fun.nix diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/unit/ju/jumpapp/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/jumpapp/default.nix rename to pkgs/unit/ju/jumpapp/pkg-fun.nix diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/unit/ju/jumpnbump/pkg-fun.nix similarity index 100% rename from pkgs/games/jumpnbump/default.nix rename to pkgs/unit/ju/jumpnbump/pkg-fun.nix diff --git a/pkgs/games/jumpy/default.nix b/pkgs/unit/ju/jumpy/pkg-fun.nix similarity index 100% rename from pkgs/games/jumpy/default.nix rename to pkgs/unit/ju/jumpy/pkg-fun.nix diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/unit/ju/junction/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/junction/default.nix rename to pkgs/unit/ju/junction/pkg-fun.nix diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/unit/ju/junicode/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/junicode/default.nix rename to pkgs/unit/ju/junicode/pkg-fun.nix diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/unit/ju/juniper/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/juniper/default.nix rename to pkgs/unit/ju/juniper/pkg-fun.nix diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/unit/ju/junkie/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/junkie/default.nix rename to pkgs/unit/ju/junkie/pkg-fun.nix diff --git a/pkgs/data/themes/juno/default.nix b/pkgs/unit/ju/juno-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/juno/default.nix rename to pkgs/unit/ju/juno-theme/pkg-fun.nix diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/unit/ju/jupp/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jupp/default.nix rename to pkgs/unit/ju/jupp/pkg-fun.nix diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/unit/ju/jupyter-kernel/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jupyter/kernel.nix rename to pkgs/unit/ju/jupyter-kernel/pkg-fun.nix diff --git a/pkgs/applications/editors/jupyter/default.nix b/pkgs/unit/ju/jupyter/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jupyter/default.nix rename to pkgs/unit/ju/jupyter/pkg-fun.nix diff --git a/pkgs/shells/jush/default.nix b/pkgs/unit/ju/jush/pkg-fun.nix similarity index 100% rename from pkgs/shells/jush/default.nix rename to pkgs/unit/ju/jush/pkg-fun.nix diff --git a/pkgs/development/tools/just/default.nix b/pkgs/unit/ju/just/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/just/default.nix rename to pkgs/unit/ju/just/pkg-fun.nix diff --git a/pkgs/tools/text/justify/default.nix b/pkgs/unit/ju/justify/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/justify/default.nix rename to pkgs/unit/ju/justify/pkg-fun.nix diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/unit/jw/jwasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/jwasm/default.nix rename to pkgs/unit/jw/jwasm/pkg-fun.nix diff --git a/pkgs/tools/networking/jwhois/connect.patch b/pkgs/unit/jw/jwhois/connect.patch similarity index 100% rename from pkgs/tools/networking/jwhois/connect.patch rename to pkgs/unit/jw/jwhois/connect.patch diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/unit/jw/jwhois/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/jwhois/default.nix rename to pkgs/unit/jw/jwhois/pkg-fun.nix diff --git a/pkgs/tools/networking/jwhois/service-name.patch b/pkgs/unit/jw/jwhois/service-name.patch similarity index 100% rename from pkgs/tools/networking/jwhois/service-name.patch rename to pkgs/unit/jw/jwhois/service-name.patch diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/unit/jw/jwm-settings-manager/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/jwm/jwm-settings-manager.nix rename to pkgs/unit/jw/jwm-settings-manager/pkg-fun.nix diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/unit/jw/jwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/jwm/default.nix rename to pkgs/unit/jw/jwm/pkg-fun.nix diff --git a/pkgs/tools/security/jwt-hack/default.nix b/pkgs/unit/jw/jwt-hack/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jwt-hack/default.nix rename to pkgs/unit/jw/jwt-hack/pkg-fun.nix diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/unit/jw/jwx/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/jwx/default.nix rename to pkgs/unit/jw/jwx/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/unit/jx/jx/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/jx/default.nix rename to pkgs/unit/jx/jx/pkg-fun.nix diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/unit/jx/jxrlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/jxrlib/default.nix rename to pkgs/unit/jx/jxrlib/pkg-fun.nix diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/unit/jy/jython/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/jython/default.nix rename to pkgs/unit/jy/jython/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/unit/k0/k0sctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/k0sctl/default.nix rename to pkgs/unit/k0/k0sctl/pkg-fun.nix diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/unit/k2/k2pdfopt/0001-Fix-CMakeLists.patch similarity index 100% rename from pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch rename to pkgs/unit/k2/k2pdfopt/0001-Fix-CMakeLists.patch diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/unit/k2/k2pdfopt/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/k2pdfopt/default.nix rename to pkgs/unit/k2/k2pdfopt/pkg-fun.nix diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/unit/k2/k2tf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/k2tf/default.nix rename to pkgs/unit/k2/k2tf/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/pkgs/unit/k3/k3s/chart-versions.nix similarity index 100% rename from pkgs/applications/networking/cluster/k3s/chart-versions.nix rename to pkgs/unit/k3/k3s/chart-versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/unit/k3/k3s/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/k3s/default.nix rename to pkgs/unit/k3/k3s/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/unit/k3/k3s/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/k3s/update.sh rename to pkgs/unit/k3/k3s/update.sh diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/unit/k3/k3sup/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/k3sup/default.nix rename to pkgs/unit/k3/k3sup/pkg-fun.nix diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/unit/k4/k40-whisperer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/k40-whisperer/default.nix rename to pkgs/unit/k4/k40-whisperer/pkg-fun.nix diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/unit/k6/k6/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/k6/default.nix rename to pkgs/unit/k6/k6/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/unit/k9/k9s/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/k9s/default.nix rename to pkgs/unit/k9/k9s/pkg-fun.nix diff --git a/pkgs/games/kabeljau/default.nix b/pkgs/unit/ka/kabeljau/pkg-fun.nix similarity index 100% rename from pkgs/games/kabeljau/default.nix rename to pkgs/unit/ka/kabeljau/pkg-fun.nix diff --git a/pkgs/data/fonts/kacst/default.nix b/pkgs/unit/ka/kacst/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kacst/default.nix rename to pkgs/unit/ka/kacst/pkg-fun.nix diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/unit/ka/kaf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kaf/default.nix rename to pkgs/unit/ka/kaf/pkg-fun.nix diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/unit/ka/kafka-delta-ingest/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kafka-delta-ingest/default.nix rename to pkgs/unit/ka/kafka-delta-ingest/pkg-fun.nix diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/unit/ka/kafkactl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kafkactl/default.nix rename to pkgs/unit/ka/kafkactl/pkg-fun.nix diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/unit/ka/kail/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/kail/default.nix rename to pkgs/unit/ka/kail/pkg-fun.nix diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/unit/ka/kaitai-struct-compiler/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/kaitai-struct-compiler/default.nix rename to pkgs/unit/ka/kaitai-struct-compiler/pkg-fun.nix diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/unit/ka/kakasi/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/kakasi/default.nix rename to pkgs/unit/ka/kakasi/pkg-fun.nix diff --git a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/pkgs/unit/ka/kakouneUtils/build-kakoune-plugin.nix similarity index 100% rename from pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix rename to pkgs/unit/ka/kakouneUtils/build-kakoune-plugin.nix diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix b/pkgs/unit/ka/kakouneUtils/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/kakoune/plugins/kakoune-utils.nix rename to pkgs/unit/ka/kakouneUtils/pkg-fun.nix diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/unit/ka/kalibrate-hackrf/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/kalibrate-hackrf/default.nix rename to pkgs/unit/ka/kalibrate-hackrf/pkg-fun.nix diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/unit/ka/kalibrate-rtl/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/kalibrate-rtl/default.nix rename to pkgs/unit/ka/kalibrate-rtl/pkg-fun.nix diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/unit/ka/kalker/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kalker/default.nix rename to pkgs/unit/ka/kalker/pkg-fun.nix diff --git a/pkgs/servers/ftp/kamid/default.nix b/pkgs/unit/ka/kamid/pkg-fun.nix similarity index 100% rename from pkgs/servers/ftp/kamid/default.nix rename to pkgs/unit/ka/kamid/pkg-fun.nix diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/unit/ka/kanata/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/kanata/default.nix rename to pkgs/unit/ka/kanata/pkg-fun.nix diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/unit/ka/kanboard/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kanboard/default.nix rename to pkgs/unit/ka/kanboard/pkg-fun.nix diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/unit/ka/kanidm/pkg-fun.nix similarity index 100% rename from pkgs/servers/kanidm/default.nix rename to pkgs/unit/ka/kanidm/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/unit/ka/kanif/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kanif/default.nix rename to pkgs/unit/ka/kanif/pkg-fun.nix diff --git a/pkgs/data/fonts/kanit/default.nix b/pkgs/unit/ka/kanit-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kanit/default.nix rename to pkgs/unit/ka/kanit-font/pkg-fun.nix diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/unit/ka/kanji-stroke-order-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kanji-stroke-order-font/default.nix rename to pkgs/unit/ka/kanji-stroke-order-font/pkg-fun.nix diff --git a/pkgs/applications/misc/kanjidraw/default.nix b/pkgs/unit/ka/kanjidraw/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kanjidraw/default.nix rename to pkgs/unit/ka/kanjidraw/pkg-fun.nix diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/unit/ka/kanshi/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/kanshi/default.nix rename to pkgs/unit/ka/kanshi/pkg-fun.nix diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/unit/ka/kapacitor/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/kapacitor/default.nix rename to pkgs/unit/ka/kapacitor/pkg-fun.nix diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/unit/ka/kapitonov-plugins-pack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/kapitonov-plugins-pack/default.nix rename to pkgs/unit/ka/kapitonov-plugins-pack/pkg-fun.nix diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/unit/ka/kapowbang/pkg-fun.nix similarity index 100% rename from pkgs/servers/kapowbang/default.nix rename to pkgs/unit/ka/kapowbang/pkg-fun.nix diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/unit/ka/kapp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/kapp/default.nix rename to pkgs/unit/ka/kapp/pkg-fun.nix diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/unit/ka/kappanhang/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/kappanhang/default.nix rename to pkgs/unit/ka/kappanhang/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/unit/ka/karabiner-elements/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/karabiner-elements/default.nix rename to pkgs/unit/ka/karabiner-elements/pkg-fun.nix diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/unit/ka/karate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/karate/default.nix rename to pkgs/unit/ka/karate/pkg-fun.nix diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/unit/ka/kargo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kargo/default.nix rename to pkgs/unit/ka/kargo/pkg-fun.nix diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/unit/ka/karlender/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/karlender/default.nix rename to pkgs/unit/ka/karlender/pkg-fun.nix diff --git a/pkgs/servers/monitoring/karma/node-composition.nix b/pkgs/unit/ka/karma/node-composition.nix similarity index 100% rename from pkgs/servers/monitoring/karma/node-composition.nix rename to pkgs/unit/ka/karma/node-composition.nix diff --git a/pkgs/development/web/newman/node-env.nix b/pkgs/unit/ka/karma/node-env.nix similarity index 100% rename from pkgs/development/web/newman/node-env.nix rename to pkgs/unit/ka/karma/node-env.nix diff --git a/pkgs/servers/monitoring/karma/node-packages.nix b/pkgs/unit/ka/karma/node-packages.nix similarity index 100% rename from pkgs/servers/monitoring/karma/node-packages.nix rename to pkgs/unit/ka/karma/node-packages.nix diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/unit/ka/karma/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/karma/default.nix rename to pkgs/unit/ka/karma/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/unit/ka/karmor/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/karmor/default.nix rename to pkgs/unit/ka/karmor/pkg-fun.nix diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/unit/ka/kasmweb/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/kasmweb/default.nix rename to pkgs/unit/ka/kasmweb/pkg-fun.nix diff --git a/pkgs/games/katago/default.nix b/pkgs/unit/ka/katago/pkg-fun.nix similarity index 100% rename from pkgs/games/katago/default.nix rename to pkgs/unit/ka/katago/pkg-fun.nix diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/unit/ka/katana/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/katana/default.nix rename to pkgs/unit/ka/katana/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/unit/ka/kati/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/kati/default.nix rename to pkgs/unit/ka/kati/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/unit/ka/kati/version.patch similarity index 100% rename from pkgs/development/tools/build-managers/kati/version.patch rename to pkgs/unit/ka/kati/version.patch diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/unit/ka/katriawm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/katriawm/default.nix rename to pkgs/unit/ka/katriawm/pkg-fun.nix diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/unit/ka/kawkab-mono-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kawkab-mono/default.nix rename to pkgs/unit/ka/kawkab-mono-font/pkg-fun.nix diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/pkgs/unit/ka/kazam/fix-paths.patch similarity index 100% rename from pkgs/applications/video/kazam/fix-paths.patch rename to pkgs/unit/ka/kazam/fix-paths.patch diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/unit/ka/kazam/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/kazam/default.nix rename to pkgs/unit/ka/kazam/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/unit/kb/kbd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kbd/default.nix rename to pkgs/unit/kb/kbd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/unit/kb/kbd/search-paths.patch similarity index 100% rename from pkgs/os-specific/linux/kbd/search-paths.patch rename to pkgs/unit/kb/kbd/search-paths.patch diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/unit/kb/kbdd/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/kbdd/default.nix rename to pkgs/unit/kb/kbdd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/unit/kb/kbdlight/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kbdlight/default.nix rename to pkgs/unit/kb/kbdlight/pkg-fun.nix diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/unit/kb/kbfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/keybase/kbfs.nix rename to pkgs/unit/kb/kbfs/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kbst/default.nix b/pkgs/unit/kb/kbst/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kbst/default.nix rename to pkgs/unit/kb/kbst/pkg-fun.nix diff --git a/pkgs/development/tools/kcat/default.nix b/pkgs/unit/kc/kcat/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kcat/default.nix rename to pkgs/unit/kc/kcat/pkg-fun.nix diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/unit/kc/kcgi/pkg-fun.nix similarity index 100% rename from pkgs/development/web/kcgi/default.nix rename to pkgs/unit/kc/kcgi/pkg-fun.nix diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/unit/kc/kcli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kcli/default.nix rename to pkgs/unit/kc/kcli/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kconf/default.nix b/pkgs/unit/kc/kconf/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kconf/default.nix rename to pkgs/unit/kc/kconf/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/unit/kc/kcov/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/kcov/default.nix rename to pkgs/unit/kc/kcov/pkg-fun.nix diff --git a/pkgs/data/themes/kde-gruvbox/default.nix b/pkgs/unit/kd/kde-gruvbox/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/kde-gruvbox/default.nix rename to pkgs/unit/kd/kde-gruvbox/pkg-fun.nix diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/unit/kd/kdigger/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kdigger/default.nix rename to pkgs/unit/kd/kdigger/pkg-fun.nix diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/unit/ke/kea/dont-create-var.patch similarity index 100% rename from pkgs/tools/networking/kea/dont-create-var.patch rename to pkgs/unit/ke/kea/dont-create-var.patch diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/unit/ke/kea/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/kea/default.nix rename to pkgs/unit/ke/kea/pkg-fun.nix diff --git a/pkgs/games/keen4/default.nix b/pkgs/unit/ke/keen4/pkg-fun.nix similarity index 100% rename from pkgs/games/keen4/default.nix rename to pkgs/unit/ke/keen4/pkg-fun.nix diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/unit/ke/keepalived/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/keepalived/default.nix rename to pkgs/unit/ke/keepalived/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix b/pkgs/unit/ke/keepass-charactercopy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/charactercopy/default.nix rename to pkgs/unit/ke/keepass-charactercopy/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/unit/ke/keepass-diff/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-diff/default.nix rename to pkgs/unit/ke/keepass-diff/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/unit/ke/keepass-keeagent/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keeagent/default.nix rename to pkgs/unit/ke/keepass-keeagent/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/unit/ke/keepass-keepasshttp/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix rename to pkgs/unit/ke/keepass-keepasshttp/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/unit/ke/keepass-keepassrpc/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix rename to pkgs/unit/ke/keepass-keepassrpc/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix b/pkgs/unit/ke/keepass-keetraytotp/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix rename to pkgs/unit/ke/keepass-keetraytotp/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/unit/ke/keepass-otpkeyprov/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix rename to pkgs/unit/ke/keepass-otpkeyprov/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix b/pkgs/unit/ke/keepass-qrcodeview/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix rename to pkgs/unit/ke/keepass-qrcodeview/pkg-fun.nix diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/unit/ke/keepass/extractWinRscIconsToStdFreeDesktopDir.sh similarity index 100% rename from pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh rename to pkgs/unit/ke/keepass/extractWinRscIconsToStdFreeDesktopDir.sh diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/unit/ke/keepass/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/keepass/fix-paths.patch rename to pkgs/unit/ke/keepass/fix-paths.patch diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/unit/ke/keepass/keepass-plugins-load.patch similarity index 100% rename from pkgs/applications/misc/keepass/keepass-plugins-load.patch rename to pkgs/unit/ke/keepass/keepass-plugins-load.patch diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/unit/ke/keepass/keepass-plugins.patch similarity index 100% rename from pkgs/applications/misc/keepass/keepass-plugins.patch rename to pkgs/unit/ke/keepass/keepass-plugins.patch diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/unit/ke/keepass/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepass/default.nix rename to pkgs/unit/ke/keepass/pkg-fun.nix diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/unit/ke/keepassx/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepassx/default.nix rename to pkgs/unit/ke/keepassx/pkg-fun.nix diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/unit/ke/keepassx/random.patch similarity index 100% rename from pkgs/applications/misc/keepassx/random.patch rename to pkgs/unit/ke/keepassx/random.patch diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/unit/ke/keepassx2/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepassx/2.0.nix rename to pkgs/unit/ke/keepassx2/pkg-fun.nix diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/unit/ke/keeperrl/pkg-fun.nix similarity index 100% rename from pkgs/games/keeperrl/default.nix rename to pkgs/unit/ke/keeperrl/pkg-fun.nix diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/unit/ke/keepmenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keepmenu/default.nix rename to pkgs/unit/ke/keepmenu/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/unit/ke/keet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/keet/default.nix rename to pkgs/unit/ke/keet/pkg-fun.nix diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/unit/ke/keeweb/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keeweb/default.nix rename to pkgs/unit/ke/keeweb/pkg-fun.nix diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/unit/ke/kent/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/kent/default.nix rename to pkgs/unit/ke/kent/pkg-fun.nix diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/unit/ke/kepubify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kepubify/default.nix rename to pkgs/unit/ke/kepubify/pkg-fun.nix diff --git a/pkgs/tools/security/kerbrute/default.nix b/pkgs/unit/ke/kerbrute/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kerbrute/default.nix rename to pkgs/unit/ke/kerbrute/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/unit/ke/kermit-terminal/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/kermit-terminal/default.nix rename to pkgs/unit/ke/kermit-terminal/pkg-fun.nix diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/unit/ke/kermit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kermit/default.nix rename to pkgs/unit/ke/kermit/pkg-fun.nix diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/unit/ke/kestrel/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kestrel/default.nix rename to pkgs/unit/ke/kestrel/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/unit/ke/kexec-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kexec-tools/default.nix rename to pkgs/unit/ke/kexec-tools/pkg-fun.nix diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/unit/ke/key/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/key/default.nix rename to pkgs/unit/ke/key/pkg-fun.nix diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/unit/ke/keybase-gui/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/keybase/gui.nix rename to pkgs/unit/ke/keybase-gui/pkg-fun.nix diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/unit/ke/keycard-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/keycard-cli/default.nix rename to pkgs/unit/ke/keycard-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/unit/ke/keychain/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/keychain/default.nix rename to pkgs/unit/ke/keychain/pkg-fun.nix diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/unit/ke/keycloak/all-plugins.nix similarity index 100% rename from pkgs/servers/keycloak/all-plugins.nix rename to pkgs/unit/ke/keycloak/all-plugins.nix diff --git a/pkgs/servers/keycloak/config_vars.patch b/pkgs/unit/ke/keycloak/config_vars.patch similarity index 100% rename from pkgs/servers/keycloak/config_vars.patch rename to pkgs/unit/ke/keycloak/config_vars.patch diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/unit/ke/keycloak/keycloak-discord/default.nix similarity index 100% rename from pkgs/servers/keycloak/keycloak-discord/default.nix rename to pkgs/unit/ke/keycloak/keycloak-discord/default.nix diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/unit/ke/keycloak/keycloak-metrics-spi/default.nix similarity index 100% rename from pkgs/servers/keycloak/keycloak-metrics-spi/default.nix rename to pkgs/unit/ke/keycloak/keycloak-metrics-spi/default.nix diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/unit/ke/keycloak/pkg-fun.nix similarity index 100% rename from pkgs/servers/keycloak/default.nix rename to pkgs/unit/ke/keycloak/pkg-fun.nix diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/unit/ke/keycloak/scim-for-keycloak/default.nix similarity index 100% rename from pkgs/servers/keycloak/scim-for-keycloak/default.nix rename to pkgs/unit/ke/keycloak/scim-for-keycloak/default.nix diff --git a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/unit/ke/keycloak/scim-keycloak-user-storage-spi/default.nix similarity index 100% rename from pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix rename to pkgs/unit/ke/keycloak/scim-keycloak-user-storage-spi/default.nix diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/unit/ke/keyd/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/keyd/default.nix rename to pkgs/unit/ke/keyd/pkg-fun.nix diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/unit/ke/keyfinder-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/keyfinder-cli/default.nix rename to pkgs/unit/ke/keyfinder-cli/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/unit/ke/keyfuzz/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/keyfuzz/default.nix rename to pkgs/unit/ke/keyfuzz/pkg-fun.nix diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/unit/ke/keylight-controller-mschneider82/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/keylight-controller-mschneider82/default.nix rename to pkgs/unit/ke/keylight-controller-mschneider82/pkg-fun.nix diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/unit/ke/keymapviz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/keymapviz/default.nix rename to pkgs/unit/ke/keymapviz/pkg-fun.nix diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/unit/ke/keynav/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/keynav/default.nix rename to pkgs/unit/ke/keynav/pkg-fun.nix diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/unit/ke/keystone/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/keystone/default.nix rename to pkgs/unit/ke/keystone/pkg-fun.nix diff --git a/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/pkgs/unit/ke/keyutils/0001-Remove-unused-function-after_eq.patch similarity index 100% rename from pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch rename to pkgs/unit/ke/keyutils/0001-Remove-unused-function-after_eq.patch diff --git a/pkgs/os-specific/linux/keyutils/conf-symlink.patch b/pkgs/unit/ke/keyutils/conf-symlink.patch similarity index 100% rename from pkgs/os-specific/linux/keyutils/conf-symlink.patch rename to pkgs/unit/ke/keyutils/conf-symlink.patch diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/unit/ke/keyutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/keyutils/default.nix rename to pkgs/unit/ke/keyutils/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kfctl/default.nix b/pkgs/unit/kf/kfctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kfctl/default.nix rename to pkgs/unit/kf/kfctl/pkg-fun.nix diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/unit/kh/khal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/khal/default.nix rename to pkgs/unit/kh/khal/pkg-fun.nix diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/unit/kh/khard/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/khard/default.nix rename to pkgs/unit/kh/khard/pkg-fun.nix diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/unit/kh/khmeros/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/khmeros/default.nix rename to pkgs/unit/kh/khmeros/pkg-fun.nix diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/unit/kh/khronos-ocl-icd-loader/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/khronos-ocl-icd-loader/default.nix rename to pkgs/unit/kh/khronos-ocl-icd-loader/pkg-fun.nix diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/unit/kh/khronos-ocl-icd-loader/tracing.patch similarity index 100% rename from pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch rename to pkgs/unit/kh/khronos-ocl-icd-loader/tracing.patch diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/unit/kh/khronos/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/khronos/default.nix rename to pkgs/unit/kh/khronos/pkg-fun.nix diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/pkgs/unit/ki/kibana7/disable-nodejs-version-check-7.patch similarity index 100% rename from pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch rename to pkgs/unit/ki/kibana7/disable-nodejs-version-check-7.patch diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch b/pkgs/unit/ki/kibana7/disable-nodejs-version-check.patch similarity index 100% rename from pkgs/development/tools/misc/kibana/disable-nodejs-version-check.patch rename to pkgs/unit/ki/kibana7/disable-nodejs-version-check.patch diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/unit/ki/kibana7/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/kibana/7.x.nix rename to pkgs/unit/ki/kibana7/pkg-fun.nix diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/unit/ki/kibi/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/kibi/default.nix rename to pkgs/unit/ki/kibi/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/unit/ki/kicad/base.nix similarity index 100% rename from pkgs/applications/science/electronics/kicad/base.nix rename to pkgs/unit/ki/kicad/base.nix diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/unit/ki/kicad/libraries.nix similarity index 100% rename from pkgs/applications/science/electronics/kicad/libraries.nix rename to pkgs/unit/ki/kicad/libraries.nix diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/unit/ki/kicad/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/kicad/default.nix rename to pkgs/unit/ki/kicad/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/unit/ki/kicad/update.sh similarity index 100% rename from pkgs/applications/science/electronics/kicad/update.sh rename to pkgs/unit/ki/kicad/update.sh diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/unit/ki/kicad/versions.nix similarity index 100% rename from pkgs/applications/science/electronics/kicad/versions.nix rename to pkgs/unit/ki/kicad/versions.nix diff --git a/pkgs/applications/science/electronics/kicad/writable.patch b/pkgs/unit/ki/kicad/writable.patch similarity index 100% rename from pkgs/applications/science/electronics/kicad/writable.patch rename to pkgs/unit/ki/kicad/writable.patch diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/unit/ki/kics/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/kics/default.nix rename to pkgs/unit/ki/kics/pkg-fun.nix diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/unit/ki/kile-wl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kile-wl/default.nix rename to pkgs/unit/ki/kile-wl/pkg-fun.nix diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/unit/ki/kiln/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kiln/default.nix rename to pkgs/unit/ki/kiln/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/unit/ki/kime/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/kime/default.nix rename to pkgs/unit/ki/kime/pkg-fun.nix diff --git a/pkgs/development/tools/kind/kernel-module-path.patch b/pkgs/unit/ki/kind/kernel-module-path.patch similarity index 100% rename from pkgs/development/tools/kind/kernel-module-path.patch rename to pkgs/unit/ki/kind/kernel-module-path.patch diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/unit/ki/kind/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kind/default.nix rename to pkgs/unit/ki/kind/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch b/pkgs/unit/ki/kinect-audio-setup/libusb-1-import-path.patch similarity index 100% rename from pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch rename to pkgs/unit/ki/kinect-audio-setup/libusb-1-import-path.patch diff --git a/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/pkgs/unit/ki/kinect-audio-setup/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kinect-audio-setup/default.nix rename to pkgs/unit/ki/kinect-audio-setup/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch b/pkgs/unit/ki/kinect-audio-setup/udev-rules-extra-devices.patch similarity index 100% rename from pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch rename to pkgs/unit/ki/kinect-audio-setup/udev-rules-extra-devices.patch diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/unit/ki/kirc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/kirc/default.nix rename to pkgs/unit/ki/kirc/pkg-fun.nix diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/unit/ki/kismet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniffers/kismet/default.nix rename to pkgs/unit/ki/kismet/pkg-fun.nix diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/unit/ki/kissat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/kissat/default.nix rename to pkgs/unit/ki/kissat/pkg-fun.nix diff --git a/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/pkgs/unit/ki/kissat/writable-passwd-is-ok.patch similarity index 100% rename from pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch rename to pkgs/unit/ki/kissat/writable-passwd-is-ok.patch diff --git a/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch b/pkgs/unit/ki/kissfft/0001-pkgconfig-darwin.patch similarity index 100% rename from pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch rename to pkgs/unit/ki/kissfft/0001-pkgconfig-darwin.patch diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/unit/ki/kissfft/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/kissfft/default.nix rename to pkgs/unit/ki/kissfft/pkg-fun.nix diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/unit/ki/kisslicer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kisslicer/default.nix rename to pkgs/unit/ki/kisslicer/pkg-fun.nix diff --git a/pkgs/tools/security/kiterunner/default.nix b/pkgs/unit/ki/kiterunner/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kiterunner/default.nix rename to pkgs/unit/ki/kiterunner/pkg-fun.nix diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/unit/ki/kitty-themes/pkg-fun.nix similarity index 100% rename from pkgs/misc/kitty-themes/default.nix rename to pkgs/unit/ki/kitty-themes/pkg-fun.nix diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/unit/ki/kiwix-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kiwix/tools.nix rename to pkgs/unit/ki/kiwix-tools/pkg-fun.nix diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/unit/kj/kjv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kjv/default.nix rename to pkgs/unit/kj/kjv/pkg-fun.nix diff --git a/pkgs/games/klavaro/icons.patch b/pkgs/unit/kl/klavaro/icons.patch similarity index 100% rename from pkgs/games/klavaro/icons.patch rename to pkgs/unit/kl/klavaro/icons.patch diff --git a/pkgs/games/klavaro/default.nix b/pkgs/unit/kl/klavaro/pkg-fun.nix similarity index 100% rename from pkgs/games/klavaro/default.nix rename to pkgs/unit/kl/klavaro/pkg-fun.nix diff --git a/pkgs/games/klavaro/trans_lang_get_similar.patch b/pkgs/unit/kl/klavaro/trans_lang_get_similar.patch similarity index 100% rename from pkgs/games/klavaro/trans_lang_get_similar.patch rename to pkgs/unit/kl/klavaro/trans_lang_get_similar.patch diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/unit/kl/klibc/no-reinstall-kernel-headers.patch similarity index 100% rename from pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch rename to pkgs/unit/kl/klibc/no-reinstall-kernel-headers.patch diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/unit/kl/klibc/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/klibc/default.nix rename to pkgs/unit/kl/klibc/pkg-fun.nix diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/unit/kl/klick/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/klick/default.nix rename to pkgs/unit/kl/klick/pkg-fun.nix diff --git a/pkgs/servers/klipper/klipper-genconf.nix b/pkgs/unit/kl/klipper-genconf/pkg-fun.nix similarity index 100% rename from pkgs/servers/klipper/klipper-genconf.nix rename to pkgs/unit/kl/klipper-genconf/pkg-fun.nix diff --git a/pkgs/servers/klipper/default.nix b/pkgs/unit/kl/klipper/pkg-fun.nix similarity index 100% rename from pkgs/servers/klipper/default.nix rename to pkgs/unit/kl/klipper/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/unit/kl/kluctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kluctl/default.nix rename to pkgs/unit/kl/kluctl/pkg-fun.nix diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/unit/kl/klystrack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/klystrack/default.nix rename to pkgs/unit/kl/klystrack/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/unit/km/kmod-blacklist-ubuntu/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix rename to pkgs/unit/km/kmod-blacklist-ubuntu/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/unit/km/kmod-debian-aliases/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kmod-debian-aliases/default.nix rename to pkgs/unit/km/kmod-debian-aliases/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kmod/enable-static.patch b/pkgs/unit/km/kmod/enable-static.patch similarity index 100% rename from pkgs/os-specific/linux/kmod/enable-static.patch rename to pkgs/unit/km/kmod/enable-static.patch diff --git a/pkgs/os-specific/linux/kmod/module-dir.patch b/pkgs/unit/km/kmod/module-dir.patch similarity index 100% rename from pkgs/os-specific/linux/kmod/module-dir.patch rename to pkgs/unit/km/kmod/module-dir.patch diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/unit/km/kmod/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kmod/default.nix rename to pkgs/unit/km/kmod/pkg-fun.nix diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/unit/km/kmon/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/kmon/default.nix rename to pkgs/unit/km/kmon/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/unit/km/kmscon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kmscon/default.nix rename to pkgs/unit/km/kmscon/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/unit/km/kmscube/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kmscube/default.nix rename to pkgs/unit/km/kmscube/pkg-fun.nix diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/unit/km/kmsxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/kmsxx/default.nix rename to pkgs/unit/km/kmsxx/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/unit/kn/kn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kn/default.nix rename to pkgs/unit/kn/kn/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/unit/kn/knightos-genkfs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/genkfs/default.nix rename to pkgs/unit/kn/knightos-genkfs/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/unit/kn/knightos-kcc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/kcc/default.nix rename to pkgs/unit/kn/knightos-kcc/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/unit/kn/knightos-kimg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/kimg/default.nix rename to pkgs/unit/kn/knightos-kimg/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/unit/kn/knightos-kpack/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/kpack/default.nix rename to pkgs/unit/kn/knightos-kpack/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/unit/kn/knightos-mkrom/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/mkrom/default.nix rename to pkgs/unit/kn/knightos-mkrom/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/unit/kn/knightos-mktiupgrade/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/mktiupgrade/default.nix rename to pkgs/unit/kn/knightos-mktiupgrade/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/unit/kn/knightos-patchrom/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/patchrom/default.nix rename to pkgs/unit/kn/knightos-patchrom/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/unit/kn/knightos-scas/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/scas/default.nix rename to pkgs/unit/kn/knightos-scas/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/unit/kn/knightos-z80e/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/z80e/default.nix rename to pkgs/unit/kn/knightos-z80e/pkg-fun.nix diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/unit/kn/knockpy/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/knockpy/default.nix rename to pkgs/unit/kn/knockpy/pkg-fun.nix diff --git a/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch b/pkgs/unit/kn/knot-dns/dont-create-run-time-dirs.patch similarity index 100% rename from pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch rename to pkgs/unit/kn/knot-dns/dont-create-run-time-dirs.patch diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/unit/kn/knot-dns/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/knot-dns/default.nix rename to pkgs/unit/kn/knot-dns/pkg-fun.nix diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/unit/kn/knot-dns/runtime-deps.patch similarity index 100% rename from pkgs/servers/dns/knot-dns/runtime-deps.patch rename to pkgs/unit/kn/knot-dns/runtime-deps.patch diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/unit/ko/ko/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ko/default.nix rename to pkgs/unit/ko/ko/pkg-fun.nix diff --git a/pkgs/games/kobodeluxe/glibc29.patch b/pkgs/unit/ko/kobodeluxe/glibc29.patch similarity index 100% rename from pkgs/games/kobodeluxe/glibc29.patch rename to pkgs/unit/ko/kobodeluxe/glibc29.patch diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/unit/ko/kobodeluxe/pkg-fun.nix similarity index 100% rename from pkgs/games/kobodeluxe/default.nix rename to pkgs/unit/ko/kobodeluxe/pkg-fun.nix diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/unit/ko/kochi-substitute-naga10/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kochi-substitute-naga10/default.nix rename to pkgs/unit/ko/kochi-substitute-naga10/pkg-fun.nix diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/unit/ko/kochi-substitute/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kochi-substitute/default.nix rename to pkgs/unit/ko/kochi-substitute/pkg-fun.nix diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/unit/ko/kodi-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kodi-cli/default.nix rename to pkgs/unit/ko/kodi-cli/pkg-fun.nix diff --git a/pkgs/servers/komga/default.nix b/pkgs/unit/ko/komga/pkg-fun.nix similarity index 100% rename from pkgs/servers/komga/default.nix rename to pkgs/unit/ko/komga/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/unit/ko/kompose/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kompose/default.nix rename to pkgs/unit/ko/kompose/pkg-fun.nix diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/unit/ko/kona/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/kona/default.nix rename to pkgs/unit/ko/kona/pkg-fun.nix diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/unit/ko/kondo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kondo/default.nix rename to pkgs/unit/ko/kondo/pkg-fun.nix diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/unit/ko/konf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/konf/default.nix rename to pkgs/unit/ko/konf/pkg-fun.nix diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/unit/ko/konstraint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/konstraint/default.nix rename to pkgs/unit/ko/konstraint/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/unit/ko/kontemplate/deps.nix similarity index 100% rename from pkgs/applications/networking/cluster/kontemplate/deps.nix rename to pkgs/unit/ko/kontemplate/deps.nix diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/unit/ko/kontemplate/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kontemplate/default.nix rename to pkgs/unit/ko/kontemplate/pkg-fun.nix diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/unit/ko/kooha/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/kooha/default.nix rename to pkgs/unit/ko/kooha/pkg-fun.nix diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/unit/ko/kopia/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/kopia/default.nix rename to pkgs/unit/ko/kopia/pkg-fun.nix diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/unit/ko/koreader/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/koreader/default.nix rename to pkgs/unit/ko/koreader/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/unit/ko/kotatogram-desktop-with-webkit/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix rename to pkgs/unit/ko/kotatogram-desktop-with-webkit/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/unit/ko/kotlin-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/kotlin-language-server/default.nix rename to pkgs/unit/ko/kotlin-language-server/pkg-fun.nix diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/unit/ko/kotlin-native/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/kotlin/native.nix rename to pkgs/unit/ko/kotlin-native/pkg-fun.nix diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/unit/ko/kotlin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/kotlin/default.nix rename to pkgs/unit/ko/kotlin/pkg-fun.nix diff --git a/pkgs/games/koules/default.nix b/pkgs/unit/ko/koules/pkg-fun.nix similarity index 100% rename from pkgs/games/koules/default.nix rename to pkgs/unit/ko/koules/pkg-fun.nix diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/unit/kp/kpcli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kpcli/default.nix rename to pkgs/unit/kp/kpcli/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/unit/kp/kpt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kpt/default.nix rename to pkgs/unit/kp/kpt/pkg-fun.nix diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/unit/kr/krakenx/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/krakenx/default.nix rename to pkgs/unit/kr/krakenx/pkg-fun.nix diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile b/pkgs/unit/kr/kramdown-asciidoc/Gemfile similarity index 100% rename from pkgs/tools/typesetting/kramdown-asciidoc/Gemfile rename to pkgs/unit/kr/kramdown-asciidoc/Gemfile diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/pkgs/unit/kr/kramdown-asciidoc/Gemfile.lock similarity index 100% rename from pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock rename to pkgs/unit/kr/kramdown-asciidoc/Gemfile.lock diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix b/pkgs/unit/kr/kramdown-asciidoc/gemset.nix similarity index 100% rename from pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix rename to pkgs/unit/kr/kramdown-asciidoc/gemset.nix diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/unit/kr/kramdown-asciidoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/kramdown-asciidoc/default.nix rename to pkgs/unit/kr/kramdown-asciidoc/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/krane/Gemfile b/pkgs/unit/kr/krane/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/krane/Gemfile rename to pkgs/unit/kr/krane/Gemfile diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/unit/kr/krane/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/cluster/krane/Gemfile.lock rename to pkgs/unit/kr/krane/Gemfile.lock diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/unit/kr/krane/gemset.nix similarity index 100% rename from pkgs/applications/networking/cluster/krane/gemset.nix rename to pkgs/unit/kr/krane/gemset.nix diff --git a/pkgs/applications/networking/cluster/krane/default.nix b/pkgs/unit/kr/krane/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/krane/default.nix rename to pkgs/unit/kr/krane/pkg-fun.nix diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/unit/kr/krankerl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/krankerl/default.nix rename to pkgs/unit/kr/krankerl/pkg-fun.nix diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/unit/kr/krapslog/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/krapslog/default.nix rename to pkgs/unit/kr/krapslog/pkg-fun.nix diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/unit/kr/kratos/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kratos/default.nix rename to pkgs/unit/kr/kratos/pkg-fun.nix diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/unit/kr/kreative-square-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/kreative-square-fonts/default.nix rename to pkgs/unit/kr/kreative-square-fonts/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/unit/kr/krelay/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/krelay/default.nix rename to pkgs/unit/kr/krelay/pkg-fun.nix diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/unit/kr/krew/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/krew/default.nix rename to pkgs/unit/kr/krew/pkg-fun.nix diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/unit/kr/kronosnet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/kronosnet/default.nix rename to pkgs/unit/kr/kronosnet/pkg-fun.nix diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/unit/kr/krop/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/krop/default.nix rename to pkgs/unit/kr/krop/pkg-fun.nix diff --git a/pkgs/shells/ksh/default.nix b/pkgs/unit/ks/ksh/pkg-fun.nix similarity index 100% rename from pkgs/shells/ksh/default.nix rename to pkgs/unit/ks/ksh/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/unit/ks/ksmbd-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ksmbd-tools/default.nix rename to pkgs/unit/ks/ksmbd-tools/pkg-fun.nix diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/unit/ks/kssd/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/kssd/default.nix rename to pkgs/unit/ks/kssd/pkg-fun.nix diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/unit/ks/ksuperkey/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/ksuperkey/default.nix rename to pkgs/unit/ks/ksuperkey/pkg-fun.nix diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/unit/kt/kt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/kt/default.nix rename to pkgs/unit/kt/kt/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/unit/kt/kthxbye/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/kthxbye.nix rename to pkgs/unit/kt/kthxbye/pkg-fun.nix diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/unit/kt/ktlint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ktlint/default.nix rename to pkgs/unit/kt/ktlint/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/unit/kt/ktunnel/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/ktunnel/default.nix rename to pkgs/unit/kt/ktunnel/pkg-fun.nix diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/unit/ku/kube-bench/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kube-bench/default.nix rename to pkgs/unit/ku/kube-bench/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/unit/ku/kube-capacity/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kube-capacity/default.nix rename to pkgs/unit/ku/kube-capacity/pkg-fun.nix diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/unit/ku/kube-hunter/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kube-hunter/default.nix rename to pkgs/unit/ku/kube-hunter/pkg-fun.nix diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/unit/ku/kube-linter/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kube-linter/default.nix rename to pkgs/unit/ku/kube-linter/pkg-fun.nix diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/unit/ku/kube-prompt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kube-prompt/default.nix rename to pkgs/unit/ku/kube-prompt/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/unit/ku/kube-router/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kube-router/default.nix rename to pkgs/unit/ku/kube-router/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/unit/ku/kube-score/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kube-score/default.nix rename to pkgs/unit/ku/kube-score/pkg-fun.nix diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/unit/ku/kubeaudit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kubeaudit/default.nix rename to pkgs/unit/ku/kubeaudit/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/unit/ku/kubebuilder/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubebuilder/default.nix rename to pkgs/unit/ku/kubebuilder/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/unit/ku/kubecfg/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubecfg/default.nix rename to pkgs/unit/ku/kubecfg/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/unit/ku/kubecolor/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubecolor/default.nix rename to pkgs/unit/ku/kubecolor/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/unit/ku/kubeconform/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeconform/default.nix rename to pkgs/unit/ku/kubeconform/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/unit/ku/kubectl-doctor/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-doctor/default.nix rename to pkgs/unit/ku/kubectl-doctor/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/unit/ku/kubectl-evict-pod/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix rename to pkgs/unit/ku/kubectl-evict-pod/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubectl-example/default.nix b/pkgs/unit/ku/kubectl-example/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-example/default.nix rename to pkgs/unit/ku/kubectl-example/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubectl-images/default.nix b/pkgs/unit/ku/kubectl-images/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-images/default.nix rename to pkgs/unit/ku/kubectl-images/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/unit/ku/kubectl-node-shell/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-node-shell/default.nix rename to pkgs/unit/ku/kubectl-node-shell/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/pkgs/unit/ku/kubectl-tree/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-tree/default.nix rename to pkgs/unit/ku/kubectl-tree/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/unit/ku/kubectl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes/kubectl.nix rename to pkgs/unit/ku/kubectl/pkg-fun.nix diff --git a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/pkgs/unit/ku/kubectx/bump-golang-x-sys.patch similarity index 100% rename from pkgs/development/tools/kubectx/bump-golang-x-sys.patch rename to pkgs/unit/ku/kubectx/bump-golang-x-sys.patch diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/unit/ku/kubectx/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kubectx/default.nix rename to pkgs/unit/ku/kubectx/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/unit/ku/kubedb-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubedb-cli/default.nix rename to pkgs/unit/ku/kubedb-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/unit/ku/kubedog/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubedog/default.nix rename to pkgs/unit/ku/kubedog/pkg-fun.nix diff --git a/pkgs/tools/security/kubei/default.nix b/pkgs/unit/ku/kubei/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kubei/default.nix rename to pkgs/unit/ku/kubei/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/unit/ku/kubelogin-oidc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubelogin-oidc/default.nix rename to pkgs/unit/ku/kubelogin-oidc/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/unit/ku/kubelogin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubelogin/default.nix rename to pkgs/unit/ku/kubelogin/pkg-fun.nix diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/unit/ku/kubemq-community/pkg-fun.nix similarity index 100% rename from pkgs/servers/kubemq-community/default.nix rename to pkgs/unit/ku/kubemq-community/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/unit/ku/kubemqctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubemqctl/default.nix rename to pkgs/unit/ku/kubemqctl/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/unit/ku/kubent/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubent/default.nix rename to pkgs/unit/ku/kubent/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/unit/ku/kubeone/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeone/default.nix rename to pkgs/unit/ku/kubeone/pkg-fun.nix diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/unit/ku/kubeprompt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kubeprompt/default.nix rename to pkgs/unit/ku/kubeprompt/pkg-fun.nix diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/unit/ku/kubepug/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kubepug/default.nix rename to pkgs/unit/ku/kubepug/pkg-fun.nix diff --git a/pkgs/development/tools/kubepug/skip-external-network-tests.patch b/pkgs/unit/ku/kubepug/skip-external-network-tests.patch similarity index 100% rename from pkgs/development/tools/kubepug/skip-external-network-tests.patch rename to pkgs/unit/ku/kubepug/skip-external-network-tests.patch diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/unit/ku/kubergrunt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubergrunt/default.nix rename to pkgs/unit/ku/kubergrunt/pkg-fun.nix diff --git a/pkgs/development/tools/kubernetes-code-generator/default.nix b/pkgs/unit/ku/kubernetes-code-generator/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kubernetes-code-generator/default.nix rename to pkgs/unit/ku/kubernetes-code-generator/pkg-fun.nix diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/unit/ku/kubernetes-controller-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kubernetes-controller-tools/default.nix rename to pkgs/unit/ku/kubernetes-controller-tools/pkg-fun.nix diff --git a/pkgs/development/tools/kubernetes-controller-tools/version.patch b/pkgs/unit/ku/kubernetes-controller-tools/version.patch similarity index 100% rename from pkgs/development/tools/kubernetes-controller-tools/version.patch rename to pkgs/unit/ku/kubernetes-controller-tools/version.patch diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/unit/ku/kubernetes-helm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm/default.nix rename to pkgs/unit/ku/kubernetes-helm/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch b/pkgs/unit/ku/kubernetes/fixup-addonmanager-lib-path.patch similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch rename to pkgs/unit/ku/kubernetes/fixup-addonmanager-lib-path.patch diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/unit/ku/kubernetes/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernetes/default.nix rename to pkgs/unit/ku/kubernetes/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/unit/ku/kubernix/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubernix/default.nix rename to pkgs/unit/ku/kubernix/pkg-fun.nix diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/unit/ku/kubescape/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kubescape/default.nix rename to pkgs/unit/ku/kubescape/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/unit/ku/kubeseal/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeseal/default.nix rename to pkgs/unit/ku/kubeseal/pkg-fun.nix diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/unit/ku/kubesec/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/kubesec/default.nix rename to pkgs/unit/ku/kubesec/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/unit/ku/kubespy/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubespy/default.nix rename to pkgs/unit/ku/kubespy/pkg-fun.nix diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/unit/ku/kubeswitch/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kubeswitch/default.nix rename to pkgs/unit/ku/kubeswitch/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/unit/ku/kubetail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubetail/default.nix rename to pkgs/unit/ku/kubetail/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubeval/schema.nix b/pkgs/unit/ku/kubeval-schema/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeval/schema.nix rename to pkgs/unit/ku/kubeval-schema/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/unit/ku/kubeval/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubeval/default.nix rename to pkgs/unit/ku/kubeval/pkg-fun.nix diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/unit/ku/kubevirt/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/kubevirt/default.nix rename to pkgs/unit/ku/kubevirt/pkg-fun.nix diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/unit/ku/kubo-migrator-all-fs-repo-migrations/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/kubo-migrator/all-migrations.nix rename to pkgs/unit/ku/kubo-migrator-all-fs-repo-migrations/pkg-fun.nix diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/unit/ku/kubo-migrator-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/kubo-migrator/unwrapped.nix rename to pkgs/unit/ku/kubo-migrator-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/networking/kubo-migrator/default.nix b/pkgs/unit/ku/kubo-migrator/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/kubo-migrator/default.nix rename to pkgs/unit/ku/kubo-migrator/pkg-fun.nix diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/unit/ku/kubo/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/kubo/default.nix rename to pkgs/unit/ku/kubo/pkg-fun.nix diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/unit/ku/kupfer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kupfer/default.nix rename to pkgs/unit/ku/kupfer/pkg-fun.nix diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/unit/ku/kustomize-sops/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kustomize/kustomize-sops.nix rename to pkgs/unit/ku/kustomize-sops/pkg-fun.nix diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/unit/ku/kustomize/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kustomize/default.nix rename to pkgs/unit/ku/kustomize/pkg-fun.nix diff --git a/pkgs/development/tools/kustomize/3.nix b/pkgs/unit/ku/kustomize_3/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kustomize/3.nix rename to pkgs/unit/ku/kustomize_3/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/unit/ku/kuttl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kuttl/default.nix rename to pkgs/unit/ku/kuttl/pkg-fun.nix diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/unit/kv/kvmtool/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/kvmtool/default.nix rename to pkgs/unit/kv/kvmtool/pkg-fun.nix diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/unit/kw/kwakd/pkg-fun.nix similarity index 100% rename from pkgs/servers/kwakd/default.nix rename to pkgs/unit/kw/kwakd/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/pkgs/unit/kw/kwm/org.nixos.kwm.plist similarity index 100% rename from pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist rename to pkgs/unit/kw/kwm/org.nixos.kwm.plist diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/unit/kw/kwm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/kwm/default.nix rename to pkgs/unit/kw/kwm/pkg-fun.nix diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/unit/ky/kyotocabinet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/kyotocabinet/default.nix rename to pkgs/unit/ky/kyotocabinet/pkg-fun.nix diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/pkgs/unit/ky/kytea/gcc-O3.patch similarity index 100% rename from pkgs/tools/text/kytea/gcc-O3.patch rename to pkgs/unit/ky/kytea/gcc-O3.patch diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/unit/ky/kytea/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/kytea/default.nix rename to pkgs/unit/ky/kytea/pkg-fun.nix diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/unit/ky/kythe/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/kythe/default.nix rename to pkgs/unit/ky/kythe/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/unit/ky/kyverno/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/kyverno/default.nix rename to pkgs/unit/ky/kyverno/pkg-fun.nix diff --git a/pkgs/tools/text/l2md/default.nix b/pkgs/unit/l2/l2md/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/l2md/default.nix rename to pkgs/unit/l2/l2md/pkg-fun.nix diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/unit/l3/l3afpad/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/l3afpad/default.nix rename to pkgs/unit/l3/l3afpad/pkg-fun.nix diff --git a/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/pkgs/unit/la/LAStools/drop-64-suffix.patch similarity index 100% rename from pkgs/development/libraries/LAStools/drop-64-suffix.patch rename to pkgs/unit/la/LAStools/drop-64-suffix.patch diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/unit/la/LAStools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/LAStools/default.nix rename to pkgs/unit/la/LAStools/pkg-fun.nix diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/unit/la/LASzip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/LASzip/default.nix rename to pkgs/unit/la/LASzip/pkg-fun.nix diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/unit/la/LASzip2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/LASzip/LASzip2.nix rename to pkgs/unit/la/LASzip2/pkg-fun.nix diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/unit/la/lab/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/lab/default.nix rename to pkgs/unit/la/lab/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/unit/la/labelImg/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/labelimg/default.nix rename to pkgs/unit/la/labelImg/pkg-fun.nix diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/unit/la/labwc/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/labwc/default.nix rename to pkgs/unit/la/labwc/pkg-fun.nix diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/unit/la/ladspa-sdk/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ladspa-sdk/default.nix rename to pkgs/unit/la/ladspa-sdk/pkg-fun.nix diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/unit/la/ladspaH/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ladspa-sdk/ladspah.nix rename to pkgs/unit/la/ladspaH/pkg-fun.nix diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/unit/la/lalezar-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lalezar-fonts/default.nix rename to pkgs/unit/la/lalezar-fonts/pkg-fun.nix diff --git a/pkgs/applications/emulators/lambda-delta/default.nix b/pkgs/unit/la/lambda-delta/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/lambda-delta/default.nix rename to pkgs/unit/la/lambda-delta/pkg-fun.nix diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/unit/la/lambda-mod-zsh-theme/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix rename to pkgs/unit/la/lambda-mod-zsh-theme/pkg-fun.nix diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/unit/la/lame/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lame/default.nix rename to pkgs/unit/la/lame/pkg-fun.nix diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/unit/la/laminar/patches/no-network.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch rename to pkgs/unit/la/laminar/patches/no-network.patch diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/unit/la/laminar/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/laminar/default.nix rename to pkgs/unit/la/laminar/pkg-fun.nix diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/unit/la/languagetool/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/languagetool/default.nix rename to pkgs/unit/la/languagetool/pkg-fun.nix diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/unit/la/lao/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lao/default.nix rename to pkgs/unit/la/lao/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/unit/la/lapack-reference/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/liblapack/default.nix rename to pkgs/unit/la/lapack-reference/pkg-fun.nix diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/unit/la/lapack/pkg-fun.nix similarity index 100% rename from pkgs/build-support/alternatives/lapack/default.nix rename to pkgs/unit/la/lapack/pkg-fun.nix diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/unit/la/larswm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/larswm/default.nix rename to pkgs/unit/la/larswm/pkg-fun.nix diff --git a/pkgs/tools/audio/larynx/default.nix b/pkgs/unit/la/larynx/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/larynx/default.nix rename to pkgs/unit/la/larynx/pkg-fun.nix diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/unit/la/lasem/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lasem/default.nix rename to pkgs/unit/la/lasem/pkg-fun.nix diff --git a/pkgs/applications/audio/lash/gcc-47.patch b/pkgs/unit/la/lash/gcc-47.patch similarity index 100% rename from pkgs/applications/audio/lash/gcc-47.patch rename to pkgs/unit/la/lash/gcc-47.patch diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/unit/la/lash/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lash/default.nix rename to pkgs/unit/la/lash/pkg-fun.nix diff --git a/pkgs/applications/audio/lash/socket.patch b/pkgs/unit/la/lash/socket.patch similarity index 100% rename from pkgs/applications/audio/lash/socket.patch rename to pkgs/unit/la/lash/socket.patch diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/unit/la/lasso/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lasso/default.nix rename to pkgs/unit/la/lasso/pkg-fun.nix diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/unit/la/last-resort/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/last-resort/default.nix rename to pkgs/unit/la/last-resort/pkg-fun.nix diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/unit/la/last/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/last/default.nix rename to pkgs/unit/la/last/pkg-fun.nix diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/unit/la/lastpass-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/lastpass-cli/default.nix rename to pkgs/unit/la/lastpass-cli/pkg-fun.nix diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/unit/la/latencytop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/latencytop/default.nix rename to pkgs/unit/la/latencytop/pkg-fun.nix diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/unit/la/latex2html/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/latex2html/default.nix rename to pkgs/unit/la/latex2html/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/unit/la/latexrun/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/latexrun/default.nix rename to pkgs/unit/la/latexrun/pkg-fun.nix diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/unit/la/lato/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lato/default.nix rename to pkgs/unit/la/lato/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/latte-integrale/default.nix b/pkgs/unit/la/latte-integrale/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/latte-integrale/default.nix rename to pkgs/unit/la/latte-integrale/pkg-fun.nix diff --git a/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/pkgs/unit/la/lattice-diamond/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/fpga/lattice-diamond/default.nix rename to pkgs/unit/la/lattice-diamond/pkg-fun.nix diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/unit/la/lavalauncher/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lavalauncher/default.nix rename to pkgs/unit/la/lavalauncher/pkg-fun.nix diff --git a/pkgs/data/themes/layan-gtk-theme/default.nix b/pkgs/unit/la/layan-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/layan-gtk-theme/default.nix rename to pkgs/unit/la/layan-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/unit/la/layan-kde/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/layan-kde/default.nix rename to pkgs/unit/la/layan-kde/pkg-fun.nix diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/unit/la/lazpaint/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/lazpaint/default.nix rename to pkgs/unit/la/lazpaint/pkg-fun.nix diff --git a/pkgs/tools/misc/lazycli/default.nix b/pkgs/unit/la/lazycli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lazycli/default.nix rename to pkgs/unit/la/lazycli/pkg-fun.nix diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/unit/la/lazydocker/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lazydocker/default.nix rename to pkgs/unit/la/lazydocker/pkg-fun.nix diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/unit/la/lazygit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/lazygit/default.nix rename to pkgs/unit/la/lazygit/pkg-fun.nix diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/pkgs/unit/lb/lbdb/add-methods-to-rc.patch similarity index 100% rename from pkgs/tools/misc/lbdb/add-methods-to-rc.patch rename to pkgs/unit/lb/lbdb/add-methods-to-rc.patch diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/unit/lb/lbdb/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lbdb/default.nix rename to pkgs/unit/lb/lbdb/pkg-fun.nix diff --git a/pkgs/games/lgames/lbreakout2/default.nix b/pkgs/unit/lb/lbreakout2/pkg-fun.nix similarity index 100% rename from pkgs/games/lgames/lbreakout2/default.nix rename to pkgs/unit/lb/lbreakout2/pkg-fun.nix diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/unit/lb/lbreakouthd/pkg-fun.nix similarity index 100% rename from pkgs/games/lgames/lbreakouthd/default.nix rename to pkgs/unit/lb/lbreakouthd/pkg-fun.nix diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/unit/lb/lbry/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/lbry/default.nix rename to pkgs/unit/lb/lbry/pkg-fun.nix diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/unit/lb/lbzip2/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lbzip2/default.nix rename to pkgs/unit/lb/lbzip2/pkg-fun.nix diff --git a/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/pkgs/unit/lc/lc3tools/0001-mangle-configure.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0001-mangle-configure.patch rename to pkgs/unit/lc/lc3tools/0001-mangle-configure.patch diff --git a/pkgs/development/tools/lc3tools/0002-lc3os-path.patch b/pkgs/unit/lc/lc3tools/0002-lc3os-path.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0002-lc3os-path.patch rename to pkgs/unit/lc/lc3tools/0002-lc3os-path.patch diff --git a/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch b/pkgs/unit/lc/lc3tools/0003-lc3sim-tk-path.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch rename to pkgs/unit/lc/lc3tools/0003-lc3sim-tk-path.patch diff --git a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/pkgs/unit/lc/lc3tools/0004-configure-use-cc.patch similarity index 100% rename from pkgs/development/tools/lc3tools/0004-configure-use-cc.patch rename to pkgs/unit/lc/lc3tools/0004-configure-use-cc.patch diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/unit/lc/lc3tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/lc3tools/default.nix rename to pkgs/unit/lc/lc3tools/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/unit/lc/lcalc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/lcalc/default.nix rename to pkgs/unit/lc/lcalc/pkg-fun.nix diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/pkgs/unit/lc/lcdf-typetools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lcdf-typetools/default.nix rename to pkgs/unit/lc/lcdf-typetools/pkg-fun.nix diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/pkgs/unit/lc/lcdproc/hardcode_mtab.patch similarity index 100% rename from pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch rename to pkgs/unit/lc/lcdproc/hardcode_mtab.patch diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/unit/lc/lcdproc/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/lcdproc/default.nix rename to pkgs/unit/lc/lcdproc/pkg-fun.nix diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/unit/lc/lci/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/lci/default.nix rename to pkgs/unit/lc/lci/pkg-fun.nix diff --git a/pkgs/development/libraries/lcm/default.nix b/pkgs/unit/lc/lcm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lcm/default.nix rename to pkgs/unit/lc/lcm/pkg-fun.nix diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/pkgs/unit/lc/lcms1/cve-2013-4276.patch similarity index 100% rename from pkgs/development/libraries/lcms/cve-2013-4276.patch rename to pkgs/unit/lc/lcms1/cve-2013-4276.patch diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/unit/lc/lcms1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lcms/default.nix rename to pkgs/unit/lc/lcms1/pkg-fun.nix diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/unit/lc/lcms2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lcms2/default.nix rename to pkgs/unit/lc/lcms2/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/unit/lc/lcov/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/lcov/default.nix rename to pkgs/unit/lc/lcov/pkg-fun.nix diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/unit/ld/ldacbt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ldacbt/default.nix rename to pkgs/unit/ld/ldacbt/pkg-fun.nix diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/unit/ld/ldapmonitor/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ldapmonitor/default.nix rename to pkgs/unit/ld/ldapmonitor/pkg-fun.nix diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/unit/ld/ldapnomnom/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ldapnomnom/default.nix rename to pkgs/unit/ld/ldapnomnom/pkg-fun.nix diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/unit/ld/ldapvi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ldapvi/default.nix rename to pkgs/unit/ld/ldapvi/pkg-fun.nix diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/unit/ld/ldb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ldb/default.nix rename to pkgs/unit/ld/ldb/pkg-fun.nix diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/unit/ld/ldc/binary.nix similarity index 100% rename from pkgs/development/compilers/ldc/binary.nix rename to pkgs/unit/ld/ldc/binary.nix diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/unit/ld/ldc/bootstrap.nix similarity index 100% rename from pkgs/development/compilers/ldc/bootstrap.nix rename to pkgs/unit/ld/ldc/bootstrap.nix diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/unit/ld/ldc/generic.nix similarity index 100% rename from pkgs/development/compilers/ldc/generic.nix rename to pkgs/unit/ld/ldc/generic.nix diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/unit/ld/ldc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ldc/default.nix rename to pkgs/unit/ld/ldc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/unit/ld/ldm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ldm/default.nix rename to pkgs/unit/ld/ldm/pkg-fun.nix diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/unit/ld/ldmtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ldmtool/default.nix rename to pkgs/unit/ld/ldmtool/pkg-fun.nix diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/unit/ld/ldns/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ldns/default.nix rename to pkgs/unit/ld/ldns/pkg-fun.nix diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/unit/ld/ldtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/ldtk/default.nix rename to pkgs/unit/ld/ldtk/pkg-fun.nix diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/unit/le/leafnode/pkg-fun.nix similarity index 100% rename from pkgs/servers/news/leafnode/default.nix rename to pkgs/unit/le/leafnode/pkg-fun.nix diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/unit/le/leafpad/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/leafpad/default.nix rename to pkgs/unit/le/leafpad/pkg-fun.nix diff --git a/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/pkgs/unit/le/league-of-moveable-type/fonts.nix similarity index 100% rename from pkgs/data/fonts/league-of-moveable-type/fonts.nix rename to pkgs/unit/le/league-of-moveable-type/fonts.nix diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/unit/le/league-of-moveable-type/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/league-of-moveable-type/default.nix rename to pkgs/unit/le/league-of-moveable-type/pkg-fun.nix diff --git a/pkgs/data/fonts/league-of-moveable-type/update.sh b/pkgs/unit/le/league-of-moveable-type/update.sh similarity index 100% rename from pkgs/data/fonts/league-of-moveable-type/update.sh rename to pkgs/unit/le/league-of-moveable-type/update.sh diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/unit/le/lean/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/lean/default.nix rename to pkgs/unit/le/lean/pkg-fun.nix diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/unit/le/lean2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/lean2/default.nix rename to pkgs/unit/le/lean2/pkg-fun.nix diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/unit/le/leaps/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/leaps/default.nix rename to pkgs/unit/le/leaps/pkg-fun.nix diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/unit/le/leatherman/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/leatherman/default.nix rename to pkgs/unit/le/leatherman/pkg-fun.nix diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/unit/le/ledger-autosync/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/ledger-autosync/default.nix rename to pkgs/unit/le/ledger-autosync/pkg-fun.nix diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/unit/le/ledger-live-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/ledger-live-desktop/default.nix rename to pkgs/unit/le/ledger-live-desktop/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/unit/le/ledger-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ledger-udev-rules/default.nix rename to pkgs/unit/le/ledger-udev-rules/pkg-fun.nix diff --git a/pkgs/applications/office/ledger-web/Gemfile b/pkgs/unit/le/ledger-web/Gemfile similarity index 100% rename from pkgs/applications/office/ledger-web/Gemfile rename to pkgs/unit/le/ledger-web/Gemfile diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/unit/le/ledger-web/Gemfile.lock similarity index 100% rename from pkgs/applications/office/ledger-web/Gemfile.lock rename to pkgs/unit/le/ledger-web/Gemfile.lock diff --git a/pkgs/applications/office/ledger-web/gemset.nix b/pkgs/unit/le/ledger-web/gemset.nix similarity index 100% rename from pkgs/applications/office/ledger-web/gemset.nix rename to pkgs/unit/le/ledger-web/gemset.nix diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/unit/le/ledger-web/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/ledger-web/default.nix rename to pkgs/unit/le/ledger-web/pkg-fun.nix diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/unit/le/ledger/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/ledger/default.nix rename to pkgs/unit/le/ledger/pkg-fun.nix diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/unit/le/ledger2beancount/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ledger2beancount/default.nix rename to pkgs/unit/le/ledger2beancount/pkg-fun.nix diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/unit/le/ledmon/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ledmon/default.nix rename to pkgs/unit/le/ledmon/pkg-fun.nix diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/unit/le/leela/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/leela/default.nix rename to pkgs/unit/le/leela/pkg-fun.nix diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/unit/le/leetcode-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/leetcode-cli/default.nix rename to pkgs/unit/le/leetcode-cli/pkg-fun.nix diff --git a/pkgs/games/left4gore/default.nix b/pkgs/unit/le/left4gore-bin/pkg-fun.nix similarity index 100% rename from pkgs/games/left4gore/default.nix rename to pkgs/unit/le/left4gore-bin/pkg-fun.nix diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/unit/le/lefthook/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/lefthook/default.nix rename to pkgs/unit/le/lefthook/pkg-fun.nix diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/unit/le/leftwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/leftwm/default.nix rename to pkgs/unit/le/leftwm/pkg-fun.nix diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/unit/le/legit/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/legit/default.nix rename to pkgs/unit/le/legit/pkg-fun.nix diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/unit/le/legitify/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/legitify/default.nix rename to pkgs/unit/le/legitify/pkg-fun.nix diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/unit/le/lego/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/lego/default.nix rename to pkgs/unit/le/lego/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/unit/le/leiningen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/leiningen/default.nix rename to pkgs/unit/le/leiningen/pkg-fun.nix diff --git a/pkgs/tools/misc/lemmeknow/default.nix b/pkgs/unit/le/lemmeknow/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lemmeknow/default.nix rename to pkgs/unit/le/lemmeknow/pkg-fun.nix diff --git a/pkgs/tools/misc/lemmy-help/default.nix b/pkgs/unit/le/lemmy-help/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lemmy-help/default.nix rename to pkgs/unit/le/lemmy-help/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/unit/le/lemon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/lemon/default.nix rename to pkgs/unit/le/lemon/pkg-fun.nix diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/unit/le/lemonade/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lemonade/default.nix rename to pkgs/unit/le/lemonade/pkg-fun.nix diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/unit/le/lemonbar-xft/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/lemonbar/xft.nix rename to pkgs/unit/le/lemonbar-xft/pkg-fun.nix diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/unit/le/lemonbar/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/lemonbar/default.nix rename to pkgs/unit/le/lemonbar/pkg-fun.nix diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/unit/le/lenmus/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lenmus/default.nix rename to pkgs/unit/le/lenmus/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/unit/le/lens/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/lens/default.nix rename to pkgs/unit/le/lens/pkg-fun.nix diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/unit/le/lensfun/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lensfun/default.nix rename to pkgs/unit/le/lensfun/pkg-fun.nix diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/unit/le/leo3-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/leo3/binary.nix rename to pkgs/unit/le/leo3-bin/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/lepton-eda/default.nix b/pkgs/unit/le/lepton-eda/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/lepton-eda/default.nix rename to pkgs/unit/le/lepton-eda/pkg-fun.nix diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/unit/le/lepton/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/lepton/default.nix rename to pkgs/unit/le/lepton/pkg-fun.nix diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/unit/le/leptonica/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/leptonica/default.nix rename to pkgs/unit/le/leptonica/pkg-fun.nix diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/unit/le/lerc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lerc/default.nix rename to pkgs/unit/le/lerc/pkg-fun.nix diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/unit/le/less/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/less/default.nix rename to pkgs/unit/le/less/pkg-fun.nix diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/unit/le/lesspass-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/lesspass-cli/default.nix rename to pkgs/unit/le/lesspass-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/unit/le/lesspipe/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lesspipe/default.nix rename to pkgs/unit/le/lesspipe/pkg-fun.nix diff --git a/pkgs/development/libraries/lesstif/c-missing_xm_h.patch b/pkgs/unit/le/lesstif/c-missing_xm_h.patch similarity index 100% rename from pkgs/development/libraries/lesstif/c-missing_xm_h.patch rename to pkgs/unit/le/lesstif/c-missing_xm_h.patch diff --git a/pkgs/development/libraries/lesstif/c-render_table_crash.patch b/pkgs/unit/le/lesstif/c-render_table_crash.patch similarity index 100% rename from pkgs/development/libraries/lesstif/c-render_table_crash.patch rename to pkgs/unit/le/lesstif/c-render_table_crash.patch diff --git a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch b/pkgs/unit/le/lesstif/c-xpmpipethrough.patch similarity index 100% rename from pkgs/development/libraries/lesstif/c-xpmpipethrough.patch rename to pkgs/unit/le/lesstif/c-xpmpipethrough.patch diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/unit/le/lesstif/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lesstif/default.nix rename to pkgs/unit/le/lesstif/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/unit/le/levant/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/levant/default.nix rename to pkgs/unit/le/levant/pkg-fun.nix diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/unit/le/level-zero/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/level-zero/default.nix rename to pkgs/unit/le/level-zero/pkg-fun.nix diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/unit/le/leveldb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/leveldb/default.nix rename to pkgs/unit/le/leveldb/pkg-fun.nix diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/unit/le/levmar/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/levmar/default.nix rename to pkgs/unit/le/levmar/pkg-fun.nix diff --git a/pkgs/data/fonts/lexend/default.nix b/pkgs/unit/le/lexend/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lexend/default.nix rename to pkgs/unit/le/lexend/pkg-fun.nix diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/unit/le/lexicon/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/lexicon/default.nix rename to pkgs/unit/le/lexicon/pkg-fun.nix diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/unit/lf/lf/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/lf/default.nix rename to pkgs/unit/lf/lf/pkg-fun.nix diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/unit/lf/lfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/lfs/default.nix rename to pkgs/unit/lf/lfs/pkg-fun.nix diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/unit/lf/lftp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/lftp/default.nix rename to pkgs/unit/lf/lftp/pkg-fun.nix diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/unit/lg/lguf-brightness/pkg-fun.nix similarity index 100% rename from pkgs/misc/lguf-brightness/default.nix rename to pkgs/unit/lg/lguf-brightness/pkg-fun.nix diff --git a/pkgs/tools/archivers/lha/default.nix b/pkgs/unit/lh/lha/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/lha/default.nix rename to pkgs/unit/lh/lha/pkg-fun.nix diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/unit/lh/lhasa/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lhasa/default.nix rename to pkgs/unit/lh/lhasa/pkg-fun.nix diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/unit/li/LibreArp-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/LibreArp/lv2.nix rename to pkgs/unit/li/LibreArp-lv2/pkg-fun.nix diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/unit/li/LibreArp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/LibreArp/default.nix rename to pkgs/unit/li/LibreArp/pkg-fun.nix diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/unit/li/Literate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/literate-programming/Literate/default.nix rename to pkgs/unit/li/Literate/pkg-fun.nix diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/unit/li/lib2geom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lib2geom/default.nix rename to pkgs/unit/li/lib2geom/pkg-fun.nix diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/unit/li/lib3ds/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lib3ds/default.nix rename to pkgs/unit/li/lib3ds/pkg-fun.nix diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/unit/li/lib3mf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lib3mf/default.nix rename to pkgs/unit/li/lib3mf/pkg-fun.nix diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/unit/li/libAfterImage/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libAfterImage/default.nix rename to pkgs/unit/li/libAfterImage/pkg-fun.nix diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/unit/li/libHX/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libHX/default.nix rename to pkgs/unit/li/libHX/pkg-fun.nix diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/unit/li/libaacs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaacs/default.nix rename to pkgs/unit/li/libaacs/pkg-fun.nix diff --git a/pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch b/pkgs/unit/li/libaal/libaal-1.0.6-glibc-2.26.patch similarity index 100% rename from pkgs/development/libraries/libaal/libaal-1.0.6-glibc-2.26.patch rename to pkgs/unit/li/libaal/libaal-1.0.6-glibc-2.26.patch diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/unit/li/libaal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaal/default.nix rename to pkgs/unit/li/libaal/pkg-fun.nix diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/unit/li/libabigail/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libabigail/default.nix rename to pkgs/unit/li/libabigail/pkg-fun.nix diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/unit/li/libabw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libabw/default.nix rename to pkgs/unit/li/libabw/pkg-fun.nix diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/unit/li/libaccounts-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaccounts-glib/default.nix rename to pkgs/unit/li/libaccounts-glib/pkg-fun.nix diff --git a/pkgs/development/libraries/libaccounts-glib/py-override.patch b/pkgs/unit/li/libaccounts-glib/py-override.patch similarity index 100% rename from pkgs/development/libraries/libaccounts-glib/py-override.patch rename to pkgs/unit/li/libaccounts-glib/py-override.patch diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/unit/li/libad9361/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libad9361/default.nix rename to pkgs/unit/li/libad9361/pkg-fun.nix diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/unit/li/libaec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaec/default.nix rename to pkgs/unit/li/libaec/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/unit/li/libaio/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libaio/default.nix rename to pkgs/unit/li/libaio/pkg-fun.nix diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/unit/li/libajantv2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libajantv2/default.nix rename to pkgs/unit/li/libajantv2/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch b/pkgs/unit/li/libamplsolver/libamplsolver-sharedlib.patch similarity index 100% rename from pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch rename to pkgs/unit/li/libamplsolver/libamplsolver-sharedlib.patch diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/unit/li/libamplsolver/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/libamplsolver/default.nix rename to pkgs/unit/li/libamplsolver/pkg-fun.nix diff --git a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/pkgs/unit/li/libamqpcpp/libamqpcpp-darwin.patch similarity index 100% rename from pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch rename to pkgs/unit/li/libamqpcpp/libamqpcpp-darwin.patch diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/unit/li/libamqpcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libamqpcpp/default.nix rename to pkgs/unit/li/libamqpcpp/pkg-fun.nix diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/unit/li/libantlr3c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libantlr3c/default.nix rename to pkgs/unit/li/libantlr3c/pkg-fun.nix diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/unit/li/libaosd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaosd/default.nix rename to pkgs/unit/li/libaosd/pkg-fun.nix diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/unit/li/libappindicator/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libappindicator/default.nix rename to pkgs/unit/li/libappindicator/pkg-fun.nix diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/unit/li/libarchive/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libarchive/default.nix rename to pkgs/unit/li/libarchive/pkg-fun.nix diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/unit/li/libargon2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libargon2/default.nix rename to pkgs/unit/li/libargon2/pkg-fun.nix diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/unit/li/libargs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libargs/default.nix rename to pkgs/unit/li/libargs/pkg-fun.nix diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/unit/li/libasr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libasr/default.nix rename to pkgs/unit/li/libasr/pkg-fun.nix diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/unit/li/libass/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libass/default.nix rename to pkgs/unit/li/libass/pkg-fun.nix diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/unit/li/libassuan/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libassuan/default.nix rename to pkgs/unit/li/libassuan/pkg-fun.nix diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/unit/li/libast/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libast/default.nix rename to pkgs/unit/li/libast/pkg-fun.nix diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/unit/li/libasyncns/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libasyncns/default.nix rename to pkgs/unit/li/libasyncns/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/unit/li/libatasmart/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libatasmart/default.nix rename to pkgs/unit/li/libatasmart/pkg-fun.nix diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/unit/li/libatomic_ops/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libatomic_ops/default.nix rename to pkgs/unit/li/libatomic_ops/pkg-fun.nix diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/unit/li/libaudclient/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaudclient/default.nix rename to pkgs/unit/li/libaudclient/pkg-fun.nix diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/unit/li/libaudec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libaudec/default.nix rename to pkgs/unit/li/libaudec/pkg-fun.nix diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/unit/li/libavc1394/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libavc1394/default.nix rename to pkgs/unit/li/libavc1394/pkg-fun.nix diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/unit/li/libavif/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libavif/default.nix rename to pkgs/unit/li/libavif/pkg-fun.nix diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/unit/li/libax25/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libax25/default.nix rename to pkgs/unit/li/libax25/pkg-fun.nix diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/unit/li/libayatana-appindicator/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libayatana-appindicator/default.nix rename to pkgs/unit/li/libayatana-appindicator/pkg-fun.nix diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/unit/li/libayatana-indicator/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libayatana-indicator/default.nix rename to pkgs/unit/li/libayatana-indicator/pkg-fun.nix diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/unit/li/libb2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libb2/default.nix rename to pkgs/unit/li/libb2/pkg-fun.nix diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/unit/li/libb64/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libb64/default.nix rename to pkgs/unit/li/libb64/pkg-fun.nix diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/unit/li/libbacktrace/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbacktrace/default.nix rename to pkgs/unit/li/libbacktrace/pkg-fun.nix diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/unit/li/libbaseencode/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbaseencode/default.nix rename to pkgs/unit/li/libbaseencode/pkg-fun.nix diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/unit/li/libbde/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbde/default.nix rename to pkgs/unit/li/libbde/pkg-fun.nix diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/unit/li/libbdplus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbdplus/default.nix rename to pkgs/unit/li/libbdplus/pkg-fun.nix diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/unit/li/libbladeRF/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbladeRF/default.nix rename to pkgs/unit/li/libbladeRF/pkg-fun.nix diff --git a/pkgs/development/libraries/libblockdev/fix-paths.patch b/pkgs/unit/li/libblockdev/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/libblockdev/fix-paths.patch rename to pkgs/unit/li/libblockdev/fix-paths.patch diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/unit/li/libblockdev/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libblockdev/default.nix rename to pkgs/unit/li/libblockdev/pkg-fun.nix diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/unit/li/libblocksruntime/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libblocksruntime/default.nix rename to pkgs/unit/li/libblocksruntime/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/unit/li/libbpf/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libbpf/default.nix rename to pkgs/unit/li/libbpf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libbpf/0.x.nix b/pkgs/unit/li/libbpf_0/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libbpf/0.x.nix rename to pkgs/unit/li/libbpf_0/pkg-fun.nix diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/unit/li/libbpkg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbpkg/default.nix rename to pkgs/unit/li/libbpkg/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/unit/li/libbraiding/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/libbraiding/default.nix rename to pkgs/unit/li/libbraiding/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/unit/li/libbs2b/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libbs2b/default.nix rename to pkgs/unit/li/libbs2b/pkg-fun.nix diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/unit/li/libbsd/darwin.patch similarity index 100% rename from pkgs/development/libraries/libbsd/darwin.patch rename to pkgs/unit/li/libbsd/darwin.patch diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/unit/li/libbsd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbsd/default.nix rename to pkgs/unit/li/libbsd/pkg-fun.nix diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/unit/li/libbson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbson/default.nix rename to pkgs/unit/li/libbson/pkg-fun.nix diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/unit/li/libburn/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libburn/default.nix rename to pkgs/unit/li/libburn/pkg-fun.nix diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/unit/li/libbytesize/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libbytesize/default.nix rename to pkgs/unit/li/libbytesize/pkg-fun.nix diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/unit/li/libcaca/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcaca/default.nix rename to pkgs/unit/li/libcaca/pkg-fun.nix diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/unit/li/libcacard/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcacard/default.nix rename to pkgs/unit/li/libcacard/pkg-fun.nix diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/unit/li/libcamera/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcamera/default.nix rename to pkgs/unit/li/libcamera/pkg-fun.nix diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/unit/li/libcangjie/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcangjie/default.nix rename to pkgs/unit/li/libcangjie/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/unit/li/libcap/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libcap/default.nix rename to pkgs/unit/li/libcap/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/unit/li/libcap_ng/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libcap-ng/default.nix rename to pkgs/unit/li/libcap_ng/pkg-fun.nix diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/unit/li/libcardiacarrest/pkg-fun.nix similarity index 100% rename from pkgs/misc/libcardiacarrest/default.nix rename to pkgs/unit/li/libcardiacarrest/pkg-fun.nix diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/unit/li/libcbor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcbor/default.nix rename to pkgs/unit/li/libcbor/pkg-fun.nix diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/unit/li/libccd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libccd/default.nix rename to pkgs/unit/li/libccd/pkg-fun.nix diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/unit/li/libcdada/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcdada/default.nix rename to pkgs/unit/li/libcdada/pkg-fun.nix diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/unit/li/libcdaudio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcdaudio/default.nix rename to pkgs/unit/li/libcdaudio/pkg-fun.nix diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/unit/li/libcddb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcddb/default.nix rename to pkgs/unit/li/libcddb/pkg-fun.nix diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/unit/li/libcec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcec/default.nix rename to pkgs/unit/li/libcec/pkg-fun.nix diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/unit/li/libcec_platform/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcec/platform.nix rename to pkgs/unit/li/libcec_platform/pkg-fun.nix diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/unit/li/libcef/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcef/default.nix rename to pkgs/unit/li/libcef/pkg-fun.nix diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/unit/li/libcef/update.sh similarity index 100% rename from pkgs/development/libraries/libcef/update.sh rename to pkgs/unit/li/libcef/update.sh diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/unit/li/libcello/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcello/default.nix rename to pkgs/unit/li/libcello/pkg-fun.nix diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/unit/li/libcerf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcerf/default.nix rename to pkgs/unit/li/libcerf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/unit/li/libcgroup/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libcgroup/default.nix rename to pkgs/unit/li/libcgroup/pkg-fun.nix diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/unit/li/libchamplain/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libchamplain/default.nix rename to pkgs/unit/li/libchamplain/pkg-fun.nix diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/unit/li/libchardet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libchardet/default.nix rename to pkgs/unit/li/libchardet/pkg-fun.nix diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/unit/li/libchewing/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libchewing/default.nix rename to pkgs/unit/li/libchewing/pkg-fun.nix diff --git a/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/unit/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch similarity index 100% rename from pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch rename to pkgs/unit/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch diff --git a/pkgs/development/libraries/libchop/gets-undeclared.patch b/pkgs/unit/li/libchop/gets-undeclared.patch similarity index 100% rename from pkgs/development/libraries/libchop/gets-undeclared.patch rename to pkgs/unit/li/libchop/gets-undeclared.patch diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/unit/li/libchop/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libchop/default.nix rename to pkgs/unit/li/libchop/pkg-fun.nix diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/unit/li/libchop/size_t.patch similarity index 100% rename from pkgs/development/libraries/libchop/size_t.patch rename to pkgs/unit/li/libchop/size_t.patch diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/unit/li/libcifpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcifpp/default.nix rename to pkgs/unit/li/libcifpp/pkg-fun.nix diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/unit/li/libcint/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcint/default.nix rename to pkgs/unit/li/libcint/pkg-fun.nix diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/unit/li/libck/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libck/default.nix rename to pkgs/unit/li/libck/pkg-fun.nix diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/unit/li/libcli/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcli/default.nix rename to pkgs/unit/li/libcli/pkg-fun.nix diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/unit/li/libcloudproviders/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcloudproviders/default.nix rename to pkgs/unit/li/libcloudproviders/pkg-fun.nix diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/unit/li/libclthreads/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libclthreads/default.nix rename to pkgs/unit/li/libclthreads/pkg-fun.nix diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/unit/li/libclxclient/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libclxclient/default.nix rename to pkgs/unit/li/libclxclient/pkg-fun.nix diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/unit/li/libcmis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcmis/default.nix rename to pkgs/unit/li/libcmis/pkg-fun.nix diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/unit/li/libcollectdclient/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcollectdclient/default.nix rename to pkgs/unit/li/libcollectdclient/pkg-fun.nix diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/unit/li/libconfig/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libconfig/default.nix rename to pkgs/unit/li/libconfig/pkg-fun.nix diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/unit/li/libconfuse/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libconfuse/default.nix rename to pkgs/unit/li/libconfuse/pkg-fun.nix diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/unit/li/libcork/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcork/default.nix rename to pkgs/unit/li/libcork/pkg-fun.nix diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/unit/li/libcotp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcotp/default.nix rename to pkgs/unit/li/libcotp/pkg-fun.nix diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/unit/li/libcouchbase/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcouchbase/default.nix rename to pkgs/unit/li/libcouchbase/pkg-fun.nix diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/unit/li/libcpuid/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/libcpuid/default.nix rename to pkgs/unit/li/libcpuid/pkg-fun.nix diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/unit/li/libcrafter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcrafter/default.nix rename to pkgs/unit/li/libcrafter/pkg-fun.nix diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/unit/li/libcredis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcredis/default.nix rename to pkgs/unit/li/libcredis/pkg-fun.nix diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/unit/li/libcrossguid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcrossguid/default.nix rename to pkgs/unit/li/libcrossguid/pkg-fun.nix diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/unit/li/libcsptr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcsptr/default.nix rename to pkgs/unit/li/libcsptr/pkg-fun.nix diff --git a/pkgs/development/libraries/libctb/include-kbhit.patch b/pkgs/unit/li/libctb/include-kbhit.patch similarity index 100% rename from pkgs/development/libraries/libctb/include-kbhit.patch rename to pkgs/unit/li/libctb/include-kbhit.patch diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/unit/li/libctb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libctb/default.nix rename to pkgs/unit/li/libctb/pkg-fun.nix diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/unit/li/libctemplate/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libctemplate/default.nix rename to pkgs/unit/li/libctemplate/pkg-fun.nix diff --git a/pkgs/development/libraries/libctl/default.nix b/pkgs/unit/li/libctl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libctl/default.nix rename to pkgs/unit/li/libctl/pkg-fun.nix diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/unit/li/libcue/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcue/default.nix rename to pkgs/unit/li/libcue/pkg-fun.nix diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/unit/li/libcutl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcutl/default.nix rename to pkgs/unit/li/libcutl/pkg-fun.nix diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/unit/li/libcyaml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libcyaml/default.nix rename to pkgs/unit/li/libcyaml/pkg-fun.nix diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/pkgs/unit/li/libdaemon/fix-includes.patch similarity index 100% rename from pkgs/development/libraries/libdaemon/fix-includes.patch rename to pkgs/unit/li/libdaemon/fix-includes.patch diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/unit/li/libdaemon/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdaemon/default.nix rename to pkgs/unit/li/libdaemon/pkg-fun.nix diff --git a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/pkgs/unit/li/libdatovka/libdatovka-deprecated-fn-curl.patch similarity index 100% rename from pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch rename to pkgs/unit/li/libdatovka/libdatovka-deprecated-fn-curl.patch diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/unit/li/libdatovka/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdatovka/default.nix rename to pkgs/unit/li/libdatovka/pkg-fun.nix diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/unit/li/libdatrie/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdatrie/default.nix rename to pkgs/unit/li/libdatrie/pkg-fun.nix diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/unit/li/libdazzle/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdazzle/default.nix rename to pkgs/unit/li/libdazzle/pkg-fun.nix diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/unit/li/libdbi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdbi/default.nix rename to pkgs/unit/li/libdbi/pkg-fun.nix diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/unit/li/libdbiDrivers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdbi-drivers/default.nix rename to pkgs/unit/li/libdbiDrivers/pkg-fun.nix diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/unit/li/libdbusmenu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdbusmenu/default.nix rename to pkgs/unit/li/libdbusmenu/pkg-fun.nix diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/unit/li/libde265/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libde265/default.nix rename to pkgs/unit/li/libde265/pkg-fun.nix diff --git a/pkgs/development/libraries/libdecor/default.nix b/pkgs/unit/li/libdecor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdecor/default.nix rename to pkgs/unit/li/libdecor/pkg-fun.nix diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/unit/li/libdeflate/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdeflate/default.nix rename to pkgs/unit/li/libdeflate/pkg-fun.nix diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/unit/li/libdigidocpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdigidocpp/default.nix rename to pkgs/unit/li/libdigidocpp/pkg-fun.nix diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/unit/li/libdiscid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdiscid/default.nix rename to pkgs/unit/li/libdiscid/pkg-fun.nix diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/unit/li/libdislocator/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/afl/libdislocator.nix rename to pkgs/unit/li/libdislocator/pkg-fun.nix diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/unit/li/libdivecomputer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdivecomputer/default.nix rename to pkgs/unit/li/libdivecomputer/pkg-fun.nix diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/unit/li/libdivsufsort/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdivsufsort/default.nix rename to pkgs/unit/li/libdivsufsort/pkg-fun.nix diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/unit/li/libdmapsharing/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdmapsharing/default.nix rename to pkgs/unit/li/libdmapsharing/pkg-fun.nix diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/unit/li/libdmtx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdmtx/default.nix rename to pkgs/unit/li/libdmtx/pkg-fun.nix diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/unit/li/libdnet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdnet/default.nix rename to pkgs/unit/li/libdnet/pkg-fun.nix diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/unit/li/libdnf/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/libdnf/default.nix rename to pkgs/unit/li/libdnf/pkg-fun.nix diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/unit/li/libdrm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdrm/default.nix rename to pkgs/unit/li/libdrm/pkg-fun.nix diff --git a/pkgs/applications/emulators/libdsk/default.nix b/pkgs/unit/li/libdsk/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/libdsk/default.nix rename to pkgs/unit/li/libdsk/pkg-fun.nix diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/unit/li/libdv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdv/default.nix rename to pkgs/unit/li/libdv/pkg-fun.nix diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/unit/li/libdvbcsa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdvbcsa/default.nix rename to pkgs/unit/li/libdvbcsa/pkg-fun.nix diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/unit/li/libdvbpsi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdvbpsi/default.nix rename to pkgs/unit/li/libdvbpsi/pkg-fun.nix diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/unit/li/libdvdnav/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdvdnav/default.nix rename to pkgs/unit/li/libdvdnav/pkg-fun.nix diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/unit/li/libdvdread/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdvdread/default.nix rename to pkgs/unit/li/libdvdread/pkg-fun.nix diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/unit/li/libdvdread_4_9_9/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdvdread/4.9.9.nix rename to pkgs/unit/li/libdvdread_4_9_9/pkg-fun.nix diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/unit/li/libdwg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libdwg/default.nix rename to pkgs/unit/li/libdwg/pkg-fun.nix diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/unit/li/libe57format/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libe57format/default.nix rename to pkgs/unit/li/libe57format/pkg-fun.nix diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/unit/li/libeb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libeb/default.nix rename to pkgs/unit/li/libeb/pkg-fun.nix diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/unit/li/libebml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libebml/default.nix rename to pkgs/unit/li/libebml/pkg-fun.nix diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/unit/li/libebur128/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libebur128/default.nix rename to pkgs/unit/li/libebur128/pkg-fun.nix diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/pkgs/unit/li/libedit/01-cygwin.patch similarity index 100% rename from pkgs/development/libraries/libedit/01-cygwin.patch rename to pkgs/unit/li/libedit/01-cygwin.patch diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/unit/li/libedit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libedit/default.nix rename to pkgs/unit/li/libedit/pkg-fun.nix diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/unit/li/libee/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libee/default.nix rename to pkgs/unit/li/libee/pkg-fun.nix diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/pkgs/unit/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch similarity index 100% rename from pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch rename to pkgs/unit/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/unit/li/libelfin/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libelfin/default.nix rename to pkgs/unit/li/libelfin/pkg-fun.nix diff --git a/pkgs/development/libraries/libemf2svg/default.nix b/pkgs/unit/li/libemf2svg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libemf2svg/default.nix rename to pkgs/unit/li/libemf2svg/pkg-fun.nix diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/unit/li/libepc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libepc/default.nix rename to pkgs/unit/li/libepc/pkg-fun.nix diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/unit/li/liberal-crime-squad/pkg-fun.nix similarity index 100% rename from pkgs/games/liberal-crime-squad/default.nix rename to pkgs/unit/li/liberal-crime-squad/pkg-fun.nix diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/unit/li/liberastika/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/liberastika/default.nix rename to pkgs/unit/li/liberastika/pkg-fun.nix diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/unit/li/liberasurecode/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/liberasurecode/default.nix rename to pkgs/unit/li/liberasurecode/pkg-fun.nix diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/unit/li/liberation-circuit/pkg-fun.nix similarity index 100% rename from pkgs/games/liberation-circuit/default.nix rename to pkgs/unit/li/liberation-circuit/pkg-fun.nix diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/unit/li/liberation-sans-narrow/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/liberation-sans-narrow/default.nix rename to pkgs/unit/li/liberation-sans-narrow/pkg-fun.nix diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/unit/li/liberfa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liberfa/default.nix rename to pkgs/unit/li/liberfa/pkg-fun.nix diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/unit/li/liberio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liberio/default.nix rename to pkgs/unit/li/liberio/pkg-fun.nix diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/unit/li/libertine/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/libertine/default.nix rename to pkgs/unit/li/libertine/pkg-fun.nix diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/unit/li/libertinus/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/libertinus/default.nix rename to pkgs/unit/li/libertinus/pkg-fun.nix diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/unit/li/libesmtp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libesmtp/default.nix rename to pkgs/unit/li/libesmtp/pkg-fun.nix diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/unit/li/libestr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libestr/default.nix rename to pkgs/unit/li/libestr/pkg-fun.nix diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/unit/li/libetpan/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libetpan/default.nix rename to pkgs/unit/li/libetpan/pkg-fun.nix diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/unit/li/libev/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libev/default.nix rename to pkgs/unit/li/libev/pkg-fun.nix diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/unit/li/libevdev/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libevdev/default.nix rename to pkgs/unit/li/libevdev/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/unit/li/libevdevc/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libevdevc/default.nix rename to pkgs/unit/li/libevdevc/pkg-fun.nix diff --git a/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/unit/li/libevdevplus/0001-Add-cmake-install-directives.patch similarity index 100% rename from pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch rename to pkgs/unit/li/libevdevplus/0001-Add-cmake-install-directives.patch diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/unit/li/libevdevplus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libevdevplus/default.nix rename to pkgs/unit/li/libevdevplus/pkg-fun.nix diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/unit/li/libevent/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libevent/default.nix rename to pkgs/unit/li/libevent/pkg-fun.nix diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/unit/li/libewf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libewf/default.nix rename to pkgs/unit/li/libewf/pkg-fun.nix diff --git a/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/pkgs/unit/li/libexecinfo/30-linux-makefile.patch similarity index 100% rename from pkgs/development/libraries/libexecinfo/30-linux-makefile.patch rename to pkgs/unit/li/libexecinfo/30-linux-makefile.patch diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/unit/li/libexecinfo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libexecinfo/default.nix rename to pkgs/unit/li/libexecinfo/pkg-fun.nix diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/unit/li/libexif/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libexif/default.nix rename to pkgs/unit/li/libexif/pkg-fun.nix diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/unit/li/libexosip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/exosip/default.nix rename to pkgs/unit/li/libexosip/pkg-fun.nix diff --git a/pkgs/development/libraries/libexsid/default.nix b/pkgs/unit/li/libexsid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libexsid/default.nix rename to pkgs/unit/li/libexsid/pkg-fun.nix diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/unit/li/libexttextcat/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libexttextcat/default.nix rename to pkgs/unit/li/libexttextcat/pkg-fun.nix diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/unit/li/libf2c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libf2c/default.nix rename to pkgs/unit/li/libf2c/pkg-fun.nix diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/unit/li/libfabric/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfabric/default.nix rename to pkgs/unit/li/libfabric/pkg-fun.nix diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/unit/li/libfakeXinerama/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xpra/libfakeXinerama.nix rename to pkgs/unit/li/libfakeXinerama/pkg-fun.nix diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/unit/li/libfakekey/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfakekey/default.nix rename to pkgs/unit/li/libfakekey/pkg-fun.nix diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/unit/li/libfaketime/0001-Remove-unsupported-clang-flags.patch similarity index 100% rename from pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch rename to pkgs/unit/li/libfaketime/0001-Remove-unsupported-clang-flags.patch diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/unit/li/libfaketime/nix-store-date.patch similarity index 100% rename from pkgs/development/libraries/libfaketime/nix-store-date.patch rename to pkgs/unit/li/libfaketime/nix-store-date.patch diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/pkgs/unit/li/libfaketime/no-date-in-gzip-man-page.patch similarity index 100% rename from pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch rename to pkgs/unit/li/libfaketime/no-date-in-gzip-man-page.patch diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/unit/li/libfaketime/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfaketime/default.nix rename to pkgs/unit/li/libfaketime/pkg-fun.nix diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/unit/li/libfann/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfann/default.nix rename to pkgs/unit/li/libfann/pkg-fun.nix diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/unit/li/libff/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libff/default.nix rename to pkgs/unit/li/libff/pkg-fun.nix diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/unit/li/libffcall/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libffcall/default.nix rename to pkgs/unit/li/libffcall/pkg-fun.nix diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/unit/li/libffi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libffi/default.nix rename to pkgs/unit/li/libffi/pkg-fun.nix diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/unit/li/libffi_3_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libffi/3.3.nix rename to pkgs/unit/li/libffi_3_3/pkg-fun.nix diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/unit/li/libfishsound/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfishsound/default.nix rename to pkgs/unit/li/libfishsound/pkg-fun.nix diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/unit/li/libfixposix/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfixposix/default.nix rename to pkgs/unit/li/libfixposix/pkg-fun.nix diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/unit/li/libfm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfm/default.nix rename to pkgs/unit/li/libfm/pkg-fun.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/unit/li/libfprint-2-tod1-goodix/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix rename to pkgs/unit/li/libfprint-2-tod1-goodix/pkg-fun.nix diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/pkgs/unit/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch rename to pkgs/unit/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/pkgs/unit/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch rename to pkgs/unit/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/pkgs/unit/li/libfprint-2-tod1-vfs0090/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix rename to pkgs/unit/li/libfprint-2-tod1-vfs0090/pkg-fun.nix diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/unit/li/libfprint-tod/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfprint-tod/default.nix rename to pkgs/unit/li/libfprint-tod/pkg-fun.nix diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/unit/li/libfprint/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfprint/default.nix rename to pkgs/unit/li/libfprint/pkg-fun.nix diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/unit/li/libfpx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfpx/default.nix rename to pkgs/unit/li/libfpx/pkg-fun.nix diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/unit/li/libfreeaptx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfreeaptx/default.nix rename to pkgs/unit/li/libfreeaptx/pkg-fun.nix diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/unit/li/libfsm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfsm/default.nix rename to pkgs/unit/li/libfsm/pkg-fun.nix diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/unit/li/libftdi1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libftdi/1.x.nix rename to pkgs/unit/li/libftdi1/pkg-fun.nix diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/unit/li/libfyaml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libfyaml/default.nix rename to pkgs/unit/li/libfyaml/pkg-fun.nix diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/unit/li/libgadu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgadu/default.nix rename to pkgs/unit/li/libgadu/pkg-fun.nix diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/unit/li/libgaminggear/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgaminggear/default.nix rename to pkgs/unit/li/libgaminggear/pkg-fun.nix diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/unit/li/libgbinder/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgbinder/default.nix rename to pkgs/unit/li/libgbinder/pkg-fun.nix diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/unit/li/libgcrypt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgcrypt/default.nix rename to pkgs/unit/li/libgcrypt/pkg-fun.nix diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/unit/li/libgcrypt_1_5/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgcrypt/1.5.nix rename to pkgs/unit/li/libgcrypt_1_5/pkg-fun.nix diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/unit/li/libgda/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgda/default.nix rename to pkgs/unit/li/libgda/pkg-fun.nix diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/unit/li/libgda6/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgda/6.x.nix rename to pkgs/unit/li/libgda6/pkg-fun.nix diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/unit/li/libgdamm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgdamm/default.nix rename to pkgs/unit/li/libgdamm/pkg-fun.nix diff --git a/pkgs/development/libraries/libgdata/installed-tests-path.patch b/pkgs/unit/li/libgdata/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/libgdata/installed-tests-path.patch rename to pkgs/unit/li/libgdata/installed-tests-path.patch diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/unit/li/libgdata/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgdata/default.nix rename to pkgs/unit/li/libgdata/pkg-fun.nix diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/unit/li/libgee/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgee/default.nix rename to pkgs/unit/li/libgee/pkg-fun.nix diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/unit/li/libgen-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/libgen-cli/default.nix rename to pkgs/unit/li/libgen-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/unit/li/libgeotiff/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgeotiff/default.nix rename to pkgs/unit/li/libgeotiff/pkg-fun.nix diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/unit/li/libgepub/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgepub/default.nix rename to pkgs/unit/li/libgepub/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libgestures/include-fix.patch b/pkgs/unit/li/libgestures/include-fix.patch similarity index 100% rename from pkgs/os-specific/linux/libgestures/include-fix.patch rename to pkgs/unit/li/libgestures/include-fix.patch diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/unit/li/libgestures/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libgestures/default.nix rename to pkgs/unit/li/libgestures/pkg-fun.nix diff --git a/pkgs/development/libraries/libgflow/default.nix b/pkgs/unit/li/libgflow/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgflow/default.nix rename to pkgs/unit/li/libgflow/pkg-fun.nix diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/unit/li/libgig/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgig/default.nix rename to pkgs/unit/li/libgig/pkg-fun.nix diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/unit/li/libgit2-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgit2-glib/default.nix rename to pkgs/unit/li/libgit2-glib/pkg-fun.nix diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/unit/li/libglibutil/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libglibutil/default.nix rename to pkgs/unit/li/libglibutil/pkg-fun.nix diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/unit/li/libglvnd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libglvnd/default.nix rename to pkgs/unit/li/libglvnd/pkg-fun.nix diff --git a/pkgs/development/libraries/libgmpris/default.nix b/pkgs/unit/li/libgmpris/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgmpris/default.nix rename to pkgs/unit/li/libgmpris/pkg-fun.nix diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/unit/li/libgnome-games-support/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgnome-games-support/default.nix rename to pkgs/unit/li/libgnome-games-support/pkg-fun.nix diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/unit/li/libgnome-games-support_2_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgnome-games-support/2.0.nix rename to pkgs/unit/li/libgnome-games-support_2_0/pkg-fun.nix diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/unit/li/libgnome-keyring/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgnome-keyring/default.nix rename to pkgs/unit/li/libgnome-keyring/pkg-fun.nix diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/unit/li/libgnomekbd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgnomekbd/default.nix rename to pkgs/unit/li/libgnomekbd/pkg-fun.nix diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/unit/li/libgnt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgnt/default.nix rename to pkgs/unit/li/libgnt/pkg-fun.nix diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/unit/li/libgnurl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgnurl/default.nix rename to pkgs/unit/li/libgnurl/pkg-fun.nix diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/unit/li/libgovirt/no-version-script-ld-flag.patch similarity index 100% rename from pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch rename to pkgs/unit/li/libgovirt/no-version-script-ld-flag.patch diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/unit/li/libgovirt/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/libgovirt/default.nix rename to pkgs/unit/li/libgovirt/pkg-fun.nix diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/unit/li/libgpg-error/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgpg-error/default.nix rename to pkgs/unit/li/libgpg-error/pkg-fun.nix diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/unit/li/libgphoto2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgphoto2/default.nix rename to pkgs/unit/li/libgphoto2/pkg-fun.nix diff --git a/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/pkgs/unit/li/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch similarity index 100% rename from pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch rename to pkgs/unit/li/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/unit/li/libgpiod/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgpiod/default.nix rename to pkgs/unit/li/libgpiod/pkg-fun.nix diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/unit/li/libgringotts/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgringotts/default.nix rename to pkgs/unit/li/libgringotts/pkg-fun.nix diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/unit/li/libgsf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgsf/default.nix rename to pkgs/unit/li/libgsf/pkg-fun.nix diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/unit/li/libgssglue/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgssglue/default.nix rename to pkgs/unit/li/libgssglue/pkg-fun.nix diff --git a/pkgs/development/libraries/libgtkflow3/default.nix b/pkgs/unit/li/libgtkflow3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgtkflow3/default.nix rename to pkgs/unit/li/libgtkflow3/pkg-fun.nix diff --git a/pkgs/development/libraries/libgtkflow4/default.nix b/pkgs/unit/li/libgtkflow4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgtkflow4/default.nix rename to pkgs/unit/li/libgtkflow4/pkg-fun.nix diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/unit/li/libgtop/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgtop/default.nix rename to pkgs/unit/li/libgtop/pkg-fun.nix diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/unit/li/libgudev/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgudev/default.nix rename to pkgs/unit/li/libgudev/pkg-fun.nix diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/unit/li/libguestfs-appliance/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libguestfs/appliance.nix rename to pkgs/unit/li/libguestfs-appliance/pkg-fun.nix diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/unit/li/libgumath/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgumath/default.nix rename to pkgs/unit/li/libgumath/pkg-fun.nix diff --git a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/pkgs/unit/li/libgweather/fix-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/libgweather/fix-pkgconfig.patch rename to pkgs/unit/li/libgweather/fix-pkgconfig.patch diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/unit/li/libgweather/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgweather/default.nix rename to pkgs/unit/li/libgweather/pkg-fun.nix diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/unit/li/libgxps/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libgxps/default.nix rename to pkgs/unit/li/libgxps/pkg-fun.nix diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/unit/li/libhandy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhandy/default.nix rename to pkgs/unit/li/libhandy/pkg-fun.nix diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/unit/li/libhandy_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhandy/0.x.nix rename to pkgs/unit/li/libhandy_0/pkg-fun.nix diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/unit/li/libhangul/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhangul/default.nix rename to pkgs/unit/li/libhangul/pkg-fun.nix diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/unit/li/libharu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libharu/default.nix rename to pkgs/unit/li/libharu/pkg-fun.nix diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/unit/li/libhdhomerun/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhdhomerun/default.nix rename to pkgs/unit/li/libhdhomerun/pkg-fun.nix diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/unit/li/libheif/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libheif/default.nix rename to pkgs/unit/li/libheif/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/unit/li/libhomfly/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/libhomfly/default.nix rename to pkgs/unit/li/libhomfly/pkg-fun.nix diff --git a/pkgs/development/libraries/libhsts/default.nix b/pkgs/unit/li/libhsts/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhsts/default.nix rename to pkgs/unit/li/libhsts/pkg-fun.nix diff --git a/pkgs/development/libraries/libhsts/update.sh b/pkgs/unit/li/libhsts/update.sh similarity index 100% rename from pkgs/development/libraries/libhsts/update.sh rename to pkgs/unit/li/libhsts/update.sh diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/unit/li/libhttpseverywhere/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhttpseverywhere/default.nix rename to pkgs/unit/li/libhttpseverywhere/pkg-fun.nix diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/unit/li/libhugetlbfs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhugetlbfs/default.nix rename to pkgs/unit/li/libhugetlbfs/pkg-fun.nix diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/unit/li/libhwy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libhwy/default.nix rename to pkgs/unit/li/libhwy/pkg-fun.nix diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/unit/li/libiberty/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libiberty/default.nix rename to pkgs/unit/li/libiberty/pkg-fun.nix diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/unit/li/libibmad/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libibmad/default.nix rename to pkgs/unit/li/libibmad/pkg-fun.nix diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/unit/li/libibumad/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libibumad/default.nix rename to pkgs/unit/li/libibumad/pkg-fun.nix diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/unit/li/libical/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libical/default.nix rename to pkgs/unit/li/libical/pkg-fun.nix diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/unit/li/libical/respect-env-tzdir.patch similarity index 100% rename from pkgs/development/libraries/libical/respect-env-tzdir.patch rename to pkgs/unit/li/libical/respect-env-tzdir.patch diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/unit/li/libicns/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libicns/default.nix rename to pkgs/unit/li/libicns/pkg-fun.nix diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/unit/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch similarity index 100% rename from pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch rename to pkgs/unit/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch diff --git a/pkgs/development/libraries/libid3tag/debian-patches.patch b/pkgs/unit/li/libid3tag/debian-patches.patch similarity index 100% rename from pkgs/development/libraries/libid3tag/debian-patches.patch rename to pkgs/unit/li/libid3tag/debian-patches.patch diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/unit/li/libid3tag/id3tag.pc similarity index 100% rename from pkgs/development/libraries/libid3tag/id3tag.pc rename to pkgs/unit/li/libid3tag/id3tag.pc diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/unit/li/libid3tag/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libid3tag/default.nix rename to pkgs/unit/li/libid3tag/pkg-fun.nix diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/unit/li/libidn/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libidn/default.nix rename to pkgs/unit/li/libidn/pkg-fun.nix diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/unit/li/libidn2/fix-error-darwin.patch similarity index 100% rename from pkgs/development/libraries/libidn2/fix-error-darwin.patch rename to pkgs/unit/li/libidn2/fix-error-darwin.patch diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/unit/li/libidn2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libidn2/default.nix rename to pkgs/unit/li/libidn2/pkg-fun.nix diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/unit/li/libiec61883/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libiec61883/default.nix rename to pkgs/unit/li/libiec61883/pkg-fun.nix diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/unit/li/libieee1284/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libieee1284/default.nix rename to pkgs/unit/li/libieee1284/pkg-fun.nix diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/unit/li/libimagequant/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libimagequant/default.nix rename to pkgs/unit/li/libimagequant/pkg-fun.nix diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/unit/li/libime/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libime/default.nix rename to pkgs/unit/li/libime/pkg-fun.nix diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/unit/li/libimobiledevice-glue/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libimobiledevice-glue/default.nix rename to pkgs/unit/li/libimobiledevice-glue/pkg-fun.nix diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/unit/li/libindicator/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libindicator/default.nix rename to pkgs/unit/li/libindicator/pkg-fun.nix diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/unit/li/libinfinity/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libinfinity/default.nix rename to pkgs/unit/li/libinfinity/pkg-fun.nix diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/unit/li/libinjection/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libinjection/default.nix rename to pkgs/unit/li/libinjection/pkg-fun.nix diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/unit/li/libinklevel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libinklevel/default.nix rename to pkgs/unit/li/libinklevel/pkg-fun.nix diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/unit/li/libinotify-kqueue/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libinotify-kqueue/default.nix rename to pkgs/unit/li/libinotify-kqueue/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/unit/li/libinput-gestures/0001-hardcode-name.patch similarity index 100% rename from pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch rename to pkgs/unit/li/libinput-gestures/0001-hardcode-name.patch diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/unit/li/libinput-gestures/0002-paths.patch similarity index 100% rename from pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch rename to pkgs/unit/li/libinput-gestures/0002-paths.patch diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/unit/li/libinput-gestures/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/libinput-gestures/default.nix rename to pkgs/unit/li/libinput-gestures/pkg-fun.nix diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/unit/li/libinsane/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libinsane/default.nix rename to pkgs/unit/li/libinsane/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/unit/li/libinstpatch/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libinstpatch/default.nix rename to pkgs/unit/li/libinstpatch/pkg-fun.nix diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/unit/li/libipfix/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libipfix/default.nix rename to pkgs/unit/li/libipfix/pkg-fun.nix diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/unit/li/libipt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libipt/default.nix rename to pkgs/unit/li/libipt/pkg-fun.nix diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/unit/li/libiptcdata/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libiptcdata/default.nix rename to pkgs/unit/li/libiptcdata/pkg-fun.nix diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/unit/li/libircclient/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libircclient/default.nix rename to pkgs/unit/li/libircclient/pkg-fun.nix diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/unit/li/libirecovery/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libirecovery/default.nix rename to pkgs/unit/li/libirecovery/pkg-fun.nix diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/unit/li/libiscsi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libiscsi/default.nix rename to pkgs/unit/li/libiscsi/pkg-fun.nix diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/unit/li/libisds/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libisds/default.nix rename to pkgs/unit/li/libisds/pkg-fun.nix diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/unit/li/libisoburn/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libisoburn/default.nix rename to pkgs/unit/li/libisoburn/pkg-fun.nix diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/unit/li/libisofs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libisofs/default.nix rename to pkgs/unit/li/libisofs/pkg-fun.nix diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/unit/li/libite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libite/default.nix rename to pkgs/unit/li/libite/pkg-fun.nix diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/unit/li/libivykis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libivykis/default.nix rename to pkgs/unit/li/libivykis/pkg-fun.nix diff --git a/pkgs/development/libraries/libixp/default.nix b/pkgs/unit/li/libixp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libixp/default.nix rename to pkgs/unit/li/libixp/pkg-fun.nix diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/unit/li/libjaylink/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjaylink/default.nix rename to pkgs/unit/li/libjaylink/pkg-fun.nix diff --git a/pkgs/development/libraries/libjcat/installed-tests-path.patch b/pkgs/unit/li/libjcat/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/libjcat/installed-tests-path.patch rename to pkgs/unit/li/libjcat/installed-tests-path.patch diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/unit/li/libjcat/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjcat/default.nix rename to pkgs/unit/li/libjcat/pkg-fun.nix diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/unit/li/libjpeg_original/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjpeg/default.nix rename to pkgs/unit/li/libjpeg_original/pkg-fun.nix diff --git a/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/unit/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch rename to pkgs/unit/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/unit/li/libjpeg_turbo/mingw-boolean.patch similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch rename to pkgs/unit/li/libjpeg_turbo/mingw-boolean.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/unit/li/libjpeg_turbo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjpeg-turbo/default.nix rename to pkgs/unit/li/libjpeg_turbo/pkg-fun.nix diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/unit/li/libjreen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjreen/default.nix rename to pkgs/unit/li/libjreen/pkg-fun.nix diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/unit/li/libjson/install-fix.patch similarity index 100% rename from pkgs/development/libraries/libjson/install-fix.patch rename to pkgs/unit/li/libjson/install-fix.patch diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/unit/li/libjson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjson/default.nix rename to pkgs/unit/li/libjson/pkg-fun.nix diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/unit/li/libjwt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjwt/default.nix rename to pkgs/unit/li/libjwt/pkg-fun.nix diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/unit/li/libjxl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libjxl/default.nix rename to pkgs/unit/li/libjxl/pkg-fun.nix diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/unit/li/libkate/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libkate/default.nix rename to pkgs/unit/li/libkate/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/unit/li/libkeyfinder/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libkeyfinder/default.nix rename to pkgs/unit/li/libkeyfinder/pkg-fun.nix diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/unit/li/libkiwix/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/kiwix/lib.nix rename to pkgs/unit/li/libkiwix/pkg-fun.nix diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/unit/li/libkkc-data/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/libkkc-data/default.nix rename to pkgs/unit/li/libkkc-data/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/unit/li/libkkc/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/libkkc/default.nix rename to pkgs/unit/li/libkkc/pkg-fun.nix diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/unit/li/libkqueue/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libkqueue/default.nix rename to pkgs/unit/li/libkqueue/pkg-fun.nix diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/unit/li/libkrunfw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libkrunfw/default.nix rename to pkgs/unit/li/libkrunfw/pkg-fun.nix diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/unit/li/libks/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libks/default.nix rename to pkgs/unit/li/libks/pkg-fun.nix diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/unit/li/libksba/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libksba/default.nix rename to pkgs/unit/li/libksba/pkg-fun.nix diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/unit/li/libksi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libksi/default.nix rename to pkgs/unit/li/libksi/pkg-fun.nix diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/unit/li/liblastfmSF/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblastfmSF/default.nix rename to pkgs/unit/li/liblastfmSF/pkg-fun.nix diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/unit/li/liblaxjson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblaxjson/default.nix rename to pkgs/unit/li/liblaxjson/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/unit/li/liblbfgs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/liblbfgs/default.nix rename to pkgs/unit/li/liblbfgs/pkg-fun.nix diff --git a/pkgs/development/libraries/liblc3/default.nix b/pkgs/unit/li/liblc3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblc3/default.nix rename to pkgs/unit/li/liblc3/pkg-fun.nix diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/unit/li/liblcf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblcf/default.nix rename to pkgs/unit/li/liblcf/pkg-fun.nix diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/unit/li/libliftoff/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libliftoff/default.nix rename to pkgs/unit/li/libliftoff/pkg-fun.nix diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/unit/li/liblinear/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblinear/default.nix rename to pkgs/unit/li/liblinear/pkg-fun.nix diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/unit/li/liblinphone/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblinphone/default.nix rename to pkgs/unit/li/liblinphone/pkg-fun.nix diff --git a/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/pkgs/unit/li/liblinphone/use-normal-jsoncpp.patch similarity index 100% rename from pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch rename to pkgs/unit/li/liblinphone/use-normal-jsoncpp.patch diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/unit/li/liblo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblo/default.nix rename to pkgs/unit/li/liblo/pkg-fun.nix diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/unit/li/liblockfile/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblockfile/default.nix rename to pkgs/unit/li/liblockfile/pkg-fun.nix diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/unit/li/liblogging/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblogging/default.nix rename to pkgs/unit/li/liblogging/pkg-fun.nix diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/unit/li/liblognorm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblognorm/default.nix rename to pkgs/unit/li/liblognorm/pkg-fun.nix diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/unit/li/liblouis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblouis/default.nix rename to pkgs/unit/li/liblouis/pkg-fun.nix diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/unit/li/liblscp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblscp/default.nix rename to pkgs/unit/li/liblscp/pkg-fun.nix diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/unit/li/libltc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libltc/default.nix rename to pkgs/unit/li/libltc/pkg-fun.nix diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/unit/li/liblxi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liblxi/default.nix rename to pkgs/unit/li/liblxi/pkg-fun.nix diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/unit/li/libmad/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmad/default.nix rename to pkgs/unit/li/libmad/pkg-fun.nix diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/unit/li/libmanette/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmanette/default.nix rename to pkgs/unit/li/libmanette/pkg-fun.nix diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/unit/li/libmatchbox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmatchbox/default.nix rename to pkgs/unit/li/libmatchbox/pkg-fun.nix diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/unit/li/libmatroska/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmatroska/default.nix rename to pkgs/unit/li/libmatroska/pkg-fun.nix diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/unit/li/libmaxminddb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmaxminddb/default.nix rename to pkgs/unit/li/libmaxminddb/pkg-fun.nix diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/unit/li/libmbim/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmbim/default.nix rename to pkgs/unit/li/libmbim/pkg-fun.nix diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/unit/li/libmcrypt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmcrypt/default.nix rename to pkgs/unit/li/libmcrypt/pkg-fun.nix diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/unit/li/libmd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmd/default.nix rename to pkgs/unit/li/libmd/pkg-fun.nix diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/unit/li/libmediaart/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmediaart/default.nix rename to pkgs/unit/li/libmediaart/pkg-fun.nix diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/unit/li/libmediainfo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmediainfo/default.nix rename to pkgs/unit/li/libmediainfo/pkg-fun.nix diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/pkgs/unit/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch similarity index 100% rename from pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch rename to pkgs/unit/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/pkgs/unit/li/libmemcached/musl-fixes.patch similarity index 100% rename from pkgs/development/libraries/libmemcached/musl-fixes.patch rename to pkgs/unit/li/libmemcached/musl-fixes.patch diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/unit/li/libmemcached/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmemcached/default.nix rename to pkgs/unit/li/libmemcached/pkg-fun.nix diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/unit/li/libmesode/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmesode/default.nix rename to pkgs/unit/li/libmesode/pkg-fun.nix diff --git a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/pkgs/unit/li/libmhash/autotools-define-conflict-debian-fix.patch similarity index 100% rename from pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch rename to pkgs/unit/li/libmhash/autotools-define-conflict-debian-fix.patch diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/unit/li/libmhash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmhash/default.nix rename to pkgs/unit/li/libmhash/pkg-fun.nix diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/unit/li/libmicrodns/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmicrodns/default.nix rename to pkgs/unit/li/libmicrodns/pkg-fun.nix diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/unit/li/libmilter/darwin.patch similarity index 100% rename from pkgs/development/libraries/libmilter/darwin.patch rename to pkgs/unit/li/libmilter/darwin.patch diff --git a/pkgs/development/libraries/libmilter/install.patch b/pkgs/unit/li/libmilter/install.patch similarity index 100% rename from pkgs/development/libraries/libmilter/install.patch rename to pkgs/unit/li/libmilter/install.patch diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/unit/li/libmilter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmilter/default.nix rename to pkgs/unit/li/libmilter/pkg-fun.nix diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/unit/li/libmilter/sharedlib.patch similarity index 100% rename from pkgs/development/libraries/libmilter/sharedlib.patch rename to pkgs/unit/li/libmilter/sharedlib.patch diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/unit/li/libminc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libminc/default.nix rename to pkgs/unit/li/libminc/pkg-fun.nix diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/unit/li/libmkv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmkv/default.nix rename to pkgs/unit/li/libmkv/pkg-fun.nix diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/unit/li/libmms/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmms/default.nix rename to pkgs/unit/li/libmms/pkg-fun.nix diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/unit/li/libmng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmng/default.nix rename to pkgs/unit/li/libmng/pkg-fun.nix diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/unit/li/libmnl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmnl/default.nix rename to pkgs/unit/li/libmnl/pkg-fun.nix diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/unit/li/libmodbus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmodbus/default.nix rename to pkgs/unit/li/libmodbus/pkg-fun.nix diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/unit/li/libmodplug/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmodplug/default.nix rename to pkgs/unit/li/libmodplug/pkg-fun.nix diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/unit/li/libmodule/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmodule/default.nix rename to pkgs/unit/li/libmodule/pkg-fun.nix diff --git a/pkgs/development/libraries/libmodulemd/glib-devdoc.patch b/pkgs/unit/li/libmodulemd/glib-devdoc.patch similarity index 100% rename from pkgs/development/libraries/libmodulemd/glib-devdoc.patch rename to pkgs/unit/li/libmodulemd/glib-devdoc.patch diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/unit/li/libmodulemd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmodulemd/default.nix rename to pkgs/unit/li/libmodulemd/pkg-fun.nix diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/unit/li/libmongo-client/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmongo-client/default.nix rename to pkgs/unit/li/libmongo-client/pkg-fun.nix diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/unit/li/libmowgli/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmowgli/default.nix rename to pkgs/unit/li/libmowgli/pkg-fun.nix diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/unit/li/libmp3splt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmp3splt/default.nix rename to pkgs/unit/li/libmp3splt/pkg-fun.nix diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/unit/li/libmpack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmpack/default.nix rename to pkgs/unit/li/libmpack/pkg-fun.nix diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/unit/li/libmpc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmpc/default.nix rename to pkgs/unit/li/libmpc/pkg-fun.nix diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/unit/li/libmpcdec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmpcdec/default.nix rename to pkgs/unit/li/libmpcdec/pkg-fun.nix diff --git a/pkgs/servers/mpd/libmpdclient.nix b/pkgs/unit/li/libmpdclient/pkg-fun.nix similarity index 100% rename from pkgs/servers/mpd/libmpdclient.nix rename to pkgs/unit/li/libmpdclient/pkg-fun.nix diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/unit/li/libmpeg2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmpeg2/default.nix rename to pkgs/unit/li/libmpeg2/pkg-fun.nix diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/unit/li/libmrss/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmrss/default.nix rename to pkgs/unit/li/libmrss/pkg-fun.nix diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/unit/li/libmspack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmspack/default.nix rename to pkgs/unit/li/libmspack/pkg-fun.nix diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/unit/li/libmsym/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/libmsym/default.nix rename to pkgs/unit/li/libmsym/pkg-fun.nix diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/unit/li/libmt32emu/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/munt/libmt32emu.nix rename to pkgs/unit/li/libmt32emu/pkg-fun.nix diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/unit/li/libmtp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmtp/default.nix rename to pkgs/unit/li/libmtp/pkg-fun.nix diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/unit/li/libmusicbrainz3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmusicbrainz/default.nix rename to pkgs/unit/li/libmusicbrainz3/pkg-fun.nix diff --git a/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch b/pkgs/unit/li/libmusicbrainz3/v3-darwin.patch similarity index 100% rename from pkgs/development/libraries/libmusicbrainz/v3-darwin.patch rename to pkgs/unit/li/libmusicbrainz3/v3-darwin.patch diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/unit/li/libmusicbrainz5/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmusicbrainz/5.x.nix rename to pkgs/unit/li/libmusicbrainz5/pkg-fun.nix diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/unit/li/libmwaw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmwaw/default.nix rename to pkgs/unit/li/libmwaw/pkg-fun.nix diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/unit/li/libmx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmx/default.nix rename to pkgs/unit/li/libmx/pkg-fun.nix diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/unit/li/libmypaint/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmypaint/default.nix rename to pkgs/unit/li/libmypaint/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/unit/li/libmysofa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libmysofa/default.nix rename to pkgs/unit/li/libmysofa/pkg-fun.nix diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/unit/li/libmysqlconnectorcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libmysqlconnectorcpp/default.nix rename to pkgs/unit/li/libmysqlconnectorcpp/pkg-fun.nix diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/unit/li/libnabo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnabo/default.nix rename to pkgs/unit/li/libnabo/pkg-fun.nix diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/unit/li/libnatpmp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnatpmp/default.nix rename to pkgs/unit/li/libnatpmp/pkg-fun.nix diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/unit/li/libnats-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnats-c/default.nix rename to pkgs/unit/li/libnats-c/pkg-fun.nix diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/unit/li/libnatspec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnatspec/default.nix rename to pkgs/unit/li/libnatspec/pkg-fun.nix diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/unit/li/libnbd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnbd/default.nix rename to pkgs/unit/li/libnbd/pkg-fun.nix diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/unit/li/libndctl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libndctl/default.nix rename to pkgs/unit/li/libndctl/pkg-fun.nix diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/unit/li/libndp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libndp/default.nix rename to pkgs/unit/li/libndp/pkg-fun.nix diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/unit/li/libndtypes/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libndtypes/default.nix rename to pkgs/unit/li/libndtypes/pkg-fun.nix diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/unit/li/libnet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnet/default.nix rename to pkgs/unit/li/libnet/pkg-fun.nix diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/unit/li/libnetfilter_acct/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_acct/default.nix rename to pkgs/unit/li/libnetfilter_acct/pkg-fun.nix diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/unit/li/libnetfilter_conntrack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_conntrack/default.nix rename to pkgs/unit/li/libnetfilter_conntrack/pkg-fun.nix diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/unit/li/libnetfilter_cthelper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_cthelper/default.nix rename to pkgs/unit/li/libnetfilter_cthelper/pkg-fun.nix diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/unit/li/libnetfilter_cttimeout/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_cttimeout/default.nix rename to pkgs/unit/li/libnetfilter_cttimeout/pkg-fun.nix diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/unit/li/libnetfilter_log/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_log/default.nix rename to pkgs/unit/li/libnetfilter_log/pkg-fun.nix diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/unit/li/libnetfilter_queue/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnetfilter_queue/default.nix rename to pkgs/unit/li/libnetfilter_queue/pkg-fun.nix diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/unit/li/libnfc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnfc/default.nix rename to pkgs/unit/li/libnfc/pkg-fun.nix diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/unit/li/libnfnetlink/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnfnetlink/default.nix rename to pkgs/unit/li/libnfnetlink/pkg-fun.nix diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/unit/li/libnfs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnfs/default.nix rename to pkgs/unit/li/libnfs/pkg-fun.nix diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/unit/li/libnftnl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnftnl/default.nix rename to pkgs/unit/li/libnftnl/pkg-fun.nix diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/unit/li/libngspice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libngspice/default.nix rename to pkgs/unit/li/libngspice/pkg-fun.nix diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/unit/li/libnice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnice/default.nix rename to pkgs/unit/li/libnice/pkg-fun.nix diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/unit/li/libnids/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/libnids/default.nix rename to pkgs/unit/li/libnids/pkg-fun.nix diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/unit/li/libnixxml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnixxml/default.nix rename to pkgs/unit/li/libnixxml/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/unit/li/libnl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libnl/default.nix rename to pkgs/unit/li/libnl/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/pkgs/unit/li/libnma/hardcode-gsettings.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch rename to pkgs/unit/li/libnma/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/unit/li/libnma/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/default.nix rename to pkgs/unit/li/libnma/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch b/pkgs/unit/li/libnma/remove-path-from-eap.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch rename to pkgs/unit/li/libnma/remove-path-from-eap.patch diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/unit/li/libnotify/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnotify/default.nix rename to pkgs/unit/li/libnotify/pkg-fun.nix diff --git a/pkgs/development/libraries/science/astronomy/libnova/default.nix b/pkgs/unit/li/libnova/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/libnova/default.nix rename to pkgs/unit/li/libnova/pkg-fun.nix diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/unit/li/libnsl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnsl/default.nix rename to pkgs/unit/li/libnsl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libnss-mysql/default.nix b/pkgs/unit/li/libnss-mysql/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libnss-mysql/default.nix rename to pkgs/unit/li/libnss-mysql/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/unit/li/libnvme/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libnvme/default.nix rename to pkgs/unit/li/libnvme/pkg-fun.nix diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/unit/li/libnxml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libnxml/default.nix rename to pkgs/unit/li/libnxml/pkg-fun.nix diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/unit/li/liboauth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liboauth/default.nix rename to pkgs/unit/li/liboauth/pkg-fun.nix diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/unit/li/libodb-sqlite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libodb-sqlite/default.nix rename to pkgs/unit/li/libodb-sqlite/pkg-fun.nix diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/unit/li/libodb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libodb/default.nix rename to pkgs/unit/li/libodb/pkg-fun.nix diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/unit/li/libodfgen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libodfgen/default.nix rename to pkgs/unit/li/libodfgen/pkg-fun.nix diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/unit/li/libofa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libofa/default.nix rename to pkgs/unit/li/libofa/pkg-fun.nix diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/unit/li/libofx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libofx/default.nix rename to pkgs/unit/li/libofx/pkg-fun.nix diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/unit/li/libogg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libogg/default.nix rename to pkgs/unit/li/libogg/pkg-fun.nix diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/unit/li/liboggz/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liboggz/default.nix rename to pkgs/unit/li/liboggz/pkg-fun.nix diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/unit/li/liboil/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liboil/default.nix rename to pkgs/unit/li/liboil/pkg-fun.nix diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/unit/li/liboil/x86_64-cpuid.patch similarity index 100% rename from pkgs/development/libraries/liboil/x86_64-cpuid.patch rename to pkgs/unit/li/liboil/x86_64-cpuid.patch diff --git a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/pkgs/unit/li/libomxil-bellagio/fedora-fixes.patch similarity index 100% rename from pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch rename to pkgs/unit/li/libomxil-bellagio/fedora-fixes.patch diff --git a/pkgs/development/libraries/libomxil-bellagio/fno-common.patch b/pkgs/unit/li/libomxil-bellagio/fno-common.patch similarity index 100% rename from pkgs/development/libraries/libomxil-bellagio/fno-common.patch rename to pkgs/unit/li/libomxil-bellagio/fno-common.patch diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/unit/li/libomxil-bellagio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libomxil-bellagio/default.nix rename to pkgs/unit/li/libomxil-bellagio/pkg-fun.nix diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/unit/li/liboop/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liboop/default.nix rename to pkgs/unit/li/liboop/pkg-fun.nix diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/unit/li/libopenaptx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libopenaptx/default.nix rename to pkgs/unit/li/libopenaptx/pkg-fun.nix diff --git a/pkgs/development/libraries/libopenglrecorder/default.nix b/pkgs/unit/li/libopenglrecorder/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libopenglrecorder/default.nix rename to pkgs/unit/li/libopenglrecorder/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/unit/li/libopenmpt-modplug/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt-modplug/default.nix rename to pkgs/unit/li/libopenmpt-modplug/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/unit/li/libopenmpt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt/default.nix rename to pkgs/unit/li/libopenmpt/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libopenmpt/update.sh b/pkgs/unit/li/libopenmpt/update.sh similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt/update.sh rename to pkgs/unit/li/libopenmpt/update.sh diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch b/pkgs/unit/li/libopensmtpd/no-chown-while-installing.patch similarity index 100% rename from pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch rename to pkgs/unit/li/libopensmtpd/no-chown-while-installing.patch diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/pkgs/unit/li/libopensmtpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix rename to pkgs/unit/li/libopensmtpd/pkg-fun.nix diff --git a/pkgs/development/libraries/liboping/ncurses-6.3.patch b/pkgs/unit/li/liboping/ncurses-6.3.patch similarity index 100% rename from pkgs/development/libraries/liboping/ncurses-6.3.patch rename to pkgs/unit/li/liboping/ncurses-6.3.patch diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/unit/li/liboping/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liboping/default.nix rename to pkgs/unit/li/liboping/pkg-fun.nix diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/unit/li/libopus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libopus/default.nix rename to pkgs/unit/li/libopus/pkg-fun.nix diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/unit/li/libopusenc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libopusenc/default.nix rename to pkgs/unit/li/libopusenc/pkg-fun.nix diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/unit/li/libosinfo/osinfo-db-data-dir.patch similarity index 100% rename from pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch rename to pkgs/unit/li/libosinfo/osinfo-db-data-dir.patch diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/unit/li/libosinfo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libosinfo/default.nix rename to pkgs/unit/li/libosinfo/pkg-fun.nix diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/unit/li/libosip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/osip/default.nix rename to pkgs/unit/li/libosip/pkg-fun.nix diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/unit/li/libosmium/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libosmium/default.nix rename to pkgs/unit/li/libosmium/pkg-fun.nix diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/unit/li/libosmocore/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/libosmocore/default.nix rename to pkgs/unit/li/libosmocore/pkg-fun.nix diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/unit/li/libossp_uuid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libossp-uuid/default.nix rename to pkgs/unit/li/libossp_uuid/pkg-fun.nix diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/unit/li/libossp_uuid/shtool.patch similarity index 100% rename from pkgs/development/libraries/libossp-uuid/shtool.patch rename to pkgs/unit/li/libossp_uuid/shtool.patch diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/unit/li/libotf/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/m17n-lib/otf.nix rename to pkgs/unit/li/libotf/pkg-fun.nix diff --git a/pkgs/development/libraries/libotr/fix-regtest-client.patch b/pkgs/unit/li/libotr/fix-regtest-client.patch similarity index 100% rename from pkgs/development/libraries/libotr/fix-regtest-client.patch rename to pkgs/unit/li/libotr/fix-regtest-client.patch diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/unit/li/libotr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libotr/default.nix rename to pkgs/unit/li/libotr/pkg-fun.nix diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/unit/li/libow/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libow/default.nix rename to pkgs/unit/li/libow/pkg-fun.nix diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/unit/li/libowfat/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libowfat/default.nix rename to pkgs/unit/li/libowfat/pkg-fun.nix diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/unit/li/libowlevelzs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libowlevelzs/default.nix rename to pkgs/unit/li/libowlevelzs/pkg-fun.nix diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/unit/li/libpam-wrapper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpam-wrapper/default.nix rename to pkgs/unit/li/libpam-wrapper/pkg-fun.nix diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/unit/li/libpanel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpanel/default.nix rename to pkgs/unit/li/libpanel/pkg-fun.nix diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/unit/li/libpaper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpaper/default.nix rename to pkgs/unit/li/libpaper/pkg-fun.nix diff --git a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/pkgs/unit/li/libpar2/libpar2-0.4-external-verification.patch similarity index 100% rename from pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch rename to pkgs/unit/li/libpar2/libpar2-0.4-external-verification.patch diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/unit/li/libpar2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpar2/default.nix rename to pkgs/unit/li/libpar2/pkg-fun.nix diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/unit/li/libpcap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpcap/default.nix rename to pkgs/unit/li/libpcap/pkg-fun.nix diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/unit/li/libpeas/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpeas/default.nix rename to pkgs/unit/li/libpeas/pkg-fun.nix diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/unit/li/libpfm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpfm/default.nix rename to pkgs/unit/li/libpfm/pkg-fun.nix diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/unit/li/libpg_query/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpg_query/default.nix rename to pkgs/unit/li/libpg_query/pkg-fun.nix diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/unit/li/libpgf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpgf/default.nix rename to pkgs/unit/li/libpgf/pkg-fun.nix diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/unit/li/libpinyin/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpinyin/default.nix rename to pkgs/unit/li/libpinyin/pkg-fun.nix diff --git a/pkgs/development/libraries/libpipeline/fix-on-osx.patch b/pkgs/unit/li/libpipeline/fix-on-osx.patch similarity index 100% rename from pkgs/development/libraries/libpipeline/fix-on-osx.patch rename to pkgs/unit/li/libpipeline/fix-on-osx.patch diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/unit/li/libpipeline/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpipeline/default.nix rename to pkgs/unit/li/libpipeline/pkg-fun.nix diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/unit/li/libplacebo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libplacebo/default.nix rename to pkgs/unit/li/libplacebo/pkg-fun.nix diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/unit/li/libplctag/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libplctag/default.nix rename to pkgs/unit/li/libplctag/pkg-fun.nix diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/unit/li/libplist/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libplist/default.nix rename to pkgs/unit/li/libplist/pkg-fun.nix diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/unit/li/libpng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpng/default.nix rename to pkgs/unit/li/libpng/pkg-fun.nix diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/unit/li/libpng12/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpng/12.nix rename to pkgs/unit/li/libpng12/pkg-fun.nix diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/unit/li/libpointmatcher/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpointmatcher/default.nix rename to pkgs/unit/li/libpointmatcher/pkg-fun.nix diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/unit/li/libpoly/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/poly/default.nix rename to pkgs/unit/li/libpoly/pkg-fun.nix diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/unit/li/libportal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libportal/default.nix rename to pkgs/unit/li/libportal/pkg-fun.nix diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/unit/li/libpostal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpostal/default.nix rename to pkgs/unit/li/libpostal/pkg-fun.nix diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/unit/li/libpqxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpqxx/default.nix rename to pkgs/unit/li/libpqxx/pkg-fun.nix diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/unit/li/libpqxx_6/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpqxx/6.nix rename to pkgs/unit/li/libpqxx_6/pkg-fun.nix diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/unit/li/libpressureaudio/pkg-fun.nix similarity index 100% rename from pkgs/misc/apulse/pressureaudio.nix rename to pkgs/unit/li/libpressureaudio/pkg-fun.nix diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/unit/li/libpseudo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpseudo/default.nix rename to pkgs/unit/li/libpseudo/pkg-fun.nix diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/unit/li/libpsl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpsl/default.nix rename to pkgs/unit/li/libpsl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/unit/li/libpsm2/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libpsm2/default.nix rename to pkgs/unit/li/libpsm2/pkg-fun.nix diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/unit/li/libpst/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpst/default.nix rename to pkgs/unit/li/libpst/pkg-fun.nix diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/unit/li/libptytty/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libptytty/default.nix rename to pkgs/unit/li/libptytty/pkg-fun.nix diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/unit/li/libpulsar/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libpulsar/default.nix rename to pkgs/unit/li/libpulsar/pkg-fun.nix diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/unit/li/libqalculate/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libqalculate/default.nix rename to pkgs/unit/li/libqalculate/pkg-fun.nix diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/unit/li/libqb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libqb/default.nix rename to pkgs/unit/li/libqb/pkg-fun.nix diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/unit/li/libqmi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libqmi/default.nix rename to pkgs/unit/li/libqmi/pkg-fun.nix diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/unit/li/libqrtr-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libqrtr-glib/default.nix rename to pkgs/unit/li/libqrtr-glib/pkg-fun.nix diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/unit/li/libquvi/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/quvi/library.nix rename to pkgs/unit/li/libquvi/pkg-fun.nix diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/unit/li/libr3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libr3/default.nix rename to pkgs/unit/li/libr3/pkg-fun.nix diff --git a/pkgs/development/tools/librarian-puppet-go/deps.nix b/pkgs/unit/li/librarian-puppet-go/deps.nix similarity index 100% rename from pkgs/development/tools/librarian-puppet-go/deps.nix rename to pkgs/unit/li/librarian-puppet-go/deps.nix diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/unit/li/librarian-puppet-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/librarian-puppet-go/default.nix rename to pkgs/unit/li/librarian-puppet-go/pkg-fun.nix diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/unit/li/libraspberrypi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libraspberrypi/default.nix rename to pkgs/unit/li/libraspberrypi/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/unit/li/libratbag/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libratbag/default.nix rename to pkgs/unit/li/libratbag/pkg-fun.nix diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/unit/li/libraw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libraw/default.nix rename to pkgs/unit/li/libraw/pkg-fun.nix diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/unit/li/libraw1394/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libraw1394/default.nix rename to pkgs/unit/li/libraw1394/pkg-fun.nix diff --git a/pkgs/development/libraries/libraw/unstable.nix b/pkgs/unit/li/libraw_unstable/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libraw/unstable.nix rename to pkgs/unit/li/libraw_unstable/pkg-fun.nix diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/unit/li/librdf_raptor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librdf/raptor.nix rename to pkgs/unit/li/librdf_raptor/pkg-fun.nix diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/unit/li/librdf_raptor2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librdf/raptor2.nix rename to pkgs/unit/li/librdf_raptor2/pkg-fun.nix diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/unit/li/librdf_rasqal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librdf/rasqal.nix rename to pkgs/unit/li/librdf_rasqal/pkg-fun.nix diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/unit/li/librdf_redland/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librdf/redland.nix rename to pkgs/unit/li/librdf_redland/pkg-fun.nix diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/unit/li/libre-baskerville/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/libre-baskerville/default.nix rename to pkgs/unit/li/libre-baskerville/pkg-fun.nix diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/unit/li/libre-bodoni/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/libre-bodoni/default.nix rename to pkgs/unit/li/libre-bodoni/pkg-fun.nix diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/unit/li/libre-caslon/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/libre-caslon/default.nix rename to pkgs/unit/li/libre-caslon/pkg-fun.nix diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/unit/li/libre-franklin/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/libre-franklin/default.nix rename to pkgs/unit/li/libre-franklin/pkg-fun.nix diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/unit/li/libre/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libre/default.nix rename to pkgs/unit/li/libre/pkg-fun.nix diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/unit/li/libredirect/libredirect.c similarity index 100% rename from pkgs/build-support/libredirect/libredirect.c rename to pkgs/unit/li/libredirect/libredirect.c diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/unit/li/libredirect/pkg-fun.nix similarity index 100% rename from pkgs/build-support/libredirect/default.nix rename to pkgs/unit/li/libredirect/pkg-fun.nix diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/unit/li/libredirect/test.c similarity index 100% rename from pkgs/build-support/libredirect/test.c rename to pkgs/unit/li/libredirect/test.c diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/unit/li/libredwg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libredwg/default.nix rename to pkgs/unit/li/libredwg/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/unit/li/libreelec-dvb-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix rename to pkgs/unit/li/libreelec-dvb-firmware/pkg-fun.nix diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/unit/li/librelp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librelp/default.nix rename to pkgs/unit/li/librelp/pkg-fun.nix diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/unit/li/librem/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librem/default.nix rename to pkgs/unit/li/librem/pkg-fun.nix diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/unit/li/librep/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librep/default.nix rename to pkgs/unit/li/librep/pkg-fun.nix diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/pkgs/unit/li/librep/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/librep/setup-hook.sh rename to pkgs/unit/li/librep/setup-hook.sh diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/unit/li/libresample/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libresample/default.nix rename to pkgs/unit/li/libresample/pkg-fun.nix diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/unit/li/librespeed-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/librespeed-cli/default.nix rename to pkgs/unit/li/librespeed-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/unit/li/librest/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librest/default.nix rename to pkgs/unit/li/librest/pkg-fun.nix diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/unit/li/librest_1_0/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librest/1.0.nix rename to pkgs/unit/li/librest_1_0/pkg-fun.nix diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/unit/li/libreswan/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/libreswan/default.nix rename to pkgs/unit/li/libreswan/pkg-fun.nix diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/unit/li/libretro-core-info/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/retroarch/libretro-core-info.nix rename to pkgs/unit/li/libretro-core-info/pkg-fun.nix diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/unit/li/librevenge/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librevenge/default.nix rename to pkgs/unit/li/librevenge/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/unit/li/librewolf-unwrapped/librewolf.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/librewolf.nix rename to pkgs/unit/li/librewolf-unwrapped/librewolf.nix diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/unit/li/librewolf-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/default.nix rename to pkgs/unit/li/librewolf-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/unit/li/librewolf-unwrapped/src.json similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/src.json rename to pkgs/unit/li/librewolf-unwrapped/src.json diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/unit/li/librewolf-unwrapped/src.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/src.nix rename to pkgs/unit/li/librewolf-unwrapped/src.nix diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/unit/li/librewolf-unwrapped/update.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/update.nix rename to pkgs/unit/li/librewolf-unwrapped/update.nix diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/unit/li/librist/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librist/default.nix rename to pkgs/unit/li/librist/pkg-fun.nix diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/unit/li/libroxml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libroxml/default.nix rename to pkgs/unit/li/libroxml/pkg-fun.nix diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/unit/li/librseq/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librseq/default.nix rename to pkgs/unit/li/librseq/pkg-fun.nix diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/unit/li/librsync/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librsync/default.nix rename to pkgs/unit/li/librsync/pkg-fun.nix diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/unit/li/librtlsdr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librtlsdr/default.nix rename to pkgs/unit/li/librtlsdr/pkg-fun.nix diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/unit/li/librtprocess/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librtprocess/default.nix rename to pkgs/unit/li/librtprocess/pkg-fun.nix diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/unit/li/librttopo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/librttopo/default.nix rename to pkgs/unit/li/librttopo/pkg-fun.nix diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/unit/li/libs3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libs3/default.nix rename to pkgs/unit/li/libs3/pkg-fun.nix diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/unit/li/libsass/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsass/default.nix rename to pkgs/unit/li/libsass/pkg-fun.nix diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/unit/li/libschrift/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libschrift/default.nix rename to pkgs/unit/li/libschrift/pkg-fun.nix diff --git a/pkgs/development/libraries/libsciter/default.nix b/pkgs/unit/li/libsciter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsciter/default.nix rename to pkgs/unit/li/libsciter/pkg-fun.nix diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/unit/li/libscrypt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libscrypt/default.nix rename to pkgs/unit/li/libscrypt/pkg-fun.nix diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/unit/li/libsearpc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsearpc/default.nix rename to pkgs/unit/li/libsearpc/pkg-fun.nix diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/unit/li/libseccomp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libseccomp/default.nix rename to pkgs/unit/li/libseccomp/pkg-fun.nix diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/unit/li/libsecret/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsecret/default.nix rename to pkgs/unit/li/libsecret/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/unit/li/libselinux/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libselinux/default.nix rename to pkgs/unit/li/libselinux/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/unit/li/libsepol/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libsepol/default.nix rename to pkgs/unit/li/libsepol/pkg-fun.nix diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/unit/li/libserdes/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libserdes/default.nix rename to pkgs/unit/li/libserdes/pkg-fun.nix diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/unit/li/libserialport/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libserialport/default.nix rename to pkgs/unit/li/libserialport/pkg-fun.nix diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/unit/li/libshout/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libshout/default.nix rename to pkgs/unit/li/libshout/pkg-fun.nix diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/unit/li/libshumate/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libshumate/default.nix rename to pkgs/unit/li/libshumate/pkg-fun.nix diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/unit/li/libsidplayfp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsidplayfp/default.nix rename to pkgs/unit/li/libsidplayfp/pkg-fun.nix diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/unit/li/libsieve/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsieve/default.nix rename to pkgs/unit/li/libsieve/pkg-fun.nix diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/unit/li/libsigcxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsigcxx/default.nix rename to pkgs/unit/li/libsigcxx/pkg-fun.nix diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/unit/li/libsigcxx12/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsigcxx/1.2.nix rename to pkgs/unit/li/libsigcxx12/pkg-fun.nix diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/unit/li/libsigcxx30/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsigcxx/3.0.nix rename to pkgs/unit/li/libsigcxx30/pkg-fun.nix diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/unit/li/libsignal-protocol-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsignal-protocol-c/default.nix rename to pkgs/unit/li/libsignal-protocol-c/pkg-fun.nix diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/unit/li/libsignon-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsignon-glib/default.nix rename to pkgs/unit/li/libsignon-glib/pkg-fun.nix diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/unit/li/libsigrokdecode/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/libsigrokdecode/default.nix rename to pkgs/unit/li/libsigrokdecode/pkg-fun.nix diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/unit/li/libsigsegv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsigsegv/default.nix rename to pkgs/unit/li/libsigsegv/pkg-fun.nix diff --git a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/pkgs/unit/li/libsigsegv/sigbus_fix.patch similarity index 100% rename from pkgs/development/libraries/libsigsegv/sigbus_fix.patch rename to pkgs/unit/li/libsigsegv/sigbus_fix.patch diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/unit/li/libsixel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsixel/default.nix rename to pkgs/unit/li/libsixel/pkg-fun.nix diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/unit/li/libslirp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libslirp/default.nix rename to pkgs/unit/li/libslirp/pkg-fun.nix diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/unit/li/libsmartcols/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsmartcols/default.nix rename to pkgs/unit/li/libsmartcols/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/unit/li/libsmbios/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libsmbios/default.nix rename to pkgs/unit/li/libsmbios/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/unit/li/libsmf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libsmf/default.nix rename to pkgs/unit/li/libsmf/pkg-fun.nix diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/unit/li/libsmi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsmi/default.nix rename to pkgs/unit/li/libsmi/pkg-fun.nix diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/unit/li/libsnark/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsnark/default.nix rename to pkgs/unit/li/libsnark/pkg-fun.nix diff --git a/pkgs/development/libraries/libsodium/mingw-no-fortify.patch b/pkgs/unit/li/libsodium/mingw-no-fortify.patch similarity index 100% rename from pkgs/development/libraries/libsodium/mingw-no-fortify.patch rename to pkgs/unit/li/libsodium/mingw-no-fortify.patch diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/unit/li/libsodium/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsodium/default.nix rename to pkgs/unit/li/libsodium/pkg-fun.nix diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/unit/li/libsolv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsolv/default.nix rename to pkgs/unit/li/libsolv/pkg-fun.nix diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/unit/li/libsoup/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsoup/default.nix rename to pkgs/unit/li/libsoup/pkg-fun.nix diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/unit/li/libsoup_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsoup/3.x.nix rename to pkgs/unit/li/libsoup_3/pkg-fun.nix diff --git a/pkgs/development/libraries/libspatialaudio/default.nix b/pkgs/unit/li/libspatialaudio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspatialaudio/default.nix rename to pkgs/unit/li/libspatialaudio/pkg-fun.nix diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/unit/li/libspatialindex/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspatialindex/default.nix rename to pkgs/unit/li/libspatialindex/pkg-fun.nix diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/unit/li/libspatialite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspatialite/default.nix rename to pkgs/unit/li/libspatialite/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/libspecbleach/default.nix b/pkgs/unit/li/libspecbleach/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/libspecbleach/default.nix rename to pkgs/unit/li/libspecbleach/pkg-fun.nix diff --git a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch b/pkgs/unit/li/libspectre/libspectre-0.2.7-gs918.patch similarity index 100% rename from pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch rename to pkgs/unit/li/libspectre/libspectre-0.2.7-gs918.patch diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/unit/li/libspectre/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspectre/default.nix rename to pkgs/unit/li/libspectre/pkg-fun.nix diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/unit/li/libspectrum/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspectrum/default.nix rename to pkgs/unit/li/libspectrum/pkg-fun.nix diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/unit/li/libspf2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspf2/default.nix rename to pkgs/unit/li/libspf2/pkg-fun.nix diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/unit/li/libspiro/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspiro/default.nix rename to pkgs/unit/li/libspiro/pkg-fun.nix diff --git a/pkgs/development/libraries/libspnav/configure-socket-path.patch b/pkgs/unit/li/libspnav/configure-socket-path.patch similarity index 100% rename from pkgs/development/libraries/libspnav/configure-socket-path.patch rename to pkgs/unit/li/libspnav/configure-socket-path.patch diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/unit/li/libspnav/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspnav/default.nix rename to pkgs/unit/li/libspnav/pkg-fun.nix diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/unit/li/libspng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libspng/default.nix rename to pkgs/unit/li/libspng/pkg-fun.nix diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/unit/li/libsrs2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsrs2/default.nix rename to pkgs/unit/li/libsrs2/pkg-fun.nix diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/unit/li/libssh/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libssh/default.nix rename to pkgs/unit/li/libssh/pkg-fun.nix diff --git a/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch b/pkgs/unit/li/libssh2/openssl_add_support_for_libressl_3_5.patch similarity index 100% rename from pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch rename to pkgs/unit/li/libssh2/openssl_add_support_for_libressl_3_5.patch diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/unit/li/libssh2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libssh2/default.nix rename to pkgs/unit/li/libssh2/pkg-fun.nix diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/unit/li/libstartup_notification/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/startup-notification/default.nix rename to pkgs/unit/li/libstartup_notification/pkg-fun.nix diff --git a/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch b/pkgs/unit/li/libstdcxx5/no-sys-dirs.patch similarity index 100% rename from pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch rename to pkgs/unit/li/libstdcxx5/no-sys-dirs.patch diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/unit/li/libstdcxx5/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/gcc/libstdc++/5.nix rename to pkgs/unit/li/libstdcxx5/pkg-fun.nix diff --git a/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch b/pkgs/unit/li/libstdcxx5/struct-ucontext.patch similarity index 100% rename from pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch rename to pkgs/unit/li/libstdcxx5/struct-ucontext.patch diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/unit/li/libstemmer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libstemmer/default.nix rename to pkgs/unit/li/libstemmer/pkg-fun.nix diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/unit/li/libstroke/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libstroke/default.nix rename to pkgs/unit/li/libstroke/pkg-fun.nix diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/unit/li/libstrophe/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libstrophe/default.nix rename to pkgs/unit/li/libstrophe/pkg-fun.nix diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/unit/li/libsurvive/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsurvive/default.nix rename to pkgs/unit/li/libsurvive/pkg-fun.nix diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/unit/li/libsvm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsvm/default.nix rename to pkgs/unit/li/libsvm/pkg-fun.nix diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/unit/li/libsysprof-capture/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/profiling/sysprof/capture.nix rename to pkgs/unit/li/libsysprof-capture/pkg-fun.nix diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/unit/li/libsystemtap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libsystemtap/default.nix rename to pkgs/unit/li/libsystemtap/pkg-fun.nix diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/unit/li/libtap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtap/default.nix rename to pkgs/unit/li/libtap/pkg-fun.nix diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/unit/li/libtar/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtar/default.nix rename to pkgs/unit/li/libtar/pkg-fun.nix diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/unit/li/libtasn1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtasn1/default.nix rename to pkgs/unit/li/libtasn1/pkg-fun.nix diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/unit/li/libtcod/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtcod/default.nix rename to pkgs/unit/li/libtcod/pkg-fun.nix diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/unit/li/libtelnet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtelnet/default.nix rename to pkgs/unit/li/libtelnet/pkg-fun.nix diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/unit/li/libtermkey/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtermkey/default.nix rename to pkgs/unit/li/libtermkey/pkg-fun.nix diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/unit/li/libthai/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libthai/default.nix rename to pkgs/unit/li/libthai/pkg-fun.nix diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/unit/li/libtheora/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtheora/default.nix rename to pkgs/unit/li/libtheora/pkg-fun.nix diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/unit/li/libthreadar/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libthreadar/default.nix rename to pkgs/unit/li/libthreadar/pkg-fun.nix diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/unit/li/libticables2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libticables2/default.nix rename to pkgs/unit/li/libticables2/pkg-fun.nix diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/unit/li/libticonv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libticonv/default.nix rename to pkgs/unit/li/libticonv/pkg-fun.nix diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/unit/li/libtiff/headers.patch similarity index 100% rename from pkgs/development/libraries/libtiff/headers.patch rename to pkgs/unit/li/libtiff/headers.patch diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/unit/li/libtiff/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtiff/default.nix rename to pkgs/unit/li/libtiff/pkg-fun.nix diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/unit/li/libtiff/rename-version.patch similarity index 100% rename from pkgs/development/libraries/libtiff/rename-version.patch rename to pkgs/unit/li/libtiff/rename-version.patch diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/unit/li/libtifiles2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtifiles2/default.nix rename to pkgs/unit/li/libtifiles2/pkg-fun.nix diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/unit/li/libtiger/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtiger/default.nix rename to pkgs/unit/li/libtiger/pkg-fun.nix diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/unit/li/libtins/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtins/default.nix rename to pkgs/unit/li/libtins/pkg-fun.nix diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/unit/li/libtirpc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ti-rpc/default.nix rename to pkgs/unit/li/libtirpc/pkg-fun.nix diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/unit/li/libtomcrypt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtomcrypt/default.nix rename to pkgs/unit/li/libtomcrypt/pkg-fun.nix diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/unit/li/libtommath/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtommath/default.nix rename to pkgs/unit/li/libtommath/pkg-fun.nix diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/unit/li/libtool_1_5/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/libtool/default.nix rename to pkgs/unit/li/libtool_1_5/pkg-fun.nix diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/unit/li/libtool_2/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/libtool/libtool2.nix rename to pkgs/unit/li/libtool_2/pkg-fun.nix diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/unit/li/libtoxcore/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtoxcore/default.nix rename to pkgs/unit/li/libtoxcore/pkg-fun.nix diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/unit/li/libtpms/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/libtpms/default.nix rename to pkgs/unit/li/libtpms/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/unit/li/libtraceevent/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libtraceevent/default.nix rename to pkgs/unit/li/libtraceevent/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/unit/li/libtracefs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libtracefs/default.nix rename to pkgs/unit/li/libtracefs/pkg-fun.nix diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/unit/li/libtree/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/libtree/default.nix rename to pkgs/unit/li/libtree/pkg-fun.nix diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/unit/li/libtsm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libtsm/default.nix rename to pkgs/unit/li/libtsm/pkg-fun.nix diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/unit/li/libu2f-host/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libu2f-host/default.nix rename to pkgs/unit/li/libu2f-host/pkg-fun.nix diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/unit/li/libu2f-server/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libu2f-server/default.nix rename to pkgs/unit/li/libu2f-server/pkg-fun.nix diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/unit/li/libubox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libubox/default.nix rename to pkgs/unit/li/libubox/pkg-fun.nix diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/unit/li/libuchardet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libuchardet/default.nix rename to pkgs/unit/li/libuchardet/pkg-fun.nix diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/unit/li/libucl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libucl/default.nix rename to pkgs/unit/li/libucl/pkg-fun.nix diff --git a/pkgs/development/libraries/libucontext/default.nix b/pkgs/unit/li/libucontext/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libucontext/default.nix rename to pkgs/unit/li/libucontext/pkg-fun.nix diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/unit/li/libudev-zero/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libudev-zero/default.nix rename to pkgs/unit/li/libudev-zero/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/unit/li/libudev0-shim/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libudev0-shim/default.nix rename to pkgs/unit/li/libudev0-shim/pkg-fun.nix diff --git a/pkgs/development/libraries/libudfread/default.nix b/pkgs/unit/li/libudfread/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libudfread/default.nix rename to pkgs/unit/li/libudfread/pkg-fun.nix diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/unit/li/libuecc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libuecc/default.nix rename to pkgs/unit/li/libuecc/pkg-fun.nix diff --git a/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/unit/li/libuinputplus/0001-Add-cmake-install-directives.patch similarity index 100% rename from pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch rename to pkgs/unit/li/libuinputplus/0001-Add-cmake-install-directives.patch diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/unit/li/libuinputplus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libuinputplus/default.nix rename to pkgs/unit/li/libuinputplus/pkg-fun.nix diff --git a/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/pkgs/unit/li/libuldaq/0001-uldaq.patch similarity index 100% rename from pkgs/development/libraries/libuldaq/0001-uldaq.patch rename to pkgs/unit/li/libuldaq/0001-uldaq.patch diff --git a/pkgs/development/libraries/libuldaq/default.nix b/pkgs/unit/li/libuldaq/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libuldaq/default.nix rename to pkgs/unit/li/libuldaq/pkg-fun.nix diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/unit/li/libunarr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libunarr/default.nix rename to pkgs/unit/li/libunarr/pkg-fun.nix diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/unit/li/libunibreak/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libunibreak/default.nix rename to pkgs/unit/li/libunibreak/pkg-fun.nix diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/unit/li/libuninameslist/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libuninameslist/default.nix rename to pkgs/unit/li/libuninameslist/pkg-fun.nix diff --git a/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch b/pkgs/unit/li/libunique/1.1.6-G_CONST_RETURN.patch similarity index 100% rename from pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch rename to pkgs/unit/li/libunique/1.1.6-G_CONST_RETURN.patch diff --git a/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch b/pkgs/unit/li/libunique/1.1.6-compiler-warnings.patch similarity index 100% rename from pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch rename to pkgs/unit/li/libunique/1.1.6-compiler-warnings.patch diff --git a/pkgs/development/libraries/libunique/1.1.6-fix-test.patch b/pkgs/unit/li/libunique/1.1.6-fix-test.patch similarity index 100% rename from pkgs/development/libraries/libunique/1.1.6-fix-test.patch rename to pkgs/unit/li/libunique/1.1.6-fix-test.patch diff --git a/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch b/pkgs/unit/li/libunique/1.1.6-include-terminator.patch similarity index 100% rename from pkgs/development/libraries/libunique/1.1.6-include-terminator.patch rename to pkgs/unit/li/libunique/1.1.6-include-terminator.patch diff --git a/pkgs/development/libraries/libunique/gcc7-bug.patch b/pkgs/unit/li/libunique/gcc7-bug.patch similarity index 100% rename from pkgs/development/libraries/libunique/gcc7-bug.patch rename to pkgs/unit/li/libunique/gcc7-bug.patch diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/unit/li/libunique/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libunique/default.nix rename to pkgs/unit/li/libunique/pkg-fun.nix diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/unit/li/libunique3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libunique/3.x.nix rename to pkgs/unit/li/libunique3/pkg-fun.nix diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/unit/li/libunistring/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libunistring/default.nix rename to pkgs/unit/li/libunistring/pkg-fun.nix diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/unit/li/libunity/fix-vala.patch similarity index 100% rename from pkgs/development/libraries/libunity/fix-vala.patch rename to pkgs/unit/li/libunity/fix-vala.patch diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/unit/li/libunity/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libunity/default.nix rename to pkgs/unit/li/libunity/pkg-fun.nix diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/unit/li/libupnp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pupnp/default.nix rename to pkgs/unit/li/libupnp/pkg-fun.nix diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/unit/li/liburcu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liburcu/default.nix rename to pkgs/unit/li/liburcu/pkg-fun.nix diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/unit/li/liburing/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liburing/default.nix rename to pkgs/unit/li/liburing/pkg-fun.nix diff --git a/pkgs/development/libraries/libusb-compat/fix-headers.patch b/pkgs/unit/li/libusb-compat-0_1/fix-headers.patch similarity index 100% rename from pkgs/development/libraries/libusb-compat/fix-headers.patch rename to pkgs/unit/li/libusb-compat-0_1/fix-headers.patch diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/unit/li/libusb-compat-0_1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libusb-compat/0.1.nix rename to pkgs/unit/li/libusb-compat-0_1/pkg-fun.nix diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/unit/li/libusbgx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libusbgx/default.nix rename to pkgs/unit/li/libusbgx/pkg-fun.nix diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/unit/li/libusbmuxd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libusbmuxd/default.nix rename to pkgs/unit/li/libusbmuxd/pkg-fun.nix diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/unit/li/libusbsio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libusbsio/default.nix rename to pkgs/unit/li/libusbsio/pkg-fun.nix diff --git a/pkgs/development/libraries/libutempter/exec_path.patch b/pkgs/unit/li/libutempter/exec_path.patch similarity index 100% rename from pkgs/development/libraries/libutempter/exec_path.patch rename to pkgs/unit/li/libutempter/exec_path.patch diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/unit/li/libutempter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libutempter/default.nix rename to pkgs/unit/li/libutempter/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/libutp/default.nix b/pkgs/unit/li/libutp/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/libutp/default.nix rename to pkgs/unit/li/libutp/pkg-fun.nix diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/unit/li/libuvc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libuvc/default.nix rename to pkgs/unit/li/libuvc/pkg-fun.nix diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/unit/li/libva-utils/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libva/utils.nix rename to pkgs/unit/li/libva-utils/pkg-fun.nix diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/unit/li/libva1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libva/1.nix rename to pkgs/unit/li/libva1/pkg-fun.nix diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/unit/li/libvarlink/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvarlink/default.nix rename to pkgs/unit/li/libvarlink/pkg-fun.nix diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/unit/li/libvdpau-va-gl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvdpau-va-gl/default.nix rename to pkgs/unit/li/libvdpau-va-gl/pkg-fun.nix diff --git a/pkgs/development/libraries/libvdpau/installdir.patch b/pkgs/unit/li/libvdpau/installdir.patch similarity index 100% rename from pkgs/development/libraries/libvdpau/installdir.patch rename to pkgs/unit/li/libvdpau/installdir.patch diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/unit/li/libvdpau/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvdpau/default.nix rename to pkgs/unit/li/libvdpau/pkg-fun.nix diff --git a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/pkgs/unit/li/libvdwxc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/libvdwxc/default.nix rename to pkgs/unit/li/libvdwxc/pkg-fun.nix diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/unit/li/libversion/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libversion/default.nix rename to pkgs/unit/li/libversion/pkg-fun.nix diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/unit/li/libverto/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libverto/default.nix rename to pkgs/unit/li/libverto/pkg-fun.nix diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/unit/li/libviper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libviper/default.nix rename to pkgs/unit/li/libviper/pkg-fun.nix diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/unit/li/libviperfx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libviperfx/default.nix rename to pkgs/unit/li/libviperfx/pkg-fun.nix diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/unit/li/libvirt-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvirt-glib/default.nix rename to pkgs/unit/li/libvirt-glib/pkg-fun.nix diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/unit/li/libvisio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvisio/default.nix rename to pkgs/unit/li/libvisio/pkg-fun.nix diff --git a/pkgs/development/libraries/libvisio2svg/default.nix b/pkgs/unit/li/libvisio2svg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvisio2svg/default.nix rename to pkgs/unit/li/libvisio2svg/pkg-fun.nix diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/unit/li/libvisual/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvisual/default.nix rename to pkgs/unit/li/libvisual/pkg-fun.nix diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/unit/li/libvmaf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvmaf/default.nix rename to pkgs/unit/li/libvmaf/pkg-fun.nix diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/unit/li/libvmi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvmi/default.nix rename to pkgs/unit/li/libvmi/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/unit/li/libvolume_id/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libvolume_id/default.nix rename to pkgs/unit/li/libvolume_id/pkg-fun.nix diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/unit/li/libvorbis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvorbis/default.nix rename to pkgs/unit/li/libvorbis/pkg-fun.nix diff --git a/pkgs/development/libraries/libvori/default.nix b/pkgs/unit/li/libvori/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvori/default.nix rename to pkgs/unit/li/libvori/pkg-fun.nix diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/unit/li/libvpx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvpx/default.nix rename to pkgs/unit/li/libvpx/pkg-fun.nix diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/unit/li/libvpx_1_8/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvpx/1_8.nix rename to pkgs/unit/li/libvpx_1_8/pkg-fun.nix diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/unit/li/libvterm-neovim/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvterm-neovim/default.nix rename to pkgs/unit/li/libvterm-neovim/pkg-fun.nix diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/unit/li/libvterm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libvterm/default.nix rename to pkgs/unit/li/libvterm/pkg-fun.nix diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/unit/li/libwacom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwacom/default.nix rename to pkgs/unit/li/libwacom/pkg-fun.nix diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/unit/li/libwbxml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwbxml/default.nix rename to pkgs/unit/li/libwbxml/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/unit/li/libwebcam/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libwebcam/default.nix rename to pkgs/unit/li/libwebcam/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch b/pkgs/unit/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch similarity index 100% rename from pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch rename to pkgs/unit/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/unit/li/libwebp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwebp/default.nix rename to pkgs/unit/li/libwebp/pkg-fun.nix diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/unit/li/libwebsockets/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwebsockets/default.nix rename to pkgs/unit/li/libwebsockets/pkg-fun.nix diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/unit/li/libwhereami/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwhereami/default.nix rename to pkgs/unit/li/libwhereami/pkg-fun.nix diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/unit/li/libwhich/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/libwhich/default.nix rename to pkgs/unit/li/libwhich/pkg-fun.nix diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/unit/li/libwmf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwmf/default.nix rename to pkgs/unit/li/libwmf/pkg-fun.nix diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/unit/li/libwnck/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwnck/default.nix rename to pkgs/unit/li/libwnck/pkg-fun.nix diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/unit/li/libwnck2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwnck/2.nix rename to pkgs/unit/li/libwnck2/pkg-fun.nix diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/unit/li/libwpd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwpd/default.nix rename to pkgs/unit/li/libwpd/pkg-fun.nix diff --git a/pkgs/development/libraries/libwpd/gcc-0.8.patch b/pkgs/unit/li/libwpd_08/gcc-0.8.patch similarity index 100% rename from pkgs/development/libraries/libwpd/gcc-0.8.patch rename to pkgs/unit/li/libwpd_08/gcc-0.8.patch diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/unit/li/libwpd_08/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwpd/0.8.nix rename to pkgs/unit/li/libwpd_08/pkg-fun.nix diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/unit/li/libwpe-fdo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwpe/fdo.nix rename to pkgs/unit/li/libwpe-fdo/pkg-fun.nix diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/unit/li/libwpe/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwpe/default.nix rename to pkgs/unit/li/libwpe/pkg-fun.nix diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/unit/li/libwpg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwpg/default.nix rename to pkgs/unit/li/libwpg/pkg-fun.nix diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/unit/li/libwps/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libwps/default.nix rename to pkgs/unit/li/libwps/pkg-fun.nix diff --git a/pkgs/development/libraries/libx86/constants.patch b/pkgs/unit/li/libx86/constants.patch similarity index 100% rename from pkgs/development/libraries/libx86/constants.patch rename to pkgs/unit/li/libx86/constants.patch diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/unit/li/libx86/non-x86.patch similarity index 100% rename from pkgs/development/libraries/libx86/non-x86.patch rename to pkgs/unit/li/libx86/non-x86.patch diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/unit/li/libx86/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libx86/default.nix rename to pkgs/unit/li/libx86/pkg-fun.nix diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/unit/li/libx86/src-for-default.nix similarity index 100% rename from pkgs/development/libraries/libx86/src-for-default.nix rename to pkgs/unit/li/libx86/src-for-default.nix diff --git a/pkgs/development/libraries/libx86/src-info-for-default.nix b/pkgs/unit/li/libx86/src-info-for-default.nix similarity index 100% rename from pkgs/development/libraries/libx86/src-info-for-default.nix rename to pkgs/unit/li/libx86/src-info-for-default.nix diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/unit/li/libx86emu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libx86emu/default.nix rename to pkgs/unit/li/libx86emu/pkg-fun.nix diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/unit/li/libxc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxc/default.nix rename to pkgs/unit/li/libxc/pkg-fun.nix diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/unit/li/libxcomp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxcomp/default.nix rename to pkgs/unit/li/libxcomp/pkg-fun.nix diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/unit/li/libxdg_basedir/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxdg-basedir/default.nix rename to pkgs/unit/li/libxdg_basedir/pkg-fun.nix diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/unit/li/libxkbcommon_7/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix rename to pkgs/unit/li/libxkbcommon_7/pkg-fun.nix diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/unit/li/libxkbcommon_8/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxkbcommon/default.nix rename to pkgs/unit/li/libxkbcommon_8/pkg-fun.nix diff --git a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/pkgs/unit/li/libxklavier/honor-XKB_CONFIG_ROOT.patch similarity index 100% rename from pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch rename to pkgs/unit/li/libxklavier/honor-XKB_CONFIG_ROOT.patch diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/unit/li/libxklavier/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxklavier/default.nix rename to pkgs/unit/li/libxklavier/pkg-fun.nix diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/unit/li/libxl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxl/default.nix rename to pkgs/unit/li/libxl/pkg-fun.nix diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/unit/li/libxls/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxls/default.nix rename to pkgs/unit/li/libxls/pkg-fun.nix diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/unit/li/libxlsxwriter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxlsxwriter/default.nix rename to pkgs/unit/li/libxlsxwriter/pkg-fun.nix diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/unit/li/libxmi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxmi/default.nix rename to pkgs/unit/li/libxmi/pkg-fun.nix diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/unit/li/libxmlb/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/libxmlb/installed-tests-path.patch rename to pkgs/unit/li/libxmlb/installed-tests-path.patch diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/unit/li/libxmlb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxmlb/default.nix rename to pkgs/unit/li/libxmlb/pkg-fun.nix diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/unit/li/libxmlxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxmlxx/default.nix rename to pkgs/unit/li/libxmlxx/pkg-fun.nix diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/unit/li/libxmlxx3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxmlxx/v3.nix rename to pkgs/unit/li/libxmlxx3/pkg-fun.nix diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/unit/li/libxmp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxmp/default.nix rename to pkgs/unit/li/libxmp/pkg-fun.nix diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/unit/li/libxnd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxnd/default.nix rename to pkgs/unit/li/libxnd/pkg-fun.nix diff --git a/pkgs/applications/misc/xpdf/libxpdf.patch b/pkgs/unit/li/libxpdf/libxpdf.patch similarity index 100% rename from pkgs/applications/misc/xpdf/libxpdf.patch rename to pkgs/unit/li/libxpdf/libxpdf.patch diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/unit/li/libxpdf/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xpdf/libxpdf.nix rename to pkgs/unit/li/libxpdf/pkg-fun.nix diff --git a/pkgs/applications/misc/xpdf/xpdf-3.02-protection.patch b/pkgs/unit/li/libxpdf/xpdf-3.02-protection.patch similarity index 100% rename from pkgs/applications/misc/xpdf/xpdf-3.02-protection.patch rename to pkgs/unit/li/libxpdf/xpdf-3.02-protection.patch diff --git a/pkgs/applications/video/xplayer/plparser.nix b/pkgs/unit/li/libxplayer-plparser/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/xplayer/plparser.nix rename to pkgs/unit/li/libxplayer-plparser/pkg-fun.nix diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/unit/li/libxsmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libxsmm/default.nix rename to pkgs/unit/li/libxsmm/pkg-fun.nix diff --git a/pkgs/tools/graphics/libyafaray/default.nix b/pkgs/unit/li/libyafaray/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/libyafaray/default.nix rename to pkgs/unit/li/libyafaray/pkg-fun.nix diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/unit/li/libyaml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libyaml/default.nix rename to pkgs/unit/li/libyaml/pkg-fun.nix diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/unit/li/libyamlcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libyaml-cpp/default.nix rename to pkgs/unit/li/libyamlcpp/pkg-fun.nix diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/pkgs/unit/li/libyamlcpp_0_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libyaml-cpp/0.3.0.nix rename to pkgs/unit/li/libyamlcpp_0_3/pkg-fun.nix diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/unit/li/libyang/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libyang/default.nix rename to pkgs/unit/li/libyang/pkg-fun.nix diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/unit/li/libykclient/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libykclient/default.nix rename to pkgs/unit/li/libykclient/pkg-fun.nix diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/unit/li/libykneomgr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libykneomgr/default.nix rename to pkgs/unit/li/libykneomgr/pkg-fun.nix diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/unit/li/libytnef/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libytnef/default.nix rename to pkgs/unit/li/libytnef/pkg-fun.nix diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/unit/li/libyubikey/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libyubikey/default.nix rename to pkgs/unit/li/libyubikey/pkg-fun.nix diff --git a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/pkgs/unit/li/libyuv/link-library-against-libjpeg.patch similarity index 100% rename from pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch rename to pkgs/unit/li/libyuv/link-library-against-libjpeg.patch diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/unit/li/libyuv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libyuv/default.nix rename to pkgs/unit/li/libyuv/pkg-fun.nix diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/unit/li/libzapojit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzapojit/default.nix rename to pkgs/unit/li/libzapojit/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/unit/li/libzbc/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libzbc/default.nix rename to pkgs/unit/li/libzbc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/libzbd/default.nix b/pkgs/unit/li/libzbd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/libzbd/default.nix rename to pkgs/unit/li/libzbd/pkg-fun.nix diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/unit/li/libzdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzdb/default.nix rename to pkgs/unit/li/libzdb/pkg-fun.nix diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/unit/li/libzen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzen/default.nix rename to pkgs/unit/li/libzen/pkg-fun.nix diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/unit/li/libzim/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzim/default.nix rename to pkgs/unit/li/libzim/pkg-fun.nix diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/unit/li/libzip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzip/default.nix rename to pkgs/unit/li/libzip/pkg-fun.nix diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/unit/li/libzmf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzmf/default.nix rename to pkgs/unit/li/libzmf/pkg-fun.nix diff --git a/pkgs/development/libraries/libzra/fix-pkg-config.patch b/pkgs/unit/li/libzra/fix-pkg-config.patch similarity index 100% rename from pkgs/development/libraries/libzra/fix-pkg-config.patch rename to pkgs/unit/li/libzra/fix-pkg-config.patch diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/unit/li/libzra/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/libzra/default.nix rename to pkgs/unit/li/libzra/pkg-fun.nix diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/unit/li/license-generator/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/license-generator/default.nix rename to pkgs/unit/li/license-generator/pkg-fun.nix diff --git a/pkgs/development/tools/license_finder/Gemfile b/pkgs/unit/li/license_finder/Gemfile similarity index 100% rename from pkgs/development/tools/license_finder/Gemfile rename to pkgs/unit/li/license_finder/Gemfile diff --git a/pkgs/development/tools/license_finder/Gemfile.lock b/pkgs/unit/li/license_finder/Gemfile.lock similarity index 100% rename from pkgs/development/tools/license_finder/Gemfile.lock rename to pkgs/unit/li/license_finder/Gemfile.lock diff --git a/pkgs/development/tools/license_finder/gemset.nix b/pkgs/unit/li/license_finder/gemset.nix similarity index 100% rename from pkgs/development/tools/license_finder/gemset.nix rename to pkgs/unit/li/license_finder/gemset.nix diff --git a/pkgs/development/tools/license_finder/default.nix b/pkgs/unit/li/license_finder/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/license_finder/default.nix rename to pkgs/unit/li/license_finder/pkg-fun.nix diff --git a/pkgs/tools/package-management/licensee/Gemfile b/pkgs/unit/li/licensee/Gemfile similarity index 100% rename from pkgs/tools/package-management/licensee/Gemfile rename to pkgs/unit/li/licensee/Gemfile diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/unit/li/licensee/Gemfile.lock similarity index 100% rename from pkgs/tools/package-management/licensee/Gemfile.lock rename to pkgs/unit/li/licensee/Gemfile.lock diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/unit/li/licensee/gemset.nix similarity index 100% rename from pkgs/tools/package-management/licensee/gemset.nix rename to pkgs/unit/li/licensee/gemset.nix diff --git a/pkgs/tools/package-management/licensee/default.nix b/pkgs/unit/li/licensee/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/licensee/default.nix rename to pkgs/unit/li/licensee/pkg-fun.nix diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/unit/li/licensor/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/licensor/default.nix rename to pkgs/unit/li/licensor/pkg-fun.nix diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/unit/li/lidarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/lidarr/default.nix rename to pkgs/unit/li/lidarr/pkg-fun.nix diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/unit/li/lidarr/update.sh similarity index 100% rename from pkgs/servers/lidarr/update.sh rename to pkgs/unit/li/lidarr/update.sh diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/unit/li/lie/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/LiE/default.nix rename to pkgs/unit/li/lie/pkg-fun.nix diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/unit/li/lieer/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/lieer/default.nix rename to pkgs/unit/li/lieer/pkg-fun.nix diff --git a/pkgs/tools/misc/lifecycled/default.nix b/pkgs/unit/li/lifecycled/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lifecycled/default.nix rename to pkgs/unit/li/lifecycled/pkg-fun.nix diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/unit/li/lifelines/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lifelines/default.nix rename to pkgs/unit/li/lifelines/pkg-fun.nix diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/unit/li/lifeograph/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/lifeograph/default.nix rename to pkgs/unit/li/lifeograph/pkg-fun.nix diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/unit/li/liferea/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/newsreaders/liferea/default.nix rename to pkgs/unit/li/liferea/pkg-fun.nix diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/unit/li/light/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/light/default.nix rename to pkgs/unit/li/light/pkg-fun.nix diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/unit/li/lightdm-enso-os-greeter/fix-paths.patch similarity index 100% rename from pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch rename to pkgs/unit/li/lightdm-enso-os-greeter/fix-paths.patch diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/unit/li/lightdm-enso-os-greeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix rename to pkgs/unit/li/lightdm-enso-os-greeter/pkg-fun.nix diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/unit/li/lightdm-mini-greeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-mini-greeter/default.nix rename to pkgs/unit/li/lightdm-mini-greeter/pkg-fun.nix diff --git a/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix b/pkgs/unit/li/lightdm-mobile-greeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix rename to pkgs/unit/li/lightdm-mobile-greeter/pkg-fun.nix diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/unit/li/lightdm-slick-greeter/pkg-fun.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-slick-greeter/default.nix rename to pkgs/unit/li/lightdm-slick-greeter/pkg-fun.nix diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/unit/li/lighthouse-steamvr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lighthouse-steamvr/default.nix rename to pkgs/unit/li/lighthouse-steamvr/pkg-fun.nix diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/unit/li/lightlocker/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/light-locker/default.nix rename to pkgs/unit/li/lightlocker/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/unit/li/lightning-loop/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lightning-loop/default.nix rename to pkgs/unit/li/lightning-loop/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lightning-pool/default.nix b/pkgs/unit/li/lightning-pool/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lightning-pool/default.nix rename to pkgs/unit/li/lightning-pool/pkg-fun.nix diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/unit/li/lightning/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lightning/default.nix rename to pkgs/unit/li/lightning/pkg-fun.nix diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/unit/li/lightningcss/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/lightningcss/default.nix rename to pkgs/unit/li/lightningcss/pkg-fun.nix diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/unit/li/lightspark/pkg-fun.nix similarity index 100% rename from pkgs/misc/lightspark/default.nix rename to pkgs/unit/li/lightspark/pkg-fun.nix diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/unit/li/lightstep-tracer-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lightstep-tracer-cpp/default.nix rename to pkgs/unit/li/lightstep-tracer-cpp/pkg-fun.nix diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/unit/li/lighttpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/lighttpd/default.nix rename to pkgs/unit/li/lighttpd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/unit/li/lightum/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lightum/default.nix rename to pkgs/unit/li/lightum/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/unit/li/lightwalletd/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lightwalletd/default.nix rename to pkgs/unit/li/lightwalletd/pkg-fun.nix diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/unit/li/lightworks/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/lightworks/default.nix rename to pkgs/unit/li/lightworks/pkg-fun.nix diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/unit/li/ligolo-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ligolo-ng/default.nix rename to pkgs/unit/li/ligolo-ng/pkg-fun.nix diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/unit/li/lilo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lilo/default.nix rename to pkgs/unit/li/lilo/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/unit/li/lilv/lilv-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch rename to pkgs/unit/li/lilv/lilv-pkgconfig.patch diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/unit/li/lilv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/lilv/default.nix rename to pkgs/unit/li/lilv/pkg-fun.nix diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/unit/li/lilypond-unstable/pkg-fun.nix similarity index 100% rename from pkgs/misc/lilypond/unstable.nix rename to pkgs/unit/li/lilypond-unstable/pkg-fun.nix diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/unit/li/lime/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lime/default.nix rename to pkgs/unit/li/lime/pkg-fun.nix diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/unit/li/limesctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/limesctl/default.nix rename to pkgs/unit/li/limesctl/pkg-fun.nix diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/unit/li/limesurvey/pkg-fun.nix similarity index 100% rename from pkgs/servers/limesurvey/default.nix rename to pkgs/unit/li/limesurvey/pkg-fun.nix diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/unit/li/limitcpu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/limitcpu/default.nix rename to pkgs/unit/li/limitcpu/pkg-fun.nix diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/unit/li/linbox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/linbox/default.nix rename to pkgs/unit/li/linbox/pkg-fun.nix diff --git a/pkgs/games/lincity/default.nix b/pkgs/unit/li/lincity/pkg-fun.nix similarity index 100% rename from pkgs/games/lincity/default.nix rename to pkgs/unit/li/lincity/pkg-fun.nix diff --git a/pkgs/data/fonts/line-awesome/default.nix b/pkgs/unit/li/line-awesome/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/line-awesome/default.nix rename to pkgs/unit/li/line-awesome/pkg-fun.nix diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/unit/li/linenoise-ng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/linenoise-ng/default.nix rename to pkgs/unit/li/linenoise-ng/pkg-fun.nix diff --git a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh b/pkgs/unit/li/linenoise/create-pkg-config-file.sh similarity index 100% rename from pkgs/development/libraries/linenoise/create-pkg-config-file.sh rename to pkgs/unit/li/linenoise/create-pkg-config-file.sh diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/unit/li/linenoise/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/linenoise/default.nix rename to pkgs/unit/li/linenoise/pkg-fun.nix diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/unit/li/lingeling/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/lingeling/default.nix rename to pkgs/unit/li/lingeling/pkg-fun.nix diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/unit/li/lingot/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lingot/default.nix rename to pkgs/unit/li/lingot/pkg-fun.nix diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/unit/li/lingua-franca/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/lingua-franca/default.nix rename to pkgs/unit/li/lingua-franca/pkg-fun.nix diff --git a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/pkgs/unit/li/linja-pi-pu-lukin/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/linja-pi-pu-lukin/default.nix rename to pkgs/unit/li/linja-pi-pu-lukin/pkg-fun.nix diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/unit/li/link-grammar/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/link-grammar/default.nix rename to pkgs/unit/li/link-grammar/pkg-fun.nix diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/unit/li/linkchecker/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/linkchecker/default.nix rename to pkgs/unit/li/linkchecker/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/unit/li/links2/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/links2/default.nix rename to pkgs/unit/li/links2/pkg-fun.nix diff --git a/pkgs/games/linthesia/default.nix b/pkgs/unit/li/linthesia/pkg-fun.nix similarity index 100% rename from pkgs/games/linthesia/default.nix rename to pkgs/unit/li/linthesia/pkg-fun.nix diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/unit/li/linux-doc/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/kernel/htmldocs.nix rename to pkgs/unit/li/linux-doc/pkg-fun.nix diff --git a/pkgs/tools/security/linux-exploit-suggester/default.nix b/pkgs/unit/li/linux-exploit-suggester/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/linux-exploit-suggester/default.nix rename to pkgs/unit/li/linux-exploit-suggester/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/unit/li/linux-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/default.nix rename to pkgs/unit/li/linux-firmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/unit/li/linux-firmware/source.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/source.nix rename to pkgs/unit/li/linux-firmware/source.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/pkgs/unit/li/linux-firmware/update.sh similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/update.sh rename to pkgs/unit/li/linux-firmware/update.sh diff --git a/pkgs/data/documentation/linux-manual/default.nix b/pkgs/unit/li/linux-manual/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/linux-manual/default.nix rename to pkgs/unit/li/linux-manual/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/unit/li/linux-pam/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam/default.nix rename to pkgs/unit/li/linux-pam/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/unit/li/linux-pam/suid-wrapper-path.patch similarity index 100% rename from pkgs/os-specific/linux/pam/suid-wrapper-path.patch rename to pkgs/unit/li/linux-pam/suid-wrapper-path.patch diff --git a/pkgs/tools/networking/linux-router/default.nix b/pkgs/unit/li/linux-router/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/linux-router/default.nix rename to pkgs/unit/li/linux-router/pkg-fun.nix diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/unit/li/linux-wifi-hotspot/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/linux-wifi-hotspot/default.nix rename to pkgs/unit/li/linux-wifi-hotspot/pkg-fun.nix diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/unit/li/linuxConsoleTools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/consoletools/default.nix rename to pkgs/unit/li/linuxConsoleTools/pkg-fun.nix diff --git a/pkgs/tools/misc/linux-logo/default.nix b/pkgs/unit/li/linux_logo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/linux-logo/default.nix rename to pkgs/unit/li/linux_logo/pkg-fun.nix diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/unit/li/linuxdoc-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sgml/linuxdoc-tools/default.nix rename to pkgs/unit/li/linuxdoc-tools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/unit/li/linuxptp/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/linuxptp/default.nix rename to pkgs/unit/li/linuxptp/pkg-fun.nix diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/unit/li/linuxquota/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/linuxquota/default.nix rename to pkgs/unit/li/linuxquota/pkg-fun.nix diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/unit/li/linuxsampler/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/linuxsampler/default.nix rename to pkgs/unit/li/linuxsampler/pkg-fun.nix diff --git a/pkgs/servers/web-apps/linx-server/default.nix b/pkgs/unit/li/linx-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/linx-server/default.nix rename to pkgs/unit/li/linx-server/pkg-fun.nix diff --git a/pkgs/servers/web-apps/linx-server/test.patch b/pkgs/unit/li/linx-server/test.patch similarity index 100% rename from pkgs/servers/web-apps/linx-server/test.patch rename to pkgs/unit/li/linx-server/test.patch diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/unit/li/liquibase/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/liquibase/default.nix rename to pkgs/unit/li/liquibase/pkg-fun.nix diff --git a/pkgs/development/java-modules/liquibase_redshift_extension/default.nix b/pkgs/unit/li/liquibase_redshift_extension/pkg-fun.nix similarity index 100% rename from pkgs/development/java-modules/liquibase_redshift_extension/default.nix rename to pkgs/unit/li/liquibase_redshift_extension/pkg-fun.nix diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/unit/li/liquidfun/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/liquidfun/default.nix rename to pkgs/unit/li/liquidfun/pkg-fun.nix diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/unit/li/liquidprompt/pkg-fun.nix similarity index 100% rename from pkgs/shells/liquidprompt/default.nix rename to pkgs/unit/li/liquidprompt/pkg-fun.nix diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/unit/li/liquidwar5/pkg-fun.nix similarity index 100% rename from pkgs/games/liquidwar/5.nix rename to pkgs/unit/li/liquidwar5/pkg-fun.nix diff --git a/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/pkgs/unit/li/lirc/linux-headers-5.18.patch similarity index 100% rename from pkgs/development/libraries/lirc/linux-headers-5.18.patch rename to pkgs/unit/li/lirc/linux-headers-5.18.patch diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/unit/li/lirc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lirc/default.nix rename to pkgs/unit/li/lirc/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/unit/li/lisgd/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/lisgd/default.nix rename to pkgs/unit/li/lisgd/pkg-fun.nix diff --git a/pkgs/applications/networking/listadmin/default.nix b/pkgs/unit/li/listadmin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/listadmin/default.nix rename to pkgs/unit/li/listadmin/pkg-fun.nix diff --git a/pkgs/servers/mail/listmonk/frontend.nix b/pkgs/unit/li/listmonk/frontend.nix similarity index 100% rename from pkgs/servers/mail/listmonk/frontend.nix rename to pkgs/unit/li/listmonk/frontend.nix diff --git a/pkgs/servers/mail/listmonk/package.json b/pkgs/unit/li/listmonk/package.json similarity index 100% rename from pkgs/servers/mail/listmonk/package.json rename to pkgs/unit/li/listmonk/package.json diff --git a/pkgs/servers/mail/listmonk/default.nix b/pkgs/unit/li/listmonk/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/listmonk/default.nix rename to pkgs/unit/li/listmonk/pkg-fun.nix diff --git a/pkgs/servers/mail/listmonk/yarn.lock b/pkgs/unit/li/listmonk/yarn.lock similarity index 100% rename from pkgs/servers/mail/listmonk/yarn.lock rename to pkgs/unit/li/listmonk/yarn.lock diff --git a/pkgs/servers/mail/listmonk/yarn.nix b/pkgs/unit/li/listmonk/yarn.nix similarity index 100% rename from pkgs/servers/mail/listmonk/yarn.nix rename to pkgs/unit/li/listmonk/yarn.nix diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/unit/li/lit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/lit/default.nix rename to pkgs/unit/li/lit/pkg-fun.nix diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/unit/li/lite/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/lite/default.nix rename to pkgs/unit/li/lite/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/litebrowser/default.nix b/pkgs/unit/li/litebrowser/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/litebrowser/default.nix rename to pkgs/unit/li/litebrowser/pkg-fun.nix diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/unit/li/litecli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/litecli/default.nix rename to pkgs/unit/li/litecli/pkg-fun.nix diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/unit/li/litefs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/litefs/default.nix rename to pkgs/unit/li/litefs/pkg-fun.nix diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/unit/li/litehtml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/litehtml/default.nix rename to pkgs/unit/li/litehtml/pkg-fun.nix diff --git a/pkgs/applications/graphics/litemdview/default.nix b/pkgs/unit/li/litemdview/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/litemdview/default.nix rename to pkgs/unit/li/litemdview/pkg-fun.nix diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/unit/li/litestream/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/litestream/default.nix rename to pkgs/unit/li/litestream/pkg-fun.nix diff --git a/pkgs/tools/filesystems/littlefs-fuse/default.nix b/pkgs/unit/li/littlefs-fuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/littlefs-fuse/default.nix rename to pkgs/unit/li/littlefs-fuse/pkg-fun.nix diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/unit/li/live555/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/live555/default.nix rename to pkgs/unit/li/live555/pkg-fun.nix diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/unit/li/livedl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/livedl/default.nix rename to pkgs/unit/li/livedl/pkg-fun.nix diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/unit/li/livepeer/pkg-fun.nix similarity index 100% rename from pkgs/servers/livepeer/default.nix rename to pkgs/unit/li/livepeer/pkg-fun.nix diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/unit/li/lizardfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/lizardfs/default.nix rename to pkgs/unit/li/lizardfs/pkg-fun.nix diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/unit/lk/lklug-sinhala/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lklug-sinhala/default.nix rename to pkgs/unit/lk/lklug-sinhala/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/unit/lk/lkproof/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/lkproof/default.nix rename to pkgs/unit/lk/lkproof/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/unit/lk/lksctp-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lksctp-tools/default.nix rename to pkgs/unit/lk/lksctp-tools/pkg-fun.nix diff --git a/pkgs/applications/file-managers/llama/default.nix b/pkgs/unit/ll/llama/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/llama/default.nix rename to pkgs/unit/ll/llama/pkg-fun.nix diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/unit/ll/lldpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/lldpd/default.nix rename to pkgs/unit/ll/lldpd/pkg-fun.nix diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/unit/ll/lls/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/lls/default.nix rename to pkgs/unit/ll/lls/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/unit/lm/lm_sensors/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lm-sensors/default.nix rename to pkgs/unit/lm/lm_sensors/pkg-fun.nix diff --git a/pkgs/development/libraries/lmdb/bin-ext.patch b/pkgs/unit/lm/lmdb/bin-ext.patch similarity index 100% rename from pkgs/development/libraries/lmdb/bin-ext.patch rename to pkgs/unit/lm/lmdb/bin-ext.patch diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/unit/lm/lmdb/hardcoded-compiler.patch similarity index 100% rename from pkgs/development/libraries/lmdb/hardcoded-compiler.patch rename to pkgs/unit/lm/lmdb/hardcoded-compiler.patch diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/unit/lm/lmdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lmdb/default.nix rename to pkgs/unit/lm/lmdb/pkg-fun.nix diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/unit/lm/lmdbxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lmdbxx/default.nix rename to pkgs/unit/lm/lmdbxx/pkg-fun.nix diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/unit/lm/lmmath/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lmmath/default.nix rename to pkgs/unit/lm/lmmath/pkg-fun.nix diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/unit/lm/lmodern/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lmodern/default.nix rename to pkgs/unit/lm/lmodern/pkg-fun.nix diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/unit/lm/lmp/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/lmp/default.nix rename to pkgs/unit/lm/lmp/pkg-fun.nix diff --git a/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch b/pkgs/unit/ln/lnav/0001-Forcefully-disable-docs-build.patch similarity index 100% rename from pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch rename to pkgs/unit/ln/lnav/0001-Forcefully-disable-docs-build.patch diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/unit/ln/lnav/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lnav/default.nix rename to pkgs/unit/ln/lnav/pkg-fun.nix diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/unit/ln/lnch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lnch/default.nix rename to pkgs/unit/ln/lnch/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/unit/ln/lnd/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lnd/default.nix rename to pkgs/unit/ln/lnd/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/unit/ln/lndconnect/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lndconnect/default.nix rename to pkgs/unit/ln/lndconnect/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/unit/ln/lndhub-go/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lndhub-go/default.nix rename to pkgs/unit/ln/lndhub-go/pkg-fun.nix diff --git a/pkgs/applications/blockchains/lndmanage/default.nix b/pkgs/unit/ln/lndmanage/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/lndmanage/default.nix rename to pkgs/unit/ln/lndmanage/pkg-fun.nix diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/unit/lo/loadlibrary/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/loadlibrary/default.nix rename to pkgs/unit/lo/loadlibrary/pkg-fun.nix diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/unit/lo/loadwatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/loadwatch/default.nix rename to pkgs/unit/lo/loadwatch/pkg-fun.nix diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/unit/lo/loc/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/loc/default.nix rename to pkgs/unit/lo/loc/pkg-fun.nix diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/unit/lo/localtime/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/localtime/default.nix rename to pkgs/unit/lo/localtime/pkg-fun.nix diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/unit/lo/loccount/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/loccount/default.nix rename to pkgs/unit/lo/loccount/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/unit/lo/lockdep/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lockdep/default.nix rename to pkgs/unit/lo/lockdep/pkg-fun.nix diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/unit/lo/lockfileProgs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lockfile-progs/default.nix rename to pkgs/unit/lo/lockfileProgs/pkg-fun.nix diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/unit/lo/log4cplus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/log4cplus/default.nix rename to pkgs/unit/lo/log4cplus/pkg-fun.nix diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/unit/lo/log4cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/log4cpp/default.nix rename to pkgs/unit/lo/log4cpp/pkg-fun.nix diff --git a/pkgs/development/libraries/log4cxx/narrowing-fixes.patch b/pkgs/unit/lo/log4cxx/narrowing-fixes.patch similarity index 100% rename from pkgs/development/libraries/log4cxx/narrowing-fixes.patch rename to pkgs/unit/lo/log4cxx/narrowing-fixes.patch diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/unit/lo/log4cxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/log4cxx/default.nix rename to pkgs/unit/lo/log4cxx/pkg-fun.nix diff --git a/pkgs/tools/security/log4j-detect/default.nix b/pkgs/unit/lo/log4j-detect/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/log4j-detect/default.nix rename to pkgs/unit/lo/log4j-detect/pkg-fun.nix diff --git a/pkgs/tools/security/log4j-scan/default.nix b/pkgs/unit/lo/log4j-scan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/log4j-scan/default.nix rename to pkgs/unit/lo/log4j-scan/pkg-fun.nix diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/unit/lo/log4j-sniffer/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/log4j-sniffer/default.nix rename to pkgs/unit/lo/log4j-sniffer/pkg-fun.nix diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/unit/lo/log4j-vuln-scanner/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/log4j-vuln-scanner/default.nix rename to pkgs/unit/lo/log4j-vuln-scanner/pkg-fun.nix diff --git a/pkgs/tools/security/log4jcheck/default.nix b/pkgs/unit/lo/log4jcheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/log4jcheck/default.nix rename to pkgs/unit/lo/log4jcheck/pkg-fun.nix diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/unit/lo/log4shell-detector/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/log4shell-detector/default.nix rename to pkgs/unit/lo/log4shell-detector/pkg-fun.nix diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/unit/lo/log4shib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/log4shib/default.nix rename to pkgs/unit/lo/log4shib/pkg-fun.nix diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/unit/lo/logcheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/logcheck/default.nix rename to pkgs/unit/lo/logcheck/pkg-fun.nix diff --git a/pkgs/misc/drivers/logiops/default.nix b/pkgs/unit/lo/logiops/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/logiops/default.nix rename to pkgs/unit/lo/logiops/pkg-fun.nix diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/unit/lo/logisim-evolution/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/logisim-evolution/default.nix rename to pkgs/unit/lo/logisim-evolution/pkg-fun.nix diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/unit/lo/logisim/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/logisim/default.nix rename to pkgs/unit/lo/logisim/pkg-fun.nix diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/unit/lo/logkeys/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/logkeys/default.nix rename to pkgs/unit/lo/logkeys/pkg-fun.nix diff --git a/pkgs/tools/security/logmap/default.nix b/pkgs/unit/lo/logmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/logmap/default.nix rename to pkgs/unit/lo/logmap/pkg-fun.nix diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/unit/lo/logmein-hamachi/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/logmein-hamachi/default.nix rename to pkgs/unit/lo/logmein-hamachi/pkg-fun.nix diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/unit/lo/logrotate/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/logrotate/default.nix rename to pkgs/unit/lo/logrotate/pkg-fun.nix diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/unit/lo/logstalgia/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/logstalgia/default.nix rename to pkgs/unit/lo/logstalgia/pkg-fun.nix diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/unit/lo/logstash-contrib/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/logstash/contrib.nix rename to pkgs/unit/lo/logstash-contrib/pkg-fun.nix diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/unit/lo/logtop/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/logtop/default.nix rename to pkgs/unit/lo/logtop/pkg-fun.nix diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/unit/lo/lokalise2-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lokalise2-cli/default.nix rename to pkgs/unit/lo/lokalise2-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/unit/lo/lokinet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/lokinet/default.nix rename to pkgs/unit/lo/lokinet/pkg-fun.nix diff --git a/pkgs/shells/loksh/default.nix b/pkgs/unit/lo/loksh/pkg-fun.nix similarity index 100% rename from pkgs/shells/loksh/default.nix rename to pkgs/unit/lo/loksh/pkg-fun.nix diff --git a/pkgs/tools/misc/lolcat/Gemfile b/pkgs/unit/lo/lolcat/Gemfile similarity index 100% rename from pkgs/tools/misc/lolcat/Gemfile rename to pkgs/unit/lo/lolcat/Gemfile diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/unit/lo/lolcat/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/lolcat/Gemfile.lock rename to pkgs/unit/lo/lolcat/Gemfile.lock diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/unit/lo/lolcat/gemset.nix similarity index 100% rename from pkgs/tools/misc/lolcat/gemset.nix rename to pkgs/unit/lo/lolcat/gemset.nix diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/unit/lo/lolcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lolcat/default.nix rename to pkgs/unit/lo/lolcat/pkg-fun.nix diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/unit/lo/lolcode/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/lolcode/default.nix rename to pkgs/unit/lo/lolcode/pkg-fun.nix diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/unit/lo/lollypop/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lollypop/default.nix rename to pkgs/unit/lo/lollypop/pkg-fun.nix diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/unit/lo/lombok/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/lombok/default.nix rename to pkgs/unit/lo/lombok/pkg-fun.nix diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/unit/lo/long-shebang/pkg-fun.nix similarity index 100% rename from pkgs/misc/long-shebang/default.nix rename to pkgs/unit/lo/long-shebang/pkg-fun.nix diff --git a/pkgs/servers/monitoring/longview/log-stdout.patch b/pkgs/unit/lo/longview/log-stdout.patch similarity index 100% rename from pkgs/servers/monitoring/longview/log-stdout.patch rename to pkgs/unit/lo/longview/log-stdout.patch diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/unit/lo/longview/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/longview/default.nix rename to pkgs/unit/lo/longview/pkg-fun.nix diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/unit/lo/looking-glass-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/looking-glass-client/default.nix rename to pkgs/unit/lo/looking-glass-client/pkg-fun.nix diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/unit/lo/loop/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/loop/default.nix rename to pkgs/unit/lo/loop/pkg-fun.nix diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/unit/lo/lorien/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/lorien/default.nix rename to pkgs/unit/lo/lorien/pkg-fun.nix diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/unit/lo/losslessaudiochecker/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/losslessaudiochecker/default.nix rename to pkgs/unit/lo/losslessaudiochecker/pkg-fun.nix diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/unit/lo/losslesscut-bin/build-from-appimage.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/build-from-appimage.nix rename to pkgs/unit/lo/losslesscut-bin/build-from-appimage.nix diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/unit/lo/losslesscut-bin/build-from-dmg.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/build-from-dmg.nix rename to pkgs/unit/lo/losslesscut-bin/build-from-dmg.nix diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/unit/lo/losslesscut-bin/build-from-windows.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/build-from-windows.nix rename to pkgs/unit/lo/losslesscut-bin/build-from-windows.nix diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/unit/lo/losslesscut-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/losslesscut-bin/default.nix rename to pkgs/unit/lo/losslesscut-bin/pkg-fun.nix diff --git a/pkgs/tools/misc/lottieconverter/default.nix b/pkgs/unit/lo/lottieconverter/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lottieconverter/default.nix rename to pkgs/unit/lo/lottieconverter/pkg-fun.nix diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/unit/lo/loudgain/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/loudgain/default.nix rename to pkgs/unit/lo/loudgain/pkg-fun.nix diff --git a/pkgs/development/libraries/loudmouth/glib-2.32.patch b/pkgs/unit/lo/loudmouth/glib-2.32.patch similarity index 100% rename from pkgs/development/libraries/loudmouth/glib-2.32.patch rename to pkgs/unit/lo/loudmouth/glib-2.32.patch diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/unit/lo/loudmouth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/loudmouth/default.nix rename to pkgs/unit/lo/loudmouth/pkg-fun.nix diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/unit/lo/lounge-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/lounge/default.nix rename to pkgs/unit/lo/lounge-gtk-theme/pkg-fun.nix diff --git a/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch b/pkgs/unit/lo/lout/CVE-2019-19917-and-CVE-2019-19918.patch similarity index 100% rename from pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch rename to pkgs/unit/lo/lout/CVE-2019-19917-and-CVE-2019-19918.patch diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/unit/lo/lout/builder.sh similarity index 100% rename from pkgs/tools/typesetting/lout/builder.sh rename to pkgs/unit/lo/lout/builder.sh diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/unit/lo/lout/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/lout/default.nix rename to pkgs/unit/lo/lout/pkg-fun.nix diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/unit/lo/love_0_10/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/love/0.10.nix rename to pkgs/unit/lo/love_0_10/pkg-fun.nix diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/unit/lo/love_11/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/love/11.nix rename to pkgs/unit/lo/love_11/pkg-fun.nix diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/unit/lo/lowdown/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/lowdown/default.nix rename to pkgs/unit/lo/lowdown/pkg-fun.nix diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/unit/lo/loxodo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/loxodo/default.nix rename to pkgs/unit/lo/loxodo/pkg-fun.nix diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/unit/lp/lpairs2/pkg-fun.nix similarity index 100% rename from pkgs/games/lgames/lpairs2/default.nix rename to pkgs/unit/lp/lpairs2/pkg-fun.nix diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/unit/lp/lpcnetfreedv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lpcnetfreedv/default.nix rename to pkgs/unit/lp/lpcnetfreedv/pkg-fun.nix diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/unit/lr/lr/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/lr/default.nix rename to pkgs/unit/lr/lr/pkg-fun.nix diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/unit/lr/lrcalc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/lrcalc/default.nix rename to pkgs/unit/lr/lrcalc/pkg-fun.nix diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/unit/lr/lrdf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lrdf/default.nix rename to pkgs/unit/lr/lrdf/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/unit/lr/lrs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/lrs/default.nix rename to pkgs/unit/lr/lrs/pkg-fun.nix diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/unit/lr/lrzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lrzip/default.nix rename to pkgs/unit/lr/lrzip/pkg-fun.nix diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/unit/lr/lrzsz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lrzsz/default.nix rename to pkgs/unit/lr/lrzsz/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/pkgs/unit/ls/lsb-release/lsb_release.sh similarity index 100% rename from pkgs/os-specific/linux/lsb-release/lsb_release.sh rename to pkgs/unit/ls/lsb-release/lsb_release.sh diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/unit/ls/lsb-release/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lsb-release/default.nix rename to pkgs/unit/ls/lsb-release/pkg-fun.nix diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/unit/ls/lscolors/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lscolors/default.nix rename to pkgs/unit/ls/lscolors/pkg-fun.nix diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/unit/ls/lsd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/lsd/default.nix rename to pkgs/unit/ls/lsd/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/unit/ls/lsdvd/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/lsdvd/default.nix rename to pkgs/unit/ls/lsdvd/pkg-fun.nix diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/unit/ls/lshw/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/lshw/default.nix rename to pkgs/unit/ls/lshw/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/unit/ls/lsirec/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lsirec/default.nix rename to pkgs/unit/ls/lsirec/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/unit/ls/lsiutil/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lsiutil/default.nix rename to pkgs/unit/ls/lsiutil/pkg-fun.nix diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/unit/ls/lsix/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/lsix/default.nix rename to pkgs/unit/ls/lsix/pkg-fun.nix diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/unit/ls/lsof/no-build-info.patch similarity index 100% rename from pkgs/development/tools/misc/lsof/no-build-info.patch rename to pkgs/unit/ls/lsof/no-build-info.patch diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/unit/ls/lsof/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/lsof/default.nix rename to pkgs/unit/ls/lsof/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/unit/ls/lsscsi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lsscsi/default.nix rename to pkgs/unit/ls/lsscsi/pkg-fun.nix diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/unit/ls/lswt/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lswt/default.nix rename to pkgs/unit/ls/lswt/pkg-fun.nix diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/unit/lt/ltc-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ltc-tools/default.nix rename to pkgs/unit/lt/ltc-tools/pkg-fun.nix diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/unit/lt/ltex-ls/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ltex-ls/default.nix rename to pkgs/unit/lt/ltex-ls/pkg-fun.nix diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/unit/lt/ltl2ba/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/ltl2ba/default.nix rename to pkgs/unit/lt/ltl2ba/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/unit/lt/ltrace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ltrace/default.nix rename to pkgs/unit/lt/ltrace/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch b/pkgs/unit/lt/ltrace/sysdeps-x86.patch similarity index 100% rename from pkgs/development/tools/misc/ltrace/sysdeps-x86.patch rename to pkgs/unit/lt/ltrace/sysdeps-x86.patch diff --git a/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch b/pkgs/unit/lt/ltrace/testsuite-newfstatat.patch similarity index 100% rename from pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch rename to pkgs/unit/lt/ltrace/testsuite-newfstatat.patch diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/unit/lt/ltris/pkg-fun.nix similarity index 100% rename from pkgs/games/lgames/ltris/default.nix rename to pkgs/unit/lt/ltris/pkg-fun.nix diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/unit/lt/lttng-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/lttng-tools/default.nix rename to pkgs/unit/lt/lttng-tools/pkg-fun.nix diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/unit/lt/lttv/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/lttv/default.nix rename to pkgs/unit/lt/lttv/pkg-fun.nix diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/unit/lt/ltunify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ltunify/default.nix rename to pkgs/unit/lt/ltunify/pkg-fun.nix diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/unit/lt/ltwheelconf/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ltwheelconf/default.nix rename to pkgs/unit/lt/ltwheelconf/pkg-fun.nix diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/unit/lu/luabridge/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/luabridge/default.nix rename to pkgs/unit/lu/luabridge/pkg-fun.nix diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/unit/lu/luau/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/luau/default.nix rename to pkgs/unit/lu/luau/pkg-fun.nix diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/unit/lu/lucene/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/lucene/default.nix rename to pkgs/unit/lu/lucene/pkg-fun.nix diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/unit/lu/lucenepp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lucene++/default.nix rename to pkgs/unit/lu/lucenepp/pkg-fun.nix diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/unit/lu/lucky-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/web/lucky-cli/default.nix rename to pkgs/unit/lu/lucky-cli/pkg-fun.nix diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/unit/lu/lucky-cli/shard.lock similarity index 100% rename from pkgs/development/web/lucky-cli/shard.lock rename to pkgs/unit/lu/lucky-cli/shard.lock diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/unit/lu/lucky-cli/shards.nix similarity index 100% rename from pkgs/development/web/lucky-cli/shards.nix rename to pkgs/unit/lu/lucky-cli/shards.nix diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/unit/lu/luculent/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/luculent/default.nix rename to pkgs/unit/lu/luculent/pkg-fun.nix diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/unit/lu/ludusavi/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/ludusavi/default.nix rename to pkgs/unit/lu/ludusavi/pkg-fun.nix diff --git a/pkgs/games/lugaru/default.nix b/pkgs/unit/lu/lugaru/pkg-fun.nix similarity index 100% rename from pkgs/games/lugaru/default.nix rename to pkgs/unit/lu/lugaru/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/unit/lu/luigi/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/luigi/default.nix rename to pkgs/unit/lu/luigi/pkg-fun.nix diff --git a/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix b/pkgs/unit/lu/lukesmithxyz-bible-kjv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/lukesmithxyz-bible/kjv.nix rename to pkgs/unit/lu/lukesmithxyz-bible-kjv/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/pkgs/unit/lu/lukesmithxyz-st/0000-makefile-fix-install.diff similarity index 100% rename from pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff rename to pkgs/unit/lu/lukesmithxyz-st/0000-makefile-fix-install.diff diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/pkgs/unit/lu/lukesmithxyz-st/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix rename to pkgs/unit/lu/lukesmithxyz-st/pkg-fun.nix diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/unit/lu/lunar-client/pkg-fun.nix similarity index 100% rename from pkgs/games/lunar-client/default.nix rename to pkgs/unit/lu/lunar-client/pkg-fun.nix diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/unit/lu/luppp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/luppp/default.nix rename to pkgs/unit/lu/luppp/pkg-fun.nix diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/unit/lu/lurk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/lurk/default.nix rename to pkgs/unit/lu/lurk/pkg-fun.nix diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/unit/lu/lux/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/lux/default.nix rename to pkgs/unit/lu/lux/pkg-fun.nix diff --git a/pkgs/tools/text/lv/default.nix b/pkgs/unit/lv/lv/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/lv/default.nix rename to pkgs/unit/lv/lv/pkg-fun.nix diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/unit/lv/lv2-cpp-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lv2-cpp-tools/default.nix rename to pkgs/unit/lv/lv2-cpp-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/unit/lv/lv2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/lv2/default.nix rename to pkgs/unit/lv/lv2/pkg-fun.nix diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/unit/lv/lv2bm/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lv2bm/default.nix rename to pkgs/unit/lv/lv2bm/pkg-fun.nix diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/unit/lv/lv2lint/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lv2lint/default.nix rename to pkgs/unit/lv/lv2lint/pkg-fun.nix diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/unit/lv/lvmsync/Gemfile similarity index 100% rename from pkgs/tools/backup/lvmsync/Gemfile rename to pkgs/unit/lv/lvmsync/Gemfile diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/unit/lv/lvmsync/Gemfile.lock similarity index 100% rename from pkgs/tools/backup/lvmsync/Gemfile.lock rename to pkgs/unit/lv/lvmsync/Gemfile.lock diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/unit/lv/lvmsync/gemset.nix similarity index 100% rename from pkgs/tools/backup/lvmsync/gemset.nix rename to pkgs/unit/lv/lvmsync/gemset.nix diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/unit/lv/lvmsync/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/lvmsync/default.nix rename to pkgs/unit/lv/lvmsync/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/unit/lv/lvtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/lvtk/default.nix rename to pkgs/unit/lv/lvtk/pkg-fun.nix diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/unit/lw/lwan/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/lwan/default.nix rename to pkgs/unit/lw/lwan/pkg-fun.nix diff --git a/pkgs/applications/window-managers/lwm/default.nix b/pkgs/unit/lw/lwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/lwm/default.nix rename to pkgs/unit/lw/lwm/pkg-fun.nix diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/unit/lx/lxcfs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/lxcfs/default.nix rename to pkgs/unit/lx/lxcfs/pkg-fun.nix diff --git a/pkgs/tools/virtualization/lxd-image-server/default.nix b/pkgs/unit/lx/lxd-image-server/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/lxd-image-server/default.nix rename to pkgs/unit/lx/lxd-image-server/pkg-fun.nix diff --git a/pkgs/tools/virtualization/lxd-image-server/run.patch b/pkgs/unit/lx/lxd-image-server/run.patch similarity index 100% rename from pkgs/tools/virtualization/lxd-image-server/run.patch rename to pkgs/unit/lx/lxd-image-server/run.patch diff --git a/pkgs/tools/virtualization/lxd-image-server/state.patch b/pkgs/unit/lx/lxd-image-server/state.patch similarity index 100% rename from pkgs/tools/virtualization/lxd-image-server/state.patch rename to pkgs/unit/lx/lxd-image-server/state.patch diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/unit/lx/lxd/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/lxd/default.nix rename to pkgs/unit/lx/lxd/pkg-fun.nix diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/unit/lx/lxdvdrip/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/lxdvdrip/default.nix rename to pkgs/unit/lx/lxdvdrip/pkg-fun.nix diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/unit/lx/lxgw-wenkai/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/lxgw-wenkai/default.nix rename to pkgs/unit/lx/lxgw-wenkai/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/unit/lx/lxterminal/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/lxterminal/default.nix rename to pkgs/unit/lx/lxterminal/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/unit/lx/lxterminal/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch rename to pkgs/unit/lx/lxterminal/respect-xml-catalog-files-var.patch diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/unit/ly/ly/pkg-fun.nix similarity index 100% rename from pkgs/applications/display-managers/ly/default.nix rename to pkgs/unit/ly/ly/pkg-fun.nix diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/unit/ly/lynis/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/lynis/default.nix rename to pkgs/unit/ly/lynis/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/unit/ly/lynx/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/lynx/default.nix rename to pkgs/unit/ly/lynx/pkg-fun.nix diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/unit/ly/lyra/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lyra/default.nix rename to pkgs/unit/ly/lyra/pkg-fun.nix diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/unit/ly/lyrebird/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/lyrebird/default.nix rename to pkgs/unit/ly/lyrebird/pkg-fun.nix diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/unit/lz/lz4/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lz4/default.nix rename to pkgs/unit/lz/lz4/pkg-fun.nix diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/unit/lz/lzbench/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lzbench/default.nix rename to pkgs/unit/lz/lzbench/pkg-fun.nix diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/unit/lz/lzfse/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lzfse/default.nix rename to pkgs/unit/lz/lzfse/pkg-fun.nix diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/unit/lz/lzham/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lzham/default.nix rename to pkgs/unit/lz/lzham/pkg-fun.nix diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/unit/lz/lzip/lzip-setup-hook.sh similarity index 100% rename from pkgs/tools/compression/lzip/lzip-setup-hook.sh rename to pkgs/unit/lz/lzip/lzip-setup-hook.sh diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/unit/lz/lzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lzip/default.nix rename to pkgs/unit/lz/lzip/pkg-fun.nix diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/unit/lz/lziprecover/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lziprecover/default.nix rename to pkgs/unit/lz/lziprecover/pkg-fun.nix diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/unit/lz/lzlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lzlib/default.nix rename to pkgs/unit/lz/lzlib/pkg-fun.nix diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/unit/lz/lzo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/lzo/default.nix rename to pkgs/unit/lz/lzo/pkg-fun.nix diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/unit/lz/lzop/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/lzop/default.nix rename to pkgs/unit/lz/lzop/pkg-fun.nix diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/unit/lz/lzwolf/pkg-fun.nix similarity index 100% rename from pkgs/games/lzwolf/default.nix rename to pkgs/unit/lz/lzwolf/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/unit/m-/m-cli/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/m-cli/default.nix rename to pkgs/unit/m-/m-cli/pkg-fun.nix diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/unit/m1/m17-cxx-demod/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/m17-cxx-demod/default.nix rename to pkgs/unit/m1/m17-cxx-demod/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/unit/m1/m17n_db/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/m17n-db/default.nix rename to pkgs/unit/m1/m17n_db/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/unit/m1/m17n_lib/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/m17n-lib/default.nix rename to pkgs/unit/m1/m17n_lib/pkg-fun.nix diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/unit/m3/m33-linux/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/m33-linux/default.nix rename to pkgs/unit/m3/m33-linux/pkg-fun.nix diff --git a/pkgs/applications/audio/m4acut/default.nix b/pkgs/unit/m4/m4acut/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/m4acut/default.nix rename to pkgs/unit/m4/m4acut/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/unit/m4/m4ri/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/m4ri/default.nix rename to pkgs/unit/m4/m4ri/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/unit/m4/m4rie/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/m4rie/default.nix rename to pkgs/unit/m4/m4rie/pkg-fun.nix diff --git a/pkgs/applications/science/biology/MACS2/default.nix b/pkgs/unit/ma/MACS2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/MACS2/default.nix rename to pkgs/unit/ma/MACS2/pkg-fun.nix diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/unit/ma/ma1sd/pkg-fun.nix similarity index 100% rename from pkgs/servers/ma1sd/default.nix rename to pkgs/unit/ma/ma1sd/pkg-fun.nix diff --git a/pkgs/tools/system/mac-fdisk/default.nix b/pkgs/unit/ma/mac-fdisk/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/mac-fdisk/default.nix rename to pkgs/unit/ma/mac-fdisk/pkg-fun.nix diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/unit/ma/mac/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mac/default.nix rename to pkgs/unit/ma/mac/pkg-fun.nix diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/unit/ma/macchanger/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/macchanger/default.nix rename to pkgs/unit/ma/macchanger/pkg-fun.nix diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/unit/ma/macchina/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/macchina/default.nix rename to pkgs/unit/ma/macchina/pkg-fun.nix diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/unit/ma/mackerel-agent/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/mackerel-agent/default.nix rename to pkgs/unit/ma/mackerel-agent/pkg-fun.nix diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/unit/ma/macse/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/macse/default.nix rename to pkgs/unit/ma/macse/pkg-fun.nix diff --git a/pkgs/servers/maddy/default.nix b/pkgs/unit/ma/maddy/pkg-fun.nix similarity index 100% rename from pkgs/servers/maddy/default.nix rename to pkgs/unit/ma/maddy/pkg-fun.nix diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/unit/ma/madonctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/madonctl/default.nix rename to pkgs/unit/ma/madonctl/pkg-fun.nix diff --git a/pkgs/games/maelstrom/fix-compilation.patch b/pkgs/unit/ma/maelstrom/fix-compilation.patch similarity index 100% rename from pkgs/games/maelstrom/fix-compilation.patch rename to pkgs/unit/ma/maelstrom/fix-compilation.patch diff --git a/pkgs/games/maelstrom/default.nix b/pkgs/unit/ma/maelstrom/pkg-fun.nix similarity index 100% rename from pkgs/games/maelstrom/default.nix rename to pkgs/unit/ma/maelstrom/pkg-fun.nix diff --git a/pkgs/development/libraries/maeparser/default.nix b/pkgs/unit/ma/maeparser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/maeparser/default.nix rename to pkgs/unit/ma/maeparser/pkg-fun.nix diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/unit/ma/maestro/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/maestro/default.nix rename to pkgs/unit/ma/maestro/pkg-fun.nix diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/unit/ma/mafft/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/mafft/default.nix rename to pkgs/unit/ma/mafft/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/unit/ma/mage/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/mage/default.nix rename to pkgs/unit/ma/mage/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/pkgs/unit/ma/magic-vlsi/0001-strip-bin-prefix.patch similarity index 100% rename from pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch rename to pkgs/unit/ma/magic-vlsi/0001-strip-bin-prefix.patch diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/unit/ma/magic-vlsi/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/magic-vlsi/default.nix rename to pkgs/unit/ma/magic-vlsi/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/unit/ma/magnetico/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/magnetico/default.nix rename to pkgs/unit/ma/magnetico/pkg-fun.nix diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/unit/ma/maigret/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/maigret/default.nix rename to pkgs/unit/ma/maigret/pkg-fun.nix diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/unit/ma/maiko/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/maiko/default.nix rename to pkgs/unit/ma/maiko/pkg-fun.nix diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/unit/ma/mailcap/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/mailcap/default.nix rename to pkgs/unit/ma/mailcap/pkg-fun.nix diff --git a/pkgs/development/web/mailcatcher/Gemfile b/pkgs/unit/ma/mailcatcher/Gemfile similarity index 100% rename from pkgs/development/web/mailcatcher/Gemfile rename to pkgs/unit/ma/mailcatcher/Gemfile diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/unit/ma/mailcatcher/Gemfile.lock similarity index 100% rename from pkgs/development/web/mailcatcher/Gemfile.lock rename to pkgs/unit/ma/mailcatcher/Gemfile.lock diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/unit/ma/mailcatcher/gemset.nix similarity index 100% rename from pkgs/development/web/mailcatcher/gemset.nix rename to pkgs/unit/ma/mailcatcher/gemset.nix diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/unit/ma/mailcatcher/pkg-fun.nix similarity index 100% rename from pkgs/development/web/mailcatcher/default.nix rename to pkgs/unit/ma/mailcatcher/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch b/pkgs/unit/ma/mailcheck/mailcheck-Makefile.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch rename to pkgs/unit/ma/mailcheck/mailcheck-Makefile.patch diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/unit/ma/mailcheck/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mailcheck/default.nix rename to pkgs/unit/ma/mailcheck/pkg-fun.nix diff --git a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/pkgs/unit/ma/maildrop/maildrop.configure.hack.patch similarity index 100% rename from pkgs/tools/networking/maildrop/maildrop.configure.hack.patch rename to pkgs/unit/ma/maildrop/maildrop.configure.hack.patch diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/unit/ma/maildrop/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/maildrop/default.nix rename to pkgs/unit/ma/maildrop/pkg-fun.nix diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/unit/ma/mailhog/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/mailhog/default.nix rename to pkgs/unit/ma/mailhog/pkg-fun.nix diff --git a/pkgs/tools/misc/mailman-rss/default.nix b/pkgs/unit/ma/mailman-rss/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mailman-rss/default.nix rename to pkgs/unit/ma/mailman-rss/pkg-fun.nix diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/unit/ma/mailmanPackages/hyperkitty.nix similarity index 100% rename from pkgs/servers/mail/mailman/hyperkitty.nix rename to pkgs/unit/ma/mailmanPackages/hyperkitty.nix diff --git a/pkgs/servers/mail/mailman/log-stderr.patch b/pkgs/unit/ma/mailmanPackages/log-stderr.patch similarity index 100% rename from pkgs/servers/mail/mailman/log-stderr.patch rename to pkgs/unit/ma/mailmanPackages/log-stderr.patch diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/unit/ma/mailmanPackages/mailman-hyperkitty.nix similarity index 100% rename from pkgs/servers/mail/mailman/mailman-hyperkitty.nix rename to pkgs/unit/ma/mailmanPackages/mailman-hyperkitty.nix diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/unit/ma/mailmanPackages/package.nix similarity index 100% rename from pkgs/servers/mail/mailman/package.nix rename to pkgs/unit/ma/mailmanPackages/package.nix diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/unit/ma/mailmanPackages/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/mailman/default.nix rename to pkgs/unit/ma/mailmanPackages/pkg-fun.nix diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/unit/ma/mailmanPackages/postorius.nix similarity index 100% rename from pkgs/servers/mail/mailman/postorius.nix rename to pkgs/unit/ma/mailmanPackages/postorius.nix diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/unit/ma/mailmanPackages/python.nix similarity index 100% rename from pkgs/servers/mail/mailman/python.nix rename to pkgs/unit/ma/mailmanPackages/python.nix diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/unit/ma/mailmanPackages/web.nix similarity index 100% rename from pkgs/servers/mail/mailman/web.nix rename to pkgs/unit/ma/mailmanPackages/web.nix diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/unit/ma/mailsend/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mailsend/default.nix rename to pkgs/unit/ma/mailsend/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/unit/ma/mailspring/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mailspring/default.nix rename to pkgs/unit/ma/mailspring/pkg-fun.nix diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/unit/ma/maim/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/maim/default.nix rename to pkgs/unit/ma/maim/pkg-fun.nix diff --git a/pkgs/tools/text/mairix/mmap.patch b/pkgs/unit/ma/mairix/mmap.patch similarity index 100% rename from pkgs/tools/text/mairix/mmap.patch rename to pkgs/unit/ma/mairix/mmap.patch diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/unit/ma/mairix/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mairix/default.nix rename to pkgs/unit/ma/mairix/pkg-fun.nix diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/unit/ma/makeAutostartItem/pkg-fun.nix similarity index 100% rename from pkgs/build-support/make-startupitem/default.nix rename to pkgs/unit/ma/makeAutostartItem/pkg-fun.nix diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/pkgs/unit/ma/makeBinaryWrapper/make-binary-wrapper.sh similarity index 100% rename from pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh rename to pkgs/unit/ma/makeBinaryWrapper/make-binary-wrapper.sh diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/unit/ma/makeBinaryWrapper/pkg-fun.nix similarity index 100% rename from pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix rename to pkgs/unit/ma/makeBinaryWrapper/pkg-fun.nix diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/unit/ma/makeDarwinBundle/pkg-fun.nix similarity index 100% rename from pkgs/build-support/make-darwin-bundle/default.nix rename to pkgs/unit/ma/makeDarwinBundle/pkg-fun.nix diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/unit/ma/makeDesktopItem/pkg-fun.nix similarity index 100% rename from pkgs/build-support/make-desktopitem/default.nix rename to pkgs/unit/ma/makeDesktopItem/pkg-fun.nix diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci b/pkgs/unit/ma/makeHardcodeGsettingsPatch/hardcode-gsettings.cocci similarity index 100% rename from pkgs/build-support/make-hardcode-gsettings-patch/hardcode-gsettings.cocci rename to pkgs/unit/ma/makeHardcodeGsettingsPatch/hardcode-gsettings.cocci diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/unit/ma/makeHardcodeGsettingsPatch/pkg-fun.nix similarity index 100% rename from pkgs/build-support/make-hardcode-gsettings-patch/default.nix rename to pkgs/unit/ma/makeHardcodeGsettingsPatch/pkg-fun.nix diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/Cargo.lock similarity index 100% rename from pkgs/build-support/kernel/make-initrd-ng/Cargo.lock rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/Cargo.lock diff --git a/pkgs/build-support/kernel/make-initrd-ng/update.sh b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/update.sh similarity index 100% rename from pkgs/build-support/kernel/make-initrd-ng/update.sh rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/update.sh diff --git a/pkgs/build-support/kernel/make-initrd-ng-tool.nix b/pkgs/unit/ma/makeInitrdNGTool/pkg-fun.nix similarity index 100% rename from pkgs/build-support/kernel/make-initrd-ng-tool.nix rename to pkgs/unit/ma/makeInitrdNGTool/pkg-fun.nix diff --git a/pkgs/build-support/make-pkgconfigitem/default.nix b/pkgs/unit/ma/makePkgconfigItem/pkg-fun.nix similarity index 100% rename from pkgs/build-support/make-pkgconfigitem/default.nix rename to pkgs/unit/ma/makePkgconfigItem/pkg-fun.nix diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/unit/ma/makebootfat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/makebootfat/default.nix rename to pkgs/unit/ma/makebootfat/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/unit/ma/makefile2graph/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/makefile2graph/default.nix rename to pkgs/unit/ma/makefile2graph/pkg-fun.nix diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/unit/ma/maker-panel/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/maker-panel/default.nix rename to pkgs/unit/ma/maker-panel/pkg-fun.nix diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/unit/ma/makerpm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/makerpm/default.nix rename to pkgs/unit/ma/makerpm/pkg-fun.nix diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/unit/ma/makeself/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/makeself/default.nix rename to pkgs/unit/ma/makeself/pkg-fun.nix diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/unit/ma/mako/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mako/default.nix rename to pkgs/unit/ma/mako/pkg-fun.nix diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/unit/ma/maligned/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/maligned/default.nix rename to pkgs/unit/ma/maligned/pkg-fun.nix diff --git a/pkgs/development/tools/profiling/malt/default.nix b/pkgs/unit/ma/malt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/profiling/malt/default.nix rename to pkgs/unit/ma/malt/pkg-fun.nix diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/unit/ma/mamba/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mamba/default.nix rename to pkgs/unit/ma/mamba/pkg-fun.nix diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/unit/ma/man-db/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/man-db/default.nix rename to pkgs/unit/ma/man-db/pkg-fun.nix diff --git a/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch b/pkgs/unit/ma/man-db/systemwide-man-db-conf.patch similarity index 100% rename from pkgs/tools/misc/man-db/systemwide-man-db-conf.patch rename to pkgs/unit/ma/man-db/systemwide-man-db-conf.patch diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/unit/ma/man-pages-posix/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/man-pages-posix/default.nix rename to pkgs/unit/ma/man-pages-posix/pkg-fun.nix diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/unit/ma/man-pages/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/man-pages/default.nix rename to pkgs/unit/ma/man-pages/pkg-fun.nix diff --git a/pkgs/games/manaplus/default.nix b/pkgs/unit/ma/manaplus/pkg-fun.nix similarity index 100% rename from pkgs/games/manaplus/default.nix rename to pkgs/unit/ma/manaplus/pkg-fun.nix diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/unit/ma/mandoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mandoc/default.nix rename to pkgs/unit/ma/mandoc/pkg-fun.nix diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/unit/ma/mandown/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mandown/default.nix rename to pkgs/unit/ma/mandown/pkg-fun.nix diff --git a/pkgs/tools/misc/manga-cli/default.nix b/pkgs/unit/ma/manga-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/manga-cli/default.nix rename to pkgs/unit/ma/manga-cli/pkg-fun.nix diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/unit/ma/mangal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mangal/default.nix rename to pkgs/unit/ma/mangal/pkg-fun.nix diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/unit/ma/mani/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mani/default.nix rename to pkgs/unit/ma/mani/pkg-fun.nix diff --git a/pkgs/applications/video/manim/failing_tests.nix b/pkgs/unit/ma/manim/failing_tests.nix similarity index 100% rename from pkgs/applications/video/manim/failing_tests.nix rename to pkgs/unit/ma/manim/failing_tests.nix diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/unit/ma/manim/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/manim/default.nix rename to pkgs/unit/ma/manim/pkg-fun.nix diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/unit/ma/manrope/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/manrope/default.nix rename to pkgs/unit/ma/manrope/pkg-fun.nix diff --git a/pkgs/applications/science/biology/manta/default.nix b/pkgs/unit/ma/manta/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/manta/default.nix rename to pkgs/unit/ma/manta/pkg-fun.nix diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/unit/ma/manticore/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/manticore/default.nix rename to pkgs/unit/ma/manticore/pkg-fun.nix diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/unit/ma/manticoresearch/pkg-fun.nix similarity index 100% rename from pkgs/servers/search/manticoresearch/default.nix rename to pkgs/unit/ma/manticoresearch/pkg-fun.nix diff --git a/pkgs/tools/misc/map/default.nix b/pkgs/unit/ma/map-cmd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/map/default.nix rename to pkgs/unit/ma/map-cmd/pkg-fun.nix diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/unit/ma/mapcache/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/mapcache/default.nix rename to pkgs/unit/ma/mapcache/pkg-fun.nix diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/unit/ma/mapcidr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mapcidr/default.nix rename to pkgs/unit/ma/mapcidr/pkg-fun.nix diff --git a/pkgs/tools/networking/maphosts/Gemfile b/pkgs/unit/ma/maphosts/Gemfile similarity index 100% rename from pkgs/tools/networking/maphosts/Gemfile rename to pkgs/unit/ma/maphosts/Gemfile diff --git a/pkgs/tools/networking/maphosts/Gemfile.lock b/pkgs/unit/ma/maphosts/Gemfile.lock similarity index 100% rename from pkgs/tools/networking/maphosts/Gemfile.lock rename to pkgs/unit/ma/maphosts/Gemfile.lock diff --git a/pkgs/tools/networking/maphosts/gemset.nix b/pkgs/unit/ma/maphosts/gemset.nix similarity index 100% rename from pkgs/tools/networking/maphosts/gemset.nix rename to pkgs/unit/ma/maphosts/gemset.nix diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/unit/ma/maphosts/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/maphosts/default.nix rename to pkgs/unit/ma/maphosts/pkg-fun.nix diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/unit/ma/mapproxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/mapproxy/default.nix rename to pkgs/unit/ma/mapproxy/pkg-fun.nix diff --git a/pkgs/servers/geospatial/mapserver/default.nix b/pkgs/unit/ma/mapserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/mapserver/default.nix rename to pkgs/unit/ma/mapserver/pkg-fun.nix diff --git a/pkgs/games/mar1d/default.nix b/pkgs/unit/ma/mar1d/pkg-fun.nix similarity index 100% rename from pkgs/games/mar1d/default.nix rename to pkgs/unit/ma/mar1d/pkg-fun.nix diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/unit/ma/marathi-cursive/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/marathi-cursive/default.nix rename to pkgs/unit/ma/marathi-cursive/pkg-fun.nix diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/unit/ma/marathonctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/marathonctl/default.nix rename to pkgs/unit/ma/marathonctl/pkg-fun.nix diff --git a/pkgs/games/mari0/default.nix b/pkgs/unit/ma/mari0/pkg-fun.nix similarity index 100% rename from pkgs/games/mari0/default.nix rename to pkgs/unit/ma/mari0/pkg-fun.nix diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/unit/ma/mariadb-galera/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/mariadb/galera/default.nix rename to pkgs/unit/ma/mariadb-galera/pkg-fun.nix diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/unit/ma/marisa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/marisa/default.nix rename to pkgs/unit/ma/marisa/pkg-fun.nix diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/unit/ma/mark/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mark/default.nix rename to pkgs/unit/ma/mark/pkg-fun.nix diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/unit/ma/markdown-anki-decks/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/markdown-anki-decks/default.nix rename to pkgs/unit/ma/markdown-anki-decks/pkg-fun.nix diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/unit/ma/markdown-pp/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/markdown-pp/default.nix rename to pkgs/unit/ma/markdown-pp/pkg-fun.nix diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/unit/ma/marker/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/marker/default.nix rename to pkgs/unit/ma/marker/pkg-fun.nix diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/unit/ma/markets/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/markets/default.nix rename to pkgs/unit/ma/markets/pkg-fun.nix diff --git a/pkgs/development/tools/marksman/deps.nix b/pkgs/unit/ma/marksman/deps.nix similarity index 100% rename from pkgs/development/tools/marksman/deps.nix rename to pkgs/unit/ma/marksman/deps.nix diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/unit/ma/marksman/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/marksman/default.nix rename to pkgs/unit/ma/marksman/pkg-fun.nix diff --git a/pkgs/development/tools/marksman/update.sh b/pkgs/unit/ma/marksman/update.sh similarity index 100% rename from pkgs/development/tools/marksman/update.sh rename to pkgs/unit/ma/marksman/update.sh diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/unit/ma/marktext/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/marktext/default.nix rename to pkgs/unit/ma/marktext/pkg-fun.nix diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/unit/ma/marl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/marl/default.nix rename to pkgs/unit/ma/marl/pkg-fun.nix diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/unit/ma/marlin-calc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/marlin-calc/default.nix rename to pkgs/unit/ma/marlin-calc/pkg-fun.nix diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/unit/ma/mars-mips/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mars-mips/default.nix rename to pkgs/unit/ma/mars-mips/pkg-fun.nix diff --git a/pkgs/games/mars/default.nix b/pkgs/unit/ma/mars/pkg-fun.nix similarity index 100% rename from pkgs/games/mars/default.nix rename to pkgs/unit/ma/mars/pkg-fun.nix diff --git a/pkgs/development/compilers/marst/default.nix b/pkgs/unit/ma/marst/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/marst/default.nix rename to pkgs/unit/ma/marst/pkg-fun.nix diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/unit/ma/martian-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/martian-mono/default.nix rename to pkgs/unit/ma/martian-mono/pkg-fun.nix diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/unit/ma/martyr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/martyr/default.nix rename to pkgs/unit/ma/martyr/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop b/pkgs/unit/ma/marvin/LicenseManager.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/LicenseManager.desktop rename to pkgs/unit/ma/marvin/LicenseManager.desktop diff --git a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop b/pkgs/unit/ma/marvin/MarvinSketch.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop rename to pkgs/unit/ma/marvin/MarvinSketch.desktop diff --git a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop b/pkgs/unit/ma/marvin/MarvinView.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/MarvinView.desktop rename to pkgs/unit/ma/marvin/MarvinView.desktop diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/unit/ma/marvin/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/marvin/default.nix rename to pkgs/unit/ma/marvin/pkg-fun.nix diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/unit/ma/marwaita-manjaro/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/marwaita-manjaro/default.nix rename to pkgs/unit/ma/marwaita-manjaro/pkg-fun.nix diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/unit/ma/marwaita-peppermint/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/marwaita-peppermint/default.nix rename to pkgs/unit/ma/marwaita-peppermint/pkg-fun.nix diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/unit/ma/marwaita-pop_os/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/marwaita-pop_os/default.nix rename to pkgs/unit/ma/marwaita-pop_os/pkg-fun.nix diff --git a/pkgs/data/themes/marwaita-ubuntu/default.nix b/pkgs/unit/ma/marwaita-ubuntu/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/marwaita-ubuntu/default.nix rename to pkgs/unit/ma/marwaita-ubuntu/pkg-fun.nix diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/unit/ma/marwaita/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/marwaita/default.nix rename to pkgs/unit/ma/marwaita/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/unit/ma/mas/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/mas/default.nix rename to pkgs/unit/ma/mas/pkg-fun.nix diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/unit/ma/mask/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mask/default.nix rename to pkgs/unit/ma/mask/pkg-fun.nix diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/unit/ma/masscan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/masscan/default.nix rename to pkgs/unit/ma/masscan/pkg-fun.nix diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/unit/ma/massren/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/massren/default.nix rename to pkgs/unit/ma/massren/pkg-fun.nix diff --git a/pkgs/tools/backup/mastodon-archive/default.nix b/pkgs/unit/ma/mastodon-archive/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/mastodon-archive/default.nix rename to pkgs/unit/ma/mastodon-archive/pkg-fun.nix diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/unit/ma/mastodon/pkg-fun.nix similarity index 100% rename from pkgs/servers/mastodon/default.nix rename to pkgs/unit/ma/mastodon/pkg-fun.nix diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/unit/ma/mastodon/source.nix similarity index 100% rename from pkgs/servers/mastodon/source.nix rename to pkgs/unit/ma/mastodon/source.nix diff --git a/pkgs/servers/mastodon/update.nix b/pkgs/unit/ma/mastodon/update.nix similarity index 100% rename from pkgs/servers/mastodon/update.nix rename to pkgs/unit/ma/mastodon/update.nix diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/unit/ma/mastodon/update.sh similarity index 100% rename from pkgs/servers/mastodon/update.sh rename to pkgs/unit/ma/mastodon/update.sh diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/unit/ma/mastodon/version.nix similarity index 100% rename from pkgs/servers/mastodon/version.nix rename to pkgs/unit/ma/mastodon/version.nix diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/unit/ma/matcha-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/matcha/default.nix rename to pkgs/unit/ma/matcha-gtk-theme/pkg-fun.nix diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/unit/ma/matchbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/matchbox/default.nix rename to pkgs/unit/ma/matchbox/pkg-fun.nix diff --git a/pkgs/data/themes/materia-kde/default.nix b/pkgs/unit/ma/materia-kde-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/materia-kde/default.nix rename to pkgs/unit/ma/materia-kde-theme/pkg-fun.nix diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/unit/ma/materia-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/materia-theme/default.nix rename to pkgs/unit/ma/materia-theme/pkg-fun.nix diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/unit/ma/material-design-icons/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/material-design-icons/default.nix rename to pkgs/unit/ma/material-design-icons/pkg-fun.nix diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/unit/ma/material-icons/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/material-icons/default.nix rename to pkgs/unit/ma/material-icons/pkg-fun.nix diff --git a/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/pkgs/unit/ma/mathpix-snipping-tool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mathpix-snipping-tool/default.nix rename to pkgs/unit/ma/mathpix-snipping-tool/pkg-fun.nix diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/unit/ma/matio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/matio/default.nix rename to pkgs/unit/ma/matio/pkg-fun.nix diff --git a/pkgs/servers/monitoring/matrix-alertmanager/package.json b/pkgs/unit/ma/matrix-alertmanager/package.json similarity index 100% rename from pkgs/servers/monitoring/matrix-alertmanager/package.json rename to pkgs/unit/ma/matrix-alertmanager/package.json diff --git a/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/pkgs/unit/ma/matrix-alertmanager/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/matrix-alertmanager/default.nix rename to pkgs/unit/ma/matrix-alertmanager/pkg-fun.nix diff --git a/pkgs/servers/monitoring/matrix-alertmanager/update.nix b/pkgs/unit/ma/matrix-alertmanager/update.nix similarity index 100% rename from pkgs/servers/monitoring/matrix-alertmanager/update.nix rename to pkgs/unit/ma/matrix-alertmanager/update.nix diff --git a/pkgs/servers/monitoring/matrix-alertmanager/yarn-hash b/pkgs/unit/ma/matrix-alertmanager/yarn-hash similarity index 100% rename from pkgs/servers/monitoring/matrix-alertmanager/yarn-hash rename to pkgs/unit/ma/matrix-alertmanager/yarn-hash diff --git a/pkgs/servers/monitoring/matrix-alertmanager/yarn.lock b/pkgs/unit/ma/matrix-alertmanager/yarn.lock similarity index 100% rename from pkgs/servers/monitoring/matrix-alertmanager/yarn.lock rename to pkgs/unit/ma/matrix-alertmanager/yarn.lock diff --git a/pkgs/servers/matrix-appservice-discord/package.json b/pkgs/unit/ma/matrix-appservice-discord/package.json similarity index 100% rename from pkgs/servers/matrix-appservice-discord/package.json rename to pkgs/unit/ma/matrix-appservice-discord/package.json diff --git a/pkgs/servers/matrix-appservice-discord/pin.json b/pkgs/unit/ma/matrix-appservice-discord/pin.json similarity index 100% rename from pkgs/servers/matrix-appservice-discord/pin.json rename to pkgs/unit/ma/matrix-appservice-discord/pin.json diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/unit/ma/matrix-appservice-discord/pkg-fun.nix similarity index 100% rename from pkgs/servers/matrix-appservice-discord/default.nix rename to pkgs/unit/ma/matrix-appservice-discord/pkg-fun.nix diff --git a/pkgs/servers/matrix-appservice-discord/update.sh b/pkgs/unit/ma/matrix-appservice-discord/update.sh similarity index 100% rename from pkgs/servers/matrix-appservice-discord/update.sh rename to pkgs/unit/ma/matrix-appservice-discord/update.sh diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/unit/ma/matrix-appservice-irc/pkg-fun.nix similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix rename to pkgs/unit/ma/matrix-appservice-irc/pkg-fun.nix diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/unit/ma/matrix-appservice-slack/package.json similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json rename to pkgs/unit/ma/matrix-appservice-slack/package.json diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/unit/ma/matrix-appservice-slack/pin.json similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json rename to pkgs/unit/ma/matrix-appservice-slack/pin.json diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/unit/ma/matrix-appservice-slack/pkg-fun.nix similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix rename to pkgs/unit/ma/matrix-appservice-slack/pkg-fun.nix diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh b/pkgs/unit/ma/matrix-appservice-slack/update.sh similarity index 100% rename from pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh rename to pkgs/unit/ma/matrix-appservice-slack/update.sh diff --git a/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch b/pkgs/unit/ma/matrix-conduit/cargo-11192-workaround.patch similarity index 100% rename from pkgs/servers/matrix-conduit/cargo-11192-workaround.patch rename to pkgs/unit/ma/matrix-conduit/cargo-11192-workaround.patch diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/unit/ma/matrix-conduit/pkg-fun.nix similarity index 100% rename from pkgs/servers/matrix-conduit/default.nix rename to pkgs/unit/ma/matrix-conduit/pkg-fun.nix diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/unit/ma/matrix-corporal/pkg-fun.nix similarity index 100% rename from pkgs/servers/matrix-corporal/default.nix rename to pkgs/unit/ma/matrix-corporal/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/unit/ma/matrix-dl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-dl/default.nix rename to pkgs/unit/ma/matrix-dl/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/unit/ma/matrix-recorder/composition.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix rename to pkgs/unit/ma/matrix-recorder/composition.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/unit/ma/matrix-recorder/node-env.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix rename to pkgs/unit/ma/matrix-recorder/node-env.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/pkgs/unit/ma/matrix-recorder/node-packages.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix rename to pkgs/unit/ma/matrix-recorder/node-packages.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/unit/ma/matrix-recorder/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix rename to pkgs/unit/ma/matrix-recorder/pkg-fun.nix diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/unit/ma/matrix-sdk-crypto-nodejs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix rename to pkgs/unit/ma/matrix-sdk-crypto-nodejs/pkg-fun.nix diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch b/pkgs/unit/ma/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch rename to pkgs/unit/ma/matrix-sdk-crypto-nodejs/remove-duplicate-dependency.patch diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/unit/ma/matrix-synapse/pkg-fun.nix similarity index 100% rename from pkgs/servers/matrix-synapse/default.nix rename to pkgs/unit/ma/matrix-synapse/pkg-fun.nix diff --git a/pkgs/servers/matrix-synapse/plugins/default.nix b/pkgs/unit/ma/matrix-synapse/plugins/default.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/default.nix rename to pkgs/unit/ma/matrix-synapse/plugins/default.nix diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/unit/ma/matrix-synapse/plugins/ldap3.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/ldap3.nix rename to pkgs/unit/ma/matrix-synapse/plugins/ldap3.nix diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/unit/ma/matrix-synapse/plugins/mjolnir-antispam.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix rename to pkgs/unit/ma/matrix-synapse/plugins/mjolnir-antispam.nix diff --git a/pkgs/servers/matrix-synapse/plugins/pam.nix b/pkgs/unit/ma/matrix-synapse/plugins/pam.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/pam.nix rename to pkgs/unit/ma/matrix-synapse/plugins/pam.nix diff --git a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/pkgs/unit/ma/matrix-synapse/plugins/shared-secret-auth.nix similarity index 100% rename from pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix rename to pkgs/unit/ma/matrix-synapse/plugins/shared-secret-auth.nix diff --git a/pkgs/servers/matrix-synapse/tools/default.nix b/pkgs/unit/ma/matrix-synapse/tools/default.nix similarity index 100% rename from pkgs/servers/matrix-synapse/tools/default.nix rename to pkgs/unit/ma/matrix-synapse/tools/default.nix diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/pkgs/unit/ma/matrix-synapse/tools/rust-synapse-compress-state.nix similarity index 100% rename from pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix rename to pkgs/unit/ma/matrix-synapse/tools/rust-synapse-compress-state.nix diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/unit/ma/matrix-synapse/tools/synadm.nix similarity index 100% rename from pkgs/servers/matrix-synapse/tools/synadm.nix rename to pkgs/unit/ma/matrix-synapse/tools/synadm.nix diff --git a/pkgs/development/compilers/matter-compiler/Gemfile b/pkgs/unit/ma/matter-compiler/Gemfile similarity index 100% rename from pkgs/development/compilers/matter-compiler/Gemfile rename to pkgs/unit/ma/matter-compiler/Gemfile diff --git a/pkgs/development/compilers/matter-compiler/Gemfile.lock b/pkgs/unit/ma/matter-compiler/Gemfile.lock similarity index 100% rename from pkgs/development/compilers/matter-compiler/Gemfile.lock rename to pkgs/unit/ma/matter-compiler/Gemfile.lock diff --git a/pkgs/development/compilers/matter-compiler/gemset.nix b/pkgs/unit/ma/matter-compiler/gemset.nix similarity index 100% rename from pkgs/development/compilers/matter-compiler/gemset.nix rename to pkgs/unit/ma/matter-compiler/gemset.nix diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/unit/ma/matter-compiler/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/matter-compiler/default.nix rename to pkgs/unit/ma/matter-compiler/pkg-fun.nix diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/unit/ma/matterbridge/pkg-fun.nix similarity index 100% rename from pkgs/servers/matterbridge/default.nix rename to pkgs/unit/ma/matterbridge/pkg-fun.nix diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/unit/ma/matterircd/pkg-fun.nix similarity index 100% rename from pkgs/servers/mattermost/matterircd.nix rename to pkgs/unit/ma/matterircd/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/unit/ma/mattermost-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix rename to pkgs/unit/ma/mattermost-desktop/pkg-fun.nix diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/unit/ma/mattermost/pkg-fun.nix similarity index 100% rename from pkgs/servers/mattermost/default.nix rename to pkgs/unit/ma/mattermost/pkg-fun.nix diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/unit/ma/mautrix-facebook/pkg-fun.nix similarity index 100% rename from pkgs/servers/mautrix-facebook/default.nix rename to pkgs/unit/ma/mautrix-facebook/pkg-fun.nix diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/unit/ma/mautrix-googlechat/pkg-fun.nix similarity index 100% rename from pkgs/servers/mautrix-googlechat/default.nix rename to pkgs/unit/ma/mautrix-googlechat/pkg-fun.nix diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/unit/ma/mautrix-whatsapp/pkg-fun.nix similarity index 100% rename from pkgs/servers/mautrix-whatsapp/default.nix rename to pkgs/unit/ma/mautrix-whatsapp/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/unit/ma/maven3/builder.sh similarity index 100% rename from pkgs/development/tools/build-managers/apache-maven/builder.sh rename to pkgs/unit/ma/maven3/builder.sh diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/unit/ma/maven3/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/apache-maven/default.nix rename to pkgs/unit/ma/maven3/pkg-fun.nix diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/unit/ma/mawk/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mawk/default.nix rename to pkgs/unit/ma/mawk/pkg-fun.nix diff --git a/pkgs/tools/archivers/maxcso/default.nix b/pkgs/unit/ma/maxcso/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/maxcso/default.nix rename to pkgs/unit/ma/maxcso/pkg-fun.nix diff --git a/pkgs/development/libraries/maxflow/default.nix b/pkgs/unit/ma/maxflow/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/maxflow/default.nix rename to pkgs/unit/ma/maxflow/pkg-fun.nix diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/unit/ma/maxlib/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/maxlib/default.nix rename to pkgs/unit/ma/maxlib/pkg-fun.nix diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/unit/mb/mb2md/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mb2md/default.nix rename to pkgs/unit/mb/mb2md/pkg-fun.nix diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/unit/mb/mbed-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mbed-cli/default.nix rename to pkgs/unit/mb/mbed-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/unit/mb/mbelib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/mbelib/default.nix rename to pkgs/unit/mb/mbelib/pkg-fun.nix diff --git a/pkgs/tools/networking/mbidled/default.nix b/pkgs/unit/mb/mbidled/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mbidled/default.nix rename to pkgs/unit/mb/mbidled/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/unit/mb/mblaze/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mblaze/default.nix rename to pkgs/unit/mb/mblaze/pkg-fun.nix diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/unit/mb/mblock-mlink/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mblock-mlink/default.nix rename to pkgs/unit/mb/mblock-mlink/pkg-fun.nix diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/unit/mb/mbox/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mbox/default.nix rename to pkgs/unit/mb/mbox/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/unit/mb/mbpfan/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mbpfan/default.nix rename to pkgs/unit/mb/mbpfan/pkg-fun.nix diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/001-libbqn-path.patch b/pkgs/unit/mb/mbqn/001-libbqn-path.patch similarity index 100% rename from pkgs/development/interpreters/bqn/mlochbaum-bqn/001-libbqn-path.patch rename to pkgs/unit/mb/mbqn/001-libbqn-path.patch diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/unit/mb/mbqn/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix rename to pkgs/unit/mb/mbqn/pkg-fun.nix diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/unit/mb/mbrola/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mbrola/default.nix rename to pkgs/unit/mb/mbrola/pkg-fun.nix diff --git a/pkgs/servers/geospatial/mbtileserver/default.nix b/pkgs/unit/mb/mbtileserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/mbtileserver/default.nix rename to pkgs/unit/mb/mbtileserver/pkg-fun.nix diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/unit/mb/mbuffer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mbuffer/default.nix rename to pkgs/unit/mb/mbuffer/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/unit/mc/mcabber/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mcabber/default.nix rename to pkgs/unit/mc/mcabber/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/unit/mc/mcaimi-st/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/mcaimi-st.nix rename to pkgs/unit/mc/mcaimi-st/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mceinject/default.nix b/pkgs/unit/mc/mceinject/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mceinject/default.nix rename to pkgs/unit/mc/mceinject/pkg-fun.nix diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/unit/mc/mcfly/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mcfly/default.nix rename to pkgs/unit/mc/mcfly/pkg-fun.nix diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/unit/mc/mcomix/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/mcomix/default.nix rename to pkgs/unit/mc/mcomix/pkg-fun.nix diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/unit/mc/mcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mcpp/default.nix rename to pkgs/unit/mc/mcpp/pkg-fun.nix diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/unit/mc/mcrcon/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mcrcon/default.nix rename to pkgs/unit/mc/mcrcon/pkg-fun.nix diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/unit/mc/mcrl2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/mcrl2/default.nix rename to pkgs/unit/mc/mcrl2/pkg-fun.nix diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/unit/mc/mcron/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/mcron/default.nix rename to pkgs/unit/mc/mcron/pkg-fun.nix diff --git a/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch b/pkgs/unit/mc/mcrypt/format-string_CVE-2012-4426.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch rename to pkgs/unit/mc/mcrypt/format-string_CVE-2012-4426.patch diff --git a/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/pkgs/unit/mc/mcrypt/malloc_to_stdlib.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch rename to pkgs/unit/mc/mcrypt/malloc_to_stdlib.patch diff --git a/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch b/pkgs/unit/mc/mcrypt/overflow_CVE-2012-4409.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch rename to pkgs/unit/mc/mcrypt/overflow_CVE-2012-4409.patch diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/unit/mc/mcrypt/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mcrypt/default.nix rename to pkgs/unit/mc/mcrypt/pkg-fun.nix diff --git a/pkgs/tools/misc/mcrypt/segv.patch b/pkgs/unit/mc/mcrypt/segv.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/segv.patch rename to pkgs/unit/mc/mcrypt/segv.patch diff --git a/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch b/pkgs/unit/mc/mcrypt/sprintf_CVE-2012-4527.patch similarity index 100% rename from pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch rename to pkgs/unit/mc/mcrypt/sprintf_CVE-2012-4527.patch diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/unit/mc/mcy/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/mcy/default.nix rename to pkgs/unit/mc/mcy/pkg-fun.nix diff --git a/pkgs/development/tools/literate-programming/md-tangle/default.nix b/pkgs/unit/md/md-tangle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/literate-programming/md-tangle/default.nix rename to pkgs/unit/md/md-tangle/pkg-fun.nix diff --git a/pkgs/development/libraries/md4c/fix-pkgconfig.patch b/pkgs/unit/md/md4c/fix-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/md4c/fix-pkgconfig.patch rename to pkgs/unit/md/md4c/fix-pkgconfig.patch diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/unit/md/md4c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/md4c/default.nix rename to pkgs/unit/md/md4c/pkg-fun.nix diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/unit/md/mda_lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mda-lv2/default.nix rename to pkgs/unit/md/mda_lv2/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mdadm/no-self-references.patch b/pkgs/unit/md/mdadm4/no-self-references.patch similarity index 100% rename from pkgs/os-specific/linux/mdadm/no-self-references.patch rename to pkgs/unit/md/mdadm4/no-self-references.patch diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/unit/md/mdadm4/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mdadm/default.nix rename to pkgs/unit/md/mdadm4/pkg-fun.nix diff --git a/pkgs/tools/text/mdbook-cmdrun/default.nix b/pkgs/unit/md/mdbook-cmdrun/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mdbook-cmdrun/default.nix rename to pkgs/unit/md/mdbook-cmdrun/pkg-fun.nix diff --git a/pkgs/tools/text/mdbook-man/default.nix b/pkgs/unit/md/mdbook-man/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mdbook-man/default.nix rename to pkgs/unit/md/mdbook-man/pkg-fun.nix diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/unit/md/mdbook-open-on-gh/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mdbook-open-on-gh/default.nix rename to pkgs/unit/md/mdbook-open-on-gh/pkg-fun.nix diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/unit/md/mdbtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mdbtools/default.nix rename to pkgs/unit/md/mdbtools/pkg-fun.nix diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/unit/md/mdctags/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/mdctags/default.nix rename to pkgs/unit/md/mdctags/pkg-fun.nix diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/unit/md/mdds/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mdds/default.nix rename to pkgs/unit/md/mdds/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/unit/md/mdevctl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mdevctl/default.nix rename to pkgs/unit/md/mdevctl/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/unit/md/mdf2iso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/mdf2iso/default.nix rename to pkgs/unit/md/mdf2iso/pkg-fun.nix diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/unit/md/mdk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mdk/default.nix rename to pkgs/unit/md/mdk/pkg-fun.nix diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/unit/md/mdk4/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mdk4/default.nix rename to pkgs/unit/md/mdk4/pkg-fun.nix diff --git a/pkgs/development/tools/misc/mdl/Gemfile b/pkgs/unit/md/mdl/Gemfile similarity index 100% rename from pkgs/development/tools/misc/mdl/Gemfile rename to pkgs/unit/md/mdl/Gemfile diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/unit/md/mdl/Gemfile.lock similarity index 100% rename from pkgs/development/tools/misc/mdl/Gemfile.lock rename to pkgs/unit/md/mdl/Gemfile.lock diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/unit/md/mdl/gemset.nix similarity index 100% rename from pkgs/development/tools/misc/mdl/gemset.nix rename to pkgs/unit/md/mdl/gemset.nix diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/unit/md/mdl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/mdl/default.nix rename to pkgs/unit/md/mdl/pkg-fun.nix diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/unit/md/mdp/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mdp/default.nix rename to pkgs/unit/md/mdp/pkg-fun.nix diff --git a/pkgs/tools/misc/mdr/default.nix b/pkgs/unit/md/mdr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mdr/default.nix rename to pkgs/unit/md/mdr/pkg-fun.nix diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/unit/md/mdsh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/documentation/mdsh/default.nix rename to pkgs/unit/md/mdsh/pkg-fun.nix diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/unit/me/me_cleaner/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/me_cleaner/default.nix rename to pkgs/unit/me/me_cleaner/pkg-fun.nix diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/unit/me/media-downloader/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/media-downloader/default.nix rename to pkgs/unit/me/media-downloader/pkg-fun.nix diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/unit/me/media-player-info/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/media-player-info/default.nix rename to pkgs/unit/me/media-player-info/pkg-fun.nix diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/unit/me/mediainfo-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mediainfo-gui/default.nix rename to pkgs/unit/me/mediainfo-gui/pkg-fun.nix diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/unit/me/mediainfo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mediainfo/default.nix rename to pkgs/unit/me/mediainfo/pkg-fun.nix diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/unit/me/mediastreamer-openh264/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mediastreamer/msopenh264.nix rename to pkgs/unit/me/mediastreamer-openh264/pkg-fun.nix diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/unit/me/mediawiki/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/mediawiki/default.nix rename to pkgs/unit/me/mediawiki/pkg-fun.nix diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/unit/me/medio/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/medio/default.nix rename to pkgs/unit/me/medio/pkg-fun.nix diff --git a/pkgs/applications/emulators/mednafen/server.nix b/pkgs/unit/me/mednafen-server/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/mednafen/server.nix rename to pkgs/unit/me/mednafen-server/pkg-fun.nix diff --git a/pkgs/applications/emulators/mednafen/default.nix b/pkgs/unit/me/mednafen/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/mednafen/default.nix rename to pkgs/unit/me/mednafen/pkg-fun.nix diff --git a/pkgs/applications/emulators/mednaffe/default.nix b/pkgs/unit/me/mednaffe/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/mednaffe/default.nix rename to pkgs/unit/me/mednaffe/pkg-fun.nix diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/unit/me/medusa/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/medusa/default.nix rename to pkgs/unit/me/medusa/pkg-fun.nix diff --git a/pkgs/applications/misc/meerk40t/camera.nix b/pkgs/unit/me/meerk40t-camera/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/meerk40t/camera.nix rename to pkgs/unit/me/meerk40t-camera/pkg-fun.nix diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/unit/me/meerk40t/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/meerk40t/default.nix rename to pkgs/unit/me/meerk40t/pkg-fun.nix diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/unit/me/megacli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/megacli/default.nix rename to pkgs/unit/me/megacli/pkg-fun.nix diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/unit/me/megacmd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/megacmd/default.nix rename to pkgs/unit/me/megacmd/pkg-fun.nix diff --git a/pkgs/games/megaglest/default.nix b/pkgs/unit/me/megaglest/pkg-fun.nix similarity index 100% rename from pkgs/games/megaglest/default.nix rename to pkgs/unit/me/megaglest/pkg-fun.nix diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/unit/me/megahit/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/megahit/default.nix rename to pkgs/unit/me/megahit/pkg-fun.nix diff --git a/pkgs/applications/science/misc/megam/ocaml-3.12.patch b/pkgs/unit/me/megam/ocaml-3.12.patch similarity index 100% rename from pkgs/applications/science/misc/megam/ocaml-3.12.patch rename to pkgs/unit/me/megam/ocaml-3.12.patch diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/pkgs/unit/me/megam/ocaml-includes.patch similarity index 100% rename from pkgs/applications/science/misc/megam/ocaml-includes.patch rename to pkgs/unit/me/megam/ocaml-includes.patch diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/unit/me/megam/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/megam/default.nix rename to pkgs/unit/me/megam/pkg-fun.nix diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/unit/me/megapixels/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/megapixels/default.nix rename to pkgs/unit/me/megapixels/pkg-fun.nix diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/unit/me/megatools/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/megatools/default.nix rename to pkgs/unit/me/megatools/pkg-fun.nix diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/unit/me/meh/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/meh/default.nix rename to pkgs/unit/me/meh/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/unit/me/mela/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/mela/default.nix rename to pkgs/unit/me/mela/pkg-fun.nix diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/unit/me/meld/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/meld/default.nix rename to pkgs/unit/me/meld/pkg-fun.nix diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/unit/me/melody/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/melody/default.nix rename to pkgs/unit/me/melody/pkg-fun.nix diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/unit/me/melt/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/melt/default.nix rename to pkgs/unit/me/melt/pkg-fun.nix diff --git a/pkgs/servers/memcached/default.nix b/pkgs/unit/me/memcached/pkg-fun.nix similarity index 100% rename from pkgs/servers/memcached/default.nix rename to pkgs/unit/me/memcached/pkg-fun.nix diff --git a/pkgs/applications/graphics/meme-image-generator/default.nix b/pkgs/unit/me/meme-image-generator/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/meme-image-generator/default.nix rename to pkgs/unit/me/meme-image-generator/pkg-fun.nix diff --git a/pkgs/applications/science/biology/meme-suite/default.nix b/pkgs/unit/me/meme-suite/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/meme-suite/default.nix rename to pkgs/unit/me/meme-suite/pkg-fun.nix diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/unit/me/memo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/memo/default.nix rename to pkgs/unit/me/memo/pkg-fun.nix diff --git a/pkgs/development/libraries/memorymapping/default.nix b/pkgs/unit/me/memorymapping/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/memorymapping/default.nix rename to pkgs/unit/me/memorymapping/pkg-fun.nix diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/unit/me/memray/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/memray/default.nix rename to pkgs/unit/me/memray/pkg-fun.nix diff --git a/pkgs/development/libraries/memstream/default.nix b/pkgs/unit/me/memstream/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/memstream/default.nix rename to pkgs/unit/me/memstream/pkg-fun.nix diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/unit/me/memtest86-efi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/memtest86-efi/default.nix rename to pkgs/unit/me/memtest86-efi/pkg-fun.nix diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/unit/me/memtest86plus/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/memtest86+/default.nix rename to pkgs/unit/me/memtest86plus/pkg-fun.nix diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/unit/me/memtester/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/memtester/default.nix rename to pkgs/unit/me/memtester/pkg-fun.nix diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/unit/me/memtier-benchmark/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/memtier-benchmark/default.nix rename to pkgs/unit/me/memtier-benchmark/pkg-fun.nix diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/unit/me/mencal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mencal/default.nix rename to pkgs/unit/me/mencal/pkg-fun.nix diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/unit/me/menu-cache/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/menu-cache/default.nix rename to pkgs/unit/me/menu-cache/pkg-fun.nix diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/unit/me/menumaker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/menumaker/default.nix rename to pkgs/unit/me/menumaker/pkg-fun.nix diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/unit/me/mepo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mepo/default.nix rename to pkgs/unit/me/mepo/pkg-fun.nix diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/unit/me/mercury/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mercury/default.nix rename to pkgs/unit/me/mercury/pkg-fun.nix diff --git a/pkgs/servers/http/merecat/default.nix b/pkgs/unit/me/merecat/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/merecat/default.nix rename to pkgs/unit/me/merecat/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/unit/me/mergerfs-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mergerfs/tools.nix rename to pkgs/unit/me/mergerfs-tools/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/unit/me/mergerfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mergerfs/default.nix rename to pkgs/unit/me/mergerfs/pkg-fun.nix diff --git a/pkgs/games/meritous/default.nix b/pkgs/unit/me/meritous/pkg-fun.nix similarity index 100% rename from pkgs/games/meritous/default.nix rename to pkgs/unit/me/meritous/pkg-fun.nix diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/unit/me/merriweather-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/merriweather-sans/default.nix rename to pkgs/unit/me/merriweather-sans/pkg-fun.nix diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/unit/me/merriweather/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/merriweather/default.nix rename to pkgs/unit/me/merriweather/pkg-fun.nix diff --git a/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch b/pkgs/unit/me/mesa-demos/demos-data-dir.patch similarity index 100% rename from pkgs/tools/graphics/mesa-demos/demos-data-dir.patch rename to pkgs/unit/me/mesa-demos/demos-data-dir.patch diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/unit/me/mesa-demos/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/mesa-demos/default.nix rename to pkgs/unit/me/mesa-demos/pkg-fun.nix diff --git a/pkgs/tools/admin/meshcentral/fix-js-include-paths.patch b/pkgs/unit/me/meshcentral/fix-js-include-paths.patch similarity index 100% rename from pkgs/tools/admin/meshcentral/fix-js-include-paths.patch rename to pkgs/unit/me/meshcentral/fix-js-include-paths.patch diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/unit/me/meshcentral/package.json similarity index 100% rename from pkgs/tools/admin/meshcentral/package.json rename to pkgs/unit/me/meshcentral/package.json diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/unit/me/meshcentral/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/meshcentral/default.nix rename to pkgs/unit/me/meshcentral/pkg-fun.nix diff --git a/pkgs/tools/admin/meshcentral/update.sh b/pkgs/unit/me/meshcentral/update.sh similarity index 100% rename from pkgs/tools/admin/meshcentral/update.sh rename to pkgs/unit/me/meshcentral/update.sh diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/unit/me/meshcentral/yarn.lock similarity index 100% rename from pkgs/tools/admin/meshcentral/yarn.lock rename to pkgs/unit/me/meshcentral/yarn.lock diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/unit/me/meshcentral/yarn.nix similarity index 100% rename from pkgs/tools/admin/meshcentral/yarn.nix rename to pkgs/unit/me/meshcentral/yarn.nix diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/unit/me/meslo-lg/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/meslo-lg/default.nix rename to pkgs/unit/me/meslo-lg/pkg-fun.nix diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/unit/me/meslo-lgs-nf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/meslo-lgs-nf/default.nix rename to pkgs/unit/me/meslo-lgs-nf/pkg-fun.nix diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/unit/me/meson-tools/pkg-fun.nix similarity index 100% rename from pkgs/misc/meson-tools/default.nix rename to pkgs/unit/me/meson-tools/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/unit/me/meson/boost-Do-not-add-system-paths-on-nix.patch similarity index 100% rename from pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch rename to pkgs/unit/me/meson/boost-Do-not-add-system-paths-on-nix.patch diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/unit/me/meson/clear-old-rpath.patch similarity index 100% rename from pkgs/development/tools/build-managers/meson/clear-old-rpath.patch rename to pkgs/unit/me/meson/clear-old-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/unit/me/meson/fix-rpath.patch similarity index 100% rename from pkgs/development/tools/build-managers/meson/fix-rpath.patch rename to pkgs/unit/me/meson/fix-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/unit/me/meson/gir-fallback-path.patch similarity index 100% rename from pkgs/development/tools/build-managers/meson/gir-fallback-path.patch rename to pkgs/unit/me/meson/gir-fallback-path.patch diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/unit/me/meson/more-env-vars.patch similarity index 100% rename from pkgs/development/tools/build-managers/meson/more-env-vars.patch rename to pkgs/unit/me/meson/more-env-vars.patch diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/unit/me/meson/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/meson/default.nix rename to pkgs/unit/me/meson/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/unit/me/meson/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/meson/setup-hook.sh rename to pkgs/unit/me/meson/setup-hook.sh diff --git a/pkgs/servers/mesos-dns/deps.nix b/pkgs/unit/me/mesos-dns/deps.nix similarity index 100% rename from pkgs/servers/mesos-dns/deps.nix rename to pkgs/unit/me/mesos-dns/deps.nix diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/unit/me/mesos-dns/pkg-fun.nix similarity index 100% rename from pkgs/servers/mesos-dns/default.nix rename to pkgs/unit/me/mesos-dns/pkg-fun.nix diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/unit/me/messer-slim/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/messer-slim/default.nix rename to pkgs/unit/me/messer-slim/pkg-fun.nix diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/unit/me/metaBuildEnv/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/meta-environment/meta-build-env/default.nix rename to pkgs/unit/me/metaBuildEnv/pkg-fun.nix diff --git a/pkgs/tools/security/metabigor/default.nix b/pkgs/unit/me/metabigor/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/metabigor/default.nix rename to pkgs/unit/me/metabigor/pkg-fun.nix diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/unit/me/metadata-cleaner/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/metadata-cleaner/default.nix rename to pkgs/unit/me/metadata-cleaner/pkg-fun.nix diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/unit/me/metal-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/metal-cli/default.nix rename to pkgs/unit/me/metal-cli/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/unit/me/metals/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/metals/default.nix rename to pkgs/unit/me/metals/pkg-fun.nix diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/unit/me/metamath/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/metamath/default.nix rename to pkgs/unit/me/metamath/pkg-fun.nix diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/unit/me/metamorphose2/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/metamorphose2/default.nix rename to pkgs/unit/me/metamorphose2/pkg-fun.nix diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/unit/me/metapixel/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/metapixel/default.nix rename to pkgs/unit/me/metapixel/pkg-fun.nix diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/unit/me/metar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/metar/default.nix rename to pkgs/unit/me/metar/pkg-fun.nix diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/unit/me/metasploit/Gemfile similarity index 100% rename from pkgs/tools/security/metasploit/Gemfile rename to pkgs/unit/me/metasploit/Gemfile diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/unit/me/metasploit/Gemfile.lock similarity index 100% rename from pkgs/tools/security/metasploit/Gemfile.lock rename to pkgs/unit/me/metasploit/Gemfile.lock diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/unit/me/metasploit/gemset.nix similarity index 100% rename from pkgs/tools/security/metasploit/gemset.nix rename to pkgs/unit/me/metasploit/gemset.nix diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/unit/me/metasploit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/metasploit/default.nix rename to pkgs/unit/me/metasploit/pkg-fun.nix diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/unit/me/metasploit/shell.nix similarity index 100% rename from pkgs/tools/security/metasploit/shell.nix rename to pkgs/unit/me/metasploit/shell.nix diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/unit/me/metasploit/update.sh similarity index 100% rename from pkgs/tools/security/metasploit/update.sh rename to pkgs/unit/me/metasploit/update.sh diff --git a/pkgs/os-specific/linux/metastore/default.nix b/pkgs/unit/me/metastore/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/metastore/default.nix rename to pkgs/unit/me/metastore/pkg-fun.nix diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/unit/me/meteo/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/weather/meteo/default.nix rename to pkgs/unit/me/meteo/pkg-fun.nix diff --git a/pkgs/servers/meteor/main.patch b/pkgs/unit/me/meteor/main.patch similarity index 100% rename from pkgs/servers/meteor/main.patch rename to pkgs/unit/me/meteor/main.patch diff --git a/pkgs/servers/meteor/default.nix b/pkgs/unit/me/meteor/pkg-fun.nix similarity index 100% rename from pkgs/servers/meteor/default.nix rename to pkgs/unit/me/meteor/pkg-fun.nix diff --git a/pkgs/applications/audio/meterbridge/buf_rect.patch b/pkgs/unit/me/meterbridge/buf_rect.patch similarity index 100% rename from pkgs/applications/audio/meterbridge/buf_rect.patch rename to pkgs/unit/me/meterbridge/buf_rect.patch diff --git a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/pkgs/unit/me/meterbridge/fix_build_with_gcc-5.patch similarity index 100% rename from pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch rename to pkgs/unit/me/meterbridge/fix_build_with_gcc-5.patch diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/unit/me/meterbridge/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/meterbridge/default.nix rename to pkgs/unit/me/meterbridge/pkg-fun.nix diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/unit/me/metersLv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/meters_lv2/default.nix rename to pkgs/unit/me/metersLv2/pkg-fun.nix diff --git a/pkgs/games/methane/default.nix b/pkgs/unit/me/methane/pkg-fun.nix similarity index 100% rename from pkgs/games/methane/default.nix rename to pkgs/unit/me/methane/pkg-fun.nix diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/unit/me/metis-prover/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/metis-prover/default.nix rename to pkgs/unit/me/metis-prover/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/unit/me/metis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/metis/default.nix rename to pkgs/unit/me/metis/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/pkgs/unit/mf/mfc9140cdncupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix rename to pkgs/unit/mf/mfc9140cdncupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/pkgs/unit/mf/mfc9140cdnlpr/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix rename to pkgs/unit/mf/mfc9140cdnlpr/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/unit/mf/mfcj470dw-cupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix rename to pkgs/unit/mf/mfcj470dw-cupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/unit/mf/mfcj6510dw-cupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix rename to pkgs/unit/mf/mfcj6510dw-cupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/unit/mf/mfcl2700dncupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix rename to pkgs/unit/mf/mfcl2700dncupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/unit/mf/mfcl2720dwcupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix rename to pkgs/unit/mf/mfcl2720dwcupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/unit/mf/mfcl2720dwlpr/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix rename to pkgs/unit/mf/mfcl2720dwlpr/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/unit/mf/mfcl2740dwcupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix rename to pkgs/unit/mf/mfcl2740dwcupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/unit/mf/mfcl2740dwlpr/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix rename to pkgs/unit/mf/mfcl2740dwlpr/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/unit/mf/mfcl8690cdwcupswrapper/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix rename to pkgs/unit/mf/mfcl8690cdwcupswrapper/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/unit/mf/mfcl8690cdwlpr/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix rename to pkgs/unit/mf/mfcl8690cdwlpr/pkg-fun.nix diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/unit/mf/mfcuk/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mfcuk/default.nix rename to pkgs/unit/mf/mfcuk/pkg-fun.nix diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/unit/mf/mfoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mfoc/default.nix rename to pkgs/unit/mf/mfoc/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/unit/mf/mftrace/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/mftrace/default.nix rename to pkgs/unit/mf/mftrace/pkg-fun.nix diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/unit/mg/mg/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/mg/default.nix rename to pkgs/unit/mg/mg/pkg-fun.nix diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/unit/mg/mgba/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/mgba/default.nix rename to pkgs/unit/mg/mgba/pkg-fun.nix diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/unit/mg/mgmt/pkg-fun.nix similarity index 100% rename from pkgs/applications/system/mgmt/default.nix rename to pkgs/unit/mg/mgmt/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/pkgs/unit/mh/mhddfs/fix-format-security-error.patch similarity index 100% rename from pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch rename to pkgs/unit/mh/mhddfs/fix-format-security-error.patch diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/unit/mh/mhddfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mhddfs/default.nix rename to pkgs/unit/mh/mhddfs/pkg-fun.nix diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/unit/mi/mi2ly/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mi2ly/default.nix rename to pkgs/unit/mi/mi2ly/pkg-fun.nix diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/unit/mi/micro-httpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/micro-httpd/default.nix rename to pkgs/unit/mi/micro-httpd/pkg-fun.nix diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/unit/mi/micro/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/micro/default.nix rename to pkgs/unit/mi/micro/pkg-fun.nix diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/unit/mi/micro/test-with-expect.nix similarity index 100% rename from pkgs/applications/editors/micro/test-with-expect.nix rename to pkgs/unit/mi/micro/test-with-expect.nix diff --git a/pkgs/servers/microbin/default.nix b/pkgs/unit/mi/microbin/pkg-fun.nix similarity index 100% rename from pkgs/servers/microbin/default.nix rename to pkgs/unit/mi/microbin/pkg-fun.nix diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/unit/mi/microcodeAmd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/microcode/amd.nix rename to pkgs/unit/mi/microcodeAmd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/unit/mi/microcodeIntel/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/microcode/intel.nix rename to pkgs/unit/mi/microcodeIntel/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/microcom/default.nix b/pkgs/unit/mi/microcom/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/microcom/default.nix rename to pkgs/unit/mi/microcom/pkg-fun.nix diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/unit/mi/microdnf/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/microdnf/default.nix rename to pkgs/unit/mi/microdnf/pkg-fun.nix diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/unit/mi/micromamba/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/micromamba/default.nix rename to pkgs/unit/mi/micromamba/pkg-fun.nix diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/unit/mi/micronaut/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/micronaut/default.nix rename to pkgs/unit/mi/micronaut/pkg-fun.nix diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/unit/mi/micronucleus/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/micronucleus/default.nix rename to pkgs/unit/mi/micronucleus/pkg-fun.nix diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/unit/mi/microplane/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/microplane/default.nix rename to pkgs/unit/mi/microplane/pkg-fun.nix diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/unit/mi/micropython/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/micropython/default.nix rename to pkgs/unit/mi/micropython/pkg-fun.nix diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/unit/mi/microscheme/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/microscheme/default.nix rename to pkgs/unit/mi/microscheme/pkg-fun.nix diff --git a/pkgs/servers/microserver/default.nix b/pkgs/unit/mi/microserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/microserver/default.nix rename to pkgs/unit/mi/microserver/pkg-fun.nix diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/unit/mi/microsoft_gsl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/microsoft_gsl/default.nix rename to pkgs/unit/mi/microsoft_gsl/pkg-fun.nix diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/unit/mi/mictray/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mictray/default.nix rename to pkgs/unit/mi/mictray/pkg-fun.nix diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/unit/mi/mid2key/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mid2key/default.nix rename to pkgs/unit/mi/mid2key/pkg-fun.nix diff --git a/pkgs/applications/audio/midi-trigger/default.nix b/pkgs/unit/mi/midi-trigger/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/midi-trigger/default.nix rename to pkgs/unit/mi/midi-trigger/pkg-fun.nix diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/unit/mi/midicsv/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/midicsv/default.nix rename to pkgs/unit/mi/midicsv/pkg-fun.nix diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/unit/mi/midimonster/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/midimonster/default.nix rename to pkgs/unit/mi/midimonster/pkg-fun.nix diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/unit/mi/midisheetmusic/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/midisheetmusic/default.nix rename to pkgs/unit/mi/midisheetmusic/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/unit/mi/midori-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/midori/default.nix rename to pkgs/unit/mi/midori-unwrapped/pkg-fun.nix diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/unit/mi/migmix/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/migmix/default.nix rename to pkgs/unit/mi/migmix/pkg-fun.nix diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/unit/mi/migrate/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/migrate/default.nix rename to pkgs/unit/mi/migrate/pkg-fun.nix diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/unit/mi/migu/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/migu/default.nix rename to pkgs/unit/mi/migu/pkg-fun.nix diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/unit/mi/mikmod/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mikmod/default.nix rename to pkgs/unit/mi/mikmod/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile b/pkgs/unit/mi/mikutter/deps/Gemfile similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile rename to pkgs/unit/mi/mikutter/deps/Gemfile diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock b/pkgs/unit/mi/mikutter/deps/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock rename to pkgs/unit/mi/mikutter/deps/Gemfile.lock diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix b/pkgs/unit/mi/mikutter/deps/gemset.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix rename to pkgs/unit/mi/mikutter/deps/gemset.nix diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile b/pkgs/unit/mi/mikutter/deps/plugin/gtk/Gemfile similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile rename to pkgs/unit/mi/mikutter/deps/plugin/gtk/Gemfile diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile b/pkgs/unit/mi/mikutter/deps/plugin/image_file_cache/Gemfile similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile rename to pkgs/unit/mi/mikutter/deps/plugin/image_file_cache/Gemfile diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile b/pkgs/unit/mi/mikutter/deps/plugin/photo_support/Gemfile similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile rename to pkgs/unit/mi/mikutter/deps/plugin/photo_support/Gemfile diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile b/pkgs/unit/mi/mikutter/deps/plugin/uitranslator/Gemfile similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile rename to pkgs/unit/mi/mikutter/deps/plugin/uitranslator/Gemfile diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/unit/mi/mikutter/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/default.nix rename to pkgs/unit/mi/mikutter/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb b/pkgs/unit/mi/mikutter/test_plugin.rb similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb rename to pkgs/unit/mi/mikutter/test_plugin.rb diff --git a/pkgs/applications/networking/instant-messengers/mikutter/update.sh b/pkgs/unit/mi/mikutter/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/mikutter/update.sh rename to pkgs/unit/mi/mikutter/update.sh diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/unit/mi/milkytracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/milkytracker/default.nix rename to pkgs/unit/mi/milkytracker/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/unit/mi/mill/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/mill/default.nix rename to pkgs/unit/mi/mill/pkg-fun.nix diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/unit/mi/miller/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/miller/default.nix rename to pkgs/unit/mi/miller/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/unit/mi/millet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/millet/default.nix rename to pkgs/unit/mi/millet/pkg-fun.nix diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/unit/mi/milu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/milu/default.nix rename to pkgs/unit/mi/milu/pkg-fun.nix diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/unit/mi/mimalloc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mimalloc/default.nix rename to pkgs/unit/mi/mimalloc/pkg-fun.nix diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/unit/mi/mimeo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mimeo/default.nix rename to pkgs/unit/mi/mimeo/pkg-fun.nix diff --git a/pkgs/development/libraries/mimetic/narrowing.patch b/pkgs/unit/mi/mimetic/narrowing.patch similarity index 100% rename from pkgs/development/libraries/mimetic/narrowing.patch rename to pkgs/unit/mi/mimetic/narrowing.patch diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/unit/mi/mimetic/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mimetic/default.nix rename to pkgs/unit/mi/mimetic/pkg-fun.nix diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/unit/mi/mimic/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mimic/default.nix rename to pkgs/unit/mi/mimic/pkg-fun.nix diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/unit/mi/mimir/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/mimir/default.nix rename to pkgs/unit/mi/mimir/pkg-fun.nix diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/unit/mi/minc_widgets/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/minc-widgets/default.nix rename to pkgs/unit/mi/minc_widgets/pkg-fun.nix diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/unit/mi/minder/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/minder/default.nix rename to pkgs/unit/mi/minder/pkg-fun.nix diff --git a/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix b/pkgs/unit/mi/minecraft-server-hibernation/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix rename to pkgs/unit/mi/minecraft-server-hibernation/pkg-fun.nix diff --git a/pkgs/games/minecraft/default.nix b/pkgs/unit/mi/minecraft/pkg-fun.nix similarity index 100% rename from pkgs/games/minecraft/default.nix rename to pkgs/unit/mi/minecraft/pkg-fun.nix diff --git a/pkgs/games/minecraft/update.sh b/pkgs/unit/mi/minecraft/update.sh similarity index 100% rename from pkgs/games/minecraft/update.sh rename to pkgs/unit/mi/minecraft/update.sh diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/unit/mi/mingetty/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mingetty/default.nix rename to pkgs/unit/mi/mingetty/pkg-fun.nix diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/unit/mi/miniHttpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/mini-httpd/default.nix rename to pkgs/unit/mi/miniHttpd/pkg-fun.nix diff --git a/pkgs/applications/science/biology/minia/no-bundle.patch b/pkgs/unit/mi/minia/no-bundle.patch similarity index 100% rename from pkgs/applications/science/biology/minia/no-bundle.patch rename to pkgs/unit/mi/minia/no-bundle.patch diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/unit/mi/minia/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/minia/default.nix rename to pkgs/unit/mi/minia/pkg-fun.nix diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/unit/mi/miniaudio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/miniaudio/default.nix rename to pkgs/unit/mi/miniaudio/pkg-fun.nix diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/unit/mi/miniball/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/miniball/default.nix rename to pkgs/unit/mi/miniball/pkg-fun.nix diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/unit/mi/minica/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/minica/default.nix rename to pkgs/unit/mi/minica/pkg-fun.nix diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/unit/mi/minicom/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/minicom/default.nix rename to pkgs/unit/mi/minicom/pkg-fun.nix diff --git a/pkgs/tools/misc/minicom/xminicom_terminal_paths.patch b/pkgs/unit/mi/minicom/xminicom_terminal_paths.patch similarity index 100% rename from pkgs/tools/misc/minicom/xminicom_terminal_paths.patch rename to pkgs/unit/mi/minicom/xminicom_terminal_paths.patch diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/unit/mi/minidjvu/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/minidjvu/default.nix rename to pkgs/unit/mi/minidjvu/pkg-fun.nix diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/unit/mi/minidlna/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/minidlna/default.nix rename to pkgs/unit/mi/minidlna/pkg-fun.nix diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/unit/mi/miniflux/pkg-fun.nix similarity index 100% rename from pkgs/servers/miniflux/default.nix rename to pkgs/unit/mi/miniflux/pkg-fun.nix diff --git a/pkgs/development/web/minify/default.nix b/pkgs/unit/mi/minify/pkg-fun.nix similarity index 100% rename from pkgs/development/web/minify/default.nix rename to pkgs/unit/mi/minify/pkg-fun.nix diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/unit/mi/minigalaxy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/minigalaxy/default.nix rename to pkgs/unit/mi/minigalaxy/pkg-fun.nix diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/unit/mi/minijail/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/minijail/default.nix rename to pkgs/unit/mi/minijail/pkg-fun.nix diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/unit/mi/minilibx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/minilibx/default.nix rename to pkgs/unit/mi/minilibx/pkg-fun.nix diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/unit/mi/minimap2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/minimap2/default.nix rename to pkgs/unit/mi/minimap2/pkg-fun.nix diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/unit/mi/minimodem/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/minimodem/default.nix rename to pkgs/unit/mi/minimodem/pkg-fun.nix diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/unit/mi/mininet/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/mininet/default.nix rename to pkgs/unit/mi/mininet/pkg-fun.nix diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/unit/mi/minio-certgen/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/minio-certgen/default.nix rename to pkgs/unit/mi/minio-certgen/pkg-fun.nix diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/unit/mi/minio-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/minio-client/default.nix rename to pkgs/unit/mi/minio-client/pkg-fun.nix diff --git a/pkgs/servers/minio/default.nix b/pkgs/unit/mi/minio/pkg-fun.nix similarity index 100% rename from pkgs/servers/minio/default.nix rename to pkgs/unit/mi/minio/pkg-fun.nix diff --git a/pkgs/servers/minio/legacy_fs.nix b/pkgs/unit/mi/minio_legacy_fs/pkg-fun.nix similarity index 100% rename from pkgs/servers/minio/legacy_fs.nix rename to pkgs/unit/mi/minio_legacy_fs/pkg-fun.nix diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/unit/mi/miniplayer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/miniplayer/default.nix rename to pkgs/unit/mi/miniplayer/pkg-fun.nix diff --git a/pkgs/tools/misc/minipro/default.nix b/pkgs/unit/mi/minipro/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/minipro/default.nix rename to pkgs/unit/mi/minipro/pkg-fun.nix diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/unit/mi/minisat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/minisat/default.nix rename to pkgs/unit/mi/minisat/pkg-fun.nix diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/unit/mi/miniscript/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/miniscript/default.nix rename to pkgs/unit/mi/miniscript/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/unit/mi/minishift/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/minishift/default.nix rename to pkgs/unit/mi/minishift/pkg-fun.nix diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/unit/mi/minisign/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/minisign/default.nix rename to pkgs/unit/mi/minisign/pkg-fun.nix diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/unit/mi/minissdpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/minissdpd/default.nix rename to pkgs/unit/mi/minissdpd/pkg-fun.nix diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/unit/mi/ministat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ministat/default.nix rename to pkgs/unit/mi/ministat/pkg-fun.nix diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/unit/mi/miniupnpc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/miniupnpc/default.nix rename to pkgs/unit/mi/miniupnpc/pkg-fun.nix diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/unit/mi/miniupnpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/miniupnpd/default.nix rename to pkgs/unit/mi/miniupnpd/pkg-fun.nix diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/unit/mi/minixml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/minixml/default.nix rename to pkgs/unit/mi/minixml/pkg-fun.nix diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/unit/mi/miniz/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/miniz/default.nix rename to pkgs/unit/mi/miniz/pkg-fun.nix diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/unit/mi/minizinc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/minizinc/default.nix rename to pkgs/unit/mi/minizinc/pkg-fun.nix diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/unit/mi/minizip-ng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/minizip-ng/default.nix rename to pkgs/unit/mi/minizip-ng/pkg-fun.nix diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/unit/mi/minizip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/minizip/default.nix rename to pkgs/unit/mi/minizip/pkg-fun.nix diff --git a/pkgs/servers/mir/default.nix b/pkgs/unit/mi/mir/pkg-fun.nix similarity index 100% rename from pkgs/servers/mir/default.nix rename to pkgs/unit/mi/mir/pkg-fun.nix diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/unit/mi/miraclecast/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/miraclecast/default.nix rename to pkgs/unit/mi/miraclecast/pkg-fun.nix diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/unit/mi/miranda/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/miranda/default.nix rename to pkgs/unit/mi/miranda/pkg-fun.nix diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/unit/mi/miredo/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/miredo/default.nix rename to pkgs/unit/mi/miredo/pkg-fun.nix diff --git a/pkgs/servers/mirrorbits/deps.nix b/pkgs/unit/mi/mirrorbits/deps.nix similarity index 100% rename from pkgs/servers/mirrorbits/deps.nix rename to pkgs/unit/mi/mirrorbits/deps.nix diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/unit/mi/mirrorbits/pkg-fun.nix similarity index 100% rename from pkgs/servers/mirrorbits/default.nix rename to pkgs/unit/mi/mirrorbits/pkg-fun.nix diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/unit/mi/miscfiles/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/miscfiles/default.nix rename to pkgs/unit/mi/miscfiles/pkg-fun.nix diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/unit/mi/mission-planner/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/robotics/mission-planner/default.nix rename to pkgs/unit/mi/mission-planner/pkg-fun.nix diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/unit/mi/mitama-cpp-result/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mitama-cpp-result/default.nix rename to pkgs/unit/mi/mitama-cpp-result/pkg-fun.nix diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/unit/mi/mitmproxy2swagger/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mitmproxy2swagger/default.nix rename to pkgs/unit/mi/mitmproxy2swagger/pkg-fun.nix diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/unit/mi/mix2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mix2nix/default.nix rename to pkgs/unit/mi/mix2nix/pkg-fun.nix diff --git a/pkgs/servers/mjolnir/node-composition.nix b/pkgs/unit/mj/mjolnir/node-composition.nix similarity index 100% rename from pkgs/servers/mjolnir/node-composition.nix rename to pkgs/unit/mj/mjolnir/node-composition.nix diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/unit/mj/mjolnir/node-deps.nix similarity index 100% rename from pkgs/servers/mjolnir/node-deps.nix rename to pkgs/unit/mj/mjolnir/node-deps.nix diff --git a/pkgs/servers/mjolnir/node-env.nix b/pkgs/unit/mj/mjolnir/node-env.nix similarity index 100% rename from pkgs/servers/mjolnir/node-env.nix rename to pkgs/unit/mj/mjolnir/node-env.nix diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/unit/mj/mjolnir/pkg-fun.nix similarity index 100% rename from pkgs/servers/mjolnir/default.nix rename to pkgs/unit/mj/mjolnir/pkg-fun.nix diff --git a/pkgs/servers/mjolnir/update.sh b/pkgs/unit/mj/mjolnir/update.sh similarity index 100% rename from pkgs/servers/mjolnir/update.sh rename to pkgs/unit/mj/mjolnir/update.sh diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/unit/mj/mjpegtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/mjpegtools/default.nix rename to pkgs/unit/mj/mjpegtools/pkg-fun.nix diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/unit/mj/mjpg-streamer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/mjpg-streamer/default.nix rename to pkgs/unit/mj/mjpg-streamer/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/unit/mk/mkNugetDeps/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/make-nuget-deps/default.nix rename to pkgs/unit/mk/mkNugetDeps/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/unit/mk/mkNugetSource/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/make-nuget-source/default.nix rename to pkgs/unit/mk/mkNugetSource/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/unit/mk/mkSaneConfig/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/config.nix rename to pkgs/unit/mk/mkSaneConfig/pkg-fun.nix diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/unit/mk/mkShell/pkg-fun.nix similarity index 100% rename from pkgs/build-support/mkshell/default.nix rename to pkgs/unit/mk/mkShell/pkg-fun.nix diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/unit/mk/mkcert/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/mkcert/default.nix rename to pkgs/unit/mk/mkcert/pkg-fun.nix diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/unit/mk/mkcl/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mkcl/default.nix rename to pkgs/unit/mk/mkcl/pkg-fun.nix diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/unit/mk/mkclean/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/mkclean/default.nix rename to pkgs/unit/mk/mkclean/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/unit/mk/mkinitcpio-nfs-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix rename to pkgs/unit/mk/mkinitcpio-nfs-utils/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/unit/mk/mkl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/mkl/default.nix rename to pkgs/unit/mk/mkl/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/unit/mk/mkl/test/default.nix similarity index 100% rename from pkgs/development/libraries/science/math/mkl/test/default.nix rename to pkgs/unit/mk/mkl/test/default.nix diff --git a/pkgs/development/libraries/science/math/mkl/test/test.c b/pkgs/unit/mk/mkl/test/test.c similarity index 100% rename from pkgs/development/libraries/science/math/mkl/test/test.c rename to pkgs/unit/mk/mkl/test/test.c diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/unit/mk/mkp224o/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mkp224o/default.nix rename to pkgs/unit/mk/mkp224o/pkg-fun.nix diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/unit/mk/mkrand/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mkrand/default.nix rename to pkgs/unit/mk/mkrand/pkg-fun.nix diff --git a/pkgs/shells/mksh/default.nix b/pkgs/unit/mk/mksh/pkg-fun.nix similarity index 100% rename from pkgs/shells/mksh/default.nix rename to pkgs/unit/mk/mksh/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/unit/mk/mkspiffs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mkspiffs/default.nix rename to pkgs/unit/mk/mkspiffs/pkg-fun.nix diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/unit/mk/mktemp/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mktemp/default.nix rename to pkgs/unit/mk/mktemp/pkg-fun.nix diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/unit/mk/mktorrent/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mktorrent/default.nix rename to pkgs/unit/mk/mktorrent/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/unit/ml/mlarchive2maildir/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix rename to pkgs/unit/ml/mlarchive2maildir/pkg-fun.nix diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/unit/ml/mlc/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/mlc/default.nix rename to pkgs/unit/ml/mlc/pkg-fun.nix diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/unit/ml/mle/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/mle/default.nix rename to pkgs/unit/ml/mle/pkg-fun.nix diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/unit/ml/mlflow-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/mlflow-server/default.nix rename to pkgs/unit/ml/mlflow-server/pkg-fun.nix diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/unit/ml/mlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mlib/default.nix rename to pkgs/unit/ml/mlib/pkg-fun.nix diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/unit/ml/mlkit/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mlkit/default.nix rename to pkgs/unit/ml/mlkit/pkg-fun.nix diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/unit/ml/mlmmj/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/mlmmj/default.nix rename to pkgs/unit/ml/mlmmj/pkg-fun.nix diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/unit/ml/mloader/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mloader/default.nix rename to pkgs/unit/ml/mloader/pkg-fun.nix diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/unit/ml/mlocate/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mlocate/default.nix rename to pkgs/unit/ml/mlocate/pkg-fun.nix diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/unit/ml/mlt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mlt/default.nix rename to pkgs/unit/ml/mlt/pkg-fun.nix diff --git a/pkgs/applications/window-managers/mlvwm/default.nix b/pkgs/unit/ml/mlvwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/mlvwm/default.nix rename to pkgs/unit/ml/mlvwm/pkg-fun.nix diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/unit/mm/MMA/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/MMA/default.nix rename to pkgs/unit/mm/MMA/pkg-fun.nix diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/unit/mm/mm-common/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mm-common/default.nix rename to pkgs/unit/mm/mm-common/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/unit/mm/mm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/mm/default.nix rename to pkgs/unit/mm/mm/pkg-fun.nix diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/unit/mm/mmake/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mmake/default.nix rename to pkgs/unit/mm/mmake/pkg-fun.nix diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/unit/mm/mmark/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/mmark/default.nix rename to pkgs/unit/mm/mmark/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/unit/mm/mmc-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mmc-utils/default.nix rename to pkgs/unit/mm/mmc-utils/pkg-fun.nix diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/unit/mm/mmctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mmctl/default.nix rename to pkgs/unit/mm/mmctl/pkg-fun.nix diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/unit/mm/mmdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mmdoc/default.nix rename to pkgs/unit/mm/mmdoc/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/unit/mm/mmh/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mmh/default.nix rename to pkgs/unit/mm/mmh/pkg-fun.nix diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/unit/mm/mmixware/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mmixware/default.nix rename to pkgs/unit/mm/mmixware/pkg-fun.nix diff --git a/pkgs/tools/networking/mmsd-tng/default.nix b/pkgs/unit/mm/mmsd-tng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mmsd-tng/default.nix rename to pkgs/unit/mm/mmsd-tng/pkg-fun.nix diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/unit/mm/mmsd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mmsd/default.nix rename to pkgs/unit/mm/mmsd/pkg-fun.nix diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/unit/mm/mmtc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mmtc/default.nix rename to pkgs/unit/mm/mmtc/pkg-fun.nix diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/unit/mm/mmtf-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix rename to pkgs/unit/mm/mmtf-cpp/pkg-fun.nix diff --git a/pkgs/tools/X11/mmutils/default.nix b/pkgs/unit/mm/mmutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/mmutils/default.nix rename to pkgs/unit/mm/mmutils/pkg-fun.nix diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/unit/mm/mmv-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mmv-go/default.nix rename to pkgs/unit/mm/mmv-go/pkg-fun.nix diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/unit/mm/mmv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mmv/default.nix rename to pkgs/unit/mm/mmv/pkg-fun.nix diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/unit/mn/mnamer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mnamer/default.nix rename to pkgs/unit/mn/mnamer/pkg-fun.nix diff --git a/pkgs/applications/misc/mnamer/remove_requirements.patch b/pkgs/unit/mn/mnamer/remove_requirements.patch similarity index 100% rename from pkgs/applications/misc/mnamer/remove_requirements.patch rename to pkgs/unit/mn/mnamer/remove_requirements.patch diff --git a/pkgs/applications/misc/mnamer/update_hack.patch b/pkgs/unit/mn/mnamer/update_hack.patch similarity index 100% rename from pkgs/applications/misc/mnamer/update_hack.patch rename to pkgs/unit/mn/mnamer/update_hack.patch diff --git a/pkgs/tools/misc/mnc/default.nix b/pkgs/unit/mn/mnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mnc/default.nix rename to pkgs/unit/mn/mnc/pkg-fun.nix diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/unit/mn/mnemonicode/pkg-fun.nix similarity index 100% rename from pkgs/misc/mnemonicode/default.nix rename to pkgs/unit/mn/mnemonicode/pkg-fun.nix diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/unit/mn/mni_autoreg/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/mni_autoreg/default.nix rename to pkgs/unit/mn/mni_autoreg/pkg-fun.nix diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/unit/mn/mnist/pkg-fun.nix similarity index 100% rename from pkgs/data/machine-learning/mnist/default.nix rename to pkgs/unit/mn/mnist/pkg-fun.nix diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/unit/mn/mno16/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/mno16/default.nix rename to pkgs/unit/mn/mno16/pkg-fun.nix diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/unit/mo/moar/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/moar/default.nix rename to pkgs/unit/mo/moar/pkg-fun.nix diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/unit/mo/mob/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mob/default.nix rename to pkgs/unit/mo/mob/pkg-fun.nix diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/unit/mo/mobile-broadband-provider-info/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/mobile-broadband-provider-info/default.nix rename to pkgs/unit/mo/mobile-broadband-provider-info/pkg-fun.nix diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/unit/mo/mobilecoin-wallet/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mobilecoin-wallet/default.nix rename to pkgs/unit/mo/mobilecoin-wallet/pkg-fun.nix diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/unit/mo/mockgen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mockgen/default.nix rename to pkgs/unit/mo/mockgen/pkg-fun.nix diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/unit/mo/mockobjects/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/mockobjects/default.nix rename to pkgs/unit/mo/mockobjects/pkg-fun.nix diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/unit/mo/mod-arpeggiator-lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mod-arpeggiator-lv2/default.nix rename to pkgs/unit/mo/mod-arpeggiator-lv2/pkg-fun.nix diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/unit/mo/mod-distortion/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mod-distortion/default.nix rename to pkgs/unit/mo/mod-distortion/pkg-fun.nix diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/unit/mo/mod/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mod/default.nix rename to pkgs/unit/mo/mod/pkg-fun.nix diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/unit/mo/modd/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/modd/default.nix rename to pkgs/unit/mo/modd/pkg-fun.nix diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/unit/mo/modem-manager-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/modem-manager-gui/default.nix rename to pkgs/unit/mo/modem-manager-gui/pkg-fun.nix diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/unit/mo/modemmanager/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/modemmanager/default.nix rename to pkgs/unit/mo/modemmanager/pkg-fun.nix diff --git a/pkgs/tools/security/modsecurity-crs/default.nix b/pkgs/unit/mo/modsecurity-crs/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/modsecurity-crs/default.nix rename to pkgs/unit/mo/modsecurity-crs/pkg-fun.nix diff --git a/pkgs/tools/security/modsecurity/Makefile.am.patch b/pkgs/unit/mo/modsecurity_standalone/Makefile.am.patch similarity index 100% rename from pkgs/tools/security/modsecurity/Makefile.am.patch rename to pkgs/unit/mo/modsecurity_standalone/Makefile.am.patch diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/unit/mo/modsecurity_standalone/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/modsecurity/default.nix rename to pkgs/unit/mo/modsecurity_standalone/pkg-fun.nix diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/unit/mo/moe/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/moe/default.nix rename to pkgs/unit/mo/moe/pkg-fun.nix diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/unit/mo/moka-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/moka-icon-theme/default.nix rename to pkgs/unit/mo/moka-icon-theme/pkg-fun.nix diff --git a/pkgs/tools/security/mokutil/default.nix b/pkgs/unit/mo/mokutil/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mokutil/default.nix rename to pkgs/unit/mo/mokutil/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/unit/mo/molden/dont_register_file_types.patch similarity index 100% rename from pkgs/applications/science/chemistry/molden/dont_register_file_types.patch rename to pkgs/unit/mo/molden/dont_register_file_types.patch diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/unit/mo/molden/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/molden/default.nix rename to pkgs/unit/mo/molden/pkg-fun.nix diff --git a/pkgs/tools/networking/mole/default.nix b/pkgs/unit/mo/mole/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mole/default.nix rename to pkgs/unit/mo/mole/pkg-fun.nix diff --git a/pkgs/servers/gemini/molly-brown/deps.nix b/pkgs/unit/mo/molly-brown/deps.nix similarity index 100% rename from pkgs/servers/gemini/molly-brown/deps.nix rename to pkgs/unit/mo/molly-brown/deps.nix diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/unit/mo/molly-brown/pkg-fun.nix similarity index 100% rename from pkgs/servers/gemini/molly-brown/default.nix rename to pkgs/unit/mo/molly-brown/pkg-fun.nix diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/unit/mo/molly-guard/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/molly-guard/default.nix rename to pkgs/unit/mo/molly-guard/pkg-fun.nix diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/unit/mo/molot-lite/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/molot-lite/default.nix rename to pkgs/unit/mo/molot-lite/pkg-fun.nix diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/unit/mo/molotov/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/molotov/default.nix rename to pkgs/unit/mo/molotov/pkg-fun.nix diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/unit/mo/moltengamepad/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/moltengamepad/default.nix rename to pkgs/unit/mo/moltengamepad/pkg-fun.nix diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/unit/mo/mona-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/mona-sans/default.nix rename to pkgs/unit/mo/mona-sans/pkg-fun.nix diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/unit/mo/monetdb/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/monetdb/default.nix rename to pkgs/unit/mo/monetdb/pkg-fun.nix diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/unit/mo/moneyplex/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/moneyplex/default.nix rename to pkgs/unit/mo/moneyplex/pkg-fun.nix diff --git a/pkgs/tools/security/mongoaudit/default.nix b/pkgs/unit/mo/mongoaudit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mongoaudit/default.nix rename to pkgs/unit/mo/mongoaudit/pkg-fun.nix diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/unit/mo/mongoc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mongoc/default.nix rename to pkgs/unit/mo/mongoc/pkg-fun.nix diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/unit/mo/mongodb-compass/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mongodb-compass/default.nix rename to pkgs/unit/mo/mongodb-compass/pkg-fun.nix diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/unit/mo/mongodb-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mongodb-tools/default.nix rename to pkgs/unit/mo/mongodb-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/unit/mo/mongoose/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/mongoose/default.nix rename to pkgs/unit/mo/mongoose/pkg-fun.nix diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/unit/mo/monit/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/monit/default.nix rename to pkgs/unit/mo/monit/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/unit/mo/monitoring-plugins/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/plugins/default.nix rename to pkgs/unit/mo/monitoring-plugins/pkg-fun.nix diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/unit/mo/monkeysAudio/buildfix.diff similarity index 100% rename from pkgs/applications/audio/monkeys-audio/buildfix.diff rename to pkgs/unit/mo/monkeysAudio/buildfix.diff diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/unit/mo/monkeysAudio/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/monkeys-audio/default.nix rename to pkgs/unit/mo/monkeysAudio/pkg-fun.nix diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/unit/mo/monkeysphere/monkeysphere.patch similarity index 100% rename from pkgs/tools/security/monkeysphere/monkeysphere.patch rename to pkgs/unit/mo/monkeysphere/monkeysphere.patch diff --git a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/pkgs/unit/mo/monkeysphere/openssh-nixos-sandbox.patch similarity index 100% rename from pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch rename to pkgs/unit/mo/monkeysphere/openssh-nixos-sandbox.patch diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/unit/mo/monkeysphere/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/monkeysphere/default.nix rename to pkgs/unit/mo/monkeysphere/pkg-fun.nix diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/unit/mo/mono-addins/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mono-addins/default.nix rename to pkgs/unit/mo/mono-addins/pkg-fun.nix diff --git a/pkgs/build-support/mono-dll-fixer/dll-fixer.pl b/pkgs/unit/mo/monoDLLFixer/dll-fixer.pl similarity index 100% rename from pkgs/build-support/mono-dll-fixer/dll-fixer.pl rename to pkgs/unit/mo/monoDLLFixer/dll-fixer.pl diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/unit/mo/monoDLLFixer/pkg-fun.nix similarity index 100% rename from pkgs/build-support/mono-dll-fixer/default.nix rename to pkgs/unit/mo/monoDLLFixer/pkg-fun.nix diff --git a/pkgs/data/fonts/monocraft/default.nix b/pkgs/unit/mo/monocraft/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/monocraft/default.nix rename to pkgs/unit/mo/monocraft/pkg-fun.nix diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/unit/mo/monocypher/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/monocypher/default.nix rename to pkgs/unit/mo/monocypher/pkg-fun.nix diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/unit/mo/monoid/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/monoid/default.nix rename to pkgs/unit/mo/monoid/pkg-fun.nix diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/unit/mo/mononoki/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/mononoki/default.nix rename to pkgs/unit/mo/mononoki/pkg-fun.nix diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/unit/mo/monosat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/monosat/default.nix rename to pkgs/unit/mo/monosat/pkg-fun.nix diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/unit/mo/mons/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mons/default.nix rename to pkgs/unit/mo/mons/pkg-fun.nix diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/unit/mo/monsoon/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/monsoon/default.nix rename to pkgs/unit/mo/monsoon/pkg-fun.nix diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/unit/mo/montserrat/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/montserrat/default.nix rename to pkgs/unit/mo/montserrat/pkg-fun.nix diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/unit/mo/mooSpace/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mooSpace/default.nix rename to pkgs/unit/mo/mooSpace/pkg-fun.nix diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/unit/mo/moodle-dl/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/moodle-dl/default.nix rename to pkgs/unit/mo/moodle-dl/pkg-fun.nix diff --git a/pkgs/servers/web-apps/moodle/moodle-utils.nix b/pkgs/unit/mo/moodle-utils/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/moodle/moodle-utils.nix rename to pkgs/unit/mo/moodle-utils/pkg-fun.nix diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/unit/mo/moodle/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/moodle/default.nix rename to pkgs/unit/mo/moodle/pkg-fun.nix diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/unit/mo/moon-buggy/pkg-fun.nix similarity index 100% rename from pkgs/games/moon-buggy/default.nix rename to pkgs/unit/mo/moon-buggy/pkg-fun.nix diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/unit/mo/moonlight-embedded/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/moonlight-embedded/default.nix rename to pkgs/unit/mo/moonlight-embedded/pkg-fun.nix diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/unit/mo/moonraker/pkg-fun.nix similarity index 100% rename from pkgs/servers/moonraker/default.nix rename to pkgs/unit/mo/moonraker/pkg-fun.nix diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/unit/mo/moosefs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/moosefs/default.nix rename to pkgs/unit/mo/moosefs/pkg-fun.nix diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/unit/mo/mop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mop/default.nix rename to pkgs/unit/mo/mop/pkg-fun.nix diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/unit/mo/moq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/moq/default.nix rename to pkgs/unit/mo/moq/pkg-fun.nix diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/unit/mo/morph/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/morph/default.nix rename to pkgs/unit/mo/morph/pkg-fun.nix diff --git a/pkgs/tools/text/morsel/default.nix b/pkgs/unit/mo/morsel/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/morsel/default.nix rename to pkgs/unit/mo/morsel/pkg-fun.nix diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/unit/mo/morty/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/morty/default.nix rename to pkgs/unit/mo/morty/pkg-fun.nix diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/unit/mo/mosdepth/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/mosdepth/default.nix rename to pkgs/unit/mo/mosdepth/pkg-fun.nix diff --git a/pkgs/tools/misc/moserial/default.nix b/pkgs/unit/mo/moserial/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/moserial/default.nix rename to pkgs/unit/mo/moserial/pkg-fun.nix diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/unit/mo/mosh/bash_completion_datadir.patch similarity index 100% rename from pkgs/tools/networking/mosh/bash_completion_datadir.patch rename to pkgs/unit/mo/mosh/bash_completion_datadir.patch diff --git a/pkgs/tools/networking/mosh/mosh-client_path.patch b/pkgs/unit/mo/mosh/mosh-client_path.patch similarity index 100% rename from pkgs/tools/networking/mosh/mosh-client_path.patch rename to pkgs/unit/mo/mosh/mosh-client_path.patch diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/unit/mo/mosh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mosh/default.nix rename to pkgs/unit/mo/mosh/pkg-fun.nix diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/pkgs/unit/mo/mosh/ssh_path.patch similarity index 100% rename from pkgs/tools/networking/mosh/ssh_path.patch rename to pkgs/unit/mo/mosh/ssh_path.patch diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/unit/mo/mosml/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mosml/default.nix rename to pkgs/unit/mo/mosml/pkg-fun.nix diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/unit/mo/mosquitto/pkg-fun.nix similarity index 100% rename from pkgs/servers/mqtt/mosquitto/default.nix rename to pkgs/unit/mo/mosquitto/pkg-fun.nix diff --git a/pkgs/tools/misc/most/parallel-make.patch b/pkgs/unit/mo/most/parallel-make.patch similarity index 100% rename from pkgs/tools/misc/most/parallel-make.patch rename to pkgs/unit/mo/most/parallel-make.patch diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/unit/mo/most/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/most/default.nix rename to pkgs/unit/mo/most/pkg-fun.nix diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/pkgs/unit/mo/motif/Add-X.Org-to-bindings-file.patch similarity index 100% rename from pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch rename to pkgs/unit/mo/motif/Add-X.Org-to-bindings-file.patch diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/pkgs/unit/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch similarity index 100% rename from pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch rename to pkgs/unit/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/unit/mo/motif/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/motif/default.nix rename to pkgs/unit/mo/motif/pkg-fun.nix diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/unit/mo/motion/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/motion/default.nix rename to pkgs/unit/mo/motion/pkg-fun.nix diff --git a/pkgs/tools/networking/motrix/default.nix b/pkgs/unit/mo/motrix/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/motrix/default.nix rename to pkgs/unit/mo/motrix/pkg-fun.nix diff --git a/pkgs/applications/audio/mousai/paths.patch b/pkgs/unit/mo/mousai/paths.patch similarity index 100% rename from pkgs/applications/audio/mousai/paths.patch rename to pkgs/unit/mo/mousai/paths.patch diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/unit/mo/mousai/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mousai/default.nix rename to pkgs/unit/mo/mousai/pkg-fun.nix diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/unit/mo/mousetweaks/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/mousetweaks/default.nix rename to pkgs/unit/mo/mousetweaks/pkg-fun.nix diff --git a/pkgs/applications/video/mov-cli/default.nix b/pkgs/unit/mo/mov-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/mov-cli/default.nix rename to pkgs/unit/mo/mov-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/unit/mo/movit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/movit/default.nix rename to pkgs/unit/mo/movit/pkg-fun.nix diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/unit/mo/mozart2-binary/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mozart/binary.nix rename to pkgs/unit/mo/mozart2-binary/pkg-fun.nix diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/unit/mo/mozjpeg/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/mozjpeg/default.nix rename to pkgs/unit/mo/mozjpeg/pkg-fun.nix diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/unit/mo/mozlz4a/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/mozlz4a/default.nix rename to pkgs/unit/mo/mozlz4a/pkg-fun.nix diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/unit/mo/mozphab/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mozphab/default.nix rename to pkgs/unit/mo/mozphab/pkg-fun.nix diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/unit/mp/mp3blaster/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mp3blaster/default.nix rename to pkgs/unit/mp/mp3blaster/pkg-fun.nix diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/unit/mp/mp3cat/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mp3cat/default.nix rename to pkgs/unit/mp/mp3cat/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/unit/mp/mp3fs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mp3fs/default.nix rename to pkgs/unit/mp/mp3fs/pkg-fun.nix diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/unit/mp/mp3gain/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mp3gain/default.nix rename to pkgs/unit/mp/mp3gain/pkg-fun.nix diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/unit/mp/mp3info/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mp3info/default.nix rename to pkgs/unit/mp/mp3info/pkg-fun.nix diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/unit/mp/mp3splt/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mp3splt/default.nix rename to pkgs/unit/mp/mp3splt/pkg-fun.nix diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/unit/mp/mp3val/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mp3val/default.nix rename to pkgs/unit/mp/mp3val/pkg-fun.nix diff --git a/pkgs/development/libraries/mp4v2/fix-build-clang.patch b/pkgs/unit/mp/mp4v2/fix-build-clang.patch similarity index 100% rename from pkgs/development/libraries/mp4v2/fix-build-clang.patch rename to pkgs/unit/mp/mp4v2/fix-build-clang.patch diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/unit/mp/mp4v2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mp4v2/default.nix rename to pkgs/unit/mp/mp4v2/pkg-fun.nix diff --git a/pkgs/tools/networking/mpack/build-fix.patch b/pkgs/unit/mp/mpack/build-fix.patch similarity index 100% rename from pkgs/tools/networking/mpack/build-fix.patch rename to pkgs/unit/mp/mpack/build-fix.patch diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/unit/mp/mpack/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mpack/default.nix rename to pkgs/unit/mp/mpack/pkg-fun.nix diff --git a/pkgs/tools/networking/mpack/sendmail-via-execvp.diff b/pkgs/unit/mp/mpack/sendmail-via-execvp.diff similarity index 100% rename from pkgs/tools/networking/mpack/sendmail-via-execvp.diff rename to pkgs/unit/mp/mpack/sendmail-via-execvp.diff diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/unit/mp/mpage/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/mpage/default.nix rename to pkgs/unit/mp/mpage/pkg-fun.nix diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/unit/mp/mpc123/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mpc123/default.nix rename to pkgs/unit/mp/mpc123/pkg-fun.nix diff --git a/pkgs/applications/audio/mpc123/use-gcc.patch b/pkgs/unit/mp/mpc123/use-gcc.patch similarity index 100% rename from pkgs/applications/audio/mpc123/use-gcc.patch rename to pkgs/unit/mp/mpc123/use-gcc.patch diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/unit/mp/mpd-mpris/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mpd-mpris/default.nix rename to pkgs/unit/mp/mpd-mpris/pkg-fun.nix diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/unit/mp/mpdas/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mpdas/default.nix rename to pkgs/unit/mp/mpdas/pkg-fun.nix diff --git a/pkgs/tools/audio/mpdcron/Gemfile b/pkgs/unit/mp/mpdcron/Gemfile similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile rename to pkgs/unit/mp/mpdcron/Gemfile diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/unit/mp/mpdcron/Gemfile.lock similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile.lock rename to pkgs/unit/mp/mpdcron/Gemfile.lock diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/unit/mp/mpdcron/gemset.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/gemset.nix rename to pkgs/unit/mp/mpdcron/gemset.nix diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/unit/mp/mpdcron/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/default.nix rename to pkgs/unit/mp/mpdcron/pkg-fun.nix diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/unit/mp/mpdecimal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mpdecimal/default.nix rename to pkgs/unit/mp/mpdecimal/pkg-fun.nix diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/unit/mp/mpdevil/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mpdevil/default.nix rename to pkgs/unit/mp/mpdevil/pkg-fun.nix diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/unit/mp/mpdris2/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mpdris2/default.nix rename to pkgs/unit/mp/mpdris2/pkg-fun.nix diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/unit/mp/mpdscribble/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mpdscribble/default.nix rename to pkgs/unit/mp/mpdscribble/pkg-fun.nix diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/unit/mp/mpfi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mpfi/default.nix rename to pkgs/unit/mp/mpfi/pkg-fun.nix diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/unit/mp/mpfr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mpfr/default.nix rename to pkgs/unit/mp/mpfr/pkg-fun.nix diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/unit/mp/mpfshell/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mpfshell/default.nix rename to pkgs/unit/mp/mpfshell/pkg-fun.nix diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/unit/mp/mpg321/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mpg321/default.nix rename to pkgs/unit/mp/mpg321/pkg-fun.nix diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/unit/mp/mph_2b_damase/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/mph-2b-damase/default.nix rename to pkgs/unit/mp/mph_2b_damase/pkg-fun.nix diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/unit/mp/mpir/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mpir/default.nix rename to pkgs/unit/mp/mpir/pkg-fun.nix diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/unit/mp/mprime/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mprime/default.nix rename to pkgs/unit/mp/mprime/pkg-fun.nix diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/unit/mp/mpris-scrobbler/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/mpris-scrobbler/default.nix rename to pkgs/unit/mp/mpris-scrobbler/pkg-fun.nix diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/unit/mp/mprocs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mprocs/default.nix rename to pkgs/unit/mp/mprocs/pkg-fun.nix diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/unit/mp/mps-youtube/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mps-youtube/default.nix rename to pkgs/unit/mp/mps-youtube/pkg-fun.nix diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/unit/mp/mpvc/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mpvc/default.nix rename to pkgs/unit/mp/mpvc/pkg-fun.nix diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/unit/mp/mpvpaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/mpvpaper/default.nix rename to pkgs/unit/mp/mpvpaper/pkg-fun.nix diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/unit/mp/mpw/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/mpw/default.nix rename to pkgs/unit/mp/mpw/pkg-fun.nix diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/unit/mq/mq-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/mq-cli/default.nix rename to pkgs/unit/mq/mq-cli/pkg-fun.nix diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/unit/mr/mr/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/mr/default.nix rename to pkgs/unit/mr/mr/pkg-fun.nix diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/unit/mr/mrbayes/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/mrbayes/default.nix rename to pkgs/unit/mr/mrbayes/pkg-fun.nix diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/unit/mr/mro-unicode/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/mro-unicode/default.nix rename to pkgs/unit/mr/mro-unicode/pkg-fun.nix diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/unit/mr/mrpeach/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/mrpeach/default.nix rename to pkgs/unit/mr/mrpeach/pkg-fun.nix diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/unit/mr/mrrescue/pkg-fun.nix similarity index 100% rename from pkgs/games/mrrescue/default.nix rename to pkgs/unit/mr/mrrescue/pkg-fun.nix diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/unit/mr/mrsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/mrsh/default.nix rename to pkgs/unit/mr/mrsh/pkg-fun.nix diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/unit/mr/mrtg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mrtg/default.nix rename to pkgs/unit/mr/mrtg/pkg-fun.nix diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/unit/mr/mruby/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mruby/default.nix rename to pkgs/unit/mr/mruby/pkg-fun.nix diff --git a/pkgs/development/compilers/mrustc/minicargo.nix b/pkgs/unit/mr/mrustc-minicargo/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mrustc/minicargo.nix rename to pkgs/unit/mr/mrustc-minicargo/pkg-fun.nix diff --git a/pkgs/development/compilers/mrustc/default.nix b/pkgs/unit/mr/mrustc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/mrustc/default.nix rename to pkgs/unit/mr/mrustc/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/unit/mr/mrxvt/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/mrxvt/default.nix rename to pkgs/unit/mr/mrxvt/pkg-fun.nix diff --git a/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch b/pkgs/unit/ms/ms-sys/manpages-without-build-timestamps.patch similarity index 100% rename from pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch rename to pkgs/unit/ms/ms-sys/manpages-without-build-timestamps.patch diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/unit/ms/ms-sys/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ms-sys/default.nix rename to pkgs/unit/ms/ms-sys/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/msbuild/create-deps.sh b/pkgs/unit/ms/msbuild/create-deps.sh similarity index 100% rename from pkgs/development/tools/build-managers/msbuild/create-deps.sh rename to pkgs/unit/ms/msbuild/create-deps.sh diff --git a/pkgs/development/tools/build-managers/msbuild/deps.nix b/pkgs/unit/ms/msbuild/deps.nix similarity index 100% rename from pkgs/development/tools/build-managers/msbuild/deps.nix rename to pkgs/unit/ms/msbuild/deps.nix diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/unit/ms/msbuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/msbuild/default.nix rename to pkgs/unit/ms/msbuild/pkg-fun.nix diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/unit/ms/mscgen/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/mscgen/default.nix rename to pkgs/unit/ms/mscgen/pkg-fun.nix diff --git a/pkgs/tools/security/msfpc/default.nix b/pkgs/unit/ms/msfpc/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/msfpc/default.nix rename to pkgs/unit/ms/msfpc/pkg-fun.nix diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/unit/ms/msgpack-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/msgpack-tools/default.nix rename to pkgs/unit/ms/msgpack-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/unit/ms/msgpack/generic.nix similarity index 100% rename from pkgs/development/libraries/msgpack/generic.nix rename to pkgs/unit/ms/msgpack/generic.nix diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/unit/ms/msgpack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/msgpack/default.nix rename to pkgs/unit/ms/msgpack/pkg-fun.nix diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/unit/ms/msgpuck/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/msgpuck/default.nix rename to pkgs/unit/ms/msgpuck/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/unit/ms/msgviewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/msgviewer/default.nix rename to pkgs/unit/ms/msgviewer/pkg-fun.nix diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/unit/ms/msieve/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/msieve/default.nix rename to pkgs/unit/ms/msieve/pkg-fun.nix diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/unit/ms/msilbc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/msilbc/default.nix rename to pkgs/unit/ms/msilbc/pkg-fun.nix diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/unit/ms/msitools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/msitools/default.nix rename to pkgs/unit/ms/msitools/pkg-fun.nix diff --git a/pkgs/tools/misc/mslink/default.nix b/pkgs/unit/ms/mslink/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mslink/default.nix rename to pkgs/unit/ms/mslink/pkg-fun.nix diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/unit/ms/msp430GccSupport/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/msp430/gcc-support.nix rename to pkgs/unit/ms/msp430GccSupport/pkg-fun.nix diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/unit/ms/mspdebug/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/msp430/mspdebug.nix rename to pkgs/unit/ms/mspdebug/pkg-fun.nix diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/unit/ms/mspds-bin/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/msp430/mspds/binary.nix rename to pkgs/unit/ms/mspds-bin/pkg-fun.nix diff --git a/pkgs/development/misc/msp430/mspds/bsl430.patch b/pkgs/unit/ms/mspds/bsl430.patch similarity index 100% rename from pkgs/development/misc/msp430/mspds/bsl430.patch rename to pkgs/unit/ms/mspds/bsl430.patch diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/unit/ms/mspds/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/msp430/mspds/default.nix rename to pkgs/unit/ms/mspds/pkg-fun.nix diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/unit/ms/msr-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/msr-tools/default.nix rename to pkgs/unit/ms/msr-tools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/msr/000-include-sysmacros.patch b/pkgs/unit/ms/msr/000-include-sysmacros.patch similarity index 100% rename from pkgs/os-specific/linux/msr/000-include-sysmacros.patch rename to pkgs/unit/ms/msr/000-include-sysmacros.patch diff --git a/pkgs/os-specific/linux/msr/default.nix b/pkgs/unit/ms/msr/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/msr/default.nix rename to pkgs/unit/ms/msr/pkg-fun.nix diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/unit/ms/mssql_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/mssql/jdbc/default.nix rename to pkgs/unit/ms/mssql_jdbc/pkg-fun.nix diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/unit/ms/mstflint/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mstflint/default.nix rename to pkgs/unit/ms/mstflint/pkg-fun.nix diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/unit/ms/mstpd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/mstpd/default.nix rename to pkgs/unit/ms/mstpd/pkg-fun.nix diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/unit/mt/mt-st/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/mt-st/default.nix rename to pkgs/unit/mt/mt-st/pkg-fun.nix diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/unit/mt/mt32emu-smf2wav/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/munt/mt32emu-smf2wav.nix rename to pkgs/unit/mt/mt32emu-smf2wav/pkg-fun.nix diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/unit/mt/mtail/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/mtail/default.nix rename to pkgs/unit/mt/mtail/pkg-fun.nix diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/unit/mt/mtdev/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mtdev/default.nix rename to pkgs/unit/mt/mtdev/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/unit/mt/mtdutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mtdutils/default.nix rename to pkgs/unit/mt/mtdutils/pkg-fun.nix diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/unit/mt/mtm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mtm/default.nix rename to pkgs/unit/mt/mtm/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/pkgs/unit/mt/mtools/UNUSED-darwin.patch similarity index 100% rename from pkgs/tools/filesystems/mtools/UNUSED-darwin.patch rename to pkgs/unit/mt/mtools/UNUSED-darwin.patch diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/unit/mt/mtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mtools/default.nix rename to pkgs/unit/mt/mtools/pkg-fun.nix diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/unit/mt/mtpaint/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/mtpaint/default.nix rename to pkgs/unit/mt/mtpaint/pkg-fun.nix diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/unit/mt/mtpfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/mtpfs/default.nix rename to pkgs/unit/mt/mtpfs/pkg-fun.nix diff --git a/pkgs/tools/networking/mtr-exporter/default.nix b/pkgs/unit/mt/mtr-exporter/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mtr-exporter/default.nix rename to pkgs/unit/mt/mtr-exporter/pkg-fun.nix diff --git a/pkgs/development/libraries/glibc/mtrace.nix b/pkgs/unit/mt/mtrace/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/glibc/mtrace.nix rename to pkgs/unit/mt/mtrace/pkg-fun.nix diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/unit/mt/mtx/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/mtx/default.nix rename to pkgs/unit/mt/mtx/pkg-fun.nix diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/unit/mu/mubeng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mubeng/default.nix rename to pkgs/unit/mu/mubeng/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/unit/mu/muchsync/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/notmuch/muchsync.nix rename to pkgs/unit/mu/muchsync/pkg-fun.nix diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/unit/mu/mucommander/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/mucommander/default.nix rename to pkgs/unit/mu/mucommander/pkg-fun.nix diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/unit/mu/mueval/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/haskell/mueval/default.nix rename to pkgs/unit/mu/mueval/pkg-fun.nix diff --git a/pkgs/applications/science/robotics/mujoco/dependencies.patch b/pkgs/unit/mu/mujoco/dependencies.patch similarity index 100% rename from pkgs/applications/science/robotics/mujoco/dependencies.patch rename to pkgs/unit/mu/mujoco/dependencies.patch diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/unit/mu/mujoco/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/robotics/mujoco/default.nix rename to pkgs/unit/mu/mujoco/pkg-fun.nix diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/unit/mu/mujs/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/mujs/default.nix rename to pkgs/unit/mu/mujs/pkg-fun.nix diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/unit/mu/mullvad-vpn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mullvad-vpn/default.nix rename to pkgs/unit/mu/mullvad-vpn/pkg-fun.nix diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/unit/mu/multilockscreen/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/multilockscreen/default.nix rename to pkgs/unit/mu/multilockscreen/pkg-fun.nix diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/unit/mu/multimarkdown/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/multimarkdown/default.nix rename to pkgs/unit/mu/multimarkdown/pkg-fun.nix diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/unit/mu/multimon-ng/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/multimon-ng/default.nix rename to pkgs/unit/mu/multimon-ng/pkg-fun.nix diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/unit/mu/multipart-parser-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/multipart-parser-c/default.nix rename to pkgs/unit/mu/multipart-parser-c/pkg-fun.nix diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/unit/mu/multipath-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/multipath-tools/default.nix rename to pkgs/unit/mu/multipath-tools/pkg-fun.nix diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/unit/mu/multitail/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/multitail/default.nix rename to pkgs/unit/mu/multitail/pkg-fun.nix diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/unit/mu/multitime/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/multitime/default.nix rename to pkgs/unit/mu/multitime/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/unit/mu/multus-cni/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/multus-cni/default.nix rename to pkgs/unit/mu/multus-cni/pkg-fun.nix diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/unit/mu/munge/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/munge/default.nix rename to pkgs/unit/mu/munge/pkg-fun.nix diff --git a/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch b/pkgs/unit/mu/munin/adding_sconfdir_munin-node.patch similarity index 100% rename from pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch rename to pkgs/unit/mu/munin/adding_sconfdir_munin-node.patch diff --git a/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch b/pkgs/unit/mu/munin/adding_servicedir_munin-node.patch similarity index 100% rename from pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch rename to pkgs/unit/mu/munin/adding_servicedir_munin-node.patch diff --git a/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch b/pkgs/unit/mu/munin/dont_preserve_source_dir_permissions.patch similarity index 100% rename from pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch rename to pkgs/unit/mu/munin/dont_preserve_source_dir_permissions.patch diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/unit/mu/munin/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/munin/default.nix rename to pkgs/unit/mu/munin/pkg-fun.nix diff --git a/pkgs/servers/monitoring/munin/preserve_environment.patch b/pkgs/unit/mu/munin/preserve_environment.patch similarity index 100% rename from pkgs/servers/monitoring/munin/preserve_environment.patch rename to pkgs/unit/mu/munin/preserve_environment.patch diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/unit/mu/muon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/muon/default.nix rename to pkgs/unit/mu/muon/pkg-fun.nix diff --git a/pkgs/development/compilers/muonlang/default.nix b/pkgs/unit/mu/muonlang/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/muonlang/default.nix rename to pkgs/unit/mu/muonlang/pkg-fun.nix diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/unit/mu/muparserx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/muparserx/default.nix rename to pkgs/unit/mu/muparserx/pkg-fun.nix diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/unit/mu/mupdf/0001-Use-command-v-in-favor-of-which.patch similarity index 100% rename from pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch rename to pkgs/unit/mu/mupdf/0001-Use-command-v-in-favor-of-which.patch diff --git a/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch b/pkgs/unit/mu/mupdf/0002-Add-Darwin-deps.patch similarity index 100% rename from pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch rename to pkgs/unit/mu/mupdf/0002-Add-Darwin-deps.patch diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/unit/mu/mupdf/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mupdf/default.nix rename to pkgs/unit/mu/mupdf/pkg-fun.nix diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/unit/mu/mupdf_1_17/darwin.patch similarity index 100% rename from pkgs/applications/misc/mupdf/darwin.patch rename to pkgs/unit/mu/mupdf_1_17/darwin.patch diff --git a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/pkgs/unit/mu/mupdf_1_17/mupdf-1.14-shared_libs.patch similarity index 100% rename from pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch rename to pkgs/unit/mu/mupdf_1_17/mupdf-1.14-shared_libs.patch diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/unit/mu/mupdf_1_17/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mupdf/1.17.nix rename to pkgs/unit/mu/mupdf_1_17/pkg-fun.nix diff --git a/pkgs/applications/emulators/mupen64plus/default.nix b/pkgs/unit/mu/mupen64plus/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/mupen64plus/default.nix rename to pkgs/unit/mu/mupen64plus/pkg-fun.nix diff --git a/pkgs/shells/murex/default.nix b/pkgs/unit/mu/murex/pkg-fun.nix similarity index 100% rename from pkgs/shells/murex/default.nix rename to pkgs/unit/mu/murex/pkg-fun.nix diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/unit/mu/muscle/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/muscle/default.nix rename to pkgs/unit/mu/muscle/pkg-fun.nix diff --git a/pkgs/applications/audio/museeks/default.nix b/pkgs/unit/mu/museeks/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/museeks/default.nix rename to pkgs/unit/mu/museeks/pkg-fun.nix diff --git a/pkgs/os-specific/linux/musl-fts/default.nix b/pkgs/unit/mu/musl-fts/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/musl-fts/default.nix rename to pkgs/unit/mu/musl-fts/pkg-fun.nix diff --git a/pkgs/os-specific/linux/musl-obstack/default.nix b/pkgs/unit/mu/musl-obstack/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/musl-obstack/default.nix rename to pkgs/unit/mu/musl-obstack/pkg-fun.nix diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/unit/mu/musl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/musl/default.nix rename to pkgs/unit/mu/musl/pkg-fun.nix diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/unit/mu/musly/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/musly/default.nix rename to pkgs/unit/mu/musly/pkg-fun.nix diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/unit/mu/mustache-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mustache-go/default.nix rename to pkgs/unit/mu/mustache-go/pkg-fun.nix diff --git a/pkgs/development/libraries/mustache-hpp/default.nix b/pkgs/unit/mu/mustache-hpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mustache-hpp/default.nix rename to pkgs/unit/mu/mustache-hpp/pkg-fun.nix diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/unit/mu/mustache-spec/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/mustache-spec/default.nix rename to pkgs/unit/mu/mustache-spec/pkg-fun.nix diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/unit/mu/mutagen-compose/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mutagen-compose/default.nix rename to pkgs/unit/mu/mutagen-compose/pkg-fun.nix diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/unit/mu/mutagen/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mutagen/default.nix rename to pkgs/unit/mu/mutagen/pkg-fun.nix diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/unit/mu/mutest/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mutest/default.nix rename to pkgs/unit/mu/mutest/pkg-fun.nix diff --git a/pkgs/development/tools/mutmut/default.nix b/pkgs/unit/mu/mutmut/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/mutmut/default.nix rename to pkgs/unit/mu/mutmut/pkg-fun.nix diff --git a/pkgs/tools/networking/mutt-ics/default.nix b/pkgs/unit/mu/mutt-ics/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/mutt-ics/default.nix rename to pkgs/unit/mu/mutt-ics/pkg-fun.nix diff --git a/pkgs/tools/misc/mutt-wizard/default.nix b/pkgs/unit/mu/mutt-wizard/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mutt-wizard/default.nix rename to pkgs/unit/mu/mutt-wizard/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/unit/mu/mutt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/mutt/default.nix rename to pkgs/unit/mu/mutt/pkg-fun.nix diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/unit/mv/mvapich/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mvapich/default.nix rename to pkgs/unit/mv/mvapich/pkg-fun.nix diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/unit/mx/mxt-app/pkg-fun.nix similarity index 100% rename from pkgs/misc/mxt-app/default.nix rename to pkgs/unit/mx/mxt-app/pkg-fun.nix diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/unit/my/mycli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/mycli/default.nix rename to pkgs/unit/my/mycli/pkg-fun.nix diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/unit/my/mycorrhiza/pkg-fun.nix similarity index 100% rename from pkgs/servers/mycorrhiza/default.nix rename to pkgs/unit/my/mycorrhiza/pkg-fun.nix diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/unit/my/mycrypto/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/mycrypto/default.nix rename to pkgs/unit/my/mycrypto/pkg-fun.nix diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/unit/my/mydumper/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/mydumper/default.nix rename to pkgs/unit/my/mydumper/pkg-fun.nix diff --git a/pkgs/tools/backup/mylvmbackup/default.nix b/pkgs/unit/my/mylvmbackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/mylvmbackup/default.nix rename to pkgs/unit/my/mylvmbackup/pkg-fun.nix diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/unit/my/mympd/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/mympd/default.nix rename to pkgs/unit/my/mympd/pkg-fun.nix diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/unit/my/mynewt-newt/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/mynewt-newt/default.nix rename to pkgs/unit/my/mynewt-newt/pkg-fun.nix diff --git a/pkgs/tools/misc/mynewt-newtmgr/default.nix b/pkgs/unit/my/mynewt-newtmgr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mynewt-newtmgr/default.nix rename to pkgs/unit/my/mynewt-newtmgr/pkg-fun.nix diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/unit/my/mypaint-brushes/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mypaint-brushes/default.nix rename to pkgs/unit/my/mypaint-brushes/pkg-fun.nix diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/unit/my/mypaint-brushes1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mypaint-brushes/1.0.nix rename to pkgs/unit/my/mypaint-brushes1/pkg-fun.nix diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/unit/my/mypaint/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/mypaint/default.nix rename to pkgs/unit/my/mypaint/pkg-fun.nix diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/unit/my/myrddin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/myrddin/default.nix rename to pkgs/unit/my/myrddin/pkg-fun.nix diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/unit/my/myrica/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/myrica/default.nix rename to pkgs/unit/my/myrica/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/mysides/default.nix b/pkgs/unit/my/mysides/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/mysides/default.nix rename to pkgs/unit/my/mysides/pkg-fun.nix diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/pkgs/unit/my/mysocketw/gcc.patch similarity index 100% rename from pkgs/development/libraries/mysocketw/gcc.patch rename to pkgs/unit/my/mysocketw/gcc.patch diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/unit/my/mysocketw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mysocketw/default.nix rename to pkgs/unit/my/mysocketw/pkg-fun.nix diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/unit/my/mysql2pgsql/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mysql2pgsql/default.nix rename to pkgs/unit/my/mysql2pgsql/pkg-fun.nix diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/unit/my/mysql_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/mysql/jdbc/default.nix rename to pkgs/unit/my/mysql_jdbc/pkg-fun.nix diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/unit/my/mysqltuner/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/mysqltuner/default.nix rename to pkgs/unit/my/mysqltuner/pkg-fun.nix diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/unit/my/mystem/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/mystem/default.nix rename to pkgs/unit/my/mystem/pkg-fun.nix diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/unit/my/mythes/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/mythes/default.nix rename to pkgs/unit/my/mythes/pkg-fun.nix diff --git a/pkgs/games/n2048/default.nix b/pkgs/unit/n2/n2048/pkg-fun.nix similarity index 100% rename from pkgs/games/n2048/default.nix rename to pkgs/unit/n2/n2048/pkg-fun.nix diff --git a/pkgs/tools/networking/n2n/default.nix b/pkgs/unit/n2/n2n/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/n2n/default.nix rename to pkgs/unit/n2/n2n/pkg-fun.nix diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/unit/n3/n3/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/N3/default.nix rename to pkgs/unit/n3/n3/pkg-fun.nix diff --git a/pkgs/applications/networking/n8n/fix-permissions.diff b/pkgs/unit/n8/n8n/fix-permissions.diff similarity index 100% rename from pkgs/applications/networking/n8n/fix-permissions.diff rename to pkgs/unit/n8/n8n/fix-permissions.diff diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/unit/n8/n8n/generate-dependencies.sh similarity index 100% rename from pkgs/applications/networking/n8n/generate-dependencies.sh rename to pkgs/unit/n8/n8n/generate-dependencies.sh diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/unit/n8/n8n/node-composition.nix similarity index 100% rename from pkgs/applications/networking/n8n/node-composition.nix rename to pkgs/unit/n8/n8n/node-composition.nix diff --git a/pkgs/servers/haste-server/node-env.nix b/pkgs/unit/n8/n8n/node-env.nix similarity index 100% rename from pkgs/servers/haste-server/node-env.nix rename to pkgs/unit/n8/n8n/node-env.nix diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/unit/n8/n8n/node-packages.nix similarity index 100% rename from pkgs/applications/networking/n8n/node-packages.nix rename to pkgs/unit/n8/n8n/node-packages.nix diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/unit/n8/n8n/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/n8n/default.nix rename to pkgs/unit/n8/n8n/pkg-fun.nix diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/unit/na/naabu/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/naabu/default.nix rename to pkgs/unit/na/naabu/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/unit/na/nabi/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/nabi/default.nix rename to pkgs/unit/na/nabi/pkg-fun.nix diff --git a/pkgs/games/naev/default.nix b/pkgs/unit/na/naev/pkg-fun.nix similarity index 100% rename from pkgs/games/naev/default.nix rename to pkgs/unit/na/naev/pkg-fun.nix diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/unit/na/nafees/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/nafees/default.nix rename to pkgs/unit/na/nafees/pkg-fun.nix diff --git a/pkgs/development/tools/nagelfar/default.nix b/pkgs/unit/na/nagelfar/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nagelfar/default.nix rename to pkgs/unit/na/nagelfar/pkg-fun.nix diff --git a/pkgs/servers/monitoring/nagios/nagios.patch b/pkgs/unit/na/nagios/nagios.patch similarity index 100% rename from pkgs/servers/monitoring/nagios/nagios.patch rename to pkgs/unit/na/nagios/nagios.patch diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/unit/na/nagios/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/nagios/default.nix rename to pkgs/unit/na/nagios/pkg-fun.nix diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/unit/na/nahid-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/nahid-fonts/default.nix rename to pkgs/unit/na/nahid-fonts/pkg-fun.nix diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/unit/na/nailgun/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nailgun/default.nix rename to pkgs/unit/na/nailgun/pkg-fun.nix diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/unit/na/nali/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/nali/default.nix rename to pkgs/unit/na/nali/pkg-fun.nix diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/unit/na/namazu/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/namazu/default.nix rename to pkgs/unit/na/namazu/pkg-fun.nix diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/unit/na/nano/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/nano/default.nix rename to pkgs/unit/na/nano/pkg-fun.nix diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/unit/na/nano/test-with-expect.nix similarity index 100% rename from pkgs/applications/editors/nano/test-with-expect.nix rename to pkgs/unit/na/nano/test-with-expect.nix diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/unit/na/nanoblogger/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nanoblogger/default.nix rename to pkgs/unit/na/nanoblogger/pkg-fun.nix diff --git a/pkgs/development/libraries/nanodbc/default.nix b/pkgs/unit/na/nanodbc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nanodbc/default.nix rename to pkgs/unit/na/nanodbc/pkg-fun.nix diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/unit/na/nanoflann/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nanoflann/default.nix rename to pkgs/unit/na/nanoflann/pkg-fun.nix diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/unit/na/nanomq/pkg-fun.nix similarity index 100% rename from pkgs/servers/mqtt/nanomq/default.nix rename to pkgs/unit/na/nanomq/pkg-fun.nix diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/unit/na/nanomsg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nanomsg/default.nix rename to pkgs/unit/na/nanomsg/pkg-fun.nix diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/unit/na/nanorc/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/nano/nanorc/default.nix rename to pkgs/unit/na/nanorc/pkg-fun.nix diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/unit/na/nanosaur/pkg-fun.nix similarity index 100% rename from pkgs/games/nanosaur/default.nix rename to pkgs/unit/na/nanosaur/pkg-fun.nix diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/unit/na/nanosaur2/pkg-fun.nix similarity index 100% rename from pkgs/games/nanosaur2/default.nix rename to pkgs/unit/na/nanosaur2/pkg-fun.nix diff --git a/pkgs/tools/audio/nanotts/default.nix b/pkgs/unit/na/nanotts/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/nanotts/default.nix rename to pkgs/unit/na/nanotts/pkg-fun.nix diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/unit/na/nanum-gothic-coding/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/nanum-gothic-coding/default.nix rename to pkgs/unit/na/nanum-gothic-coding/pkg-fun.nix diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/unit/na/nanum/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/nanum/default.nix rename to pkgs/unit/na/nanum/pkg-fun.nix diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/unit/na/nap/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nap/default.nix rename to pkgs/unit/na/nap/pkg-fun.nix diff --git a/pkgs/development/tools/napi-rs-cli/default.nix b/pkgs/unit/na/napi-rs-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/napi-rs-cli/default.nix rename to pkgs/unit/na/napi-rs-cli/pkg-fun.nix diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/unit/na/naproche/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/naproche/default.nix rename to pkgs/unit/na/naproche/pkg-fun.nix diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/unit/na/nar-serve/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nar-serve/default.nix rename to pkgs/unit/na/nar-serve/pkg-fun.nix diff --git a/pkgs/servers/nas/default.nix b/pkgs/unit/na/nas/pkg-fun.nix similarity index 100% rename from pkgs/servers/nas/default.nix rename to pkgs/unit/na/nas/pkg-fun.nix diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/unit/na/nasc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/nasc/default.nix rename to pkgs/unit/na/nasc/pkg-fun.nix diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/unit/na/nasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/nasm/default.nix rename to pkgs/unit/na/nasm/pkg-fun.nix diff --git a/pkgs/development/tools/nasmfmt/go.mod b/pkgs/unit/na/nasmfmt/go.mod similarity index 100% rename from pkgs/development/tools/nasmfmt/go.mod rename to pkgs/unit/na/nasmfmt/go.mod diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/unit/na/nasmfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nasmfmt/default.nix rename to pkgs/unit/na/nasmfmt/pkg-fun.nix diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/unit/na/nasty/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nasty/default.nix rename to pkgs/unit/na/nasty/pkg-fun.nix diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/unit/na/nat-traverse/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nat-traverse/default.nix rename to pkgs/unit/na/nat-traverse/pkg-fun.nix diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/unit/na/national-park-typeface/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/national-park/default.nix rename to pkgs/unit/na/national-park-typeface/pkg-fun.nix diff --git a/pkgs/tools/misc/natls/default.nix b/pkgs/unit/na/natls/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/natls/default.nix rename to pkgs/unit/na/natls/pkg-fun.nix diff --git a/pkgs/applications/video/natron/config.pri b/pkgs/unit/na/natron/config.pri similarity index 100% rename from pkgs/applications/video/natron/config.pri rename to pkgs/unit/na/natron/config.pri diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/unit/na/natron/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/natron/default.nix rename to pkgs/unit/na/natron/pkg-fun.nix diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/unit/na/nats-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/nats-server/default.nix rename to pkgs/unit/na/nats-server/pkg-fun.nix diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/unit/na/nats-streaming-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/nats-streaming-server/default.nix rename to pkgs/unit/na/nats-streaming-server/pkg-fun.nix diff --git a/pkgs/tools/system/nats-top/default.nix b/pkgs/unit/na/nats-top/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/nats-top/default.nix rename to pkgs/unit/na/nats-top/pkg-fun.nix diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/unit/na/natscli/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/natscli/default.nix rename to pkgs/unit/na/natscli/pkg-fun.nix diff --git a/pkgs/applications/misc/natural-docs/default.nix b/pkgs/unit/na/natural-docs/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/natural-docs/default.nix rename to pkgs/unit/na/natural-docs/pkg-fun.nix diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/unit/na/nautilus-open-any-terminal/hardcode-gsettings.patch similarity index 100% rename from pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch rename to pkgs/unit/na/nautilus-open-any-terminal/hardcode-gsettings.patch diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/unit/na/nautilus-open-any-terminal/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nautilus-open-any-terminal/default.nix rename to pkgs/unit/na/nautilus-open-any-terminal/pkg-fun.nix diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/unit/na/nauty/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/nauty/default.nix rename to pkgs/unit/na/nauty/pkg-fun.nix diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/unit/na/navi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/navi/default.nix rename to pkgs/unit/na/navi/pkg-fun.nix diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/unit/na/navidrome/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/navidrome/default.nix rename to pkgs/unit/na/navidrome/pkg-fun.nix diff --git a/pkgs/servers/misc/navidrome/ui/default.nix b/pkgs/unit/na/navidrome/ui/default.nix similarity index 100% rename from pkgs/servers/misc/navidrome/ui/default.nix rename to pkgs/unit/na/navidrome/ui/default.nix diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/unit/na/navidrome/ui/node-composition.nix similarity index 100% rename from pkgs/development/web/newman/node-composition.nix rename to pkgs/unit/na/navidrome/ui/node-composition.nix diff --git a/pkgs/servers/misc/navidrome/ui/node-env.nix b/pkgs/unit/na/navidrome/ui/node-env.nix similarity index 100% rename from pkgs/servers/misc/navidrome/ui/node-env.nix rename to pkgs/unit/na/navidrome/ui/node-env.nix diff --git a/pkgs/servers/misc/navidrome/ui/node-packages.nix b/pkgs/unit/na/navidrome/ui/node-packages.nix similarity index 100% rename from pkgs/servers/misc/navidrome/ui/node-packages.nix rename to pkgs/unit/na/navidrome/ui/node-packages.nix diff --git a/pkgs/servers/misc/navidrome/update.nix b/pkgs/unit/na/navidrome/update.nix similarity index 100% rename from pkgs/servers/misc/navidrome/update.nix rename to pkgs/unit/na/navidrome/update.nix diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/unit/na/navipowm/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/navipowm/default.nix rename to pkgs/unit/na/navipowm/pkg-fun.nix diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/unit/na/nawk/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/nawk/default.nix rename to pkgs/unit/na/nawk/pkg-fun.nix diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/unit/nb/nb/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nb/default.nix rename to pkgs/unit/nb/nb/pkg-fun.nix diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/unit/nb/nbd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nbd/default.nix rename to pkgs/unit/nb/nbd/pkg-fun.nix diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/unit/nb/nbench/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nbench/default.nix rename to pkgs/unit/nb/nbench/pkg-fun.nix diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/unit/nb/nbstripout/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/nbstripout/default.nix rename to pkgs/unit/nb/nbstripout/pkg-fun.nix diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/unit/nb/nbxplorer/deps.nix similarity index 100% rename from pkgs/applications/blockchains/nbxplorer/deps.nix rename to pkgs/unit/nb/nbxplorer/deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/unit/nb/nbxplorer/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/nbxplorer/default.nix rename to pkgs/unit/nb/nbxplorer/pkg-fun.nix diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/unit/nb/nbxplorer/update.sh similarity index 100% rename from pkgs/applications/blockchains/nbxplorer/update.sh rename to pkgs/unit/nb/nbxplorer/update.sh diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/unit/nb/nbxplorer/util/update-common.sh similarity index 100% rename from pkgs/applications/blockchains/nbxplorer/util/update-common.sh rename to pkgs/unit/nb/nbxplorer/util/update-common.sh diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/unit/nc/nc4nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nc4nix/default.nix rename to pkgs/unit/nc/nc4nix/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/unit/nc/ncdc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/ncdc/default.nix rename to pkgs/unit/nc/ncdc/pkg-fun.nix diff --git a/pkgs/servers/dns/ncdns/fix-tpl-path.patch b/pkgs/unit/nc/ncdns/fix-tpl-path.patch similarity index 100% rename from pkgs/servers/dns/ncdns/fix-tpl-path.patch rename to pkgs/unit/nc/ncdns/fix-tpl-path.patch diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/unit/nc/ncdns/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/ncdns/default.nix rename to pkgs/unit/nc/ncdns/pkg-fun.nix diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/unit/nc/ncdu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ncdu/default.nix rename to pkgs/unit/nc/ncdu/pkg-fun.nix diff --git a/pkgs/tools/misc/ncdu/1.nix b/pkgs/unit/nc/ncdu_1/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ncdu/1.nix rename to pkgs/unit/nc/ncdu_1/pkg-fun.nix diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/unit/nc/ncftp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ncftp/default.nix rename to pkgs/unit/nc/ncftp/pkg-fun.nix diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/unit/nc/ncgopher/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ncgopher/default.nix rename to pkgs/unit/nc/ncgopher/pkg-fun.nix diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/unit/nc/ncmpc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ncmpc/default.nix rename to pkgs/unit/nc/ncmpc/pkg-fun.nix diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/unit/nc/ncmpcpp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ncmpcpp/default.nix rename to pkgs/unit/nc/ncmpcpp/pkg-fun.nix diff --git a/pkgs/development/libraries/ncnn/cmakelists.patch b/pkgs/unit/nc/ncnn/cmakelists.patch similarity index 100% rename from pkgs/development/libraries/ncnn/cmakelists.patch rename to pkgs/unit/nc/ncnn/cmakelists.patch diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/unit/nc/ncnn/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ncnn/default.nix rename to pkgs/unit/nc/ncnn/pkg-fun.nix diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/unit/nc/nco/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nco/default.nix rename to pkgs/unit/nc/nco/pkg-fun.nix diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/unit/nc/ncompress/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/ncompress/default.nix rename to pkgs/unit/nc/ncompress/pkg-fun.nix diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/unit/nc/ncpamixer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ncpamixer/default.nix rename to pkgs/unit/nc/ncpamixer/pkg-fun.nix diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/unit/nc/ncrack/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ncrack/default.nix rename to pkgs/unit/nc/ncrack/pkg-fun.nix diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/unit/nc/ncview/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/ncview/default.nix rename to pkgs/unit/nc/ncview/pkg-fun.nix diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/unit/nd/ndi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ndi/default.nix rename to pkgs/unit/nd/ndi/pkg-fun.nix diff --git a/pkgs/development/libraries/ndi/update.py b/pkgs/unit/nd/ndi/update.py similarity index 100% rename from pkgs/development/libraries/ndi/update.py rename to pkgs/unit/nd/ndi/update.py diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/unit/nd/ndi/version.json similarity index 100% rename from pkgs/development/libraries/ndi/version.json rename to pkgs/unit/nd/ndi/version.json diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/unit/nd/ndisc6/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ndisc6/default.nix rename to pkgs/unit/nd/ndisc6/pkg-fun.nix diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/unit/nd/ndjbdns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ndjbdns/default.nix rename to pkgs/unit/nd/ndjbdns/pkg-fun.nix diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/unit/nd/ndpi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ndpi/default.nix rename to pkgs/unit/nd/ndpi/pkg-fun.nix diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/unit/nd/ndppd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ndppd/default.nix rename to pkgs/unit/nd/ndppd/pkg-fun.nix diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/unit/nd/ndstool/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/ndstool/default.nix rename to pkgs/unit/nd/ndstool/pkg-fun.nix diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/unit/ne/ne/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/ne/default.nix rename to pkgs/unit/ne/ne/pkg-fun.nix diff --git a/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch b/pkgs/unit/ne/nearcore/0001-make-near-test-contracts-optional.patch similarity index 100% rename from pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch rename to pkgs/unit/ne/nearcore/0001-make-near-test-contracts-optional.patch diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/unit/ne/nearcore/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/nearcore/default.nix rename to pkgs/unit/ne/nearcore/pkg-fun.nix diff --git a/pkgs/servers/neard/default.nix b/pkgs/unit/ne/neard/pkg-fun.nix similarity index 100% rename from pkgs/servers/neard/default.nix rename to pkgs/unit/ne/neard/pkg-fun.nix diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/unit/ne/neardal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/neardal/default.nix rename to pkgs/unit/ne/neardal/pkg-fun.nix diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/unit/ne/neatvnc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/neatvnc/default.nix rename to pkgs/unit/ne/neatvnc/pkg-fun.nix diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/unit/ne/nebula/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nebula/default.nix rename to pkgs/unit/ne/nebula/pkg-fun.nix diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/unit/ne/nedit/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/nedit/default.nix rename to pkgs/unit/ne/nedit/pkg-fun.nix diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/unit/ne/neil/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/neil/default.nix rename to pkgs/unit/ne/neil/pkg-fun.nix diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/unit/ne/neko/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/neko/default.nix rename to pkgs/unit/ne/neko/pkg-fun.nix diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/unit/ne/nelua/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/nelua/default.nix rename to pkgs/unit/ne/nelua/pkg-fun.nix diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/unit/ne/nemiver/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nemiver/default.nix rename to pkgs/unit/ne/nemiver/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/pkgs/unit/ne/nengo-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/nengo-gui/default.nix rename to pkgs/unit/ne/nengo-gui/pkg-fun.nix diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/unit/ne/neo-cowsay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/neo-cowsay/default.nix rename to pkgs/unit/ne/neo-cowsay/pkg-fun.nix diff --git a/pkgs/applications/misc/neo/default.nix b/pkgs/unit/ne/neo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/neo/default.nix rename to pkgs/unit/ne/neo/pkg-fun.nix diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/unit/ne/neo4j-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/neo4j-desktop/default.nix rename to pkgs/unit/ne/neo4j-desktop/pkg-fun.nix diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/unit/ne/neo4j/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/neo4j/default.nix rename to pkgs/unit/ne/neo4j/pkg-fun.nix diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/unit/ne/neocomp/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/neocomp/default.nix rename to pkgs/unit/ne/neocomp/pkg-fun.nix diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/unit/ne/neofetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/neofetch/default.nix rename to pkgs/unit/ne/neofetch/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/unit/ne/neomutt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/neomutt/default.nix rename to pkgs/unit/ne/neomutt/pkg-fun.nix diff --git a/pkgs/development/libraries/neon/darwin-fix-configure.patch b/pkgs/unit/ne/neon/darwin-fix-configure.patch similarity index 100% rename from pkgs/development/libraries/neon/darwin-fix-configure.patch rename to pkgs/unit/ne/neon/darwin-fix-configure.patch diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/unit/ne/neon/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/neon/default.nix rename to pkgs/unit/ne/neon/pkg-fun.nix diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/unit/ne/neovide/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/neovim/neovide/default.nix rename to pkgs/unit/ne/neovide/pkg-fun.nix diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/unit/ne/neovide/skia-externals.json similarity index 100% rename from pkgs/applications/editors/neovim/neovide/skia-externals.json rename to pkgs/unit/ne/neovide/skia-externals.json diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/unit/ne/neovim-remote/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/neovim/neovim-remote.nix rename to pkgs/unit/ne/neovim-remote/pkg-fun.nix diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/unit/ne/nerd-font-patcher/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nerd-font-patcher/default.nix rename to pkgs/unit/ne/nerd-font-patcher/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/unit/ne/nerdctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/nerdctl/default.nix rename to pkgs/unit/ne/nerdctl/pkg-fun.nix diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/unit/ne/nerdfonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/nerdfonts/default.nix rename to pkgs/unit/ne/nerdfonts/pkg-fun.nix diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/unit/ne/nerdfonts/shas.nix similarity index 100% rename from pkgs/data/fonts/nerdfonts/shas.nix rename to pkgs/unit/ne/nerdfonts/shas.nix diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/unit/ne/nerdfonts/update.sh similarity index 100% rename from pkgs/data/fonts/nerdfonts/update.sh rename to pkgs/unit/ne/nerdfonts/update.sh diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/unit/ne/nerdfonts/version.nix similarity index 100% rename from pkgs/data/fonts/nerdfonts/version.nix rename to pkgs/unit/ne/nerdfonts/version.nix diff --git a/pkgs/applications/emulators/nestopia/build-fix.patch b/pkgs/unit/ne/nestopia/build-fix.patch similarity index 100% rename from pkgs/applications/emulators/nestopia/build-fix.patch rename to pkgs/unit/ne/nestopia/build-fix.patch diff --git a/pkgs/applications/emulators/nestopia/gcc6.patch b/pkgs/unit/ne/nestopia/gcc6.patch similarity index 100% rename from pkgs/applications/emulators/nestopia/gcc6.patch rename to pkgs/unit/ne/nestopia/gcc6.patch diff --git a/pkgs/applications/emulators/nestopia/default.nix b/pkgs/unit/ne/nestopia/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/nestopia/default.nix rename to pkgs/unit/ne/nestopia/pkg-fun.nix diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/unit/ne/net-snmp/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/net-snmp/default.nix rename to pkgs/unit/ne/net-snmp/pkg-fun.nix diff --git a/pkgs/tools/filesystems/netatalk/000-no-suid.patch b/pkgs/unit/ne/netatalk/000-no-suid.patch similarity index 100% rename from pkgs/tools/filesystems/netatalk/000-no-suid.patch rename to pkgs/unit/ne/netatalk/000-no-suid.patch diff --git a/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch b/pkgs/unit/ne/netatalk/001-omit-localstatedir-creation.patch similarity index 100% rename from pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch rename to pkgs/unit/ne/netatalk/001-omit-localstatedir-creation.patch diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/unit/ne/netatalk/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/netatalk/default.nix rename to pkgs/unit/ne/netatalk/pkg-fun.nix diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/unit/ne/netavark/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netavark/default.nix rename to pkgs/unit/ne/netavark/pkg-fun.nix diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/unit/ne/netboot/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netboot/default.nix rename to pkgs/unit/ne/netboot/pkg-fun.nix diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/unit/ne/netbootxyz-efi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/netbootxyz-efi/default.nix rename to pkgs/unit/ne/netbootxyz-efi/pkg-fun.nix diff --git a/pkgs/servers/web-apps/netbox/config.patch b/pkgs/unit/ne/netbox/config.patch similarity index 100% rename from pkgs/servers/web-apps/netbox/config.patch rename to pkgs/unit/ne/netbox/config.patch diff --git a/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch b/pkgs/unit/ne/netbox/graphql-3_2_0.patch similarity index 100% rename from pkgs/servers/web-apps/netbox/graphql-3_2_0.patch rename to pkgs/unit/ne/netbox/graphql-3_2_0.patch diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/unit/ne/netbox/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/netbox/default.nix rename to pkgs/unit/ne/netbox/pkg-fun.nix diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/unit/ne/netcat-gnu/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netcat/default.nix rename to pkgs/unit/ne/netcat-gnu/pkg-fun.nix diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/unit/ne/netcat-openbsd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netcat-openbsd/default.nix rename to pkgs/unit/ne/netcat-openbsd/pkg-fun.nix diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/unit/ne/netcdfcxx4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/netcdf-cxx4/default.nix rename to pkgs/unit/ne/netcdfcxx4/pkg-fun.nix diff --git a/pkgs/development/tools/misc/netcoredbg/deps.nix b/pkgs/unit/ne/netcoredbg/deps.nix similarity index 100% rename from pkgs/development/tools/misc/netcoredbg/deps.nix rename to pkgs/unit/ne/netcoredbg/deps.nix diff --git a/pkgs/development/tools/misc/netcoredbg/limits.patch b/pkgs/unit/ne/netcoredbg/limits.patch similarity index 100% rename from pkgs/development/tools/misc/netcoredbg/limits.patch rename to pkgs/unit/ne/netcoredbg/limits.patch diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/unit/ne/netcoredbg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/netcoredbg/default.nix rename to pkgs/unit/ne/netcoredbg/pkg-fun.nix diff --git a/pkgs/tools/networking/netdiscover/default.nix b/pkgs/unit/ne/netdiscover/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netdiscover/default.nix rename to pkgs/unit/ne/netdiscover/pkg-fun.nix diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/unit/ne/netease-music-tui/cargo-lock.patch similarity index 100% rename from pkgs/applications/audio/netease-music-tui/cargo-lock.patch rename to pkgs/unit/ne/netease-music-tui/cargo-lock.patch diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/unit/ne/netease-music-tui/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/netease-music-tui/default.nix rename to pkgs/unit/ne/netease-music-tui/pkg-fun.nix diff --git a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh b/pkgs/unit/ne/netease-music-tui/update-cargo-lock.sh similarity index 100% rename from pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh rename to pkgs/unit/ne/netease-music-tui/update-cargo-lock.sh diff --git a/pkgs/tools/inputmethods/netevent/default.nix b/pkgs/unit/ne/netevent/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/netevent/default.nix rename to pkgs/unit/ne/netevent/pkg-fun.nix diff --git a/pkgs/applications/video/netflix/default.nix b/pkgs/unit/ne/netflix/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/netflix/default.nix rename to pkgs/unit/ne/netflix/pkg-fun.nix diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/unit/ne/nethogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nethogs/default.nix rename to pkgs/unit/ne/nethogs/pkg-fun.nix diff --git a/pkgs/tools/networking/nethoscope/default.nix b/pkgs/unit/ne/nethoscope/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nethoscope/default.nix rename to pkgs/unit/ne/nethoscope/pkg-fun.nix diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/unit/ne/netifd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netifd/default.nix rename to pkgs/unit/ne/netifd/pkg-fun.nix diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/unit/ne/netkittftp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netkit/tftp/default.nix rename to pkgs/unit/ne/netkittftp/pkg-fun.nix diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/unit/ne/netlify-cli/composition.nix similarity index 100% rename from pkgs/development/web/netlify-cli/composition.nix rename to pkgs/unit/ne/netlify-cli/composition.nix diff --git a/pkgs/development/web/netlify-cli/netlify-cli.json b/pkgs/unit/ne/netlify-cli/netlify-cli.json similarity index 100% rename from pkgs/development/web/netlify-cli/netlify-cli.json rename to pkgs/unit/ne/netlify-cli/netlify-cli.json diff --git a/pkgs/servers/monitoring/karma/node-env.nix b/pkgs/unit/ne/netlify-cli/node-env.nix similarity index 100% rename from pkgs/servers/monitoring/karma/node-env.nix rename to pkgs/unit/ne/netlify-cli/node-env.nix diff --git a/pkgs/development/web/netlify-cli/node-packages.nix b/pkgs/unit/ne/netlify-cli/node-packages.nix similarity index 100% rename from pkgs/development/web/netlify-cli/node-packages.nix rename to pkgs/unit/ne/netlify-cli/node-packages.nix diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/unit/ne/netlify-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/web/netlify-cli/default.nix rename to pkgs/unit/ne/netlify-cli/pkg-fun.nix diff --git a/pkgs/development/web/netlify-cli/test.nix b/pkgs/unit/ne/netlify-cli/test.nix similarity index 100% rename from pkgs/development/web/netlify-cli/test.nix rename to pkgs/unit/ne/netlify-cli/test.nix diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/unit/ne/netlogo/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/netlogo/default.nix rename to pkgs/unit/ne/netlogo/pkg-fun.nix diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/unit/ne/netmask/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netmask/default.nix rename to pkgs/unit/ne/netmask/pkg-fun.nix diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/unit/ne/netpbm/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/netpbm/default.nix rename to pkgs/unit/ne/netpbm/pkg-fun.nix diff --git a/pkgs/tools/graphics/netpbm/update.sh b/pkgs/unit/ne/netpbm/update.sh similarity index 100% rename from pkgs/tools/graphics/netpbm/update.sh rename to pkgs/unit/ne/netpbm/update.sh diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/unit/ne/netperf/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/netperf/default.nix rename to pkgs/unit/ne/netperf/pkg-fun.nix diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/unit/ne/netplan/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/netplan/default.nix rename to pkgs/unit/ne/netplan/pkg-fun.nix diff --git a/pkgs/tools/networking/netproc/default.nix b/pkgs/unit/ne/netproc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netproc/default.nix rename to pkgs/unit/ne/netproc/pkg-fun.nix diff --git a/pkgs/games/netris/default.nix b/pkgs/unit/ne/netris/pkg-fun.nix similarity index 100% rename from pkgs/games/netris/default.nix rename to pkgs/unit/ne/netris/pkg-fun.nix diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/unit/ne/netrw/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netrw/default.nix rename to pkgs/unit/ne/netrw/pkg-fun.nix diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/unit/ne/netselect/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netselect/default.nix rename to pkgs/unit/ne/netselect/pkg-fun.nix diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/unit/ne/netsniff-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/netsniff-ng/default.nix rename to pkgs/unit/ne/netsniff-ng/pkg-fun.nix diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/unit/ne/networkaudiod/pkg-fun.nix similarity index 100% rename from pkgs/servers/networkaudiod/default.nix rename to pkgs/unit/ne/networkaudiod/pkg-fun.nix diff --git a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/pkgs/unit/ne/networking-ts-cxx/networking_ts.pc.in similarity index 100% rename from pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in rename to pkgs/unit/ne/networking-ts-cxx/networking_ts.pc.in diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/unit/ne/networking-ts-cxx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/networking-ts-cxx/default.nix rename to pkgs/unit/ne/networking-ts-cxx/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch b/pkgs/unit/ne/networkmanager-fortisslvpn/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch rename to pkgs/unit/ne/networkmanager-fortisslvpn/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/unit/ne/networkmanager-fortisslvpn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/fortisslvpn/default.nix rename to pkgs/unit/ne/networkmanager-fortisslvpn/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch b/pkgs/unit/ne/networkmanager-iodine/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/iodine/fix-paths.patch rename to pkgs/unit/ne/networkmanager-iodine/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/unit/ne/networkmanager-iodine/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/iodine/default.nix rename to pkgs/unit/ne/networkmanager-iodine/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch b/pkgs/unit/ne/networkmanager-l2tp/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch rename to pkgs/unit/ne/networkmanager-l2tp/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/unit/ne/networkmanager-l2tp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/l2tp/default.nix rename to pkgs/unit/ne/networkmanager-l2tp/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch b/pkgs/unit/ne/networkmanager-openconnect/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch rename to pkgs/unit/ne/networkmanager-openconnect/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/unit/ne/networkmanager-openconnect/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/openconnect/default.nix rename to pkgs/unit/ne/networkmanager-openconnect/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch b/pkgs/unit/ne/networkmanager-openvpn/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch rename to pkgs/unit/ne/networkmanager-openvpn/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/unit/ne/networkmanager-openvpn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/openvpn/default.nix rename to pkgs/unit/ne/networkmanager-openvpn/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/unit/ne/networkmanager-sstp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/sstp/default.nix rename to pkgs/unit/ne/networkmanager-sstp/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch b/pkgs/unit/ne/networkmanager-vpnc/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch rename to pkgs/unit/ne/networkmanager-vpnc/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/unit/ne/networkmanager-vpnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/vpnc/default.nix rename to pkgs/unit/ne/networkmanager-vpnc/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/unit/ne/networkmanager/fix-install-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/fix-install-paths.patch rename to pkgs/unit/ne/networkmanager/fix-install-paths.patch diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/unit/ne/networkmanager/fix-paths.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/fix-paths.patch rename to pkgs/unit/ne/networkmanager/fix-paths.patch diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/unit/ne/networkmanager/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/default.nix rename to pkgs/unit/ne/networkmanager/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/unit/ne/networkmanager_dmenu/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/dmenu/default.nix rename to pkgs/unit/ne/networkmanager_dmenu/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/unit/ne/networkmanager_strongswan/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/strongswan/default.nix rename to pkgs/unit/ne/networkmanager_strongswan/pkg-fun.nix diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/unit/ne/networkmanagerapplet/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/applet/default.nix rename to pkgs/unit/ne/networkmanagerapplet/pkg-fun.nix diff --git a/pkgs/games/neverball/default.nix b/pkgs/unit/ne/neverball/pkg-fun.nix similarity index 100% rename from pkgs/games/neverball/default.nix rename to pkgs/unit/ne/neverball/pkg-fun.nix diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/unit/ne/new-session-manager/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/new-session-manager/default.nix rename to pkgs/unit/ne/new-session-manager/pkg-fun.nix diff --git a/pkgs/servers/misc/navidrome/ui/node-composition.nix b/pkgs/unit/ne/newman/node-composition.nix similarity index 100% rename from pkgs/servers/misc/navidrome/ui/node-composition.nix rename to pkgs/unit/ne/newman/node-composition.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/node-env.nix b/pkgs/unit/ne/newman/node-env.nix similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/node-env.nix rename to pkgs/unit/ne/newman/node-env.nix diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/unit/ne/newman/node-packages.nix similarity index 100% rename from pkgs/development/web/newman/node-packages.nix rename to pkgs/unit/ne/newman/node-packages.nix diff --git a/pkgs/development/web/newman/package.json b/pkgs/unit/ne/newman/package.json similarity index 100% rename from pkgs/development/web/newman/package.json rename to pkgs/unit/ne/newman/package.json diff --git a/pkgs/development/web/newman/default.nix b/pkgs/unit/ne/newman/pkg-fun.nix similarity index 100% rename from pkgs/development/web/newman/default.nix rename to pkgs/unit/ne/newman/pkg-fun.nix diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/unit/ne/newrelic-sysmond/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/newrelic-sysmond/default.nix rename to pkgs/unit/ne/newrelic-sysmond/pkg-fun.nix diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/unit/ne/newtonwars/pkg-fun.nix similarity index 100% rename from pkgs/games/newtonwars/default.nix rename to pkgs/unit/ne/newtonwars/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/unit/ne/nex/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/nex/default.nix rename to pkgs/unit/ne/nex/pkg-fun.nix diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/unit/ne/nextcloud-news-updater/pkg-fun.nix similarity index 100% rename from pkgs/servers/nextcloud/news-updater.nix rename to pkgs/unit/ne/nextcloud-news-updater/pkg-fun.nix diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/unit/ne/nextdns/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/nextdns/default.nix rename to pkgs/unit/ne/nextdns/pkg-fun.nix diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/unit/ne/nextflow/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/nextflow/default.nix rename to pkgs/unit/ne/nextflow/pkg-fun.nix diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/unit/ne/nexuiz/pkg-fun.nix similarity index 100% rename from pkgs/games/nexuiz/default.nix rename to pkgs/unit/ne/nexuiz/pkg-fun.nix diff --git a/pkgs/servers/nfd/default.nix b/pkgs/unit/nf/nfd/pkg-fun.nix similarity index 100% rename from pkgs/servers/nfd/default.nix rename to pkgs/unit/nf/nfd/pkg-fun.nix diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/unit/nf/nfdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nfdump/default.nix rename to pkgs/unit/nf/nfdump/pkg-fun.nix diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/unit/nf/nfpm/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nfpm/default.nix rename to pkgs/unit/nf/nfpm/pkg-fun.nix diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/unit/nf/nfs-ganesha/pkg-fun.nix similarity index 100% rename from pkgs/servers/nfs-ganesha/default.nix rename to pkgs/unit/nf/nfs-ganesha/pkg-fun.nix diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/unit/nf/nfs-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nfs-utils/default.nix rename to pkgs/unit/nf/nfs-utils/pkg-fun.nix diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/unit/nf/nfstrace/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nfstrace/default.nix rename to pkgs/unit/nf/nfstrace/pkg-fun.nix diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/unit/nf/nftables/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nftables/default.nix rename to pkgs/unit/nf/nftables/pkg-fun.nix diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/unit/ng/ngadmin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ngadmin/default.nix rename to pkgs/unit/ng/ngadmin/pkg-fun.nix diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/unit/ng/nghttp2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nghttp2/default.nix rename to pkgs/unit/ng/nghttp2/pkg-fun.nix diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/unit/ng/nghttp3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nghttp3/default.nix rename to pkgs/unit/ng/nghttp3/pkg-fun.nix diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/unit/ng/nginx-config-formatter/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nginx-config-formatter/default.nix rename to pkgs/unit/ng/nginx-config-formatter/pkg-fun.nix diff --git a/pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch b/pkgs/unit/ng/nginx-doc/exclude-google-analytics.patch similarity index 100% rename from pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch rename to pkgs/unit/ng/nginx-doc/exclude-google-analytics.patch diff --git a/pkgs/data/documentation/nginx-doc/default.nix b/pkgs/unit/ng/nginx-doc/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/nginx-doc/default.nix rename to pkgs/unit/ng/nginx-doc/pkg-fun.nix diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/unit/ng/nginx-sso/pkg-fun.nix similarity index 100% rename from pkgs/servers/nginx-sso/default.nix rename to pkgs/unit/ng/nginx-sso/pkg-fun.nix diff --git a/pkgs/servers/nginx-sso/rune.patch b/pkgs/unit/ng/nginx-sso/rune.patch similarity index 100% rename from pkgs/servers/nginx-sso/rune.patch rename to pkgs/unit/ng/nginx-sso/rune.patch diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/unit/ng/ngircd/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/ngircd/default.nix rename to pkgs/unit/ng/ngircd/pkg-fun.nix diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/unit/ng/ngn-k/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/ngn-k/default.nix rename to pkgs/unit/ng/ngn-k/pkg-fun.nix diff --git a/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/pkgs/unit/ng/ngn-k/repl-license-path.patch similarity index 100% rename from pkgs/development/interpreters/ngn-k/repl-license-path.patch rename to pkgs/unit/ng/ngn-k/repl-license-path.patch diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/unit/ng/ngrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ngrep/default.nix rename to pkgs/unit/ng/ngrep/pkg-fun.nix diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/unit/ng/ngrok/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ngrok/default.nix rename to pkgs/unit/ng/ngrok/pkg-fun.nix diff --git a/pkgs/tools/networking/ngrok/update.sh b/pkgs/unit/ng/ngrok/update.sh similarity index 100% rename from pkgs/tools/networking/ngrok/update.sh rename to pkgs/unit/ng/ngrok/update.sh diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/unit/ng/ngrok/versions.json similarity index 100% rename from pkgs/tools/networking/ngrok/versions.json rename to pkgs/unit/ng/ngrok/versions.json diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/unit/ng/ngspice/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/ngspice/default.nix rename to pkgs/unit/ng/ngspice/pkg-fun.nix diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/unit/ng/ngt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ngt/default.nix rename to pkgs/unit/ng/ngt/pkg-fun.nix diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/unit/ng/ngtcp2-gnutls/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ngtcp2/gnutls.nix rename to pkgs/unit/ng/ngtcp2-gnutls/pkg-fun.nix diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/unit/ng/ngtcp2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ngtcp2/default.nix rename to pkgs/unit/ng/ngtcp2/pkg-fun.nix diff --git a/pkgs/applications/misc/nhentai/default.nix b/pkgs/unit/nh/nhentai/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nhentai/default.nix rename to pkgs/unit/nh/nhentai/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/unit/ni/nice-dcv-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/nice-dcv-client/default.nix rename to pkgs/unit/ni/nice-dcv-client/pkg-fun.nix diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/unit/ni/nickel/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/nickel/default.nix rename to pkgs/unit/ni/nickel/pkg-fun.nix diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/unit/ni/nicotine-plus/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/soulseek/nicotine-plus/default.nix rename to pkgs/unit/ni/nicotine-plus/pkg-fun.nix diff --git a/pkgs/tools/package-management/niff/default.nix b/pkgs/unit/ni/niff/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/niff/default.nix rename to pkgs/unit/ni/niff/pkg-fun.nix diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/unit/ni/nifi/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/nifi/default.nix rename to pkgs/unit/ni/nifi/pkg-fun.nix diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/unit/ni/nifticlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/biology/nifticlib/default.nix rename to pkgs/unit/ni/nifticlib/pkg-fun.nix diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/unit/ni/niftyreg/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/niftyreg/default.nix rename to pkgs/unit/ni/niftyreg/pkg-fun.nix diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/unit/ni/niftyseg/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/niftyseg/default.nix rename to pkgs/unit/ni/niftyseg/pkg-fun.nix diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/unit/ni/nika-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/nika-fonts/default.nix rename to pkgs/unit/ni/nika-fonts/pkg-fun.nix diff --git a/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch b/pkgs/unit/ni/nikto/NIKTODIR-nix-wrapper-fix.patch similarity index 100% rename from pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch rename to pkgs/unit/ni/nikto/NIKTODIR-nix-wrapper-fix.patch diff --git a/pkgs/tools/networking/nikto/default.nix b/pkgs/unit/ni/nikto/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nikto/default.nix rename to pkgs/unit/ni/nikto/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/unit/ni/nil/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/nil/default.nix rename to pkgs/unit/ni/nil/pkg-fun.nix diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/unit/ni/nilfs-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/nilfs-utils/default.nix rename to pkgs/unit/ni/nilfs-utils/pkg-fun.nix diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/unit/ni/nimlsp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/nimlsp/default.nix rename to pkgs/unit/ni/nimlsp/pkg-fun.nix diff --git a/pkgs/applications/file-managers/nimmm/default.nix b/pkgs/unit/ni/nimmm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/nimmm/default.nix rename to pkgs/unit/ni/nimmm/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/unit/ni/ninja/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/ninja/default.nix rename to pkgs/unit/ni/ninja/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/unit/ni/ninja/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/ninja/setup-hook.sh rename to pkgs/unit/ni/ninja/setup-hook.sh diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/unit/ni/ninjas2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ninjas2/default.nix rename to pkgs/unit/ni/ninjas2/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/unit/ni/ninka/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ninka/default.nix rename to pkgs/unit/ni/ninka/pkg-fun.nix diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/unit/ni/ninvaders/pkg-fun.nix similarity index 100% rename from pkgs/games/ninvaders/default.nix rename to pkgs/unit/ni/ninvaders/pkg-fun.nix diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/unit/ni/nip2/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/nip2/default.nix rename to pkgs/unit/ni/nip2/pkg-fun.nix diff --git a/pkgs/tools/misc/nitch/default.nix b/pkgs/unit/ni/nitch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nitch/default.nix rename to pkgs/unit/ni/nitch/pkg-fun.nix diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/unit/ni/nitrogen/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/nitrogen/default.nix rename to pkgs/unit/ni/nitrogen/pkg-fun.nix diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/unit/ni/nitrokey-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nitrokey-app/udev-rules.nix rename to pkgs/unit/ni/nitrokey-udev-rules/pkg-fun.nix diff --git a/pkgs/servers/nitter/nitter-version.patch b/pkgs/unit/ni/nitter/nitter-version.patch similarity index 100% rename from pkgs/servers/nitter/nitter-version.patch rename to pkgs/unit/ni/nitter/nitter-version.patch diff --git a/pkgs/servers/nitter/default.nix b/pkgs/unit/ni/nitter/pkg-fun.nix similarity index 100% rename from pkgs/servers/nitter/default.nix rename to pkgs/unit/ni/nitter/pkg-fun.nix diff --git a/pkgs/servers/nitter/update.sh b/pkgs/unit/ni/nitter/update.sh similarity index 100% rename from pkgs/servers/nitter/update.sh rename to pkgs/unit/ni/nitter/update.sh diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/unit/ni/nix-bash-completions/pkg-fun.nix similarity index 100% rename from pkgs/shells/bash/nix-bash-completions/default.nix rename to pkgs/unit/ni/nix-bash-completions/pkg-fun.nix diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in b/pkgs/unit/ni/nix-binary-cache/nix-binary-cache-start.in similarity index 100% rename from pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in rename to pkgs/unit/ni/nix-binary-cache/nix-binary-cache-start.in diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/unit/ni/nix-binary-cache/nix-binary-cache.cgi.in similarity index 100% rename from pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in rename to pkgs/unit/ni/nix-binary-cache/nix-binary-cache.cgi.in diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/unit/ni/nix-binary-cache/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/nix-binary-cache/default.nix rename to pkgs/unit/ni/nix-binary-cache/pkg-fun.nix diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/unit/ni/nix-bisect/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/nix-bisect/default.nix rename to pkgs/unit/ni/nix-bisect/pkg-fun.nix diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/unit/ni/nix-build-uncached/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/nix-build-uncached/default.nix rename to pkgs/unit/ni/nix-build-uncached/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/unit/ni/nix-bundle/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-bundle/default.nix rename to pkgs/unit/ni/nix-bundle/pkg-fun.nix diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/unit/ni/nix-direnv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nix-direnv/default.nix rename to pkgs/unit/ni/nix-direnv/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/unit/ni/nix-doc/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-doc/default.nix rename to pkgs/unit/ni/nix-doc/pkg-fun.nix diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/pkgs/unit/ni/nix-generate-from-cpan/nix-generate-from-cpan.pl similarity index 100% rename from maintainers/scripts/nix-generate-from-cpan.pl rename to pkgs/unit/ni/nix-generate-from-cpan/nix-generate-from-cpan.pl diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/pkgs/unit/ni/nix-generate-from-cpan/pkg-fun.nix similarity index 100% rename from maintainers/scripts/nix-generate-from-cpan.nix rename to pkgs/unit/ni/nix-generate-from-cpan/pkg-fun.nix diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/unit/ni/nix-gitignore/pkg-fun.nix similarity index 100% rename from pkgs/build-support/nix-gitignore/default.nix rename to pkgs/unit/ni/nix-gitignore/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-index/wrapper.nix b/pkgs/unit/ni/nix-index/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-index/wrapper.nix rename to pkgs/unit/ni/nix-index/pkg-fun.nix diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/unit/ni/nix-info/info.sh similarity index 100% rename from pkgs/tools/nix/info/info.sh rename to pkgs/unit/ni/nix-info/info.sh diff --git a/pkgs/tools/nix/info/multiuser.nix b/pkgs/unit/ni/nix-info/multiuser.nix similarity index 100% rename from pkgs/tools/nix/info/multiuser.nix rename to pkgs/unit/ni/nix-info/multiuser.nix diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/unit/ni/nix-info/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/info/default.nix rename to pkgs/unit/ni/nix-info/pkg-fun.nix diff --git a/pkgs/tools/nix/info/relaxedsandbox.nix b/pkgs/unit/ni/nix-info/relaxedsandbox.nix similarity index 100% rename from pkgs/tools/nix/info/relaxedsandbox.nix rename to pkgs/unit/ni/nix-info/relaxedsandbox.nix diff --git a/pkgs/tools/nix/info/sandbox.nix b/pkgs/unit/ni/nix-info/sandbox.nix similarity index 100% rename from pkgs/tools/nix/info/sandbox.nix rename to pkgs/unit/ni/nix-info/sandbox.nix diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/unit/ni/nix-ld/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nix-ld/default.nix rename to pkgs/unit/ni/nix-ld/pkg-fun.nix diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/unit/ni/nix-output-monitor/generated-package.nix similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/generated-package.nix rename to pkgs/unit/ni/nix-output-monitor/generated-package.nix diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/unit/ni/nix-output-monitor/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/default.nix rename to pkgs/unit/ni/nix-output-monitor/pkg-fun.nix diff --git a/pkgs/tools/nix/nix-output-monitor/update.sh b/pkgs/unit/ni/nix-output-monitor/update.sh similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/update.sh rename to pkgs/unit/ni/nix-output-monitor/update.sh diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/unit/ni/nix-pin/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-pin/default.nix rename to pkgs/unit/ni/nix-pin/pkg-fun.nix diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/unit/ni/nix-plugins/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nix-plugins/default.nix rename to pkgs/unit/ni/nix-plugins/pkg-fun.nix diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/unit/ni/nix-prefetch-docker/nix-prefetch-docker similarity index 100% rename from pkgs/build-support/docker/nix-prefetch-docker rename to pkgs/unit/ni/nix-prefetch-docker/nix-prefetch-docker diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/unit/ni/nix-prefetch-docker/pkg-fun.nix similarity index 100% rename from pkgs/build-support/docker/nix-prefetch-docker.nix rename to pkgs/unit/ni/nix-prefetch-docker/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/unit/ni/nix-prefetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-prefetch/default.nix rename to pkgs/unit/ni/nix-prefetch/pkg-fun.nix diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/unit/ni/nix-query-tree-viewer/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nix-query-tree-viewer/default.nix rename to pkgs/unit/ni/nix-query-tree-viewer/pkg-fun.nix diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/unit/ni/nix-script/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nix-script/default.nix rename to pkgs/unit/ni/nix-script/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/unit/ni/nix-serve/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-serve/default.nix rename to pkgs/unit/ni/nix-serve/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/unit/ni/nix-simple-deploy/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-simple-deploy/default.nix rename to pkgs/unit/ni/nix-simple-deploy/pkg-fun.nix diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/pkgs/unit/ni/nix-store-gcs-proxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nix-store-gcs-proxy/default.nix rename to pkgs/unit/ni/nix-store-gcs-proxy/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/unit/ni/nix-top/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-top/default.nix rename to pkgs/unit/ni/nix-top/pkg-fun.nix diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/unit/ni/nix-tour/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nix-tour/default.nix rename to pkgs/unit/ni/nix-tour/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/unit/ni/nix-universal-prefetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-universal-prefetch/default.nix rename to pkgs/unit/ni/nix-universal-prefetch/pkg-fun.nix diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/unit/ni/nix-update-script/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/nix-update.nix rename to pkgs/unit/ni/nix-update-script/pkg-fun.nix diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/unit/ni/nix-update-source/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nix-update-source/default.nix rename to pkgs/unit/ni/nix-update-source/pkg-fun.nix diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/unit/ni/nix-zsh-completions/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/nix-zsh-completions/default.nix rename to pkgs/unit/ni/nix-zsh-completions/pkg-fun.nix diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/unit/ni/nixdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nixdoc/default.nix rename to pkgs/unit/ni/nixdoc/pkg-fun.nix diff --git a/pkgs/tools/nix/nixel/default.nix b/pkgs/unit/ni/nixel/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nixel/default.nix rename to pkgs/unit/ni/nixel/pkg-fun.nix diff --git a/pkgs/tools/package-management/nixops/deps.nix b/pkgs/unit/ni/nixops-dns/deps.nix similarity index 100% rename from pkgs/tools/package-management/nixops/deps.nix rename to pkgs/unit/ni/nixops-dns/deps.nix diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/unit/ni/nixops-dns/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nixops/nixops-dns.nix rename to pkgs/unit/ni/nixops-dns/pkg-fun.nix diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/unit/ni/nixos-artwork/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/nixos-artwork/default.nix rename to pkgs/unit/ni/nixos-artwork/pkg-fun.nix diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/unit/ni/nixos-artwork/wallpapers.nix similarity index 100% rename from pkgs/data/misc/nixos-artwork/wallpapers.nix rename to pkgs/unit/ni/nixos-artwork/wallpapers.nix diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh b/pkgs/unit/ni/nixos-container/nixos-container-completion.sh similarity index 100% rename from pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh rename to pkgs/unit/ni/nixos-container/nixos-container-completion.sh diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/unit/ni/nixos-container/nixos-container.pl similarity index 100% rename from pkgs/tools/virtualization/nixos-container/nixos-container.pl rename to pkgs/unit/ni/nixos-container/nixos-container.pl diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/unit/ni/nixos-container/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/nixos-container/default.nix rename to pkgs/unit/ni/nixos-container/pkg-fun.nix diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/unit/ni/nixos-generators/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nixos-generators/default.nix rename to pkgs/unit/ni/nixos-generators/pkg-fun.nix diff --git a/pkgs/data/misc/nixos-artwork/grub2-theme.nix b/pkgs/unit/ni/nixos-grub2-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/nixos-artwork/grub2-theme.nix rename to pkgs/unit/ni/nixos-grub2-theme/pkg-fun.nix diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/unit/ni/nixos-icons/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/nixos-artwork/icons.nix rename to pkgs/unit/ni/nixos-icons/pkg-fun.nix diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/unit/ni/nixos-install-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nixos-install-tools/default.nix rename to pkgs/unit/ni/nixos-install-tools/pkg-fun.nix diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/unit/ni/nixos-shell/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/nixos-shell/default.nix rename to pkgs/unit/ni/nixos-shell/pkg-fun.nix diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/unit/ni/nixpacks/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/nixpacks/default.nix rename to pkgs/unit/ni/nixpacks/pkg-fun.nix diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/unit/ni/nixpkgs-fmt/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nixpkgs-fmt/default.nix rename to pkgs/unit/ni/nixpkgs-fmt/pkg-fun.nix diff --git a/pkgs/tools/nix/nixpkgs-hammering/default.nix b/pkgs/unit/ni/nixpkgs-hammering/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/nixpkgs-hammering/default.nix rename to pkgs/unit/ni/nixpkgs-hammering/pkg-fun.nix diff --git a/maintainers/scripts/nixpkgs-lint.pl b/pkgs/unit/ni/nixpkgs-lint/nixpkgs-lint.pl similarity index 100% rename from maintainers/scripts/nixpkgs-lint.pl rename to pkgs/unit/ni/nixpkgs-lint/nixpkgs-lint.pl diff --git a/maintainers/scripts/nixpkgs-lint.nix b/pkgs/unit/ni/nixpkgs-lint/pkg-fun.nix similarity index 100% rename from maintainers/scripts/nixpkgs-lint.nix rename to pkgs/unit/ni/nixpkgs-lint/pkg-fun.nix diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/unit/ni/nixpkgs-review/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nixpkgs-review/default.nix rename to pkgs/unit/ni/nixpkgs-review/pkg-fun.nix diff --git a/pkgs/games/njam/logfile.patch b/pkgs/unit/nj/njam/logfile.patch similarity index 100% rename from pkgs/games/njam/logfile.patch rename to pkgs/unit/nj/njam/logfile.patch diff --git a/pkgs/games/njam/default.nix b/pkgs/unit/nj/njam/pkg-fun.nix similarity index 100% rename from pkgs/games/njam/default.nix rename to pkgs/unit/nj/njam/pkg-fun.nix diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/unit/nk/nkeys/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/nkeys/default.nix rename to pkgs/unit/nk/nkeys/pkg-fun.nix diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/unit/nk/nkf/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/nkf/default.nix rename to pkgs/unit/nk/nkf/pkg-fun.nix diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/unit/nl/nload/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/nload/default.nix rename to pkgs/unit/nl/nload/pkg-fun.nix diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/unit/nl/nlohmann_json/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nlohmann_json/default.nix rename to pkgs/unit/nl/nlohmann_json/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/unit/nl/nlojet/nlojet_clang_fix.patch similarity index 100% rename from pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch rename to pkgs/unit/nl/nlojet/nlojet_clang_fix.patch diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/unit/nl/nlojet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/nlojet/default.nix rename to pkgs/unit/nl/nlojet/pkg-fun.nix diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/unit/nm/nmap-formatter/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nmap-formatter/default.nix rename to pkgs/unit/nm/nmap-formatter/pkg-fun.nix diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/unit/nm/nmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nmap/default.nix rename to pkgs/unit/nm/nmap/pkg-fun.nix diff --git a/pkgs/tools/security/nmap/zenmap.patch b/pkgs/unit/nm/nmap/zenmap.patch similarity index 100% rename from pkgs/tools/security/nmap/zenmap.patch rename to pkgs/unit/nm/nmap/zenmap.patch diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/unit/nm/nmon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nmon/default.nix rename to pkgs/unit/nm/nmon/pkg-fun.nix diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/unit/nm/nmrpflash/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/nmrpflash/default.nix rename to pkgs/unit/nm/nmrpflash/pkg-fun.nix diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/unit/nm/nms/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nms/default.nix rename to pkgs/unit/nm/nms/pkg-fun.nix diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/unit/nn/nng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nng/default.nix rename to pkgs/unit/nn/nng/pkg-fun.nix diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/unit/nn/nnn/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/nnn/default.nix rename to pkgs/unit/nn/nnn/pkg-fun.nix diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/unit/nn/nnpdf/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/nnpdf/default.nix rename to pkgs/unit/nn/nnpdf/pkg-fun.nix diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/unit/nn/nntp-proxy/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/nntp-proxy/default.nix rename to pkgs/unit/nn/nntp-proxy/pkg-fun.nix diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/unit/no/noaa-apt/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/noaa-apt/default.nix rename to pkgs/unit/no/noaa-apt/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/unit/no/node-problem-detector/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/node-problem-detector/default.nix rename to pkgs/unit/no/node-problem-detector/pkg-fun.nix diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/unit/no/nodenv/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nodenv/default.nix rename to pkgs/unit/no/nodenv/pkg-fun.nix diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/unit/no/noice/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/noice/default.nix rename to pkgs/unit/no/noice/pkg-fun.nix diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/unit/no/noip/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/noip/default.nix rename to pkgs/unit/no/noip/pkg-fun.nix diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/unit/no/noise-repellent/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/noise-repellent/default.nix rename to pkgs/unit/no/noise-repellent/pkg-fun.nix diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/unit/no/noisetorch/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/noisetorch/default.nix rename to pkgs/unit/no/noisetorch/pkg-fun.nix diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/unit/no/nomachine-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/nomachine-client/default.nix rename to pkgs/unit/no/nomachine-client/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/unit/no/nomad-autoscaler/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/nomad-autoscaler/default.nix rename to pkgs/unit/no/nomad-autoscaler/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/unit/no/nomad-driver-podman/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/nomad-driver-podman/default.nix rename to pkgs/unit/no/nomad-driver-podman/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/unit/no/nomad-pack/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/nomad-pack/default.nix rename to pkgs/unit/no/nomad-pack/pkg-fun.nix diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/unit/no/nominatim/pkg-fun.nix similarity index 100% rename from pkgs/servers/nominatim/default.nix rename to pkgs/unit/no/nominatim/pkg-fun.nix diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/unit/no/nomino/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nomino/default.nix rename to pkgs/unit/no/nomino/pkg-fun.nix diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/unit/no/nordic/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/nordic/default.nix rename to pkgs/unit/no/nordic/pkg-fun.nix diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/unit/no/nordzy-cursor-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/nordzy-cursor-theme/default.nix rename to pkgs/unit/no/nordzy-cursor-theme/pkg-fun.nix diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/unit/no/nordzy-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/nordzy-icon-theme/default.nix rename to pkgs/unit/no/nordzy-icon-theme/pkg-fun.nix diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/unit/no/normalize/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/normalize/default.nix rename to pkgs/unit/no/normalize/pkg-fun.nix diff --git a/pkgs/development/tools/norminette/default.nix b/pkgs/unit/no/norminette/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/norminette/default.nix rename to pkgs/unit/no/norminette/pkg-fun.nix diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/unit/no/norwester-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/norwester/default.nix rename to pkgs/unit/no/norwester-font/pkg-fun.nix diff --git a/pkgs/tools/security/nosqli/default.nix b/pkgs/unit/no/nosqli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nosqli/default.nix rename to pkgs/unit/no/nosqli/pkg-fun.nix diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/unit/no/notable/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/notable/default.nix rename to pkgs/unit/no/notable/pkg-fun.nix diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/unit/no/notary/no-git-usage.patch similarity index 100% rename from pkgs/tools/security/notary/no-git-usage.patch rename to pkgs/unit/no/notary/no-git-usage.patch diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/unit/no/notary/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/notary/default.nix rename to pkgs/unit/no/notary/pkg-fun.nix diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/unit/no/notcurses/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/notcurses/default.nix rename to pkgs/unit/no/notcurses/pkg-fun.nix diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/unit/no/notejot/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/notejot/default.nix rename to pkgs/unit/no/notejot/pkg-fun.nix diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/unit/no/notemap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/notemap/default.nix rename to pkgs/unit/no/notemap/pkg-fun.nix diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/unit/no/notes-up/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/notes-up/default.nix rename to pkgs/unit/no/notes-up/pkg-fun.nix diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/unit/no/noteshrink/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/noteshrink/default.nix rename to pkgs/unit/no/noteshrink/pkg-fun.nix diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/unit/no/notify-desktop/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/notify-desktop/default.nix rename to pkgs/unit/no/notify-desktop/pkg-fun.nix diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/unit/no/notify-osd-customizable/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/notify-osd-customizable/default.nix rename to pkgs/unit/no/notify-osd-customizable/pkg-fun.nix diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/unit/no/notify-osd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/notify-osd/default.nix rename to pkgs/unit/no/notify-osd/pkg-fun.nix diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/unit/no/notify-sharp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/notify-sharp/default.nix rename to pkgs/unit/no/notify-sharp/pkg-fun.nix diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/unit/no/notify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/notify/default.nix rename to pkgs/unit/no/notify/pkg-fun.nix diff --git a/pkgs/applications/misc/notifymuch/default.nix b/pkgs/unit/no/notifymuch/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/notifymuch/default.nix rename to pkgs/unit/no/notifymuch/pkg-fun.nix diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/unit/no/notion-app-enhanced/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/notion-app-enhanced/default.nix rename to pkgs/unit/no/notion-app-enhanced/pkg-fun.nix diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/unit/no/notion/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/notion/default.nix rename to pkgs/unit/no/notion/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/unit/no/notmuch-addrlookup/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix rename to pkgs/unit/no/notmuch-addrlookup/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/unit/no/notmuch-bower/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/notmuch-bower/default.nix rename to pkgs/unit/no/notmuch-bower/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/unit/no/notmuch-mailmover/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix rename to pkgs/unit/no/notmuch-mailmover/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/unit/no/notmuch-mutt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/notmuch/mutt.nix rename to pkgs/unit/no/notmuch-mutt/pkg-fun.nix diff --git a/pkgs/applications/networking/novnc/fix-paths.patch b/pkgs/unit/no/novnc/fix-paths.patch similarity index 100% rename from pkgs/applications/networking/novnc/fix-paths.patch rename to pkgs/unit/no/novnc/fix-paths.patch diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/unit/no/novnc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/novnc/default.nix rename to pkgs/unit/no/novnc/pkg-fun.nix diff --git a/pkgs/applications/networking/novnc/websockify.patch b/pkgs/unit/no/novnc/websockify.patch similarity index 100% rename from pkgs/applications/networking/novnc/websockify.patch rename to pkgs/unit/no/novnc/websockify.patch diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/unit/no/noweb/no-FAQ.patch similarity index 100% rename from pkgs/development/tools/literate-programming/noweb/no-FAQ.patch rename to pkgs/unit/no/noweb/no-FAQ.patch diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/unit/no/noweb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/literate-programming/noweb/default.nix rename to pkgs/unit/no/noweb/pkg-fun.nix diff --git a/pkgs/tools/package-management/nox/nox-review-wip.patch b/pkgs/unit/no/nox/nox-review-wip.patch similarity index 100% rename from pkgs/tools/package-management/nox/nox-review-wip.patch rename to pkgs/unit/no/nox/nox-review-wip.patch diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/unit/no/nox/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nox/default.nix rename to pkgs/unit/no/nox/pkg-fun.nix diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/unit/np/np2kai/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/np2kai/default.nix rename to pkgs/unit/np/np2kai/pkg-fun.nix diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/unit/np/npapi_sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/npapi-sdk/default.nix rename to pkgs/unit/np/npapi_sdk/pkg-fun.nix diff --git a/pkgs/development/interpreters/npiet/default.nix b/pkgs/unit/np/npiet/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/npiet/default.nix rename to pkgs/unit/np/npiet/pkg-fun.nix diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/unit/np/npins/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/npins/default.nix rename to pkgs/unit/np/npins/pkg-fun.nix diff --git a/pkgs/tools/nix/npins/source.nix b/pkgs/unit/np/npins/source.nix similarity index 100% rename from pkgs/tools/nix/npins/source.nix rename to pkgs/unit/np/npins/source.nix diff --git a/pkgs/tools/nix/npins/sources.json b/pkgs/unit/np/npins/sources.json similarity index 100% rename from pkgs/tools/nix/npins/sources.json rename to pkgs/unit/np/npins/sources.json diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh b/pkgs/unit/np/npmHooks/npm-build-hook.sh similarity index 100% rename from pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh rename to pkgs/unit/np/npmHooks/npm-build-hook.sh diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/unit/np/npmHooks/npm-config-hook.sh similarity index 100% rename from pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh rename to pkgs/unit/np/npmHooks/npm-config-hook.sh diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/unit/np/npmHooks/npm-install-hook.sh similarity index 100% rename from pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh rename to pkgs/unit/np/npmHooks/npm-install-hook.sh diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/unit/np/npmHooks/pkg-fun.nix similarity index 100% rename from pkgs/build-support/node/build-npm-package/hooks/default.nix rename to pkgs/unit/np/npmHooks/pkg-fun.nix diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/unit/np/npth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/npth/default.nix rename to pkgs/unit/np/npth/pkg-fun.nix diff --git a/pkgs/games/npush/default.nix b/pkgs/unit/np/npush/pkg-fun.nix similarity index 100% rename from pkgs/games/npush/default.nix rename to pkgs/unit/np/npush/pkg-fun.nix diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/unit/nq/nq/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/nq/default.nix rename to pkgs/unit/nq/nq/pkg-fun.nix diff --git a/pkgs/development/compilers/nqc/nqc-unistd.patch b/pkgs/unit/nq/nqc/nqc-unistd.patch similarity index 100% rename from pkgs/development/compilers/nqc/nqc-unistd.patch rename to pkgs/unit/nq/nqc/nqc-unistd.patch diff --git a/pkgs/development/compilers/nqc/default.nix b/pkgs/unit/nq/nqc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/nqc/default.nix rename to pkgs/unit/nq/nqc/pkg-fun.nix diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/unit/nq/nqp/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/rakudo/nqp.nix rename to pkgs/unit/nq/nqp/pkg-fun.nix diff --git a/pkgs/tools/networking/nqptp/default.nix b/pkgs/unit/nq/nqptp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nqptp/default.nix rename to pkgs/unit/nq/nqptp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/nrf-command-line-tools/default.nix b/pkgs/unit/nr/nrf-command-line-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/nrf-command-line-tools/default.nix rename to pkgs/unit/nr/nrf-command-line-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/nrf5-sdk/default.nix b/pkgs/unit/nr/nrf5-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nrf5-sdk/default.nix rename to pkgs/unit/nr/nrf5-sdk/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/nrfconnect/default.nix b/pkgs/unit/nr/nrfconnect/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/nrfconnect/default.nix rename to pkgs/unit/nr/nrfconnect/pkg-fun.nix diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/unit/nr/nrfutil/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/nrfutil/default.nix rename to pkgs/unit/nr/nrfutil/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/unit/nr/nrg2iso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/nrg2iso/default.nix rename to pkgs/unit/nr/nrg2iso/pkg-fun.nix diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/unit/nr/nrpl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nrpl/default.nix rename to pkgs/unit/nr/nrpl/pkg-fun.nix diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/unit/nr/nrsc5/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nrsc5/default.nix rename to pkgs/unit/nr/nrsc5/pkg-fun.nix diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/unit/ns/NSPlist/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/NSPlist/default.nix rename to pkgs/unit/ns/NSPlist/pkg-fun.nix diff --git a/pkgs/shells/nsh/default.nix b/pkgs/unit/ns/nsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/nsh/default.nix rename to pkgs/unit/ns/nsh/pkg-fun.nix diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/unit/ns/nsis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/nsis/default.nix rename to pkgs/unit/ns/nsis/pkg-fun.nix diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/unit/ns/nsjail/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nsjail/default.nix rename to pkgs/unit/ns/nsjail/pkg-fun.nix diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/unit/ns/nsncd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nsncd/default.nix rename to pkgs/unit/ns/nsncd/pkg-fun.nix diff --git a/pkgs/servers/nsq/default.nix b/pkgs/unit/ns/nsq/pkg-fun.nix similarity index 100% rename from pkgs/servers/nsq/default.nix rename to pkgs/unit/ns/nsq/pkg-fun.nix diff --git a/pkgs/os-specific/linux/nss_ldap/crashes.patch b/pkgs/unit/ns/nss_ldap/crashes.patch similarity index 100% rename from pkgs/os-specific/linux/nss_ldap/crashes.patch rename to pkgs/unit/ns/nss_ldap/crashes.patch diff --git a/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch b/pkgs/unit/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch similarity index 100% rename from pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch rename to pkgs/unit/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/unit/ns/nss_ldap/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nss_ldap/default.nix rename to pkgs/unit/ns/nss_ldap/pkg-fun.nix diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/unit/ns/nss_pam_ldapd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nss-pam-ldapd/default.nix rename to pkgs/unit/ns/nss_pam_ldapd/pkg-fun.nix diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/unit/ns/nss_wrapper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nss_wrapper/default.nix rename to pkgs/unit/ns/nss_wrapper/pkg-fun.nix diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/unit/ns/nssmdns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nss-mdns/default.nix rename to pkgs/unit/ns/nssmdns/pkg-fun.nix diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/unit/ns/nsync/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nsync/default.nix rename to pkgs/unit/ns/nsync/pkg-fun.nix diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/unit/nt/ntbtls/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ntbtls/default.nix rename to pkgs/unit/nt/ntbtls/pkg-fun.nix diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/unit/nt/ntirpc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ntirpc/default.nix rename to pkgs/unit/nt/ntirpc/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/unit/nt/ntk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/ntk/default.nix rename to pkgs/unit/nt/ntk/pkg-fun.nix diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/unit/nt/ntl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ntl/default.nix rename to pkgs/unit/nt/ntl/pkg-fun.nix diff --git a/pkgs/tools/security/ntlmrecon/default.nix b/pkgs/unit/nt/ntlmrecon/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ntlmrecon/default.nix rename to pkgs/unit/nt/ntlmrecon/pkg-fun.nix diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/unit/nt/ntopng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ntopng/default.nix rename to pkgs/unit/nt/ntopng/pkg-fun.nix diff --git a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/pkgs/unit/nt/ntp/glibc-2.34-fix.patch similarity index 100% rename from pkgs/tools/networking/ntp/glibc-2.34-fix.patch rename to pkgs/unit/nt/ntp/glibc-2.34-fix.patch diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/unit/nt/ntp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ntp/default.nix rename to pkgs/unit/nt/ntp/pkg-fun.nix diff --git a/pkgs/development/libraries/ntrack/libnl-fix.patch b/pkgs/unit/nt/ntrack/libnl-fix.patch similarity index 100% rename from pkgs/development/libraries/ntrack/libnl-fix.patch rename to pkgs/unit/nt/ntrack/libnl-fix.patch diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/unit/nt/ntrack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ntrack/default.nix rename to pkgs/unit/nt/ntrack/pkg-fun.nix diff --git a/pkgs/tools/networking/nttcp/format-security.patch b/pkgs/unit/nt/nttcp/format-security.patch similarity index 100% rename from pkgs/tools/networking/nttcp/format-security.patch rename to pkgs/unit/nt/nttcp/format-security.patch diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/unit/nt/nttcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nttcp/default.nix rename to pkgs/unit/nt/nttcp/pkg-fun.nix diff --git a/pkgs/tools/networking/ntttcp/default.nix b/pkgs/unit/nt/ntttcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ntttcp/default.nix rename to pkgs/unit/nt/ntttcp/pkg-fun.nix diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/unit/nu/nuXmv/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/nuXmv/default.nix rename to pkgs/unit/nu/nuXmv/pkg-fun.nix diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/unit/nu/nuclear/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/nuclear/default.nix rename to pkgs/unit/nu/nuclear/pkg-fun.nix diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/unit/nu/nuclei/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nuclei/default.nix rename to pkgs/unit/nu/nuclei/pkg-fun.nix diff --git a/pkgs/games/nudoku/default.nix b/pkgs/unit/nu/nudoku/pkg-fun.nix similarity index 100% rename from pkgs/games/nudoku/default.nix rename to pkgs/unit/nu/nudoku/pkg-fun.nix diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/unit/nu/nuget-to-nix/nuget-to-nix.sh similarity index 100% rename from pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh rename to pkgs/unit/nu/nuget-to-nix/nuget-to-nix.sh diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/unit/nu/nuget-to-nix/pkg-fun.nix similarity index 100% rename from pkgs/build-support/dotnet/nuget-to-nix/default.nix rename to pkgs/unit/nu/nuget-to-nix/pkg-fun.nix diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/unit/nu/nullidentdmod/pkg-fun.nix similarity index 100% rename from pkgs/servers/identd/nullidentdmod/default.nix rename to pkgs/unit/nu/nullidentdmod/pkg-fun.nix diff --git a/pkgs/tools/text/num-utils/default.nix b/pkgs/unit/nu/num-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/num-utils/default.nix rename to pkgs/unit/nu/num-utils/pkg-fun.nix diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/unit/nu/numactl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/numactl/default.nix rename to pkgs/unit/nu/numactl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/numad/numad-linker-flags.patch b/pkgs/unit/nu/numad/numad-linker-flags.patch similarity index 100% rename from pkgs/os-specific/linux/numad/numad-linker-flags.patch rename to pkgs/unit/nu/numad/numad-linker-flags.patch diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/unit/nu/numad/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/numad/default.nix rename to pkgs/unit/nu/numad/pkg-fun.nix diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/unit/nu/numatop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/numatop/default.nix rename to pkgs/unit/nu/numatop/pkg-fun.nix diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/unit/nu/numberstation/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/numberstation/default.nix rename to pkgs/unit/nu/numberstation/pkg-fun.nix diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/unit/nu/numdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/numdiff/default.nix rename to pkgs/unit/nu/numdiff/pkg-fun.nix diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/unit/nu/numix-cursor-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/numix-cursor-theme/default.nix rename to pkgs/unit/nu/numix-cursor-theme/pkg-fun.nix diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/unit/nu/numix-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/numix/default.nix rename to pkgs/unit/nu/numix-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/unit/nu/numix-icon-theme-circle/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/numix-icon-theme-circle/default.nix rename to pkgs/unit/nu/numix-icon-theme-circle/pkg-fun.nix diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/unit/nu/numix-icon-theme-square/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/numix-icon-theme-square/default.nix rename to pkgs/unit/nu/numix-icon-theme-square/pkg-fun.nix diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/unit/nu/numix-solarized-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/numix-solarized/default.nix rename to pkgs/unit/nu/numix-solarized-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/unit/nu/numix-sx-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/numix-sx/default.nix rename to pkgs/unit/nu/numix-sx-gtk-theme/pkg-fun.nix diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/unit/nu/numlockx/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/numlockx/default.nix rename to pkgs/unit/nu/numlockx/pkg-fun.nix diff --git a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch b/pkgs/unit/nu/numworks-epsilon/0001-ion-linux-makerules.patch similarity index 100% rename from pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch rename to pkgs/unit/nu/numworks-epsilon/0001-ion-linux-makerules.patch diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/unit/nu/numworks-epsilon/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/numworks-epsilon/default.nix rename to pkgs/unit/nu/numworks-epsilon/pkg-fun.nix diff --git a/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules b/pkgs/unit/nu/numworks-udev-rules/50-numworks-calculator.rules similarity index 100% rename from pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules rename to pkgs/unit/nu/numworks-udev-rules/50-numworks-calculator.rules diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/unit/nu/numworks-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/numworks-udev-rules/default.nix rename to pkgs/unit/nu/numworks-udev-rules/pkg-fun.nix diff --git a/pkgs/os-specific/linux/numworks-udev-rules/update.sh b/pkgs/unit/nu/numworks-udev-rules/update.sh similarity index 100% rename from pkgs/os-specific/linux/numworks-udev-rules/update.sh rename to pkgs/unit/nu/numworks-udev-rules/update.sh diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/unit/nu/nuraft/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nuraft/default.nix rename to pkgs/unit/nu/nuraft/pkg-fun.nix diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/unit/nu/nurl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nurl/default.nix rename to pkgs/unit/nu/nurl/pkg-fun.nix diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/unit/nu/nusmv/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/nusmv/default.nix rename to pkgs/unit/nu/nusmv/pkg-fun.nix diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/unit/nu/nuspell/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nuspell/default.nix rename to pkgs/unit/nu/nuspell/pkg-fun.nix diff --git a/pkgs/applications/misc/nut/hardcode-paths.patch b/pkgs/unit/nu/nut/hardcode-paths.patch similarity index 100% rename from pkgs/applications/misc/nut/hardcode-paths.patch rename to pkgs/unit/nu/nut/hardcode-paths.patch diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/unit/nu/nut/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nut/default.nix rename to pkgs/unit/nu/nut/pkg-fun.nix diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/unit/nu/nuttcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nuttcp/default.nix rename to pkgs/unit/nu/nuttcp/pkg-fun.nix diff --git a/pkgs/tools/misc/nux/default.nix b/pkgs/unit/nu/nux/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nux/default.nix rename to pkgs/unit/nu/nux/pkg-fun.nix diff --git a/pkgs/development/libraries/nv-codec-headers/10_x.nix b/pkgs/unit/nv/nv-codec-headers-10/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nv-codec-headers/10_x.nix rename to pkgs/unit/nv/nv-codec-headers-10/pkg-fun.nix diff --git a/pkgs/development/libraries/nv-codec-headers/11_x.nix b/pkgs/unit/nv/nv-codec-headers-11/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nv-codec-headers/11_x.nix rename to pkgs/unit/nv/nv-codec-headers-11/pkg-fun.nix diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/unit/nv/nv-codec-headers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nv-codec-headers/default.nix rename to pkgs/unit/nv/nv-codec-headers/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/unit/nv/nvc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/nvc/default.nix rename to pkgs/unit/nv/nvc/pkg-fun.nix diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/unit/nv/nvd/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/nvd/default.nix rename to pkgs/unit/nv/nvd/pkg-fun.nix diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/unit/nv/nvi/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/nvi/default.nix rename to pkgs/unit/nv/nvi/pkg-fun.nix diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/unit/nv/nvidia-optical-flow-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix rename to pkgs/unit/nv/nvidia-optical-flow-sdk/pkg-fun.nix diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/unit/nv/nvidia-texture-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nvidia-texture-tools/default.nix rename to pkgs/unit/nv/nvidia-texture-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/unit/nv/nvidia-video-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/nvidia-video-sdk/default.nix rename to pkgs/unit/nv/nvidia-video-sdk/pkg-fun.nix diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/unit/nv/nvidia_cg_toolkit/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/nvidia-cg-toolkit/default.nix rename to pkgs/unit/nv/nvidia_cg_toolkit/pkg-fun.nix diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/unit/nv/nvimpager/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nvimpager/default.nix rename to pkgs/unit/nv/nvimpager/pkg-fun.nix diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/unit/nv/nvitop/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/nvitop/default.nix rename to pkgs/unit/nv/nvitop/pkg-fun.nix diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/unit/nv/nvme-cli/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nvme-cli/default.nix rename to pkgs/unit/nv/nvme-cli/pkg-fun.nix diff --git a/pkgs/os-specific/linux/nvmet-cli/default.nix b/pkgs/unit/nv/nvmet-cli/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/nvmet-cli/default.nix rename to pkgs/unit/nv/nvmet-cli/pkg-fun.nix diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/unit/nv/nvpy/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/nvpy/default.nix rename to pkgs/unit/nv/nvpy/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-bar/fix-paths.patch b/pkgs/unit/nw/nwg-bar/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/nwg-bar/fix-paths.patch rename to pkgs/unit/nw/nwg-bar/fix-paths.patch diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/unit/nw/nwg-bar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-bar/default.nix rename to pkgs/unit/nw/nwg-bar/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/unit/nw/nwg-dock/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-dock/default.nix rename to pkgs/unit/nw/nwg-dock/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/unit/nw/nwg-drawer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-drawer/default.nix rename to pkgs/unit/nw/nwg-drawer/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/unit/nw/nwg-launchers/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-launchers/default.nix rename to pkgs/unit/nw/nwg-launchers/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/unit/nw/nwg-menu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-menu/default.nix rename to pkgs/unit/nw/nwg-menu/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/unit/nw/nwg-panel/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-panel/default.nix rename to pkgs/unit/nw/nwg-panel/pkg-fun.nix diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/unit/nw/nwg-wrapper/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/nwg-wrapper/default.nix rename to pkgs/unit/nw/nwg-wrapper/pkg-fun.nix diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/unit/nw/nwipe/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/nwipe/default.nix rename to pkgs/unit/nw/nwipe/pkg-fun.nix diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/unit/nx/nx-libs/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/nx-libs/default.nix rename to pkgs/unit/nx/nx-libs/pkg-fun.nix diff --git a/pkgs/tools/compression/nx2elf/default.nix b/pkgs/unit/nx/nx2elf/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/nx2elf/default.nix rename to pkgs/unit/nx/nx2elf/pkg-fun.nix diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/unit/nx/nxengine-evo/pkg-fun.nix similarity index 100% rename from pkgs/games/nxengine-evo/default.nix rename to pkgs/unit/nx/nxengine-evo/pkg-fun.nix diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/unit/nx/nxpmicro-mfgtools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix rename to pkgs/unit/nx/nxpmicro-mfgtools/pkg-fun.nix diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/unit/ny/nyancat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/nyancat/default.nix rename to pkgs/unit/ny/nyancat/pkg-fun.nix diff --git a/pkgs/tools/networking/nylon/configure-use-solib.patch b/pkgs/unit/ny/nylon/configure-use-solib.patch similarity index 100% rename from pkgs/tools/networking/nylon/configure-use-solib.patch rename to pkgs/unit/ny/nylon/configure-use-solib.patch diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/unit/ny/nylon/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nylon/default.nix rename to pkgs/unit/ny/nylon/pkg-fun.nix diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/unit/ny/nyx/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/nyx/default.nix rename to pkgs/unit/ny/nyx/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/unit/ny/nyxt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/nyxt/default.nix rename to pkgs/unit/ny/nyxt/pkg-fun.nix diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/unit/o/o/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/o/default.nix rename to pkgs/unit/o/o/pkg-fun.nix diff --git a/pkgs/development/interpreters/oak/default.nix b/pkgs/unit/oa/oak/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/oak/default.nix rename to pkgs/unit/oa/oak/pkg-fun.nix diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/unit/oa/oapi-codegen/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/oapi-codegen/default.nix rename to pkgs/unit/oa/oapi-codegen/pkg-fun.nix diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/unit/oa/oath-toolkit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/oath-toolkit/default.nix rename to pkgs/unit/oa/oath-toolkit/pkg-fun.nix diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/unit/oa/oatpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/oatpp/default.nix rename to pkgs/unit/oa/oatpp/pkg-fun.nix diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/unit/oa/oauth2-proxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/oauth2-proxy/default.nix rename to pkgs/unit/oa/oauth2-proxy/pkg-fun.nix diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/unit/ob/obb/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/clojure/obb.nix rename to pkgs/unit/ob/obb/pkg-fun.nix diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/unit/ob/obconf/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/obconf/default.nix rename to pkgs/unit/ob/obconf/pkg-fun.nix diff --git a/pkgs/applications/emulators/oberon-risc-emu/default.nix b/pkgs/unit/ob/oberon-risc-emu/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/oberon-risc-emu/default.nix rename to pkgs/unit/ob/oberon-risc-emu/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/unit/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch similarity index 100% rename from pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch rename to pkgs/unit/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/unit/ob/obex_data_server/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/obex-data-server/default.nix rename to pkgs/unit/ob/obex_data_server/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/unit/ob/obexd/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/obexd/default.nix rename to pkgs/unit/ob/obexd/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/unit/ob/obexfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/obexfs/default.nix rename to pkgs/unit/ob/obexfs/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/unit/ob/obexftp/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/obexftp/default.nix rename to pkgs/unit/ob/obexftp/pkg-fun.nix diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/unit/ob/obfs4/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/obfs4/default.nix rename to pkgs/unit/ob/obfs4/pkg-fun.nix diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/unit/ob/obinskit/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/obinskit/default.nix rename to pkgs/unit/ob/obinskit/pkg-fun.nix diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/unit/ob/obitools3/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/obitools/obitools3.nix rename to pkgs/unit/ob/obitools3/pkg-fun.nix diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/unit/ob/objconv/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/objconv/default.nix rename to pkgs/unit/ob/objconv/pkg-fun.nix diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/unit/ob/obsidian/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/obsidian/default.nix rename to pkgs/unit/ob/obsidian/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/unit/ob/obuild/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/obuild/default.nix rename to pkgs/unit/ob/obuild/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/unit/oc/ocaml-top/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/ocaml-top/default.nix rename to pkgs/unit/oc/ocaml-top/pkg-fun.nix diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/unit/oc/ocaml_make/pkg-fun.nix similarity index 100% rename from pkgs/development/ocaml-modules/ocamlmake/default.nix rename to pkgs/unit/oc/ocaml_make/pkg-fun.nix diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/unit/oc/ocaml_make/setup-hook.sh similarity index 100% rename from pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh rename to pkgs/unit/oc/ocaml_make/setup-hook.sh diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/unit/oc/ocenaudio/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ocenaudio/default.nix rename to pkgs/unit/oc/ocenaudio/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/unit/oc/ocf-resource-agents/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ocf-resource-agents/default.nix rename to pkgs/unit/oc/ocf-resource-agents/pkg-fun.nix diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/unit/oc/oci-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/oci-cli/default.nix rename to pkgs/unit/oc/oci-cli/pkg-fun.nix diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/unit/oc/oci-seccomp-bpf-hook/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix rename to pkgs/unit/oc/oci-seccomp-bpf-hook/pkg-fun.nix diff --git a/pkgs/build-support/oci-tools/default.nix b/pkgs/unit/oc/ociTools/pkg-fun.nix similarity index 100% rename from pkgs/build-support/oci-tools/default.nix rename to pkgs/unit/oc/ociTools/pkg-fun.nix diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/unit/oc/ocl-icd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ocl-icd/default.nix rename to pkgs/unit/oc/ocl-icd/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/unit/oc/oclgrind/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/oclgrind/default.nix rename to pkgs/unit/oc/oclgrind/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/unit/oc/ocm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/ocm/default.nix rename to pkgs/unit/oc/ocm/pkg-fun.nix diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/unit/oc/ocproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ocproxy/default.nix rename to pkgs/unit/oc/ocproxy/pkg-fun.nix diff --git a/pkgs/data/fonts/ocr-a/default.nix b/pkgs/unit/oc/ocr-a/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ocr-a/default.nix rename to pkgs/unit/oc/ocr-a/pkg-fun.nix diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/unit/oc/ocrad/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/ocrad/default.nix rename to pkgs/unit/oc/ocrad/pkg-fun.nix diff --git a/pkgs/applications/graphics/ocrfeeder/fix-launch.diff b/pkgs/unit/oc/ocrfeeder/fix-launch.diff similarity index 100% rename from pkgs/applications/graphics/ocrfeeder/fix-launch.diff rename to pkgs/unit/oc/ocrfeeder/fix-launch.diff diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/unit/oc/ocrfeeder/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/ocrfeeder/default.nix rename to pkgs/unit/oc/ocrfeeder/pkg-fun.nix diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/unit/oc/ocserv/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ocserv/default.nix rename to pkgs/unit/oc/ocserv/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/unit/oc/ocsigen-i18n/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/ocsigen-i18n/default.nix rename to pkgs/unit/oc/ocsigen-i18n/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/unit/oc/octant-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/octant/desktop.nix rename to pkgs/unit/oc/octant-desktop/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/octant/update-desktop.sh b/pkgs/unit/oc/octant-desktop/update-desktop.sh similarity index 100% rename from pkgs/applications/networking/cluster/octant/update-desktop.sh rename to pkgs/unit/oc/octant-desktop/update-desktop.sh diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/unit/oc/octant/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/octant/default.nix rename to pkgs/unit/oc/octant/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/octant/update.sh b/pkgs/unit/oc/octant/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/octant/update.sh rename to pkgs/unit/oc/octant/update.sh diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/unit/oc/octave-kernel/kernel.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/octave/kernel.nix rename to pkgs/unit/oc/octave-kernel/kernel.nix diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/unit/oc/octave-kernel/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/octave/default.nix rename to pkgs/unit/oc/octave-kernel/pkg-fun.nix diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/unit/oc/octomap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/octomap/default.nix rename to pkgs/unit/oc/octomap/pkg-fun.nix diff --git a/pkgs/applications/misc/octoprint/ffmpeg-path.patch b/pkgs/unit/oc/octoprint/ffmpeg-path.patch similarity index 100% rename from pkgs/applications/misc/octoprint/ffmpeg-path.patch rename to pkgs/unit/oc/octoprint/ffmpeg-path.patch diff --git a/pkgs/applications/misc/octoprint/pip-path.patch b/pkgs/unit/oc/octoprint/pip-path.patch similarity index 100% rename from pkgs/applications/misc/octoprint/pip-path.patch rename to pkgs/unit/oc/octoprint/pip-path.patch diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/unit/oc/octoprint/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/octoprint/default.nix rename to pkgs/unit/oc/octoprint/pkg-fun.nix diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/unit/oc/octoprint/plugins.nix similarity index 100% rename from pkgs/applications/misc/octoprint/plugins.nix rename to pkgs/unit/oc/octoprint/plugins.nix diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/unit/oc/octopus-caller/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/octopus/default.nix rename to pkgs/unit/oc/octopus-caller/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/unit/oc/octopus/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/octopus/default.nix rename to pkgs/unit/oc/octopus/pkg-fun.nix diff --git a/pkgs/tools/misc/octosql/default.nix b/pkgs/unit/oc/octosql/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/octosql/default.nix rename to pkgs/unit/oc/octosql/pkg-fun.nix diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/unit/oc/oculante/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/oculante/default.nix rename to pkgs/unit/oc/oculante/pkg-fun.nix diff --git a/pkgs/games/odamex/default.nix b/pkgs/unit/od/odamex/pkg-fun.nix similarity index 100% rename from pkgs/games/odamex/default.nix rename to pkgs/unit/od/odamex/pkg-fun.nix diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/unit/od/ode/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ode/default.nix rename to pkgs/unit/od/ode/pkg-fun.nix diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/unit/od/odin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/odin/default.nix rename to pkgs/unit/od/odin/pkg-fun.nix diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/unit/od/odin2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/odin2/default.nix rename to pkgs/unit/od/odin2/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/unit/od/odo/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/odo/default.nix rename to pkgs/unit/od/odo/pkg-fun.nix diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/unit/od/odoo/pkg-fun.nix similarity index 100% rename from pkgs/applications/finance/odoo/default.nix rename to pkgs/unit/od/odoo/pkg-fun.nix diff --git a/pkgs/applications/finance/odoo/update.sh b/pkgs/unit/od/odoo/update.sh similarity index 100% rename from pkgs/applications/finance/odoo/update.sh rename to pkgs/unit/od/odoo/update.sh diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/unit/od/odpic/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/odpic/default.nix rename to pkgs/unit/od/odpic/pkg-fun.nix diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/unit/od/odroid-xu3-bootloader/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/odroid-xu3-bootloader/default.nix rename to pkgs/unit/od/odroid-xu3-bootloader/pkg-fun.nix diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/unit/od/odt2txt/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/odt2txt/default.nix rename to pkgs/unit/od/odt2txt/pkg-fun.nix diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/unit/od/odyssey/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/odyssey/default.nix rename to pkgs/unit/od/odyssey/pkg-fun.nix diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/unit/oe/oed/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/oed/default.nix rename to pkgs/unit/oe/oed/pkg-fun.nix diff --git a/pkgs/tools/security/offensive-azure/default.nix b/pkgs/unit/of/offensive-azure/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/offensive-azure/default.nix rename to pkgs/unit/of/offensive-azure/pkg-fun.nix diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/unit/of/office-code-pro/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/office-code-pro/default.nix rename to pkgs/unit/of/office-code-pro/pkg-fun.nix diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/unit/of/offlineimap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/offlineimap/default.nix rename to pkgs/unit/of/offlineimap/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/unit/of/offpunk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/offpunk/default.nix rename to pkgs/unit/of/offpunk/pkg-fun.nix diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/unit/of/offrss/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/offrss/default.nix rename to pkgs/unit/of/offrss/pkg-fun.nix diff --git a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/pkgs/unit/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch similarity index 100% rename from pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch rename to pkgs/unit/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/unit/of/ofono/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ofono/default.nix rename to pkgs/unit/of/ofono/pkg-fun.nix diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/unit/og/ogdf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ogdf/default.nix rename to pkgs/unit/og/ogdf/pkg-fun.nix diff --git a/pkgs/tools/misc/oggvideotools/default.nix b/pkgs/unit/og/oggvideotools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/oggvideotools/default.nix rename to pkgs/unit/og/oggvideotools/pkg-fun.nix diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/unit/og/ogmtools/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/ogmtools/default.nix rename to pkgs/unit/og/ogmtools/pkg-fun.nix diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/unit/og/ograc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/ograc/default.nix rename to pkgs/unit/og/ograc/pkg-fun.nix diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/unit/og/ogre1_10/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ogre/1.10.x.nix rename to pkgs/unit/og/ogre1_10/pkg-fun.nix diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/unit/og/ogre1_9/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ogre/1.9.x.nix rename to pkgs/unit/og/ogre1_9/pkg-fun.nix diff --git a/pkgs/tools/wayland/oguri/default.nix b/pkgs/unit/og/oguri/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/oguri/default.nix rename to pkgs/unit/og/oguri/pkg-fun.nix diff --git a/pkgs/shells/fish/oh-my-fish/default.nix b/pkgs/unit/oh/oh-my-fish/pkg-fun.nix similarity index 100% rename from pkgs/shells/fish/oh-my-fish/default.nix rename to pkgs/unit/oh/oh-my-fish/pkg-fun.nix diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/unit/oh/oh-my-git/pkg-fun.nix similarity index 100% rename from pkgs/games/oh-my-git/default.nix rename to pkgs/unit/oh/oh-my-git/pkg-fun.nix diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/unit/oh/oh-my-posh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/oh-my-posh/default.nix rename to pkgs/unit/oh/oh-my-posh/pkg-fun.nix diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/unit/oh/oh-my-zsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/oh-my-zsh/default.nix rename to pkgs/unit/oh/oh-my-zsh/pkg-fun.nix diff --git a/pkgs/shells/oh/default.nix b/pkgs/unit/oh/oh/pkg-fun.nix similarity index 100% rename from pkgs/shells/oh/default.nix rename to pkgs/unit/oh/oh/pkg-fun.nix diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/unit/oi/oidentd/pkg-fun.nix similarity index 100% rename from pkgs/servers/identd/oidentd/default.nix rename to pkgs/unit/oi/oidentd/pkg-fun.nix diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/unit/oi/oil-buku/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/oil-buku/default.nix rename to pkgs/unit/oi/oil-buku/pkg-fun.nix diff --git a/pkgs/shells/oil/default.nix b/pkgs/unit/oi/oil/pkg-fun.nix similarity index 100% rename from pkgs/shells/oil/default.nix rename to pkgs/unit/oi/oil/pkg-fun.nix diff --git a/pkgs/games/oilrush/default.nix b/pkgs/unit/oi/oilrush/pkg-fun.nix similarity index 100% rename from pkgs/games/oilrush/default.nix rename to pkgs/unit/oi/oilrush/pkg-fun.nix diff --git a/pkgs/shells/oksh/default.nix b/pkgs/unit/ok/oksh/pkg-fun.nix similarity index 100% rename from pkgs/shells/oksh/default.nix rename to pkgs/unit/ok/oksh/pkg-fun.nix diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/unit/ok/okteto/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/okteto/default.nix rename to pkgs/unit/ok/okteto/pkg-fun.nix diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/unit/ol/ola/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ola/default.nix rename to pkgs/unit/ol/ola/pkg-fun.nix diff --git a/pkgs/servers/olaris/default.nix b/pkgs/unit/ol/olaris-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/olaris/default.nix rename to pkgs/unit/ol/olaris-server/pkg-fun.nix diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/unit/ol/oldsindhi/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/oldsindhi/default.nix rename to pkgs/unit/ol/oldsindhi/pkg-fun.nix diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/unit/ol/oldstandard/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/oldstandard/default.nix rename to pkgs/unit/ol/oldstandard/pkg-fun.nix diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/unit/ol/olm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/olm/default.nix rename to pkgs/unit/ol/olm/pkg-fun.nix diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/unit/ol/olsrd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/olsrd/default.nix rename to pkgs/unit/ol/olsrd/pkg-fun.nix diff --git a/pkgs/development/tools/misc/om4/default.nix b/pkgs/unit/om/om4/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/om4/default.nix rename to pkgs/unit/om/om4/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/unit/om/omake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/omake/default.nix rename to pkgs/unit/om/omake/pkg-fun.nix diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/unit/om/omapd/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/omapd/default.nix rename to pkgs/unit/om/omapd/pkg-fun.nix diff --git a/pkgs/tools/security/omapd/zlib.patch b/pkgs/unit/om/omapd/zlib.patch similarity index 100% rename from pkgs/tools/security/omapd/zlib.patch rename to pkgs/unit/om/omapd/zlib.patch diff --git a/pkgs/servers/ombi/default.nix b/pkgs/unit/om/ombi/pkg-fun.nix similarity index 100% rename from pkgs/servers/ombi/default.nix rename to pkgs/unit/om/ombi/pkg-fun.nix diff --git a/pkgs/servers/ombi/update.sh b/pkgs/unit/om/ombi/update.sh similarity index 100% rename from pkgs/servers/ombi/update.sh rename to pkgs/unit/om/ombi/update.sh diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/unit/om/omegat/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/omegat.nix rename to pkgs/unit/om/omegat/pkg-fun.nix diff --git a/pkgs/data/themes/omni-gtk-theme/default.nix b/pkgs/unit/om/omni-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/omni-gtk-theme/default.nix rename to pkgs/unit/om/omni-gtk-theme/pkg-fun.nix diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/unit/om/omniorb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/omniorb/default.nix rename to pkgs/unit/om/omniorb/pkg-fun.nix diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/unit/om/omnisharp-roslyn/deps.nix similarity index 100% rename from pkgs/development/tools/omnisharp-roslyn/deps.nix rename to pkgs/unit/om/omnisharp-roslyn/deps.nix diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/unit/om/omnisharp-roslyn/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/omnisharp-roslyn/default.nix rename to pkgs/unit/om/omnisharp-roslyn/pkg-fun.nix diff --git a/pkgs/development/tools/omnisharp-roslyn/updater.sh b/pkgs/unit/om/omnisharp-roslyn/updater.sh similarity index 100% rename from pkgs/development/tools/omnisharp-roslyn/updater.sh rename to pkgs/unit/om/omnisharp-roslyn/updater.sh diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/unit/om/omping/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/omping/default.nix rename to pkgs/unit/om/omping/pkg-fun.nix diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/unit/om/omxplayer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/omxplayer/default.nix rename to pkgs/unit/om/omxplayer/pkg-fun.nix diff --git a/pkgs/applications/misc/onboard/fix-paths.patch b/pkgs/unit/on/onboard/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/onboard/fix-paths.patch rename to pkgs/unit/on/onboard/fix-paths.patch diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/unit/on/onboard/hunspell-use-xdg-datadirs.patch similarity index 100% rename from pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch rename to pkgs/unit/on/onboard/hunspell-use-xdg-datadirs.patch diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/unit/on/onboard/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/onboard/default.nix rename to pkgs/unit/on/onboard/pkg-fun.nix diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/unit/on/oneDNN/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/oneDNN/default.nix rename to pkgs/unit/on/oneDNN/pkg-fun.nix diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile b/pkgs/unit/on/one_gadget/Gemfile similarity index 100% rename from pkgs/development/tools/misc/one_gadget/Gemfile rename to pkgs/unit/on/one_gadget/Gemfile diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/unit/on/one_gadget/Gemfile.lock similarity index 100% rename from pkgs/development/tools/misc/one_gadget/Gemfile.lock rename to pkgs/unit/on/one_gadget/Gemfile.lock diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/unit/on/one_gadget/gemset.nix similarity index 100% rename from pkgs/development/tools/misc/one_gadget/gemset.nix rename to pkgs/unit/on/one_gadget/gemset.nix diff --git a/pkgs/development/tools/misc/one_gadget/default.nix b/pkgs/unit/on/one_gadget/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/one_gadget/default.nix rename to pkgs/unit/on/one_gadget/pkg-fun.nix diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/unit/on/onedrive/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sync/onedrive/default.nix rename to pkgs/unit/on/onedrive/pkg-fun.nix diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/unit/on/oneko/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/oneko/default.nix rename to pkgs/unit/on/oneko/pkg-fun.nix diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/unit/on/oneshot/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/oneshot/default.nix rename to pkgs/unit/on/oneshot/pkg-fun.nix diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/unit/on/onesixtyone/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/onesixtyone/default.nix rename to pkgs/unit/on/onesixtyone/pkg-fun.nix diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/unit/on/onestepback/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/onestepback/default.nix rename to pkgs/unit/on/onestepback/pkg-fun.nix diff --git a/pkgs/applications/editors/oni2/common.nix b/pkgs/unit/on/oni2/common.nix similarity index 100% rename from pkgs/applications/editors/oni2/common.nix rename to pkgs/unit/on/oni2/common.nix diff --git a/pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch b/pkgs/unit/on/oni2/esy_skia_use_nixpkgs.patch similarity index 100% rename from pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch rename to pkgs/unit/on/oni2/esy_skia_use_nixpkgs.patch diff --git a/pkgs/applications/editors/oni2/extensions.lock b/pkgs/unit/on/oni2/extensions.lock similarity index 100% rename from pkgs/applications/editors/oni2/extensions.lock rename to pkgs/unit/on/oni2/extensions.lock diff --git a/pkgs/applications/editors/oni2/extensions.nix b/pkgs/unit/on/oni2/extensions.nix similarity index 100% rename from pkgs/applications/editors/oni2/extensions.nix rename to pkgs/unit/on/oni2/extensions.nix diff --git a/pkgs/applications/editors/oni2/node.lock b/pkgs/unit/on/oni2/node.lock similarity index 100% rename from pkgs/applications/editors/oni2/node.lock rename to pkgs/unit/on/oni2/node.lock diff --git a/pkgs/applications/editors/oni2/node.nix b/pkgs/unit/on/oni2/node.nix similarity index 100% rename from pkgs/applications/editors/oni2/node.nix rename to pkgs/unit/on/oni2/node.nix diff --git a/pkgs/applications/editors/oni2/default.nix b/pkgs/unit/on/oni2/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/oni2/default.nix rename to pkgs/unit/on/oni2/pkg-fun.nix diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/unit/on/oniguruma/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/oniguruma/default.nix rename to pkgs/unit/on/oniguruma/pkg-fun.nix diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/unit/on/onioncircuits/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/onioncircuits/default.nix rename to pkgs/unit/on/onioncircuits/pkg-fun.nix diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/unit/on/onlykey-agent/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/onlykey-agent/default.nix rename to pkgs/unit/on/onlykey-agent/pkg-fun.nix diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/unit/on/onlykey-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/onlykey-cli/default.nix rename to pkgs/unit/on/onlykey-cli/pkg-fun.nix diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/unit/on/onlyoffice-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/onlyoffice-bin/default.nix rename to pkgs/unit/on/onlyoffice-bin/pkg-fun.nix diff --git a/pkgs/applications/office/onlyoffice-bin/update.sh b/pkgs/unit/on/onlyoffice-bin/update.sh similarity index 100% rename from pkgs/applications/office/onlyoffice-bin/update.sh rename to pkgs/unit/on/onlyoffice-bin/update.sh diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/unit/on/onlyoffice-documentserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/onlyoffice-documentserver/default.nix rename to pkgs/unit/on/onlyoffice-documentserver/pkg-fun.nix diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/unit/on/onmetal-image/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/onmetal-image/default.nix rename to pkgs/unit/on/onmetal-image/pkg-fun.nix diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/unit/on/onscripter-en/pkg-fun.nix similarity index 100% rename from pkgs/games/onscripter-en/default.nix rename to pkgs/unit/on/onscripter-en/pkg-fun.nix diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/unit/oo/oobicpl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/biology/oobicpl/default.nix rename to pkgs/unit/oo/oobicpl/pkg-fun.nix diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/unit/oo/ookla-speedtest/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ookla-speedtest/default.nix rename to pkgs/unit/oo/ookla-speedtest/pkg-fun.nix diff --git a/pkgs/tools/networking/oonf-olsrd2/default.nix b/pkgs/unit/oo/oonf-olsrd2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/oonf-olsrd2/default.nix rename to pkgs/unit/oo/oonf-olsrd2/pkg-fun.nix diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/unit/oo/ooniprobe-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ooniprobe-cli/default.nix rename to pkgs/unit/oo/ooniprobe-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/unit/op/opae/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opae/default.nix rename to pkgs/unit/op/opae/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/unit/op/opaline/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/opaline/default.nix rename to pkgs/unit/op/opaline/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/unit/op/opam-installer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/opam/installer.nix rename to pkgs/unit/op/opam-installer/pkg-fun.nix diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/unit/op/opam2json/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ocaml/opam2json/default.nix rename to pkgs/unit/op/opam2json/pkg-fun.nix diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/unit/op/opcr-policy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/opcr-policy/default.nix rename to pkgs/unit/op/opcr-policy/pkg-fun.nix diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/unit/op/open-dyslexic/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/open-dyslexic/default.nix rename to pkgs/unit/op/open-dyslexic/pkg-fun.nix diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/unit/op/open-ecard/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/open-ecard/default.nix rename to pkgs/unit/op/open-ecard/pkg-fun.nix diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/unit/op/open-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/open-fonts/default.nix rename to pkgs/unit/op/open-fonts/pkg-fun.nix diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/unit/op/open-isns/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/open-isns/default.nix rename to pkgs/unit/op/open-isns/pkg-fun.nix diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/unit/op/open-pdf-sign/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/open-pdf-sign/default.nix rename to pkgs/unit/op/open-pdf-sign/pkg-fun.nix diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/unit/op/open-policy-agent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/open-policy-agent/default.nix rename to pkgs/unit/op/open-policy-agent/pkg-fun.nix diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/unit/op/open-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/open-sans/default.nix rename to pkgs/unit/op/open-sans/pkg-fun.nix diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/unit/op/open-stage-control/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/open-stage-control/default.nix rename to pkgs/unit/op/open-stage-control/pkg-fun.nix diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/unit/op/open-stage-control/update.sh similarity index 100% rename from pkgs/applications/audio/open-stage-control/update.sh rename to pkgs/unit/op/open-stage-control/update.sh diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/unit/op/open-vm-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/open-vm-tools/default.nix rename to pkgs/unit/op/open-vm-tools/pkg-fun.nix diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/unit/op/open-watcom-bin-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/open-watcom/bin.nix rename to pkgs/unit/op/open-watcom-bin-unwrapped/pkg-fun.nix diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/unit/op/open-watcom-v2-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/open-watcom/v2.nix rename to pkgs/unit/op/open-watcom-v2-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/unit/op/open-wbo/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/open-wbo/default.nix rename to pkgs/unit/op/open-wbo/pkg-fun.nix diff --git a/pkgs/games/openarena/default.nix b/pkgs/unit/op/openarena/pkg-fun.nix similarity index 100% rename from pkgs/games/openarena/default.nix rename to pkgs/unit/op/openarena/pkg-fun.nix diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/unit/op/openbabel2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openbabel/2.nix rename to pkgs/unit/op/openbabel2/pkg-fun.nix diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/unit/op/openbgpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/openbgpd/default.nix rename to pkgs/unit/op/openbgpd/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/unit/op/openblas/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/openblas/default.nix rename to pkgs/unit/op/openblas/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/unit/op/openboardview/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/openboardview/default.nix rename to pkgs/unit/op/openboardview/pkg-fun.nix diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/unit/op/openbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/openbox/default.nix rename to pkgs/unit/op/openbox/pkg-fun.nix diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/pkgs/unit/op/openbsm/bsm-add-audit_token_to_pid.patch similarity index 100% rename from pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch rename to pkgs/unit/op/openbsm/bsm-add-audit_token_to_pid.patch diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/unit/op/openbsm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openbsm/default.nix rename to pkgs/unit/op/openbsm/pkg-fun.nix diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/unit/op/opencascade-occt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencascade-occt/default.nix rename to pkgs/unit/op/opencascade-occt/pkg-fun.nix diff --git a/pkgs/tools/misc/opencbm/default.nix b/pkgs/unit/op/opencbm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/opencbm/default.nix rename to pkgs/unit/op/opencbm/pkg-fun.nix diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/unit/op/opencc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/opencc/default.nix rename to pkgs/unit/op/opencc/pkg-fun.nix diff --git a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch b/pkgs/unit/op/opencl-clang/opencl-headers-dir.patch similarity index 100% rename from pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch rename to pkgs/unit/op/opencl-clang/opencl-headers-dir.patch diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/unit/op/opencl-clang/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencl-clang/default.nix rename to pkgs/unit/op/opencl-clang/pkg-fun.nix diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/unit/op/opencl-clhpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencl-clhpp/default.nix rename to pkgs/unit/op/opencl-clhpp/pkg-fun.nix diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/unit/op/opencl-headers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencl-headers/default.nix rename to pkgs/unit/op/opencl-headers/pkg-fun.nix diff --git a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff b/pkgs/unit/op/opencl-info/opencl-info-clhpp2.diff similarity index 100% rename from pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff rename to pkgs/unit/op/opencl-info/opencl-info-clhpp2.diff diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/unit/op/opencl-info/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/opencl-info/default.nix rename to pkgs/unit/op/opencl-info/pkg-fun.nix diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/pkgs/unit/op/opencollada/pcre.patch similarity index 100% rename from pkgs/development/libraries/opencollada/pcre.patch rename to pkgs/unit/op/opencollada/pcre.patch diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/unit/op/opencollada/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencollada/default.nix rename to pkgs/unit/op/opencollada/pkg-fun.nix diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/unit/op/opencolorio_1/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencolorio/1.x.nix rename to pkgs/unit/op/opencolorio_1/pkg-fun.nix diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/unit/op/openconnectPackages/common.nix similarity index 100% rename from pkgs/tools/networking/openconnect/common.nix rename to pkgs/unit/op/openconnectPackages/common.nix diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/unit/op/openconnectPackages/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openconnect/default.nix rename to pkgs/unit/op/openconnectPackages/pkg-fun.nix diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/unit/op/opencore-amr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opencore-amr/default.nix rename to pkgs/unit/op/opencore-amr/pkg-fun.nix diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/unit/op/opencorsairlink/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/opencorsairlink/default.nix rename to pkgs/unit/op/opencorsairlink/pkg-fun.nix diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/unit/op/opencryptoki/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/opencryptoki/default.nix rename to pkgs/unit/op/opencryptoki/pkg-fun.nix diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/unit/op/openct/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openct/default.nix rename to pkgs/unit/op/openct/pkg-fun.nix diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/unit/op/opendkim/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opendkim/default.nix rename to pkgs/unit/op/opendkim/pkg-fun.nix diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/unit/op/opendmarc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opendmarc/default.nix rename to pkgs/unit/op/opendmarc/pkg-fun.nix diff --git a/pkgs/games/opendune/default.nix b/pkgs/unit/op/opendune/pkg-fun.nix similarity index 100% rename from pkgs/games/opendune/default.nix rename to pkgs/unit/op/opendune/pkg-fun.nix diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/unit/op/opendylan_bin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/opendylan/bin.nix rename to pkgs/unit/op/opendylan_bin/pkg-fun.nix diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/unit/op/openethereum/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/openethereum/default.nix rename to pkgs/unit/op/openethereum/pkg-fun.nix diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/unit/op/openexr_2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openexr/default.nix rename to pkgs/unit/op/openexr_2/pkg-fun.nix diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/unit/op/openexr_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openexr/3.nix rename to pkgs/unit/op/openexr_3/pkg-fun.nix diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/unit/op/openexrid-unstable/openexrid.patch similarity index 100% rename from pkgs/development/libraries/openexrid-unstable/openexrid.patch rename to pkgs/unit/op/openexrid-unstable/openexrid.patch diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/unit/op/openexrid-unstable/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openexrid-unstable/default.nix rename to pkgs/unit/op/openexrid-unstable/pkg-fun.nix diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/unit/op/openfec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openfec/default.nix rename to pkgs/unit/op/openfec/pkg-fun.nix diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/unit/op/openfortivpn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openfortivpn/default.nix rename to pkgs/unit/op/openfortivpn/pkg-fun.nix diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/unit/op/openfpgaloader/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/fpga/openfpgaloader/default.nix rename to pkgs/unit/op/openfpgaloader/pkg-fun.nix diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/unit/op/openfst/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openfst/default.nix rename to pkgs/unit/op/openfst/pkg-fun.nix diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/unit/op/openfx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openfx/default.nix rename to pkgs/unit/op/openfx/pkg-fun.nix diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/unit/op/opengrm-ngram/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opengrm-ngram/default.nix rename to pkgs/unit/op/opengrm-ngram/pkg-fun.nix diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/unit/op/opengrok/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/opengrok/default.nix rename to pkgs/unit/op/opengrok/pkg-fun.nix diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/unit/op/openh264/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openh264/default.nix rename to pkgs/unit/op/openh264/pkg-fun.nix diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/unit/op/openhmd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openhmd/default.nix rename to pkgs/unit/op/openhmd/pkg-fun.nix diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/unit/op/openimagedenoise/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openimagedenoise/default.nix rename to pkgs/unit/op/openimagedenoise/pkg-fun.nix diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/unit/op/openimagedenoise_1_2_x/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openimagedenoise/1_2_x.nix rename to pkgs/unit/op/openimagedenoise_1_2_x/pkg-fun.nix diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/unit/op/openipmi/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/openipmi/default.nix rename to pkgs/unit/op/openipmi/pkg-fun.nix diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/unit/op/openiscsi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/open-iscsi/default.nix rename to pkgs/unit/op/openiscsi/pkg-fun.nix diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/unit/op/openjade/msggen.patch similarity index 100% rename from pkgs/tools/text/sgml/openjade/msggen.patch rename to pkgs/unit/op/openjade/msggen.patch diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/unit/op/openjade/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sgml/openjade/default.nix rename to pkgs/unit/op/openjade/pkg-fun.nix diff --git a/pkgs/games/openjk/default.nix b/pkgs/unit/op/openjk/pkg-fun.nix similarity index 100% rename from pkgs/games/openjk/default.nix rename to pkgs/unit/op/openjk/pkg-fun.nix diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/unit/op/openjpeg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openjpeg/default.nix rename to pkgs/unit/op/openjpeg/pkg-fun.nix diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/unit/op/openjump/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/openjump/default.nix rename to pkgs/unit/op/openjump/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/unit/op/openlibm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/openlibm/default.nix rename to pkgs/unit/op/openlibm/pkg-fun.nix diff --git a/pkgs/games/openlierox/default.nix b/pkgs/unit/op/openlierox/pkg-fun.nix similarity index 100% rename from pkgs/games/openlierox/default.nix rename to pkgs/unit/op/openlierox/pkg-fun.nix diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/unit/op/openlilylib-fonts/pkg-fun.nix similarity index 100% rename from pkgs/misc/lilypond/fonts.nix rename to pkgs/unit/op/openlilylib-fonts/pkg-fun.nix diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/unit/op/openmm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/openmm/default.nix rename to pkgs/unit/op/openmm/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch b/pkgs/unit/op/openmolcas/MKL-MPICH.patch similarity index 100% rename from pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch rename to pkgs/unit/op/openmolcas/MKL-MPICH.patch diff --git a/pkgs/applications/science/chemistry/openmolcas/openblasPath.patch b/pkgs/unit/op/openmolcas/openblasPath.patch similarity index 100% rename from pkgs/applications/science/chemistry/openmolcas/openblasPath.patch rename to pkgs/unit/op/openmolcas/openblasPath.patch diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/unit/op/openmolcas/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/openmolcas/default.nix rename to pkgs/unit/op/openmolcas/pkg-fun.nix diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/unit/op/openmpi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openmpi/default.nix rename to pkgs/unit/op/openmpi/pkg-fun.nix diff --git a/pkgs/applications/emulators/openmsx/custom-nix.mk b/pkgs/unit/op/openmsx/custom-nix.mk similarity index 100% rename from pkgs/applications/emulators/openmsx/custom-nix.mk rename to pkgs/unit/op/openmsx/custom-nix.mk diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/unit/op/openmsx/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/openmsx/default.nix rename to pkgs/unit/op/openmsx/pkg-fun.nix diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/unit/op/openmvg/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/openmvg/default.nix rename to pkgs/unit/op/openmvg/pkg-fun.nix diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/unit/op/openmvs/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/openmvs/default.nix rename to pkgs/unit/op/openmvs/pkg-fun.nix diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/unit/op/openntpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openntpd/default.nix rename to pkgs/unit/op/openntpd/pkg-fun.nix diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/unit/op/openobex/pkg-fun.nix similarity index 100% rename from pkgs/tools/bluetooth/openobex/default.nix rename to pkgs/unit/op/openobex/pkg-fun.nix diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/unit/op/openocd/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/openocd/default.nix rename to pkgs/unit/op/openocd/pkg-fun.nix diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/unit/op/openpa/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openpa/default.nix rename to pkgs/unit/op/openpa/pkg-fun.nix diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/unit/op/openpam/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openpam/default.nix rename to pkgs/unit/op/openpam/pkg-fun.nix diff --git a/pkgs/games/openrct2/default.nix b/pkgs/unit/op/openrct2/pkg-fun.nix similarity index 100% rename from pkgs/games/openrct2/default.nix rename to pkgs/unit/op/openrct2/pkg-fun.nix diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/unit/op/openresolv/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openresolv/default.nix rename to pkgs/unit/op/openresolv/pkg-fun.nix diff --git a/pkgs/applications/misc/openring/default.nix b/pkgs/unit/op/openring/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/openring/default.nix rename to pkgs/unit/op/openring/pkg-fun.nix diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/unit/op/opensaml-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opensaml-cpp/default.nix rename to pkgs/unit/op/opensaml-cpp/pkg-fun.nix diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/unit/op/opensbi/pkg-fun.nix similarity index 100% rename from pkgs/misc/opensbi/default.nix rename to pkgs/unit/op/opensbi/pkg-fun.nix diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/unit/op/openseachest/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/openseachest/default.nix rename to pkgs/unit/op/openseachest/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/unit/op/openshift/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/openshift/default.nix rename to pkgs/unit/op/openshift/pkg-fun.nix diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/unit/op/openslide/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openslide/default.nix rename to pkgs/unit/op/openslide/pkg-fun.nix diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/unit/op/openslp/CVE-2016-4912.patch similarity index 100% rename from pkgs/development/libraries/openslp/CVE-2016-4912.patch rename to pkgs/unit/op/openslp/CVE-2016-4912.patch diff --git a/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/pkgs/unit/op/openslp/CVE-2019-5544.patch similarity index 100% rename from pkgs/development/libraries/openslp/CVE-2019-5544.patch rename to pkgs/unit/op/openslp/CVE-2019-5544.patch diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/unit/op/openslp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openslp/default.nix rename to pkgs/unit/op/openslp/pkg-fun.nix diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/unit/op/opensm/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/opensm/default.nix rename to pkgs/unit/op/opensm/pkg-fun.nix diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/unit/op/opensmt/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/opensmt/default.nix rename to pkgs/unit/op/opensmt/pkg-fun.nix diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/unit/op/opensmtpd-extras/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/extras.nix rename to pkgs/unit/op/opensmtpd-extras/pkg-fun.nix diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch b/pkgs/unit/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch similarity index 100% rename from pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch rename to pkgs/unit/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/pkgs/unit/op/opensmtpd-filter-dkimsign/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix rename to pkgs/unit/op/opensmtpd-filter-dkimsign/pkg-fun.nix diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/unit/op/opensmtpd-filter-rspamd/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/filter-rspamd.nix rename to pkgs/unit/op/opensmtpd-filter-rspamd/pkg-fun.nix diff --git a/pkgs/servers/mail/opensmtpd/cross_fix.diff b/pkgs/unit/op/opensmtpd/cross_fix.diff similarity index 100% rename from pkgs/servers/mail/opensmtpd/cross_fix.diff rename to pkgs/unit/op/opensmtpd/cross_fix.diff diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/unit/op/opensmtpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/opensmtpd/default.nix rename to pkgs/unit/op/opensmtpd/pkg-fun.nix diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/unit/op/opensmtpd/proc_path.diff similarity index 100% rename from pkgs/servers/mail/opensmtpd/proc_path.diff rename to pkgs/unit/op/opensmtpd/proc_path.diff diff --git a/pkgs/tools/networking/opensnitch/go.mod b/pkgs/unit/op/opensnitch/go.mod similarity index 100% rename from pkgs/tools/networking/opensnitch/go.mod rename to pkgs/unit/op/opensnitch/go.mod diff --git a/pkgs/tools/networking/opensnitch/go.sum b/pkgs/unit/op/opensnitch/go.sum similarity index 100% rename from pkgs/tools/networking/opensnitch/go.sum rename to pkgs/unit/op/opensnitch/go.sum diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/unit/op/opensnitch/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/opensnitch/daemon.nix rename to pkgs/unit/op/opensnitch/pkg-fun.nix diff --git a/pkgs/games/opensoldat/default.nix b/pkgs/unit/op/opensoldat/pkg-fun.nix similarity index 100% rename from pkgs/games/opensoldat/default.nix rename to pkgs/unit/op/opensoldat/pkg-fun.nix diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/unit/op/opensp/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sgml/opensp/default.nix rename to pkgs/unit/op/opensp/pkg-fun.nix diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/unit/op/opensp/setup-hook.sh similarity index 100% rename from pkgs/tools/text/sgml/opensp/setup-hook.sh rename to pkgs/unit/op/opensp/setup-hook.sh diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/unit/op/openspecfun/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/openspecfun/default.nix rename to pkgs/unit/op/openspecfun/pkg-fun.nix diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/unit/op/openspin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/openspin/default.nix rename to pkgs/unit/op/openspin/pkg-fun.nix diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/unit/op/opensubdiv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opensubdiv/default.nix rename to pkgs/unit/op/opensubdiv/pkg-fun.nix diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/unit/op/opensupaplex/pkg-fun.nix similarity index 100% rename from pkgs/games/opensupaplex/default.nix rename to pkgs/unit/op/opensupaplex/pkg-fun.nix diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/unit/op/opentabletdriver/deps.nix similarity index 100% rename from pkgs/tools/X11/opentabletdriver/deps.nix rename to pkgs/unit/op/opentabletdriver/deps.nix diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/unit/op/opentabletdriver/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/opentabletdriver/default.nix rename to pkgs/unit/op/opentabletdriver/pkg-fun.nix diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/unit/op/opentabletdriver/update.sh similarity index 100% rename from pkgs/tools/X11/opentabletdriver/update.sh rename to pkgs/unit/op/opentabletdriver/update.sh diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/unit/op/opentelemetry-collector-contrib/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/opentelemetry-collector/contrib.nix rename to pkgs/unit/op/opentelemetry-collector-contrib/pkg-fun.nix diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/unit/op/opentelemetry-collector/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/opentelemetry-collector/default.nix rename to pkgs/unit/op/opentelemetry-collector/pkg-fun.nix diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/unit/op/opentracing-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/opentracing-cpp/default.nix rename to pkgs/unit/op/opentracing-cpp/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/unit/op/opentracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/opentracker/default.nix rename to pkgs/unit/op/opentracker/pkg-fun.nix diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/unit/op/opentsdb/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/opentsdb/default.nix rename to pkgs/unit/op/opentsdb/pkg-fun.nix diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/unit/op/openttd-grfcodec/pkg-fun.nix similarity index 100% rename from pkgs/games/openttd/grfcodec.nix rename to pkgs/unit/op/openttd-grfcodec/pkg-fun.nix diff --git a/pkgs/games/openttd/nml.nix b/pkgs/unit/op/openttd-nml/pkg-fun.nix similarity index 100% rename from pkgs/games/openttd/nml.nix rename to pkgs/unit/op/openttd-nml/pkg-fun.nix diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/unit/op/opentyrian/pkg-fun.nix similarity index 100% rename from pkgs/games/opentyrian/default.nix rename to pkgs/unit/op/opentyrian/pkg-fun.nix diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/unit/op/openvdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openvdb/default.nix rename to pkgs/unit/op/openvdb/pkg-fun.nix diff --git a/pkgs/tools/networking/openvpn3/default.nix b/pkgs/unit/op/openvpn3/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openvpn3/default.nix rename to pkgs/unit/op/openvpn3/pkg-fun.nix diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/unit/op/openvpn_learnaddress/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openvpn/openvpn_learnaddress.nix rename to pkgs/unit/op/openvpn_learnaddress/pkg-fun.nix diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/unit/op/openwsman/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openwsman/default.nix rename to pkgs/unit/op/openwsman/pkg-fun.nix diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/unit/op/openxr-loader/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openxr-loader/default.nix rename to pkgs/unit/op/openxr-loader/pkg-fun.nix diff --git a/pkgs/games/openxray/default.nix b/pkgs/unit/op/openxray/pkg-fun.nix similarity index 100% rename from pkgs/games/openxray/default.nix rename to pkgs/unit/op/openxray/pkg-fun.nix diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/unit/op/openzone-cursors/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/openzone/default.nix rename to pkgs/unit/op/openzone-cursors/pkg-fun.nix diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/unit/op/openzwave/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/openzwave/default.nix rename to pkgs/unit/op/openzwave/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/unit/op/opera/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/opera/default.nix rename to pkgs/unit/op/opera/pkg-fun.nix diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/unit/op/operator-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/operator-sdk/default.nix rename to pkgs/unit/op/operator-sdk/pkg-fun.nix diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/unit/op/opkg-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/opkg-utils/default.nix rename to pkgs/unit/op/opkg-utils/pkg-fun.nix diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/unit/op/opkg/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/opkg/default.nix rename to pkgs/unit/op/opkg/pkg-fun.nix diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/unit/op/oppai-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/oppai-ng/default.nix rename to pkgs/unit/op/oppai-ng/pkg-fun.nix diff --git a/pkgs/applications/virtualization/ops/default.nix b/pkgs/unit/op/ops/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/ops/default.nix rename to pkgs/unit/op/ops/pkg-fun.nix diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/unit/op/opsdroid/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/opsdroid/default.nix rename to pkgs/unit/op/opsdroid/pkg-fun.nix diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/unit/op/optar/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/optar/default.nix rename to pkgs/unit/op/optar/pkg-fun.nix diff --git a/pkgs/tools/games/minecraft/optifine/generic.nix b/pkgs/unit/op/optifinePackages/generic.nix similarity index 100% rename from pkgs/tools/games/minecraft/optifine/generic.nix rename to pkgs/unit/op/optifinePackages/generic.nix diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/unit/op/optifinePackages/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/minecraft/optifine/default.nix rename to pkgs/unit/op/optifinePackages/pkg-fun.nix diff --git a/pkgs/tools/games/minecraft/optifine/update.py b/pkgs/unit/op/optifinePackages/update.py similarity index 100% rename from pkgs/tools/games/minecraft/optifine/update.py rename to pkgs/unit/op/optifinePackages/update.py diff --git a/pkgs/tools/games/minecraft/optifine/versions.json b/pkgs/unit/op/optifinePackages/versions.json similarity index 100% rename from pkgs/tools/games/minecraft/optifine/versions.json rename to pkgs/unit/op/optifinePackages/versions.json diff --git a/pkgs/development/libraries/optparse-bash/default.nix b/pkgs/unit/op/optparse-bash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/optparse-bash/default.nix rename to pkgs/unit/op/optparse-bash/pkg-fun.nix diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/unit/op/opusTools/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/opus-tools/default.nix rename to pkgs/unit/op/opusTools/pkg-fun.nix diff --git a/pkgs/applications/audio/opusfile/disable-cert-store.patch b/pkgs/unit/op/opusfile/disable-cert-store.patch similarity index 100% rename from pkgs/applications/audio/opusfile/disable-cert-store.patch rename to pkgs/unit/op/opusfile/disable-cert-store.patch diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/unit/op/opusfile/include-multistream.patch similarity index 100% rename from pkgs/applications/audio/opusfile/include-multistream.patch rename to pkgs/unit/op/opusfile/include-multistream.patch diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/unit/op/opusfile/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/opusfile/default.nix rename to pkgs/unit/op/opusfile/pkg-fun.nix diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/unit/op/opustags/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/opustags/default.nix rename to pkgs/unit/op/opustags/pkg-fun.nix diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/unit/oq/oq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/oq/default.nix rename to pkgs/unit/oq/oq/pkg-fun.nix diff --git a/pkgs/development/misc/or1k/newlib.nix b/pkgs/unit/or/or1k-newlib/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/or1k/newlib.nix rename to pkgs/unit/or/or1k-newlib/pkg-fun.nix diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/unit/or/oracle-instantclient/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/oracle-instantclient/default.nix rename to pkgs/unit/or/oracle-instantclient/pkg-fun.nix diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/unit/or/oraclejdk11/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/oraclejdk/jdk11-linux.nix rename to pkgs/unit/or/oraclejdk11/pkg-fun.nix diff --git a/pkgs/data/icons/oranchelo-icon-theme/default.nix b/pkgs/unit/or/oranchelo-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/oranchelo-icon-theme/default.nix rename to pkgs/unit/or/oranchelo-icon-theme/pkg-fun.nix diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/unit/or/oras/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/oras/default.nix rename to pkgs/unit/or/oras/pkg-fun.nix diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/unit/or/orbitron/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/orbitron/default.nix rename to pkgs/unit/or/orbitron/pkg-fun.nix diff --git a/pkgs/development/embedded/orbuculum/default.nix b/pkgs/unit/or/orbuculum/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/orbuculum/default.nix rename to pkgs/unit/or/orbuculum/pkg-fun.nix diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/unit/or/orc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/orc/default.nix rename to pkgs/unit/or/orc/pkg-fun.nix diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/unit/or/orca-c/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/orca-c/default.nix rename to pkgs/unit/or/orca-c/pkg-fun.nix diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/unit/or/orcania/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/orcania/default.nix rename to pkgs/unit/or/orcania/pkg-fun.nix diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/unit/or/orchis-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/orchis-theme/default.nix rename to pkgs/unit/or/orchis-theme/pkg-fun.nix diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/unit/or/orion/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/orion/default.nix rename to pkgs/unit/or/orion/pkg-fun.nix diff --git a/pkgs/tools/security/orjail/default.nix b/pkgs/unit/or/orjail/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/orjail/default.nix rename to pkgs/unit/or/orjail/pkg-fun.nix diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/unit/or/oroborus/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/oroborus/default.nix rename to pkgs/unit/or/oroborus/pkg-fun.nix diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/unit/or/orocos-kdl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/orocos-kdl/default.nix rename to pkgs/unit/or/orocos-kdl/pkg-fun.nix diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/unit/or/orthorobot/pkg-fun.nix similarity index 100% rename from pkgs/games/orthorobot/default.nix rename to pkgs/unit/or/orthorobot/pkg-fun.nix diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/unit/or/ortp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ortp/default.nix rename to pkgs/unit/or/ortp/pkg-fun.nix diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/unit/os/os-prober/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/os-prober/default.nix rename to pkgs/unit/os/os-prober/pkg-fun.nix diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/unit/os/oscclip/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/oscclip/default.nix rename to pkgs/unit/os/oscclip/pkg-fun.nix diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/unit/os/osdlyrics/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/osdlyrics/default.nix rename to pkgs/unit/os/osdlyrics/pkg-fun.nix diff --git a/pkgs/development/tools/oshka/default.nix b/pkgs/unit/os/oshka/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/oshka/default.nix rename to pkgs/unit/os/oshka/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/unit/os/osi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/osi/default.nix rename to pkgs/unit/os/osi/pkg-fun.nix diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/unit/os/osinfo-db-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/osinfo-db-tools/default.nix rename to pkgs/unit/os/osinfo-db-tools/pkg-fun.nix diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/unit/os/osinfo-db/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/osinfo-db/default.nix rename to pkgs/unit/os/osinfo-db/pkg-fun.nix diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/unit/os/osm-gps-map/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/osm-gps-map/default.nix rename to pkgs/unit/os/osm-gps-map/pkg-fun.nix diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/unit/os/osmctools/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/osmctools/default.nix rename to pkgs/unit/os/osmctools/pkg-fun.nix diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/unit/os/osmid/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/osmid/default.nix rename to pkgs/unit/os/osmid/pkg-fun.nix diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/unit/os/osmium-tool/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/osmium-tool/default.nix rename to pkgs/unit/os/osmium-tool/pkg-fun.nix diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/unit/os/osmo/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/osmo/default.nix rename to pkgs/unit/os/osmo/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/unit/os/osqp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/osqp/default.nix rename to pkgs/unit/os/osqp/pkg-fun.nix diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/unit/os/osrm-backend/pkg-fun.nix similarity index 100% rename from pkgs/servers/osrm-backend/default.nix rename to pkgs/unit/os/osrm-backend/pkg-fun.nix diff --git a/pkgs/tools/security/ossec/no-root.patch b/pkgs/unit/os/ossec/no-root.patch similarity index 100% rename from pkgs/tools/security/ossec/no-root.patch rename to pkgs/unit/os/ossec/no-root.patch diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/unit/os/ossec/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ossec/default.nix rename to pkgs/unit/os/ossec/pkg-fun.nix diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/unit/os/osslsigncode/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/osslsigncode/default.nix rename to pkgs/unit/os/osslsigncode/pkg-fun.nix diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/unit/os/ossutil/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/ossutil/default.nix rename to pkgs/unit/os/ossutil/pkg-fun.nix diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/unit/os/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch similarity index 100% rename from pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch rename to pkgs/unit/os/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/unit/os/ostree/fix-1592.patch similarity index 100% rename from pkgs/tools/misc/ostree/fix-1592.patch rename to pkgs/unit/os/ostree/fix-1592.patch diff --git a/pkgs/tools/misc/ostree/fix-test-paths.patch b/pkgs/unit/os/ostree/fix-test-paths.patch similarity index 100% rename from pkgs/tools/misc/ostree/fix-test-paths.patch rename to pkgs/unit/os/ostree/fix-test-paths.patch diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/unit/os/ostree/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ostree/default.nix rename to pkgs/unit/os/ostree/pkg-fun.nix diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/unit/os/osu-lazer-bin/pkg-fun.nix similarity index 100% rename from pkgs/games/osu-lazer/bin.nix rename to pkgs/unit/os/osu-lazer-bin/pkg-fun.nix diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/unit/os/osu-lazer/deps.nix similarity index 100% rename from pkgs/games/osu-lazer/deps.nix rename to pkgs/unit/os/osu-lazer/deps.nix diff --git a/pkgs/games/osu-lazer/osu.runtimeconfig.json b/pkgs/unit/os/osu-lazer/osu.runtimeconfig.json similarity index 100% rename from pkgs/games/osu-lazer/osu.runtimeconfig.json rename to pkgs/unit/os/osu-lazer/osu.runtimeconfig.json diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/unit/os/osu-lazer/pkg-fun.nix similarity index 100% rename from pkgs/games/osu-lazer/default.nix rename to pkgs/unit/os/osu-lazer/pkg-fun.nix diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/unit/os/osu-lazer/update.sh similarity index 100% rename from pkgs/games/osu-lazer/update.sh rename to pkgs/unit/os/osu-lazer/update.sh diff --git a/pkgs/tools/security/osv-detector/default.nix b/pkgs/unit/os/osv-detector/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/osv-detector/default.nix rename to pkgs/unit/os/osv-detector/pkg-fun.nix diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/unit/os/osv-scanner/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/osv-scanner/default.nix rename to pkgs/unit/os/osv-scanner/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/unit/os/osxsnarf/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/osxsnarf/default.nix rename to pkgs/unit/os/osxsnarf/pkg-fun.nix diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/unit/ot/otel-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/otel-cli/default.nix rename to pkgs/unit/ot/otel-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/otfcc/fix-aarch64.patch b/pkgs/unit/ot/otfcc/fix-aarch64.patch similarity index 100% rename from pkgs/tools/misc/otfcc/fix-aarch64.patch rename to pkgs/unit/ot/otfcc/fix-aarch64.patch diff --git a/pkgs/tools/misc/otfcc/move-makefiles.patch b/pkgs/unit/ot/otfcc/move-makefiles.patch similarity index 100% rename from pkgs/tools/misc/otfcc/move-makefiles.patch rename to pkgs/unit/ot/otfcc/move-makefiles.patch diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/unit/ot/otfcc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/otfcc/default.nix rename to pkgs/unit/ot/otfcc/pkg-fun.nix diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/unit/ot/otpauth/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/otpauth/default.nix rename to pkgs/unit/ot/otpauth/pkg-fun.nix diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/unit/ot/otpclient/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/otpclient/default.nix rename to pkgs/unit/ot/otpclient/pkg-fun.nix diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/unit/ot/otpw/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/otpw/default.nix rename to pkgs/unit/ot/otpw/pkg-fun.nix diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/unit/ot/ott/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/ott/default.nix rename to pkgs/unit/ot/ott/pkg-fun.nix diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/unit/ot/otto-matic/pkg-fun.nix similarity index 100% rename from pkgs/games/otto-matic/default.nix rename to pkgs/unit/ot/otto-matic/pkg-fun.nix diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/unit/ou/ouch/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/ouch/default.nix rename to pkgs/unit/ou/ouch/pkg-fun.nix diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/unit/ou/out-of-tree/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/out-of-tree/default.nix rename to pkgs/unit/ou/out-of-tree/pkg-fun.nix diff --git a/pkgs/tools/misc/outils/default.nix b/pkgs/unit/ou/outils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/outils/default.nix rename to pkgs/unit/ou/outils/pkg-fun.nix diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/unit/ov/ov/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ov/default.nix rename to pkgs/unit/ov/ov/pkg-fun.nix diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/unit/ov/oven-media-engine/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/oven-media-engine/default.nix rename to pkgs/unit/ov/oven-media-engine/pkg-fun.nix diff --git a/pkgs/development/tools/overcommit/Gemfile b/pkgs/unit/ov/overcommit/Gemfile similarity index 100% rename from pkgs/development/tools/overcommit/Gemfile rename to pkgs/unit/ov/overcommit/Gemfile diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/unit/ov/overcommit/Gemfile.lock similarity index 100% rename from pkgs/development/tools/overcommit/Gemfile.lock rename to pkgs/unit/ov/overcommit/Gemfile.lock diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/unit/ov/overcommit/gemset.nix similarity index 100% rename from pkgs/development/tools/overcommit/gemset.nix rename to pkgs/unit/ov/overcommit/gemset.nix diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/unit/ov/overcommit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/overcommit/default.nix rename to pkgs/unit/ov/overcommit/pkg-fun.nix diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/unit/ov/overmind/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/overmind/default.nix rename to pkgs/unit/ov/overmind/pkg-fun.nix diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/unit/ov/overpass/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/overpass/default.nix rename to pkgs/unit/ov/overpass/pkg-fun.nix diff --git a/pkgs/applications/misc/oversteer/fix-install-dir.patch b/pkgs/unit/ov/oversteer/fix-install-dir.patch similarity index 100% rename from pkgs/applications/misc/oversteer/fix-install-dir.patch rename to pkgs/unit/ov/oversteer/fix-install-dir.patch diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/unit/ov/oversteer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/oversteer/default.nix rename to pkgs/unit/ov/oversteer/pkg-fun.nix diff --git a/pkgs/tools/misc/ovh-ttyrec/default.nix b/pkgs/unit/ov/ovh-ttyrec/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ovh-ttyrec/default.nix rename to pkgs/unit/ov/ovh-ttyrec/pkg-fun.nix diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/unit/ow/owamp/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/owamp/default.nix rename to pkgs/unit/ow/owamp/pkg-fun.nix diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/unit/ow/owl-lisp/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/owl-lisp/default.nix rename to pkgs/unit/ow/owl-lisp/pkg-fun.nix diff --git a/pkgs/tools/networking/owl/default.nix b/pkgs/unit/ow/owl/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/owl/default.nix rename to pkgs/unit/ow/owl/pkg-fun.nix diff --git a/pkgs/servers/owncast/default.nix b/pkgs/unit/ow/owncast/pkg-fun.nix similarity index 100% rename from pkgs/servers/owncast/default.nix rename to pkgs/unit/ow/owncast/pkg-fun.nix diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/unit/ox/ox/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/ox/default.nix rename to pkgs/unit/ox/ox/pkg-fun.nix diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/unit/ox/oxefmsynth/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/oxefmsynth/default.nix rename to pkgs/unit/ox/oxefmsynth/pkg-fun.nix diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/unit/ox/oxidized/Gemfile similarity index 100% rename from pkgs/tools/admin/oxidized/Gemfile rename to pkgs/unit/ox/oxidized/Gemfile diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/unit/ox/oxidized/Gemfile.lock similarity index 100% rename from pkgs/tools/admin/oxidized/Gemfile.lock rename to pkgs/unit/ox/oxidized/Gemfile.lock diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/unit/ox/oxidized/gemset.nix similarity index 100% rename from pkgs/tools/admin/oxidized/gemset.nix rename to pkgs/unit/ox/oxidized/gemset.nix diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/unit/ox/oxidized/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/oxidized/default.nix rename to pkgs/unit/ox/oxidized/pkg-fun.nix diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/unit/ox/oxipng/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/oxipng/default.nix rename to pkgs/unit/ox/oxipng/pkg-fun.nix diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/unit/ox/oxker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/oxker/default.nix rename to pkgs/unit/ox/oxker/pkg-fun.nix diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/unit/ox/oxtools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/oxtools/default.nix rename to pkgs/unit/ox/oxtools/pkg-fun.nix diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/unit/ox/oxygenfonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/oxygenfonts/default.nix rename to pkgs/unit/ox/oxygenfonts/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/unit/oy/oysttyer/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/oysttyer/default.nix rename to pkgs/unit/oy/oysttyer/pkg-fun.nix diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/unit/p0/p0f/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/p0f/default.nix rename to pkgs/unit/p0/p0f/pkg-fun.nix diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/unit/p1/p11-kit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/p11-kit/default.nix rename to pkgs/unit/p1/p11-kit/pkg-fun.nix diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/unit/p2/p2pool/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/p2pool/default.nix rename to pkgs/unit/p2/p2pool/pkg-fun.nix diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/unit/p2/p2pvc/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/p2pvc/default.nix rename to pkgs/unit/p2/p2pvc/pkg-fun.nix diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/unit/p3/p3x-onenote/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/p3x-onenote/default.nix rename to pkgs/unit/p3/p3x-onenote/pkg-fun.nix diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/unit/p4/p4c/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/p4c/default.nix rename to pkgs/unit/p4/p4c/pkg-fun.nix diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/unit/p4/p4d/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/p4d/default.nix rename to pkgs/unit/p4/p4d/pkg-fun.nix diff --git a/pkgs/applications/version-management/p4v/darwin.nix b/pkgs/unit/p4/p4v/darwin.nix similarity index 100% rename from pkgs/applications/version-management/p4v/darwin.nix rename to pkgs/unit/p4/p4v/darwin.nix diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/unit/p4/p4v/linux.nix similarity index 100% rename from pkgs/applications/version-management/p4v/linux.nix rename to pkgs/unit/p4/p4v/linux.nix diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/unit/p4/p4v/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/p4v/default.nix rename to pkgs/unit/p4/p4v/pkg-fun.nix diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/unit/p7/p7zip/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/p7zip/default.nix rename to pkgs/unit/p7/p7zip/pkg-fun.nix diff --git a/pkgs/tools/archivers/p7zip/setup-hook.sh b/pkgs/unit/p7/p7zip/setup-hook.sh similarity index 100% rename from pkgs/tools/archivers/p7zip/setup-hook.sh rename to pkgs/unit/p7/p7zip/setup-hook.sh diff --git a/pkgs/tools/archivers/p7zip/update.sh b/pkgs/unit/p7/p7zip/update.sh similarity index 100% rename from pkgs/tools/archivers/p7zip/update.sh rename to pkgs/unit/p7/p7zip/update.sh diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/unit/p9/p910nd/pkg-fun.nix similarity index 100% rename from pkgs/servers/p910nd/default.nix rename to pkgs/unit/p9/p910nd/pkg-fun.nix diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/unit/pa/pa_applet/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/pa-applet/default.nix rename to pkgs/unit/pa/pa_applet/pkg-fun.nix diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/unit/pa/pacemaker/pkg-fun.nix similarity index 100% rename from pkgs/misc/logging/pacemaker/default.nix rename to pkgs/unit/pa/pacemaker/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/unit/pa/pachyderm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/pachyderm/default.nix rename to pkgs/unit/pa/pachyderm/pkg-fun.nix diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/unit/pa/package-project-cmake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/package-project-cmake/default.nix rename to pkgs/unit/pa/package-project-cmake/pkg-fun.nix diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/unit/pa/packagekit/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/packagekit/default.nix rename to pkgs/unit/pa/packagekit/pkg-fun.nix diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/unit/pa/packcc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/packcc/default.nix rename to pkgs/unit/pa/packcc/pkg-fun.nix diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/unit/pa/packer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/packer/default.nix rename to pkgs/unit/pa/packer/pkg-fun.nix diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/unit/pa/packet-sd/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/packet-sd/default.nix rename to pkgs/unit/pa/packet-sd/pkg-fun.nix diff --git a/pkgs/development/tools/packet/deps.nix b/pkgs/unit/pa/packet/deps.nix similarity index 100% rename from pkgs/development/tools/packet/deps.nix rename to pkgs/unit/pa/packet/deps.nix diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/unit/pa/packet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/packet/default.nix rename to pkgs/unit/pa/packet/pkg-fun.nix diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/unit/pa/packetdrill/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/packetdrill/default.nix rename to pkgs/unit/pa/packetdrill/pkg-fun.nix diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/unit/pa/packr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/packr/default.nix rename to pkgs/unit/pa/packr/pkg-fun.nix diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/unit/pa/packwiz/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/minecraft/packwiz/default.nix rename to pkgs/unit/pa/packwiz/pkg-fun.nix diff --git a/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch b/pkgs/unit/pa/pacman/dont-create-empty-dirs.patch similarity index 100% rename from pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch rename to pkgs/unit/pa/pacman/dont-create-empty-dirs.patch diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/unit/pa/pacman/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/pacman/default.nix rename to pkgs/unit/pa/pacman/pkg-fun.nix diff --git a/pkgs/development/compilers/paco/deps.nix b/pkgs/unit/pa/paco/deps.nix similarity index 100% rename from pkgs/development/compilers/paco/deps.nix rename to pkgs/unit/pa/paco/deps.nix diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/unit/pa/paco/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/paco/default.nix rename to pkgs/unit/pa/paco/pkg-fun.nix diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/unit/pa/pacparser/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pacparser/default.nix rename to pkgs/unit/pa/pacparser/pkg-fun.nix diff --git a/pkgs/games/pacvim/default.nix b/pkgs/unit/pa/pacvim/pkg-fun.nix similarity index 100% rename from pkgs/games/pacvim/default.nix rename to pkgs/unit/pa/pacvim/pkg-fun.nix diff --git a/pkgs/tools/security/padbuster/default.nix b/pkgs/unit/pa/padbuster/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/padbuster/default.nix rename to pkgs/unit/pa/padbuster/pkg-fun.nix diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/unit/pa/page/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/page/default.nix rename to pkgs/unit/pa/page/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/unit/pa/pagemon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pagemon/default.nix rename to pkgs/unit/pa/pagemon/pkg-fun.nix diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/unit/pa/pagmo2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pagmo2/default.nix rename to pkgs/unit/pa/pagmo2/pkg-fun.nix diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/unit/pa/pagsuite/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/pagsuite/default.nix rename to pkgs/unit/pa/pagsuite/pkg-fun.nix diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/unit/pa/paho-mqtt-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/paho-mqtt-c/default.nix rename to pkgs/unit/pa/paho-mqtt-c/pkg-fun.nix diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/unit/pa/paho-mqtt-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/paho-mqtt-cpp/default.nix rename to pkgs/unit/pa/paho-mqtt-cpp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/unit/pa/pahole/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/pahole/default.nix rename to pkgs/unit/pa/pahole/pkg-fun.nix diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/unit/pa/pal/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pal/default.nix rename to pkgs/unit/pa/pal/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/unit/pa/palemoon/mozconfig similarity index 100% rename from pkgs/applications/networking/browsers/palemoon/mozconfig rename to pkgs/unit/pa/palemoon/mozconfig diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/unit/pa/palemoon/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/palemoon/default.nix rename to pkgs/unit/pa/palemoon/pkg-fun.nix diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/unit/pa/palp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/palp/default.nix rename to pkgs/unit/pa/palp/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/pam-reattach/default.nix b/pkgs/unit/pa/pam-reattach/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/pam-reattach/default.nix rename to pkgs/unit/pa/pam-reattach/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/unit/pa/pam_ccreds/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_ccreds/default.nix rename to pkgs/unit/pa/pam_ccreds/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/unit/pa/pam_gnupg/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_gnupg/default.nix rename to pkgs/unit/pa/pam_gnupg/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/unit/pa/pam_krb5/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_krb5/default.nix rename to pkgs/unit/pa/pam_krb5/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/unit/pa/pam_ldap/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_ldap/default.nix rename to pkgs/unit/pa/pam_ldap/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch b/pkgs/unit/pa/pam_mount/insert_utillinux_path_hooks.patch similarity index 100% rename from pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch rename to pkgs/unit/pa/pam_mount/insert_utillinux_path_hooks.patch diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/unit/pa/pam_mount/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_mount/default.nix rename to pkgs/unit/pa/pam_mount/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_mysql/default.nix b/pkgs/unit/pa/pam_mysql/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_mysql/default.nix rename to pkgs/unit/pa/pam_mysql/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/unit/pa/pam_p11/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_p11/default.nix rename to pkgs/unit/pa/pam_p11/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/unit/pa/pam_pgsql/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_pgsql/default.nix rename to pkgs/unit/pa/pam_pgsql/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch b/pkgs/unit/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch similarity index 100% rename from pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch rename to pkgs/unit/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/unit/pa/pam_ssh_agent_auth/multiple-key-files.patch similarity index 100% rename from pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch rename to pkgs/unit/pa/pam_ssh_agent_auth/multiple-key-files.patch diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/unit/pa/pam_ssh_agent_auth/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix rename to pkgs/unit/pa/pam_ssh_agent_auth/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_tmpdir/default.nix b/pkgs/unit/pa/pam_tmpdir/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_tmpdir/default.nix rename to pkgs/unit/pa/pam_tmpdir/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/unit/pa/pam_u2f/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_u2f/default.nix rename to pkgs/unit/pa/pam_u2f/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/unit/pa/pam_usb/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_usb/default.nix rename to pkgs/unit/pa/pam_usb/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pam_ussh/go.mod b/pkgs/unit/pa/pam_ussh/go.mod similarity index 100% rename from pkgs/os-specific/linux/pam_ussh/go.mod rename to pkgs/unit/pa/pam_ussh/go.mod diff --git a/pkgs/os-specific/linux/pam_ussh/go.sum b/pkgs/unit/pa/pam_ussh/go.sum similarity index 100% rename from pkgs/os-specific/linux/pam_ussh/go.sum rename to pkgs/unit/pa/pam_ussh/go.sum diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/unit/pa/pam_ussh/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pam_ussh/default.nix rename to pkgs/unit/pa/pam_ussh/pkg-fun.nix diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/unit/pa/pamix/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pamix/default.nix rename to pkgs/unit/pa/pamix/pkg-fun.nix diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/unit/pa/pamixer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pamixer/default.nix rename to pkgs/unit/pa/pamixer/pkg-fun.nix diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/unit/pa/paml/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/paml/default.nix rename to pkgs/unit/pa/paml/pkg-fun.nix diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/unit/pa/pamtester/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pamtester/default.nix rename to pkgs/unit/pa/pamtester/pkg-fun.nix diff --git a/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff b/pkgs/unit/pa/pan/move-out-of-extern-c.diff similarity index 100% rename from pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff rename to pkgs/unit/pa/pan/move-out-of-extern-c.diff diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/unit/pa/pan/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/newsreaders/pan/default.nix rename to pkgs/unit/pa/pan/pkg-fun.nix diff --git a/pkgs/tools/misc/pandoc-katex/default.nix b/pkgs/unit/pa/pandoc-katex/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pandoc-katex/default.nix rename to pkgs/unit/pa/pandoc-katex/pkg-fun.nix diff --git a/pkgs/tools/misc/pandoc-lua-filters/default.nix b/pkgs/unit/pa/pandoc-lua-filters/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pandoc-lua-filters/default.nix rename to pkgs/unit/pa/pandoc-lua-filters/pkg-fun.nix diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/unit/pa/pandoc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pandoc/default.nix rename to pkgs/unit/pa/pandoc/pkg-fun.nix diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/unit/pa/panoply/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/panoply/default.nix rename to pkgs/unit/pa/panoply/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/unit/pa/panopticon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/panopticon/default.nix rename to pkgs/unit/pa/panopticon/pkg-fun.nix diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/unit/pa/panotools/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/panotools/default.nix rename to pkgs/unit/pa/panotools/pkg-fun.nix diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch b/pkgs/unit/pa/pantheon-tweaks/fix-paths.patch similarity index 100% rename from pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch rename to pkgs/unit/pa/pantheon-tweaks/fix-paths.patch diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/unit/pa/pantheon-tweaks/pkg-fun.nix similarity index 100% rename from pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix rename to pkgs/unit/pa/pantheon-tweaks/pkg-fun.nix diff --git a/pkgs/data/themes/paper-gtk/default.nix b/pkgs/unit/pa/paper-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/paper-gtk/default.nix rename to pkgs/unit/pa/paper-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/unit/pa/paper-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/paper-icon-theme/default.nix rename to pkgs/unit/pa/paper-icon-theme/pkg-fun.nix diff --git a/pkgs/applications/office/paper-note/default.nix b/pkgs/unit/pa/paper-note/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/paper-note/default.nix rename to pkgs/unit/pa/paper-note/pkg-fun.nix diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/unit/pa/paperkey/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/paperkey/default.nix rename to pkgs/unit/pa/paperkey/pkg-fun.nix diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/unit/pa/paperless-ngx/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/paperless-ngx/default.nix rename to pkgs/unit/pa/paperless-ngx/pkg-fun.nix diff --git a/pkgs/tools/misc/paperlike-go/default.nix b/pkgs/unit/pa/paperlike-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/paperlike-go/default.nix rename to pkgs/unit/pa/paperlike-go/pkg-fun.nix diff --git a/pkgs/games/papermc/default.nix b/pkgs/unit/pa/papermc/pkg-fun.nix similarity index 100% rename from pkgs/games/papermc/default.nix rename to pkgs/unit/pa/papermc/pkg-fun.nix diff --git a/pkgs/tools/text/papertrail/Gemfile b/pkgs/unit/pa/papertrail/Gemfile similarity index 100% rename from pkgs/tools/text/papertrail/Gemfile rename to pkgs/unit/pa/papertrail/Gemfile diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/unit/pa/papertrail/Gemfile.lock similarity index 100% rename from pkgs/tools/text/papertrail/Gemfile.lock rename to pkgs/unit/pa/papertrail/Gemfile.lock diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/unit/pa/papertrail/gemset.nix similarity index 100% rename from pkgs/tools/text/papertrail/gemset.nix rename to pkgs/unit/pa/papertrail/gemset.nix diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/unit/pa/papertrail/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/papertrail/default.nix rename to pkgs/unit/pa/papertrail/pkg-fun.nix diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/unit/pa/papi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/benchmark/papi/default.nix rename to pkgs/unit/pa/papi/pkg-fun.nix diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/unit/pa/papirus-folders/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/papirus-folders/default.nix rename to pkgs/unit/pa/papirus-folders/pkg-fun.nix diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/unit/pa/pappl/pkg-fun.nix similarity index 100% rename from pkgs/applications/printing/pappl/default.nix rename to pkgs/unit/pa/pappl/pkg-fun.nix diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/unit/pa/paprefs/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/paprefs/default.nix rename to pkgs/unit/pa/paprefs/pkg-fun.nix diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/unit/pa/paps/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/paps/default.nix rename to pkgs/unit/pa/paps/pkg-fun.nix diff --git a/pkgs/tools/text/par/default.nix b/pkgs/unit/pa/par/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/par/default.nix rename to pkgs/unit/pa/par/pkg-fun.nix diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/unit/pa/par2cmdline/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/par2cmdline/default.nix rename to pkgs/unit/pa/par2cmdline/pkg-fun.nix diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/unit/pa/parallel-full/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/parallel/wrapper.nix rename to pkgs/unit/pa/parallel-full/pkg-fun.nix diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/unit/pa/parallel/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/parallel/default.nix rename to pkgs/unit/pa/parallel/pkg-fun.nix diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/unit/pa/parastoo-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/parastoo-fonts/default.nix rename to pkgs/unit/pa/parastoo-fonts/pkg-fun.nix diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/unit/pa/paratype-pt-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/mono.nix rename to pkgs/unit/pa/paratype-pt-mono/pkg-fun.nix diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/unit/pa/paratype-pt-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/sans.nix rename to pkgs/unit/pa/paratype-pt-sans/pkg-fun.nix diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/unit/pa/paratype-pt-serif/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/serif.nix rename to pkgs/unit/pa/paratype-pt-serif/pkg-fun.nix diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/unit/pa/pari-galdata/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/pari-galdata/default.nix rename to pkgs/unit/pa/pari-galdata/pkg-fun.nix diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/unit/pa/pari-seadata-small/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/pari-seadata-small/default.nix rename to pkgs/unit/pa/pari-seadata-small/pkg-fun.nix diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/unit/pa/parinfer-rust/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parinfer-rust/default.nix rename to pkgs/unit/pa/parinfer-rust/pkg-fun.nix diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/unit/pa/parlatype/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/parlatype/default.nix rename to pkgs/unit/pa/parlatype/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/unit/pa/parmetis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/parmetis/default.nix rename to pkgs/unit/pa/parmetis/pkg-fun.nix diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/unit/pa/parquet-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/parquet-tools/default.nix rename to pkgs/unit/pa/parquet-tools/pkg-fun.nix diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/unit/pa/parse-cli-bin/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parse-cli-bin/default.nix rename to pkgs/unit/pa/parse-cli-bin/pkg-fun.nix diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/unit/pa/parsec-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/parsec/bin.nix rename to pkgs/unit/pa/parsec-bin/pkg-fun.nix diff --git a/pkgs/tools/security/parsero/default.nix b/pkgs/unit/pa/parsero/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/parsero/default.nix rename to pkgs/unit/pa/parsero/pkg-fun.nix diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/unit/pa/partclone/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/partclone/default.nix rename to pkgs/unit/pa/partclone/pkg-fun.nix diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/unit/pa/parted/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/parted/default.nix rename to pkgs/unit/pa/parted/pkg-fun.nix diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/unit/pa/particl-core/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/particl-core/default.nix rename to pkgs/unit/pa/particl-core/pkg-fun.nix diff --git a/pkgs/tools/backup/partimage/gentoos-zlib.patch b/pkgs/unit/pa/partimage/gentoos-zlib.patch similarity index 100% rename from pkgs/tools/backup/partimage/gentoos-zlib.patch rename to pkgs/unit/pa/partimage/gentoos-zlib.patch diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/unit/pa/partimage/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/partimage/default.nix rename to pkgs/unit/pa/partimage/pkg-fun.nix diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/unit/pa/partio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/partio/default.nix rename to pkgs/unit/pa/partio/pkg-fun.nix diff --git a/pkgs/shells/pash/default.nix b/pkgs/unit/pa/pash/pkg-fun.nix similarity index 100% rename from pkgs/shells/pash/default.nix rename to pkgs/unit/pa/pash/pkg-fun.nix diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/unit/pa/pass-secret-service/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pass-secret-service/default.nix rename to pkgs/unit/pa/pass-secret-service/pkg-fun.nix diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/unit/pa/passage/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/passage/default.nix rename to pkgs/unit/pa/passage/pkg-fun.nix diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/unit/pa/passerine/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/passerine/default.nix rename to pkgs/unit/pa/passerine/pkg-fun.nix diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/unit/pa/passff-host/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/passff-host/default.nix rename to pkgs/unit/pa/passff-host/pkg-fun.nix diff --git a/pkgs/tools/networking/passh/default.nix b/pkgs/unit/pa/passh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/passh/default.nix rename to pkgs/unit/pa/passh/pkg-fun.nix diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/unit/pa/passky-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/passky-desktop/default.nix rename to pkgs/unit/pa/passky-desktop/pkg-fun.nix diff --git a/pkgs/tools/security/passphrase2pgp/default.nix b/pkgs/unit/pa/passphrase2pgp/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/passphrase2pgp/default.nix rename to pkgs/unit/pa/passphrase2pgp/pkg-fun.nix diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/unit/pa/pastebinit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pastebinit/default.nix rename to pkgs/unit/pa/pastebinit/pkg-fun.nix diff --git a/pkgs/tools/audio/pasystray/fix-wayland.patch b/pkgs/unit/pa/pasystray/fix-wayland.patch similarity index 100% rename from pkgs/tools/audio/pasystray/fix-wayland.patch rename to pkgs/unit/pa/pasystray/fix-wayland.patch diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/unit/pa/pasystray/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/pasystray/default.nix rename to pkgs/unit/pa/pasystray/pkg-fun.nix diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/unit/pa/patatt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/patatt/default.nix rename to pkgs/unit/pa/patatt/pkg-fun.nix diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/pkgs/unit/pa/patchPpdFilesHook/patch-ppd-hook.sh similarity index 100% rename from pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh rename to pkgs/unit/pa/patchPpdFilesHook/patch-ppd-hook.sh diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk b/pkgs/unit/pa/patchPpdFilesHook/patch-ppd-lines.awk similarity index 100% rename from pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk rename to pkgs/unit/pa/patchPpdFilesHook/patch-ppd-lines.awk diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/default.nix b/pkgs/unit/pa/patchPpdFilesHook/pkg-fun.nix similarity index 100% rename from pkgs/build-support/setup-hooks/patch-ppd-files/default.nix rename to pkgs/unit/pa/patchPpdFilesHook/pkg-fun.nix diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/test.nix b/pkgs/unit/pa/patchPpdFilesHook/test.nix similarity index 100% rename from pkgs/build-support/setup-hooks/patch-ppd-files/test.nix rename to pkgs/unit/pa/patchPpdFilesHook/test.nix diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd b/pkgs/unit/pa/patchPpdFilesHook/test.ppd similarity index 100% rename from pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd rename to pkgs/unit/pa/patchPpdFilesHook/test.ppd diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/unit/pa/patchage/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/patchage/default.nix rename to pkgs/unit/pa/patchage/pkg-fun.nix diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/unit/pa/pathvector/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pathvector/default.nix rename to pkgs/unit/pa/pathvector/pkg-fun.nix diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/unit/pa/patray/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/patray/default.nix rename to pkgs/unit/pa/patray/pkg-fun.nix diff --git a/pkgs/development/tools/misc/patsh/default.nix b/pkgs/unit/pa/patsh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/patsh/default.nix rename to pkgs/unit/pa/patsh/pkg-fun.nix diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/unit/pa/pattypan/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pattypan/default.nix rename to pkgs/unit/pa/pattypan/pkg-fun.nix diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/unit/pa/paulstretch/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/paulstretch/default.nix rename to pkgs/unit/pa/paulstretch/pkg-fun.nix diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/unit/pa/pavucontrol/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pavucontrol/default.nix rename to pkgs/unit/pa/pavucontrol/pkg-fun.nix diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/unit/pa/pax-rs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pax-rs/default.nix rename to pkgs/unit/pa/pax-rs/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/unit/pa/pax-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pax-utils/default.nix rename to pkgs/unit/pa/pax-utils/pkg-fun.nix diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/unit/pa/paxctl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/paxctl/default.nix rename to pkgs/unit/pa/paxctl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/paxctl/setup-hook.sh b/pkgs/unit/pa/paxctl/setup-hook.sh similarity index 100% rename from pkgs/os-specific/linux/paxctl/setup-hook.sh rename to pkgs/unit/pa/paxctl/setup-hook.sh diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/unit/pa/paxtest/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/paxtest/default.nix rename to pkgs/unit/pa/paxtest/pkg-fun.nix diff --git a/pkgs/tools/archivers/payload_dumper/default.nix b/pkgs/unit/pa/payload_dumper/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/payload_dumper/default.nix rename to pkgs/unit/pa/payload_dumper/pkg-fun.nix diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/unit/pa/pazi/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pazi/default.nix rename to pkgs/unit/pa/pazi/pkg-fun.nix diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/unit/pb/pb_cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pb_cli/default.nix rename to pkgs/unit/pb/pb_cli/pkg-fun.nix diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/unit/pb/pbgopy/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/pbgopy/default.nix rename to pkgs/unit/pb/pbgopy/pkg-fun.nix diff --git a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/pkgs/unit/pb/pbrt/openexr-cmake-3.12.patch similarity index 100% rename from pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch rename to pkgs/unit/pb/pbrt/openexr-cmake-3.12.patch diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/unit/pb/pbrt/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pbrt/default.nix rename to pkgs/unit/pb/pbrt/pkg-fun.nix diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/unit/pb/pbzip2/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/pbzip2/default.nix rename to pkgs/unit/pb/pbzip2/pkg-fun.nix diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/unit/pb/pbzx/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/pbzx/default.nix rename to pkgs/unit/pb/pbzx/pkg-fun.nix diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/unit/pc/pcalc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/pcalc/default.nix rename to pkgs/unit/pc/pcalc/pkg-fun.nix diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/unit/pc/pcapc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pcapc/default.nix rename to pkgs/unit/pc/pcapc/pkg-fun.nix diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/unit/pc/pcapfix/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pcapfix/default.nix rename to pkgs/unit/pc/pcapfix/pkg-fun.nix diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/unit/pc/pcaudiolib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pcaudiolib/default.nix rename to pkgs/unit/pc/pcaudiolib/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/unit/pc/pcb/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/pcb/default.nix rename to pkgs/unit/pc/pcb/pkg-fun.nix diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/unit/pc/pcb2gcode/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pcb2gcode/default.nix rename to pkgs/unit/pc/pcb2gcode/pkg-fun.nix diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/unit/pc/pcem/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/pcem/default.nix rename to pkgs/unit/pc/pcem/pkg-fun.nix diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/unit/pc/pcg_c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pcg-c/default.nix rename to pkgs/unit/pc/pcg_c/pkg-fun.nix diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/unit/pc/pcg_c/prefix-variable.patch similarity index 100% rename from pkgs/development/libraries/pcg-c/prefix-variable.patch rename to pkgs/unit/pc/pcg_c/prefix-variable.patch diff --git a/pkgs/os-specific/linux/pcimem/default.nix b/pkgs/unit/pc/pcimem/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pcimem/default.nix rename to pkgs/unit/pc/pcimem/pkg-fun.nix diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/unit/pc/pcloud/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/pcloud/default.nix rename to pkgs/unit/pc/pcloud/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/unit/pc/pcm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pcm/default.nix rename to pkgs/unit/pc/pcm/pkg-fun.nix diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/unit/pc/pcmanfm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/pcmanfm/default.nix rename to pkgs/unit/pc/pcmanfm/pkg-fun.nix diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/unit/pc/pcmanx-gtk2/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pcmanx-gtk2/default.nix rename to pkgs/unit/pc/pcmanx-gtk2/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/unit/pc/pcmciaUtils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pcmciautils/default.nix rename to pkgs/unit/pc/pcmciaUtils/pkg-fun.nix diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/unit/pc/pcmsolver/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pcmsolver/default.nix rename to pkgs/unit/pc/pcmsolver/pkg-fun.nix diff --git a/pkgs/tools/misc/pcp/default.nix b/pkgs/unit/pc/pcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pcp/default.nix rename to pkgs/unit/pc/pcp/pkg-fun.nix diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/unit/pc/pcre/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pcre/default.nix rename to pkgs/unit/pc/pcre/pkg-fun.nix diff --git a/pkgs/development/libraries/pcre/stacksize-detection.patch b/pkgs/unit/pc/pcre/stacksize-detection.patch similarity index 100% rename from pkgs/development/libraries/pcre/stacksize-detection.patch rename to pkgs/unit/pc/pcre/stacksize-detection.patch diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/unit/pc/pcre2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pcre2/default.nix rename to pkgs/unit/pc/pcre2/pkg-fun.nix diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/unit/pc/pcsc-cyberjack/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pcsc-cyberjack/default.nix rename to pkgs/unit/pc/pcsc-cyberjack/pkg-fun.nix diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/unit/pc/pcsc-safenet/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pcsc-safenet/default.nix rename to pkgs/unit/pc/pcsc-safenet/pkg-fun.nix diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/pkgs/unit/pc/pcsc-scm-scl011/eid.patch similarity index 100% rename from pkgs/tools/security/pcsc-scm-scl011/eid.patch rename to pkgs/unit/pc/pcsc-scm-scl011/eid.patch diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/unit/pc/pcsc-scm-scl011/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pcsc-scm-scl011/default.nix rename to pkgs/unit/pc/pcsc-scm-scl011/pkg-fun.nix diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/unit/pc/pcsctools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pcsctools/default.nix rename to pkgs/unit/pc/pcsctools/pkg-fun.nix diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/unit/pc/pcstat/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/pcstat/default.nix rename to pkgs/unit/pc/pcstat/pkg-fun.nix diff --git a/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/unit/pc/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch similarity index 100% rename from pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch rename to pkgs/unit/pc/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/unit/pc/pcsxr/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/pcsxr/default.nix rename to pkgs/unit/pc/pcsxr/pkg-fun.nix diff --git a/pkgs/applications/emulators/pcsxr/uncompress2.patch b/pkgs/unit/pc/pcsxr/uncompress2.patch similarity index 100% rename from pkgs/applications/emulators/pcsxr/uncompress2.patch rename to pkgs/unit/pc/pcsxr/uncompress2.patch diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/unit/pd/pdal/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pdal/default.nix rename to pkgs/unit/pd/pdal/pkg-fun.nix diff --git a/pkgs/development/php-packages/pdepend/default.nix b/pkgs/unit/pd/pdepend/pkg-fun.nix similarity index 100% rename from pkgs/development/php-packages/pdepend/default.nix rename to pkgs/unit/pd/pdepend/pkg-fun.nix diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/unit/pd/pdf-parser/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pdf-parser/default.nix rename to pkgs/unit/pd/pdf-parser/pkg-fun.nix diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/unit/pd/pdf-quench/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pdf-quench/default.nix rename to pkgs/unit/pd/pdf-quench/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/unit/pd/pdf2djvu/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/pdf2djvu/default.nix rename to pkgs/unit/pd/pdf2djvu/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/unit/pd/pdf2odt/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/pdf2odt/default.nix rename to pkgs/unit/pd/pdf2odt/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch b/pkgs/unit/pd/pdf2odt/use_mktemp.patch similarity index 100% rename from pkgs/tools/typesetting/pdf2odt/use_mktemp.patch rename to pkgs/unit/pd/pdf2odt/use_mktemp.patch diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/unit/pd/pdf2svg/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pdf2svg/default.nix rename to pkgs/unit/pd/pdf2svg/pkg-fun.nix diff --git a/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/pkgs/unit/pd/pdf2xml/pdf2xml.patch similarity index 100% rename from pkgs/development/libraries/pdf2xml/pdf2xml.patch rename to pkgs/unit/pd/pdf2xml/pdf2xml.patch diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/unit/pd/pdf2xml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pdf2xml/default.nix rename to pkgs/unit/pd/pdf2xml/pkg-fun.nix diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/unit/pd/pdfarranger/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pdfarranger/default.nix rename to pkgs/unit/pd/pdfarranger/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/unit/pd/pdfchain/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/pdfchain/default.nix rename to pkgs/unit/pd/pdfchain/pkg-fun.nix diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/unit/pd/pdfcpu/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pdfcpu/default.nix rename to pkgs/unit/pd/pdfcpu/pkg-fun.nix diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/unit/pd/pdfcrack/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pdfcrack/default.nix rename to pkgs/unit/pd/pdfcrack/pkg-fun.nix diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/unit/pd/pdfdiff/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pdfdiff/default.nix rename to pkgs/unit/pd/pdfdiff/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/unit/pd/pdfgrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/pdfgrep/default.nix rename to pkgs/unit/pd/pdfgrep/pkg-fun.nix diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/unit/pd/pdfsam-basic/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pdfsam-basic/default.nix rename to pkgs/unit/pd/pdfsam-basic/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/unit/pd/pdfsandwich/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/pdfsandwich/default.nix rename to pkgs/unit/pd/pdfsandwich/pkg-fun.nix diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/unit/pd/pdfslicer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pdfslicer/default.nix rename to pkgs/unit/pd/pdfslicer/pkg-fun.nix diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/unit/pd/pdftag/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pdftag/default.nix rename to pkgs/unit/pd/pdftag/pkg-fun.nix diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/unit/pd/pdftk/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/pdftk/default.nix rename to pkgs/unit/pd/pdftk/pkg-fun.nix diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/unit/pd/pdftoipe/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pdftoipe/default.nix rename to pkgs/unit/pd/pdftoipe/pkg-fun.nix diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/unit/pd/pdm/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/pdm/default.nix rename to pkgs/unit/pd/pdm/pkg-fun.nix diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/unit/pd/pdns-recursor/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/pdns-recursor/default.nix rename to pkgs/unit/pd/pdns-recursor/pkg-fun.nix diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/unit/pd/pdns/pkg-fun.nix similarity index 100% rename from pkgs/servers/dns/pdns/default.nix rename to pkgs/unit/pd/pdns/pkg-fun.nix diff --git a/pkgs/servers/dns/pdns/version.patch b/pkgs/unit/pd/pdns/version.patch similarity index 100% rename from pkgs/servers/dns/pdns/version.patch rename to pkgs/unit/pd/pdns/version.patch diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/unit/pd/pdnsd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pdnsd/default.nix rename to pkgs/unit/pd/pdnsd/pkg-fun.nix diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/unit/pe/pe-parse/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pe-parse/default.nix rename to pkgs/unit/pe/pe-parse/pkg-fun.nix diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/unit/pe/pebble/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/pebble/default.nix rename to pkgs/unit/pe/pebble/pkg-fun.nix diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/unit/pe/pecita/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/pecita/default.nix rename to pkgs/unit/pe/pecita/pkg-fun.nix diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/unit/pe/peco/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/peco/default.nix rename to pkgs/unit/pe/peco/pkg-fun.nix diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/unit/pe/peek/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/peek/default.nix rename to pkgs/unit/pe/peek/pkg-fun.nix diff --git a/pkgs/tools/misc/peep/default.nix b/pkgs/unit/pe/peep/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/peep/default.nix rename to pkgs/unit/pe/peep/pkg-fun.nix diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/unit/pe/peering-manager/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/peering-manager/default.nix rename to pkgs/unit/pe/peering-manager/pkg-fun.nix diff --git a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch b/pkgs/unit/pe/peering-manager/redis-unix-sock.patch similarity index 100% rename from pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch rename to pkgs/unit/pe/peering-manager/redis-unix-sock.patch diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/unit/pe/peg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/peg/default.nix rename to pkgs/unit/pe/peg/pkg-fun.nix diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/unit/pe/pell/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pell/default.nix rename to pkgs/unit/pe/pell/pkg-fun.nix diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/unit/pe/pencil/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pencil/default.nix rename to pkgs/unit/pe/pencil/pkg-fun.nix diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/unit/pe/penna/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/penna/default.nix rename to pkgs/unit/pe/penna/pkg-fun.nix diff --git a/pkgs/tools/misc/perccli/default.nix b/pkgs/unit/pe/perccli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/perccli/default.nix rename to pkgs/unit/pe/perccli/pkg-fun.nix diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/unit/pe/perceptualdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/perceptualdiff/default.nix rename to pkgs/unit/pe/perceptualdiff/pkg-fun.nix diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/unit/pe/perf-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/perf-tools/default.nix rename to pkgs/unit/pe/perf-tools/pkg-fun.nix diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/unit/pe/perfect-hash/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/perfect-hash/default.nix rename to pkgs/unit/pe/perfect-hash/pkg-fun.nix diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/unit/pe/performous/performous-cmake.patch similarity index 100% rename from pkgs/games/performous/performous-cmake.patch rename to pkgs/unit/pe/performous/performous-cmake.patch diff --git a/pkgs/games/performous/performous-fftw.patch b/pkgs/unit/pe/performous/performous-fftw.patch similarity index 100% rename from pkgs/games/performous/performous-fftw.patch rename to pkgs/unit/pe/performous/performous-fftw.patch diff --git a/pkgs/games/performous/default.nix b/pkgs/unit/pe/performous/pkg-fun.nix similarity index 100% rename from pkgs/games/performous/default.nix rename to pkgs/unit/pe/performous/pkg-fun.nix diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/unit/pe/perkeep/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/perkeep/default.nix rename to pkgs/unit/pe/perkeep/pkg-fun.nix diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/unit/pe/perseus/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/perseus/default.nix rename to pkgs/unit/pe/perseus/pkg-fun.nix diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/unit/pe/peru/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/peru/default.nix rename to pkgs/unit/pe/peru/pkg-fun.nix diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/unit/pe/pet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pet/default.nix rename to pkgs/unit/pe/pet/pkg-fun.nix diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/unit/pe/petidomo/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/petidomo/default.nix rename to pkgs/unit/pe/petidomo/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/unit/pe/petsc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/petsc/default.nix rename to pkgs/unit/pe/petsc/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/unit/pe/pev/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/pev/default.nix rename to pkgs/unit/pe/pev/pkg-fun.nix diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/unit/pe/pew/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pew/default.nix rename to pkgs/unit/pe/pew/pkg-fun.nix diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/unit/pf/pferd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pferd/default.nix rename to pkgs/unit/pf/pferd/pkg-fun.nix diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/unit/pf/pfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pfetch/default.nix rename to pkgs/unit/pf/pfetch/pkg-fun.nix diff --git a/pkgs/development/libraries/pffft/default.nix b/pkgs/unit/pf/pffft/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pffft/default.nix rename to pkgs/unit/pf/pffft/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/unit/pf/pflask/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pflask/default.nix rename to pkgs/unit/pf/pflask/pkg-fun.nix diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/unit/pf/pflogsumm/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/postfix/pflogsumm.nix rename to pkgs/unit/pf/pflogsumm/pkg-fun.nix diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/unit/pf/pforth/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/pforth/default.nix rename to pkgs/unit/pf/pforth/pkg-fun.nix diff --git a/pkgs/tools/misc/pfsshell/default.nix b/pkgs/unit/pf/pfsshell/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pfsshell/default.nix rename to pkgs/unit/pf/pfsshell/pkg-fun.nix diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/unit/pg/pg_activity/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/pg_activity/default.nix rename to pkgs/unit/pg/pg_activity/pkg-fun.nix diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/unit/pg/pg_checksums/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/pg_checksums/default.nix rename to pkgs/unit/pg/pg_checksums/pkg-fun.nix diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/unit/pg/pg_featureserv/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/pg_featureserv/default.nix rename to pkgs/unit/pg/pg_featureserv/pkg-fun.nix diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/unit/pg/pg_flame/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pg_flame/default.nix rename to pkgs/unit/pg/pg_flame/pkg-fun.nix diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/unit/pg/pg_tileserv/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/pg_tileserv/default.nix rename to pkgs/unit/pg/pg_tileserv/pkg-fun.nix diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/unit/pg/pg_top/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pg_top/default.nix rename to pkgs/unit/pg/pg_top/pkg-fun.nix diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/unit/pg/pgbackrest/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/pgbackrest/default.nix rename to pkgs/unit/pg/pgbackrest/pkg-fun.nix diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/unit/pg/pgbouncer/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/pgbouncer/default.nix rename to pkgs/unit/pg/pgbouncer/pkg-fun.nix diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/unit/pg/pgcenter/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pgcenter/default.nix rename to pkgs/unit/pg/pgcenter/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix b/pkgs/unit/pg/pgf-pie/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-pie.nix rename to pkgs/unit/pg/pgf-pie/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix b/pkgs/unit/pg/pgf-umlcd/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlcd.nix rename to pkgs/unit/pg/pgf-umlcd/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/pkgs/unit/pg/pgf-umlsd/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix rename to pkgs/unit/pg/pgf-umlsd/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix b/pkgs/unit/pg/pgf1/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-1.x.nix rename to pkgs/unit/pg/pgf1/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix b/pkgs/unit/pg/pgf2/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-2.x.nix rename to pkgs/unit/pg/pgf2/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix b/pkgs/unit/pg/pgf3/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgf-3.x.nix rename to pkgs/unit/pg/pgf3/pkg-fun.nix diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/unit/pg/pgf_graphics/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pgf/default.nix rename to pkgs/unit/pg/pgf_graphics/pkg-fun.nix diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/unit/pg/pgformatter/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pgformatter/default.nix rename to pkgs/unit/pg/pgformatter/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix b/pkgs/unit/pg/pgfplots/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix rename to pkgs/unit/pg/pgfplots/pkg-fun.nix diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/unit/pg/pgloader/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pgloader/default.nix rename to pkgs/unit/pg/pgloader/pkg-fun.nix diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/unit/pg/pgmanage/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pgmanage/default.nix rename to pkgs/unit/pg/pgmanage/pkg-fun.nix diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/unit/pg/pgmetrics/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pgmetrics/default.nix rename to pkgs/unit/pg/pgmetrics/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/pgo-client/default.nix b/pkgs/unit/pg/pgo-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/pgo-client/default.nix rename to pkgs/unit/pg/pgo-client/pkg-fun.nix diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/unit/pg/pgpdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pgpdump/default.nix rename to pkgs/unit/pg/pgpdump/pkg-fun.nix diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/unit/pg/pgpkeyserver-lite/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/pgpkeyserver-lite/default.nix rename to pkgs/unit/pg/pgpkeyserver-lite/pkg-fun.nix diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/unit/pg/pgpool/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/pgpool/default.nix rename to pkgs/unit/pg/pgpool/pkg-fun.nix diff --git a/pkgs/development/tools/database/pgsync/Gemfile b/pkgs/unit/pg/pgsync/Gemfile similarity index 100% rename from pkgs/development/tools/database/pgsync/Gemfile rename to pkgs/unit/pg/pgsync/Gemfile diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/unit/pg/pgsync/Gemfile.lock similarity index 100% rename from pkgs/development/tools/database/pgsync/Gemfile.lock rename to pkgs/unit/pg/pgsync/Gemfile.lock diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/unit/pg/pgsync/gemset.nix similarity index 100% rename from pkgs/development/tools/database/pgsync/gemset.nix rename to pkgs/unit/pg/pgsync/gemset.nix diff --git a/pkgs/development/tools/database/pgsync/default.nix b/pkgs/unit/pg/pgsync/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/pgsync/default.nix rename to pkgs/unit/pg/pgsync/pkg-fun.nix diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/unit/pg/pgtop/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pgtop/default.nix rename to pkgs/unit/pg/pgtop/pkg-fun.nix diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/unit/pg/pgweb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/pgweb/default.nix rename to pkgs/unit/pg/pgweb/pkg-fun.nix diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/unit/ph/pharo-launcher/pkg-fun.nix similarity index 100% rename from pkgs/development/pharo/launcher/default.nix rename to pkgs/unit/ph/pharo-launcher/pkg-fun.nix diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/unit/ph/phash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/phash/default.nix rename to pkgs/unit/ph/phash/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/unit/ph/phd2/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/phd2/default.nix rename to pkgs/unit/ph/phd2/pkg-fun.nix diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/unit/ph/phinger-cursors/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/phinger-cursors/default.nix rename to pkgs/unit/ph/phinger-cursors/pkg-fun.nix diff --git a/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch b/pkgs/unit/ph/phoc/0001-handle-outputs-that-arent-in-the-layout.patch similarity index 100% rename from pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch rename to pkgs/unit/ph/phoc/0001-handle-outputs-that-arent-in-the-layout.patch diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/unit/ph/phoc/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/phoc/default.nix rename to pkgs/unit/ph/phoc/pkg-fun.nix diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/unit/ph/phockup/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/phockup/default.nix rename to pkgs/unit/ph/phockup/pkg-fun.nix diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/unit/ph/phodav/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/phodav/default.nix rename to pkgs/unit/ph/phodav/pkg-fun.nix diff --git a/pkgs/tools/networking/phodav/2.0.nix b/pkgs/unit/ph/phodav_2_0/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/phodav/2.0.nix rename to pkgs/unit/ph/phodav_2_0/pkg-fun.nix diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/unit/ph/phoronix-test-suite/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/phoronix-test-suite/default.nix rename to pkgs/unit/ph/phoronix-test-suite/pkg-fun.nix diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/unit/ph/phoronix-test-suite/tests.nix similarity index 100% rename from pkgs/tools/misc/phoronix-test-suite/tests.nix rename to pkgs/unit/ph/phoronix-test-suite/tests.nix diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/unit/ph/phosh-mobile-settings/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix rename to pkgs/unit/ph/phosh-mobile-settings/pkg-fun.nix diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/unit/ph/phosh/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/phosh/default.nix rename to pkgs/unit/ph/phosh/pkg-fun.nix diff --git a/pkgs/applications/graphics/photoflow/CMakeLists.patch b/pkgs/unit/ph/photoflow/CMakeLists.patch similarity index 100% rename from pkgs/applications/graphics/photoflow/CMakeLists.patch rename to pkgs/unit/ph/photoflow/CMakeLists.patch diff --git a/pkgs/applications/graphics/photoflow/fix-build.patch b/pkgs/unit/ph/photoflow/fix-build.patch similarity index 100% rename from pkgs/applications/graphics/photoflow/fix-build.patch rename to pkgs/unit/ph/photoflow/fix-build.patch diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/unit/ph/photoflow/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/photoflow/default.nix rename to pkgs/unit/ph/photoflow/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/unit/ph/photon-rss/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/photon/default.nix rename to pkgs/unit/ph/photon-rss/pkg-fun.nix diff --git a/pkgs/tools/networking/photon/destdir.patch b/pkgs/unit/ph/photon/destdir.patch similarity index 100% rename from pkgs/tools/networking/photon/destdir.patch rename to pkgs/unit/ph/photon/destdir.patch diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/unit/ph/photon/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/photon/default.nix rename to pkgs/unit/ph/photon/pkg-fun.nix diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/unit/ph/photoprism/backend.nix similarity index 100% rename from pkgs/servers/photoprism/backend.nix rename to pkgs/unit/ph/photoprism/backend.nix diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/unit/ph/photoprism/frontend.nix similarity index 100% rename from pkgs/servers/photoprism/frontend.nix rename to pkgs/unit/ph/photoprism/frontend.nix diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/unit/ph/photoprism/libtensorflow.nix similarity index 100% rename from pkgs/servers/photoprism/libtensorflow.nix rename to pkgs/unit/ph/photoprism/libtensorflow.nix diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/unit/ph/photoprism/pkg-fun.nix similarity index 100% rename from pkgs/servers/photoprism/default.nix rename to pkgs/unit/ph/photoprism/pkg-fun.nix diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/unit/ph/phrase-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/phrase-cli/default.nix rename to pkgs/unit/ph/phrase-cli/pkg-fun.nix diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/unit/ph/phrasendrescher/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/phrasendrescher/default.nix rename to pkgs/unit/ph/phrasendrescher/pkg-fun.nix diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/unit/ph/phylactery/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/phylactery/default.nix rename to pkgs/unit/ph/phylactery/pkg-fun.nix diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/unit/ph/physlock/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/physlock/default.nix rename to pkgs/unit/ph/physlock/pkg-fun.nix diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/unit/pi/pianobar/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pianobar/default.nix rename to pkgs/unit/pi/pianobar/pkg-fun.nix diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/unit/pi/pianoteq/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pianoteq/default.nix rename to pkgs/unit/pi/pianoteq/pkg-fun.nix diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/unit/pi/picard-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/picard-tools/default.nix rename to pkgs/unit/pi/picard-tools/pkg-fun.nix diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/unit/pi/picard/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/picard/default.nix rename to pkgs/unit/pi/picard/pkg-fun.nix diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/unit/pi/picat/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/picat/default.nix rename to pkgs/unit/pi/picat/pkg-fun.nix diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/unit/pi/pick/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pick/default.nix rename to pkgs/unit/pi/pick/pkg-fun.nix diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/unit/pi/pico-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pico-sdk/default.nix rename to pkgs/unit/pi/pico-sdk/pkg-fun.nix diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/unit/pi/picoc/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/picoc/default.nix rename to pkgs/unit/pi/picoc/pkg-fun.nix diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/unit/pi/picolisp/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/picolisp/default.nix rename to pkgs/unit/pi/picolisp/pkg-fun.nix diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/unit/pi/picoloop/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/picoloop/default.nix rename to pkgs/unit/pi/picoloop/pkg-fun.nix diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/unit/pi/picom-jonaburg/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/picom/picom-jonaburg.nix rename to pkgs/unit/pi/picom-jonaburg/pkg-fun.nix diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/unit/pi/picom-next/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/picom/picom-next.nix rename to pkgs/unit/pi/picom-next/pkg-fun.nix diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/unit/pi/picom/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/picom/default.nix rename to pkgs/unit/pi/picom/pkg-fun.nix diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/unit/pi/picosat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/picosat/default.nix rename to pkgs/unit/pi/picosat/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/unit/pi/picoscope/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/picoscope/default.nix rename to pkgs/unit/pi/picoscope/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/unit/pi/picoscope/sources.json similarity index 100% rename from pkgs/applications/science/electronics/picoscope/sources.json rename to pkgs/unit/pi/picoscope/sources.json diff --git a/pkgs/applications/science/electronics/picoscope/update.py b/pkgs/unit/pi/picoscope/update.py similarity index 100% rename from pkgs/applications/science/electronics/picoscope/update.py rename to pkgs/unit/pi/picoscope/update.py diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/unit/pi/picotool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/picotool/default.nix rename to pkgs/unit/pi/picotool/pkg-fun.nix diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/unit/pi/picotts/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/picotts/default.nix rename to pkgs/unit/pi/picotts/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/unit/pi/pidgin-carbons/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix rename to pkgs/unit/pi/pidgin-carbons/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/unit/pi/pidgin-indicator/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix rename to pkgs/unit/pi/pidgin-indicator/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/unit/pi/pidgin-mra/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix rename to pkgs/unit/pi/pidgin-mra/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/unit/pi/pidgin-msn-pecan/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix rename to pkgs/unit/pi/pidgin-msn-pecan/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/unit/pi/pidgin-opensteamworks/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix rename to pkgs/unit/pi/pidgin-opensteamworks/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/unit/pi/pidgin-osd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix rename to pkgs/unit/pi/pidgin-osd/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/unit/pi/pidgin-otr/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix rename to pkgs/unit/pi/pidgin-otr/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/unit/pi/pidgin-sipe/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix rename to pkgs/unit/pi/pidgin-sipe/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/unit/pi/pidgin-skypeweb/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix rename to pkgs/unit/pi/pidgin-skypeweb/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/unit/pi/pidgin-window-merge/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix rename to pkgs/unit/pi/pidgin-window-merge/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/unit/pi/pidgin-xmpp-receipts/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix rename to pkgs/unit/pi/pidgin-xmpp-receipts/pkg-fun.nix diff --git a/pkgs/servers/pies/default.nix b/pkgs/unit/pi/pies/pkg-fun.nix similarity index 100% rename from pkgs/servers/pies/default.nix rename to pkgs/unit/pi/pies/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/unit/pi/pig/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/pig/default.nix rename to pkgs/unit/pi/pig/pkg-fun.nix diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/unit/pi/pigeon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pigeon/default.nix rename to pkgs/unit/pi/pigeon/pkg-fun.nix diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/unit/pi/piglit/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/piglit/default.nix rename to pkgs/unit/pi/piglit/pkg-fun.nix diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/unit/pi/pigz/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/pigz/default.nix rename to pkgs/unit/pi/pigz/pkg-fun.nix diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/unit/pi/pijul/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/pijul/default.nix rename to pkgs/unit/pi/pijul/pkg-fun.nix diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/unit/pi/pika-backup/borg-path.patch similarity index 100% rename from pkgs/applications/backup/pika-backup/borg-path.patch rename to pkgs/unit/pi/pika-backup/borg-path.patch diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/unit/pi/pika-backup/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/pika-backup/default.nix rename to pkgs/unit/pi/pika-backup/pkg-fun.nix diff --git a/pkgs/applications/graphics/pika/default.nix b/pkgs/unit/pi/pika/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pika/default.nix rename to pkgs/unit/pi/pika/pkg-fun.nix diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/unit/pi/pikchr/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pikchr/default.nix rename to pkgs/unit/pi/pikchr/pkg-fun.nix diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/unit/pi/pikopixel/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pikopixel/default.nix rename to pkgs/unit/pi/pikopixel/pkg-fun.nix diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/unit/pi/pim6sd/pkg-fun.nix similarity index 100% rename from pkgs/servers/pim6sd/default.nix rename to pkgs/unit/pi/pim6sd/pkg-fun.nix diff --git a/pkgs/games/pinball/default.nix b/pkgs/unit/pi/pinball/pkg-fun.nix similarity index 100% rename from pkgs/games/pinball/default.nix rename to pkgs/unit/pi/pinball/pkg-fun.nix diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/unit/pi/pinentry-bemenu/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pinentry-bemenu/default.nix rename to pkgs/unit/pi/pinentry-bemenu/pkg-fun.nix diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/unit/pi/pinentry-rofi/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pinentry-rofi/default.nix rename to pkgs/unit/pi/pinentry-rofi/pkg-fun.nix diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/unit/pi/pinfo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pinfo/default.nix rename to pkgs/unit/pi/pinfo/pkg-fun.nix diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/unit/pi/pingtcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pingtcp/default.nix rename to pkgs/unit/pi/pingtcp/pkg-fun.nix diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/unit/pi/pingu/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pingu/default.nix rename to pkgs/unit/pi/pingu/pkg-fun.nix diff --git a/pkgs/games/pingus/default.nix b/pkgs/unit/pi/pingus/pkg-fun.nix similarity index 100% rename from pkgs/games/pingus/default.nix rename to pkgs/unit/pi/pingus/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/unit/pi/pinniped/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/pinniped/default.nix rename to pkgs/unit/pi/pinniped/pkg-fun.nix diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/unit/pi/pinnwand/pkg-fun.nix similarity index 100% rename from pkgs/servers/pinnwand/default.nix rename to pkgs/unit/pi/pinnwand/pkg-fun.nix diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/unit/pi/pinocchio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pinocchio/default.nix rename to pkgs/unit/pi/pinocchio/pkg-fun.nix diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/unit/pi/pinpoint/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/pinpoint/default.nix rename to pkgs/unit/pi/pinpoint/pkg-fun.nix diff --git a/pkgs/tools/misc/pinsel/default.nix b/pkgs/unit/pi/pinsel/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pinsel/default.nix rename to pkgs/unit/pi/pinsel/pkg-fun.nix diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/unit/pi/pinta/deps.nix similarity index 100% rename from pkgs/applications/graphics/pinta/deps.nix rename to pkgs/unit/pi/pinta/deps.nix diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/unit/pi/pinta/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pinta/default.nix rename to pkgs/unit/pi/pinta/pkg-fun.nix diff --git a/pkgs/games/pioneer/default.nix b/pkgs/unit/pi/pioneer/pkg-fun.nix similarity index 100% rename from pkgs/games/pioneer/default.nix rename to pkgs/unit/pi/pioneer/pkg-fun.nix diff --git a/pkgs/games/pioneers/default.nix b/pkgs/unit/pi/pioneers/pkg-fun.nix similarity index 100% rename from pkgs/games/pioneers/default.nix rename to pkgs/unit/pi/pioneers/pkg-fun.nix diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/unit/pi/pip-audit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pip-audit/default.nix rename to pkgs/unit/pi/pip-audit/pkg-fun.nix diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/unit/pi/pipe-rename/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pipe-rename/default.nix rename to pkgs/unit/pi/pipe-rename/pkg-fun.nix diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/unit/pi/pipectl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pipectl/default.nix rename to pkgs/unit/pi/pipectl/pkg-fun.nix diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/unit/pi/pipenv/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pipenv/default.nix rename to pkgs/unit/pi/pipenv/pkg-fun.nix diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/unit/pi/piper/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/piper/default.nix rename to pkgs/unit/pi/piper/pkg-fun.nix diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/unit/pi/pipes-rs/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/pipes-rs/default.nix rename to pkgs/unit/pi/pipes-rs/pkg-fun.nix diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/unit/pi/pipes/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/pipes/default.nix rename to pkgs/unit/pi/pipes/pkg-fun.nix diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/unit/pi/pipewire_0_2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pipewire/0.2.nix rename to pkgs/unit/pi/pipewire_0_2/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/unit/pi/pipework/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pipework/default.nix rename to pkgs/unit/pi/pipework/pkg-fun.nix diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/unit/pi/pipr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pipr/default.nix rename to pkgs/unit/pi/pipr/pkg-fun.nix diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/unit/pi/pipreqs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pipreqs/default.nix rename to pkgs/unit/pi/pipreqs/pkg-fun.nix diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/unit/pi/pirate-get/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pirate-get/default.nix rename to pkgs/unit/pi/pirate-get/pkg-fun.nix diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/unit/pi/pistol/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pistol/default.nix rename to pkgs/unit/pi/pistol/pkg-fun.nix diff --git a/pkgs/data/themes/pitch-black/default.nix b/pkgs/unit/pi/pitch-black/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/pitch-black/default.nix rename to pkgs/unit/pi/pitch-black/pkg-fun.nix diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/unit/pi/pitivi/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/pitivi/default.nix rename to pkgs/unit/pi/pitivi/pkg-fun.nix diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/unit/pi/pitivi/prevent-closure-contamination.patch similarity index 100% rename from pkgs/applications/video/pitivi/prevent-closure-contamination.patch rename to pkgs/unit/pi/pitivi/prevent-closure-contamination.patch diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/unit/pi/pius/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pius/default.nix rename to pkgs/unit/pi/pius/pkg-fun.nix diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/unit/pi/pixd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pixd/default.nix rename to pkgs/unit/pi/pixd/pkg-fun.nix diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/unit/pi/pixelnuke/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pixelnuke/default.nix rename to pkgs/unit/pi/pixelnuke/pkg-fun.nix diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/unit/pi/pixelorama/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/pixelorama/default.nix rename to pkgs/unit/pi/pixelorama/pkg-fun.nix diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/unit/pi/pixeluvo/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pixeluvo/default.nix rename to pkgs/unit/pi/pixeluvo/pkg-fun.nix diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/unit/pi/pixiecore/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pixiecore/default.nix rename to pkgs/unit/pi/pixiecore/pkg-fun.nix diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/unit/pi/pixiewps/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pixiewps/default.nix rename to pkgs/unit/pi/pixiewps/pkg-fun.nix diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/unit/pi/pixman/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pixman/default.nix rename to pkgs/unit/pi/pixman/pkg-fun.nix diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/unit/pi/pixz/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/pixz/default.nix rename to pkgs/unit/pi/pixz/pkg-fun.nix diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/unit/pi/pizarra/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pizarra/default.nix rename to pkgs/unit/pi/pizarra/pkg-fun.nix diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/unit/pk/pk2cmd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pk2cmd/default.nix rename to pkgs/unit/pk/pk2cmd/pkg-fun.nix diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/unit/pk/pkcs11helper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pkcs11helper/default.nix rename to pkgs/unit/pk/pkcs11helper/pkg-fun.nix diff --git a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch b/pkgs/unit/pk/pkg-config-unwrapped/2.36.3-not-win32.patch similarity index 100% rename from pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch rename to pkgs/unit/pk/pkg-config-unwrapped/2.36.3-not-win32.patch diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/unit/pk/pkg-config-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/pkg-config/default.nix rename to pkgs/unit/pk/pkg-config-unwrapped/pkg-fun.nix diff --git a/pkgs/development/tools/misc/pkg-config/requires-private.patch b/pkgs/unit/pk/pkg-config-unwrapped/requires-private.patch similarity index 100% rename from pkgs/development/tools/misc/pkg-config/requires-private.patch rename to pkgs/unit/pk/pkg-config-unwrapped/requires-private.patch diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/unit/pk/pkgconf-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/pkgconf/default.nix rename to pkgs/unit/pk/pkgconf-unwrapped/pkg-fun.nix diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/unit/pk/pkgdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pkgdiff/default.nix rename to pkgs/unit/pk/pkgdiff/pkg-fun.nix diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/unit/pk/pkger/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pkger/default.nix rename to pkgs/unit/pk/pkger/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/unit/pl/planarity/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/planarity/default.nix rename to pkgs/unit/pl/planarity/pkg-fun.nix diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/unit/pl/planetary_annihilation/pkg-fun.nix similarity index 100% rename from pkgs/games/planetaryannihilation/default.nix rename to pkgs/unit/pl/planetary_annihilation/pkg-fun.nix diff --git a/pkgs/applications/misc/plank/hide-in-pantheon.patch b/pkgs/unit/pl/plank/hide-in-pantheon.patch similarity index 100% rename from pkgs/applications/misc/plank/hide-in-pantheon.patch rename to pkgs/unit/pl/plank/hide-in-pantheon.patch diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/unit/pl/plank/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/plank/default.nix rename to pkgs/unit/pl/plank/pkg-fun.nix diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/unit/pl/plano-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/plano/default.nix rename to pkgs/unit/pl/plano-theme/pkg-fun.nix diff --git a/pkgs/tools/misc/plantuml/plantuml-c4.nix b/pkgs/unit/pl/plantuml-c4/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/plantuml/plantuml-c4.nix rename to pkgs/unit/pl/plantuml-c4/pkg-fun.nix diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/unit/pl/plantuml-server/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/plantuml-server/default.nix rename to pkgs/unit/pl/plantuml-server/pkg-fun.nix diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/unit/pl/plantuml/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/plantuml/default.nix rename to pkgs/unit/pl/plantuml/pkg-fun.nix diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/unit/pl/plasma-hud/pkg-fun.nix similarity index 100% rename from pkgs/misc/plasma-hud/default.nix rename to pkgs/unit/pl/plasma-hud/pkg-fun.nix diff --git a/pkgs/data/themes/plasma-overdose-kde-theme/default.nix b/pkgs/unit/pl/plasma-overdose-kde-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/plasma-overdose-kde-theme/default.nix rename to pkgs/unit/pl/plasma-overdose-kde-theme/pkg-fun.nix diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/unit/pl/platform-folders/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/platform-folders/default.nix rename to pkgs/unit/pl/platform-folders/pkg-fun.nix diff --git a/pkgs/misc/platformsh/default.nix b/pkgs/unit/pl/platformsh/pkg-fun.nix similarity index 100% rename from pkgs/misc/platformsh/default.nix rename to pkgs/unit/pl/platformsh/pkg-fun.nix diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/unit/pl/platinum-searcher/deps.nix similarity index 100% rename from pkgs/tools/text/platinum-searcher/deps.nix rename to pkgs/unit/pl/platinum-searcher/deps.nix diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/unit/pl/platinum-searcher/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/platinum-searcher/default.nix rename to pkgs/unit/pl/platinum-searcher/pkg-fun.nix diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/unit/pl/platypus/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/platypus/default.nix rename to pkgs/unit/pl/platypus/pkg-fun.nix diff --git a/pkgs/servers/web-apps/plausible/package.json b/pkgs/unit/pl/plausible/package.json similarity index 100% rename from pkgs/servers/web-apps/plausible/package.json rename to pkgs/unit/pl/plausible/package.json diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/unit/pl/plausible/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/plausible/default.nix rename to pkgs/unit/pl/plausible/pkg-fun.nix diff --git a/pkgs/servers/web-apps/plausible/update.sh b/pkgs/unit/pl/plausible/update.sh similarity index 100% rename from pkgs/servers/web-apps/plausible/update.sh rename to pkgs/unit/pl/plausible/update.sh diff --git a/pkgs/servers/web-apps/plausible/yarn.lock b/pkgs/unit/pl/plausible/yarn.lock similarity index 100% rename from pkgs/servers/web-apps/plausible/yarn.lock rename to pkgs/unit/pl/plausible/yarn.lock diff --git a/pkgs/servers/web-apps/plausible/yarn.nix b/pkgs/unit/pl/plausible/yarn.nix similarity index 100% rename from pkgs/servers/web-apps/plausible/yarn.nix rename to pkgs/unit/pl/plausible/yarn.nix diff --git a/pkgs/tools/video/play-with-mpv/default.nix b/pkgs/unit/pl/play-with-mpv/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/play-with-mpv/default.nix rename to pkgs/unit/pl/play-with-mpv/pkg-fun.nix diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/unit/pl/playerctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/playerctl/default.nix rename to pkgs/unit/pl/playerctl/pkg-fun.nix diff --git a/pkgs/tools/security/please/nixos-specific.patch b/pkgs/unit/pl/please/nixos-specific.patch similarity index 100% rename from pkgs/tools/security/please/nixos-specific.patch rename to pkgs/unit/pl/please/nixos-specific.patch diff --git a/pkgs/tools/security/please/default.nix b/pkgs/unit/pl/please/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/please/default.nix rename to pkgs/unit/pl/please/pkg-fun.nix diff --git a/pkgs/tools/security/plecost/default.nix b/pkgs/unit/pl/plecost/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/plecost/default.nix rename to pkgs/unit/pl/plecost/pkg-fun.nix diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/unit/pl/pleroma/mix.nix similarity index 100% rename from pkgs/servers/pleroma/mix.nix rename to pkgs/unit/pl/pleroma/mix.nix diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/unit/pl/pleroma/pkg-fun.nix similarity index 100% rename from pkgs/servers/pleroma/default.nix rename to pkgs/unit/pl/pleroma/pkg-fun.nix diff --git a/pkgs/servers/plex/default.nix b/pkgs/unit/pl/plex/pkg-fun.nix similarity index 100% rename from pkgs/servers/plex/default.nix rename to pkgs/unit/pl/plex/pkg-fun.nix diff --git a/pkgs/servers/plex/raw.nix b/pkgs/unit/pl/plexRaw/pkg-fun.nix similarity index 100% rename from pkgs/servers/plex/raw.nix rename to pkgs/unit/pl/plexRaw/pkg-fun.nix diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/unit/pl/plexamp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/plexamp/default.nix rename to pkgs/unit/pl/plexamp/pkg-fun.nix diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/unit/pl/plexamp/update-plexamp.sh similarity index 100% rename from pkgs/applications/audio/plexamp/update-plexamp.sh rename to pkgs/unit/pl/plexamp/update-plexamp.sh diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/unit/pl/plib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/plib/default.nix rename to pkgs/unit/pl/plib/pkg-fun.nix diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/unit/pl/plink-ng/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/plink-ng/default.nix rename to pkgs/unit/pl/plink-ng/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/plistwatch/go-modules.patch b/pkgs/unit/pl/plistwatch/go-modules.patch similarity index 100% rename from pkgs/os-specific/darwin/plistwatch/go-modules.patch rename to pkgs/unit/pl/plistwatch/go-modules.patch diff --git a/pkgs/os-specific/darwin/plistwatch/default.nix b/pkgs/unit/pl/plistwatch/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/plistwatch/default.nix rename to pkgs/unit/pl/plistwatch/pkg-fun.nix diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/unit/pl/plm/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/programming/plm/default.nix rename to pkgs/unit/pl/plm/pkg-fun.nix diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/unit/pl/plocate/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/plocate/default.nix rename to pkgs/unit/pl/plocate/pkg-fun.nix diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/unit/pl/plotinus/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/plotinus/default.nix rename to pkgs/unit/pl/plotinus/pkg-fun.nix diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/unit/pl/plotutils/debian-patches.nix similarity index 100% rename from pkgs/tools/graphics/plotutils/debian-patches.nix rename to pkgs/unit/pl/plotutils/debian-patches.nix diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/unit/pl/plotutils/debian-patches.txt similarity index 100% rename from pkgs/tools/graphics/plotutils/debian-patches.txt rename to pkgs/unit/pl/plotutils/debian-patches.txt diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/unit/pl/plotutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/plotutils/default.nix rename to pkgs/unit/pl/plotutils/pkg-fun.nix diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/unit/pl/plowshare/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/plowshare/default.nix rename to pkgs/unit/pl/plowshare/pkg-fun.nix diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/unit/pl/pls/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pls/default.nix rename to pkgs/unit/pl/pls/pkg-fun.nix diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/unit/pl/plugin-torture/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/plugin-torture/default.nix rename to pkgs/unit/pl/plugin-torture/pkg-fun.nix diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/unit/pl/plujain-ramp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/plujain-ramp/default.nix rename to pkgs/unit/pl/plujain-ramp/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/unit/pl/pluto/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/pluto/default.nix rename to pkgs/unit/pl/pluto/pkg-fun.nix diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/unit/pl/plymouth/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/plymouth/default.nix rename to pkgs/unit/pl/plymouth/pkg-fun.nix diff --git a/pkgs/tools/compression/plzip/default.nix b/pkgs/unit/pl/plzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/plzip/default.nix rename to pkgs/unit/pl/plzip/pkg-fun.nix diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/unit/pm/pmacct/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pmacct/default.nix rename to pkgs/unit/pm/pmacct/pkg-fun.nix diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/pkgs/unit/pm/pmccabe/getopt_on_darwin.patch similarity index 100% rename from pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch rename to pkgs/unit/pm/pmccabe/getopt_on_darwin.patch diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/unit/pm/pmccabe/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/pmccabe/default.nix rename to pkgs/unit/pm/pmccabe/pkg-fun.nix diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/unit/pm/pmdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pmdk/default.nix rename to pkgs/unit/pm/pmdk/pkg-fun.nix diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/unit/pm/pmenu/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/pmenu/default.nix rename to pkgs/unit/pm/pmenu/pkg-fun.nix diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/unit/pm/pmidi/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pmidi/default.nix rename to pkgs/unit/pm/pmidi/pkg-fun.nix diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/unit/pm/pmix/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pmix/default.nix rename to pkgs/unit/pm/pmix/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/unit/pm/pmount/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pmount/default.nix rename to pkgs/unit/pm/pmount/pkg-fun.nix diff --git a/pkgs/applications/audio/pms/default.nix b/pkgs/unit/pm/pms/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pms/default.nix rename to pkgs/unit/pm/pms/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/unit/pm/pmutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pm-utils/default.nix rename to pkgs/unit/pm/pmutils/pkg-fun.nix diff --git a/pkgs/tools/text/pn/default.nix b/pkgs/unit/pn/pn/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/pn/default.nix rename to pkgs/unit/pn/pn/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/unit/pn/pngcheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngcheck/default.nix rename to pkgs/unit/pn/pngcheck/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/unit/pn/pngcrush/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngcrush/default.nix rename to pkgs/unit/pn/pngcrush/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/unit/pn/pngloss/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngloss/default.nix rename to pkgs/unit/pn/pngloss/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/unit/pn/pngnq/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngnq/default.nix rename to pkgs/unit/pn/pngnq/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngoptimizer/default.nix b/pkgs/unit/pn/pngoptimizer/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngoptimizer/default.nix rename to pkgs/unit/pn/pngoptimizer/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/unit/pn/pngout/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngout/default.nix rename to pkgs/unit/pn/pngout/pkg-fun.nix diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/unit/pn/pngpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/png++/default.nix rename to pkgs/unit/pn/pngpp/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/unit/pn/pngquant/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngquant/default.nix rename to pkgs/unit/pn/pngquant/pkg-fun.nix diff --git a/pkgs/tools/graphics/pngtools/default.nix b/pkgs/unit/pn/pngtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pngtools/default.nix rename to pkgs/unit/pn/pngtools/pkg-fun.nix diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/unit/pn/pnmixer/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/pnmixer/default.nix rename to pkgs/unit/pn/pnmixer/pkg-fun.nix diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/unit/po/pocket-casts/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pocket-casts/default.nix rename to pkgs/unit/po/pocket-casts/pkg-fun.nix diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/unit/po/pocketbase/pkg-fun.nix similarity index 100% rename from pkgs/servers/pocketbase/default.nix rename to pkgs/unit/po/pocketbase/pkg-fun.nix diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/unit/po/poco/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/poco/default.nix rename to pkgs/unit/po/poco/pkg-fun.nix diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/unit/po/pod2mdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pod2mdoc/default.nix rename to pkgs/unit/po/pod2mdoc/pkg-fun.nix diff --git a/pkgs/servers/misc/podgrab/default.nix b/pkgs/unit/po/podgrab/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/podgrab/default.nix rename to pkgs/unit/po/podgrab/pkg-fun.nix diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/unit/po/podiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/podiff/default.nix rename to pkgs/unit/po/podiff/pkg-fun.nix diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/unit/po/podman-tui/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/podman-tui/default.nix rename to pkgs/unit/po/podman-tui/pkg-fun.nix diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/unit/po/podman-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/podman/default.nix rename to pkgs/unit/po/podman-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/unit/po/podman-unwrapped/rm-podman-mac-helper-msg.patch similarity index 100% rename from pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch rename to pkgs/unit/po/podman-unwrapped/rm-podman-mac-helper-msg.patch diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/unit/po/podman/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/podman/wrapper.nix rename to pkgs/unit/po/podman/pkg-fun.nix diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/unit/po/podofo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/podofo/default.nix rename to pkgs/unit/po/podofo/pkg-fun.nix diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/unit/po/pods/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/pods/default.nix rename to pkgs/unit/po/pods/pkg-fun.nix diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/unit/po/poetry/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/poetry/default.nix rename to pkgs/unit/po/poetry/pkg-fun.nix diff --git a/pkgs/tools/package-management/poetry2conda/default.nix b/pkgs/unit/po/poetry2conda/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/poetry2conda/default.nix rename to pkgs/unit/po/poetry2conda/pkg-fun.nix diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/unit/po/poke/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/poke/default.nix rename to pkgs/unit/po/poke/pkg-fun.nix diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/unit/po/pokemon-colorscripts-mac/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pokemon-colorscripts-mac/default.nix rename to pkgs/unit/po/pokemon-colorscripts-mac/pkg-fun.nix diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/unit/po/pokemonsay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pokemonsay/default.nix rename to pkgs/unit/po/pokemonsay/pkg-fun.nix diff --git a/pkgs/games/pokete/default.nix b/pkgs/unit/po/pokete/pkg-fun.nix similarity index 100% rename from pkgs/games/pokete/default.nix rename to pkgs/unit/po/pokete/pkg-fun.nix diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/unit/po/polar-bookshelf/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/polar-bookshelf/default.nix rename to pkgs/unit/po/polar-bookshelf/pkg-fun.nix diff --git a/pkgs/tools/misc/polar/Gemfile b/pkgs/unit/po/polar/Gemfile similarity index 100% rename from pkgs/tools/misc/polar/Gemfile rename to pkgs/unit/po/polar/Gemfile diff --git a/pkgs/tools/misc/polar/Gemfile.lock b/pkgs/unit/po/polar/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/polar/Gemfile.lock rename to pkgs/unit/po/polar/Gemfile.lock diff --git a/pkgs/tools/misc/polar/gemset.nix b/pkgs/unit/po/polar/gemset.nix similarity index 100% rename from pkgs/tools/misc/polar/gemset.nix rename to pkgs/unit/po/polar/gemset.nix diff --git a/pkgs/tools/misc/polar/default.nix b/pkgs/unit/po/polar/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/polar/default.nix rename to pkgs/unit/po/polar/pkg-fun.nix diff --git a/pkgs/servers/polaris/default.nix b/pkgs/unit/po/polaris/pkg-fun.nix similarity index 100% rename from pkgs/servers/polaris/default.nix rename to pkgs/unit/po/polaris/pkg-fun.nix diff --git a/pkgs/servers/polaris/update.sh b/pkgs/unit/po/polaris/update.sh similarity index 100% rename from pkgs/servers/polaris/update.sh rename to pkgs/unit/po/polaris/update.sh diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/unit/po/policycoreutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/policycoreutils/default.nix rename to pkgs/unit/po/policycoreutils/pkg-fun.nix diff --git a/pkgs/servers/polipo/default.nix b/pkgs/unit/po/polipo/pkg-fun.nix similarity index 100% rename from pkgs/servers/polipo/default.nix rename to pkgs/unit/po/polipo/pkg-fun.nix diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/unit/po/polkit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/polkit/default.nix rename to pkgs/unit/po/polkit/pkg-fun.nix diff --git a/pkgs/development/libraries/polkit/system_bus.conf b/pkgs/unit/po/polkit/system_bus.conf similarity index 100% rename from pkgs/development/libraries/polkit/system_bus.conf rename to pkgs/unit/po/polkit/system_bus.conf diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/unit/po/polkit_gnome/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/polkit-gnome/default.nix rename to pkgs/unit/po/polkit_gnome/pkg-fun.nix diff --git a/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/pkgs/unit/po/polkit_gnome/polkit-gnome-authentication-agent-1.desktop similarity index 100% rename from pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop rename to pkgs/unit/po/polkit_gnome/polkit-gnome-authentication-agent-1.desktop diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/unit/po/poly/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/poly/default.nix rename to pkgs/unit/po/poly/pkg-fun.nix diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/unit/po/poly2tri-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/poly2tri-c/default.nix rename to pkgs/unit/po/poly2tri-c/pkg-fun.nix diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/unit/po/polygraph/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/polygraph/default.nix rename to pkgs/unit/po/polygraph/pkg-fun.nix diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/unit/po/polylith/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/polylith/default.nix rename to pkgs/unit/po/polylith/pkg-fun.nix diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/unit/po/polymake/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/polymake/default.nix rename to pkgs/unit/po/polymake/pkg-fun.nix diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/unit/po/polyml/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/polyml/default.nix rename to pkgs/unit/po/polyml/pkg-fun.nix diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/unit/po/polyml56/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/polyml/5.6.nix rename to pkgs/unit/po/polyml56/pkg-fun.nix diff --git a/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch b/pkgs/unit/po/polyml57/5.7-new-libffi-FFI_SYSV.patch similarity index 100% rename from pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch rename to pkgs/unit/po/polyml57/5.7-new-libffi-FFI_SYSV.patch diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/unit/po/polyml57/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/polyml/5.7.nix rename to pkgs/unit/po/polyml57/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/unit/po/polypane/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/polypane/default.nix rename to pkgs/unit/po/polypane/pkg-fun.nix diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/unit/po/polytopes_db/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/polytopes_db/default.nix rename to pkgs/unit/po/polytopes_db/pkg-fun.nix diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/unit/po/pomerium-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pomerium-cli/default.nix rename to pkgs/unit/po/pomerium-cli/pkg-fun.nix diff --git a/pkgs/servers/http/pomerium/external-envoy.diff b/pkgs/unit/po/pomerium/external-envoy.diff similarity index 100% rename from pkgs/servers/http/pomerium/external-envoy.diff rename to pkgs/unit/po/pomerium/external-envoy.diff diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/unit/po/pomerium/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/pomerium/default.nix rename to pkgs/unit/po/pomerium/pkg-fun.nix diff --git a/pkgs/servers/http/pomerium/pomerium-ui-package.json b/pkgs/unit/po/pomerium/pomerium-ui-package.json similarity index 100% rename from pkgs/servers/http/pomerium/pomerium-ui-package.json rename to pkgs/unit/po/pomerium/pomerium-ui-package.json diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/unit/po/pommed_light/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pommed-light/default.nix rename to pkgs/unit/po/pommed_light/pkg-fun.nix diff --git a/pkgs/tools/text/pomsky/default.nix b/pkgs/unit/po/pomsky/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/pomsky/default.nix rename to pkgs/unit/po/pomsky/pkg-fun.nix diff --git a/pkgs/games/pong3d/default.nix b/pkgs/unit/po/pong3d/pkg-fun.nix similarity index 100% rename from pkgs/games/pong3d/default.nix rename to pkgs/unit/po/pong3d/pkg-fun.nix diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/unit/po/pony-corral/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/ponyc/pony-corral.nix rename to pkgs/unit/po/pony-corral/pkg-fun.nix diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/unit/po/ponymix/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ponymix/default.nix rename to pkgs/unit/po/ponymix/pkg-fun.nix diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/unit/po/ponysay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ponysay/default.nix rename to pkgs/unit/po/ponysay/pkg-fun.nix diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/unit/po/pop-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/pop-gtk/default.nix rename to pkgs/unit/po/pop-gtk-theme/pkg-fun.nix diff --git a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/pkgs/unit/po/popa3d/enable-standalone-mode.patch similarity index 100% rename from pkgs/servers/mail/popa3d/enable-standalone-mode.patch rename to pkgs/unit/po/popa3d/enable-standalone-mode.patch diff --git a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/pkgs/unit/po/popa3d/fix-mail-spool-path.patch similarity index 100% rename from pkgs/servers/mail/popa3d/fix-mail-spool-path.patch rename to pkgs/unit/po/popa3d/fix-mail-spool-path.patch diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/unit/po/popa3d/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/popa3d/default.nix rename to pkgs/unit/po/popa3d/pkg-fun.nix diff --git a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/pkgs/unit/po/popa3d/use-glibc-crypt.patch similarity index 100% rename from pkgs/servers/mail/popa3d/use-glibc-crypt.patch rename to pkgs/unit/po/popa3d/use-glibc-crypt.patch diff --git a/pkgs/servers/mail/popa3d/use-openssl.patch b/pkgs/unit/po/popa3d/use-openssl.patch similarity index 100% rename from pkgs/servers/mail/popa3d/use-openssl.patch rename to pkgs/unit/po/popa3d/use-openssl.patch diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/unit/po/popcorntime/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/popcorntime/default.nix rename to pkgs/unit/po/popcorntime/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/unit/po/popeye/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/popeye/default.nix rename to pkgs/unit/po/popeye/pkg-fun.nix diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/unit/po/popfile/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/popfile/default.nix rename to pkgs/unit/po/popfile/pkg-fun.nix diff --git a/pkgs/development/libraries/popl/default.nix b/pkgs/unit/po/popl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/popl/default.nix rename to pkgs/unit/po/popl/pkg-fun.nix diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/unit/po/poppler_data/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/poppler-data/default.nix rename to pkgs/unit/po/poppler_data/pkg-fun.nix diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/unit/po/popsicle/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/popsicle/default.nix rename to pkgs/unit/po/popsicle/pkg-fun.nix diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/unit/po/popt/1.16-cygwin.patch similarity index 100% rename from pkgs/development/libraries/popt/1.16-cygwin.patch rename to pkgs/unit/po/popt/1.16-cygwin.patch diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/unit/po/popt/1.16-vpath.patch similarity index 100% rename from pkgs/development/libraries/popt/1.16-vpath.patch rename to pkgs/unit/po/popt/1.16-vpath.patch diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/unit/po/popt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/popt/default.nix rename to pkgs/unit/po/popt/pkg-fun.nix diff --git a/pkgs/tools/networking/popura/default.nix b/pkgs/unit/po/popura/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/popura/default.nix rename to pkgs/unit/po/popura/pkg-fun.nix diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/unit/po/poretools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/poretools/default.nix rename to pkgs/unit/po/poretools/pkg-fun.nix diff --git a/pkgs/build-support/portable-service/default.nix b/pkgs/unit/po/portableService/pkg-fun.nix similarity index 100% rename from pkgs/build-support/portable-service/default.nix rename to pkgs/unit/po/portableService/pkg-fun.nix diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/unit/po/portfolio-filemanager/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/portfolio-filemanager/default.nix rename to pkgs/unit/po/portfolio-filemanager/pkg-fun.nix diff --git a/pkgs/games/portmod/default.nix b/pkgs/unit/po/portmod/pkg-fun.nix similarity index 100% rename from pkgs/games/portmod/default.nix rename to pkgs/unit/po/portmod/pkg-fun.nix diff --git a/pkgs/servers/portunus/default.nix b/pkgs/unit/po/portunus/pkg-fun.nix similarity index 100% rename from pkgs/servers/portunus/default.nix rename to pkgs/unit/po/portunus/pkg-fun.nix diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/unit/po/posterazor/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/posterazor/default.nix rename to pkgs/unit/po/posterazor/pkg-fun.nix diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/unit/po/postfix/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/postfix/default.nix rename to pkgs/unit/po/postfix/pkg-fun.nix diff --git a/pkgs/servers/mail/postfix/post-install-script.patch b/pkgs/unit/po/postfix/post-install-script.patch similarity index 100% rename from pkgs/servers/mail/postfix/post-install-script.patch rename to pkgs/unit/po/postfix/post-install-script.patch diff --git a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch b/pkgs/unit/po/postfix/postfix-3.0-no-warnings.patch similarity index 100% rename from pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch rename to pkgs/unit/po/postfix/postfix-3.0-no-warnings.patch diff --git a/pkgs/servers/mail/postfix/postfix-script-shell.patch b/pkgs/unit/po/postfix/postfix-script-shell.patch similarity index 100% rename from pkgs/servers/mail/postfix/postfix-script-shell.patch rename to pkgs/unit/po/postfix/postfix-script-shell.patch diff --git a/pkgs/servers/mail/postfix/relative-symlinks.patch b/pkgs/unit/po/postfix/relative-symlinks.patch similarity index 100% rename from pkgs/servers/mail/postfix/relative-symlinks.patch rename to pkgs/unit/po/postfix/relative-symlinks.patch diff --git a/pkgs/servers/mail/postfix/update.sh b/pkgs/unit/po/postfix/update.sh similarity index 100% rename from pkgs/servers/mail/postfix/update.sh rename to pkgs/unit/po/postfix/update.sh diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/unit/po/postfixadmin/pkg-fun.nix similarity index 100% rename from pkgs/servers/postfixadmin/default.nix rename to pkgs/unit/po/postfixadmin/pkg-fun.nix diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix b/pkgs/unit/po/postgresqlTestHook/pkg-fun.nix similarity index 100% rename from pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix rename to pkgs/unit/po/postgresqlTestHook/pkg-fun.nix diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/unit/po/postgresqlTestHook/postgresql-test-hook.sh similarity index 100% rename from pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh rename to pkgs/unit/po/postgresqlTestHook/postgresql-test-hook.sh diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/unit/po/postgresqlTestHook/test.nix similarity index 100% rename from pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix rename to pkgs/unit/po/postgresqlTestHook/test.nix diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/unit/po/postgresql_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/development/java-modules/postgresql_jdbc/default.nix rename to pkgs/unit/po/postgresql_jdbc/pkg-fun.nix diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/unit/po/postgrey/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/postgrey/default.nix rename to pkgs/unit/po/postgrey/pkg-fun.nix diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/unit/po/postiats-utilities/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/postiats-utilities/default.nix rename to pkgs/unit/po/postiats-utilities/pkg-fun.nix diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/unit/po/postman/darwin.nix similarity index 100% rename from pkgs/development/web/postman/darwin.nix rename to pkgs/unit/po/postman/darwin.nix diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/unit/po/postman/linux.nix similarity index 100% rename from pkgs/development/web/postman/linux.nix rename to pkgs/unit/po/postman/linux.nix diff --git a/pkgs/development/web/postman/default.nix b/pkgs/unit/po/postman/pkg-fun.nix similarity index 100% rename from pkgs/development/web/postman/default.nix rename to pkgs/unit/po/postman/pkg-fun.nix diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/unit/po/postscript-lexmark/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/postscript-lexmark/default.nix rename to pkgs/unit/po/postscript-lexmark/pkg-fun.nix diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/unit/po/postsrsd/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/postsrsd/default.nix rename to pkgs/unit/po/postsrsd/pkg-fun.nix diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/unit/po/potrace/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/potrace/default.nix rename to pkgs/unit/po/potrace/pkg-fun.nix diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/unit/po/pouf/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pouf/default.nix rename to pkgs/unit/po/pouf/pkg-fun.nix diff --git a/pkgs/servers/pounce/default.nix b/pkgs/unit/po/pounce/pkg-fun.nix similarity index 100% rename from pkgs/servers/pounce/default.nix rename to pkgs/unit/po/pounce/pkg-fun.nix diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/unit/po/power-calibrate/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/power-calibrate/default.nix rename to pkgs/unit/po/power-calibrate/pkg-fun.nix diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/unit/po/power-profiles-daemon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/power-profiles-daemon/default.nix rename to pkgs/unit/po/power-profiles-daemon/pkg-fun.nix diff --git a/pkgs/tools/misc/poweralertd/default.nix b/pkgs/unit/po/poweralertd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/poweralertd/default.nix rename to pkgs/unit/po/poweralertd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/unit/po/powercap/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/powercap/default.nix rename to pkgs/unit/po/powercap/pkg-fun.nix diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/unit/po/powerdns-admin/package.json similarity index 100% rename from pkgs/applications/networking/powerdns-admin/package.json rename to pkgs/unit/po/powerdns-admin/package.json diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/unit/po/powerdns-admin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/powerdns-admin/default.nix rename to pkgs/unit/po/powerdns-admin/pkg-fun.nix diff --git a/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh b/pkgs/unit/po/powerdns-admin/update-asset-deps.sh similarity index 100% rename from pkgs/applications/networking/powerdns-admin/update-asset-deps.sh rename to pkgs/unit/po/powerdns-admin/update-asset-deps.sh diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/unit/po/powerdns-admin/yarndeps.nix similarity index 100% rename from pkgs/applications/networking/powerdns-admin/yarndeps.nix rename to pkgs/unit/po/powerdns-admin/yarndeps.nix diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/unit/po/powerline-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/powerline-fonts/default.nix rename to pkgs/unit/po/powerline-fonts/pkg-fun.nix diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/unit/po/powerline-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/powerline-go/default.nix rename to pkgs/unit/po/powerline-go/pkg-fun.nix diff --git a/pkgs/data/fonts/powerline-symbols/default.nix b/pkgs/unit/po/powerline-symbols/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/powerline-symbols/default.nix rename to pkgs/unit/po/powerline-symbols/pkg-fun.nix diff --git a/pkgs/games/powermanga/default.nix b/pkgs/unit/po/powermanga/pkg-fun.nix similarity index 100% rename from pkgs/games/powermanga/default.nix rename to pkgs/unit/po/powermanga/pkg-fun.nix diff --git a/pkgs/shells/powershell/getHashes.sh b/pkgs/unit/po/powershell/getHashes.sh similarity index 100% rename from pkgs/shells/powershell/getHashes.sh rename to pkgs/unit/po/powershell/getHashes.sh diff --git a/pkgs/shells/powershell/default.nix b/pkgs/unit/po/powershell/pkg-fun.nix similarity index 100% rename from pkgs/shells/powershell/default.nix rename to pkgs/unit/po/powershell/pkg-fun.nix diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/unit/po/powerstat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/powerstat/default.nix rename to pkgs/unit/po/powerstat/pkg-fun.nix diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/unit/po/powertop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/powertop/default.nix rename to pkgs/unit/po/powertop/pkg-fun.nix diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/unit/pp/ppl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ppl/default.nix rename to pkgs/unit/pp/ppl/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/unit/pp/pplatex/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/pplatex/default.nix rename to pkgs/unit/pp/pplatex/pkg-fun.nix diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/unit/pp/ppp/nix-purity.patch similarity index 100% rename from pkgs/tools/networking/ppp/nix-purity.patch rename to pkgs/unit/pp/ppp/nix-purity.patch diff --git a/pkgs/tools/networking/ppp/nonpriv.patch b/pkgs/unit/pp/ppp/nonpriv.patch similarity index 100% rename from pkgs/tools/networking/ppp/nonpriv.patch rename to pkgs/unit/pp/ppp/nonpriv.patch diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/unit/pp/ppp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ppp/default.nix rename to pkgs/unit/pp/ppp/pkg-fun.nix diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/unit/pp/pprof/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/profiling/pprof/default.nix rename to pkgs/unit/pp/pprof/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/unit/pp/pps-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pps-tools/default.nix rename to pkgs/unit/pp/pps-tools/pkg-fun.nix diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/unit/pp/ppsspp/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/ppsspp/default.nix rename to pkgs/unit/pp/ppsspp/pkg-fun.nix diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/unit/pp/pptp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pptp/default.nix rename to pkgs/unit/pp/pptp/pkg-fun.nix diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/unit/pp/pptpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pptpd/default.nix rename to pkgs/unit/pp/pptpd/pkg-fun.nix diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/unit/pq/pqiv/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pqiv/default.nix rename to pkgs/unit/pq/pqiv/pkg-fun.nix diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/unit/pq/pqrs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pqrs/default.nix rename to pkgs/unit/pq/pqrs/pkg-fun.nix diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/unit/pr/pr-tracker/pkg-fun.nix similarity index 100% rename from pkgs/servers/pr-tracker/default.nix rename to pkgs/unit/pr/pr-tracker/pkg-fun.nix diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/unit/pr/praat/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/praat/default.nix rename to pkgs/unit/pr/praat/pkg-fun.nix diff --git a/pkgs/servers/prayer/install.patch b/pkgs/unit/pr/prayer/install.patch similarity index 100% rename from pkgs/servers/prayer/install.patch rename to pkgs/unit/pr/prayer/install.patch diff --git a/pkgs/servers/prayer/default.nix b/pkgs/unit/pr/prayer/pkg-fun.nix similarity index 100% rename from pkgs/servers/prayer/default.nix rename to pkgs/unit/pr/prayer/pkg-fun.nix diff --git a/pkgs/games/prboom-plus/default.nix b/pkgs/unit/pr/prboom-plus/pkg-fun.nix similarity index 100% rename from pkgs/games/prboom-plus/default.nix rename to pkgs/unit/pr/prboom-plus/pkg-fun.nix diff --git a/pkgs/tools/misc/pre-commit/hook-tmpl.patch b/pkgs/unit/pr/pre-commit/hook-tmpl.patch similarity index 100% rename from pkgs/tools/misc/pre-commit/hook-tmpl.patch rename to pkgs/unit/pr/pre-commit/hook-tmpl.patch diff --git a/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/unit/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch similarity index 100% rename from pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch rename to pkgs/unit/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/unit/pr/pre-commit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pre-commit/default.nix rename to pkgs/unit/pr/pre-commit/pkg-fun.nix diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/unit/pr/precice-config-visualizer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/precice-config-visualizer/default.nix rename to pkgs/unit/pr/precice-config-visualizer/pkg-fun.nix diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/unit/pr/precice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/precice/default.nix rename to pkgs/unit/pr/precice/pkg-fun.nix diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/unit/pr/prelink/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/prelink/default.nix rename to pkgs/unit/pr/prelink/pkg-fun.nix diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/unit/pr/premid/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/premid/default.nix rename to pkgs/unit/pr/premid/pkg-fun.nix diff --git a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/pkgs/unit/pr/presage/fixed-cppunit-detection.patch similarity index 100% rename from pkgs/development/libraries/presage/fixed-cppunit-detection.patch rename to pkgs/unit/pr/presage/fixed-cppunit-detection.patch diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/unit/pr/presage/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/presage/default.nix rename to pkgs/unit/pr/presage/pkg-fun.nix diff --git a/pkgs/misc/present/default.nix b/pkgs/unit/pr/present/pkg-fun.nix similarity index 100% rename from pkgs/misc/present/default.nix rename to pkgs/unit/pr/present/pkg-fun.nix diff --git a/pkgs/tools/security/pretender/default.nix b/pkgs/unit/pr/pretender/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pretender/default.nix rename to pkgs/unit/pr/pretender/pkg-fun.nix diff --git a/pkgs/development/tools/pretty-simple/default.nix b/pkgs/unit/pr/pretty-simple/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pretty-simple/default.nix rename to pkgs/unit/pr/pretty-simple/pkg-fun.nix diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/unit/pr/prettyping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/prettyping/default.nix rename to pkgs/unit/pr/prettyping/pkg-fun.nix diff --git a/pkgs/applications/misc/prevo/data.nix b/pkgs/unit/pr/prevo-data/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/prevo/data.nix rename to pkgs/unit/pr/prevo-data/pkg-fun.nix diff --git a/pkgs/applications/misc/prevo/tools.nix b/pkgs/unit/pr/prevo-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/prevo/tools.nix rename to pkgs/unit/pr/prevo-tools/pkg-fun.nix diff --git a/pkgs/applications/misc/prevo/default.nix b/pkgs/unit/pr/prevo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/prevo/default.nix rename to pkgs/unit/pr/prevo/pkg-fun.nix diff --git a/pkgs/tools/misc/pridecat/fix_install.patch b/pkgs/unit/pr/pridecat/fix_install.patch similarity index 100% rename from pkgs/tools/misc/pridecat/fix_install.patch rename to pkgs/unit/pr/pridecat/fix_install.patch diff --git a/pkgs/tools/misc/pridecat/default.nix b/pkgs/unit/pr/pridecat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pridecat/default.nix rename to pkgs/unit/pr/pridecat/pkg-fun.nix diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/unit/pr/pridefetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pridefetch/default.nix rename to pkgs/unit/pr/pridefetch/pkg-fun.nix diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/unit/pr/prime-server/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/prime-server/default.nix rename to pkgs/unit/pr/prime-server/pkg-fun.nix diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/unit/pr/primecount/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/primecount/default.nix rename to pkgs/unit/pr/primecount/pkg-fun.nix diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/unit/pr/primesieve/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/primesieve/default.nix rename to pkgs/unit/pr/primesieve/pkg-fun.nix diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/unit/pr/printrun/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/printrun/default.nix rename to pkgs/unit/pr/printrun/pkg-fun.nix diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/unit/pr/prism/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/prism/default.nix rename to pkgs/unit/pr/prism/pkg-fun.nix diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/unit/pr/prison/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/prison/default.nix rename to pkgs/unit/pr/prison/pkg-fun.nix diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/unit/pr/pritunl-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pritunl-client/default.nix rename to pkgs/unit/pr/pritunl-client/pkg-fun.nix diff --git a/pkgs/tools/networking/pritunl-ssh/default.nix b/pkgs/unit/pr/pritunl-ssh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pritunl-ssh/default.nix rename to pkgs/unit/pr/pritunl-ssh/pkg-fun.nix diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/unit/pr/privacyidea/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/privacyidea/default.nix rename to pkgs/unit/pr/privacyidea/pkg-fun.nix diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/unit/pr/procdump/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/procdump/default.nix rename to pkgs/unit/pr/procdump/pkg-fun.nix diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/unit/pr/process-compose/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/process-compose/default.nix rename to pkgs/unit/pr/process-compose/pkg-fun.nix diff --git a/pkgs/development/libraries/process-cpp/default.nix b/pkgs/unit/pr/process-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/process-cpp/default.nix rename to pkgs/unit/pr/process-cpp/pkg-fun.nix diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/unit/pr/process-viewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/process-viewer/default.nix rename to pkgs/unit/pr/process-viewer/pkg-fun.nix diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/unit/pr/procmail/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/procmail/default.nix rename to pkgs/unit/pr/procmail/pkg-fun.nix diff --git a/pkgs/tools/system/procodile/Gemfile b/pkgs/unit/pr/procodile/Gemfile similarity index 100% rename from pkgs/tools/system/procodile/Gemfile rename to pkgs/unit/pr/procodile/Gemfile diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/pkgs/unit/pr/procodile/Gemfile.lock similarity index 100% rename from pkgs/tools/system/procodile/Gemfile.lock rename to pkgs/unit/pr/procodile/Gemfile.lock diff --git a/pkgs/tools/system/procodile/gemset.nix b/pkgs/unit/pr/procodile/gemset.nix similarity index 100% rename from pkgs/tools/system/procodile/gemset.nix rename to pkgs/unit/pr/procodile/gemset.nix diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/unit/pr/procodile/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/procodile/default.nix rename to pkgs/unit/pr/procodile/pkg-fun.nix diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/unit/pr/procyon/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/procyon/default.nix rename to pkgs/unit/pr/procyon/pkg-fun.nix diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/unit/pr/prodigal/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/prodigal/default.nix rename to pkgs/unit/pr/prodigal/pkg-fun.nix diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/unit/pr/professor/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/professor/default.nix rename to pkgs/unit/pr/professor/pkg-fun.nix diff --git a/pkgs/tools/misc/profetch/default.nix b/pkgs/unit/pr/profetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/profetch/default.nix rename to pkgs/unit/pr/profetch/pkg-fun.nix diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/unit/pr/profile-cleaner/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/profile-cleaner/default.nix rename to pkgs/unit/pr/profile-cleaner/pkg-fun.nix diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/unit/pr/profile-sync-daemon/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/profile-sync-daemon/default.nix rename to pkgs/unit/pr/profile-sync-daemon/pkg-fun.nix diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/unit/pr/profont/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/profont/default.nix rename to pkgs/unit/pr/profont/pkg-fun.nix diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/unit/pr/proggyfonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/proggyfonts/default.nix rename to pkgs/unit/pr/proggyfonts/pkg-fun.nix diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/unit/pr/programmer-calculator/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/programmer-calculator/default.nix rename to pkgs/unit/pr/programmer-calculator/pkg-fun.nix diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/unit/pr/progress/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/progress/default.nix rename to pkgs/unit/pr/progress/pkg-fun.nix diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/unit/pr/proj-datumgrid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/proj-datumgrid/default.nix rename to pkgs/unit/pr/proj-datumgrid/pkg-fun.nix diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/unit/pr/proj/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/proj/default.nix rename to pkgs/unit/pr/proj/pkg-fun.nix diff --git a/pkgs/development/libraries/proj/tests.nix b/pkgs/unit/pr/proj/tests.nix similarity index 100% rename from pkgs/development/libraries/proj/tests.nix rename to pkgs/unit/pr/proj/tests.nix diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/unit/pr/proj_7/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/proj/7.nix rename to pkgs/unit/pr/proj_7/pkg-fun.nix diff --git a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch b/pkgs/unit/pr/proj_7/tests-sqlite-3.39.patch similarity index 100% rename from pkgs/development/libraries/proj/tests-sqlite-3.39.patch rename to pkgs/unit/pr/proj_7/tests-sqlite-3.39.patch diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/unit/pr/prom2json/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/prom2json.nix rename to pkgs/unit/pr/prom2json/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/unit/pr/prometheus-alertmanager/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/alertmanager.nix rename to pkgs/unit/pr/prometheus-alertmanager/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/unit/pr/prometheus-apcupsd-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix rename to pkgs/unit/pr/prometheus-apcupsd-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/unit/pr/prometheus-artifactory-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/artifactory-exporter.nix rename to pkgs/unit/pr/prometheus-artifactory-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/unit/pr/prometheus-aws-s3-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix rename to pkgs/unit/pr/prometheus-aws-s3-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/unit/pr/prometheus-bind-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/bind-exporter.nix rename to pkgs/unit/pr/prometheus-bind-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/unit/pr/prometheus-bird-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/bird-exporter.nix rename to pkgs/unit/pr/prometheus-bird-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/unit/pr/prometheus-bitcoin-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix rename to pkgs/unit/pr/prometheus-bitcoin-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/unit/pr/prometheus-blackbox-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/blackbox-exporter.nix rename to pkgs/unit/pr/prometheus-blackbox-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/unit/pr/prometheus-collectd-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/collectd-exporter.nix rename to pkgs/unit/pr/prometheus-collectd-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/unit/pr/prometheus-consul-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/consul-exporter.nix rename to pkgs/unit/pr/prometheus-consul-exporter/pkg-fun.nix diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/unit/pr/prometheus-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/prometheus-cpp/default.nix rename to pkgs/unit/pr/prometheus-cpp/pkg-fun.nix diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/unit/pr/prometheus-cpp/prometheus-cpp.pc.in similarity index 100% rename from pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in rename to pkgs/unit/pr/prometheus-cpp/prometheus-cpp.pc.in diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/unit/pr/prometheus-dnsmasq-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix rename to pkgs/unit/pr/prometheus-dnsmasq-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/unit/pr/prometheus-domain-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/domain-exporter.nix rename to pkgs/unit/pr/prometheus-domain-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/unit/pr/prometheus-dovecot-exporter/dovecot-exporter-deps.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix rename to pkgs/unit/pr/prometheus-dovecot-exporter/dovecot-exporter-deps.nix diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/unit/pr/prometheus-dovecot-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/dovecot-exporter.nix rename to pkgs/unit/pr/prometheus-dovecot-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/unit/pr/prometheus-fastly-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/fastly-exporter.nix rename to pkgs/unit/pr/prometheus-fastly-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/unit/pr/prometheus-flow-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/flow-exporter.nix rename to pkgs/unit/pr/prometheus-flow-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/unit/pr/prometheus-fritzbox-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix rename to pkgs/unit/pr/prometheus-fritzbox-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/unit/pr/prometheus-gitlab-ci-pipelines-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix rename to pkgs/unit/pr/prometheus-gitlab-ci-pipelines-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/unit/pr/prometheus-haproxy-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/haproxy-exporter.nix rename to pkgs/unit/pr/prometheus-haproxy-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/unit/pr/prometheus-influxdb-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/influxdb-exporter.nix rename to pkgs/unit/pr/prometheus-influxdb-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/unit/pr/prometheus-ipmi-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/ipmi-exporter.nix rename to pkgs/unit/pr/prometheus-ipmi-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/unit/pr/prometheus-jitsi-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/jitsi-exporter.nix rename to pkgs/unit/pr/prometheus-jitsi-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/unit/pr/prometheus-jmx-httpserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/jmx-httpserver.nix rename to pkgs/unit/pr/prometheus-jmx-httpserver/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/unit/pr/prometheus-json-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/json-exporter.nix rename to pkgs/unit/pr/prometheus-json-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/unit/pr/prometheus-kea-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/kea-exporter.nix rename to pkgs/unit/pr/prometheus-kea-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/unit/pr/prometheus-keylight-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/keylight-exporter.nix rename to pkgs/unit/pr/prometheus-keylight-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/unit/pr/prometheus-knot-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/knot-exporter.nix rename to pkgs/unit/pr/prometheus-knot-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/unit/pr/prometheus-lnd-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/lnd-exporter.nix rename to pkgs/unit/pr/prometheus-lnd-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/unit/pr/prometheus-mail-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/mail-exporter.nix rename to pkgs/unit/pr/prometheus-mail-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/unit/pr/prometheus-mikrotik-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix rename to pkgs/unit/pr/prometheus-mikrotik-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/pkgs/unit/pr/prometheus-minio-exporter/deps.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix rename to pkgs/unit/pr/prometheus-minio-exporter/deps.nix diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/unit/pr/prometheus-minio-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/minio-exporter/default.nix rename to pkgs/unit/pr/prometheus-minio-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/unit/pr/prometheus-modemmanager-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix rename to pkgs/unit/pr/prometheus-modemmanager-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/unit/pr/prometheus-mysqld-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/mysqld-exporter.nix rename to pkgs/unit/pr/prometheus-mysqld-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/unit/pr/prometheus-nats-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nats-exporter.nix rename to pkgs/unit/pr/prometheus-nats-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/unit/pr/prometheus-nextcloud-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix rename to pkgs/unit/pr/prometheus-nextcloud-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/unit/pr/prometheus-nginx-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nginx-exporter.nix rename to pkgs/unit/pr/prometheus-nginx-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/unit/pr/prometheus-nginxlog-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix rename to pkgs/unit/pr/prometheus-nginxlog-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/unit/pr/prometheus-nut-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/nut-exporter.nix rename to pkgs/unit/pr/prometheus-nut-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/unit/pr/prometheus-openvpn-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/openvpn-exporter.nix rename to pkgs/unit/pr/prometheus-openvpn-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/unit/pr/prometheus-pihole-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pihole-exporter.nix rename to pkgs/unit/pr/prometheus-pihole-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/unit/pr/prometheus-postfix-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/postfix-exporter.nix rename to pkgs/unit/pr/prometheus-postfix-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/unit/pr/prometheus-postgres-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/postgres-exporter.nix rename to pkgs/unit/pr/prometheus-postgres-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/unit/pr/prometheus-process-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/process-exporter.nix rename to pkgs/unit/pr/prometheus-process-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/unit/pr/prometheus-pushgateway/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pushgateway.nix rename to pkgs/unit/pr/prometheus-pushgateway/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/unit/pr/prometheus-pve-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/pve-exporter.nix rename to pkgs/unit/pr/prometheus-pve-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/unit/pr/prometheus-rabbitmq-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix rename to pkgs/unit/pr/prometheus-rabbitmq-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/unit/pr/prometheus-redis-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/redis-exporter.nix rename to pkgs/unit/pr/prometheus-redis-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/pkgs/unit/pr/prometheus-rtl_433-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix rename to pkgs/unit/pr/prometheus-rtl_433-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/unit/pr/prometheus-sachet/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/sachet.nix rename to pkgs/unit/pr/prometheus-sachet/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/unit/pr/prometheus-script-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/script-exporter.nix rename to pkgs/unit/pr/prometheus-script-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch b/pkgs/unit/pr/prometheus-smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch similarity index 100% rename from pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch rename to pkgs/unit/pr/prometheus-smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/unit/pr/prometheus-smartctl-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix rename to pkgs/unit/pr/prometheus-smartctl-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/unit/pr/prometheus-smokeping-prober/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/smokeping-prober.nix rename to pkgs/unit/pr/prometheus-smokeping-prober/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/unit/pr/prometheus-snmp-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/snmp-exporter.nix rename to pkgs/unit/pr/prometheus-snmp-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix b/pkgs/unit/pr/prometheus-speedtest-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/speedtest-exporter.nix rename to pkgs/unit/pr/prometheus-speedtest-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/unit/pr/prometheus-sql-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/sql-exporter.nix rename to pkgs/unit/pr/prometheus-sql-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/unit/pr/prometheus-statsd-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/statsd-exporter.nix rename to pkgs/unit/pr/prometheus-statsd-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/unit/pr/prometheus-surfboard-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/surfboard-exporter.nix rename to pkgs/unit/pr/prometheus-surfboard-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/unit/pr/prometheus-systemd-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/systemd-exporter.nix rename to pkgs/unit/pr/prometheus-systemd-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/unit/pr/prometheus-tor-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/tor-exporter.nix rename to pkgs/unit/pr/prometheus-tor-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/unit/pr/prometheus-v2ray-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/v2ray-exporter.nix rename to pkgs/unit/pr/prometheus-v2ray-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/unit/pr/prometheus-varnish-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/varnish-exporter.nix rename to pkgs/unit/pr/prometheus-varnish-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/unit/pr/prometheus-xmpp-alerts/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/xmpp-alerts.nix rename to pkgs/unit/pr/prometheus-xmpp-alerts/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/unit/pr/prometheus-zfs-exporter/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/zfs-exporter.nix rename to pkgs/unit/pr/prometheus-zfs-exporter/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/unit/pr/prometheus/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/default.nix rename to pkgs/unit/pr/prometheus/pkg-fun.nix diff --git a/pkgs/tools/misc/promql-cli/default.nix b/pkgs/unit/pr/promql-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/promql-cli/default.nix rename to pkgs/unit/pr/promql-cli/pkg-fun.nix diff --git a/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch b/pkgs/unit/pr/promscale/0001-remove-jaeger-test-dep.patch similarity index 100% rename from pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch rename to pkgs/unit/pr/promscale/0001-remove-jaeger-test-dep.patch diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/unit/pr/promscale/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/prometheus/promscale/default.nix rename to pkgs/unit/pr/promscale/pkg-fun.nix diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/unit/pr/promtail/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/loki/promtail.nix rename to pkgs/unit/pr/promtail/pkg-fun.nix diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/unit/pr/proot/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/proot/default.nix rename to pkgs/unit/pr/proot/pkg-fun.nix diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/unit/pr/properties-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/properties-cpp/default.nix rename to pkgs/unit/pr/properties-cpp/pkg-fun.nix diff --git a/pkgs/servers/xmpp/prosody-filer/default.nix b/pkgs/unit/pr/prosody-filer/pkg-fun.nix similarity index 100% rename from pkgs/servers/xmpp/prosody-filer/default.nix rename to pkgs/unit/pr/prosody-filer/pkg-fun.nix diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/unit/pr/prospector/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/prospector/default.nix rename to pkgs/unit/pr/prospector/pkg-fun.nix diff --git a/pkgs/development/tools/prospector/setoptconf.nix b/pkgs/unit/pr/prospector/setoptconf.nix similarity index 100% rename from pkgs/development/tools/prospector/setoptconf.nix rename to pkgs/unit/pr/prospector/setoptconf.nix diff --git a/pkgs/development/web/protege-distribution/disable-console-log.patch b/pkgs/unit/pr/protege-distribution/disable-console-log.patch similarity index 100% rename from pkgs/development/web/protege-distribution/disable-console-log.patch rename to pkgs/unit/pr/protege-distribution/disable-console-log.patch diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/unit/pr/protege-distribution/pkg-fun.nix similarity index 100% rename from pkgs/development/web/protege-distribution/default.nix rename to pkgs/unit/pr/protege-distribution/pkg-fun.nix diff --git a/pkgs/development/web/protege-distribution/static-path.patch b/pkgs/unit/pr/protege-distribution/static-path.patch similarity index 100% rename from pkgs/development/web/protege-distribution/static-path.patch rename to pkgs/unit/pr/protege-distribution/static-path.patch diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/unit/pr/proto-contrib/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/proto-contrib/default.nix rename to pkgs/unit/pr/proto-contrib/pkg-fun.nix diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/unit/pr/protobuf3_21/generic-v3-cmake.nix similarity index 100% rename from pkgs/development/libraries/protobuf/generic-v3-cmake.nix rename to pkgs/unit/pr/protobuf3_21/generic-v3-cmake.nix diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/unit/pr/protobuf3_21/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/protobuf/3.21.nix rename to pkgs/unit/pr/protobuf3_21/pkg-fun.nix diff --git a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch b/pkgs/unit/pr/protobuf3_21/static-executables-have-no-rpath.patch similarity index 100% rename from pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch rename to pkgs/unit/pr/protobuf3_21/static-executables-have-no-rpath.patch diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/unit/pr/protobufc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/protobufc/default.nix rename to pkgs/unit/pr/protobufc/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/unit/pr/protoc-gen-connect-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-connect-go/default.nix rename to pkgs/unit/pr/protoc-gen-connect-go/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/unit/pr/protoc-gen-doc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-doc/default.nix rename to pkgs/unit/pr/protoc-gen-doc/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/unit/pr/protoc-gen-entgrpc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-entgrpc/default.nix rename to pkgs/unit/pr/protoc-gen-entgrpc/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/unit/pr/protoc-gen-go-grpc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-go-grpc/default.nix rename to pkgs/unit/pr/protoc-gen-go-grpc/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/unit/pr/protoc-gen-go-vtproto/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-go-vtproto/default.nix rename to pkgs/unit/pr/protoc-gen-go-vtproto/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/unit/pr/protoc-gen-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-go/default.nix rename to pkgs/unit/pr/protoc-gen-go/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch b/pkgs/unit/pr/protoc-gen-grpc-web/optional-static.patch similarity index 100% rename from pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch rename to pkgs/unit/pr/protoc-gen-grpc-web/optional-static.patch diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/unit/pr/protoc-gen-grpc-web/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-grpc-web/default.nix rename to pkgs/unit/pr/protoc-gen-grpc-web/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-rust/default.nix b/pkgs/unit/pr/protoc-gen-rust/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-rust/default.nix rename to pkgs/unit/pr/protoc-gen-rust/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/unit/pr/protoc-gen-twirp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-twirp/default.nix rename to pkgs/unit/pr/protoc-gen-twirp/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/unit/pr/protoc-gen-twirp_php/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-twirp_php/default.nix rename to pkgs/unit/pr/protoc-gen-twirp_php/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix b/pkgs/unit/pr/protoc-gen-twirp_swagger/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-twirp_swagger/default.nix rename to pkgs/unit/pr/protoc-gen-twirp_swagger/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/unit/pr/protoc-gen-twirp_typescript/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-twirp_typescript/default.nix rename to pkgs/unit/pr/protoc-gen-twirp_typescript/pkg-fun.nix diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/unit/pr/protoc-gen-validate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-validate/default.nix rename to pkgs/unit/pr/protoc-gen-validate/pkg-fun.nix diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/unit/pr/protocol/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/protocol/default.nix rename to pkgs/unit/pr/protocol/pkg-fun.nix diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/unit/pr/protolint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protolint/default.nix rename to pkgs/unit/pr/protolint/pkg-fun.nix diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/unit/pr/protolock/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/protolock/default.nix rename to pkgs/unit/pr/protolock/pkg-fun.nix diff --git a/pkgs/applications/emulators/proton-caller/default.nix b/pkgs/unit/pr/proton-caller/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/proton-caller/default.nix rename to pkgs/unit/pr/proton-caller/pkg-fun.nix diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/unit/pr/protonmail-bridge/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/protonmail-bridge/default.nix rename to pkgs/unit/pr/protonmail-bridge/pkg-fun.nix diff --git a/pkgs/development/tools/protoscope/default.nix b/pkgs/unit/pr/protoscope/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/protoscope/default.nix rename to pkgs/unit/pr/protoscope/pkg-fun.nix diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/unit/pr/prototool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/prototool/default.nix rename to pkgs/unit/pr/prototool/pkg-fun.nix diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/unit/pr/prototypejs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/prototypejs/default.nix rename to pkgs/unit/pr/prototypejs/pkg-fun.nix diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/unit/pr/protozero/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/protozero/default.nix rename to pkgs/unit/pr/protozero/pkg-fun.nix diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/unit/pr/prover9/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/prover9/default.nix rename to pkgs/unit/pr/prover9/pkg-fun.nix diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/unit/pr/proverif/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/proverif/default.nix rename to pkgs/unit/pr/proverif/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/unit/pr/prow/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/prow/default.nix rename to pkgs/unit/pr/prow/pkg-fun.nix diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/unit/pr/prowlarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/prowlarr/default.nix rename to pkgs/unit/pr/prowlarr/pkg-fun.nix diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/unit/pr/prowlarr/update.sh similarity index 100% rename from pkgs/servers/prowlarr/update.sh rename to pkgs/unit/pr/prowlarr/update.sh diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/unit/pr/proxify/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/proxify/default.nix rename to pkgs/unit/pr/proxify/pkg-fun.nix diff --git a/pkgs/tools/misc/proximity-sort/default.nix b/pkgs/unit/pr/proximity-sort/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/proximity-sort/default.nix rename to pkgs/unit/pr/proximity-sort/pkg-fun.nix diff --git a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/pkgs/unit/pr/proxmox-backup-client/Cargo.lock similarity index 100% rename from pkgs/applications/backup/proxmox-backup-client/Cargo.lock rename to pkgs/unit/pr/proxmox-backup-client/Cargo.lock diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/unit/pr/proxmox-backup-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/proxmox-backup-client/default.nix rename to pkgs/unit/pr/proxmox-backup-client/pkg-fun.nix diff --git a/pkgs/applications/backup/proxmox-backup-client/re-route-dependencies.patch b/pkgs/unit/pr/proxmox-backup-client/re-route-dependencies.patch similarity index 100% rename from pkgs/applications/backup/proxmox-backup-client/re-route-dependencies.patch rename to pkgs/unit/pr/proxmox-backup-client/re-route-dependencies.patch diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/unit/pr/proxychains-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/proxychains-ng/default.nix rename to pkgs/unit/pr/proxychains-ng/pkg-fun.nix diff --git a/pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch b/pkgs/unit/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch similarity index 100% rename from pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch rename to pkgs/unit/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/unit/pr/proxychains/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/proxychains/default.nix rename to pkgs/unit/pr/proxychains/pkg-fun.nix diff --git a/pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch b/pkgs/unit/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch similarity index 100% rename from pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch rename to pkgs/unit/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch diff --git a/pkgs/servers/sql/proxysql/dont-phone-home.patch b/pkgs/unit/pr/proxysql/dont-phone-home.patch similarity index 100% rename from pkgs/servers/sql/proxysql/dont-phone-home.patch rename to pkgs/unit/pr/proxysql/dont-phone-home.patch diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/unit/pr/proxysql/makefiles.patch similarity index 100% rename from pkgs/servers/sql/proxysql/makefiles.patch rename to pkgs/unit/pr/proxysql/makefiles.patch diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/unit/pr/proxysql/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/proxysql/default.nix rename to pkgs/unit/pr/proxysql/pkg-fun.nix diff --git a/pkgs/tools/wayland/proycon-wayout/default.nix b/pkgs/unit/pr/proycon-wayout/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/proycon-wayout/default.nix rename to pkgs/unit/pr/proycon-wayout/pkg-fun.nix diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/unit/pr/prs/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/prs/default.nix rename to pkgs/unit/pr/prs/pkg-fun.nix diff --git a/pkgs/tools/text/pru/Gemfile b/pkgs/unit/pr/pru/Gemfile similarity index 100% rename from pkgs/tools/text/pru/Gemfile rename to pkgs/unit/pr/pru/Gemfile diff --git a/pkgs/tools/text/pru/Gemfile.lock b/pkgs/unit/pr/pru/Gemfile.lock similarity index 100% rename from pkgs/tools/text/pru/Gemfile.lock rename to pkgs/unit/pr/pru/Gemfile.lock diff --git a/pkgs/tools/text/pru/gemset.nix b/pkgs/unit/pr/pru/gemset.nix similarity index 100% rename from pkgs/tools/text/pru/gemset.nix rename to pkgs/unit/pr/pru/gemset.nix diff --git a/pkgs/tools/text/pru/default.nix b/pkgs/unit/pr/pru/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/pru/default.nix rename to pkgs/unit/pr/pru/pkg-fun.nix diff --git a/pkgs/development/tools/pry/Gemfile b/pkgs/unit/pr/pry/Gemfile similarity index 100% rename from pkgs/development/tools/pry/Gemfile rename to pkgs/unit/pr/pry/Gemfile diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/unit/pr/pry/Gemfile.lock similarity index 100% rename from pkgs/development/tools/pry/Gemfile.lock rename to pkgs/unit/pr/pry/Gemfile.lock diff --git a/pkgs/development/tools/pry/gemset.nix b/pkgs/unit/pr/pry/gemset.nix similarity index 100% rename from pkgs/development/tools/pry/gemset.nix rename to pkgs/unit/pr/pry/gemset.nix diff --git a/pkgs/development/tools/pry/default.nix b/pkgs/unit/pr/pry/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pry/default.nix rename to pkgs/unit/pr/pry/pkg-fun.nix diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/unit/ps/ps2client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ps2client/default.nix rename to pkgs/unit/ps/ps2client/pkg-fun.nix diff --git a/pkgs/tools/games/ps3-disc-dumper/deps.nix b/pkgs/unit/ps/ps3-disc-dumper/deps.nix similarity index 100% rename from pkgs/tools/games/ps3-disc-dumper/deps.nix rename to pkgs/unit/ps/ps3-disc-dumper/deps.nix diff --git a/pkgs/tools/games/ps3-disc-dumper/default.nix b/pkgs/unit/ps/ps3-disc-dumper/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/ps3-disc-dumper/default.nix rename to pkgs/unit/ps/ps3-disc-dumper/pkg-fun.nix diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/unit/ps/ps3netsrv/pkg-fun.nix similarity index 100% rename from pkgs/servers/ps3netsrv/default.nix rename to pkgs/unit/ps/ps3netsrv/pkg-fun.nix diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/unit/ps/ps_mem/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ps_mem/default.nix rename to pkgs/unit/ps/ps_mem/pkg-fun.nix diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/unit/ps/psc-package/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/purescript/psc-package/default.nix rename to pkgs/unit/ps/psc-package/pkg-fun.nix diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/unit/ps/pscale/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pscale/default.nix rename to pkgs/unit/ps/pscale/pkg-fun.nix diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/unit/ps/pscircle/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/pscircle/default.nix rename to pkgs/unit/ps/pscircle/pkg-fun.nix diff --git a/pkgs/os-specific/linux/psftools/default.nix b/pkgs/unit/ps/psftools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/psftools/default.nix rename to pkgs/unit/ps/psftools/pkg-fun.nix diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/unit/ps/pshs/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/pshs/default.nix rename to pkgs/unit/ps/pshs/pkg-fun.nix diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/unit/ps/psi-notify/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/psi-notify/default.nix rename to pkgs/unit/ps/psi-notify/pkg-fun.nix diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/unit/ps/pslib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pslib/default.nix rename to pkgs/unit/ps/pslib/pkg-fun.nix diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/unit/ps/psmisc/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/psmisc/default.nix rename to pkgs/unit/ps/psmisc/pkg-fun.nix diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/unit/ps/psol/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/psol/default.nix rename to pkgs/unit/ps/psol/pkg-fun.nix diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/unit/ps/pspg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pspg/default.nix rename to pkgs/unit/ps/pspg/pkg-fun.nix diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/unit/ps/pspp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/pspp/default.nix rename to pkgs/unit/ps/pspp/pkg-fun.nix diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/unit/ps/psqlodbc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/psqlodbc/default.nix rename to pkgs/unit/ps/psqlodbc/pkg-fun.nix diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/unit/ps/pssh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pssh/default.nix rename to pkgs/unit/ps/pssh/pkg-fun.nix diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/unit/ps/psst/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/psst/default.nix rename to pkgs/unit/ps/psst/pkg-fun.nix diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/unit/ps/psstop/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/psstop/default.nix rename to pkgs/unit/ps/psstop/pkg-fun.nix diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/unit/ps/pstoedit/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/pstoedit/default.nix rename to pkgs/unit/ps/pstoedit/pkg-fun.nix diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/pkgs/unit/ps/pstoedit/pstoedit-gs-9.22-compat.patch similarity index 100% rename from pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch rename to pkgs/unit/ps/pstoedit/pstoedit-gs-9.22-compat.patch diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/unit/ps/pstreams/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pstreams/default.nix rename to pkgs/unit/ps/pstreams/pkg-fun.nix diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/unit/ps/pstree/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pstree/default.nix rename to pkgs/unit/ps/pstree/pkg-fun.nix diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/unit/ps/psutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/psutils/default.nix rename to pkgs/unit/ps/psutils/pkg-fun.nix diff --git a/pkgs/tools/misc/psw/default.nix b/pkgs/unit/ps/psw/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/psw/default.nix rename to pkgs/unit/ps/psw/pkg-fun.nix diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/unit/pt/pt/Gemfile similarity index 100% rename from pkgs/applications/misc/pt/Gemfile rename to pkgs/unit/pt/pt/Gemfile diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/unit/pt/pt/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/pt/Gemfile.lock rename to pkgs/unit/pt/pt/Gemfile.lock diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/unit/pt/pt/gemset.nix similarity index 100% rename from pkgs/applications/misc/pt/gemset.nix rename to pkgs/unit/pt/pt/gemset.nix diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/unit/pt/pt/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pt/default.nix rename to pkgs/unit/pt/pt/pkg-fun.nix diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/unit/pt/pt2-clone/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pt2-clone/default.nix rename to pkgs/unit/pt/pt2-clone/pkg-fun.nix diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/unit/pt/ptags/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/ptags/default.nix rename to pkgs/unit/pt/ptags/pkg-fun.nix diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/unit/pt/ptask/json_c_is_error.patch similarity index 100% rename from pkgs/applications/misc/ptask/json_c_is_error.patch rename to pkgs/unit/pt/ptask/json_c_is_error.patch diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/unit/pt/ptask/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ptask/default.nix rename to pkgs/unit/pt/ptask/pkg-fun.nix diff --git a/pkgs/applications/misc/ptask/tw-version.patch b/pkgs/unit/pt/ptask/tw-version.patch similarity index 100% rename from pkgs/applications/misc/ptask/tw-version.patch rename to pkgs/unit/pt/ptask/tw-version.patch diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/unit/pt/ptex/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ptex/default.nix rename to pkgs/unit/pt/ptex/pkg-fun.nix diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/unit/pt/ptouch-print/pkg-fun.nix similarity index 100% rename from pkgs/misc/ptouch-print/default.nix rename to pkgs/unit/pt/ptouch-print/pkg-fun.nix diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/unit/pu/public-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/public-sans/default.nix rename to pkgs/unit/pu/public-sans/pkg-fun.nix diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/unit/pu/publicsuffix-list/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/publicsuffix-list/default.nix rename to pkgs/unit/pu/publicsuffix-list/pkg-fun.nix diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/unit/pu/pubs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pubs/default.nix rename to pkgs/unit/pu/pubs/pkg-fun.nix diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/unit/pu/pufferpanel/pkg-fun.nix similarity index 100% rename from pkgs/servers/pufferpanel/default.nix rename to pkgs/unit/pu/pufferpanel/pkg-fun.nix diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/unit/pu/pugixml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pugixml/default.nix rename to pkgs/unit/pu/pugixml/pkg-fun.nix diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/unit/pu/pulseaudio-ctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pulseaudio-ctl/default.nix rename to pkgs/unit/pu/pulseaudio-ctl/pkg-fun.nix diff --git a/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch b/pkgs/unit/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch similarity index 100% rename from pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch rename to pkgs/unit/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/unit/pu/pulseaudio-dlna/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pulseaudio-dlna/default.nix rename to pkgs/unit/pu/pulseaudio-dlna/pkg-fun.nix diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/unit/pu/pulseaudio-dlna/zeroconf.nix similarity index 100% rename from pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix rename to pkgs/unit/pu/pulseaudio-dlna/zeroconf.nix diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/unit/pu/pulsemixer/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/pulsemixer/default.nix rename to pkgs/unit/pu/pulsemixer/pkg-fun.nix diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/unit/pu/pulumi-bin/data.nix similarity index 100% rename from pkgs/tools/admin/pulumi-bin/data.nix rename to pkgs/unit/pu/pulumi-bin/data.nix diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/unit/pu/pulumi-bin/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/pulumi-bin/default.nix rename to pkgs/unit/pu/pulumi-bin/pkg-fun.nix diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/unit/pu/pulumi/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/pulumi/default.nix rename to pkgs/unit/pu/pulumi/pkg-fun.nix diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/unit/pu/pulumictl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pulumictl/default.nix rename to pkgs/unit/pu/pulumictl/pkg-fun.nix diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/unit/pu/pup/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pup/default.nix rename to pkgs/unit/pu/pup/pkg-fun.nix diff --git a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile b/pkgs/unit/pu/puppet-bolt/Gemfile similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/Gemfile rename to pkgs/unit/pu/puppet-bolt/Gemfile diff --git a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/pkgs/unit/pu/puppet-bolt/Gemfile.lock similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock rename to pkgs/unit/pu/puppet-bolt/Gemfile.lock diff --git a/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/pkgs/unit/pu/puppet-bolt/gemset.nix similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/gemset.nix rename to pkgs/unit/pu/puppet-bolt/gemset.nix diff --git a/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/pkgs/unit/pu/puppet-bolt/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/default.nix rename to pkgs/unit/pu/puppet-bolt/pkg-fun.nix diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile b/pkgs/unit/pu/puppet-lint/Gemfile similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/Gemfile rename to pkgs/unit/pu/puppet-lint/Gemfile diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/unit/pu/puppet-lint/Gemfile.lock similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/Gemfile.lock rename to pkgs/unit/pu/puppet-lint/Gemfile.lock diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/unit/pu/puppet-lint/gemset.nix similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/gemset.nix rename to pkgs/unit/pu/puppet-lint/gemset.nix diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/pkgs/unit/pu/puppet-lint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/default.nix rename to pkgs/unit/pu/puppet-lint/pkg-fun.nix diff --git a/pkgs/tools/graphics/puppeteer-cli/package.json b/pkgs/unit/pu/puppeteer-cli/package.json similarity index 100% rename from pkgs/tools/graphics/puppeteer-cli/package.json rename to pkgs/unit/pu/puppeteer-cli/package.json diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/unit/pu/puppeteer-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/puppeteer-cli/default.nix rename to pkgs/unit/pu/puppeteer-cli/pkg-fun.nix diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.lock b/pkgs/unit/pu/puppeteer-cli/yarn.lock similarity index 100% rename from pkgs/tools/graphics/puppeteer-cli/yarn.lock rename to pkgs/unit/pu/puppeteer-cli/yarn.lock diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.nix b/pkgs/unit/pu/puppeteer-cli/yarn.nix similarity index 100% rename from pkgs/tools/graphics/puppeteer-cli/yarn.nix rename to pkgs/unit/pu/puppeteer-cli/yarn.nix diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/unit/pu/pur/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pur/default.nix rename to pkgs/unit/pu/pur/pkg-fun.nix diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/unit/pu/pure-ftpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/ftp/pure-ftpd/default.nix rename to pkgs/unit/pu/pure-ftpd/pkg-fun.nix diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/unit/pu/pure-prompt/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/pure-prompt/default.nix rename to pkgs/unit/pu/pure-prompt/pkg-fun.nix diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/unit/pu/puredata/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/puredata/default.nix rename to pkgs/unit/pu/puredata/pkg-fun.nix diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/unit/pu/puremapping/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pd-plugins/puremapping/default.nix rename to pkgs/unit/pu/puremapping/pkg-fun.nix diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/unit/pu/pureref/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/pureref/default.nix rename to pkgs/unit/pu/pureref/pkg-fun.nix diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/unit/pu/purescript/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/purescript/purescript/default.nix rename to pkgs/unit/pu/purescript/pkg-fun.nix diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js b/pkgs/unit/pu/purescript/test-minimal-module/Main.js similarity index 100% rename from pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js rename to pkgs/unit/pu/purescript/test-minimal-module/Main.js diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs b/pkgs/unit/pu/purescript/test-minimal-module/Main.purs similarity index 100% rename from pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.purs rename to pkgs/unit/pu/purescript/test-minimal-module/Main.purs diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/unit/pu/purescript/test-minimal-module/default.nix similarity index 100% rename from pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix rename to pkgs/unit/pu/purescript/test-minimal-module/default.nix diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/unit/pu/purescript/update.sh similarity index 100% rename from pkgs/development/compilers/purescript/purescript/update.sh rename to pkgs/unit/pu/purescript/update.sh diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/unit/pu/purple-discord/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix rename to pkgs/unit/pu/purple-discord/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/unit/pu/purple-facebook/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix rename to pkgs/unit/pu/purple-facebook/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/pkgs/unit/pu/purple-googlechat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix rename to pkgs/unit/pu/purple-googlechat/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/unit/pu/purple-hangouts/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix rename to pkgs/unit/pu/purple-hangouts/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/unit/pu/purple-lurch/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix rename to pkgs/unit/pu/purple-lurch/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/unit/pu/purple-matrix/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix rename to pkgs/unit/pu/purple-matrix/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix b/pkgs/unit/pu/purple-mm-sms/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix rename to pkgs/unit/pu/purple-mm-sms/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/unit/pu/purple-plugin-pack/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix rename to pkgs/unit/pu/purple-plugin-pack/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix b/pkgs/unit/pu/purple-signald/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix rename to pkgs/unit/pu/purple-signald/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/unit/pu/purple-slack/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix rename to pkgs/unit/pu/purple-slack/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/unit/pu/purple-vk-plugin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix rename to pkgs/unit/pu/purple-vk-plugin/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/unit/pu/purple-xmpp-http-upload/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix rename to pkgs/unit/pu/purple-xmpp-http-upload/pkg-fun.nix diff --git a/pkgs/games/purpur/default.nix b/pkgs/unit/pu/purpur/pkg-fun.nix similarity index 100% rename from pkgs/games/purpur/default.nix rename to pkgs/unit/pu/purpur/pkg-fun.nix diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/unit/pv/pv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pv/default.nix rename to pkgs/unit/pv/pv/pkg-fun.nix diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/unit/pw/pw-viz/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pw-viz/default.nix rename to pkgs/unit/pw/pw-viz/pkg-fun.nix diff --git a/pkgs/tools/security/pwdsafety/default.nix b/pkgs/unit/pw/pwdsafety/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pwdsafety/default.nix rename to pkgs/unit/pw/pwdsafety/pkg-fun.nix diff --git a/pkgs/tools/security/pwgen-secure/default.nix b/pkgs/unit/pw/pwgen-secure/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pwgen-secure/default.nix rename to pkgs/unit/pw/pwgen-secure/pkg-fun.nix diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/unit/pw/pwgen/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pwgen/default.nix rename to pkgs/unit/pw/pwgen/pkg-fun.nix diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/unit/pw/pwnat/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pwnat/default.nix rename to pkgs/unit/pw/pwnat/pkg-fun.nix diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/unit/pw/pwndbg/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/pwndbg/default.nix rename to pkgs/unit/pw/pwndbg/pkg-fun.nix diff --git a/pkgs/tools/misc/pws/Gemfile b/pkgs/unit/pw/pws/Gemfile similarity index 100% rename from pkgs/tools/misc/pws/Gemfile rename to pkgs/unit/pw/pws/Gemfile diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/pkgs/unit/pw/pws/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/pws/Gemfile.lock rename to pkgs/unit/pw/pws/Gemfile.lock diff --git a/pkgs/tools/misc/pws/gemset.nix b/pkgs/unit/pw/pws/gemset.nix similarity index 100% rename from pkgs/tools/misc/pws/gemset.nix rename to pkgs/unit/pw/pws/gemset.nix diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/unit/pw/pws/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/pws/default.nix rename to pkgs/unit/pw/pws/pkg-fun.nix diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/unit/pw/pwsafe/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pwsafe/default.nix rename to pkgs/unit/pw/pwsafe/pkg-fun.nix diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/unit/px/pxattr/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/pxattr/default.nix rename to pkgs/unit/px/pxattr/pkg-fun.nix diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/unit/px/pxlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pxlib/default.nix rename to pkgs/unit/px/pxlib/pkg-fun.nix diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/unit/px/pxview/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pxview/default.nix rename to pkgs/unit/px/pxview/pkg-fun.nix diff --git a/pkgs/tools/compression/pxz/flush-stdout-help-version.patch b/pkgs/unit/px/pxz/flush-stdout-help-version.patch similarity index 100% rename from pkgs/tools/compression/pxz/flush-stdout-help-version.patch rename to pkgs/unit/px/pxz/flush-stdout-help-version.patch diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/unit/px/pxz/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/pxz/default.nix rename to pkgs/unit/px/pxz/pkg-fun.nix diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/unit/py/py-spy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/py-spy/default.nix rename to pkgs/unit/py/py-spy/pkg-fun.nix diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/unit/py/py3c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/py3c/default.nix rename to pkgs/unit/py/py3c/pkg-fun.nix diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/unit/py/pydf/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pydf/default.nix rename to pkgs/unit/py/pydf/pkg-fun.nix diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/unit/py/pykms/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/pykms/default.nix rename to pkgs/unit/py/pykms/pkg-fun.nix diff --git a/pkgs/development/tools/pylint-exit/default.nix b/pkgs/unit/py/pylint-exit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pylint-exit/default.nix rename to pkgs/unit/py/pylint-exit/pkg-fun.nix diff --git a/pkgs/misc/pylode/default.nix b/pkgs/unit/py/pylode/pkg-fun.nix similarity index 100% rename from pkgs/misc/pylode/default.nix rename to pkgs/unit/py/pylode/pkg-fun.nix diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/unit/py/pymol/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/chemistry/pymol/default.nix rename to pkgs/unit/py/pymol/pkg-fun.nix diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/unit/py/pympress/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/pympress/default.nix rename to pkgs/unit/py/pympress/pkg-fun.nix diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/unit/py/pynac/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/pynac/default.nix rename to pkgs/unit/py/pynac/pkg-fun.nix diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/unit/py/pynitrokey/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pynitrokey/default.nix rename to pkgs/unit/py/pynitrokey/pkg-fun.nix diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/unit/py/pypi-mirror/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pypi-mirror/default.nix rename to pkgs/unit/py/pypi-mirror/pkg-fun.nix diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/unit/py/pypi2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/pypi2nix/default.nix rename to pkgs/unit/py/pypi2nix/pkg-fun.nix diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/unit/py/pyradio/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/pyradio/default.nix rename to pkgs/unit/py/pyradio/pkg-fun.nix diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/unit/py/pyrseas/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/pyrseas/default.nix rename to pkgs/unit/py/pyrseas/pkg-fun.nix diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/unit/py/pysideApiextractor/pkg-fun.nix similarity index 100% rename from pkgs/development/python-modules/pyside/apiextractor.nix rename to pkgs/unit/py/pysideApiextractor/pkg-fun.nix diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/unit/py/pysideGeneratorrunner/pkg-fun.nix similarity index 100% rename from pkgs/development/python-modules/pyside/generatorrunner.nix rename to pkgs/unit/py/pysideGeneratorrunner/pkg-fun.nix diff --git a/pkgs/development/libraries/pystring/default.nix b/pkgs/unit/py/pystring/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pystring/default.nix rename to pkgs/unit/py/pystring/pkg-fun.nix diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/unit/py/python-cosmopolitan/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/python-cosmopolitan/default.nix rename to pkgs/unit/py/python-cosmopolitan/pkg-fun.nix diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/unit/py/python-language-server/deps.nix similarity index 100% rename from pkgs/development/dotnet-modules/python-language-server/deps.nix rename to pkgs/unit/py/python-language-server/deps.nix diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/unit/py/python-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/dotnet-modules/python-language-server/default.nix rename to pkgs/unit/py/python-language-server/pkg-fun.nix diff --git a/pkgs/development/dotnet-modules/python-language-server/updater.sh b/pkgs/unit/py/python-language-server/updater.sh similarity index 100% rename from pkgs/development/dotnet-modules/python-language-server/updater.sh rename to pkgs/unit/py/python-language-server/updater.sh diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/unit/py/python-launcher/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/python-launcher/default.nix rename to pkgs/unit/py/python-launcher/pkg-fun.nix diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/unit/py/pythonCondaPackages/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/python/conda/default.nix rename to pkgs/unit/py/pythonCondaPackages/pkg-fun.nix diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/unit/py/pythonManylinuxPackages/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/python/manylinux/default.nix rename to pkgs/unit/py/pythonManylinuxPackages/pkg-fun.nix diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/unit/py/pytrainer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/pytrainer/default.nix rename to pkgs/unit/py/pytrainer/pkg-fun.nix diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/unit/q-/q-text-as-data/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/q-text-as-data/default.nix rename to pkgs/unit/q-/q-text-as-data/pkg-fun.nix diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/unit/q/q/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/q/default.nix rename to pkgs/unit/q/q/pkg-fun.nix diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/unit/qa/qalculate-gtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/qalculate-gtk/default.nix rename to pkgs/unit/qa/qalculate-gtk/pkg-fun.nix diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/unit/qb/qbe/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/qbe/default.nix rename to pkgs/unit/qb/qbe/pkg-fun.nix diff --git a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix b/pkgs/unit/qb/qbe/test-can-run-hello-world.nix similarity index 100% rename from pkgs/development/compilers/qbe/test-can-run-hello-world.nix rename to pkgs/unit/qb/qbe/test-can-run-hello-world.nix diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/unit/qb/qbec/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/qbec/default.nix rename to pkgs/unit/qb/qbec/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/unit/qc/qcdnum/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/qcdnum/default.nix rename to pkgs/unit/qc/qcdnum/pkg-fun.nix diff --git a/pkgs/tools/misc/qdl/default.nix b/pkgs/unit/qd/qdl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/qdl/default.nix rename to pkgs/unit/qd/qdl/pkg-fun.nix diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/unit/qe/qemacs/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/qemacs/default.nix rename to pkgs/unit/qe/qemacs/pkg-fun.nix diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/unit/qe/qemu-utils/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/qemu/utils.nix rename to pkgs/unit/qe/qemu-utils/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch b/pkgs/unit/qf/qfsm/drop-hardcoded-prefix.patch similarity index 100% rename from pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch rename to pkgs/unit/qf/qfsm/drop-hardcoded-prefix.patch diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/pkgs/unit/qf/qfsm/gcc6-fixes.patch similarity index 100% rename from pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch rename to pkgs/unit/qf/qfsm/gcc6-fixes.patch diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/unit/qf/qfsm/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/qfsm/default.nix rename to pkgs/unit/qf/qfsm/pkg-fun.nix diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/unit/qh/qhull/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qhull/default.nix rename to pkgs/unit/qh/qhull/pkg-fun.nix diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/unit/qi/qimageblitz/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qimageblitz/default.nix rename to pkgs/unit/qi/qimageblitz/pkg-fun.nix diff --git a/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch b/pkgs/unit/qi/qimageblitz/qimageblitz-9999-exec-stack.patch similarity index 100% rename from pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch rename to pkgs/unit/qi/qimageblitz/qimageblitz-9999-exec-stack.patch diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/unit/qm/qm-dsp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/qm-dsp/default.nix rename to pkgs/unit/qm/qm-dsp/pkg-fun.nix diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/unit/qm/qmetro/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/qmetro/default.nix rename to pkgs/unit/qm/qmetro/pkg-fun.nix diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/unit/qm/qmidiarp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/qmidiarp/default.nix rename to pkgs/unit/qm/qmidiarp/pkg-fun.nix diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/unit/qm/qmidiroute/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/qmidiroute/default.nix rename to pkgs/unit/qm/qmidiroute/pkg-fun.nix diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/unit/qm/qmk-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/qmk-udev-rules/default.nix rename to pkgs/unit/qm/qmk-udev-rules/pkg-fun.nix diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/unit/qm/qmk/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/qmk/default.nix rename to pkgs/unit/qm/qmk/pkg-fun.nix diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/unit/qn/qnial/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/qnial/default.nix rename to pkgs/unit/qn/qnial/pkg-fun.nix diff --git a/pkgs/tools/networking/qodem/default.nix b/pkgs/unit/qo/qodem/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/qodem/default.nix rename to pkgs/unit/qo/qodem/pkg-fun.nix diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/unit/qo/qogir-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/qogir-icon-theme/default.nix rename to pkgs/unit/qo/qogir-icon-theme/pkg-fun.nix diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/unit/qo/qogir-kde/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/qogir-kde/default.nix rename to pkgs/unit/qo/qogir-kde/pkg-fun.nix diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/unit/qo/qogir-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/qogir/default.nix rename to pkgs/unit/qo/qogir-theme/pkg-fun.nix diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/unit/qo/qovery-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/qovery-cli/default.nix rename to pkgs/unit/qo/qovery-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/unit/qp/qpdf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qpdf/default.nix rename to pkgs/unit/qp/qpdf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/qperf/default.nix b/pkgs/unit/qp/qperf/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/qperf/default.nix rename to pkgs/unit/qp/qperf/pkg-fun.nix diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/unit/qp/qpid-cpp/pkg-fun.nix similarity index 100% rename from pkgs/servers/amqp/qpid-cpp/default.nix rename to pkgs/unit/qp/qpid-cpp/pkg-fun.nix diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/unit/qp/qprint/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/qprint/default.nix rename to pkgs/unit/qp/qprint/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/unit/qq/qq/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/qq/default.nix rename to pkgs/unit/qq/qq/pkg-fun.nix diff --git a/pkgs/games/qqwing/default.nix b/pkgs/unit/qq/qqwing/pkg-fun.nix similarity index 100% rename from pkgs/games/qqwing/default.nix rename to pkgs/unit/qq/qqwing/pkg-fun.nix diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/unit/qr/qradiolink/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/qradiolink/default.nix rename to pkgs/unit/qr/qradiolink/pkg-fun.nix diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/unit/qr/qrcode/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/qrcode/default.nix rename to pkgs/unit/qr/qrcode/pkg-fun.nix diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/unit/qr/qrcodegen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qrcodegen/default.nix rename to pkgs/unit/qr/qrcodegen/pkg-fun.nix diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/unit/qr/qrcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/qrcp/default.nix rename to pkgs/unit/qr/qrcp/pkg-fun.nix diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/unit/qr/qrupdate/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qrupdate/default.nix rename to pkgs/unit/qr/qrupdate/pkg-fun.nix diff --git a/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch b/pkgs/unit/qs/qscintilla-qt4/fix-qt4-build.patch similarity index 100% rename from pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch rename to pkgs/unit/qs/qscintilla-qt4/fix-qt4-build.patch diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/unit/qs/qscintilla-qt4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qscintilla-qt4/default.nix rename to pkgs/unit/qs/qscintilla-qt4/pkg-fun.nix diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/unit/qt/qt-mobility/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qt-mobility/default.nix rename to pkgs/unit/qt/qt-mobility/pkg-fun.nix diff --git a/pkgs/applications/window-managers/qtile/fix-restart.patch b/pkgs/unit/qt/qtile/fix-restart.patch similarity index 100% rename from pkgs/applications/window-managers/qtile/fix-restart.patch rename to pkgs/unit/qt/qtile/fix-restart.patch diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/unit/qt/qtile/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/qtile/default.nix rename to pkgs/unit/qt/qtile/pkg-fun.nix diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/unit/qt/qtscrobbler/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/qtscrobbler/default.nix rename to pkgs/unit/qt/qtscrobbler/pkg-fun.nix diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/unit/qt/qtstyleplugin-kvantum-qt4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix rename to pkgs/unit/qt/qtstyleplugin-kvantum-qt4/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/unit/qu/QuadProgpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/QuadProgpp/default.nix rename to pkgs/unit/qu/QuadProgpp/pkg-fun.nix diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/unit/qu/quadrafuzz/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/quadrafuzz/default.nix rename to pkgs/unit/qu/quadrafuzz/pkg-fun.nix diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/unit/qu/quake3demodata/pkg-fun.nix similarity index 100% rename from pkgs/games/quake3/content/demo.nix rename to pkgs/unit/qu/quake3demodata/pkg-fun.nix diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/unit/qu/quake3e/pkg-fun.nix similarity index 100% rename from pkgs/games/quake3/quake3e/default.nix rename to pkgs/unit/qu/quake3e/pkg-fun.nix diff --git a/pkgs/games/quake3/content/hires.nix b/pkgs/unit/qu/quake3hires/pkg-fun.nix similarity index 100% rename from pkgs/games/quake3/content/hires.nix rename to pkgs/unit/qu/quake3hires/pkg-fun.nix diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/unit/qu/quake3pointrelease/pkg-fun.nix similarity index 100% rename from pkgs/games/quake3/content/pointrelease.nix rename to pkgs/unit/qu/quake3pointrelease/pkg-fun.nix diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/unit/qu/quake3wrapper/pkg-fun.nix similarity index 100% rename from pkgs/games/quake3/wrapper/default.nix rename to pkgs/unit/qu/quake3wrapper/pkg-fun.nix diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/unit/qu/quantomatic/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/quantomatic/default.nix rename to pkgs/unit/qu/quantomatic/pkg-fun.nix diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/unit/qu/quantumminigolf/pkg-fun.nix similarity index 100% rename from pkgs/games/quantumminigolf/default.nix rename to pkgs/unit/qu/quantumminigolf/pkg-fun.nix diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/unit/qu/quark-engine/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/quark-engine/default.nix rename to pkgs/unit/qu/quark-engine/pkg-fun.nix diff --git a/pkgs/servers/http/quark/default.nix b/pkgs/unit/qu/quark/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/quark/default.nix rename to pkgs/unit/qu/quark/pkg-fun.nix diff --git a/pkgs/development/libraries/quarto/fix-deno-path.patch b/pkgs/unit/qu/quarto/fix-deno-path.patch similarity index 100% rename from pkgs/development/libraries/quarto/fix-deno-path.patch rename to pkgs/unit/qu/quarto/fix-deno-path.patch diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/unit/qu/quarto/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/quarto/default.nix rename to pkgs/unit/qu/quarto/pkg-fun.nix diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/unit/qu/quartus-prime-lite/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/quartus-prime/default.nix rename to pkgs/unit/qu/quartus-prime-lite/pkg-fun.nix diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/unit/qu/quartus-prime-lite/quartus.nix similarity index 100% rename from pkgs/applications/editors/quartus-prime/quartus.nix rename to pkgs/unit/qu/quartus-prime-lite/quartus.nix diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/unit/qu/quast/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/quast/default.nix rename to pkgs/unit/qu/quast/pkg-fun.nix diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/unit/qu/quattrocento-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/quattrocento-sans/default.nix rename to pkgs/unit/qu/quattrocento-sans/pkg-fun.nix diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/unit/qu/quattrocento/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/quattrocento/default.nix rename to pkgs/unit/qu/quattrocento/pkg-fun.nix diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/unit/qu/qubes-core-vchan-xen/pkg-fun.nix similarity index 100% rename from pkgs/applications/qubes/qubes-core-vchan-xen/default.nix rename to pkgs/unit/qu/qubes-core-vchan-xen/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/unit/qu/qucs-s/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/qucs-s/default.nix rename to pkgs/unit/qu/qucs-s/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/qucs/cmakelists.patch b/pkgs/unit/qu/qucs/cmakelists.patch similarity index 100% rename from pkgs/applications/science/electronics/qucs/cmakelists.patch rename to pkgs/unit/qu/qucs/cmakelists.patch diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/unit/qu/qucs/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/qucs/default.nix rename to pkgs/unit/qu/qucs/pkg-fun.nix diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/unit/qu/quesoglc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/quesoglc/default.nix rename to pkgs/unit/qu/quesoglc/pkg-fun.nix diff --git a/pkgs/tools/misc/quich/default.nix b/pkgs/unit/qu/quich/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/quich/default.nix rename to pkgs/unit/qu/quich/pkg-fun.nix diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/unit/qu/quick-lint-js/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/quick-lint-js/default.nix rename to pkgs/unit/qu/quick-lint-js/pkg-fun.nix diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/unit/qu/quickder/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/quickder/default.nix rename to pkgs/unit/qu/quickder/pkg-fun.nix diff --git a/pkgs/development/quickemu/default.nix b/pkgs/unit/qu/quickemu/pkg-fun.nix similarity index 100% rename from pkgs/development/quickemu/default.nix rename to pkgs/unit/qu/quickemu/pkg-fun.nix diff --git a/pkgs/development/libraries/quickfix/disableUnitTests.patch b/pkgs/unit/qu/quickfix/disableUnitTests.patch similarity index 100% rename from pkgs/development/libraries/quickfix/disableUnitTests.patch rename to pkgs/unit/qu/quickfix/disableUnitTests.patch diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/unit/qu/quickfix/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/quickfix/default.nix rename to pkgs/unit/qu/quickfix/pkg-fun.nix diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/unit/qu/quickjs/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/quickjs/default.nix rename to pkgs/unit/qu/quickjs/pkg-fun.nix diff --git a/pkgs/development/libraries/quickmem/default.nix b/pkgs/unit/qu/quickmem/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/quickmem/default.nix rename to pkgs/unit/qu/quickmem/pkg-fun.nix diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/unit/qu/quickserve/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/quickserve/default.nix rename to pkgs/unit/qu/quickserve/pkg-fun.nix diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/unit/qu/quicksynergy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/quicksynergy/default.nix rename to pkgs/unit/qu/quicksynergy/pkg-fun.nix diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/unit/qu/quicktemplate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/quicktemplate/default.nix rename to pkgs/unit/qu/quicktemplate/pkg-fun.nix diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/unit/qu/quicktun/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/quicktun/default.nix rename to pkgs/unit/qu/quicktun/pkg-fun.nix diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/unit/qu/quicktun/tar-1.30.diff similarity index 100% rename from pkgs/tools/networking/quicktun/tar-1.30.diff rename to pkgs/unit/qu/quicktun/tar-1.30.diff diff --git a/pkgs/tools/security/quill-qr/default.nix b/pkgs/unit/qu/quill-qr/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/quill-qr/default.nix rename to pkgs/unit/qu/quill-qr/pkg-fun.nix diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/unit/qu/quilt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/quilt/default.nix rename to pkgs/unit/qu/quilt/pkg-fun.nix diff --git a/pkgs/data/icons/quintom-cursor-theme/default.nix b/pkgs/unit/qu/quintom-cursor-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/quintom-cursor-theme/default.nix rename to pkgs/unit/qu/quintom-cursor-theme/pkg-fun.nix diff --git a/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch b/pkgs/unit/qu/quirc/0001-dont-build-demos.patch similarity index 100% rename from pkgs/tools/graphics/quirc/0001-dont-build-demos.patch rename to pkgs/unit/qu/quirc/0001-dont-build-demos.patch diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/unit/qu/quirc/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/quirc/default.nix rename to pkgs/unit/qu/quirc/pkg-fun.nix diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/unit/qu/quorum/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/quorum/default.nix rename to pkgs/unit/qu/quorum/pkg-fun.nix diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/unit/qu/quvi_scripts/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/quvi/scripts.nix rename to pkgs/unit/qu/quvi_scripts/pkg-fun.nix diff --git a/pkgs/applications/editors/qxw/default.nix b/pkgs/unit/qx/qxw/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/qxw/default.nix rename to pkgs/unit/qx/qxw/pkg-fun.nix diff --git a/pkgs/tools/system/r10k/Gemfile b/pkgs/unit/r1/r10k/Gemfile similarity index 100% rename from pkgs/tools/system/r10k/Gemfile rename to pkgs/unit/r1/r10k/Gemfile diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/unit/r1/r10k/Gemfile.lock similarity index 100% rename from pkgs/tools/system/r10k/Gemfile.lock rename to pkgs/unit/r1/r10k/Gemfile.lock diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/unit/r1/r10k/gemset.nix similarity index 100% rename from pkgs/tools/system/r10k/gemset.nix rename to pkgs/unit/r1/r10k/gemset.nix diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/unit/r1/r10k/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/r10k/default.nix rename to pkgs/unit/r1/r10k/pkg-fun.nix diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/unit/r1/r128gain/ffmpeg-location.patch similarity index 100% rename from pkgs/applications/audio/r128gain/ffmpeg-location.patch rename to pkgs/unit/r1/r128gain/ffmpeg-location.patch diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/unit/r1/r128gain/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/r128gain/default.nix rename to pkgs/unit/r1/r128gain/pkg-fun.nix diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/unit/r2/r2mod_cli/pkg-fun.nix similarity index 100% rename from pkgs/games/r2mod_cli/default.nix rename to pkgs/unit/r2/r2mod_cli/pkg-fun.nix diff --git a/pkgs/applications/networking/r53-ddns/default.nix b/pkgs/unit/r5/r53-ddns/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/r53-ddns/default.nix rename to pkgs/unit/r5/r53-ddns/pkg-fun.nix diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/unit/ra/rabbitmq-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rabbitmq-c/default.nix rename to pkgs/unit/ra/rabbitmq-c/pkg-fun.nix diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/unit/ra/rabbitvcs/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/rabbitvcs/default.nix rename to pkgs/unit/ra/rabbitvcs/pkg-fun.nix diff --git a/pkgs/games/racer/mkdir.patch b/pkgs/unit/ra/racer/mkdir.patch similarity index 100% rename from pkgs/games/racer/mkdir.patch rename to pkgs/unit/ra/racer/mkdir.patch diff --git a/pkgs/games/racer/default.nix b/pkgs/unit/ra/racer/pkg-fun.nix similarity index 100% rename from pkgs/games/racer/default.nix rename to pkgs/unit/ra/racer/pkg-fun.nix diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/unit/ra/racket-minimal/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/racket/minimal.nix rename to pkgs/unit/ra/racket-minimal/pkg-fun.nix diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/unit/ra/radamsa/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/radamsa/default.nix rename to pkgs/unit/ra/radamsa/pkg-fun.nix diff --git a/pkgs/servers/radarr/default.nix b/pkgs/unit/ra/radarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/radarr/default.nix rename to pkgs/unit/ra/radarr/pkg-fun.nix diff --git a/pkgs/servers/radarr/update.sh b/pkgs/unit/ra/radarr/update.sh similarity index 100% rename from pkgs/servers/radarr/update.sh rename to pkgs/unit/ra/radarr/update.sh diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/unit/ra/radeontools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/radeontools/default.nix rename to pkgs/unit/ra/radeontools/pkg-fun.nix diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/unit/ra/radeontop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/radeontop/default.nix rename to pkgs/unit/ra/radeontop/pkg-fun.nix diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/unit/ra/radicale2/pkg-fun.nix similarity index 100% rename from pkgs/servers/radicale/2.x.nix rename to pkgs/unit/ra/radicale2/pkg-fun.nix diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/unit/ra/radicale3/pkg-fun.nix similarity index 100% rename from pkgs/servers/radicale/3.x.nix rename to pkgs/unit/ra/radicale3/pkg-fun.nix diff --git a/pkgs/applications/version-management/radicle-upstream/default.nix b/pkgs/unit/ra/radicle-upstream/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/radicle-upstream/default.nix rename to pkgs/unit/ra/radicle-upstream/pkg-fun.nix diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/unit/ra/radioboat/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/radioboat/default.nix rename to pkgs/unit/ra/radioboat/pkg-fun.nix diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/unit/ra/radsecproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/radsecproxy/default.nix rename to pkgs/unit/ra/radsecproxy/pkg-fun.nix diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/unit/ra/radvd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/radvd/default.nix rename to pkgs/unit/ra/radvd/pkg-fun.nix diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/unit/ra/raft-canonical/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/raft-canonical/default.nix rename to pkgs/unit/ra/raft-canonical/pkg-fun.nix diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/unit/ra/raider/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/raider/default.nix rename to pkgs/unit/ra/raider/pkg-fun.nix diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/unit/ra/railway/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/railway/default.nix rename to pkgs/unit/ra/railway/pkg-fun.nix diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/unit/ra/rain/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rain/default.nix rename to pkgs/unit/ra/rain/pkg-fun.nix diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/unit/ra/raiseorlaunch/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/raiseorlaunch/default.nix rename to pkgs/unit/ra/raiseorlaunch/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/rake/Gemfile b/pkgs/unit/ra/rake/Gemfile similarity index 100% rename from pkgs/development/tools/build-managers/rake/Gemfile rename to pkgs/unit/ra/rake/Gemfile diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/unit/ra/rake/Gemfile.lock similarity index 100% rename from pkgs/development/tools/build-managers/rake/Gemfile.lock rename to pkgs/unit/ra/rake/Gemfile.lock diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/unit/ra/rake/gemset.nix similarity index 100% rename from pkgs/development/tools/build-managers/rake/gemset.nix rename to pkgs/unit/ra/rake/gemset.nix diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/unit/ra/rake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/rake/default.nix rename to pkgs/unit/ra/rake/pkg-fun.nix diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/unit/ra/rakkess/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rakkess/default.nix rename to pkgs/unit/ra/rakkess/pkg-fun.nix diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/unit/ra/rakudo/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/rakudo/default.nix rename to pkgs/unit/ra/rakudo/pkg-fun.nix diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/unit/ra/raleway/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/raleway/default.nix rename to pkgs/unit/ra/raleway/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/unit/ra/rambox/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/rambox/default.nix rename to pkgs/unit/ra/rambox/pkg-fun.nix diff --git a/pkgs/servers/http/ran/default.nix b/pkgs/unit/ra/ran/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/ran/default.nix rename to pkgs/unit/ra/ran/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/unit/ra/rancher/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/rancher/default.nix rename to pkgs/unit/ra/rancher/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/unit/ra/randoop/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/randoop/default.nix rename to pkgs/unit/ra/randoop/pkg-fun.nix diff --git a/pkgs/games/randtype/default.nix b/pkgs/unit/ra/randtype/pkg-fun.nix similarity index 100% rename from pkgs/games/randtype/default.nix rename to pkgs/unit/ra/randtype/pkg-fun.nix diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/unit/ra/rang/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rang/default.nix rename to pkgs/unit/ra/rang/pkg-fun.nix diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/unit/ra/range-v3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/range-v3/default.nix rename to pkgs/unit/ra/range-v3/pkg-fun.nix diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/unit/ra/ranger/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/ranger/default.nix rename to pkgs/unit/ra/ranger/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/unit/ra/rankwidth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/rankwidth/default.nix rename to pkgs/unit/ra/rankwidth/pkg-fun.nix diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/unit/ra/rapidcheck/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rapidcheck/default.nix rename to pkgs/unit/ra/rapidcheck/pkg-fun.nix diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/unit/ra/rapidfuzz-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rapidfuzz-cpp/default.nix rename to pkgs/unit/ra/rapidfuzz-cpp/pkg-fun.nix diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/unit/ra/rapidjson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rapidjson/default.nix rename to pkgs/unit/ra/rapidjson/pkg-fun.nix diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/unit/ra/rapidsvn/fix-build.patch similarity index 100% rename from pkgs/applications/version-management/rapidsvn/fix-build.patch rename to pkgs/unit/ra/rapidsvn/fix-build.patch diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/unit/ra/rapidsvn/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/rapidsvn/default.nix rename to pkgs/unit/ra/rapidsvn/pkg-fun.nix diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/unit/ra/rapidxml/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rapidxml/default.nix rename to pkgs/unit/ra/rapidxml/pkg-fun.nix diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/unit/ra/rappel/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/rappel/default.nix rename to pkgs/unit/ra/rappel/pkg-fun.nix diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/unit/ra/rar/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/rar/default.nix rename to pkgs/unit/ra/rar/pkg-fun.nix diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/unit/ra/rar2fs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/rar2fs/default.nix rename to pkgs/unit/ra/rar2fs/pkg-fun.nix diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/unit/ra/rarcrack/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/rarcrack/default.nix rename to pkgs/unit/ra/rarcrack/pkg-fun.nix diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/unit/ra/rargs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rargs/default.nix rename to pkgs/unit/ra/rargs/pkg-fun.nix diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/unit/ra/rarian/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rarian/default.nix rename to pkgs/unit/ra/rarian/pkg-fun.nix diff --git a/pkgs/development/tools/rars/default.nix b/pkgs/unit/ra/rars/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rars/default.nix rename to pkgs/unit/ra/rars/pkg-fun.nix diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/unit/ra/rascal/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/rascal/default.nix rename to pkgs/unit/ra/rascal/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/unit/ra/rasdaemon/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/rasdaemon/default.nix rename to pkgs/unit/ra/rasdaemon/pkg-fun.nix diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/unit/ra/rasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/rasm/default.nix rename to pkgs/unit/ra/rasm/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/unit/ra/raspberrypi-armstubs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix rename to pkgs/unit/ra/raspberrypi-armstubs/pkg-fun.nix diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/unit/ra/raspberrypi-eeprom/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/raspberrypi-eeprom/default.nix rename to pkgs/unit/ra/raspberrypi-eeprom/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/unit/ra/raspberrypiWirelessFirmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix rename to pkgs/unit/ra/raspberrypiWirelessFirmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/unit/ra/raspberrypifw/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/raspberrypi/default.nix rename to pkgs/unit/ra/raspberrypifw/pkg-fun.nix diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/unit/ra/ratman/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ratman/default.nix rename to pkgs/unit/ra/ratman/pkg-fun.nix diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/unit/ra/ratmen/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/ratmen/default.nix rename to pkgs/unit/ra/ratmen/pkg-fun.nix diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/unit/ra/ratools/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ratools/default.nix rename to pkgs/unit/ra/ratools/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/unit/ra/ratox/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/ratox/default.nix rename to pkgs/unit/ra/ratox/pkg-fun.nix diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/unit/ra/ratpoints/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/ratpoints/default.nix rename to pkgs/unit/ra/ratpoints/pkg-fun.nix diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/unit/ra/ratpoison/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/ratpoison/default.nix rename to pkgs/unit/ra/ratpoison/pkg-fun.nix diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/unit/ra/ratt/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ratt/default.nix rename to pkgs/unit/ra/ratt/pkg-fun.nix diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/unit/ra/rauc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rauc/default.nix rename to pkgs/unit/ra/rauc/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/unit/ra/raul/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/raul/default.nix rename to pkgs/unit/ra/raul/pkg-fun.nix diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/unit/ra/raven-reader/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/newsreaders/raven-reader/default.nix rename to pkgs/unit/ra/raven-reader/pkg-fun.nix diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/unit/ra/raxml/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/raxml/default.nix rename to pkgs/unit/ra/raxml/pkg-fun.nix diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/unit/ra/raylib-games/pkg-fun.nix similarity index 100% rename from pkgs/games/raylib-games/default.nix rename to pkgs/unit/ra/raylib-games/pkg-fun.nix diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/unit/ra/raylib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/raylib/default.nix rename to pkgs/unit/ra/raylib/pkg-fun.nix diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/unit/rb/rbenv/pkg-fun.nix similarity index 100% rename from pkgs/development/ruby-modules/rbenv/default.nix rename to pkgs/unit/rb/rbenv/pkg-fun.nix diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/unit/rb/rbspy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rbspy/default.nix rename to pkgs/unit/rb/rbspy/pkg-fun.nix diff --git a/pkgs/shells/rc/default.nix b/pkgs/unit/rc/rc/pkg-fun.nix similarity index 100% rename from pkgs/shells/rc/default.nix rename to pkgs/unit/rc/rc/pkg-fun.nix diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/unit/rc/rclone/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sync/rclone/default.nix rename to pkgs/unit/rc/rclone/pkg-fun.nix diff --git a/pkgs/tools/misc/rcm/fix-rcmlib-path.patch b/pkgs/unit/rc/rcm/fix-rcmlib-path.patch similarity index 100% rename from pkgs/tools/misc/rcm/fix-rcmlib-path.patch rename to pkgs/unit/rc/rcm/fix-rcmlib-path.patch diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/unit/rc/rcm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rcm/default.nix rename to pkgs/unit/rc/rcm/pkg-fun.nix diff --git a/pkgs/tools/networking/rcon/default.nix b/pkgs/unit/rc/rcon/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rcon/default.nix rename to pkgs/unit/rc/rcon/pkg-fun.nix diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/unit/rc/rconc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rconc/default.nix rename to pkgs/unit/rc/rconc/pkg-fun.nix diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/unit/rc/rcs/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/rcs/default.nix rename to pkgs/unit/rc/rcs/pkg-fun.nix diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/unit/rc/rcshist/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/rcshist/default.nix rename to pkgs/unit/rc/rcshist/pkg-fun.nix diff --git a/pkgs/tools/networking/rdap/default.nix b/pkgs/unit/rd/rdap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rdap/default.nix rename to pkgs/unit/rd/rdap/pkg-fun.nix diff --git a/pkgs/development/tools/misc/rdc/default.nix b/pkgs/unit/rd/rdc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/rdc/default.nix rename to pkgs/unit/rd/rdc/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/unit/rd/rdesktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/rdesktop/default.nix rename to pkgs/unit/rd/rdesktop/pkg-fun.nix diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/unit/rd/rdfind/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/rdfind/default.nix rename to pkgs/unit/rd/rdfind/pkg-fun.nix diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/unit/rd/rdiff-backup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/rdiff-backup/default.nix rename to pkgs/unit/rd/rdiff-backup/pkg-fun.nix diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/unit/rd/rdkafka/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rdkafka/default.nix rename to pkgs/unit/rd/rdkafka/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/unit/rd/rdma-core/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/rdma-core/default.nix rename to pkgs/unit/rd/rdma-core/pkg-fun.nix diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/unit/rd/rdocker/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rdocker/default.nix rename to pkgs/unit/rd/rdocker/pkg-fun.nix diff --git a/pkgs/tools/networking/rdrview/default.nix b/pkgs/unit/rd/rdrview/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rdrview/default.nix rename to pkgs/unit/rd/rdrview/pkg-fun.nix diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/unit/rd/rdup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/rdup/default.nix rename to pkgs/unit/rd/rdup/pkg-fun.nix diff --git a/pkgs/applications/search/re-isearch/default.nix b/pkgs/unit/re/re-isearch/pkg-fun.nix similarity index 100% rename from pkgs/applications/search/re-isearch/default.nix rename to pkgs/unit/re/re-isearch/pkg-fun.nix diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/unit/re/re2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/re2/default.nix rename to pkgs/unit/re/re2/pkg-fun.nix diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/unit/re/re2c/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/parsing/re2c/default.nix rename to pkgs/unit/re/re2c/pkg-fun.nix diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/unit/re/react-native-debugger/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/react-native-debugger/default.nix rename to pkgs/unit/re/react-native-debugger/pkg-fun.nix diff --git a/pkgs/os-specific/linux/read-edid/fno-common.patch b/pkgs/unit/re/read-edid/fno-common.patch similarity index 100% rename from pkgs/os-specific/linux/read-edid/fno-common.patch rename to pkgs/unit/re/read-edid/fno-common.patch diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/unit/re/read-edid/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/read-edid/default.nix rename to pkgs/unit/re/read-edid/pkg-fun.nix diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/unit/re/readosm/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/readosm/default.nix rename to pkgs/unit/re/readosm/pkg-fun.nix diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/unit/re/readstat/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/readstat/default.nix rename to pkgs/unit/re/readstat/pkg-fun.nix diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/unit/re/real_time_config_quick_scan/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/real_time_config_quick_scan/default.nix rename to pkgs/unit/re/real_time_config_quick_scan/pkg-fun.nix diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch b/pkgs/unit/re/realesrgan-ncnn-vulkan/cmakelists.patch similarity index 100% rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch rename to pkgs/unit/re/realesrgan-ncnn-vulkan/cmakelists.patch diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch b/pkgs/unit/re/realesrgan-ncnn-vulkan/models_path.patch similarity index 100% rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch rename to pkgs/unit/re/realesrgan-ncnn-vulkan/models_path.patch diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/unit/re/realesrgan-ncnn-vulkan/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix rename to pkgs/unit/re/realesrgan-ncnn-vulkan/pkg-fun.nix diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/unit/re/realvnc-vnc-viewer/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/realvnc-vnc-viewer/default.nix rename to pkgs/unit/re/realvnc-vnc-viewer/pkg-fun.nix diff --git a/pkgs/os-specific/linux/reap/default.nix b/pkgs/unit/re/reap/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/reap/default.nix rename to pkgs/unit/re/reap/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/unit/re/reattach-to-user-namespace/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix rename to pkgs/unit/re/reattach-to-user-namespace/pkg-fun.nix diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/unit/re/reaverwps-t6x/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/reaver-wps-t6x/default.nix rename to pkgs/unit/re/reaverwps-t6x/pkg-fun.nix diff --git a/pkgs/tools/networking/reaver-wps/parallel-build.patch b/pkgs/unit/re/reaverwps/parallel-build.patch similarity index 100% rename from pkgs/tools/networking/reaver-wps/parallel-build.patch rename to pkgs/unit/re/reaverwps/parallel-build.patch diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/unit/re/reaverwps/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/reaver-wps/default.nix rename to pkgs/unit/re/reaverwps/pkg-fun.nix diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/unit/re/recapp/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/recapp/default.nix rename to pkgs/unit/re/recapp/pkg-fun.nix diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/unit/re/recastnavigation/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/recastnavigation/default.nix rename to pkgs/unit/re/recastnavigation/pkg-fun.nix diff --git a/pkgs/tools/text/reckon/Gemfile b/pkgs/unit/re/reckon/Gemfile similarity index 100% rename from pkgs/tools/text/reckon/Gemfile rename to pkgs/unit/re/reckon/Gemfile diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/unit/re/reckon/Gemfile.lock similarity index 100% rename from pkgs/tools/text/reckon/Gemfile.lock rename to pkgs/unit/re/reckon/Gemfile.lock diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/unit/re/reckon/gemset.nix similarity index 100% rename from pkgs/tools/text/reckon/gemset.nix rename to pkgs/unit/re/reckon/gemset.nix diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/unit/re/reckon/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/reckon/default.nix rename to pkgs/unit/re/reckon/pkg-fun.nix diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/unit/re/recode/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/recode/default.nix rename to pkgs/unit/re/recode/pkg-fun.nix diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/unit/re/recoverjpeg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/recoverjpeg/default.nix rename to pkgs/unit/re/recoverjpeg/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/unit/re/rectangle/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/rectangle/default.nix rename to pkgs/unit/re/rectangle/pkg-fun.nix diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/unit/re/recursive/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/recursive/default.nix rename to pkgs/unit/re/recursive/pkg-fun.nix diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/unit/re/recutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/recutils/default.nix rename to pkgs/unit/re/recutils/pkg-fun.nix diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/unit/re/red/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/red/default.nix rename to pkgs/unit/re/red/pkg-fun.nix diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/unit/re/redeclipse/pkg-fun.nix similarity index 100% rename from pkgs/games/redeclipse/default.nix rename to pkgs/unit/re/redeclipse/pkg-fun.nix diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/unit/re/redfang/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/redfang/default.nix rename to pkgs/unit/re/redfang/pkg-fun.nix diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/unit/re/redhat-official-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/redhat-official/default.nix rename to pkgs/unit/re/redhat-official-fonts/pkg-fun.nix diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/unit/re/redir/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/redir/default.nix rename to pkgs/unit/re/redir/pkg-fun.nix diff --git a/pkgs/development/tools/redis-dump/Gemfile b/pkgs/unit/re/redis-dump/Gemfile similarity index 100% rename from pkgs/development/tools/redis-dump/Gemfile rename to pkgs/unit/re/redis-dump/Gemfile diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/unit/re/redis-dump/Gemfile.lock similarity index 100% rename from pkgs/development/tools/redis-dump/Gemfile.lock rename to pkgs/unit/re/redis-dump/Gemfile.lock diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/unit/re/redis-dump/gemset.nix similarity index 100% rename from pkgs/development/tools/redis-dump/gemset.nix rename to pkgs/unit/re/redis-dump/gemset.nix diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/unit/re/redis-dump/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/redis-dump/default.nix rename to pkgs/unit/re/redis-dump/pkg-fun.nix diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/unit/re/redis-plus-plus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/redis-plus-plus/default.nix rename to pkgs/unit/re/redis-plus-plus/pkg-fun.nix diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/unit/re/redis/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/redis/default.nix rename to pkgs/unit/re/redis/pkg-fun.nix diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/unit/re/redli/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/redli/default.nix rename to pkgs/unit/re/redli/pkg-fun.nix diff --git a/pkgs/applications/version-management/redmine/0001-python3.patch b/pkgs/unit/re/redmine/0001-python3.patch similarity index 100% rename from pkgs/applications/version-management/redmine/0001-python3.patch rename to pkgs/unit/re/redmine/0001-python3.patch diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/unit/re/redmine/Gemfile similarity index 100% rename from pkgs/applications/version-management/redmine/Gemfile rename to pkgs/unit/re/redmine/Gemfile diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/unit/re/redmine/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/redmine/Gemfile.lock rename to pkgs/unit/re/redmine/Gemfile.lock diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/unit/re/redmine/gemset.nix similarity index 100% rename from pkgs/applications/version-management/redmine/gemset.nix rename to pkgs/unit/re/redmine/gemset.nix diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/unit/re/redmine/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/redmine/default.nix rename to pkgs/unit/re/redmine/pkg-fun.nix diff --git a/pkgs/applications/version-management/redmine/update.sh b/pkgs/unit/re/redmine/update.sh similarity index 100% rename from pkgs/applications/version-management/redmine/update.sh rename to pkgs/unit/re/redmine/update.sh diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/unit/re/redo-apenwarr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/redo-apenwarr/default.nix rename to pkgs/unit/re/redo-apenwarr/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/unit/re/redo-c/Makefile similarity index 100% rename from pkgs/development/tools/build-managers/redo-c/Makefile rename to pkgs/unit/re/redo-c/Makefile diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/unit/re/redo-c/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/redo-c/default.nix rename to pkgs/unit/re/redo-c/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/unit/re/redo-sh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/redo-sh/default.nix rename to pkgs/unit/re/redo-sh/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/unit/re/redo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/redo/default.nix rename to pkgs/unit/re/redo/pkg-fun.nix diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/unit/re/redoflacs/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/redoflacs/default.nix rename to pkgs/unit/re/redoflacs/pkg-fun.nix diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/unit/re/redpanda/pkg-fun.nix similarity index 100% rename from pkgs/servers/redpanda/default.nix rename to pkgs/unit/re/redpanda/pkg-fun.nix diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/unit/re/redprl/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/redprl/default.nix rename to pkgs/unit/re/redprl/pkg-fun.nix diff --git a/pkgs/development/java-modules/redshift_jdbc/default.nix b/pkgs/unit/re/redshift_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/development/java-modules/redshift_jdbc/default.nix rename to pkgs/unit/re/redshift_jdbc/pkg-fun.nix diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/unit/re/redsocks/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/redsocks/default.nix rename to pkgs/unit/re/redsocks/pkg-fun.nix diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/unit/re/redstore/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/redstore/default.nix rename to pkgs/unit/re/redstore/pkg-fun.nix diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/unit/re/redux/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/redux/default.nix rename to pkgs/unit/re/redux/pkg-fun.nix diff --git a/pkgs/tools/security/redwax-tool/default.nix b/pkgs/unit/re/redwax-tool/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/redwax-tool/default.nix rename to pkgs/unit/re/redwax-tool/pkg-fun.nix diff --git a/pkgs/build-support/references-by-popularity/closure-graph.py b/pkgs/unit/re/referencesByPopularity/closure-graph.py similarity index 100% rename from pkgs/build-support/references-by-popularity/closure-graph.py rename to pkgs/unit/re/referencesByPopularity/closure-graph.py diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/unit/re/referencesByPopularity/pkg-fun.nix similarity index 100% rename from pkgs/build-support/references-by-popularity/default.nix rename to pkgs/unit/re/referencesByPopularity/pkg-fun.nix diff --git a/pkgs/tools/bootloaders/refind/0001-toolchain.patch b/pkgs/unit/re/refind/0001-toolchain.patch similarity index 100% rename from pkgs/tools/bootloaders/refind/0001-toolchain.patch rename to pkgs/unit/re/refind/0001-toolchain.patch diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/unit/re/refind/pkg-fun.nix similarity index 100% rename from pkgs/tools/bootloaders/refind/default.nix rename to pkgs/unit/re/refind/pkg-fun.nix diff --git a/pkgs/development/tools/refinery-cli/default.nix b/pkgs/unit/re/refinery-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/refinery-cli/default.nix rename to pkgs/unit/re/refinery-cli/pkg-fun.nix diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/unit/re/reflex/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/reflex/default.nix rename to pkgs/unit/re/reflex/pkg-fun.nix diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/unit/re/reftools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/reftools/default.nix rename to pkgs/unit/re/reftools/pkg-fun.nix diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/unit/re/refurb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/refurb/default.nix rename to pkgs/unit/re/refurb/pkg-fun.nix diff --git a/pkgs/tools/virtualization/reg/default.nix b/pkgs/unit/re/reg/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/reg/default.nix rename to pkgs/unit/re/reg/pkg-fun.nix diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/unit/re/regclient/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/regclient/default.nix rename to pkgs/unit/re/regclient/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/unit/re/regenkfs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/regenkfs/default.nix rename to pkgs/unit/re/regenkfs/pkg-fun.nix diff --git a/pkgs/tools/security/regexploit/default.nix b/pkgs/unit/re/regexploit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/regexploit/default.nix rename to pkgs/unit/re/regexploit/pkg-fun.nix diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/unit/re/regextester/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/regextester/default.nix rename to pkgs/unit/re/regextester/pkg-fun.nix diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/unit/re/regina/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/regina/default.nix rename to pkgs/unit/re/regina/pkg-fun.nix diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/unit/re/regionset/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/regionset/default.nix rename to pkgs/unit/re/regionset/pkg-fun.nix diff --git a/pkgs/tools/security/regpg/default.nix b/pkgs/unit/re/regpg/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/regpg/default.nix rename to pkgs/unit/re/regpg/pkg-fun.nix diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/unit/re/reiser4progs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/reiser4progs/default.nix rename to pkgs/unit/re/reiser4progs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/unit/re/reiserfsprogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/reiserfsprogs/default.nix rename to pkgs/unit/re/reiserfsprogs/pkg-fun.nix diff --git a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch b/pkgs/unit/re/reiserfsprogs/reiserfsprogs-ar-fix.patch similarity index 100% rename from pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch rename to pkgs/unit/re/reiserfsprogs/reiserfsprogs-ar-fix.patch diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/unit/re/releaseTools/binary-tarball.nix similarity index 100% rename from pkgs/build-support/release/binary-tarball.nix rename to pkgs/unit/re/releaseTools/binary-tarball.nix diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/unit/re/releaseTools/debian-build.nix similarity index 100% rename from pkgs/build-support/release/debian-build.nix rename to pkgs/unit/re/releaseTools/debian-build.nix diff --git a/pkgs/build-support/release/functions.sh b/pkgs/unit/re/releaseTools/functions.sh similarity index 100% rename from pkgs/build-support/release/functions.sh rename to pkgs/unit/re/releaseTools/functions.sh diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/unit/re/releaseTools/maven-build.nix similarity index 100% rename from pkgs/build-support/release/maven-build.nix rename to pkgs/unit/re/releaseTools/maven-build.nix diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/unit/re/releaseTools/nix-build.nix similarity index 100% rename from pkgs/build-support/release/nix-build.nix rename to pkgs/unit/re/releaseTools/nix-build.nix diff --git a/pkgs/build-support/release/default.nix b/pkgs/unit/re/releaseTools/pkg-fun.nix similarity index 100% rename from pkgs/build-support/release/default.nix rename to pkgs/unit/re/releaseTools/pkg-fun.nix diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/unit/re/releaseTools/rpm-build.nix similarity index 100% rename from pkgs/build-support/release/rpm-build.nix rename to pkgs/unit/re/releaseTools/rpm-build.nix diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/unit/re/releaseTools/source-tarball.nix similarity index 100% rename from pkgs/build-support/release/source-tarball.nix rename to pkgs/unit/re/releaseTools/source-tarball.nix diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/unit/re/relibc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/relibc/default.nix rename to pkgs/unit/re/relibc/pkg-fun.nix diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/unit/re/relic/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/relic/default.nix rename to pkgs/unit/re/relic/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/unit/re/remake/glibc-2.27-glob.patch similarity index 100% rename from pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch rename to pkgs/unit/re/remake/glibc-2.27-glob.patch diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/unit/re/remake/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/remake/default.nix rename to pkgs/unit/re/remake/pkg-fun.nix diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/unit/re/remarkable-toolchain/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix rename to pkgs/unit/re/remarkable-toolchain/pkg-fun.nix diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/unit/re/remarkable2-toolchain/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix rename to pkgs/unit/re/remarkable2-toolchain/pkg-fun.nix diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/unit/re/remind/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/remind/default.nix rename to pkgs/unit/re/remind/pkg-fun.nix diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/unit/re/remkrom/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/knightos/remkrom/default.nix rename to pkgs/unit/re/remkrom/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/unit/re/remmina/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/remmina/default.nix rename to pkgs/unit/re/remmina/pkg-fun.nix diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/unit/re/remnote/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/remnote/default.nix rename to pkgs/unit/re/remnote/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/unit/re/remote-touchpad/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/remote-touchpad/default.nix rename to pkgs/unit/re/remote-touchpad/pkg-fun.nix diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/unit/re/remotebox/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/remotebox/default.nix rename to pkgs/unit/re/remotebox/pkg-fun.nix diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/unit/re/rename/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rename/default.nix rename to pkgs/unit/re/rename/pkg-fun.nix diff --git a/pkgs/tools/misc/renameutils/install-exec.patch b/pkgs/unit/re/renameutils/install-exec.patch similarity index 100% rename from pkgs/tools/misc/renameutils/install-exec.patch rename to pkgs/unit/re/renameutils/install-exec.patch diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/unit/re/renameutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/renameutils/default.nix rename to pkgs/unit/re/renameutils/pkg-fun.nix diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/unit/re/renderizer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/renderizer/default.nix rename to pkgs/unit/re/renderizer/pkg-fun.nix diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/unit/re/reno/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/reno/default.nix rename to pkgs/unit/re/reno/pkg-fun.nix diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/unit/re/renoise/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/renoise/default.nix rename to pkgs/unit/re/renoise/pkg-fun.nix diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/unit/re/renpy/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/renpy/default.nix rename to pkgs/unit/re/renpy/pkg-fun.nix diff --git a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff b/pkgs/unit/re/renpy/renpy-system-fribidi.diff similarity index 100% rename from pkgs/development/interpreters/renpy/renpy-system-fribidi.diff rename to pkgs/unit/re/renpy/renpy-system-fribidi.diff diff --git a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch b/pkgs/unit/re/renpy/shutup-erofs-errors.patch similarity index 100% rename from pkgs/development/interpreters/renpy/shutup-erofs-errors.patch rename to pkgs/unit/re/renpy/shutup-erofs-errors.patch diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/unit/re/rep-gtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rep-gtk/default.nix rename to pkgs/unit/re/rep-gtk/pkg-fun.nix diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/pkgs/unit/re/rep-gtk/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/rep-gtk/setup-hook.sh rename to pkgs/unit/re/rep-gtk/setup-hook.sh diff --git a/pkgs/development/tools/rep/default.nix b/pkgs/unit/re/rep/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rep/default.nix rename to pkgs/unit/re/rep/pkg-fun.nix diff --git a/pkgs/build-support/replace-secret/replace-secret.nix b/pkgs/unit/re/replace-secret/pkg-fun.nix similarity index 100% rename from pkgs/build-support/replace-secret/replace-secret.nix rename to pkgs/unit/re/replace-secret/pkg-fun.nix diff --git a/pkgs/build-support/replace-secret/replace-secret.py b/pkgs/unit/re/replace-secret/replace-secret.py similarity index 100% rename from pkgs/build-support/replace-secret/replace-secret.py rename to pkgs/unit/re/replace-secret/replace-secret.py diff --git a/pkgs/build-support/replace-secret/test/expected_long_output b/pkgs/unit/re/replace-secret/test/expected_long_output similarity index 100% rename from pkgs/build-support/replace-secret/test/expected_long_output rename to pkgs/unit/re/replace-secret/test/expected_long_output diff --git a/pkgs/build-support/replace-secret/test/expected_short_output b/pkgs/unit/re/replace-secret/test/expected_short_output similarity index 100% rename from pkgs/build-support/replace-secret/test/expected_short_output rename to pkgs/unit/re/replace-secret/test/expected_short_output diff --git a/pkgs/build-support/replace-secret/test/input_file b/pkgs/unit/re/replace-secret/test/input_file similarity index 100% rename from pkgs/build-support/replace-secret/test/input_file rename to pkgs/unit/re/replace-secret/test/input_file diff --git a/pkgs/build-support/replace-secret/test/passwd b/pkgs/unit/re/replace-secret/test/passwd similarity index 100% rename from pkgs/build-support/replace-secret/test/passwd rename to pkgs/unit/re/replace-secret/test/passwd diff --git a/pkgs/build-support/replace-secret/test/rsa b/pkgs/unit/re/replace-secret/test/rsa similarity index 100% rename from pkgs/build-support/replace-secret/test/rsa rename to pkgs/unit/re/replace-secret/test/rsa diff --git a/pkgs/tools/text/replace/malloc.patch b/pkgs/unit/re/replace/malloc.patch similarity index 100% rename from pkgs/tools/text/replace/malloc.patch rename to pkgs/unit/re/replace/malloc.patch diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/unit/re/replace/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/replace/default.nix rename to pkgs/unit/re/replace/pkg-fun.nix diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/unit/re/replaceDependency/pkg-fun.nix similarity index 100% rename from pkgs/build-support/replace-dependency.nix rename to pkgs/unit/re/replaceDependency/pkg-fun.nix diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/unit/re/replacement/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/replacement/default.nix rename to pkgs/unit/re/replacement/pkg-fun.nix diff --git a/pkgs/tools/video/replay-sorcery/fix-global-config.patch b/pkgs/unit/re/replay-sorcery/fix-global-config.patch similarity index 100% rename from pkgs/tools/video/replay-sorcery/fix-global-config.patch rename to pkgs/unit/re/replay-sorcery/fix-global-config.patch diff --git a/pkgs/tools/video/replay-sorcery/hardcode-libnotify.patch b/pkgs/unit/re/replay-sorcery/hardcode-libnotify.patch similarity index 100% rename from pkgs/tools/video/replay-sorcery/hardcode-libnotify.patch rename to pkgs/unit/re/replay-sorcery/hardcode-libnotify.patch diff --git a/pkgs/tools/video/replay-sorcery/default.nix b/pkgs/unit/re/replay-sorcery/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/replay-sorcery/default.nix rename to pkgs/unit/re/replay-sorcery/pkg-fun.nix diff --git a/pkgs/applications/version-management/reposurgeon/fix-makefile.patch b/pkgs/unit/re/reposurgeon/fix-makefile.patch similarity index 100% rename from pkgs/applications/version-management/reposurgeon/fix-makefile.patch rename to pkgs/unit/re/reposurgeon/fix-makefile.patch diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/unit/re/reposurgeon/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/reposurgeon/default.nix rename to pkgs/unit/re/reposurgeon/pkg-fun.nix diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/unit/re/reproc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/reproc/default.nix rename to pkgs/unit/re/reproc/pkg-fun.nix diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/unit/re/reproxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/reproxy/default.nix rename to pkgs/unit/re/reproxy/pkg-fun.nix diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/unit/re/repseek/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/repseek/default.nix rename to pkgs/unit/re/repseek/pkg-fun.nix diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/unit/re/reptyr/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/reptyr/default.nix rename to pkgs/unit/re/reptyr/pkg-fun.nix diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/unit/re/reredirect/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/reredirect/default.nix rename to pkgs/unit/re/reredirect/pkg-fun.nix diff --git a/pkgs/servers/resgate/default.nix b/pkgs/unit/re/resgate/pkg-fun.nix similarity index 100% rename from pkgs/servers/resgate/default.nix rename to pkgs/unit/re/resgate/pkg-fun.nix diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/unit/re/resilio-sync/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/resilio-sync/default.nix rename to pkgs/unit/re/resilio-sync/pkg-fun.nix diff --git a/pkgs/applications/emulators/resim/default.nix b/pkgs/unit/re/resim/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/resim/default.nix rename to pkgs/unit/re/resim/pkg-fun.nix diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/unit/re/resolv_wrapper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/resolv_wrapper/default.nix rename to pkgs/unit/re/resolv_wrapper/pkg-fun.nix diff --git a/pkgs/development/tools/resolve-march-native/default.nix b/pkgs/unit/re/resolve-march-native/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/resolve-march-native/default.nix rename to pkgs/unit/re/resolve-march-native/pkg-fun.nix diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/unit/re/restic-rest-server/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/restic/rest-server.nix rename to pkgs/unit/re/restic-rest-server/pkg-fun.nix diff --git a/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch b/pkgs/unit/re/restic/0001-Skip-testing-restore-with-permission-failure.patch similarity index 100% rename from pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch rename to pkgs/unit/re/restic/0001-Skip-testing-restore-with-permission-failure.patch diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/unit/re/restic/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/restic/default.nix rename to pkgs/unit/re/restic/pkg-fun.nix diff --git a/pkgs/development/libraries/restinio/default.nix b/pkgs/unit/re/restinio/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/restinio/default.nix rename to pkgs/unit/re/restinio/pkg-fun.nix diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/unit/re/restool/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/restool/default.nix rename to pkgs/unit/re/restool/pkg-fun.nix diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/unit/re/restream/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/remarkable/restream/default.nix rename to pkgs/unit/re/restream/pkg-fun.nix diff --git a/pkgs/servers/web-apps/restya-board/fix_request-uri.patch b/pkgs/unit/re/restya-board/fix_request-uri.patch similarity index 100% rename from pkgs/servers/web-apps/restya-board/fix_request-uri.patch rename to pkgs/unit/re/restya-board/fix_request-uri.patch diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/unit/re/restya-board/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/restya-board/default.nix rename to pkgs/unit/re/restya-board/pkg-fun.nix diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/unit/re/resvg/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/resvg/default.nix rename to pkgs/unit/re/resvg/pkg-fun.nix diff --git a/pkgs/development/libraries/retro-gtk/gio-unix.patch b/pkgs/unit/re/retro-gtk/gio-unix.patch similarity index 100% rename from pkgs/development/libraries/retro-gtk/gio-unix.patch rename to pkgs/unit/re/retro-gtk/gio-unix.patch diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/unit/re/retro-gtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/retro-gtk/default.nix rename to pkgs/unit/re/retro-gtk/pkg-fun.nix diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/unit/re/retroarch-assets/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/retroarch/retroarch-assets.nix rename to pkgs/unit/re/retroarch-assets/pkg-fun.nix diff --git a/pkgs/applications/emulators/retrofe/default.nix b/pkgs/unit/re/retrofe/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/retrofe/default.nix rename to pkgs/unit/re/retrofe/pkg-fun.nix diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/unit/re/retry/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/retry/default.nix rename to pkgs/unit/re/retry/pkg-fun.nix diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/unit/re/reuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/reuse/default.nix rename to pkgs/unit/re/reuse/pkg-fun.nix diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/unit/re/reviewdog/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/reviewdog/default.nix rename to pkgs/unit/re/reviewdog/pkg-fun.nix diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/unit/re/revive/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/revive/default.nix rename to pkgs/unit/re/revive/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/unit/re/rewritefs/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/rewritefs/default.nix rename to pkgs/unit/re/rewritefs/pkg-fun.nix diff --git a/pkgs/tools/networking/rewrk/Cargo.lock b/pkgs/unit/re/rewrk/Cargo.lock similarity index 100% rename from pkgs/tools/networking/rewrk/Cargo.lock rename to pkgs/unit/re/rewrk/Cargo.lock diff --git a/pkgs/tools/networking/rewrk/default.nix b/pkgs/unit/re/rewrk/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rewrk/default.nix rename to pkgs/unit/re/rewrk/pkg-fun.nix diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/unit/re/rex/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/rex/default.nix rename to pkgs/unit/re/rex/pkg-fun.nix diff --git a/pkgs/tools/typesetting/rfc-bibtex/default.nix b/pkgs/unit/rf/rfc-bibtex/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/rfc-bibtex/default.nix rename to pkgs/unit/rf/rfc-bibtex/pkg-fun.nix diff --git a/pkgs/tools/misc/rfc/default.nix b/pkgs/unit/rf/rfc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rfc/default.nix rename to pkgs/unit/rf/rfc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/unit/rf/rfkill_udev/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/rfkill/udev.nix rename to pkgs/unit/rf/rfkill_udev/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/unit/rf/rfkill_udev/rfkill-hook.sh similarity index 100% rename from pkgs/os-specific/linux/rfkill/rfkill-hook.sh rename to pkgs/unit/rf/rfkill_udev/rfkill-hook.sh diff --git a/pkgs/games/rftg/default.nix b/pkgs/unit/rf/rftg/pkg-fun.nix similarity index 100% rename from pkgs/games/rftg/default.nix rename to pkgs/unit/rf/rftg/pkg-fun.nix diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/unit/rg/rgbds/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/rgbds/default.nix rename to pkgs/unit/rg/rgbds/pkg-fun.nix diff --git a/pkgs/tools/text/rgxg/default.nix b/pkgs/unit/rg/rgxg/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rgxg/default.nix rename to pkgs/unit/rg/rgxg/pkg-fun.nix diff --git a/pkgs/development/tools/rust/rhack/default.nix b/pkgs/unit/rh/rhack/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/rhack/default.nix rename to pkgs/unit/rh/rhack/pkg-fun.nix diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/unit/rh/rhash/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/rhash/default.nix rename to pkgs/unit/rh/rhash/pkg-fun.nix diff --git a/pkgs/tools/admin/rhoas/default.nix b/pkgs/unit/rh/rhoas/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/rhoas/default.nix rename to pkgs/unit/rh/rhoas/pkg-fun.nix diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/unit/rh/rhodium-libre/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/rhodium-libre/default.nix rename to pkgs/unit/rh/rhodium-libre/pkg-fun.nix diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/unit/rh/rhvoice/honor_nix_environment.patch similarity index 100% rename from pkgs/applications/audio/rhvoice/honor_nix_environment.patch rename to pkgs/unit/rh/rhvoice/honor_nix_environment.patch diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/unit/rh/rhvoice/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/rhvoice/default.nix rename to pkgs/unit/rh/rhvoice/pkg-fun.nix diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/unit/rh/rhythmbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/rhythmbox/default.nix rename to pkgs/unit/rh/rhythmbox/pkg-fun.nix diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/unit/ri/rich-cli/pkg-fun.nix similarity index 100% rename from pkgs/misc/rich-cli/default.nix rename to pkgs/unit/ri/rich-cli/pkg-fun.nix diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/unit/ri/richgo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/richgo/default.nix rename to pkgs/unit/ri/richgo/pkg-fun.nix diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/unit/ri/ricty/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ricty/default.nix rename to pkgs/unit/ri/ricty/pkg-fun.nix diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/unit/ri/rictydiminished-with-firacode/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/rictydiminished-with-firacode/default.nix rename to pkgs/unit/ri/rictydiminished-with-firacode/pkg-fun.nix diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/unit/ri/riemann-dash/Gemfile similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/Gemfile rename to pkgs/unit/ri/riemann-dash/Gemfile diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/unit/ri/riemann-dash/Gemfile.lock similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/Gemfile.lock rename to pkgs/unit/ri/riemann-dash/Gemfile.lock diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/unit/ri/riemann-dash/gemset.nix similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/gemset.nix rename to pkgs/unit/ri/riemann-dash/gemset.nix diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/unit/ri/riemann-dash/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/default.nix rename to pkgs/unit/ri/riemann-dash/pkg-fun.nix diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/unit/ri/riemann-tools/Gemfile similarity index 100% rename from pkgs/tools/misc/riemann-tools/Gemfile rename to pkgs/unit/ri/riemann-tools/Gemfile diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/unit/ri/riemann-tools/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/riemann-tools/Gemfile.lock rename to pkgs/unit/ri/riemann-tools/Gemfile.lock diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/unit/ri/riemann-tools/gemset.nix similarity index 100% rename from pkgs/tools/misc/riemann-tools/gemset.nix rename to pkgs/unit/ri/riemann-tools/gemset.nix diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/unit/ri/riemann-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/riemann-tools/default.nix rename to pkgs/unit/ri/riemann-tools/pkg-fun.nix diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/unit/ri/riemann/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/riemann/default.nix rename to pkgs/unit/ri/riemann/pkg-fun.nix diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/unit/ri/riemann_c_client/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/riemann-c-client/default.nix rename to pkgs/unit/ri/riemann_c_client/pkg-fun.nix diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/unit/ri/ries/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/ries/default.nix rename to pkgs/unit/ri/ries/pkg-fun.nix diff --git a/pkgs/development/tools/misc/riff/default.nix b/pkgs/unit/ri/riff/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/riff/default.nix rename to pkgs/unit/ri/riff/pkg-fun.nix diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/unit/ri/rig/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rig/default.nix rename to pkgs/unit/ri/rig/pkg-fun.nix diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/pkgs/unit/ri/rig/rig_1.11-1.diff similarity index 100% rename from pkgs/tools/misc/rig/rig_1.11-1.diff rename to pkgs/unit/ri/rig/rig_1.11-1.diff diff --git a/pkgs/games/riko4/default.nix b/pkgs/unit/ri/riko4/pkg-fun.nix similarity index 100% rename from pkgs/games/riko4/default.nix rename to pkgs/unit/ri/riko4/pkg-fun.nix diff --git a/pkgs/games/rili/moderinze_cpp.patch b/pkgs/unit/ri/rili/moderinze_cpp.patch similarity index 100% rename from pkgs/games/rili/moderinze_cpp.patch rename to pkgs/unit/ri/rili/moderinze_cpp.patch diff --git a/pkgs/games/rili/default.nix b/pkgs/unit/ri/rili/pkg-fun.nix similarity index 100% rename from pkgs/games/rili/default.nix rename to pkgs/unit/ri/rili/pkg-fun.nix diff --git a/pkgs/data/misc/rime-data/fetchSchema.nix b/pkgs/unit/ri/rime-data/fetchSchema.nix similarity index 100% rename from pkgs/data/misc/rime-data/fetchSchema.nix rename to pkgs/unit/ri/rime-data/fetchSchema.nix diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/unit/ri/rime-data/generateFetchSchema.sh similarity index 100% rename from pkgs/data/misc/rime-data/generateFetchSchema.sh rename to pkgs/unit/ri/rime-data/generateFetchSchema.sh diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/unit/ri/rime-data/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/rime-data/default.nix rename to pkgs/unit/ri/rime-data/pkg-fun.nix diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/unit/ri/rinutils/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rinutils/default.nix rename to pkgs/unit/ri/rinutils/pkg-fun.nix diff --git a/pkgs/development/tools/riot-redis/default.nix b/pkgs/unit/ri/riot-redis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/riot-redis/default.nix rename to pkgs/unit/ri/riot-redis/pkg-fun.nix diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/unit/ri/ripdrag/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ripdrag/default.nix rename to pkgs/unit/ri/ripdrag/pkg-fun.nix diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/unit/ri/ripe-atlas-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ripe-atlas-tools/default.nix rename to pkgs/unit/ri/ripe-atlas-tools/pkg-fun.nix diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/unit/ri/ripmime/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ripmime/default.nix rename to pkgs/unit/ri/ripmime/pkg-fun.nix diff --git a/pkgs/servers/rippled/validator-keys-tool.nix b/pkgs/unit/ri/rippled-validator-keys-tool/pkg-fun.nix similarity index 100% rename from pkgs/servers/rippled/validator-keys-tool.nix rename to pkgs/unit/ri/rippled-validator-keys-tool/pkg-fun.nix diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/unit/ri/ripser/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/ripser/default.nix rename to pkgs/unit/ri/ripser/pkg-fun.nix diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/unit/ri/riscv-pk/pkg-fun.nix similarity index 100% rename from pkgs/misc/riscv-pk/default.nix rename to pkgs/unit/ri/riscv-pk/pkg-fun.nix diff --git a/pkgs/tools/misc/ristate/default.nix b/pkgs/unit/ri/ristate/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ristate/default.nix rename to pkgs/unit/ri/ristate/pkg-fun.nix diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/unit/ri/river/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/river/default.nix rename to pkgs/unit/ri/river/pkg-fun.nix diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/unit/ri/rivercarro/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rivercarro/default.nix rename to pkgs/unit/ri/rivercarro/pkg-fun.nix diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/unit/rk/rkdeveloptool-pine64/pkg-fun.nix similarity index 100% rename from pkgs/misc/rkdeveloptool-pine64/default.nix rename to pkgs/unit/rk/rkdeveloptool-pine64/pkg-fun.nix diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/unit/rk/rkdeveloptool/pkg-fun.nix similarity index 100% rename from pkgs/misc/rkdeveloptool/default.nix rename to pkgs/unit/rk/rkdeveloptool/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/unit/rk/rke/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/rke/default.nix rename to pkgs/unit/rk/rke/pkg-fun.nix diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/unit/rk/rkflashtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rkflashtool/default.nix rename to pkgs/unit/rk/rkflashtool/pkg-fun.nix diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/unit/rk/rkrlv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/rkrlv2/default.nix rename to pkgs/unit/rk/rkrlv2/pkg-fun.nix diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/unit/rl/rlaunch/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rlaunch/default.nix rename to pkgs/unit/rl/rlaunch/pkg-fun.nix diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/unit/rl/rlog/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rlog/default.nix rename to pkgs/unit/rl/rlog/pkg-fun.nix diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/unit/rl/rlottie/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rlottie/default.nix rename to pkgs/unit/rl/rlottie/pkg-fun.nix diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/unit/rl/rlwrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rlwrap/default.nix rename to pkgs/unit/rl/rlwrap/pkg-fun.nix diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/unit/rm/rm-improved/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rm-improved/default.nix rename to pkgs/unit/rm/rm-improved/pkg-fun.nix diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/unit/rm/rman/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/rman/default.nix rename to pkgs/unit/rm/rman/pkg-fun.nix diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/unit/rm/rmapi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/remarkable/rmapi/default.nix rename to pkgs/unit/rm/rmapi/pkg-fun.nix diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/unit/rm/rmfakecloud/pkg-fun.nix similarity index 100% rename from pkgs/servers/rmfakecloud/default.nix rename to pkgs/unit/rm/rmfakecloud/pkg-fun.nix diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/unit/rm/rmfakecloud/webui.nix similarity index 100% rename from pkgs/servers/rmfakecloud/webui.nix rename to pkgs/unit/rm/rmfakecloud/webui.nix diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/unit/rm/rmfuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/rmfuse/default.nix rename to pkgs/unit/rm/rmfuse/pkg-fun.nix diff --git a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/pkgs/unit/rm/rmfuse/poetry-git-overlay.nix similarity index 100% rename from pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix rename to pkgs/unit/rm/rmfuse/poetry-git-overlay.nix diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/unit/rm/rmfuse/poetry.lock similarity index 100% rename from pkgs/tools/filesystems/rmfuse/poetry.lock rename to pkgs/unit/rm/rmfuse/poetry.lock diff --git a/pkgs/tools/filesystems/rmfuse/pyproject.toml b/pkgs/unit/rm/rmfuse/pyproject.toml similarity index 100% rename from pkgs/tools/filesystems/rmfuse/pyproject.toml rename to pkgs/unit/rm/rmfuse/pyproject.toml diff --git a/pkgs/tools/filesystems/rmfuse/update b/pkgs/unit/rm/rmfuse/update similarity index 100% rename from pkgs/tools/filesystems/rmfuse/update rename to pkgs/unit/rm/rmfuse/update diff --git a/pkgs/development/compilers/rml/default.nix b/pkgs/unit/rm/rml/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/rml/default.nix rename to pkgs/unit/rm/rml/pkg-fun.nix diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/unit/rm/rmount/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/rmount/default.nix rename to pkgs/unit/rm/rmount/pkg-fun.nix diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/unit/rm/rmtrash/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rmtrash/default.nix rename to pkgs/unit/rm/rmtrash/pkg-fun.nix diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/unit/rn/rng-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/rng-tools/default.nix rename to pkgs/unit/rn/rng-tools/pkg-fun.nix diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/unit/rn/rnix-hashes/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/rnix-hashes/default.nix rename to pkgs/unit/rn/rnix-hashes/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/rnix-lsp/default.nix b/pkgs/unit/rn/rnix-lsp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/rnix-lsp/default.nix rename to pkgs/unit/rn/rnix-lsp/pkg-fun.nix diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/unit/rn/rnnoise/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rnnoise/default.nix rename to pkgs/unit/rn/rnnoise/pkg-fun.nix diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/unit/rn/rnp/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/rnp/default.nix rename to pkgs/unit/rn/rnp/pkg-fun.nix diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/unit/rn/rnr/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rnr/default.nix rename to pkgs/unit/rn/rnr/pkg-fun.nix diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/unit/rn/rnv/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/rnv/default.nix rename to pkgs/unit/rn/rnv/pkg-fun.nix diff --git a/pkgs/servers/roapi/http.nix b/pkgs/unit/ro/roapi-http/pkg-fun.nix similarity index 100% rename from pkgs/servers/roapi/http.nix rename to pkgs/unit/ro/roapi-http/pkg-fun.nix diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/unit/ro/robin-map/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/robin-map/default.nix rename to pkgs/unit/ro/robin-map/pkg-fun.nix diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/unit/ro/robo3t/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/robo3t/default.nix rename to pkgs/unit/ro/robo3t/pkg-fun.nix diff --git a/pkgs/tools/text/robodoc/default.nix b/pkgs/unit/ro/robodoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/robodoc/default.nix rename to pkgs/unit/ro/robodoc/pkg-fun.nix diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/unit/ro/robotfindskitten/pkg-fun.nix similarity index 100% rename from pkgs/games/robotfindskitten/default.nix rename to pkgs/unit/ro/robotfindskitten/pkg-fun.nix diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/unit/ro/roboto-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/roboto-mono/default.nix rename to pkgs/unit/ro/roboto-mono/pkg-fun.nix diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/unit/ro/roboto-slab/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/roboto-slab/default.nix rename to pkgs/unit/ro/roboto-slab/pkg-fun.nix diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/unit/ro/roboto/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/roboto/default.nix rename to pkgs/unit/ro/roboto/pkg-fun.nix diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/unit/ro/robustirc-bridge/pkg-fun.nix similarity index 100% rename from pkgs/servers/irc/robustirc-bridge/default.nix rename to pkgs/unit/ro/robustirc-bridge/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch b/pkgs/unit/ro/roc-toolkit/fix-pkgconfig-installation.patch similarity index 100% rename from pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch rename to pkgs/unit/ro/roc-toolkit/fix-pkgconfig-installation.patch diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/unit/ro/roc-toolkit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/roc-toolkit/default.nix rename to pkgs/unit/ro/roc-toolkit/pkg-fun.nix diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/unit/ro/roccat-tools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/roccat-tools/default.nix rename to pkgs/unit/ro/roccat-tools/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/unit/ro/rocketchat-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix rename to pkgs/unit/ro/rocketchat-desktop/pkg-fun.nix diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/unit/ro/rocksdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rocksdb/default.nix rename to pkgs/unit/ro/rocksdb/pkg-fun.nix diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/unit/ro/rocksndiamonds/pkg-fun.nix similarity index 100% rename from pkgs/games/rocksndiamonds/default.nix rename to pkgs/unit/ro/rocksndiamonds/pkg-fun.nix diff --git a/pkgs/development/rocm-modules/update-script/default.nix b/pkgs/unit/ro/rocmUpdateScript/pkg-fun.nix similarity index 100% rename from pkgs/development/rocm-modules/update-script/default.nix rename to pkgs/unit/ro/rocmUpdateScript/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/unit/ro/rofi-bluetooth/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi-bluetooth/default.nix rename to pkgs/unit/ro/rofi-bluetooth/pkg-fun.nix diff --git a/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch b/pkgs/unit/ro/rofi-calc/0001-Patch-plugindir-to-output.patch similarity index 100% rename from pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch rename to pkgs/unit/ro/rofi-calc/0001-Patch-plugindir-to-output.patch diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/unit/ro/rofi-calc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/rofi-calc/default.nix rename to pkgs/unit/ro/rofi-calc/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch b/pkgs/unit/ro/rofi-emoji/0001-Patch-plugindir-to-output.patch similarity index 100% rename from pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch rename to pkgs/unit/ro/rofi-emoji/0001-Patch-plugindir-to-output.patch diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/unit/ro/rofi-emoji/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi-emoji/default.nix rename to pkgs/unit/ro/rofi-emoji/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/unit/ro/rofi-file-browser/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi-file-browser/default.nix rename to pkgs/unit/ro/rofi-file-browser/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/unit/ro/rofi-menugen/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi-menugen/default.nix rename to pkgs/unit/ro/rofi-menugen/pkg-fun.nix diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/unit/ro/rofi-mpd/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/rofi-mpd/default.nix rename to pkgs/unit/ro/rofi-mpd/pkg-fun.nix diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/unit/ro/rofi-pass/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/pass/rofi-pass.nix rename to pkgs/unit/ro/rofi-pass/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/unit/ro/rofi-power-menu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi-power-menu/default.nix rename to pkgs/unit/ro/rofi-power-menu/pkg-fun.nix diff --git a/pkgs/applications/audio/rofi-pulse-select/default.nix b/pkgs/unit/ro/rofi-pulse-select/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/rofi-pulse-select/default.nix rename to pkgs/unit/ro/rofi-pulse-select/pkg-fun.nix diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/unit/ro/rofi-systemd/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/rofi-systemd/default.nix rename to pkgs/unit/ro/rofi-systemd/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch b/pkgs/unit/ro/rofi-top/0001-Patch-plugindir-to-output.patch similarity index 100% rename from pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch rename to pkgs/unit/ro/rofi-top/0001-Patch-plugindir-to-output.patch diff --git a/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch b/pkgs/unit/ro/rofi-top/0002-Patch-add-cairo.patch similarity index 100% rename from pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch rename to pkgs/unit/ro/rofi-top/0002-Patch-add-cairo.patch diff --git a/pkgs/applications/misc/rofi-top/default.nix b/pkgs/unit/ro/rofi-top/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi-top/default.nix rename to pkgs/unit/ro/rofi-top/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/unit/ro/rofi-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi/default.nix rename to pkgs/unit/ro/rofi-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/networking/rofi-vpn/default.nix b/pkgs/unit/ro/rofi-vpn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/rofi-vpn/default.nix rename to pkgs/unit/ro/rofi-vpn/pkg-fun.nix diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/unit/ro/rofi-wayland-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rofi/wayland.nix rename to pkgs/unit/ro/rofi-wayland-unwrapped/pkg-fun.nix diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/unit/ro/rojo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rojo/default.nix rename to pkgs/unit/ro/rojo/pkg-fun.nix diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/unit/ro/rolespec/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/rolespec/default.nix rename to pkgs/unit/ro/rolespec/pkg-fun.nix diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/unit/ro/ronn/Gemfile similarity index 100% rename from pkgs/development/tools/ronn/Gemfile rename to pkgs/unit/ro/ronn/Gemfile diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/unit/ro/ronn/Gemfile.lock similarity index 100% rename from pkgs/development/tools/ronn/Gemfile.lock rename to pkgs/unit/ro/ronn/Gemfile.lock diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/unit/ro/ronn/gemset.nix similarity index 100% rename from pkgs/development/tools/ronn/gemset.nix rename to pkgs/unit/ro/ronn/gemset.nix diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/unit/ro/ronn/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ronn/default.nix rename to pkgs/unit/ro/ronn/pkg-fun.nix diff --git a/pkgs/development/tools/ronn/test-reproducible-html.nix b/pkgs/unit/ro/ronn/test-reproducible-html.nix similarity index 100% rename from pkgs/development/tools/ronn/test-reproducible-html.nix rename to pkgs/unit/ro/ronn/test-reproducible-html.nix diff --git a/pkgs/development/tools/rust/roogle/default.nix b/pkgs/unit/ro/roogle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/roogle/default.nix rename to pkgs/unit/ro/roogle/pkg-fun.nix diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/unit/ro/roomeqwizard/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/roomeqwizard/default.nix rename to pkgs/unit/ro/roomeqwizard/pkg-fun.nix diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/unit/ro/roon-bridge/pkg-fun.nix similarity index 100% rename from pkgs/servers/roon-bridge/default.nix rename to pkgs/unit/ro/roon-bridge/pkg-fun.nix diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/unit/ro/roon-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/roon-server/default.nix rename to pkgs/unit/ro/roon-server/pkg-fun.nix diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/unit/ro/rootbar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rootbar/default.nix rename to pkgs/unit/ro/rootbar/pkg-fun.nix diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/unit/ro/rootlesskit/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/rootlesskit/default.nix rename to pkgs/unit/ro/rootlesskit/pkg-fun.nix diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/unit/ro/rose-pine-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/rose-pine-gtk/default.nix rename to pkgs/unit/ro/rose-pine-gtk-theme/pkg-fun.nix diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/unit/ro/rose-pine-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/rose-pine/default.nix rename to pkgs/unit/ro/rose-pine-icon-theme/pkg-fun.nix diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/unit/ro/rosie/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rosie/default.nix rename to pkgs/unit/ro/rosie/pkg-fun.nix diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/unit/ro/roslyn/deps.nix similarity index 100% rename from pkgs/development/compilers/roslyn/deps.nix rename to pkgs/unit/ro/roslyn/deps.nix diff --git a/pkgs/development/compilers/roslyn/extended-deps.nix b/pkgs/unit/ro/roslyn/extended-deps.nix similarity index 100% rename from pkgs/development/compilers/roslyn/extended-deps.nix rename to pkgs/unit/ro/roslyn/extended-deps.nix diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/unit/ro/roslyn/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/roslyn/default.nix rename to pkgs/unit/ro/roslyn/pkg-fun.nix diff --git a/pkgs/development/tools/roswell/0001-get-image-from-environment.patch b/pkgs/unit/ro/roswell/0001-get-image-from-environment.patch similarity index 100% rename from pkgs/development/tools/roswell/0001-get-image-from-environment.patch rename to pkgs/unit/ro/roswell/0001-get-image-from-environment.patch diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/unit/ro/roswell/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/roswell/default.nix rename to pkgs/unit/ro/roswell/pkg-fun.nix diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/unit/ro/rotate-backups/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/rotate-backups/default.nix rename to pkgs/unit/ro/rotate-backups/pkg-fun.nix diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/unit/ro/rote/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rote/default.nix rename to pkgs/unit/ro/rote/pkg-fun.nix diff --git a/pkgs/applications/graphics/round/default.nix b/pkgs/unit/ro/round/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/round/default.nix rename to pkgs/unit/ro/round/pkg-fun.nix diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/pkgs/unit/ro/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch similarity index 100% rename from pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch rename to pkgs/unit/ro/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/unit/ro/roundcube/pkg-fun.nix similarity index 100% rename from pkgs/servers/roundcube/default.nix rename to pkgs/unit/ro/roundcube/pkg-fun.nix diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/unit/ro/rounded-mgenplus/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/rounded-mgenplus/default.nix rename to pkgs/unit/ro/rounded-mgenplus/pkg-fun.nix diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/unit/ro/roundup/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/roundup/default.nix rename to pkgs/unit/ro/roundup/pkg-fun.nix diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/unit/ro/route159/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/route159/default.nix rename to pkgs/unit/ro/route159/pkg-fun.nix diff --git a/pkgs/tools/security/routersploit/default.nix b/pkgs/unit/ro/routersploit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/routersploit/default.nix rename to pkgs/unit/ro/routersploit/pkg-fun.nix diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/unit/ro/routino/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/routino/default.nix rename to pkgs/unit/ro/routino/pkg-fun.nix diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/unit/ro/rover/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rover/default.nix rename to pkgs/unit/ro/rover/pkg-fun.nix diff --git a/pkgs/development/tools/rover/schema/etag.id b/pkgs/unit/ro/rover/schema/etag.id similarity index 100% rename from pkgs/development/tools/rover/schema/etag.id rename to pkgs/unit/ro/rover/schema/etag.id diff --git a/pkgs/development/tools/rover/schema/schema.graphql b/pkgs/unit/ro/rover/schema/schema.graphql similarity index 100% rename from pkgs/development/tools/rover/schema/schema.graphql rename to pkgs/unit/ro/rover/schema/schema.graphql diff --git a/pkgs/development/tools/rover/update.sh b/pkgs/unit/ro/rover/update.sh similarity index 100% rename from pkgs/development/tools/rover/update.sh rename to pkgs/unit/ro/rover/update.sh diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/unit/ro/rowhammer-test/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/rowhammer-test/default.nix rename to pkgs/unit/ro/rowhammer-test/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/unit/ro/roxctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/roxctl/default.nix rename to pkgs/unit/ro/roxctl/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/unit/ro/roxterm/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/roxterm/default.nix rename to pkgs/unit/ro/roxterm/pkg-fun.nix diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/unit/rp/rpPPPoE/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rp-pppoe/default.nix rename to pkgs/unit/rp/rpPPPoE/pkg-fun.nix diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/unit/rp/rpcbind/pkg-fun.nix similarity index 100% rename from pkgs/servers/rpcbind/default.nix rename to pkgs/unit/rp/rpcbind/pkg-fun.nix diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/unit/rp/rpcbind/sunrpc.patch similarity index 100% rename from pkgs/servers/rpcbind/sunrpc.patch rename to pkgs/unit/rp/rpcbind/sunrpc.patch diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/unit/rp/rpcsvc-proto/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rpcsvc-proto/default.nix rename to pkgs/unit/rp/rpcsvc-proto/pkg-fun.nix diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/unit/rp/rpg-cli/pkg-fun.nix similarity index 100% rename from pkgs/games/rpg-cli/default.nix rename to pkgs/unit/rp/rpg-cli/pkg-fun.nix diff --git a/pkgs/development/misc/rpiboot/default.nix b/pkgs/unit/rp/rpiboot/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/rpiboot/default.nix rename to pkgs/unit/rp/rpiboot/pkg-fun.nix diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/unit/rp/rpiplay/pkg-fun.nix similarity index 100% rename from pkgs/servers/rpiplay/default.nix rename to pkgs/unit/rp/rpiplay/pkg-fun.nix diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/unit/rp/rpl/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rpl/default.nix rename to pkgs/unit/rp/rpl/pkg-fun.nix diff --git a/pkgs/tools/text/rpl/remove-argparse-manpage.diff b/pkgs/unit/rp/rpl/remove-argparse-manpage.diff similarity index 100% rename from pkgs/tools/text/rpl/remove-argparse-manpage.diff rename to pkgs/unit/rp/rpl/remove-argparse-manpage.diff diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/unit/rp/rpm2targz/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/rpm2targz/default.nix rename to pkgs/unit/rp/rpm2targz/pkg-fun.nix diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/unit/rp/rpmextract/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/rpmextract/default.nix rename to pkgs/unit/rp/rpmextract/pkg-fun.nix diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/unit/rp/rpmextract/rpmextract.sh similarity index 100% rename from pkgs/tools/archivers/rpmextract/rpmextract.sh rename to pkgs/unit/rp/rpmextract/rpmextract.sh diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/unit/rq/rq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rq/default.nix rename to pkgs/unit/rq/rq/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/unit/rr/rr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/rr/default.nix rename to pkgs/unit/rr/rr/pkg-fun.nix diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/unit/rr/rrdtool/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rrdtool/default.nix rename to pkgs/unit/rr/rrdtool/pkg-fun.nix diff --git a/pkgs/games/rrootage/default.nix b/pkgs/unit/rr/rrootage/pkg-fun.nix similarity index 100% rename from pkgs/games/rrootage/default.nix rename to pkgs/unit/rr/rrootage/pkg-fun.nix diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/unit/rr/rrsync/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sync/rsync/rrsync.nix rename to pkgs/unit/rr/rrsync/pkg-fun.nix diff --git a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/pkgs/unit/rs/rs-git-fsmonitor/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/rs-git-fsmonitor/default.nix rename to pkgs/unit/rs/rs-git-fsmonitor/pkg-fun.nix diff --git a/pkgs/tools/text/rs/default.nix b/pkgs/unit/rs/rs/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rs/default.nix rename to pkgs/unit/rs/rs/pkg-fun.nix diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/unit/rs/rsass/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/rsass/default.nix rename to pkgs/unit/rs/rsass/pkg-fun.nix diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/unit/rs/rsbep/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/rsbep/default.nix rename to pkgs/unit/rs/rsbep/pkg-fun.nix diff --git a/pkgs/tools/text/rsbkb/default.nix b/pkgs/unit/rs/rsbkb/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rsbkb/default.nix rename to pkgs/unit/rs/rsbkb/pkg-fun.nix diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/unit/rs/rsclock/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rsclock/default.nix rename to pkgs/unit/rs/rsclock/pkg-fun.nix diff --git a/pkgs/applications/radio/rscw/default.nix b/pkgs/unit/rs/rscw/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/rscw/default.nix rename to pkgs/unit/rs/rscw/pkg-fun.nix diff --git a/pkgs/tools/admin/rset/paths.patch b/pkgs/unit/rs/rset/paths.patch similarity index 100% rename from pkgs/tools/admin/rset/paths.patch rename to pkgs/unit/rs/rset/paths.patch diff --git a/pkgs/tools/admin/rset/default.nix b/pkgs/unit/rs/rset/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/rset/default.nix rename to pkgs/unit/rs/rset/pkg-fun.nix diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/unit/rs/rshijack/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rshijack/default.nix rename to pkgs/unit/rs/rshijack/pkg-fun.nix diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/unit/rs/rslint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rslint/default.nix rename to pkgs/unit/rs/rslint/pkg-fun.nix diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/unit/rs/rsnapshot/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/rsnapshot/default.nix rename to pkgs/unit/rs/rsnapshot/pkg-fun.nix diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/unit/rs/rspamd/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/rspamd/default.nix rename to pkgs/unit/rs/rspamd/pkg-fun.nix diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/unit/rs/rss-bridge-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rss-bridge-cli/default.nix rename to pkgs/unit/rs/rss-bridge-cli/pkg-fun.nix diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/unit/rs/rss-bridge/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/rss-bridge/default.nix rename to pkgs/unit/rs/rss-bridge/pkg-fun.nix diff --git a/pkgs/misc/screensavers/rss-glx/cstddef.patch b/pkgs/unit/rs/rss-glx/cstddef.patch similarity index 100% rename from pkgs/misc/screensavers/rss-glx/cstddef.patch rename to pkgs/unit/rs/rss-glx/cstddef.patch diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/unit/rs/rss-glx/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/rss-glx/default.nix rename to pkgs/unit/rs/rss-glx/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/unit/rs/rsstail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/rsstail/default.nix rename to pkgs/unit/rs/rsstail/pkg-fun.nix diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/unit/rs/rst2html5/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rst2html5/default.nix rename to pkgs/unit/rs/rst2html5/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/unit/rt/rt-tests/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/rt-tests/default.nix rename to pkgs/unit/rt/rt-tests/pkg-fun.nix diff --git a/pkgs/servers/rt/dont-check-users_groups.patch b/pkgs/unit/rt/rt/dont-check-users_groups.patch similarity index 100% rename from pkgs/servers/rt/dont-check-users_groups.patch rename to pkgs/unit/rt/rt/dont-check-users_groups.patch diff --git a/pkgs/servers/rt/override-generated.patch b/pkgs/unit/rt/rt/override-generated.patch similarity index 100% rename from pkgs/servers/rt/override-generated.patch rename to pkgs/unit/rt/rt/override-generated.patch diff --git a/pkgs/servers/rt/default.nix b/pkgs/unit/rt/rt/pkg-fun.nix similarity index 100% rename from pkgs/servers/rt/default.nix rename to pkgs/unit/rt/rt/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/unit/rt/rt5677-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/rt5677/default.nix rename to pkgs/unit/rt/rt5677-firmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/unit/rt/rtkit/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/rtkit/default.nix rename to pkgs/unit/rt/rtkit/pkg-fun.nix diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/unit/rt/rtl-ais/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/rtl-ais/default.nix rename to pkgs/unit/rt/rtl-ais/pkg-fun.nix diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/unit/rt/rtl-sdr/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/rtl-sdr/default.nix rename to pkgs/unit/rt/rtl-sdr/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/unit/rt/rtl8192su-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix rename to pkgs/unit/rt/rtl8192su-firmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/unit/rt/rtl8723bs-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix rename to pkgs/unit/rt/rtl8723bs-firmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/unit/rt/rtl8761b-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix rename to pkgs/unit/rt/rtl8761b-firmware/pkg-fun.nix diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/unit/rt/rtl_433/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/rtl_433/default.nix rename to pkgs/unit/rt/rtl_433/pkg-fun.nix diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/unit/rt/rtmpdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/rtmpdump/default.nix rename to pkgs/unit/rt/rtmpdump/pkg-fun.nix diff --git a/pkgs/tools/networking/rtptools/default.nix b/pkgs/unit/rt/rtptools/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/rtptools/default.nix rename to pkgs/unit/rt/rtptools/pkg-fun.nix diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/unit/rt/rtrlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rtrlib/default.nix rename to pkgs/unit/rt/rtrlib/pkg-fun.nix diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/unit/rt/rtsp-simple-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/rtsp-simple-server/default.nix rename to pkgs/unit/rt/rtsp-simple-server/pkg-fun.nix diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/unit/rt/rtss/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/rtss/default.nix rename to pkgs/unit/rt/rtss/pkg-fun.nix diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/unit/rt/rttr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rttr/default.nix rename to pkgs/unit/rt/rttr/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix b/pkgs/unit/rt/rtw88-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix rename to pkgs/unit/rt/rtw88-firmware/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix b/pkgs/unit/rt/rtw89-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix rename to pkgs/unit/rt/rtw89-firmware/pkg-fun.nix diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/unit/ru/rubber/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/rubber/default.nix rename to pkgs/unit/ru/rubber/pkg-fun.nix diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/unit/ru/rubberband/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rubberband/default.nix rename to pkgs/unit/ru/rubberband/pkg-fun.nix diff --git a/pkgs/data/fonts/rubik/default.nix b/pkgs/unit/ru/rubik/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/rubik/default.nix rename to pkgs/unit/ru/rubik/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/unit/ru/rubiks/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/rubiks/default.nix rename to pkgs/unit/ru/rubiks/pkg-fun.nix diff --git a/pkgs/tools/text/ruby-zoom/Gemfile b/pkgs/unit/ru/ruby-zoom/Gemfile similarity index 100% rename from pkgs/tools/text/ruby-zoom/Gemfile rename to pkgs/unit/ru/ruby-zoom/Gemfile diff --git a/pkgs/tools/text/ruby-zoom/Gemfile.lock b/pkgs/unit/ru/ruby-zoom/Gemfile.lock similarity index 100% rename from pkgs/tools/text/ruby-zoom/Gemfile.lock rename to pkgs/unit/ru/ruby-zoom/Gemfile.lock diff --git a/pkgs/tools/text/ruby-zoom/gemset.nix b/pkgs/unit/ru/ruby-zoom/gemset.nix similarity index 100% rename from pkgs/tools/text/ruby-zoom/gemset.nix rename to pkgs/unit/ru/ruby-zoom/gemset.nix diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/unit/ru/ruby-zoom/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ruby-zoom/default.nix rename to pkgs/unit/ru/ruby-zoom/pkg-fun.nix diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/unit/ru/rubyripper/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/rubyripper/default.nix rename to pkgs/unit/ru/rubyripper/pkg-fun.nix diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/unit/ru/rucksack/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rucksack/default.nix rename to pkgs/unit/ru/rucksack/pkg-fun.nix diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/unit/ru/ruff/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ruff/default.nix rename to pkgs/unit/ru/ruff/pkg-fun.nix diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/unit/ru/ruffle/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/ruffle/default.nix rename to pkgs/unit/ru/ruffle/pkg-fun.nix diff --git a/pkgs/development/tools/rufo/Gemfile b/pkgs/unit/ru/rufo/Gemfile similarity index 100% rename from pkgs/development/tools/rufo/Gemfile rename to pkgs/unit/ru/rufo/Gemfile diff --git a/pkgs/development/tools/rufo/Gemfile.lock b/pkgs/unit/ru/rufo/Gemfile.lock similarity index 100% rename from pkgs/development/tools/rufo/Gemfile.lock rename to pkgs/unit/ru/rufo/Gemfile.lock diff --git a/pkgs/development/tools/rufo/gemset.nix b/pkgs/unit/ru/rufo/gemset.nix similarity index 100% rename from pkgs/development/tools/rufo/gemset.nix rename to pkgs/unit/ru/rufo/gemset.nix diff --git a/pkgs/development/tools/rufo/default.nix b/pkgs/unit/ru/rufo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rufo/default.nix rename to pkgs/unit/ru/rufo/pkg-fun.nix diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/unit/ru/ruler/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ruler/default.nix rename to pkgs/unit/ru/ruler/pkg-fun.nix diff --git a/pkgs/games/npush/run.nix b/pkgs/unit/ru/run-npush/pkg-fun.nix similarity index 100% rename from pkgs/games/npush/run.nix rename to pkgs/unit/ru/run-npush/pkg-fun.nix diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/unit/ru/run-scaled/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/run-scaled/default.nix rename to pkgs/unit/ru/run-scaled/pkg-fun.nix diff --git a/pkgs/development/tools/run/default.nix b/pkgs/unit/ru/run/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/run/default.nix rename to pkgs/unit/ru/run/pkg-fun.nix diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/unit/ru/runc/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/runc/default.nix rename to pkgs/unit/ru/runc/pkg-fun.nix diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/unit/ru/rund/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rund/default.nix rename to pkgs/unit/ru/rund/pkg-fun.nix diff --git a/pkgs/games/runelite/default.nix b/pkgs/unit/ru/runelite/pkg-fun.nix similarity index 100% rename from pkgs/games/runelite/default.nix rename to pkgs/unit/ru/runelite/pkg-fun.nix diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/unit/ru/runescape/pkg-fun.nix similarity index 100% rename from pkgs/games/runescape-launcher/default.nix rename to pkgs/unit/ru/runescape/pkg-fun.nix diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/unit/ru/runiq/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/runiq/default.nix rename to pkgs/unit/ru/runiq/pkg-fun.nix diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/pkgs/unit/ru/runit/fix-ar-ranlib.patch similarity index 100% rename from pkgs/tools/system/runit/fix-ar-ranlib.patch rename to pkgs/unit/ru/runit/fix-ar-ranlib.patch diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/unit/ru/runit/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/runit/default.nix rename to pkgs/unit/ru/runit/pkg-fun.nix diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/unit/ru/runitor/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/runitor/default.nix rename to pkgs/unit/ru/runitor/pkg-fun.nix diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/unit/ru/runningx/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/runningx/default.nix rename to pkgs/unit/ru/runningx/pkg-fun.nix diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/unit/ru/runzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/runzip/default.nix rename to pkgs/unit/ru/runzip/pkg-fun.nix diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/unit/ru/rure/Cargo.lock similarity index 100% rename from pkgs/development/libraries/rure/Cargo.lock rename to pkgs/unit/ru/rure/Cargo.lock diff --git a/pkgs/development/libraries/rure/pin.json b/pkgs/unit/ru/rure/pin.json similarity index 100% rename from pkgs/development/libraries/rure/pin.json rename to pkgs/unit/ru/rure/pin.json diff --git a/pkgs/development/libraries/rure/default.nix b/pkgs/unit/ru/rure/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rure/default.nix rename to pkgs/unit/ru/rure/pkg-fun.nix diff --git a/pkgs/development/libraries/rure/update.sh b/pkgs/unit/ru/rure/update.sh similarity index 100% rename from pkgs/development/libraries/rure/update.sh rename to pkgs/unit/ru/rure/update.sh diff --git a/pkgs/shells/rush/default.nix b/pkgs/unit/ru/rush/pkg-fun.nix similarity index 100% rename from pkgs/shells/rush/default.nix rename to pkgs/unit/ru/rush/pkg-fun.nix diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/unit/ru/rust-analyzer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/rust-analyzer/wrapper.nix rename to pkgs/unit/ru/rust-analyzer/pkg-fun.nix diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/unit/ru/rust-audit-info/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/rust-audit-info/default.nix rename to pkgs/unit/ru/rust-audit-info/pkg-fun.nix diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/unit/ru/rust-bindgen-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/bindgen/unwrapped.nix rename to pkgs/unit/ru/rust-bindgen-unwrapped/pkg-fun.nix diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/unit/ru/rust-bindgen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/bindgen/default.nix rename to pkgs/unit/ru/rust-bindgen/pkg-fun.nix diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/unit/ru/rust-bindgen/wrapper.sh similarity index 100% rename from pkgs/development/tools/rust/bindgen/wrapper.sh rename to pkgs/unit/ru/rust-bindgen/wrapper.sh diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/unit/ru/rust-code-analysis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust-code-analysis/default.nix rename to pkgs/unit/ru/rust-code-analysis/pkg-fun.nix diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/unit/ru/rust-petname/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/rust-petname/default.nix rename to pkgs/unit/ru/rust-petname/pkg-fun.nix diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/unit/ru/rust-script/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/rust-script/default.nix rename to pkgs/unit/ru/rust-script/pkg-fun.nix diff --git a/pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch b/pkgs/unit/ru/rustc-demangle/add-Cargo.lock.patch similarity index 100% rename from pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch rename to pkgs/unit/ru/rustc-demangle/add-Cargo.lock.patch diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/unit/ru/rustc-demangle/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/rustc-demangle/default.nix rename to pkgs/unit/ru/rustc-demangle/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/rustdesk/cargo.patch b/pkgs/unit/ru/rustdesk/cargo.patch similarity index 100% rename from pkgs/applications/networking/remote/rustdesk/cargo.patch rename to pkgs/unit/ru/rustdesk/cargo.patch diff --git a/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff b/pkgs/unit/ru/rustdesk/fix-for-rust-1.65.diff similarity index 100% rename from pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff rename to pkgs/unit/ru/rustdesk/fix-for-rust-1.65.diff diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/unit/ru/rustdesk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/rustdesk/default.nix rename to pkgs/unit/ru/rustdesk/pkg-fun.nix diff --git a/pkgs/development/tools/rust/rusty-man/default.nix b/pkgs/unit/ru/rusty-man/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/rusty-man/default.nix rename to pkgs/unit/ru/rusty-man/pkg-fun.nix diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/unit/ru/rusty-psn/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/rusty-psn/default.nix rename to pkgs/unit/ru/rusty-psn/pkg-fun.nix diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/unit/ru/rustypaste/pkg-fun.nix similarity index 100% rename from pkgs/servers/rustypaste/default.nix rename to pkgs/unit/ru/rustypaste/pkg-fun.nix diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/unit/ru/ruwudu/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ruwudu/default.nix rename to pkgs/unit/ru/ruwudu/pkg-fun.nix diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/unit/rw/rw/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/rw/default.nix rename to pkgs/unit/rw/rw/pkg-fun.nix diff --git a/pkgs/tools/system/rwc/default.nix b/pkgs/unit/rw/rwc/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/rwc/default.nix rename to pkgs/unit/rw/rwc/pkg-fun.nix diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/unit/rx/rx/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/rx/default.nix rename to pkgs/unit/rx/rx/pkg-fun.nix diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/unit/rx/rxp/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/rxp/default.nix rename to pkgs/unit/rx/rxp/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch b/pkgs/unit/rx/rxvt-unicode-unwrapped/patches/256-color-resources.patch similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch rename to pkgs/unit/rx/rxvt-unicode-unwrapped/patches/256-color-resources.patch diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch b/pkgs/unit/rx/rxvt-unicode-unwrapped/patches/9.06-font-width.patch similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch rename to pkgs/unit/rx/rxvt-unicode-unwrapped/patches/9.06-font-width.patch diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch b/pkgs/unit/rx/rxvt-unicode-unwrapped/patches/makefile-phony.patch similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch rename to pkgs/unit/rx/rxvt-unicode-unwrapped/patches/makefile-phony.patch diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/unit/rx/rxvt-unicode-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/default.nix rename to pkgs/unit/rx/rxvt-unicode-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/unit/rx/rxvt-unicode/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix rename to pkgs/unit/rx/rxvt-unicode/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/unit/rx/rxvt/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/rxvt/default.nix rename to pkgs/unit/rx/rxvt/pkg-fun.nix diff --git a/pkgs/applications/emulators/ryujinx/appdir.patch b/pkgs/unit/ry/ryujinx/appdir.patch similarity index 100% rename from pkgs/applications/emulators/ryujinx/appdir.patch rename to pkgs/unit/ry/ryujinx/appdir.patch diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/unit/ry/ryujinx/deps.nix similarity index 100% rename from pkgs/applications/emulators/ryujinx/deps.nix rename to pkgs/unit/ry/ryujinx/deps.nix diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/unit/ry/ryujinx/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/ryujinx/default.nix rename to pkgs/unit/ry/ryujinx/pkg-fun.nix diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/unit/ry/ryujinx/updater.sh similarity index 100% rename from pkgs/applications/emulators/ryujinx/updater.sh rename to pkgs/unit/ry/ryujinx/updater.sh diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/unit/ry/ryzenadj/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ryzenadj/default.nix rename to pkgs/unit/ry/ryzenadj/pkg-fun.nix diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/unit/rz/rzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/rzip/default.nix rename to pkgs/unit/rz/rzip/pkg-fun.nix diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/unit/s-/s-tar/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/s-tar/default.nix rename to pkgs/unit/s-/s-tar/pkg-fun.nix diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/unit/s-/s-tui/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/s-tui/default.nix rename to pkgs/unit/s-/s-tui/pkg-fun.nix diff --git a/pkgs/development/libraries/s2geometry/default.nix b/pkgs/unit/s2/s2geometry/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/s2geometry/default.nix rename to pkgs/unit/s2/s2geometry/pkg-fun.nix diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/unit/s2/s2n-tls/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/s2n-tls/default.nix rename to pkgs/unit/s2/s2n-tls/pkg-fun.nix diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/unit/s2/s2png/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/s2png/default.nix rename to pkgs/unit/s2/s2png/pkg-fun.nix diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/unit/s3/s3backer/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/s3backer/default.nix rename to pkgs/unit/s3/s3backer/pkg-fun.nix diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/unit/s3/s3bro/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/s3bro/default.nix rename to pkgs/unit/s3/s3bro/pkg-fun.nix diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/unit/s3/s3fs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/s3fs/default.nix rename to pkgs/unit/s3/s3fs/pkg-fun.nix diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/unit/s3/s3ql/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/s3ql/default.nix rename to pkgs/unit/s3/s3ql/pkg-fun.nix diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/unit/s4/s4cmd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/s4cmd/default.nix rename to pkgs/unit/s4/s4cmd/pkg-fun.nix diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/unit/s5/s5cmd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/s5cmd/default.nix rename to pkgs/unit/s5/s5cmd/pkg-fun.nix diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/unit/s9/s9fes/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/s9fes/default.nix rename to pkgs/unit/s9/s9fes/pkg-fun.nix diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/unit/sa/sabnzbd/pkg-fun.nix similarity index 100% rename from pkgs/servers/sabnzbd/default.nix rename to pkgs/unit/sa/sabnzbd/pkg-fun.nix diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/unit/sa/sacad/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sacad/default.nix rename to pkgs/unit/sa/sacad/pkg-fun.nix diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/unit/sa/sacc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/gopher/sacc/default.nix rename to pkgs/unit/sa/sacc/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/unit/sa/sacd/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/sacd/default.nix rename to pkgs/unit/sa/sacd/pkg-fun.nix diff --git a/pkgs/applications/science/physics/sacrifice/compat.patch b/pkgs/unit/sa/sacrifice/compat.patch similarity index 100% rename from pkgs/applications/science/physics/sacrifice/compat.patch rename to pkgs/unit/sa/sacrifice/compat.patch diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/unit/sa/sacrifice/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/sacrifice/default.nix rename to pkgs/unit/sa/sacrifice/pkg-fun.nix diff --git a/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/pkgs/unit/sa/sacrifice/pythia83xx.patch similarity index 100% rename from pkgs/applications/science/physics/sacrifice/pythia83xx.patch rename to pkgs/unit/sa/sacrifice/pythia83xx.patch diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/unit/sa/sad/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sad/default.nix rename to pkgs/unit/sa/sad/pkg-fun.nix diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/unit/sa/safe-rm/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/safe-rm/default.nix rename to pkgs/unit/sa/safe-rm/pkg-fun.nix diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/unit/sa/safe/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/safe/default.nix rename to pkgs/unit/sa/safe/pkg-fun.nix diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/unit/sa/safecopy/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/safecopy/default.nix rename to pkgs/unit/sa/safecopy/pkg-fun.nix diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/unit/sa/safeeyes/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/safeeyes/default.nix rename to pkgs/unit/sa/safeeyes/pkg-fun.nix diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/unit/sa/safefile/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/safefile/default.nix rename to pkgs/unit/sa/safefile/pkg-fun.nix diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/unit/sa/sage/env-locations.nix similarity index 100% rename from pkgs/applications/science/math/sage/env-locations.nix rename to pkgs/unit/sa/sage/env-locations.nix diff --git a/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch b/pkgs/unit/sa/sage/patches/configurationpy-error-verbose.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch rename to pkgs/unit/sa/sage/patches/configurationpy-error-verbose.patch diff --git a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch b/pkgs/unit/sa/sage/patches/disable-slow-glpk-test.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch rename to pkgs/unit/sa/sage/patches/disable-slow-glpk-test.patch diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/unit/sa/sage/patches/do-not-test-find-library.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch rename to pkgs/unit/sa/sage/patches/do-not-test-find-library.patch diff --git a/pkgs/applications/science/math/sage/patches/fix-ecl-race.patch b/pkgs/unit/sa/sage/patches/fix-ecl-race.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/fix-ecl-race.patch rename to pkgs/unit/sa/sage/patches/fix-ecl-race.patch diff --git a/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch b/pkgs/unit/sa/sage/patches/ipywidgets-on_submit-deprecationwarning.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch rename to pkgs/unit/sa/sage/patches/ipywidgets-on_submit-deprecationwarning.patch diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/unit/sa/sage/patches/linbox-1.7-upgrade.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch rename to pkgs/unit/sa/sage/patches/linbox-1.7-upgrade.patch diff --git a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch b/pkgs/unit/sa/sage/patches/pari-2.15.1-upgrade-rebased.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch rename to pkgs/unit/sa/sage/patches/pari-2.15.1-upgrade-rebased.patch diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/unit/sa/sage/patches/sphinx-docbuild-subprocesses.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch rename to pkgs/unit/sa/sage/patches/sphinx-docbuild-subprocesses.patch diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/unit/sa/sage/patches/sympow-cache.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/sympow-cache.patch rename to pkgs/unit/sa/sage/patches/sympow-cache.patch diff --git a/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch b/pkgs/unit/sa/sage/patches/tachyon-renamed-focallength.patch similarity index 100% rename from pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch rename to pkgs/unit/sa/sage/patches/tachyon-renamed-focallength.patch diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/unit/sa/sage/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/sage/default.nix rename to pkgs/unit/sa/sage/pkg-fun.nix diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/unit/sa/sage/python-modules/sage-docbuild.nix similarity index 100% rename from pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix rename to pkgs/unit/sa/sage/python-modules/sage-docbuild.nix diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/unit/sa/sage/python-modules/sage-setup.nix similarity index 100% rename from pkgs/applications/science/math/sage/python-modules/sage-setup.nix rename to pkgs/unit/sa/sage/python-modules/sage-setup.nix diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/unit/sa/sage/sage-env.nix similarity index 100% rename from pkgs/applications/science/math/sage/sage-env.nix rename to pkgs/unit/sa/sage/sage-env.nix diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/unit/sa/sage/sage-src.nix similarity index 100% rename from pkgs/applications/science/math/sage/sage-src.nix rename to pkgs/unit/sa/sage/sage-src.nix diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/unit/sa/sage/sage-tests.nix similarity index 100% rename from pkgs/applications/science/math/sage/sage-tests.nix rename to pkgs/unit/sa/sage/sage-tests.nix diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/unit/sa/sage/sage-with-env.nix similarity index 100% rename from pkgs/applications/science/math/sage/sage-with-env.nix rename to pkgs/unit/sa/sage/sage-with-env.nix diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/unit/sa/sage/sage.nix similarity index 100% rename from pkgs/applications/science/math/sage/sage.nix rename to pkgs/unit/sa/sage/sage.nix diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/unit/sa/sage/sagedoc.nix similarity index 100% rename from pkgs/applications/science/math/sage/sagedoc.nix rename to pkgs/unit/sa/sage/sagedoc.nix diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/unit/sa/sage/sagelib.nix similarity index 100% rename from pkgs/applications/science/math/sage/sagelib.nix rename to pkgs/unit/sa/sage/sagelib.nix diff --git a/pkgs/applications/science/math/sage/threejs-sage.nix b/pkgs/unit/sa/sage/threejs-sage.nix similarity index 100% rename from pkgs/applications/science/math/sage/threejs-sage.nix rename to pkgs/unit/sa/sage/threejs-sage.nix diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/unit/sa/sagetex/pkg-fun.nix similarity index 100% rename from pkgs/misc/sagetex/default.nix rename to pkgs/unit/sa/sagetex/pkg-fun.nix diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/unit/sa/sagittarius-scheme/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/sagittarius-scheme/default.nix rename to pkgs/unit/sa/sagittarius-scheme/pkg-fun.nix diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/unit/sa/sagoin/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sagoin/default.nix rename to pkgs/unit/sa/sagoin/pkg-fun.nix diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/unit/sa/sahel-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sahel-fonts/default.nix rename to pkgs/unit/sa/sahel-fonts/pkg-fun.nix diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/unit/sa/sailsd/pkg-fun.nix similarity index 100% rename from pkgs/misc/sailsd/default.nix rename to pkgs/unit/sa/sailsd/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/unit/sa/sakura/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/sakura/default.nix rename to pkgs/unit/sa/sakura/pkg-fun.nix diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/unit/sa/saldl/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/saldl/default.nix rename to pkgs/unit/sa/saldl/pkg-fun.nix diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/unit/sa/saleae-logic-2/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/saleae-logic-2/default.nix rename to pkgs/unit/sa/saleae-logic-2/pkg-fun.nix diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/unit/sa/saleae-logic/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/saleae-logic/default.nix rename to pkgs/unit/sa/saleae-logic/pkg-fun.nix diff --git a/pkgs/development/tools/misc/saleae-logic/preload.c b/pkgs/unit/sa/saleae-logic/preload.c similarity index 100% rename from pkgs/development/tools/misc/saleae-logic/preload.c rename to pkgs/unit/sa/saleae-logic/preload.c diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/unit/sa/salt/fix-libcrypto-loading.patch similarity index 100% rename from pkgs/tools/admin/salt/fix-libcrypto-loading.patch rename to pkgs/unit/sa/salt/fix-libcrypto-loading.patch diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/unit/sa/salt/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/salt/default.nix rename to pkgs/unit/sa/salt/pkg-fun.nix diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/unit/sa/sam-ba/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sam-ba/default.nix rename to pkgs/unit/sa/sam-ba/pkg-fun.nix diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/unit/sa/sambamba/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/sambamba/default.nix rename to pkgs/unit/sa/sambamba/pkg-fun.nix diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/unit/sa/samblaster/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/samblaster/default.nix rename to pkgs/unit/sa/samblaster/pkg-fun.nix diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/unit/sa/sameboy/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/sameboy/default.nix rename to pkgs/unit/sa/sameboy/pkg-fun.nix diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/unit/sa/samim-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/samim-fonts/default.nix rename to pkgs/unit/sa/samim-fonts/pkg-fun.nix diff --git a/pkgs/tools/security/sammler/default.nix b/pkgs/unit/sa/sammler/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sammler/default.nix rename to pkgs/unit/sa/sammler/pkg-fun.nix diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/unit/sa/sampler/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sampler/default.nix rename to pkgs/unit/sa/sampler/pkg-fun.nix diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/unit/sa/samplicator/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/samplicator/default.nix rename to pkgs/unit/sa/samplicator/pkg-fun.nix diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/unit/sa/sampradaya/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sampradaya/default.nix rename to pkgs/unit/sa/sampradaya/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/unit/sa/samsung-unified-linux-driver_1_00_36/module.nix similarity index 100% rename from pkgs/misc/cups/drivers/samsung/1.00.36/module.nix rename to pkgs/unit/sa/samsung-unified-linux-driver_1_00_36/module.nix diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/unit/sa/samsung-unified-linux-driver_1_00_36/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/samsung/1.00.36/default.nix rename to pkgs/unit/sa/samsung-unified-linux-driver_1_00_36/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/unit/sa/samsung-unified-linux-driver_1_00_37/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/samsung/1.00.37.nix rename to pkgs/unit/sa/samsung-unified-linux-driver_1_00_37/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/unit/sa/samsung-unified-linux-driver_4_01_17/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/samsung/4.01.17.nix rename to pkgs/unit/sa/samsung-unified-linux-driver_4_01_17/pkg-fun.nix diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/unit/sa/samtools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/samtools/default.nix rename to pkgs/unit/sa/samtools/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/unit/sa/samurai/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/samurai/default.nix rename to pkgs/unit/sa/samurai/pkg-fun.nix diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/unit/sa/sanctity/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sanctity/default.nix rename to pkgs/unit/sa/sanctity/pkg-fun.nix diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/unit/sa/sandboxfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/sandboxfs/default.nix rename to pkgs/unit/sa/sandboxfs/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/unit/sa/sane-airscan/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/backends/airscan/default.nix rename to pkgs/unit/sa/sane-airscan/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/drivers.nix b/pkgs/unit/sa/sane-drivers/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/drivers.nix rename to pkgs/unit/sa/sane-drivers/pkg-fun.nix diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/unit/sa/sane-frontends/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/sane/frontends.nix rename to pkgs/unit/sa/sane-frontends/pkg-fun.nix diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/unit/sa/sanjuuni/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/sanjuuni/default.nix rename to pkgs/unit/sa/sanjuuni/pkg-fun.nix diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/unit/sa/sanoid/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/sanoid/default.nix rename to pkgs/unit/sa/sanoid/pkg-fun.nix diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/unit/sa/sarasa-gothic/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sarasa-gothic/default.nix rename to pkgs/unit/sa/sarasa-gothic/pkg-fun.nix diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/unit/sa/sasquatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/sasquatch/default.nix rename to pkgs/unit/sa/sasquatch/pkg-fun.nix diff --git a/pkgs/development/tools/sass/Gemfile b/pkgs/unit/sa/sass/Gemfile similarity index 100% rename from pkgs/development/tools/sass/Gemfile rename to pkgs/unit/sa/sass/Gemfile diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/unit/sa/sass/Gemfile.lock similarity index 100% rename from pkgs/development/tools/sass/Gemfile.lock rename to pkgs/unit/sa/sass/Gemfile.lock diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/unit/sa/sass/gemset.nix similarity index 100% rename from pkgs/development/tools/sass/gemset.nix rename to pkgs/unit/sa/sass/gemset.nix diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/unit/sa/sass/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sass/default.nix rename to pkgs/unit/sa/sass/pkg-fun.nix diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/unit/sa/sassc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sassc/default.nix rename to pkgs/unit/sa/sassc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/unit/sa/sasutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sasutils/default.nix rename to pkgs/unit/sa/sasutils/pkg-fun.nix diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/unit/sa/satysfi/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/satysfi/default.nix rename to pkgs/unit/sa/satysfi/pkg-fun.nix diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/unit/sa/sauce-connect/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sauce-connect/default.nix rename to pkgs/unit/sa/sauce-connect/pkg-fun.nix diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/unit/sa/sauerbraten/pkg-fun.nix similarity index 100% rename from pkgs/games/sauerbraten/default.nix rename to pkgs/unit/sa/sauerbraten/pkg-fun.nix diff --git a/pkgs/tools/misc/savepagenow/default.nix b/pkgs/unit/sa/savepagenow/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/savepagenow/default.nix rename to pkgs/unit/sa/savepagenow/pkg-fun.nix diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/unit/sa/saw-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/saw-tools/default.nix rename to pkgs/unit/sa/saw-tools/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/unit/sa/sawfish/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sawfish/default.nix rename to pkgs/unit/sa/sawfish/pkg-fun.nix diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/unit/sa/sawjap/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/sawjap/default.nix rename to pkgs/unit/sa/sawjap/pkg-fun.nix diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/unit/sb/sbagen/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sbagen/default.nix rename to pkgs/unit/sb/sbagen/pkg-fun.nix diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/unit/sb/sbc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sbc/default.nix rename to pkgs/unit/sb/sbc/pkg-fun.nix diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/unit/sb/sbclBootstrap/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/sbcl/bootstrap.nix rename to pkgs/unit/sb/sbclBootstrap/pkg-fun.nix diff --git a/pkgs/tools/security/sbctl/default.nix b/pkgs/unit/sb/sbctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sbctl/default.nix rename to pkgs/unit/sb/sbctl/pkg-fun.nix diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/unit/sb/sblim-sfcc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sblim-sfcc/default.nix rename to pkgs/unit/sb/sblim-sfcc/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/unit/sb/sbt-extras/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/sbt-extras/default.nix rename to pkgs/unit/sb/sbt-extras/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/unit/sb/sbt-with-scala-native/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/sbt/scala-native.nix rename to pkgs/unit/sb/sbt-with-scala-native/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/unit/sb/sbt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/sbt/default.nix rename to pkgs/unit/sb/sbt/pkg-fun.nix diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/unit/sc/sc-im/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sc-im/default.nix rename to pkgs/unit/sc/sc-im/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/unit/sc/sc2-headless/maps.nix similarity index 100% rename from pkgs/applications/science/machine-learning/sc2-headless/maps.nix rename to pkgs/unit/sc/sc2-headless/maps.nix diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/unit/sc/sc2-headless/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/sc2-headless/default.nix rename to pkgs/unit/sc/sc2-headless/pkg-fun.nix diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/unit/sc/sc68/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sc68/default.nix rename to pkgs/unit/sc/sc68/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/unit/sc/scala-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/default.nix rename to pkgs/unit/sc/scala-cli/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/unit/sc/scala-cli/sources.json similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/sources.json rename to pkgs/unit/sc/scala-cli/sources.json diff --git a/pkgs/development/tools/build-managers/scala-cli/update.nix b/pkgs/unit/sc/scala-cli/update.nix similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/update.nix rename to pkgs/unit/sc/scala-cli/update.nix diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/unit/sc/scala_3/bare.nix similarity index 100% rename from pkgs/development/compilers/scala/bare.nix rename to pkgs/unit/sc/scala_3/bare.nix diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/unit/sc/scala_3/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/scala/default.nix rename to pkgs/unit/sc/scala_3/pkg-fun.nix diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/unit/sc/scalafmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/scalafmt/default.nix rename to pkgs/unit/sc/scalafmt/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/unit/sc/scalapack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/scalapack/default.nix rename to pkgs/unit/sc/scalapack/pkg-fun.nix diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/unit/sc/scaleft/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/scaleft/default.nix rename to pkgs/unit/sc/scaleft/pkg-fun.nix diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/unit/sc/scaleway-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/scaleway-cli/default.nix rename to pkgs/unit/sc/scaleway-cli/pkg-fun.nix diff --git a/pkgs/applications/science/math/scalp/default.nix b/pkgs/unit/sc/scalp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/scalp/default.nix rename to pkgs/unit/sc/scalp/pkg-fun.nix diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/unit/sc/scanbd/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/scanbd/default.nix rename to pkgs/unit/sc/scanbd/pkg-fun.nix diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/unit/sc/scanmem/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/scanmem/default.nix rename to pkgs/unit/sc/scanmem/pkg-fun.nix diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/unit/sc/scantailor/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/scantailor/default.nix rename to pkgs/unit/sc/scantailor/pkg-fun.nix diff --git a/pkgs/tools/games/scarab/deps.nix b/pkgs/unit/sc/scarab/deps.nix similarity index 100% rename from pkgs/tools/games/scarab/deps.nix rename to pkgs/unit/sc/scarab/deps.nix diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/unit/sc/scarab/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/scarab/default.nix rename to pkgs/unit/sc/scarab/pkg-fun.nix diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/unit/sc/scc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/scc/default.nix rename to pkgs/unit/sc/scc/pkg-fun.nix diff --git a/pkgs/tools/misc/scdl/default.nix b/pkgs/unit/sc/scdl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/scdl/default.nix rename to pkgs/unit/sc/scdl/pkg-fun.nix diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/unit/sc/scdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/scdoc/default.nix rename to pkgs/unit/sc/scdoc/pkg-fun.nix diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/unit/sc/scenebuilder/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/scenebuilder/default.nix rename to pkgs/unit/sc/scenebuilder/pkg-fun.nix diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/unit/sc/schedtool/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/schedtool/default.nix rename to pkgs/unit/sc/schedtool/pkg-fun.nix diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/unit/sc/schema2ldif/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/schema2ldif/default.nix rename to pkgs/unit/sc/schema2ldif/pkg-fun.nix diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/unit/sc/schemaspy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/schemaspy/default.nix rename to pkgs/unit/sc/schemaspy/pkg-fun.nix diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/unit/sc/scheme-bytestructures/pkg-fun.nix similarity index 100% rename from pkgs/development/scheme-modules/scheme-bytestructures/default.nix rename to pkgs/unit/sc/scheme-bytestructures/pkg-fun.nix diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/unit/sc/scheme-manpages/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/scheme-manpages/default.nix rename to pkgs/unit/sc/scheme-manpages/pkg-fun.nix diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/unit/sc/scheme48/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/scheme48/default.nix rename to pkgs/unit/sc/scheme48/pkg-fun.nix diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/unit/sc/schismtracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/schismtracker/default.nix rename to pkgs/unit/sc/schismtracker/pkg-fun.nix diff --git a/pkgs/tools/security/schleuder/cli/Gemfile b/pkgs/unit/sc/schleuder-cli/Gemfile similarity index 100% rename from pkgs/tools/security/schleuder/cli/Gemfile rename to pkgs/unit/sc/schleuder-cli/Gemfile diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/unit/sc/schleuder-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/security/schleuder/cli/Gemfile.lock rename to pkgs/unit/sc/schleuder-cli/Gemfile.lock diff --git a/pkgs/tools/security/schleuder/cli/gemset.nix b/pkgs/unit/sc/schleuder-cli/gemset.nix similarity index 100% rename from pkgs/tools/security/schleuder/cli/gemset.nix rename to pkgs/unit/sc/schleuder-cli/gemset.nix diff --git a/pkgs/tools/security/schleuder/cli/default.nix b/pkgs/unit/sc/schleuder-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/schleuder/cli/default.nix rename to pkgs/unit/sc/schleuder-cli/pkg-fun.nix diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/unit/sc/schleuder/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/schleuder/default.nix rename to pkgs/unit/sc/schleuder/pkg-fun.nix diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/unit/sc/scientifica/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/scientifica/default.nix rename to pkgs/unit/sc/scientifica/pkg-fun.nix diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/unit/sc/scilab-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/scilab-bin/default.nix rename to pkgs/unit/sc/scilab-bin/pkg-fun.nix diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/unit/sc/scilla/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/scilla/default.nix rename to pkgs/unit/sc/scilla/pkg-fun.nix diff --git a/pkgs/misc/scimark/default.nix b/pkgs/unit/sc/scimark/pkg-fun.nix similarity index 100% rename from pkgs/misc/scimark/default.nix rename to pkgs/unit/sc/scimark/pkg-fun.nix diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/unit/sc/scite/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/scite/default.nix rename to pkgs/unit/sc/scite/pkg-fun.nix diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/unit/sc/scli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/scli/default.nix rename to pkgs/unit/sc/scli/pkg-fun.nix diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/unit/sc/scmccid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/scmccid/default.nix rename to pkgs/unit/sc/scmccid/pkg-fun.nix diff --git a/pkgs/applications/version-management/scmpuff/default.nix b/pkgs/unit/sc/scmpuff/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/scmpuff/default.nix rename to pkgs/unit/sc/scmpuff/pkg-fun.nix diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/unit/sc/scope-lite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/scope-lite/default.nix rename to pkgs/unit/sc/scope-lite/pkg-fun.nix diff --git a/pkgs/games/scorched3d/file-existence.patch b/pkgs/unit/sc/scorched3d/file-existence.patch similarity index 100% rename from pkgs/games/scorched3d/file-existence.patch rename to pkgs/unit/sc/scorched3d/file-existence.patch diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/unit/sc/scorched3d/pkg-fun.nix similarity index 100% rename from pkgs/games/scorched3d/default.nix rename to pkgs/unit/sc/scorched3d/pkg-fun.nix diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/unit/sc/scorecard/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/scorecard/default.nix rename to pkgs/unit/sc/scorecard/pkg-fun.nix diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/unit/sc/scotch/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/scotch/default.nix rename to pkgs/unit/sc/scotch/pkg-fun.nix diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/unit/sc/scowl/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/scowl/default.nix rename to pkgs/unit/sc/scowl/pkg-fun.nix diff --git a/pkgs/shells/scponly/default.nix b/pkgs/unit/sc/scponly/pkg-fun.nix similarity index 100% rename from pkgs/shells/scponly/default.nix rename to pkgs/unit/sc/scponly/pkg-fun.nix diff --git a/pkgs/shells/scponly/scponly-fix-make.patch b/pkgs/unit/sc/scponly/scponly-fix-make.patch similarity index 100% rename from pkgs/shells/scponly/scponly-fix-make.patch rename to pkgs/unit/sc/scponly/scponly-fix-make.patch diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/unit/sc/scraper/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/scraper/default.nix rename to pkgs/unit/sc/scraper/pkg-fun.nix diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/unit/sc/scream/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/scream/default.nix rename to pkgs/unit/sc/scream/pkg-fun.nix diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/unit/sc/screen-message/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/screen-message/default.nix rename to pkgs/unit/sc/screen-message/pkg-fun.nix diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/unit/sc/screenfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/screenfetch/default.nix rename to pkgs/unit/sc/screenfetch/pkg-fun.nix diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/unit/sc/screenkey/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/screenkey/default.nix rename to pkgs/unit/sc/screenkey/pkg-fun.nix diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/unit/sc/scriptaculous/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/scriptaculous/default.nix rename to pkgs/unit/sc/scriptaculous/pkg-fun.nix diff --git a/pkgs/games/scrolls/default.nix b/pkgs/unit/sc/scrolls/pkg-fun.nix similarity index 100% rename from pkgs/games/scrolls/default.nix rename to pkgs/unit/sc/scrolls/pkg-fun.nix diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/unit/sc/scrot/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/scrot/default.nix rename to pkgs/unit/sc/scrot/pkg-fun.nix diff --git a/pkgs/tools/misc/scrub/default.nix b/pkgs/unit/sc/scrub/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/scrub/default.nix rename to pkgs/unit/sc/scrub/pkg-fun.nix diff --git a/pkgs/development/compilers/scryer-prolog/cargo.patch b/pkgs/unit/sc/scryer-prolog/cargo.patch similarity index 100% rename from pkgs/development/compilers/scryer-prolog/cargo.patch rename to pkgs/unit/sc/scryer-prolog/cargo.patch diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/unit/sc/scryer-prolog/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/scryer-prolog/default.nix rename to pkgs/unit/sc/scryer-prolog/pkg-fun.nix diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/unit/sc/scrypt/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/scrypt/default.nix rename to pkgs/unit/sc/scrypt/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/unit/sc/scs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/scs/default.nix rename to pkgs/unit/sc/scs/pkg-fun.nix diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/unit/sc/scsh/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/scsh/default.nix rename to pkgs/unit/sc/scsh/pkg-fun.nix diff --git a/pkgs/development/tools/scss-lint/Gemfile b/pkgs/unit/sc/scss-lint/Gemfile similarity index 100% rename from pkgs/development/tools/scss-lint/Gemfile rename to pkgs/unit/sc/scss-lint/Gemfile diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/unit/sc/scss-lint/Gemfile.lock similarity index 100% rename from pkgs/development/tools/scss-lint/Gemfile.lock rename to pkgs/unit/sc/scss-lint/Gemfile.lock diff --git a/pkgs/development/tools/scss-lint/gemset.nix b/pkgs/unit/sc/scss-lint/gemset.nix similarity index 100% rename from pkgs/development/tools/scss-lint/gemset.nix rename to pkgs/unit/sc/scss-lint/gemset.nix diff --git a/pkgs/development/tools/scss-lint/default.nix b/pkgs/unit/sc/scss-lint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/scss-lint/default.nix rename to pkgs/unit/sc/scss-lint/pkg-fun.nix diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/unit/sc/sct/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/sct/default.nix rename to pkgs/unit/sc/sct/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/unit/sc/scudcloud/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/scudcloud/default.nix rename to pkgs/unit/sc/scudcloud/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/unit/sd/SDL2_gfx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL2_gfx/default.nix rename to pkgs/unit/sd/SDL2_gfx/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/unit/sd/SDL2_net/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL2_net/default.nix rename to pkgs/unit/sd/SDL2_net/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/unit/sd/SDL2_ttf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL2_ttf/default.nix rename to pkgs/unit/sd/SDL2_ttf/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/pkgs/unit/sd/SDL2_ttf_2_0_15/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL2_ttf/2.0.15.nix rename to pkgs/unit/sd/SDL2_ttf_2_0_15/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_Pango/fixes.patch b/pkgs/unit/sd/SDL_Pango/fixes.patch similarity index 100% rename from pkgs/development/libraries/SDL_Pango/fixes.patch rename to pkgs/unit/sd/SDL_Pango/fixes.patch diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/unit/sd/SDL_Pango/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_Pango/default.nix rename to pkgs/unit/sd/SDL_Pango/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_audiolib/default.nix b/pkgs/unit/sd/SDL_audiolib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_audiolib/default.nix rename to pkgs/unit/sd/SDL_audiolib/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/unit/sd/SDL_gfx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_gfx/default.nix rename to pkgs/unit/sd/SDL_gfx/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/unit/sd/SDL_gpu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_gpu/default.nix rename to pkgs/unit/sd/SDL_gpu/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/unit/sd/SDL_image/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_image/default.nix rename to pkgs/unit/sd/SDL_image/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/unit/sd/SDL_mixer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_mixer/default.nix rename to pkgs/unit/sd/SDL_mixer/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/unit/sd/SDL_net/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_net/default.nix rename to pkgs/unit/sd/SDL_net/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/unit/sd/SDL_sixel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_sixel/default.nix rename to pkgs/unit/sd/SDL_sixel/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/unit/sd/SDL_sound/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_sound/default.nix rename to pkgs/unit/sd/SDL_sound/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/unit/sd/SDL_stretch/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_stretch/default.nix rename to pkgs/unit/sd/SDL_stretch/pkg-fun.nix diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/unit/sd/SDL_ttf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/SDL_ttf/default.nix rename to pkgs/unit/sd/SDL_ttf/pkg-fun.nix diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/unit/sd/sd-local/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sd-local/default.nix rename to pkgs/unit/sd/sd-local/pkg-fun.nix diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/unit/sd/sd-mux-ctrl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sd-mux-ctrl/default.nix rename to pkgs/unit/sd/sd-mux-ctrl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/unit/sd/sd-switch/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sd-switch/default.nix rename to pkgs/unit/sd/sd-switch/pkg-fun.nix diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/unit/sd/sdat2img/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/sdat2img/default.nix rename to pkgs/unit/sd/sdat2img/pkg-fun.nix diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/unit/sd/sdate/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sdate/default.nix rename to pkgs/unit/sd/sdate/pkg-fun.nix diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/unit/sd/sdbus-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sdbus-cpp/default.nix rename to pkgs/unit/sd/sdbus-cpp/pkg-fun.nix diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/unit/sd/sdcv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sdcv/default.nix rename to pkgs/unit/sd/sdcv/pkg-fun.nix diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/unit/sd/sdl-jstest/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sdl-jstest/default.nix rename to pkgs/unit/sd/sdl-jstest/pkg-fun.nix diff --git a/pkgs/tools/security/sdlookup/default.nix b/pkgs/unit/sd/sdlookup/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sdlookup/default.nix rename to pkgs/unit/sd/sdlookup/pkg-fun.nix diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/unit/sd/sdlpop/pkg-fun.nix similarity index 100% rename from pkgs/games/sdlpop/default.nix rename to pkgs/unit/sd/sdlpop/pkg-fun.nix diff --git a/pkgs/games/sdlpop/prince.sh b/pkgs/unit/sd/sdlpop/prince.sh similarity index 100% rename from pkgs/games/sdlpop/prince.sh rename to pkgs/unit/sd/sdlpop/prince.sh diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/unit/sd/sdparm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sdparm/default.nix rename to pkgs/unit/sd/sdparm/pkg-fun.nix diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/unit/sd/sdrplay/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/sdrplay/default.nix rename to pkgs/unit/sd/sdrplay/pkg-fun.nix diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/unit/se/seabios/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/seabios/default.nix rename to pkgs/unit/se/seabios/pkg-fun.nix diff --git a/pkgs/servers/seafile-server/libevhtp.nix b/pkgs/unit/se/seafile-server/libevhtp.nix similarity index 100% rename from pkgs/servers/seafile-server/libevhtp.nix rename to pkgs/unit/se/seafile-server/libevhtp.nix diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/unit/se/seafile-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/seafile-server/default.nix rename to pkgs/unit/se/seafile-server/pkg-fun.nix diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/unit/se/seafile-shared/pkg-fun.nix similarity index 100% rename from pkgs/misc/seafile-shared/default.nix rename to pkgs/unit/se/seafile-shared/pkg-fun.nix diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/unit/se/seahub/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/seahub/default.nix rename to pkgs/unit/se/seahub/pkg-fun.nix diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/unit/se/sealcurses/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sealcurses/default.nix rename to pkgs/unit/se/sealcurses/pkg-fun.nix diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/unit/se/searx/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/searx/default.nix rename to pkgs/unit/se/searx/pkg-fun.nix diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/unit/se/seashells/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/seashells/default.nix rename to pkgs/unit/se/seashells/pkg-fun.nix diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/unit/se/seasocks/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/seasocks/default.nix rename to pkgs/unit/se/seasocks/pkg-fun.nix diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/unit/se/seatd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/seatd/default.nix rename to pkgs/unit/se/seatd/pkg-fun.nix diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/unit/se/seaview/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/seaview/default.nix rename to pkgs/unit/se/seaview/pkg-fun.nix diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/unit/se/seaweedfs/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/seaweedfs/default.nix rename to pkgs/unit/se/seaweedfs/pkg-fun.nix diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/unit/se/sec/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/sec/default.nix rename to pkgs/unit/se/sec/pkg-fun.nix diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/unit/se/seccure/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/seccure/default.nix rename to pkgs/unit/se/seccure/pkg-fun.nix diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/unit/se/secp256k1/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/secp256k1/default.nix rename to pkgs/unit/se/secp256k1/pkg-fun.nix diff --git a/pkgs/tools/security/secrets-extractor/default.nix b/pkgs/unit/se/secrets-extractor/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/secrets-extractor/default.nix rename to pkgs/unit/se/secrets-extractor/pkg-fun.nix diff --git a/pkgs/tools/security/secretscanner/default.nix b/pkgs/unit/se/secretscanner/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/secretscanner/default.nix rename to pkgs/unit/se/secretscanner/pkg-fun.nix diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/unit/se/sedutil/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sedutil/default.nix rename to pkgs/unit/se/sedutil/pkg-fun.nix diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/unit/se/seehecht/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/seehecht/default.nix rename to pkgs/unit/se/seehecht/pkg-fun.nix diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/unit/se/seexpr/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/seexpr/default.nix rename to pkgs/unit/se/seexpr/pkg-fun.nix diff --git a/pkgs/development/tools/misc/segger-jlink/default.nix b/pkgs/unit/se/segger-jlink/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/segger-jlink/default.nix rename to pkgs/unit/se/segger-jlink/pkg-fun.nix diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/unit/se/segger-ozone/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/segger-ozone/default.nix rename to pkgs/unit/se/segger-ozone/pkg-fun.nix diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/unit/se/selendroid/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/selenium/selendroid/default.nix rename to pkgs/unit/se/selendroid/pkg-fun.nix diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/unit/se/selene/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/selene/default.nix rename to pkgs/unit/se/selene/pkg-fun.nix diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/unit/se/selenium-server-standalone/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/selenium/server/default.nix rename to pkgs/unit/se/selenium-server-standalone/pkg-fun.nix diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/unit/se/selfoss/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/selfoss/default.nix rename to pkgs/unit/se/selfoss/pkg-fun.nix diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/unit/se/selinux-python/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/selinux-python/default.nix rename to pkgs/unit/se/selinux-python/pkg-fun.nix diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/unit/se/selinux-sandbox/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/selinux-sandbox/default.nix rename to pkgs/unit/se/selinux-sandbox/pkg-fun.nix diff --git a/pkgs/tools/misc/semiphemeral/default.nix b/pkgs/unit/se/semiphemeral/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/semiphemeral/default.nix rename to pkgs/unit/se/semiphemeral/pkg-fun.nix diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/unit/se/semodule-utils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/semodule-utils/default.nix rename to pkgs/unit/se/semodule-utils/pkg-fun.nix diff --git a/pkgs/development/libraries/semver-cpp/default.nix b/pkgs/unit/se/semver-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/semver-cpp/default.nix rename to pkgs/unit/se/semver-cpp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/unit/se/semver-tool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/semver-tool/default.nix rename to pkgs/unit/se/semver-tool/pkg-fun.nix diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/unit/se/semver/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/semver/default.nix rename to pkgs/unit/se/semver/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/unit/se/senpai/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/senpai/default.nix rename to pkgs/unit/se/senpai/pkg-fun.nix diff --git a/pkgs/servers/monitoring/sensu/Gemfile b/pkgs/unit/se/sensu/Gemfile similarity index 100% rename from pkgs/servers/monitoring/sensu/Gemfile rename to pkgs/unit/se/sensu/Gemfile diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/unit/se/sensu/Gemfile.lock similarity index 100% rename from pkgs/servers/monitoring/sensu/Gemfile.lock rename to pkgs/unit/se/sensu/Gemfile.lock diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/unit/se/sensu/gemset.nix similarity index 100% rename from pkgs/servers/monitoring/sensu/gemset.nix rename to pkgs/unit/se/sensu/gemset.nix diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/unit/se/sensu/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/sensu/default.nix rename to pkgs/unit/se/sensu/pkg-fun.nix diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/unit/se/sent/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sent/default.nix rename to pkgs/unit/se/sent/pkg-fun.nix diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/unit/se/sentencepiece/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sentencepiece/default.nix rename to pkgs/unit/se/sentencepiece/pkg-fun.nix diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/unit/se/sentry-native/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sentry-native/default.nix rename to pkgs/unit/se/sentry-native/pkg-fun.nix diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/unit/se/senv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/senv/default.nix rename to pkgs/unit/se/senv/pkg-fun.nix diff --git a/pkgs/applications/audio/seq24/mutex_no_nameclash.patch b/pkgs/unit/se/seq24/mutex_no_nameclash.patch similarity index 100% rename from pkgs/applications/audio/seq24/mutex_no_nameclash.patch rename to pkgs/unit/se/seq24/mutex_no_nameclash.patch diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/unit/se/seq24/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/seq24/default.nix rename to pkgs/unit/se/seq24/pkg-fun.nix diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/unit/se/seqkit/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/seqkit/default.nix rename to pkgs/unit/se/seqkit/pkg-fun.nix diff --git a/pkgs/applications/science/biology/seqtk/default.nix b/pkgs/unit/se/seqtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/seqtk/default.nix rename to pkgs/unit/se/seqtk/pkg-fun.nix diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/unit/se/sequeler/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sequeler/default.nix rename to pkgs/unit/se/sequeler/pkg-fun.nix diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/unit/se/sequelpro/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sequelpro/default.nix rename to pkgs/unit/se/sequelpro/pkg-fun.nix diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/unit/se/sequoia-chameleon-gnupg/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sequoia-chameleon-gnupg/default.nix rename to pkgs/unit/se/sequoia-chameleon-gnupg/pkg-fun.nix diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/unit/se/ser2net/pkg-fun.nix similarity index 100% rename from pkgs/servers/ser2net/default.nix rename to pkgs/unit/se/ser2net/pkg-fun.nix diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/unit/se/serd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/serd/default.nix rename to pkgs/unit/se/serd/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/unit/se/seren/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/seren/default.nix rename to pkgs/unit/se/seren/pkg-fun.nix diff --git a/pkgs/servers/serf/default.nix b/pkgs/unit/se/serfdom/pkg-fun.nix similarity index 100% rename from pkgs/servers/serf/default.nix rename to pkgs/unit/se/serfdom/pkg-fun.nix diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/unit/se/serialdv/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/serialdv/default.nix rename to pkgs/unit/se/serialdv/pkg-fun.nix diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/unit/se/serpent/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/serpent/default.nix rename to pkgs/unit/se/serpent/pkg-fun.nix diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/unit/se/service-wrapper/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/service-wrapper/default.nix rename to pkgs/unit/se/service-wrapper/pkg-fun.nix diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/unit/se/service-wrapper/service-wrapper.sh similarity index 100% rename from pkgs/os-specific/linux/service-wrapper/service-wrapper.sh rename to pkgs/unit/se/service-wrapper/service-wrapper.sh diff --git a/pkgs/servers/serviio/default.nix b/pkgs/unit/se/serviio/pkg-fun.nix similarity index 100% rename from pkgs/servers/serviio/default.nix rename to pkgs/unit/se/serviio/pkg-fun.nix diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/unit/se/seshat/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/seshat/default.nix rename to pkgs/unit/se/seshat/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/unit/se/session-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/session-desktop/default.nix rename to pkgs/unit/se/session-desktop/pkg-fun.nix diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/unit/se/setbfree/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/setbfree/default.nix rename to pkgs/unit/se/setbfree/pkg-fun.nix diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/unit/se/setools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/setools/default.nix rename to pkgs/unit/se/setools/pkg-fun.nix diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/unit/se/setroot/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/setroot/default.nix rename to pkgs/unit/se/setroot/pkg-fun.nix diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/unit/se/setserial/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/setserial/default.nix rename to pkgs/unit/se/setserial/pkg-fun.nix diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/unit/se/setupSystemdUnits/pkg-fun.nix similarity index 100% rename from pkgs/build-support/setup-systemd-units.nix rename to pkgs/unit/se/setupSystemdUnits/pkg-fun.nix diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/unit/se/seturgent/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/seturgent/default.nix rename to pkgs/unit/se/seturgent/pkg-fun.nix diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/unit/se/setzer/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/setzer/default.nix rename to pkgs/unit/se/setzer/pkg-fun.nix diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/unit/se/sewer/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/sewer/default.nix rename to pkgs/unit/se/sewer/pkg-fun.nix diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/unit/se/seyren/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/seyren/default.nix rename to pkgs/unit/se/seyren/pkg-fun.nix diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/unit/sf/sfeed/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sfeed/default.nix rename to pkgs/unit/sf/sfeed/pkg-fun.nix diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/unit/sf/sfizz/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sfizz/default.nix rename to pkgs/unit/sf/sfizz/pkg-fun.nix diff --git a/pkgs/applications/file-managers/sfm/default.nix b/pkgs/unit/sf/sfm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/sfm/default.nix rename to pkgs/unit/sf/sfm/pkg-fun.nix diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/unit/sf/sfrotz/pkg-fun.nix similarity index 100% rename from pkgs/games/sfrotz/default.nix rename to pkgs/unit/sf/sfrotz/pkg-fun.nix diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/unit/sf/sfsexp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sfsexp/default.nix rename to pkgs/unit/sf/sfsexp/pkg-fun.nix diff --git a/pkgs/tools/filesystems/sftpman/default.nix b/pkgs/unit/sf/sftpman/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/sftpman/default.nix rename to pkgs/unit/sf/sftpman/pkg-fun.nix diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/unit/sf/sfxr/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sfxr/default.nix rename to pkgs/unit/sf/sfxr/pkg-fun.nix diff --git a/pkgs/tools/misc/sfz/default.nix b/pkgs/unit/sf/sfz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sfz/default.nix rename to pkgs/unit/sf/sfz/pkg-fun.nix diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/unit/sg/sg3_utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/sg3_utils/default.nix rename to pkgs/unit/sg/sg3_utils/pkg-fun.nix diff --git a/pkgs/tools/security/sget/default.nix b/pkgs/unit/sg/sget/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sget/default.nix rename to pkgs/unit/sg/sget/pkg-fun.nix diff --git a/pkgs/development/libraries/sgp4/default.nix b/pkgs/unit/sg/sgp4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sgp4/default.nix rename to pkgs/unit/sg/sgp4/pkg-fun.nix diff --git a/pkgs/tools/text/sgrep/default.nix b/pkgs/unit/sg/sgrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sgrep/default.nix rename to pkgs/unit/sg/sgrep/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/pkgs/unit/sg/sgx-azure-dcap-client/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix rename to pkgs/unit/sg/sgx-azure-dcap-client/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix b/pkgs/unit/sg/sgx-azure-dcap-client/test-suite.nix similarity index 100% rename from pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix rename to pkgs/unit/sg/sgx-azure-dcap-client/test-suite.nix diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/unit/sg/sgx-psw/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sgx/psw/default.nix rename to pkgs/unit/sg/sgx-psw/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sgx/ssl/intel-sgx-ssl-pr-111.patch b/pkgs/unit/sg/sgx-ssl/intel-sgx-ssl-pr-111.patch similarity index 100% rename from pkgs/os-specific/linux/sgx/ssl/intel-sgx-ssl-pr-111.patch rename to pkgs/unit/sg/sgx-ssl/intel-sgx-ssl-pr-111.patch diff --git a/pkgs/os-specific/linux/sgx/ssl/default.nix b/pkgs/unit/sg/sgx-ssl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sgx/ssl/default.nix rename to pkgs/unit/sg/sgx-ssl/pkg-fun.nix diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/unit/sh/sha1collisiondetection/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sha1collisiondetection/default.nix rename to pkgs/unit/sh/sha1collisiondetection/pkg-fun.nix diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/unit/sh/shaarli/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/shaarli/default.nix rename to pkgs/unit/sh/shaarli/pkg-fun.nix diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/unit/sh/shab/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/shab/default.nix rename to pkgs/unit/sh/shab/pkg-fun.nix diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/unit/sh/shabnam-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/shabnam-fonts/default.nix rename to pkgs/unit/sh/shabnam-fonts/pkg-fun.nix diff --git a/pkgs/development/tools/shadered/install_path_fix.patch b/pkgs/unit/sh/shadered/install_path_fix.patch similarity index 100% rename from pkgs/development/tools/shadered/install_path_fix.patch rename to pkgs/unit/sh/shadered/install_path_fix.patch diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/unit/sh/shadered/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/shadered/default.nix rename to pkgs/unit/sh/shadered/pkg-fun.nix diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/unit/sh/shades-of-gray-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/shades-of-gray/default.nix rename to pkgs/unit/sh/shades-of-gray-theme/pkg-fun.nix diff --git a/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/pkgs/unit/sh/shadow/fix-install-with-tcb.patch similarity index 100% rename from pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch rename to pkgs/unit/sh/shadow/fix-install-with-tcb.patch diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/unit/sh/shadow/keep-path.patch similarity index 100% rename from pkgs/os-specific/linux/shadow/keep-path.patch rename to pkgs/unit/sh/shadow/keep-path.patch diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/unit/sh/shadow/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/shadow/default.nix rename to pkgs/unit/sh/shadow/pkg-fun.nix diff --git a/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch b/pkgs/unit/sh/shadow/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch rename to pkgs/unit/sh/shadow/respect-xml-catalog-files-var.patch diff --git a/pkgs/os-specific/linux/shadow/runtime-shell.patch b/pkgs/unit/sh/shadow/runtime-shell.patch similarity index 100% rename from pkgs/os-specific/linux/shadow/runtime-shell.patch rename to pkgs/unit/sh/shadow/runtime-shell.patch diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/unit/sh/shadowfox/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/shadowfox/default.nix rename to pkgs/unit/sh/shadowfox/pkg-fun.nix diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/unit/sh/shadowsocks-libev/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/shadowsocks-libev/default.nix rename to pkgs/unit/sh/shadowsocks-libev/pkg-fun.nix diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/unit/sh/shadowsocks-v2ray-plugin/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix rename to pkgs/unit/sh/shadowsocks-v2ray-plugin/pkg-fun.nix diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/unit/sh/shairport-sync/pkg-fun.nix similarity index 100% rename from pkgs/servers/shairport-sync/default.nix rename to pkgs/unit/sh/shairport-sync/pkg-fun.nix diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/unit/sh/shallot/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/shallot/default.nix rename to pkgs/unit/sh/shallot/pkg-fun.nix diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/unit/sh/shapelib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/shapelib/default.nix rename to pkgs/unit/sh/shapelib/pkg-fun.nix diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/unit/sh/shared-mime-info/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/shared-mime-info/default.nix rename to pkgs/unit/sh/shared-mime-info/pkg-fun.nix diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/unit/sh/shared_desktop_ontologies/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/shared-desktop-ontologies/default.nix rename to pkgs/unit/sh/shared_desktop_ontologies/pkg-fun.nix diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/unit/sh/sharedown/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sharedown/default.nix rename to pkgs/unit/sh/sharedown/pkg-fun.nix diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/unit/sh/sharedown/update.sh similarity index 100% rename from pkgs/tools/misc/sharedown/update.sh rename to pkgs/unit/sh/sharedown/update.sh diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/unit/sh/sharedown/yarn.lock similarity index 100% rename from pkgs/tools/misc/sharedown/yarn.lock rename to pkgs/unit/sh/sharedown/yarn.lock diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/unit/sh/sharedown/yarndeps.nix similarity index 100% rename from pkgs/tools/misc/sharedown/yarndeps.nix rename to pkgs/unit/sh/sharedown/yarndeps.nix diff --git a/pkgs/development/libraries/sharness/default.nix b/pkgs/unit/sh/sharness/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sharness/default.nix rename to pkgs/unit/sh/sharness/pkg-fun.nix diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/unit/sh/sharutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/sharutils/default.nix rename to pkgs/unit/sh/sharutils/pkg-fun.nix diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/unit/sh/shattered-pixel-dungeon/pkg-fun.nix similarity index 100% rename from pkgs/games/shattered-pixel-dungeon/default.nix rename to pkgs/unit/sh/shattered-pixel-dungeon/pkg-fun.nix diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/unit/sh/shc/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/shc/default.nix rename to pkgs/unit/sh/shc/pkg-fun.nix diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/unit/sh/shell-hist/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/shell-hist/default.nix rename to pkgs/unit/sh/shell-hist/pkg-fun.nix diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/unit/sh/shelldap/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/shelldap/default.nix rename to pkgs/unit/sh/shelldap/pkg-fun.nix diff --git a/pkgs/development/tools/shellharden/default.nix b/pkgs/unit/sh/shellharden/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/shellharden/default.nix rename to pkgs/unit/sh/shellharden/pkg-fun.nix diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/unit/sh/shellhub-agent/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/shellhub-agent/default.nix rename to pkgs/unit/sh/shellhub-agent/pkg-fun.nix diff --git a/pkgs/tools/security/shellnoob/default.nix b/pkgs/unit/sh/shellnoob/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/shellnoob/default.nix rename to pkgs/unit/sh/shellnoob/pkg-fun.nix diff --git a/pkgs/tools/misc/shellspec/default.nix b/pkgs/unit/sh/shellspec/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/shellspec/default.nix rename to pkgs/unit/sh/shellspec/pkg-fun.nix diff --git a/pkgs/tools/security/shellz/default.nix b/pkgs/unit/sh/shellz/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/shellz/default.nix rename to pkgs/unit/sh/shellz/pkg-fun.nix diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/unit/sh/shen-sbcl/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/shen-sbcl/default.nix rename to pkgs/unit/sh/shen-sbcl/pkg-fun.nix diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/unit/sh/shen-sources/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/shen-sources/default.nix rename to pkgs/unit/sh/shen-sources/pkg-fun.nix diff --git a/pkgs/tools/security/sherlock/default.nix b/pkgs/unit/sh/sherlock/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sherlock/default.nix rename to pkgs/unit/sh/sherlock/pkg-fun.nix diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/unit/sh/sherpa/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/sherpa/default.nix rename to pkgs/unit/sh/sherpa/pkg-fun.nix diff --git a/pkgs/applications/file-managers/shfm/default.nix b/pkgs/unit/sh/shfm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/shfm/default.nix rename to pkgs/unit/sh/shfm/pkg-fun.nix diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/unit/sh/shfmt/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/shfmt/default.nix rename to pkgs/unit/sh/shfmt/pkg-fun.nix diff --git a/pkgs/tools/security/shhgit/default.nix b/pkgs/unit/sh/shhgit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/shhgit/default.nix rename to pkgs/unit/sh/shhgit/pkg-fun.nix diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/unit/sh/shhmsg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/shhmsg/default.nix rename to pkgs/unit/sh/shhmsg/pkg-fun.nix diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/unit/sh/shhopt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/shhopt/default.nix rename to pkgs/unit/sh/shhopt/pkg-fun.nix diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/unit/sh/shibboleth-sp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/shibboleth-sp/default.nix rename to pkgs/unit/sh/shibboleth-sp/pkg-fun.nix diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/unit/sh/shim-unsigned/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/shim/default.nix rename to pkgs/unit/sh/shim-unsigned/pkg-fun.nix diff --git a/pkgs/development/libraries/shine/default.nix b/pkgs/unit/sh/shine/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/shine/default.nix rename to pkgs/unit/sh/shine/pkg-fun.nix diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/unit/sh/shiori/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/shiori/default.nix rename to pkgs/unit/sh/shiori/pkg-fun.nix diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/unit/sh/shipyard/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/shipyard/default.nix rename to pkgs/unit/sh/shipyard/pkg-fun.nix diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/unit/sh/shisho/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/shisho/default.nix rename to pkgs/unit/sh/shisho/pkg-fun.nix diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/unit/sh/shmig/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/shmig/default.nix rename to pkgs/unit/sh/shmig/pkg-fun.nix diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/unit/sh/shncpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/shncpd/default.nix rename to pkgs/unit/sh/shncpd/pkg-fun.nix diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/unit/sh/shntool/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/shntool/default.nix rename to pkgs/unit/sh/shntool/pkg-fun.nix diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/unit/sh/shocco/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/shocco/default.nix rename to pkgs/unit/sh/shocco/pkg-fun.nix diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/unit/sh/shod/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/shod/default.nix rename to pkgs/unit/sh/shod/pkg-fun.nix diff --git a/pkgs/development/web/shopify-cli/Gemfile b/pkgs/unit/sh/shopify-cli/Gemfile similarity index 100% rename from pkgs/development/web/shopify-cli/Gemfile rename to pkgs/unit/sh/shopify-cli/Gemfile diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/unit/sh/shopify-cli/Gemfile.lock similarity index 100% rename from pkgs/development/web/shopify-cli/Gemfile.lock rename to pkgs/unit/sh/shopify-cli/Gemfile.lock diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/unit/sh/shopify-cli/gemset.nix similarity index 100% rename from pkgs/development/web/shopify-cli/gemset.nix rename to pkgs/unit/sh/shopify-cli/gemset.nix diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/unit/sh/shopify-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/web/shopify-cli/default.nix rename to pkgs/unit/sh/shopify-cli/pkg-fun.nix diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/unit/sh/shopify-themekit/pkg-fun.nix similarity index 100% rename from pkgs/development/web/shopify-themekit/default.nix rename to pkgs/unit/sh/shopify-themekit/pkg-fun.nix diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/unit/sh/shorewall/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/shorewall/default.nix rename to pkgs/unit/sh/shorewall/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/unit/sh/shortcat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/shortcat/default.nix rename to pkgs/unit/sh/shortcat/pkg-fun.nix diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/unit/sh/shortwave/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/shortwave/default.nix rename to pkgs/unit/sh/shortwave/pkg-fun.nix diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/unit/sh/shotgun/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/shotgun/default.nix rename to pkgs/unit/sh/shotgun/pkg-fun.nix diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/unit/sh/shotman/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/shotman/default.nix rename to pkgs/unit/sh/shotman/pkg-fun.nix diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/unit/sh/shotwell/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/shotwell/default.nix rename to pkgs/unit/sh/shotwell/pkg-fun.nix diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/unit/sh/showmethekey/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/showmethekey/default.nix rename to pkgs/unit/sh/showmethekey/pkg-fun.nix diff --git a/pkgs/servers/http/showoff/Gemfile b/pkgs/unit/sh/showoff/Gemfile similarity index 100% rename from pkgs/servers/http/showoff/Gemfile rename to pkgs/unit/sh/showoff/Gemfile diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/pkgs/unit/sh/showoff/Gemfile.lock similarity index 100% rename from pkgs/servers/http/showoff/Gemfile.lock rename to pkgs/unit/sh/showoff/Gemfile.lock diff --git a/pkgs/servers/http/showoff/gemset.nix b/pkgs/unit/sh/showoff/gemset.nix similarity index 100% rename from pkgs/servers/http/showoff/gemset.nix rename to pkgs/unit/sh/showoff/gemset.nix diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/unit/sh/showoff/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/showoff/default.nix rename to pkgs/unit/sh/showoff/pkg-fun.nix diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/unit/sh/shrikhand/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/shrikhand/default.nix rename to pkgs/unit/sh/shrikhand/pkg-fun.nix diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/unit/sh/shticker-book-unwritten/pkg-fun.nix similarity index 100% rename from pkgs/games/shticker-book-unwritten/default.nix rename to pkgs/unit/sh/shticker-book-unwritten/pkg-fun.nix diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/unit/sh/shticker-book-unwritten/unwrapped.nix similarity index 100% rename from pkgs/games/shticker-book-unwritten/unwrapped.nix rename to pkgs/unit/sh/shticker-book-unwritten/unwrapped.nix diff --git a/pkgs/applications/science/physics/shtns/default.nix b/pkgs/unit/sh/shtns/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/shtns/default.nix rename to pkgs/unit/sh/shtns/pkg-fun.nix diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/unit/sh/shunit2/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/shunit2/default.nix rename to pkgs/unit/sh/shunit2/pkg-fun.nix diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/unit/sh/shutter/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/shutter/default.nix rename to pkgs/unit/sh/shutter/pkg-fun.nix diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/unit/si/sic-image-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/sic-image-cli/default.nix rename to pkgs/unit/si/sic-image-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/unit/si/sic/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/sic/default.nix rename to pkgs/unit/si/sic/pkg-fun.nix diff --git a/pkgs/servers/sickbeard/patches/override-python-version-check.patch b/pkgs/unit/si/sickgear/patches/override-python-version-check.patch similarity index 100% rename from pkgs/servers/sickbeard/patches/override-python-version-check.patch rename to pkgs/unit/si/sickgear/patches/override-python-version-check.patch diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/unit/si/sickgear/pkg-fun.nix similarity index 100% rename from pkgs/servers/sickbeard/sickgear.nix rename to pkgs/unit/si/sickgear/pkg-fun.nix diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/unit/si/sidequest/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sidequest/default.nix rename to pkgs/unit/si/sidequest/pkg-fun.nix diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/unit/si/sidplayfp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sidplayfp/default.nix rename to pkgs/unit/si/sidplayfp/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/unit/si/siduck76-st/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/siduck76-st.nix rename to pkgs/unit/si/siduck76-st/pkg-fun.nix diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/unit/si/siege/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/siege/default.nix rename to pkgs/unit/si/siege/pkg-fun.nix diff --git a/pkgs/games/sienna/default.nix b/pkgs/unit/si/sienna/pkg-fun.nix similarity index 100% rename from pkgs/games/sienna/default.nix rename to pkgs/unit/si/sienna/pkg-fun.nix diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/unit/si/sierra-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/sierra/default.nix rename to pkgs/unit/si/sierra-gtk-theme/pkg-fun.nix diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/unit/si/sieve-connect/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sieve-connect/default.nix rename to pkgs/unit/si/sieve-connect/pkg-fun.nix diff --git a/pkgs/tools/text/sift/deps.nix b/pkgs/unit/si/sift/deps.nix similarity index 100% rename from pkgs/tools/text/sift/deps.nix rename to pkgs/unit/si/sift/deps.nix diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/unit/si/sift/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sift/default.nix rename to pkgs/unit/si/sift/pkg-fun.nix diff --git a/pkgs/applications/misc/sigal/copytree-permissions.patch b/pkgs/unit/si/sigal/copytree-permissions.patch similarity index 100% rename from pkgs/applications/misc/sigal/copytree-permissions.patch rename to pkgs/unit/si/sigal/copytree-permissions.patch diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/unit/si/sigal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sigal/default.nix rename to pkgs/unit/si/sigal/pkg-fun.nix diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/unit/si/sigi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sigi/default.nix rename to pkgs/unit/si/sigi/pkg-fun.nix diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/unit/si/siglo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/siglo/default.nix rename to pkgs/unit/si/siglo/pkg-fun.nix diff --git a/pkgs/applications/misc/siglo/siglo-no-user-install.patch b/pkgs/unit/si/siglo/siglo-no-user-install.patch similarity index 100% rename from pkgs/applications/misc/siglo/siglo-no-user-install.patch rename to pkgs/unit/si/siglo/siglo-no-user-install.patch diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/unit/si/sigma-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sigma-cli/default.nix rename to pkgs/unit/si/sigma-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/unit/si/signal-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/signal-cli/default.nix rename to pkgs/unit/si/signal-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/unit/si/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch rename to pkgs/unit/si/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/unit/si/signald/0002-buildconfig-local-deps-fixes.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch rename to pkgs/unit/si/signald/0002-buildconfig-local-deps-fixes.patch diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/unit/si/signald/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/signald/default.nix rename to pkgs/unit/si/signald/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/unit/si/signaldctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/signaldctl/default.nix rename to pkgs/unit/si/signaldctl/pkg-fun.nix diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/unit/si/signify/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/signify/default.nix rename to pkgs/unit/si/signify/pkg-fun.nix diff --git a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/pkgs/unit/si/signing-party/gpgwrap_makefile.patch similarity index 100% rename from pkgs/tools/security/signing-party/gpgwrap_makefile.patch rename to pkgs/unit/si/signing-party/gpgwrap_makefile.patch diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/unit/si/signing-party/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/signing-party/default.nix rename to pkgs/unit/si/signing-party/pkg-fun.nix diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/unit/si/signumone-ks/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/signumone-ks/default.nix rename to pkgs/unit/si/signumone-ks/pkg-fun.nix diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/unit/si/signwriting/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/signwriting/default.nix rename to pkgs/unit/si/signwriting/pkg-fun.nix diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/unit/si/sigrok-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sigrok-cli/default.nix rename to pkgs/unit/si/sigrok-cli/pkg-fun.nix diff --git a/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix b/pkgs/unit/si/sigrok-firmware-fx2lafw/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix rename to pkgs/unit/si/sigrok-firmware-fx2lafw/pkg-fun.nix diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/unit/si/sigslot/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sigslot/default.nix rename to pkgs/unit/si/sigslot/pkg-fun.nix diff --git a/pkgs/applications/radio/sigutils/default.nix b/pkgs/unit/si/sigutils/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/sigutils/default.nix rename to pkgs/unit/si/sigutils/pkg-fun.nix diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/unit/si/siji/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/siji/default.nix rename to pkgs/unit/si/siji/pkg-fun.nix diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/unit/si/sil-abyssinica/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sil-abyssinica/default.nix rename to pkgs/unit/si/sil-abyssinica/pkg-fun.nix diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/unit/si/sil-padauk/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sil-padauk/default.nix rename to pkgs/unit/si/sil-padauk/pkg-fun.nix diff --git a/pkgs/games/sil-q/default.nix b/pkgs/unit/si/sil-q/pkg-fun.nix similarity index 100% rename from pkgs/games/sil-q/default.nix rename to pkgs/unit/si/sil-q/pkg-fun.nix diff --git a/pkgs/games/sil/default.nix b/pkgs/unit/si/sil/pkg-fun.nix similarity index 100% rename from pkgs/games/sil/default.nix rename to pkgs/unit/si/sil/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/unit/si/silc_client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/silc-client/default.nix rename to pkgs/unit/si/silc_client/pkg-fun.nix diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/unit/si/silc_server/pkg-fun.nix similarity index 100% rename from pkgs/servers/silc-server/default.nix rename to pkgs/unit/si/silc_server/pkg-fun.nix diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/unit/si/silenthound/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/silenthound/default.nix rename to pkgs/unit/si/silenthound/pkg-fun.nix diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/unit/si/silice/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/silice/default.nix rename to pkgs/unit/si/silice/pkg-fun.nix diff --git a/pkgs/tools/text/silver-searcher/bash-completion.patch b/pkgs/unit/si/silver-searcher/bash-completion.patch similarity index 100% rename from pkgs/tools/text/silver-searcher/bash-completion.patch rename to pkgs/unit/si/silver-searcher/bash-completion.patch diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/unit/si/silver-searcher/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/silver-searcher/default.nix rename to pkgs/unit/si/silver-searcher/pkg-fun.nix diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/unit/si/simdjson/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/simdjson/default.nix rename to pkgs/unit/si/simdjson/pkg-fun.nix diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/unit/si/simg2img/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/simg2img/default.nix rename to pkgs/unit/si/simg2img/pkg-fun.nix diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/unit/si/simgear/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/simgear/default.nix rename to pkgs/unit/si/simgear/pkg-fun.nix diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/unit/si/simgrid/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/simgrid/default.nix rename to pkgs/unit/si/simgrid/pkg-fun.nix diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/unit/si/simh/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/simh/default.nix rename to pkgs/unit/si/simh/pkg-fun.nix diff --git a/pkgs/data/icons/simp1e-cursors/default.nix b/pkgs/unit/si/simp1e-cursors/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/simp1e-cursors/default.nix rename to pkgs/unit/si/simp1e-cursors/pkg-fun.nix diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/unit/si/simp_le/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/simp_le/default.nix rename to pkgs/unit/si/simp_le/pkg-fun.nix diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/unit/si/simple-dlna-browser/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/simple-dlna-browser/default.nix rename to pkgs/unit/si/simple-dlna-browser/pkg-fun.nix diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/unit/si/simpleTpmPk11/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/simple-tpm-pk11/default.nix rename to pkgs/unit/si/simpleTpmPk11/pkg-fun.nix diff --git a/pkgs/servers/simplehttp2server/deps.nix b/pkgs/unit/si/simplehttp2server/deps.nix similarity index 100% rename from pkgs/servers/simplehttp2server/deps.nix rename to pkgs/unit/si/simplehttp2server/deps.nix diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/unit/si/simplehttp2server/pkg-fun.nix similarity index 100% rename from pkgs/servers/simplehttp2server/default.nix rename to pkgs/unit/si/simplehttp2server/pkg-fun.nix diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/unit/si/simplenes/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/simplenes/default.nix rename to pkgs/unit/si/simplenes/pkg-fun.nix diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/unit/si/simplenote/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/simplenote/default.nix rename to pkgs/unit/si/simplenote/pkg-fun.nix diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/unit/si/simpleproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/simpleproxy/default.nix rename to pkgs/unit/si/simpleproxy/pkg-fun.nix diff --git a/pkgs/games/simutrans/default.nix b/pkgs/unit/si/simutrans/pkg-fun.nix similarity index 100% rename from pkgs/games/simutrans/default.nix rename to pkgs/unit/si/simutrans/pkg-fun.nix diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/unit/si/sing-box/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sing-box/default.nix rename to pkgs/unit/si/sing-box/pkg-fun.nix diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/unit/si/singular/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/singular/default.nix rename to pkgs/unit/si/singular/pkg-fun.nix diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/unit/si/singularity-tools/pkg-fun.nix similarity index 100% rename from pkgs/build-support/singularity-tools/default.nix rename to pkgs/unit/si/singularity-tools/pkg-fun.nix diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/unit/si/singularity/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/singularity/default.nix rename to pkgs/unit/si/singularity/pkg-fun.nix diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/unit/si/sipcalc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sipcalc/default.nix rename to pkgs/unit/si/sipcalc/pkg-fun.nix diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/unit/si/sipexer/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sipexer/default.nix rename to pkgs/unit/si/sipexer/pkg-fun.nix diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/unit/si/sipp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/sipp/default.nix rename to pkgs/unit/si/sipp/pkg-fun.nix diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/unit/si/siproxd/cheaders.patch similarity index 100% rename from pkgs/applications/networking/siproxd/cheaders.patch rename to pkgs/unit/si/siproxd/cheaders.patch diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/unit/si/siproxd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/siproxd/default.nix rename to pkgs/unit/si/siproxd/pkg-fun.nix diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/unit/si/sipsak/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sipsak/default.nix rename to pkgs/unit/si/sipsak/pkg-fun.nix diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/unit/si/sipwitch/pkg-fun.nix similarity index 100% rename from pkgs/servers/sip/sipwitch/default.nix rename to pkgs/unit/si/sipwitch/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/unit/si/siril/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/siril/default.nix rename to pkgs/unit/si/siril/pkg-fun.nix diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/unit/si/sirula/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/sirula/default.nix rename to pkgs/unit/si/sirula/pkg-fun.nix diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/unit/si/sish/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sish/default.nix rename to pkgs/unit/si/sish/pkg-fun.nix diff --git a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/pkgs/unit/si/sitelen-seli-kiwen/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sitelen-seli-kiwen/default.nix rename to pkgs/unit/si/sitelen-seli-kiwen/pkg-fun.nix diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/pkgs/unit/si/sixpair/hcitool.patch similarity index 100% rename from pkgs/tools/misc/sixpair/hcitool.patch rename to pkgs/unit/si/sixpair/hcitool.patch diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/unit/si/sixpair/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sixpair/default.nix rename to pkgs/unit/si/sixpair/pkg-fun.nix diff --git a/pkgs/development/compilers/sjasmplus/default.nix b/pkgs/unit/sj/sjasmplus/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/sjasmplus/default.nix rename to pkgs/unit/sj/sjasmplus/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/unit/sk/SkypeExport/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/SkypeExport/default.nix rename to pkgs/unit/sk/SkypeExport/pkg-fun.nix diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/unit/sk/skaffold/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/skaffold/default.nix rename to pkgs/unit/sk/skaffold/pkg-fun.nix diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/unit/sk/skate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/skate/default.nix rename to pkgs/unit/sk/skate/pkg-fun.nix diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/unit/sk/skeema/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/skeema/default.nix rename to pkgs/unit/sk/skeema/pkg-fun.nix diff --git a/pkgs/data/themes/skeu/default.nix b/pkgs/unit/sk/skeu/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/skeu/default.nix rename to pkgs/unit/sk/skeu/pkg-fun.nix diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/unit/sk/skim/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/skim/default.nix rename to pkgs/unit/sk/skim/pkg-fun.nix diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/unit/sk/skippy-xd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/skippy-xd/default.nix rename to pkgs/unit/sk/skippy-xd/pkg-fun.nix diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/unit/sk/skjold/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/skjold/default.nix rename to pkgs/unit/sk/skjold/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/unit/sk/skk-dicts/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/skk/skk-dicts/default.nix rename to pkgs/unit/sk/skk-dicts/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/unit/sk/skktools/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/skk/skktools/default.nix rename to pkgs/unit/sk/skktools/pkg-fun.nix diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/unit/sk/skopeo/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/skopeo/default.nix rename to pkgs/unit/sk/skopeo/pkg-fun.nix diff --git a/pkgs/servers/skydns/deps.nix b/pkgs/unit/sk/skydns/deps.nix similarity index 100% rename from pkgs/servers/skydns/deps.nix rename to pkgs/unit/sk/skydns/deps.nix diff --git a/pkgs/servers/skydns/default.nix b/pkgs/unit/sk/skydns/pkg-fun.nix similarity index 100% rename from pkgs/servers/skydns/default.nix rename to pkgs/unit/sk/skydns/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/unit/sk/skypeforlinux/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix rename to pkgs/unit/sk/skypeforlinux/pkg-fun.nix diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/unit/sk/skytemple/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/skytemple/default.nix rename to pkgs/unit/sk/skytemple/pkg-fun.nix diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/unit/sl/sl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sl/default.nix rename to pkgs/unit/sl/sl/pkg-fun.nix diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/unit/sl/slack-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/slack-cli/default.nix rename to pkgs/unit/sl/slack-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/unit/sl/slack-term/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/slack-term/default.nix rename to pkgs/unit/sl/slack-term/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/unit/sl/slack/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/slack/default.nix rename to pkgs/unit/sl/slack/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/unit/sl/slack/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/slack/update.sh rename to pkgs/unit/sl/slack/update.sh diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/unit/sl/slang/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/slang/default.nix rename to pkgs/unit/sl/slang/pkg-fun.nix diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/unit/sl/sleuthkit/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/sleuthkit/default.nix rename to pkgs/unit/sl/sleuthkit/pkg-fun.nix diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/unit/sl/slides/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/slides/default.nix rename to pkgs/unit/sl/slides/pkg-fun.nix diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/unit/sl/slimerjs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/slimerjs/default.nix rename to pkgs/unit/sl/slimerjs/pkg-fun.nix diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/unit/sl/slimserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/slimserver/default.nix rename to pkgs/unit/sl/slimserver/pkg-fun.nix diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/unit/sl/slirp4netns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/slirp4netns/default.nix rename to pkgs/unit/sl/slirp4netns/pkg-fun.nix diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/unit/sl/slmenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/slmenu/default.nix rename to pkgs/unit/sl/slmenu/pkg-fun.nix diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/unit/sl/sloccount/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/sloccount/default.nix rename to pkgs/unit/sl/sloccount/pkg-fun.nix diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/unit/sl/slop/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/slop/default.nix rename to pkgs/unit/sl/slop/pkg-fun.nix diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/unit/sl/slowhttptest/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/slowhttptest/default.nix rename to pkgs/unit/sl/slowhttptest/pkg-fun.nix diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/unit/sl/slowlorust/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/slowlorust/default.nix rename to pkgs/unit/sl/slowlorust/pkg-fun.nix diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/unit/sl/slrn/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/newsreaders/slrn/default.nix rename to pkgs/unit/sl/slrn/pkg-fun.nix diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/unit/sl/slsnif/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/slsnif/default.nix rename to pkgs/unit/sl/slsnif/pkg-fun.nix diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/unit/sl/slurm-spank-stunnel/pkg-fun.nix similarity index 100% rename from pkgs/servers/computing/slurm-spank-stunnel/default.nix rename to pkgs/unit/sl/slurm-spank-stunnel/pkg-fun.nix diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/unit/sl/slurm-spank-x11/pkg-fun.nix similarity index 100% rename from pkgs/servers/computing/slurm-spank-x11/default.nix rename to pkgs/unit/sl/slurm-spank-x11/pkg-fun.nix diff --git a/pkgs/servers/computing/slurm/common-env-echo.patch b/pkgs/unit/sl/slurm/common-env-echo.patch similarity index 100% rename from pkgs/servers/computing/slurm/common-env-echo.patch rename to pkgs/unit/sl/slurm/common-env-echo.patch diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/unit/sl/slurm/pkg-fun.nix similarity index 100% rename from pkgs/servers/computing/slurm/default.nix rename to pkgs/unit/sl/slurm/pkg-fun.nix diff --git a/pkgs/servers/computing/slurm/pmix-configure.patch b/pkgs/unit/sl/slurm/pmix-configure.patch similarity index 100% rename from pkgs/servers/computing/slurm/pmix-configure.patch rename to pkgs/unit/sl/slurm/pmix-configure.patch diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/unit/sl/slurp/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/slurp/default.nix rename to pkgs/unit/sl/slurp/pkg-fun.nix diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/unit/sl/slweb/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/slweb/default.nix rename to pkgs/unit/sl/slweb/pkg-fun.nix diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/unit/sm/smack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/java/smack/default.nix rename to pkgs/unit/sm/smack/pkg-fun.nix diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/unit/sm/smallwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/smallwm/default.nix rename to pkgs/unit/sm/smallwm/pkg-fun.nix diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/unit/sm/smart-wallpaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/smart-wallpaper/default.nix rename to pkgs/unit/sm/smart-wallpaper/pkg-fun.nix diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/unit/sm/smartdns/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/smartdns/default.nix rename to pkgs/unit/sm/smartdns/pkg-fun.nix diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/unit/sm/smarty3-i18n/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smarty3-i18n/default.nix rename to pkgs/unit/sm/smarty3-i18n/pkg-fun.nix diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/unit/sm/smarty3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smarty3/default.nix rename to pkgs/unit/sm/smarty3/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/unit/sm/smatch/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/smatch/default.nix rename to pkgs/unit/sm/smatch/pkg-fun.nix diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/unit/sm/smbnetfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/smbnetfs/default.nix rename to pkgs/unit/sm/smbnetfs/pkg-fun.nix diff --git a/pkgs/tools/security/smbscan/default.nix b/pkgs/unit/sm/smbscan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/smbscan/default.nix rename to pkgs/unit/sm/smbscan/pkg-fun.nix diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/unit/sm/smc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/smc/default.nix rename to pkgs/unit/sm/smc/pkg-fun.nix diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/unit/sm/smcroute/pkg-fun.nix similarity index 100% rename from pkgs/servers/smcroute/default.nix rename to pkgs/unit/sm/smcroute/pkg-fun.nix diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/unit/sm/smem/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/smem/default.nix rename to pkgs/unit/sm/smem/pkg-fun.nix diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/unit/sm/smemstat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/smemstat/default.nix rename to pkgs/unit/sm/smemstat/pkg-fun.nix diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/unit/sm/smenu/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/smenu/default.nix rename to pkgs/unit/sm/smenu/pkg-fun.nix diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/unit/sm/smiley-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/smiley-sans/default.nix rename to pkgs/unit/sm/smiley-sans/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/unit/sm/smimesign/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/smimesign/default.nix rename to pkgs/unit/sm/smimesign/pkg-fun.nix diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/unit/sm/smlfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/smlfmt/default.nix rename to pkgs/unit/sm/smlfmt/pkg-fun.nix diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/unit/sm/smlnjBootstrap/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/smlnj/bootstrap.nix rename to pkgs/unit/sm/smlnjBootstrap/pkg-fun.nix diff --git a/pkgs/tools/package-management/smlpkg/default.nix b/pkgs/unit/sm/smlpkg/pkg-fun.nix similarity index 100% rename from pkgs/tools/package-management/smlpkg/default.nix rename to pkgs/unit/sm/smlpkg/pkg-fun.nix diff --git a/pkgs/development/libraries/smokegen/default.nix b/pkgs/unit/sm/smokegen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smokegen/default.nix rename to pkgs/unit/sm/smokegen/pkg-fun.nix diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/unit/sm/smokeping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/smokeping/default.nix rename to pkgs/unit/sm/smokeping/pkg-fun.nix diff --git a/pkgs/development/libraries/smokeqt/default.nix b/pkgs/unit/sm/smokeqt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smokeqt/default.nix rename to pkgs/unit/sm/smokeqt/pkg-fun.nix diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/unit/sm/smooth/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smooth/default.nix rename to pkgs/unit/sm/smooth/pkg-fun.nix diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/unit/sm/smpeg/format.patch similarity index 100% rename from pkgs/development/libraries/smpeg/format.patch rename to pkgs/unit/sm/smpeg/format.patch diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/unit/sm/smpeg/gcc6.patch similarity index 100% rename from pkgs/development/libraries/smpeg/gcc6.patch rename to pkgs/unit/sm/smpeg/gcc6.patch diff --git a/pkgs/development/libraries/smpeg/gtk.patch b/pkgs/unit/sm/smpeg/gtk.patch similarity index 100% rename from pkgs/development/libraries/smpeg/gtk.patch rename to pkgs/unit/sm/smpeg/gtk.patch diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/unit/sm/smpeg/libx11.patch similarity index 100% rename from pkgs/development/libraries/smpeg/libx11.patch rename to pkgs/unit/sm/smpeg/libx11.patch diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/unit/sm/smpeg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smpeg/default.nix rename to pkgs/unit/sm/smpeg/pkg-fun.nix diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/unit/sm/smpeg2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/smpeg2/default.nix rename to pkgs/unit/sm/smpeg2/pkg-fun.nix diff --git a/pkgs/applications/misc/smpq/default.nix b/pkgs/unit/sm/smpq/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/smpq/default.nix rename to pkgs/unit/sm/smpq/pkg-fun.nix diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/unit/sm/smu/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/smu/default.nix rename to pkgs/unit/sm/smu/pkg-fun.nix diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/unit/sm/smug/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/smug/default.nix rename to pkgs/unit/sm/smug/pkg-fun.nix diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/unit/sn/sn0int/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sn0int/default.nix rename to pkgs/unit/sn/sn0int/pkg-fun.nix diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/unit/sn/snabb/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/snabb/default.nix rename to pkgs/unit/sn/snabb/pkg-fun.nix diff --git a/pkgs/servers/snac2/default.nix b/pkgs/unit/sn/snac2/pkg-fun.nix similarity index 100% rename from pkgs/servers/snac2/default.nix rename to pkgs/unit/sn/snac2/pkg-fun.nix diff --git a/pkgs/games/snake4/default.nix b/pkgs/unit/sn/snake4/pkg-fun.nix similarity index 100% rename from pkgs/games/snake4/default.nix rename to pkgs/unit/sn/snake4/pkg-fun.nix diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/unit/sn/snakemake/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/snakemake/default.nix rename to pkgs/unit/sn/snakemake/pkg-fun.nix diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/unit/sn/snallygaster/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/snallygaster/default.nix rename to pkgs/unit/sn/snallygaster/pkg-fun.nix diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/unit/sn/snap7/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/snap7/default.nix rename to pkgs/unit/sn/snap7/pkg-fun.nix diff --git a/pkgs/build-support/snap/make-snap.nix b/pkgs/unit/sn/snapTools/make-snap.nix similarity index 100% rename from pkgs/build-support/snap/make-snap.nix rename to pkgs/unit/sn/snapTools/make-snap.nix diff --git a/pkgs/build-support/snap/default.nix b/pkgs/unit/sn/snapTools/pkg-fun.nix similarity index 100% rename from pkgs/build-support/snap/default.nix rename to pkgs/unit/sn/snapTools/pkg-fun.nix diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/unit/sn/snapdragon-profiler/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/snapdragon-profiler/default.nix rename to pkgs/unit/sn/snapdragon-profiler/pkg-fun.nix diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/unit/sn/snapmaker-luban/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/snapmaker-luban/default.nix rename to pkgs/unit/sn/snapmaker-luban/pkg-fun.nix diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/unit/sn/snapper-gui/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/snapper-gui/default.nix rename to pkgs/unit/sn/snapper-gui/pkg-fun.nix diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/unit/sn/snapper/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/snapper/default.nix rename to pkgs/unit/sn/snapper/pkg-fun.nix diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/unit/sn/snappy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/snappy/default.nix rename to pkgs/unit/sn/snappy/pkg-fun.nix diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/unit/sn/snappymail/pkg-fun.nix similarity index 100% rename from pkgs/servers/snappymail/default.nix rename to pkgs/unit/sn/snappymail/pkg-fun.nix diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/unit/sn/snapraid/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/snapraid/default.nix rename to pkgs/unit/sn/snapraid/pkg-fun.nix diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/unit/sn/snazy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/snazy/default.nix rename to pkgs/unit/sn/snazy/pkg-fun.nix diff --git a/pkgs/misc/sndio/default.nix b/pkgs/unit/sn/sndio/pkg-fun.nix similarity index 100% rename from pkgs/misc/sndio/default.nix rename to pkgs/unit/sn/sndio/pkg-fun.nix diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/unit/sn/sndpeek/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sndpeek/default.nix rename to pkgs/unit/sn/sndpeek/pkg-fun.nix diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/pkgs/unit/sn/sndpeek/pthread.patch similarity index 100% rename from pkgs/applications/audio/sndpeek/pthread.patch rename to pkgs/unit/sn/sndpeek/pthread.patch diff --git a/pkgs/tools/networking/snet/default.nix b/pkgs/unit/sn/snet/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/snet/default.nix rename to pkgs/unit/sn/snet/pkg-fun.nix diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/unit/sn/sngrep/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniffers/sngrep/default.nix rename to pkgs/unit/sn/sngrep/pkg-fun.nix diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/unit/sn/sniffglue/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sniffglue/default.nix rename to pkgs/unit/sn/sniffglue/pkg-fun.nix diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/unit/sn/sniffnet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniffnet/default.nix rename to pkgs/unit/sn/sniffnet/pkg-fun.nix diff --git a/pkgs/servers/web-apps/snipe-it/composer-env.nix b/pkgs/unit/sn/snipe-it/composer-env.nix similarity index 100% rename from pkgs/servers/web-apps/snipe-it/composer-env.nix rename to pkgs/unit/sn/snipe-it/composer-env.nix diff --git a/pkgs/servers/web-apps/snipe-it/composition.nix b/pkgs/unit/sn/snipe-it/composition.nix similarity index 100% rename from pkgs/servers/web-apps/snipe-it/composition.nix rename to pkgs/unit/sn/snipe-it/composition.nix diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/unit/sn/snipe-it/php-packages.nix similarity index 100% rename from pkgs/servers/web-apps/snipe-it/php-packages.nix rename to pkgs/unit/sn/snipe-it/php-packages.nix diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/unit/sn/snipe-it/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/snipe-it/default.nix rename to pkgs/unit/sn/snipe-it/pkg-fun.nix diff --git a/pkgs/games/snipes/default.nix b/pkgs/unit/sn/snipes/pkg-fun.nix similarity index 100% rename from pkgs/games/snipes/default.nix rename to pkgs/unit/sn/snipes/pkg-fun.nix diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/unit/sn/snippetpixie/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/snippetpixie/default.nix rename to pkgs/unit/sn/snippetpixie/pkg-fun.nix diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/unit/sn/sniproxy/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniproxy/default.nix rename to pkgs/unit/sn/sniproxy/pkg-fun.nix diff --git a/pkgs/games/snis/default.nix b/pkgs/unit/sn/snis/pkg-fun.nix similarity index 100% rename from pkgs/games/snis/default.nix rename to pkgs/unit/sn/snis/pkg-fun.nix diff --git a/pkgs/applications/misc/snixembed/default.nix b/pkgs/unit/sn/snixembed/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/snixembed/default.nix rename to pkgs/unit/sn/snixembed/pkg-fun.nix diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/unit/sn/snmpcheck/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/snmpcheck/default.nix rename to pkgs/unit/sn/snmpcheck/pkg-fun.nix diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/unit/sn/snooze/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/snooze/default.nix rename to pkgs/unit/sn/snooze/pkg-fun.nix diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/unit/sn/snore/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/snore/default.nix rename to pkgs/unit/sn/snore/pkg-fun.nix diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/unit/sn/snort/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ids/snort/default.nix rename to pkgs/unit/sn/snort/pkg-fun.nix diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/unit/sn/snow/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/snow/default.nix rename to pkgs/unit/sn/snow/pkg-fun.nix diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/unit/sn/snowblind/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/snowblind/default.nix rename to pkgs/unit/sn/snowblind/pkg-fun.nix diff --git a/pkgs/tools/security/snowcat/default.nix b/pkgs/unit/sn/snowcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/snowcat/default.nix rename to pkgs/unit/sn/snowcat/pkg-fun.nix diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/unit/sn/snowcrash/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/snowcrash/default.nix rename to pkgs/unit/sn/snowcrash/pkg-fun.nix diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/unit/sn/snowflake/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/snowflake/default.nix rename to pkgs/unit/sn/snowflake/pkg-fun.nix diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/unit/sn/snowsql/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/snowsql/default.nix rename to pkgs/unit/sn/snowsql/pkg-fun.nix diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/unit/sn/snpeff/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/snpeff/default.nix rename to pkgs/unit/sn/snpeff/pkg-fun.nix diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/unit/sn/snzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/snzip/default.nix rename to pkgs/unit/sn/snzip/pkg-fun.nix diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/unit/so/soapyremote/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/soapyremote/default.nix rename to pkgs/unit/so/soapyremote/pkg-fun.nix diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/unit/so/soapysdrplay/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/soapysdrplay/default.nix rename to pkgs/unit/so/soapysdrplay/pkg-fun.nix diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/unit/so/socat/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/socat/default.nix rename to pkgs/unit/so/socat/pkg-fun.nix diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/unit/so/soci/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/soci/default.nix rename to pkgs/unit/so/soci/pkg-fun.nix diff --git a/pkgs/tools/security/social-engineer-toolkit/default.nix b/pkgs/unit/so/social-engineer-toolkit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/social-engineer-toolkit/default.nix rename to pkgs/unit/so/social-engineer-toolkit/pkg-fun.nix diff --git a/pkgs/tools/networking/sockdump/default.nix b/pkgs/unit/so/sockdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sockdump/default.nix rename to pkgs/unit/so/sockdump/pkg-fun.nix diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/unit/so/socket_wrapper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/socket_wrapper/default.nix rename to pkgs/unit/so/socket_wrapper/pkg-fun.nix diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/unit/so/socklog/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/socklog/default.nix rename to pkgs/unit/so/socklog/pkg-fun.nix diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/unit/so/sockperf/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sockperf/default.nix rename to pkgs/unit/so/sockperf/pkg-fun.nix diff --git a/pkgs/tools/audio/soco-cli/default.nix b/pkgs/unit/so/soco-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/soco-cli/default.nix rename to pkgs/unit/so/soco-cli/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/unit/so/sof-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/sof-firmware/default.nix rename to pkgs/unit/so/sof-firmware/pkg-fun.nix diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/unit/so/soft-serve/pkg-fun.nix similarity index 100% rename from pkgs/servers/soft-serve/default.nix rename to pkgs/unit/so/soft-serve/pkg-fun.nix diff --git a/pkgs/servers/softether/default.nix b/pkgs/unit/so/softether/pkg-fun.nix similarity index 100% rename from pkgs/servers/softether/default.nix rename to pkgs/unit/so/softether/pkg-fun.nix diff --git a/pkgs/servers/web-apps/sogo/enable-activesync.patch b/pkgs/unit/so/sogo/enable-activesync.patch similarity index 100% rename from pkgs/servers/web-apps/sogo/enable-activesync.patch rename to pkgs/unit/so/sogo/enable-activesync.patch diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/unit/so/sogo/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/sogo/default.nix rename to pkgs/unit/so/sogo/pkg-fun.nix diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/unit/so/soju/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/soju/default.nix rename to pkgs/unit/so/soju/pkg-fun.nix diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/unit/so/sokol/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sokol/default.nix rename to pkgs/unit/so/sokol/pkg-fun.nix diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/unit/so/solaar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/solaar/default.nix rename to pkgs/unit/so/solaar/pkg-fun.nix diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/unit/so/solarc-gtk-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/solarc/default.nix rename to pkgs/unit/so/solarc-gtk-theme/pkg-fun.nix diff --git a/pkgs/games/solicurses/default.nix b/pkgs/unit/so/solicurses/pkg-fun.nix similarity index 100% rename from pkgs/games/solicurses/default.nix rename to pkgs/unit/so/solicurses/pkg-fun.nix diff --git a/pkgs/development/interpreters/sollya/default.nix b/pkgs/unit/so/sollya/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/sollya/default.nix rename to pkgs/unit/so/sollya/pkg-fun.nix diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/unit/so/solo5/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/solo5/default.nix rename to pkgs/unit/so/solo5/pkg-fun.nix diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/unit/so/solr/pkg-fun.nix similarity index 100% rename from pkgs/servers/search/solr/default.nix rename to pkgs/unit/so/solr/pkg-fun.nix diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/unit/so/solvespace/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/solvespace/default.nix rename to pkgs/unit/so/solvespace/pkg-fun.nix diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/unit/so/somafm-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/somafm-cli/default.nix rename to pkgs/unit/so/somafm-cli/pkg-fun.nix diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/unit/so/somatic-sniper/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/somatic-sniper/default.nix rename to pkgs/unit/so/somatic-sniper/pkg-fun.nix diff --git a/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch b/pkgs/unit/so/somatic-sniper/somatic-sniper.patch similarity index 100% rename from pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch rename to pkgs/unit/so/somatic-sniper/somatic-sniper.patch diff --git a/pkgs/applications/misc/somebar/default.nix b/pkgs/unit/so/somebar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/somebar/default.nix rename to pkgs/unit/so/somebar/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/unit/so/sommelier/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sommelier/default.nix rename to pkgs/unit/so/sommelier/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sommelier/update.py b/pkgs/unit/so/sommelier/update.py similarity index 100% rename from pkgs/applications/window-managers/sommelier/update.py rename to pkgs/unit/so/sommelier/update.py diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/unit/so/sonar-scanner-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sonar-scanner-cli/default.nix rename to pkgs/unit/so/sonar-scanner-cli/pkg-fun.nix diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/unit/so/sonarr/pkg-fun.nix similarity index 100% rename from pkgs/servers/sonarr/default.nix rename to pkgs/unit/so/sonarr/pkg-fun.nix diff --git a/pkgs/servers/sonarr/update.sh b/pkgs/unit/so/sonarr/update.sh similarity index 100% rename from pkgs/servers/sonarr/update.sh rename to pkgs/unit/so/sonarr/update.sh diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/unit/so/sonata/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sonata/default.nix rename to pkgs/unit/so/sonata/pkg-fun.nix diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/unit/so/songrec/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/songrec/default.nix rename to pkgs/unit/so/songrec/pkg-fun.nix diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/unit/so/sonic-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/search/sonic-server/default.nix rename to pkgs/unit/so/sonic-server/pkg-fun.nix diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/unit/so/sonic/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sonic/default.nix rename to pkgs/unit/so/sonic/pkg-fun.nix diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/unit/so/sonixd/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sonixd/default.nix rename to pkgs/unit/so/sonixd/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/unit/so/sonobuoy/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/sonobuoy/default.nix rename to pkgs/unit/so/sonobuoy/pkg-fun.nix diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/unit/so/sonota/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sonota/default.nix rename to pkgs/unit/so/sonota/pkg-fun.nix diff --git a/pkgs/tools/misc/sonota/set_resource_path.patch b/pkgs/unit/so/sonota/set_resource_path.patch similarity index 100% rename from pkgs/tools/misc/sonota/set_resource_path.patch rename to pkgs/unit/so/sonota/set_resource_path.patch diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/unit/so/sony-headphones-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sony-headphones-client/default.nix rename to pkgs/unit/so/sony-headphones-client/pkg-fun.nix diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/unit/so/sooperlooper/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sooperlooper/default.nix rename to pkgs/unit/so/sooperlooper/pkg-fun.nix diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/unit/so/sope/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sope/default.nix rename to pkgs/unit/so/sope/pkg-fun.nix diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/unit/so/sops/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sops/default.nix rename to pkgs/unit/so/sops/pkg-fun.nix diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/unit/so/sorcer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sorcer/default.nix rename to pkgs/unit/so/sorcer/pkg-fun.nix diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/unit/so/sord/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sord/default.nix rename to pkgs/unit/so/sord/pkg-fun.nix diff --git a/pkgs/tools/text/sorted-grep/default.nix b/pkgs/unit/so/sorted-grep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/sorted-grep/default.nix rename to pkgs/unit/so/sorted-grep/pkg-fun.nix diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/unit/so/sortmerna/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/sortmerna/default.nix rename to pkgs/unit/so/sortmerna/pkg-fun.nix diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/unit/so/souffle/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/souffle/default.nix rename to pkgs/unit/so/souffle/pkg-fun.nix diff --git a/pkgs/development/compilers/souffle/threads.patch b/pkgs/unit/so/souffle/threads.patch similarity index 100% rename from pkgs/development/compilers/souffle/threads.patch rename to pkgs/unit/so/souffle/threads.patch diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/unit/so/sound-juicer/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sound-juicer/default.nix rename to pkgs/unit/so/sound-juicer/pkg-fun.nix diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/unit/so/sound-theme-freedesktop/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/sound-theme-freedesktop/default.nix rename to pkgs/unit/so/sound-theme-freedesktop/pkg-fun.nix diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/unit/so/soundOfSorting/pkg-fun.nix similarity index 100% rename from pkgs/misc/sound-of-sorting/default.nix rename to pkgs/unit/so/soundOfSorting/pkg-fun.nix diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/unit/so/soundconverter/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/soundconverter/default.nix rename to pkgs/unit/so/soundconverter/pkg-fun.nix diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/unit/so/soundfont-fluid/pkg-fun.nix similarity index 100% rename from pkgs/data/soundfonts/fluid/default.nix rename to pkgs/unit/so/soundfont-fluid/pkg-fun.nix diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/unit/so/soundfont-generaluser/pkg-fun.nix similarity index 100% rename from pkgs/data/soundfonts/generaluser/default.nix rename to pkgs/unit/so/soundfont-generaluser/pkg-fun.nix diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/unit/so/soundfont-ydp-grand/pkg-fun.nix similarity index 100% rename from pkgs/data/soundfonts/ydp-grand/default.nix rename to pkgs/unit/so/soundfont-ydp-grand/pkg-fun.nix diff --git a/pkgs/applications/radio/soundmodem/matFix.patch b/pkgs/unit/so/soundmodem/matFix.patch similarity index 100% rename from pkgs/applications/radio/soundmodem/matFix.patch rename to pkgs/unit/so/soundmodem/matFix.patch diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/unit/so/soundmodem/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/soundmodem/default.nix rename to pkgs/unit/so/soundmodem/pkg-fun.nix diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/unit/so/soundtouch/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/soundtouch/default.nix rename to pkgs/unit/so/soundtouch/pkg-fun.nix diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/unit/so/soundtracker/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/soundtracker/default.nix rename to pkgs/unit/so/soundtracker/pkg-fun.nix diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/unit/so/soundwireserver/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/soundwireserver/default.nix rename to pkgs/unit/so/soundwireserver/pkg-fun.nix diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/unit/so/soupault/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/soupault/default.nix rename to pkgs/unit/so/soupault/pkg-fun.nix diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/unit/so/source-code-pro/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/source-code-pro/default.nix rename to pkgs/unit/so/source-code-pro/pkg-fun.nix diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/unit/so/source-han-code-jp/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/source-han-code-jp/default.nix rename to pkgs/unit/so/source-han-code-jp/pkg-fun.nix diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/unit/so/source-sans-pro/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/source-sans-pro/default.nix rename to pkgs/unit/so/source-sans-pro/pkg-fun.nix diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/unit/so/source-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/source-sans/default.nix rename to pkgs/unit/so/source-sans/pkg-fun.nix diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/unit/so/source-serif-pro/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/source-serif-pro/default.nix rename to pkgs/unit/so/source-serif-pro/pkg-fun.nix diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/unit/so/source-serif/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/source-serif/default.nix rename to pkgs/unit/so/source-serif/pkg-fun.nix diff --git a/pkgs/build-support/source-from-head-fun.nix b/pkgs/unit/so/sourceFromHead/pkg-fun.nix similarity index 100% rename from pkgs/build-support/source-from-head-fun.nix rename to pkgs/unit/so/sourceFromHead/pkg-fun.nix diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/unit/so/sourceHighlight/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/source-highlight/default.nix rename to pkgs/unit/so/sourceHighlight/pkg-fun.nix diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/unit/so/sourcehut/builds.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/builds.nix rename to pkgs/unit/so/sourcehut/builds.nix diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/unit/so/sourcehut/core.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/core.nix rename to pkgs/unit/so/sourcehut/core.nix diff --git a/pkgs/applications/version-management/sourcehut/disable-npm-install.patch b/pkgs/unit/so/sourcehut/disable-npm-install.patch similarity index 100% rename from pkgs/applications/version-management/sourcehut/disable-npm-install.patch rename to pkgs/unit/so/sourcehut/disable-npm-install.patch diff --git a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/pkgs/unit/so/sourcehut/fetchNodeModules.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/fetchNodeModules.nix rename to pkgs/unit/so/sourcehut/fetchNodeModules.nix diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/unit/so/sourcehut/fix-gqlgen-trimpath.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix rename to pkgs/unit/so/sourcehut/fix-gqlgen-trimpath.nix diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/unit/so/sourcehut/git.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/git.nix rename to pkgs/unit/so/sourcehut/git.nix diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/unit/so/sourcehut/hg.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/hg.nix rename to pkgs/unit/so/sourcehut/hg.nix diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/unit/so/sourcehut/hub.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/hub.nix rename to pkgs/unit/so/sourcehut/hub.nix diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/unit/so/sourcehut/lists.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/lists.nix rename to pkgs/unit/so/sourcehut/lists.nix diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/unit/so/sourcehut/man.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/man.nix rename to pkgs/unit/so/sourcehut/man.nix diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/unit/so/sourcehut/meta.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/meta.nix rename to pkgs/unit/so/sourcehut/meta.nix diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/unit/so/sourcehut/pages.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/pages.nix rename to pkgs/unit/so/sourcehut/pages.nix diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/unit/so/sourcehut/paste.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/paste.nix rename to pkgs/unit/so/sourcehut/paste.nix diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch b/pkgs/unit/so/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch similarity index 100% rename from pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch rename to pkgs/unit/so/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/unit/so/sourcehut/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/default.nix rename to pkgs/unit/so/sourcehut/pkg-fun.nix diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/unit/so/sourcehut/scm.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/scm.nix rename to pkgs/unit/so/sourcehut/scm.nix diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/unit/so/sourcehut/todo.nix similarity index 100% rename from pkgs/applications/version-management/sourcehut/todo.nix rename to pkgs/unit/so/sourcehut/todo.nix diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/unit/so/sov/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/sov/default.nix rename to pkgs/unit/so/sov/pkg-fun.nix diff --git a/pkgs/applications/misc/audio/soxr/arm64-check.patch b/pkgs/unit/so/soxr/arm64-check.patch similarity index 100% rename from pkgs/applications/misc/audio/soxr/arm64-check.patch rename to pkgs/unit/so/soxr/arm64-check.patch diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/unit/so/soxr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/audio/soxr/default.nix rename to pkgs/unit/so/soxr/pkg-fun.nix diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/unit/so/soxt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/soxt/default.nix rename to pkgs/unit/so/soxt/pkg-fun.nix diff --git a/pkgs/servers/sozu/default.nix b/pkgs/unit/so/sozu/pkg-fun.nix similarity index 100% rename from pkgs/servers/sozu/default.nix rename to pkgs/unit/so/sozu/pkg-fun.nix diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/unit/sp/SPAdes/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/spades/default.nix rename to pkgs/unit/sp/SPAdes/pkg-fun.nix diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/unit/sp/space-orbit/pkg-fun.nix similarity index 100% rename from pkgs/games/space-orbit/default.nix rename to pkgs/unit/sp/space-orbit/pkg-fun.nix diff --git a/pkgs/applications/file-managers/spacefm/glibc-fix.patch b/pkgs/unit/sp/spaceFM/glibc-fix.patch similarity index 100% rename from pkgs/applications/file-managers/spacefm/glibc-fix.patch rename to pkgs/unit/sp/spaceFM/glibc-fix.patch diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/unit/sp/spaceFM/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/spacefm/default.nix rename to pkgs/unit/sp/spaceFM/pkg-fun.nix diff --git a/pkgs/applications/file-managers/spacefm/x11-only.patch b/pkgs/unit/sp/spaceFM/x11-only.patch similarity index 100% rename from pkgs/applications/file-managers/spacefm/x11-only.patch rename to pkgs/unit/sp/spaceFM/x11-only.patch diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/unit/sp/spacenav-cube-example/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/spacenav-cube-example/default.nix rename to pkgs/unit/sp/spacenav-cube-example/pkg-fun.nix diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/unit/sp/spaceship-prompt/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/spaceship-prompt/default.nix rename to pkgs/unit/sp/spaceship-prompt/pkg-fun.nix diff --git a/pkgs/applications/editors/spacevim/helptags.patch b/pkgs/unit/sp/spacevim/helptags.patch similarity index 100% rename from pkgs/applications/editors/spacevim/helptags.patch rename to pkgs/unit/sp/spacevim/helptags.patch diff --git a/pkgs/applications/editors/spacevim/init.nix b/pkgs/unit/sp/spacevim/init.nix similarity index 100% rename from pkgs/applications/editors/spacevim/init.nix rename to pkgs/unit/sp/spacevim/init.nix diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/unit/sp/spacevim/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/spacevim/default.nix rename to pkgs/unit/sp/spacevim/pkg-fun.nix diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/unit/sp/spago/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/purescript/spago/default.nix rename to pkgs/unit/sp/spago/pkg-fun.nix diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/unit/sp/spago/update.sh similarity index 100% rename from pkgs/development/tools/purescript/spago/update.sh rename to pkgs/unit/sp/spago/update.sh diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/unit/sp/spamassassin/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/spamassassin/default.nix rename to pkgs/unit/sp/spamassassin/pkg-fun.nix diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/unit/sp/spamassassin/sa-update_add--siteconfigpath.patch similarity index 100% rename from pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch rename to pkgs/unit/sp/spamassassin/sa-update_add--siteconfigpath.patch diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/unit/sp/spandsp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spandsp/default.nix rename to pkgs/unit/sp/spandsp/pkg-fun.nix diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/unit/sp/spandsp3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spandsp/3.nix rename to pkgs/unit/sp/spandsp3/pkg-fun.nix diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/unit/sp/spark2014/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ada/spark2014/default.nix rename to pkgs/unit/sp/spark2014/pkg-fun.nix diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/unit/sp/sparkleshare/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/sparkleshare/default.nix rename to pkgs/unit/sp/sparkleshare/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/unit/sp/sparse/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/sparse/default.nix rename to pkgs/unit/sp/sparse/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/sparse/tests.nix b/pkgs/unit/sp/sparse/tests.nix similarity index 100% rename from pkgs/development/tools/analysis/sparse/tests.nix rename to pkgs/unit/sp/sparse/tests.nix diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/unit/sp/sparsehash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sparsehash/default.nix rename to pkgs/unit/sp/sparsehash/pkg-fun.nix diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/unit/sp/spasm-ng/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/spasm-ng/default.nix rename to pkgs/unit/sp/spasm-ng/pkg-fun.nix diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/unit/sp/spatialite_tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/gis/spatialite-tools/default.nix rename to pkgs/unit/sp/spatialite_tools/pkg-fun.nix diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/unit/sp/spawn_fcgi/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/spawn-fcgi/default.nix rename to pkgs/unit/sp/spawn_fcgi/pkg-fun.nix diff --git a/pkgs/development/libraries/spdk/ncurses-6.3.patch b/pkgs/unit/sp/spdk/ncurses-6.3.patch similarity index 100% rename from pkgs/development/libraries/spdk/ncurses-6.3.patch rename to pkgs/unit/sp/spdk/ncurses-6.3.patch diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/unit/sp/spdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spdk/default.nix rename to pkgs/unit/sp/spdk/pkg-fun.nix diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/unit/sp/spdx-license-list-data/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/spdx-license-list-data/default.nix rename to pkgs/unit/sp/spdx-license-list-data/pkg-fun.nix diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/unit/sp/spectmorph/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/spectmorph/default.nix rename to pkgs/unit/sp/spectmorph/pkg-fun.nix diff --git a/pkgs/development/libraries/spectra/default.nix b/pkgs/unit/sp/spectra/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spectra/default.nix rename to pkgs/unit/sp/spectra/pkg-fun.nix diff --git a/pkgs/tools/security/spectre-cli/default.nix b/pkgs/unit/sp/spectre-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/spectre-cli/default.nix rename to pkgs/unit/sp/spectre-cli/pkg-fun.nix diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/unit/sp/spectre-meltdown-checker/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/spectre-meltdown-checker/default.nix rename to pkgs/unit/sp/spectre-meltdown-checker/pkg-fun.nix diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/unit/sp/spectrojack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/spectrojack/default.nix rename to pkgs/unit/sp/spectrojack/pkg-fun.nix diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/unit/sp/spectrwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/spectrwm/default.nix rename to pkgs/unit/sp/spectrwm/pkg-fun.nix diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/unit/sp/speech-denoiser/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/speech-denoiser/default.nix rename to pkgs/unit/sp/speech-denoiser/pkg-fun.nix diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/unit/sp/speech-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/speech-tools/default.nix rename to pkgs/unit/sp/speech-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/speechd/fix-mbrola-paths.patch b/pkgs/unit/sp/speechd/fix-mbrola-paths.patch similarity index 100% rename from pkgs/development/libraries/speechd/fix-mbrola-paths.patch rename to pkgs/unit/sp/speechd/fix-mbrola-paths.patch diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/unit/sp/speechd/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/speechd/fix-paths.patch rename to pkgs/unit/sp/speechd/fix-paths.patch diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/unit/sp/speechd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/speechd/default.nix rename to pkgs/unit/sp/speechd/pkg-fun.nix diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/unit/sp/speedread/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/speedread/default.nix rename to pkgs/unit/sp/speedread/pkg-fun.nix diff --git a/pkgs/development/libraries/speedtest-exporter/default.nix b/pkgs/unit/sp/speedtest-exporter/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/speedtest-exporter/default.nix rename to pkgs/unit/sp/speedtest-exporter/pkg-fun.nix diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/unit/sp/sphinxsearch/pkg-fun.nix similarity index 100% rename from pkgs/servers/search/sphinxsearch/default.nix rename to pkgs/unit/sp/sphinxsearch/pkg-fun.nix diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/unit/sp/spice-gtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spice-gtk/default.nix rename to pkgs/unit/sp/spice-gtk/pkg-fun.nix diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/unit/sp/spice-protocol/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spice-protocol/default.nix rename to pkgs/unit/sp/spice-protocol/pkg-fun.nix diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/unit/sp/spice-up/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/spice-up/default.nix rename to pkgs/unit/sp/spice-up/pkg-fun.nix diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/unit/sp/spice-vdagent/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/spice-vdagent/default.nix rename to pkgs/unit/sp/spice-vdagent/pkg-fun.nix diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/unit/sp/spice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spice/default.nix rename to pkgs/unit/sp/spice/pkg-fun.nix diff --git a/pkgs/development/libraries/spice/remove-rt-on-darwin.patch b/pkgs/unit/sp/spice/remove-rt-on-darwin.patch similarity index 100% rename from pkgs/development/libraries/spice/remove-rt-on-darwin.patch rename to pkgs/unit/sp/spice/remove-rt-on-darwin.patch diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/unit/sp/spicedb-zed/pkg-fun.nix similarity index 100% rename from pkgs/servers/spicedb/zed.nix rename to pkgs/unit/sp/spicedb-zed/pkg-fun.nix diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/unit/sp/spicedb/pkg-fun.nix similarity index 100% rename from pkgs/servers/spicedb/default.nix rename to pkgs/unit/sp/spicedb/pkg-fun.nix diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/unit/sp/spicetify-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/spicetify-cli/default.nix rename to pkgs/unit/sp/spicetify-cli/pkg-fun.nix diff --git a/pkgs/development/tools/spicy/default.nix b/pkgs/unit/sp/spicy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/spicy/default.nix rename to pkgs/unit/sp/spicy/pkg-fun.nix diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/unit/sp/spideroak/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/spideroak/default.nix rename to pkgs/unit/sp/spideroak/pkg-fun.nix diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/unit/sp/spigot/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/spigot/default.nix rename to pkgs/unit/sp/spigot/pkg-fun.nix diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/unit/sp/spike/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/spike/default.nix rename to pkgs/unit/sp/spike/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/unit/sp/spin/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/spin/default.nix rename to pkgs/unit/sp/spin/pkg-fun.nix diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/unit/sp/spiped/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/spiped/default.nix rename to pkgs/unit/sp/spiped/pkg-fun.nix diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/unit/sp/spire/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/spire/default.nix rename to pkgs/unit/sp/spire/pkg-fun.nix diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/unit/sp/spirv-cross/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/spirv-cross/default.nix rename to pkgs/unit/sp/spirv-cross/pkg-fun.nix diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/unit/sp/spirv-headers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/spirv-headers/default.nix rename to pkgs/unit/sp/spirv-headers/pkg-fun.nix diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/unit/sp/spirv-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/spirv-tools/default.nix rename to pkgs/unit/sp/spirv-tools/pkg-fun.nix diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/unit/sp/splat/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/splat/default.nix rename to pkgs/unit/sp/splat/pkg-fun.nix diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/unit/sp/spleen/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/spleen/default.nix rename to pkgs/unit/sp/spleen/pkg-fun.nix diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/unit/sp/splix/pkg-fun.nix similarity index 100% rename from pkgs/misc/cups/drivers/splix/default.nix rename to pkgs/unit/sp/splix/pkg-fun.nix diff --git a/pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch b/pkgs/unit/sp/spnavcfg/configure-cfgfile-path.patch similarity index 100% rename from pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch rename to pkgs/unit/sp/spnavcfg/configure-cfgfile-path.patch diff --git a/pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch b/pkgs/unit/sp/spnavcfg/configure-pidfile-path.patch similarity index 100% rename from pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch rename to pkgs/unit/sp/spnavcfg/configure-pidfile-path.patch diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/unit/sp/spnavcfg/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/spnavcfg/default.nix rename to pkgs/unit/sp/spnavcfg/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/unit/sp/spooles/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/spooles/default.nix rename to pkgs/unit/sp/spooles/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/spooles/spooles.patch b/pkgs/unit/sp/spooles/spooles.patch similarity index 100% rename from pkgs/development/libraries/science/math/spooles/spooles.patch rename to pkgs/unit/sp/spooles/spooles.patch diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/unit/sp/spot/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/spot/default.nix rename to pkgs/unit/sp/spot/pkg-fun.nix diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/unit/sp/spotdl/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/spotdl/default.nix rename to pkgs/unit/sp/spotdl/pkg-fun.nix diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/unit/sp/spotify-cli-linux/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/spotify-cli-linux/default.nix rename to pkgs/unit/sp/spotify-cli-linux/pkg-fun.nix diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/unit/sp/spotify-tray/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/spotify-tray/default.nix rename to pkgs/unit/sp/spotify-tray/pkg-fun.nix diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/unit/sp/spotify/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/spotify/default.nix rename to pkgs/unit/sp/spotify/pkg-fun.nix diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/unit/sp/spotify/update.sh similarity index 100% rename from pkgs/applications/audio/spotify/update.sh rename to pkgs/unit/sp/spotify/update.sh diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/unit/sp/spotifywm/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/spotifywm/default.nix rename to pkgs/unit/sp/spotifywm/pkg-fun.nix diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/unit/sp/spring-boot-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/spring-boot-cli/default.nix rename to pkgs/unit/sp/spring-boot-cli/pkg-fun.nix diff --git a/pkgs/games/spring/fix-certs.patch b/pkgs/unit/sp/springLobby/fix-certs.patch similarity index 100% rename from pkgs/games/spring/fix-certs.patch rename to pkgs/unit/sp/springLobby/fix-certs.patch diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/unit/sp/springLobby/pkg-fun.nix similarity index 100% rename from pkgs/games/spring/springlobby.nix rename to pkgs/unit/sp/springLobby/pkg-fun.nix diff --git a/pkgs/games/spring/revert_58b423e.patch b/pkgs/unit/sp/springLobby/revert_58b423e.patch similarity index 100% rename from pkgs/games/spring/revert_58b423e.patch rename to pkgs/unit/sp/springLobby/revert_58b423e.patch diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/unit/sp/spruce/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/spruce/default.nix rename to pkgs/unit/sp/spruce/pkg-fun.nix diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/unit/sp/sptk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sptk/default.nix rename to pkgs/unit/sp/sptk/pkg-fun.nix diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/unit/sp/sptlrx/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sptlrx/default.nix rename to pkgs/unit/sp/sptlrx/pkg-fun.nix diff --git a/pkgs/tools/security/spyre/default.nix b/pkgs/unit/sp/spyre/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/spyre/default.nix rename to pkgs/unit/sp/spyre/pkg-fun.nix diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/unit/sq/sq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sq/default.nix rename to pkgs/unit/sq/sq/pkg-fun.nix diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/unit/sq/sqlar/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sqlite/sqlar.nix rename to pkgs/unit/sq/sqlar/pkg-fun.nix diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/unit/sq/sqlc/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/sqlc/default.nix rename to pkgs/unit/sq/sqlc/pkg-fun.nix diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/unit/sq/sqlcheck/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/sqlcheck/default.nix rename to pkgs/unit/sq/sqlcheck/pkg-fun.nix diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/unit/sq/sqlcipher/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sqlcipher/default.nix rename to pkgs/unit/sq/sqlcipher/pkg-fun.nix diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/unit/sq/sqlcl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/sqlcl/default.nix rename to pkgs/unit/sq/sqlcl/pkg-fun.nix diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/unit/sq/sqlfluff/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/sqlfluff/default.nix rename to pkgs/unit/sq/sqlfluff/pkg-fun.nix diff --git a/pkgs/development/tools/sqlint/Gemfile b/pkgs/unit/sq/sqlint/Gemfile similarity index 100% rename from pkgs/development/tools/sqlint/Gemfile rename to pkgs/unit/sq/sqlint/Gemfile diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/unit/sq/sqlint/Gemfile.lock similarity index 100% rename from pkgs/development/tools/sqlint/Gemfile.lock rename to pkgs/unit/sq/sqlint/Gemfile.lock diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/unit/sq/sqlint/gemset.nix similarity index 100% rename from pkgs/development/tools/sqlint/gemset.nix rename to pkgs/unit/sq/sqlint/gemset.nix diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/unit/sq/sqlint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sqlint/default.nix rename to pkgs/unit/sq/sqlint/pkg-fun.nix diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/unit/sq/sqlite-jdbc/pkg-fun.nix similarity index 100% rename from pkgs/servers/sql/sqlite/jdbc/default.nix rename to pkgs/unit/sq/sqlite-jdbc/pkg-fun.nix diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/unit/sq/sqlite-web/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/sqlite-web/default.nix rename to pkgs/unit/sq/sqlite-web/pkg-fun.nix diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/unit/sq/sqlite3-to-mysql/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sqlite3-to-mysql/default.nix rename to pkgs/unit/sq/sqlite3-to-mysql/pkg-fun.nix diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/unit/sq/sqlitecpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sqlitecpp/default.nix rename to pkgs/unit/sq/sqlitecpp/pkg-fun.nix diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/unit/sq/sqliteman/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sqliteman/default.nix rename to pkgs/unit/sq/sqliteman/pkg-fun.nix diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/unit/sq/sqls/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sqls/default.nix rename to pkgs/unit/sq/sqls/pkg-fun.nix diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/unit/sq/sqsh/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sqsh/default.nix rename to pkgs/unit/sq/sqsh/pkg-fun.nix diff --git a/pkgs/tools/filesystems/squashfs/4k-align.patch b/pkgs/unit/sq/squashfsTools/4k-align.patch similarity index 100% rename from pkgs/tools/filesystems/squashfs/4k-align.patch rename to pkgs/unit/sq/squashfsTools/4k-align.patch diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/unit/sq/squashfsTools/darwin.patch similarity index 100% rename from pkgs/tools/filesystems/squashfs/darwin.patch rename to pkgs/unit/sq/squashfsTools/darwin.patch diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/unit/sq/squashfsTools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/squashfs/default.nix rename to pkgs/unit/sq/squashfsTools/pkg-fun.nix diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/unit/sq/squashfuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/squashfuse/default.nix rename to pkgs/unit/sq/squashfuse/pkg-fun.nix diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/unit/sq/squeak/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/squeak/default.nix rename to pkgs/unit/sq/squeak/pkg-fun.nix diff --git a/pkgs/development/compilers/squeak/squeak-configure-version.patch b/pkgs/unit/sq/squeak/squeak-configure-version.patch similarity index 100% rename from pkgs/development/compilers/squeak/squeak-configure-version.patch rename to pkgs/unit/sq/squeak/squeak-configure-version.patch diff --git a/pkgs/development/compilers/squeak/squeak-plugins-discovery.patch b/pkgs/unit/sq/squeak/squeak-plugins-discovery.patch similarity index 100% rename from pkgs/development/compilers/squeak/squeak-plugins-discovery.patch rename to pkgs/unit/sq/squeak/squeak-plugins-discovery.patch diff --git a/pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch b/pkgs/unit/sq/squeak/squeak-squeaksh-nixpkgs.patch similarity index 100% rename from pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch rename to pkgs/unit/sq/squeak/squeak-squeaksh-nixpkgs.patch diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/unit/sq/squeekboard/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/squeekboard/default.nix rename to pkgs/unit/sq/squeekboard/pkg-fun.nix diff --git a/pkgs/servers/squid/default.nix b/pkgs/unit/sq/squid/pkg-fun.nix similarity index 100% rename from pkgs/servers/squid/default.nix rename to pkgs/unit/sq/squid/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/unit/sr/srain/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/srain/default.nix rename to pkgs/unit/sr/srain/pkg-fun.nix diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/unit/sr/srandrd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/srandrd/default.nix rename to pkgs/unit/sr/srandrd/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/unit/sr/sratom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/sratom/default.nix rename to pkgs/unit/sr/sratom/pkg-fun.nix diff --git a/pkgs/applications/science/biology/sratoolkit/default.nix b/pkgs/unit/sr/sratoolkit/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/sratoolkit/default.nix rename to pkgs/unit/sr/sratoolkit/pkg-fun.nix diff --git a/pkgs/games/srb2/default.nix b/pkgs/unit/sr/srb2/pkg-fun.nix similarity index 100% rename from pkgs/games/srb2/default.nix rename to pkgs/unit/sr/srb2/pkg-fun.nix diff --git a/pkgs/games/srb2/wadlocation.patch b/pkgs/unit/sr/srb2/wadlocation.patch similarity index 100% rename from pkgs/games/srb2/wadlocation.patch rename to pkgs/unit/sr/srb2/wadlocation.patch diff --git a/pkgs/games/srb2kart/default.nix b/pkgs/unit/sr/srb2kart/pkg-fun.nix similarity index 100% rename from pkgs/games/srb2kart/default.nix rename to pkgs/unit/sr/srb2kart/pkg-fun.nix diff --git a/pkgs/games/srb2kart/wadlocation.patch b/pkgs/unit/sr/srb2kart/wadlocation.patch similarity index 100% rename from pkgs/games/srb2kart/wadlocation.patch rename to pkgs/unit/sr/srb2kart/wadlocation.patch diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/unit/sr/srcOnly/pkg-fun.nix similarity index 100% rename from pkgs/build-support/src-only/default.nix rename to pkgs/unit/sr/srcOnly/pkg-fun.nix diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/unit/sr/srecord/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/srecord/default.nix rename to pkgs/unit/sr/srecord/pkg-fun.nix diff --git a/pkgs/tools/networking/srelay/arm.patch b/pkgs/unit/sr/srelay/arm.patch similarity index 100% rename from pkgs/tools/networking/srelay/arm.patch rename to pkgs/unit/sr/srelay/arm.patch diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/unit/sr/srelay/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/srelay/default.nix rename to pkgs/unit/sr/srelay/pkg-fun.nix diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/unit/sr/srm/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/srm/default.nix rename to pkgs/unit/sr/srm/pkg-fun.nix diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/unit/sr/srsran/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/srsran/default.nix rename to pkgs/unit/sr/srsran/pkg-fun.nix diff --git a/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch b/pkgs/unit/sr/srt-live-server/fix-insecure-printfs.patch similarity index 100% rename from pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch rename to pkgs/unit/sr/srt-live-server/fix-insecure-printfs.patch diff --git a/pkgs/applications/video/srt-live-server/default.nix b/pkgs/unit/sr/srt-live-server/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/srt-live-server/default.nix rename to pkgs/unit/sr/srt-live-server/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch b/pkgs/unit/sr/srt-to-vtt-cl/fix-validation.patch similarity index 100% rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch rename to pkgs/unit/sr/srt-to-vtt-cl/fix-validation.patch diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/unit/sr/srt-to-vtt-cl/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix rename to pkgs/unit/sr/srt-to-vtt-cl/pkg-fun.nix diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/unit/sr/srt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/srt/default.nix rename to pkgs/unit/sr/srt/pkg-fun.nix diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/unit/sr/srtp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/srtp/default.nix rename to pkgs/unit/sr/srtp/pkg-fun.nix diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/unit/sr/srtrelay/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/srtrelay/default.nix rename to pkgs/unit/sr/srtrelay/pkg-fun.nix diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/unit/ss/ssb-patchwork/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ssb-patchwork/default.nix rename to pkgs/unit/ss/ssb-patchwork/pkg-fun.nix diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/unit/ss/ssb/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ssb/default.nix rename to pkgs/unit/ss/ssb/pkg-fun.nix diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/unit/ss/ssdeep/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ssdeep/default.nix rename to pkgs/unit/ss/ssdeep/pkg-fun.nix diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/unit/ss/sselp/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/sselp/default.nix rename to pkgs/unit/ss/sselp/pkg-fun.nix diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/unit/ss/ssh-agents/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ssh-agents/default.nix rename to pkgs/unit/ss/ssh-agents/pkg-fun.nix diff --git a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/pkgs/unit/ss/ssh-askpass-fullscreen/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ssh-askpass-fullscreen/default.nix rename to pkgs/unit/ss/ssh-askpass-fullscreen/pkg-fun.nix diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/unit/ss/ssh-audit/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ssh-audit/default.nix rename to pkgs/unit/ss/ssh-audit/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/pkgs/unit/ss/ssh-chat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/ssh-chat/default.nix rename to pkgs/unit/ss/ssh-chat/pkg-fun.nix diff --git a/pkgs/tools/networking/openssh/copyid.nix b/pkgs/unit/ss/ssh-copy-id/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openssh/copyid.nix rename to pkgs/unit/ss/ssh-copy-id/pkg-fun.nix diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/unit/ss/ssh-ident/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ssh-ident/default.nix rename to pkgs/unit/ss/ssh-ident/pkg-fun.nix diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/unit/ss/ssh-key-confirmer/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ssh-key-confirmer/default.nix rename to pkgs/unit/ss/ssh-key-confirmer/pkg-fun.nix diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/unit/ss/ssh-to-age/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ssh-to-age/default.nix rename to pkgs/unit/ss/ssh-to-age/pkg-fun.nix diff --git a/pkgs/tools/security/ssh-to-pgp/default.nix b/pkgs/unit/ss/ssh-to-pgp/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ssh-to-pgp/default.nix rename to pkgs/unit/ss/ssh-to-pgp/pkg-fun.nix diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/unit/ss/ssh-tools/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ssh-tools/default.nix rename to pkgs/unit/ss/ssh-tools/pkg-fun.nix diff --git a/pkgs/tools/security/sshchecker/default.nix b/pkgs/unit/ss/sshchecker/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sshchecker/default.nix rename to pkgs/unit/ss/sshchecker/pkg-fun.nix diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/unit/ss/sshfs-fuse/common.nix similarity index 100% rename from pkgs/tools/filesystems/sshfs-fuse/common.nix rename to pkgs/unit/ss/sshfs-fuse/common.nix diff --git a/pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch b/pkgs/unit/ss/sshfs-fuse/fix-fuse-darwin-h.patch similarity index 100% rename from pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch rename to pkgs/unit/ss/sshfs-fuse/fix-fuse-darwin-h.patch diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/unit/ss/sshfs-fuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/sshfs-fuse/default.nix rename to pkgs/unit/ss/sshfs-fuse/pkg-fun.nix diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/unit/ss/sshguard/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sshguard/default.nix rename to pkgs/unit/ss/sshguard/pkg-fun.nix diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/unit/ss/sshlatex/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/sshlatex/default.nix rename to pkgs/unit/ss/sshlatex/pkg-fun.nix diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/unit/ss/sshoogr/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sshoogr/default.nix rename to pkgs/unit/ss/sshoogr/pkg-fun.nix diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/unit/ss/sshpass/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sshpass/default.nix rename to pkgs/unit/ss/sshpass/pkg-fun.nix diff --git a/pkgs/tools/networking/sshping/default.nix b/pkgs/unit/ss/sshping/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sshping/default.nix rename to pkgs/unit/ss/sshping/pkg-fun.nix diff --git a/pkgs/servers/sshportal/default.nix b/pkgs/unit/ss/sshportal/pkg-fun.nix similarity index 100% rename from pkgs/servers/sshportal/default.nix rename to pkgs/unit/ss/sshportal/pkg-fun.nix diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/unit/ss/sshs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sshs/default.nix rename to pkgs/unit/ss/sshs/pkg-fun.nix diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/unit/ss/sshuttle/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sshuttle/default.nix rename to pkgs/unit/ss/sshuttle/pkg-fun.nix diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/unit/ss/sshuttle/sudo.patch similarity index 100% rename from pkgs/tools/security/sshuttle/sudo.patch rename to pkgs/unit/ss/sshuttle/sudo.patch diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/unit/ss/ssl-cert-check/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/ssl-cert-check/default.nix rename to pkgs/unit/ss/ssl-cert-check/pkg-fun.nix diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/unit/ss/ssldump/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ssldump/default.nix rename to pkgs/unit/ss/ssldump/pkg-fun.nix diff --git a/pkgs/servers/sslh/default.nix b/pkgs/unit/ss/sslh/pkg-fun.nix similarity index 100% rename from pkgs/servers/sslh/default.nix rename to pkgs/unit/ss/sslh/pkg-fun.nix diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/unit/ss/sslmate-agent/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sslmate-agent/default.nix rename to pkgs/unit/ss/sslmate-agent/pkg-fun.nix diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/unit/ss/sslmate/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sslmate/default.nix rename to pkgs/unit/ss/sslmate/pkg-fun.nix diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/unit/ss/sslscan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sslscan/default.nix rename to pkgs/unit/ss/sslscan/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch b/pkgs/unit/ss/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch similarity index 100% rename from pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch rename to pkgs/unit/ss/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch diff --git a/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch b/pkgs/unit/ss/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch similarity index 100% rename from pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch rename to pkgs/unit/ss/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/unit/ss/ssm-agent/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/ssm-agent/default.nix rename to pkgs/unit/ss/ssm-agent/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/unit/ss/ssm-session-manager-plugin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix rename to pkgs/unit/ss/ssm-session-manager-plugin/pkg-fun.nix diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/unit/ss/ssmsh/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/ssmsh/default.nix rename to pkgs/unit/ss/ssmsh/pkg-fun.nix diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/unit/ss/ssocr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ssocr/default.nix rename to pkgs/unit/ss/ssocr/pkg-fun.nix diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/unit/ss/ssrc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ssrc/default.nix rename to pkgs/unit/ss/ssrc/pkg-fun.nix diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/unit/ss/ssss/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/ssss/default.nix rename to pkgs/unit/ss/ssss/pkg-fun.nix diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/unit/ss/sstp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/sstp/default.nix rename to pkgs/unit/ss/sstp/pkg-fun.nix diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/unit/ss/ssw/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ssw/default.nix rename to pkgs/unit/ss/ssw/pkg-fun.nix diff --git a/pkgs/development/libraries/StormLib/default.nix b/pkgs/unit/st/StormLib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/StormLib/default.nix rename to pkgs/unit/st/StormLib/pkg-fun.nix diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/unit/st/sta/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sta/default.nix rename to pkgs/unit/st/sta/pkg-fun.nix diff --git a/pkgs/misc/stabber/default.nix b/pkgs/unit/st/stabber/pkg-fun.nix similarity index 100% rename from pkgs/misc/stabber/default.nix rename to pkgs/unit/st/stabber/pkg-fun.nix diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/unit/st/stacks/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/stacks/default.nix rename to pkgs/unit/st/stacks/pkg-fun.nix diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/unit/st/stacs/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/stacs/default.nix rename to pkgs/unit/st/stacs/pkg-fun.nix diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/unit/st/stagit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/stagit/default.nix rename to pkgs/unit/st/stagit/pkg-fun.nix diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/unit/st/stalin/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/stalin/default.nix rename to pkgs/unit/st/stalin/pkg-fun.nix diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/unit/st/stalonetray/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/stalonetray/default.nix rename to pkgs/unit/st/stalonetray/pkg-fun.nix diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/unit/st/stanc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/stanc/default.nix rename to pkgs/unit/st/stanc/pkg-fun.nix diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/unit/st/standardnotes/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/standardnotes/default.nix rename to pkgs/unit/st/standardnotes/pkg-fun.nix diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/unit/st/standardnotes/src.json similarity index 100% rename from pkgs/applications/editors/standardnotes/src.json rename to pkgs/unit/st/standardnotes/src.json diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/unit/st/standardnotes/update.nix similarity index 100% rename from pkgs/applications/editors/standardnotes/update.nix rename to pkgs/unit/st/standardnotes/update.nix diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/unit/st/star/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/star/default.nix rename to pkgs/unit/st/star/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/unit/st/starboard-octant-plugin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix rename to pkgs/unit/st/starboard-octant-plugin/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/unit/st/starboard/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/starboard/default.nix rename to pkgs/unit/st/starboard/pkg-fun.nix diff --git a/pkgs/games/stardust/default.nix b/pkgs/unit/st/stardust/pkg-fun.nix similarity index 100% rename from pkgs/games/stardust/default.nix rename to pkgs/unit/st/stardust/pkg-fun.nix diff --git a/pkgs/tools/misc/starfetch/default.nix b/pkgs/unit/st/starfetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/starfetch/default.nix rename to pkgs/unit/st/starfetch/pkg-fun.nix diff --git a/pkgs/development/libraries/stargate-libcds/Makefile.patch b/pkgs/unit/st/stargate-libcds/Makefile.patch similarity index 100% rename from pkgs/development/libraries/stargate-libcds/Makefile.patch rename to pkgs/unit/st/stargate-libcds/Makefile.patch diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/unit/st/stargate-libcds/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/stargate-libcds/default.nix rename to pkgs/unit/st/stargate-libcds/pkg-fun.nix diff --git a/pkgs/development/interpreters/starlark/default.nix b/pkgs/unit/st/starlark/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/starlark/default.nix rename to pkgs/unit/st/starlark/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/unit/st/starspace/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/starspace/default.nix rename to pkgs/unit/st/starspace/pkg-fun.nix diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/unit/st/staruml/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/staruml/default.nix rename to pkgs/unit/st/staruml/pkg-fun.nix diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/unit/st/static-web-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/static-web-server/default.nix rename to pkgs/unit/st/static-web-server/pkg-fun.nix diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/unit/st/statifier/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/statifier/default.nix rename to pkgs/unit/st/statifier/pkg-fun.nix diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/unit/st/statik/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/statik/default.nix rename to pkgs/unit/st/statik/pkg-fun.nix diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/unit/st/station/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/station/default.nix rename to pkgs/unit/st/station/pkg-fun.nix diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/unit/st/statix/pkg-fun.nix similarity index 100% rename from pkgs/tools/nix/statix/default.nix rename to pkgs/unit/st/statix/pkg-fun.nix diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/unit/st/statserial/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/statserial/default.nix rename to pkgs/unit/st/statserial/pkg-fun.nix diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/unit/st/stayrtr/pkg-fun.nix similarity index 100% rename from pkgs/servers/stayrtr/default.nix rename to pkgs/unit/st/stayrtr/pkg-fun.nix diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/unit/st/stb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/stb/default.nix rename to pkgs/unit/st/stb/pkg-fun.nix diff --git a/pkgs/tools/misc/stderred/default.nix b/pkgs/unit/st/stderred/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/stderred/default.nix rename to pkgs/unit/st/stderred/pkg-fun.nix diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/unit/st/stdman/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/stdman/default.nix rename to pkgs/unit/st/stdman/pkg-fun.nix diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/unit/st/stdmanpages/pkg-fun.nix similarity index 100% rename from pkgs/data/documentation/std-man-pages/default.nix rename to pkgs/unit/st/stdmanpages/pkg-fun.nix diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/unit/st/stduuid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/stduuid/default.nix rename to pkgs/unit/st/stduuid/pkg-fun.nix diff --git a/pkgs/tools/games/steam-acf/default.nix b/pkgs/unit/st/steam-acf/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/steam-acf/default.nix rename to pkgs/unit/st/steam-acf/pkg-fun.nix diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/unit/st/steam-rom-manager/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/steam-rom-manager/default.nix rename to pkgs/unit/st/steam-rom-manager/pkg-fun.nix diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/unit/st/steam-tui/pkg-fun.nix similarity index 100% rename from pkgs/games/steam-tui/default.nix rename to pkgs/unit/st/steam-tui/pkg-fun.nix diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/unit/st/steamcontroller/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/steamcontroller/default.nix rename to pkgs/unit/st/steamcontroller/pkg-fun.nix diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/unit/st/steamos-devkit/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/steamos-devkit/default.nix rename to pkgs/unit/st/steamos-devkit/pkg-fun.nix diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/unit/st/steampipe/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/steampipe/default.nix rename to pkgs/unit/st/steampipe/pkg-fun.nix diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/unit/st/steamtinkerlaunch/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/steamtinkerlaunch/default.nix rename to pkgs/unit/st/steamtinkerlaunch/pkg-fun.nix diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/unit/st/steck/pkg-fun.nix similarity index 100% rename from pkgs/servers/pinnwand/steck.nix rename to pkgs/unit/st/steck/pkg-fun.nix diff --git a/pkgs/tools/graphics/steghide/default.nix b/pkgs/unit/st/steghide/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/steghide/default.nix rename to pkgs/unit/st/steghide/pkg-fun.nix diff --git a/pkgs/tools/security/stegseek/default.nix b/pkgs/unit/st/stegseek/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/stegseek/default.nix rename to pkgs/unit/st/stegseek/pkg-fun.nix diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/unit/st/stegsolve/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/stegsolve/default.nix rename to pkgs/unit/st/stegsolve/pkg-fun.nix diff --git a/pkgs/applications/emulators/stella/default.nix b/pkgs/unit/st/stella/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/stella/default.nix rename to pkgs/unit/st/stella/pkg-fun.nix diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/unit/st/stellar-core/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/stellar-core/default.nix rename to pkgs/unit/st/stellar-core/pkg-fun.nix diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/unit/st/stenc/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/stenc/default.nix rename to pkgs/unit/st/stenc/pkg-fun.nix diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/unit/st/step-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/step-cli/default.nix rename to pkgs/unit/st/step-cli/pkg-fun.nix diff --git a/pkgs/games/stepmania/0001-fix-build-with-ffmpeg-4.patch b/pkgs/unit/st/stepmania/0001-fix-build-with-ffmpeg-4.patch similarity index 100% rename from pkgs/games/stepmania/0001-fix-build-with-ffmpeg-4.patch rename to pkgs/unit/st/stepmania/0001-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/games/stepmania/default.nix b/pkgs/unit/st/stepmania/pkg-fun.nix similarity index 100% rename from pkgs/games/stepmania/default.nix rename to pkgs/unit/st/stepmania/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/unit/st/stern/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/stern/default.nix rename to pkgs/unit/st/stern/pkg-fun.nix diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/unit/st/stevenblack-blocklist/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/stevenblack-blocklist/default.nix rename to pkgs/unit/st/stevenblack-blocklist/pkg-fun.nix diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/unit/st/stfl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/stfl/default.nix rename to pkgs/unit/st/stfl/pkg-fun.nix diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/unit/st/stgit/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/stgit/default.nix rename to pkgs/unit/st/stgit/pkg-fun.nix diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/unit/st/sticky/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sticky/default.nix rename to pkgs/unit/st/sticky/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/unit/st/stig/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/stig/default.nix rename to pkgs/unit/st/stig/pkg-fun.nix diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/unit/st/stilo-themes/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/stilo/default.nix rename to pkgs/unit/st/stilo-themes/pkg-fun.nix diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/unit/st/stix-otf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/stix-otf/default.nix rename to pkgs/unit/st/stix-otf/pkg-fun.nix diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/unit/st/stix-two/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/stix-two/default.nix rename to pkgs/unit/st/stix-two/pkg-fun.nix diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/unit/st/stm32cubemx/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/stm32/stm32cubemx/default.nix rename to pkgs/unit/st/stm32cubemx/pkg-fun.nix diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/unit/st/stm32flash/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/stm32/stm32flash/default.nix rename to pkgs/unit/st/stm32flash/pkg-fun.nix diff --git a/pkgs/development/embedded/stm8/stm8flash/default.nix b/pkgs/unit/st/stm8flash/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/stm8/stm8flash/default.nix rename to pkgs/unit/st/stm8flash/pkg-fun.nix diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/unit/st/stochas/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/stochas/default.nix rename to pkgs/unit/st/stochas/pkg-fun.nix diff --git a/pkgs/games/stockfish/default.nix b/pkgs/unit/st/stockfish/pkg-fun.nix similarity index 100% rename from pkgs/games/stockfish/default.nix rename to pkgs/unit/st/stockfish/pkg-fun.nix diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/unit/st/stone-phaser/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/stone-phaser/default.nix rename to pkgs/unit/st/stone-phaser/pkg-fun.nix diff --git a/pkgs/tools/misc/storcli/default.nix b/pkgs/unit/st/storcli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/storcli/default.nix rename to pkgs/unit/st/storcli/pkg-fun.nix diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/unit/st/storeBackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/store-backup/default.nix rename to pkgs/unit/st/storeBackup/pkg-fun.nix diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/unit/st/storm/pkg-fun.nix similarity index 100% rename from pkgs/servers/computing/storm/default.nix rename to pkgs/unit/st/storm/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/unit/st/storrent/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/storrent/default.nix rename to pkgs/unit/st/storrent/pkg-fun.nix diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/unit/st/stow/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/stow/default.nix rename to pkgs/unit/st/stow/pkg-fun.nix diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/unit/st/stp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/stp/default.nix rename to pkgs/unit/st/stp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/unit/st/strace-analyzer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/strace-analyzer/default.nix rename to pkgs/unit/st/strace-analyzer/pkg-fun.nix diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/unit/st/strace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/strace/default.nix rename to pkgs/unit/st/strace/pkg-fun.nix diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/unit/st/stratis-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/stratis-cli/default.nix rename to pkgs/unit/st/stratis-cli/pkg-fun.nix diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/unit/st/stratisd/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/stratisd/default.nix rename to pkgs/unit/st/stratisd/pkg-fun.nix diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/unit/st/streamlink-twitch-gui-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/streamlink-twitch-gui/bin.nix rename to pkgs/unit/st/streamlink-twitch-gui-bin/pkg-fun.nix diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/unit/st/streamlink/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/streamlink/default.nix rename to pkgs/unit/st/streamlink/pkg-fun.nix diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/unit/st/streamripper/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/streamripper/default.nix rename to pkgs/unit/st/streamripper/pkg-fun.nix diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/unit/st/stress-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/stress-ng/default.nix rename to pkgs/unit/st/stress-ng/pkg-fun.nix diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/unit/st/stress/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/stress/default.nix rename to pkgs/unit/st/stress/pkg-fun.nix diff --git a/pkgs/tools/system/stressapptest/default.nix b/pkgs/unit/st/stressapptest/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/stressapptest/default.nix rename to pkgs/unit/st/stressapptest/pkg-fun.nix diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/unit/st/stretchly/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/stretchly/default.nix rename to pkgs/unit/st/stretchly/pkg-fun.nix diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/unit/st/stricat/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/stricat/default.nix rename to pkgs/unit/st/stricat/pkg-fun.nix diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/unit/st/string-machine/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/string-machine/default.nix rename to pkgs/unit/st/string-machine/pkg-fun.nix diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/pkgs/unit/st/strongswan/ext_auth-path.patch similarity index 100% rename from pkgs/tools/networking/strongswan/ext_auth-path.patch rename to pkgs/unit/st/strongswan/ext_auth-path.patch diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/pkgs/unit/st/strongswan/firewall_defaults.patch similarity index 100% rename from pkgs/tools/networking/strongswan/firewall_defaults.patch rename to pkgs/unit/st/strongswan/firewall_defaults.patch diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/unit/st/strongswan/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/strongswan/default.nix rename to pkgs/unit/st/strongswan/pkg-fun.nix diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/pkgs/unit/st/strongswan/updown-path.patch similarity index 100% rename from pkgs/tools/networking/strongswan/updown-path.patch rename to pkgs/unit/st/strongswan/updown-path.patch diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/unit/st/structure-synth/gcc47.patch similarity index 100% rename from pkgs/tools/graphics/structure-synth/gcc47.patch rename to pkgs/unit/st/structure-synth/gcc47.patch diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/unit/st/structure-synth/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/structure-synth/default.nix rename to pkgs/unit/st/structure-synth/pkg-fun.nix diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/unit/st/stt/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/stt/default.nix rename to pkgs/unit/st/stt/pkg-fun.nix diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/unit/st/stuffbin/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/stuffbin/default.nix rename to pkgs/unit/st/stuffbin/pkg-fun.nix diff --git a/pkgs/applications/window-managers/stumpish/paths.patch b/pkgs/unit/st/stumpish/paths.patch similarity index 100% rename from pkgs/applications/window-managers/stumpish/paths.patch rename to pkgs/unit/st/stumpish/paths.patch diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/unit/st/stumpish/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/stumpish/default.nix rename to pkgs/unit/st/stumpish/pkg-fun.nix diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/unit/st/stun/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/stun/default.nix rename to pkgs/unit/st/stun/pkg-fun.nix diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/unit/st/stunnel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/stunnel/default.nix rename to pkgs/unit/st/stunnel/pkg-fun.nix diff --git a/pkgs/tools/networking/stuntman/default.nix b/pkgs/unit/st/stuntman/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/stuntman/default.nix rename to pkgs/unit/st/stuntman/pkg-fun.nix diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/unit/st/stw/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/stw/default.nix rename to pkgs/unit/st/stw/pkg-fun.nix diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/unit/st/stxxl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/stxxl/default.nix rename to pkgs/unit/st/stxxl/pkg-fun.nix diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/unit/st/stylish/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/stylish/default.nix rename to pkgs/unit/st/stylish/pkg-fun.nix diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/unit/st/stylua/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/stylua/default.nix rename to pkgs/unit/st/stylua/pkg-fun.nix diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/unit/st/styx/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/styx/default.nix rename to pkgs/unit/st/styx/pkg-fun.nix diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/unit/su/su-exec/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/su-exec/default.nix rename to pkgs/unit/su/su-exec/pkg-fun.nix diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/unit/su/sub-batch/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/sub-batch/default.nix rename to pkgs/unit/su/sub-batch/pkg-fun.nix diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/unit/su/subberthehut/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/subberthehut/default.nix rename to pkgs/unit/su/subberthehut/pkg-fun.nix diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/unit/su/subdl/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/subdl/default.nix rename to pkgs/unit/su/subdl/pkg-fun.nix diff --git a/pkgs/tools/text/subedit/default.nix b/pkgs/unit/su/subedit/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/subedit/default.nix rename to pkgs/unit/su/subedit/pkg-fun.nix diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/unit/su/subfinder/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/subfinder/default.nix rename to pkgs/unit/su/subfinder/pkg-fun.nix diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/unit/su/subgit/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/subgit/default.nix rename to pkgs/unit/su/subgit/pkg-fun.nix diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/unit/su/subjs/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/subjs/default.nix rename to pkgs/unit/su/subjs/pkg-fun.nix diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/unit/su/sublime-music/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sublime-music/default.nix rename to pkgs/unit/su/sublime-music/pkg-fun.nix diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/unit/su/sublime/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/sublime/2/default.nix rename to pkgs/unit/su/sublime/pkg-fun.nix diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/unit/su/subnetcalc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/subnetcalc/default.nix rename to pkgs/unit/su/subnetcalc/pkg-fun.nix diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/unit/su/subread/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/subread/default.nix rename to pkgs/unit/su/subread/pkg-fun.nix diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/unit/su/subsonic/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/subsonic/default.nix rename to pkgs/unit/su/subsonic/pkg-fun.nix diff --git a/pkgs/build-support/substitute/substitute.nix b/pkgs/unit/su/substitute/pkg-fun.nix similarity index 100% rename from pkgs/build-support/substitute/substitute.nix rename to pkgs/unit/su/substitute/pkg-fun.nix diff --git a/pkgs/build-support/substitute/substitute.sh b/pkgs/unit/su/substitute/substitute.sh similarity index 100% rename from pkgs/build-support/substitute/substitute.sh rename to pkgs/unit/su/substitute/substitute.sh diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/unit/su/substituteAll/pkg-fun.nix similarity index 100% rename from pkgs/build-support/substitute/substitute-all.nix rename to pkgs/unit/su/substituteAll/pkg-fun.nix diff --git a/pkgs/build-support/substitute/substitute-all.sh b/pkgs/unit/su/substituteAll/substitute-all.sh similarity index 100% rename from pkgs/build-support/substitute/substitute-all.sh rename to pkgs/unit/su/substituteAll/substitute-all.sh diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/unit/su/substituteAllFiles/pkg-fun.nix similarity index 100% rename from pkgs/build-support/substitute-files/substitute-all-files.nix rename to pkgs/unit/su/substituteAllFiles/pkg-fun.nix diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/unit/su/subtitleeditor/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/subtitleeditor/default.nix rename to pkgs/unit/su/subtitleeditor/pkg-fun.nix diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/unit/su/subunit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/subunit/default.nix rename to pkgs/unit/su/subunit/pkg-fun.nix diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/unit/su/sudo-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/sudo/default.nix rename to pkgs/unit/su/sudo-font/pkg-fun.nix diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/unit/su/sudo/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sudo/default.nix rename to pkgs/unit/su/sudo/pkg-fun.nix diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/unit/su/suidChroot/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/suid-chroot/default.nix rename to pkgs/unit/su/suidChroot/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/unit/su/suil/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/suil/default.nix rename to pkgs/unit/su/suil/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/unit/su/suitesparse-graphblas/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix rename to pkgs/unit/su/suitesparse-graphblas/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/unit/su/suitesparse_4_2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/suitesparse/4.2.nix rename to pkgs/unit/su/suitesparse_4_2/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/unit/su/suitesparse_4_4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/suitesparse/4.4.nix rename to pkgs/unit/su/suitesparse_4_4/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/unit/su/suitesparse_5_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/suitesparse/default.nix rename to pkgs/unit/su/suitesparse_5_3/pkg-fun.nix diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/unit/su/summon/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/summon/default.nix rename to pkgs/unit/su/summon/pkg-fun.nix diff --git a/pkgs/development/tools/summon/resolve-paths.patch b/pkgs/unit/su/summon/resolve-paths.patch similarity index 100% rename from pkgs/development/tools/summon/resolve-paths.patch rename to pkgs/unit/su/summon/resolve-paths.patch diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/unit/su/sumo/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/networking/sumo/default.nix rename to pkgs/unit/su/sumo/pkg-fun.nix diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/unit/su/sundtek/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/sundtek/default.nix rename to pkgs/unit/su/sundtek/pkg-fun.nix diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/unit/su/sunpaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/sunpaper/default.nix rename to pkgs/unit/su/sunpaper/pkg-fun.nix diff --git a/pkgs/servers/sunshine/ffmpeg.diff b/pkgs/unit/su/sunshine/ffmpeg.diff similarity index 100% rename from pkgs/servers/sunshine/ffmpeg.diff rename to pkgs/unit/su/sunshine/ffmpeg.diff diff --git a/pkgs/servers/sunshine/package-lock.json b/pkgs/unit/su/sunshine/package-lock.json similarity index 100% rename from pkgs/servers/sunshine/package-lock.json rename to pkgs/unit/su/sunshine/package-lock.json diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/unit/su/sunshine/pkg-fun.nix similarity index 100% rename from pkgs/servers/sunshine/default.nix rename to pkgs/unit/su/sunshine/pkg-fun.nix diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/unit/su/sunvox/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/sunvox/default.nix rename to pkgs/unit/su/sunvox/pkg-fun.nix diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/unit/su/sunwait/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sunwait/default.nix rename to pkgs/unit/su/sunwait/pkg-fun.nix diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/unit/su/sunxi-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/sunxi-tools/default.nix rename to pkgs/unit/su/sunxi-tools/pkg-fun.nix diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/unit/su/supabase-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/supabase-cli/default.nix rename to pkgs/unit/su/supabase-cli/pkg-fun.nix diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/unit/su/super-productivity/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/super-productivity/default.nix rename to pkgs/unit/su/super-productivity/pkg-fun.nix diff --git a/pkgs/data/icons/super-tiny-icons/default.nix b/pkgs/unit/su/super-tiny-icons/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/super-tiny-icons/default.nix rename to pkgs/unit/su/super-tiny-icons/pkg-fun.nix diff --git a/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch b/pkgs/unit/su/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch similarity index 100% rename from pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch rename to pkgs/unit/su/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch diff --git a/pkgs/tools/security/super/default.nix b/pkgs/unit/su/super/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/super/default.nix rename to pkgs/unit/su/super/pkg-fun.nix diff --git a/pkgs/games/supertux/default.nix b/pkgs/unit/su/superTux/pkg-fun.nix similarity index 100% rename from pkgs/games/supertux/default.nix rename to pkgs/unit/su/superTux/pkg-fun.nix diff --git a/pkgs/misc/superd/default.nix b/pkgs/unit/su/superd/pkg-fun.nix similarity index 100% rename from pkgs/misc/superd/default.nix rename to pkgs/unit/su/superd/pkg-fun.nix diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/unit/su/supergfxctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/system/supergfxctl/default.nix rename to pkgs/unit/su/supergfxctl/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/pkgs/unit/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch similarity index 100% rename from pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch rename to pkgs/unit/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/unit/su/superlu/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/superlu/default.nix rename to pkgs/unit/su/superlu/pkg-fun.nix diff --git a/pkgs/tools/virtualization/supermin/default.nix b/pkgs/unit/su/supermin/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/supermin/default.nix rename to pkgs/unit/su/supermin/pkg-fun.nix diff --git a/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/pkgs/unit/su/supertag/cargo-lock-update-lexical-core.patch similarity index 100% rename from pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch rename to pkgs/unit/su/supertag/cargo-lock-update-lexical-core.patch diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/unit/su/supertag/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/supertag/default.nix rename to pkgs/unit/su/supertag/pkg-fun.nix diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/unit/su/supertux-editor/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/supertux-editor/default.nix rename to pkgs/unit/su/supertux-editor/pkg-fun.nix diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/unit/su/supervise/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/supervise/default.nix rename to pkgs/unit/su/supervise/pkg-fun.nix diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/unit/su/surelog/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/surelog/default.nix rename to pkgs/unit/su/surelog/pkg-fun.nix diff --git a/pkgs/desktops/surf-display/pdf-makefile.patch b/pkgs/unit/su/surf-display/pdf-makefile.patch similarity index 100% rename from pkgs/desktops/surf-display/pdf-makefile.patch rename to pkgs/unit/su/surf-display/pdf-makefile.patch diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/unit/su/surf-display/pkg-fun.nix similarity index 100% rename from pkgs/desktops/surf-display/default.nix rename to pkgs/unit/su/surf-display/pkg-fun.nix diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/unit/su/surface-control/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/surface-control/default.nix rename to pkgs/unit/su/surface-control/pkg-fun.nix diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/unit/su/surfraw/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/surfraw/default.nix rename to pkgs/unit/su/surfraw/pkg-fun.nix diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/unit/su/surge-XT/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/surge-XT/default.nix rename to pkgs/unit/su/surge-XT/pkg-fun.nix diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/unit/su/suscan/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/suscan/default.nix rename to pkgs/unit/su/suscan/pkg-fun.nix diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/unit/su/sutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sutils/default.nix rename to pkgs/unit/su/sutils/pkg-fun.nix diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/unit/sv/svaba/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/svaba/default.nix rename to pkgs/unit/sv/svaba/pkg-fun.nix diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/unit/sv/svd2rust/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/svd2rust/default.nix rename to pkgs/unit/sv/svd2rust/pkg-fun.nix diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/unit/sv/svdtools/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/svdtools/default.nix rename to pkgs/unit/sv/svdtools/pkg-fun.nix diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/unit/sv/svg2pdf/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/svg2pdf/default.nix rename to pkgs/unit/sv/svg2pdf/pkg-fun.nix diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/unit/sv/svgbob/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/svgbob/default.nix rename to pkgs/unit/sv/svgbob/pkg-fun.nix diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/unit/sv/svgcleaner/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/svgcleaner/default.nix rename to pkgs/unit/sv/svgcleaner/pkg-fun.nix diff --git a/pkgs/applications/accessibility/svkbd/default.nix b/pkgs/unit/sv/svkbd/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/svkbd/default.nix rename to pkgs/unit/sv/svkbd/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/unit/sv/svlint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/svlint/default.nix rename to pkgs/unit/sv/svlint/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/unit/sv/svls/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/svls/default.nix rename to pkgs/unit/sv/svls/pkg-fun.nix diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/unit/sv/svnfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/svnfs/default.nix rename to pkgs/unit/sv/svnfs/pkg-fun.nix diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/unit/sv/svox/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/svox/default.nix rename to pkgs/unit/sv/svox/pkg-fun.nix diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/unit/sv/svrcore/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/svrcore/default.nix rename to pkgs/unit/sv/svrcore/pkg-fun.nix diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/unit/sv/svt-av1/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/svt-av1/default.nix rename to pkgs/unit/sv/svt-av1/pkg-fun.nix diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/unit/sv/svtplay-dl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/svtplay-dl/default.nix rename to pkgs/unit/sv/svtplay-dl/pkg-fun.nix diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/unit/sw/swagger-codegen/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/swagger-codegen/default.nix rename to pkgs/unit/sw/swagger-codegen/pkg-fun.nix diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/unit/sw/swagger-codegen3/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/swagger-codegen3/default.nix rename to pkgs/unit/sw/swagger-codegen3/pkg-fun.nix diff --git a/pkgs/tools/security/swaggerhole/default.nix b/pkgs/unit/sw/swaggerhole/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/swaggerhole/default.nix rename to pkgs/unit/sw/swaggerhole/pkg-fun.nix diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/unit/sw/swaglyrics/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/swaglyrics/default.nix rename to pkgs/unit/sw/swaglyrics/pkg-fun.nix diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/unit/sw/swaks/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/swaks/default.nix rename to pkgs/unit/sw/swaks/pkg-fun.nix diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/unit/sw/swapspace/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/swapspace/default.nix rename to pkgs/unit/sw/swapspace/pkg-fun.nix diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/unit/sw/swapview/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/swapview/default.nix rename to pkgs/unit/sw/swapview/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/unit/sw/swarm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/swarm/default.nix rename to pkgs/unit/sw/swarm/pkg-fun.nix diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/unit/sw/sway-launcher-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/sway-launcher-desktop/default.nix rename to pkgs/unit/sw/sway-launcher-desktop/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/fix-paths.patch b/pkgs/unit/sw/sway-unwrapped/fix-paths.patch similarity index 100% rename from pkgs/applications/window-managers/sway/fix-paths.patch rename to pkgs/unit/sw/sway-unwrapped/fix-paths.patch diff --git a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch b/pkgs/unit/sw/sway-unwrapped/load-configuration-from-etc.patch similarity index 100% rename from pkgs/applications/window-managers/sway/load-configuration-from-etc.patch rename to pkgs/unit/sw/sway-unwrapped/load-configuration-from-etc.patch diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/unit/sw/sway-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/default.nix rename to pkgs/unit/sw/sway-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch b/pkgs/unit/sw/sway-unwrapped/sway-config-nixos-paths.patch similarity index 100% rename from pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch rename to pkgs/unit/sw/sway-unwrapped/sway-config-nixos-paths.patch diff --git a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/pkgs/unit/sw/sway-unwrapped/sway-config-no-nix-store-references.patch similarity index 100% rename from pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch rename to pkgs/unit/sw/sway-unwrapped/sway-config-no-nix-store-references.patch diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/unit/sw/sway/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/wrapper.nix rename to pkgs/unit/sw/sway/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/unit/sw/swaybg/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/bg.nix rename to pkgs/unit/sw/swaybg/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/swaycons.nix b/pkgs/unit/sw/swaycons/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/swaycons.nix rename to pkgs/unit/sw/swaycons/pkg-fun.nix diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/unit/sw/swaycwd/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/swaycwd/default.nix rename to pkgs/unit/sw/swaycwd/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/unit/sw/swayest-workstyle/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/swayest-workstyle/default.nix rename to pkgs/unit/sw/swayest-workstyle/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/unit/sw/swayidle/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/idle.nix rename to pkgs/unit/sw/swayidle/pkg-fun.nix diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/unit/sw/swayimg/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/swayimg/default.nix rename to pkgs/unit/sw/swayimg/pkg-fun.nix diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/unit/sw/swaykbdd/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/swaykbdd/default.nix rename to pkgs/unit/sw/swaykbdd/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/unit/sw/swaylock-effects/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/lock-effects.nix rename to pkgs/unit/sw/swaylock-effects/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/unit/sw/swaylock-fancy/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/lock-fancy.nix rename to pkgs/unit/sw/swaylock-fancy/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/unit/sw/swaylock/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/lock.nix rename to pkgs/unit/sw/swaylock/pkg-fun.nix diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/unit/sw/swaynag-battery/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/swaynag-battery/default.nix rename to pkgs/unit/sw/swaynag-battery/pkg-fun.nix diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/unit/sw/swaynotificationcenter/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/swaynotificationcenter/default.nix rename to pkgs/unit/sw/swaynotificationcenter/pkg-fun.nix diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/unit/sw/swayr/icon-paths.patch similarity index 100% rename from pkgs/tools/wayland/swayr/icon-paths.patch rename to pkgs/unit/sw/swayr/icon-paths.patch diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/unit/sw/swayr/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/swayr/default.nix rename to pkgs/unit/sw/swayr/pkg-fun.nix diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/unit/sw/swaysettings/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/swaysettings/default.nix rename to pkgs/unit/sw/swaysettings/pkg-fun.nix diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/unit/sw/swaysome/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/swaysome/default.nix rename to pkgs/unit/sw/swaysome/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/ws.nix b/pkgs/unit/sw/swayws/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/ws.nix rename to pkgs/unit/sw/swayws/pkg-fun.nix diff --git a/pkgs/applications/window-managers/sway/wsr.nix b/pkgs/unit/sw/swaywsr/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/sway/wsr.nix rename to pkgs/unit/sw/swaywsr/pkg-fun.nix diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/unit/sw/sweet/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/sweet/default.nix rename to pkgs/unit/sw/sweet/pkg-fun.nix diff --git a/pkgs/servers/swego/default.nix b/pkgs/unit/sw/swego/pkg-fun.nix similarity index 100% rename from pkgs/servers/swego/default.nix rename to pkgs/unit/sw/swego/pkg-fun.nix diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/unit/sw/swh_lv2/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/swh-lv2/default.nix rename to pkgs/unit/sw/swh_lv2/pkg-fun.nix diff --git a/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix b/pkgs/unit/sw/swift-corelibs-libdispatch/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/swift-corelibs-libdispatch/default.nix rename to pkgs/unit/sw/swift-corelibs-libdispatch/pkg-fun.nix diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/unit/sw/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch rename to pkgs/unit/sw/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/unit/sw/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch rename to pkgs/unit/sw/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch b/pkgs/unit/sw/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch rename to pkgs/unit/sw/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/unit/sw/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch rename to pkgs/unit/sw/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch diff --git a/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch b/pkgs/unit/sw/swift/patches/0005-clang-toolchain-dir.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch rename to pkgs/unit/sw/swift/patches/0005-clang-toolchain-dir.patch diff --git a/pkgs/development/compilers/swift/patches/0006-clang-purity.patch b/pkgs/unit/sw/swift/patches/0006-clang-purity.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0006-clang-purity.patch rename to pkgs/unit/sw/swift/patches/0006-clang-purity.patch diff --git a/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch b/pkgs/unit/sw/swift/patches/0007-build-presets-linux-os-stdlib.patch similarity index 100% rename from pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch rename to pkgs/unit/sw/swift/patches/0007-build-presets-linux-os-stdlib.patch diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/unit/sw/swift/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/swift/default.nix rename to pkgs/unit/sw/swift/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/swiftbar/default.nix b/pkgs/unit/sw/swiftbar/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/swiftbar/default.nix rename to pkgs/unit/sw/swiftbar/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/swiftdefaultapps/default.nix b/pkgs/unit/sw/swiftdefaultapps/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/swiftdefaultapps/default.nix rename to pkgs/unit/sw/swiftdefaultapps/pkg-fun.nix diff --git a/pkgs/development/libraries/swiften/build-fix.patch b/pkgs/unit/sw/swiften/build-fix.patch similarity index 100% rename from pkgs/development/libraries/swiften/build-fix.patch rename to pkgs/unit/sw/swiften/build-fix.patch diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/unit/sw/swiften/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/swiften/default.nix rename to pkgs/unit/sw/swiften/pkg-fun.nix diff --git a/pkgs/development/libraries/swiften/scons.patch b/pkgs/unit/sw/swiften/scons.patch similarity index 100% rename from pkgs/development/libraries/swiften/scons.patch rename to pkgs/unit/sw/swiften/scons.patch diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/unit/sw/swiftformat/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/swiftformat/default.nix rename to pkgs/unit/sw/swiftformat/pkg-fun.nix diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/unit/sw/swig1/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/swig/default.nix rename to pkgs/unit/sw/swig1/pkg-fun.nix diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/unit/sw/swig2/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/swig/2.x.nix rename to pkgs/unit/sw/swig2/pkg-fun.nix diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/unit/sw/swig3/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/swig/3.x.nix rename to pkgs/unit/sw/swig3/pkg-fun.nix diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/unit/sw/swig4/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/swig/4.nix rename to pkgs/unit/sw/swig4/pkg-fun.nix diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/unit/sw/swingsane/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/swingsane/default.nix rename to pkgs/unit/sw/swingsane/pkg-fun.nix diff --git a/pkgs/os-specific/linux/switcheroo-control/default.nix b/pkgs/unit/sw/switcheroo-control/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/switcheroo-control/default.nix rename to pkgs/unit/sw/switcheroo-control/pkg-fun.nix diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/unit/sw/sword/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sword/default.nix rename to pkgs/unit/sw/sword/pkg-fun.nix diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/unit/sw/swtpm/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/swtpm/default.nix rename to pkgs/unit/sw/swtpm/pkg-fun.nix diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/unit/sx/sx-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/sx-go/default.nix rename to pkgs/unit/sx/sx-go/pkg-fun.nix diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/unit/sx/sx/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/sx/default.nix rename to pkgs/unit/sx/sx/pkg-fun.nix diff --git a/pkgs/tools/X11/sxhkd/default.nix b/pkgs/unit/sx/sxhkd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/sxhkd/default.nix rename to pkgs/unit/sx/sxhkd/pkg-fun.nix diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/unit/sy/Sylk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/Sylk/default.nix rename to pkgs/unit/sy/Sylk/pkg-fun.nix diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/unit/sy/sycl-info/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/sycl-info/default.nix rename to pkgs/unit/sy/sycl-info/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sydbox/default.nix b/pkgs/unit/sy/sydbox/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sydbox/default.nix rename to pkgs/unit/sy/sydbox/pkg-fun.nix diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/unit/sy/syft/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/syft/default.nix rename to pkgs/unit/sy/syft/pkg-fun.nix diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/unit/sy/symbiyosys/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/symbiyosys/default.nix rename to pkgs/unit/sy/symbiyosys/pkg-fun.nix diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/unit/sy/symbolic-preview/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/symbolic-preview/default.nix rename to pkgs/unit/sy/symbolic-preview/pkg-fun.nix diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/unit/sy/symengine/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/symengine/default.nix rename to pkgs/unit/sy/symengine/pkg-fun.nix diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/unit/sy/symfony-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/symfony-cli/default.nix rename to pkgs/unit/sy/symfony-cli/pkg-fun.nix diff --git a/pkgs/applications/science/logic/symfpu/default.nix b/pkgs/unit/sy/symfpu/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/symfpu/default.nix rename to pkgs/unit/sy/symfpu/pkg-fun.nix diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/unit/sy/symlinks/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/symlinks/default.nix rename to pkgs/unit/sy/symlinks/pkg-fun.nix diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/unit/sy/symmetrica/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/symmetrica/default.nix rename to pkgs/unit/sy/symmetrica/pkg-fun.nix diff --git a/pkgs/servers/mail/sympa/make-docs.patch b/pkgs/unit/sy/sympa/make-docs.patch similarity index 100% rename from pkgs/servers/mail/sympa/make-docs.patch rename to pkgs/unit/sy/sympa/make-docs.patch diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/unit/sy/sympa/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/sympa/default.nix rename to pkgs/unit/sy/sympa/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/unit/sy/sympow/clean-extra-logfile-output-from-pari.patch similarity index 100% rename from pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch rename to pkgs/unit/sy/sympow/clean-extra-logfile-output-from-pari.patch diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/unit/sy/sympow/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/sympow/default.nix rename to pkgs/unit/sy/sympow/pkg-fun.nix diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/unit/sy/synaesthesia/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/synaesthesia/default.nix rename to pkgs/unit/sy/synaesthesia/pkg-fun.nix diff --git a/pkgs/tools/admin/synapse-admin/package.json b/pkgs/unit/sy/synapse-admin/package.json similarity index 100% rename from pkgs/tools/admin/synapse-admin/package.json rename to pkgs/unit/sy/synapse-admin/package.json diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/unit/sy/synapse-admin/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/synapse-admin/default.nix rename to pkgs/unit/sy/synapse-admin/pkg-fun.nix diff --git a/pkgs/tools/admin/synapse-admin/yarn.lock b/pkgs/unit/sy/synapse-admin/yarn.lock similarity index 100% rename from pkgs/tools/admin/synapse-admin/yarn.lock rename to pkgs/unit/sy/synapse-admin/yarn.lock diff --git a/pkgs/tools/admin/synapse-admin/yarn.nix b/pkgs/unit/sy/synapse-admin/yarn.nix similarity index 100% rename from pkgs/tools/admin/synapse-admin/yarn.nix rename to pkgs/unit/sy/synapse-admin/yarn.nix diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/unit/sy/synapse/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/synapse/default.nix rename to pkgs/unit/sy/synapse/pkg-fun.nix diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/unit/sy/syncstorage-rs/pkg-fun.nix similarity index 100% rename from pkgs/servers/syncstorage-rs/default.nix rename to pkgs/unit/sy/syncstorage-rs/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/unit/sy/syncterm/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/syncterm/default.nix rename to pkgs/unit/sy/syncterm/pkg-fun.nix diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/pkgs/unit/sy/syncthing-tray/deps.nix similarity index 100% rename from pkgs/applications/misc/syncthing-tray/deps.nix rename to pkgs/unit/sy/syncthing-tray/deps.nix diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/unit/sy/syncthing-tray/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/syncthing-tray/default.nix rename to pkgs/unit/sy/syncthing-tray/pkg-fun.nix diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/unit/sy/synfigstudio/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/synfigstudio/default.nix rename to pkgs/unit/sy/synfigstudio/pkg-fun.nix diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/unit/sy/synology-cloud-sync-decryption-tool/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix rename to pkgs/unit/sy/synology-cloud-sync-decryption-tool/pkg-fun.nix diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/unit/sy/synology-drive-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/synology-drive-client/default.nix rename to pkgs/unit/sy/synology-drive-client/pkg-fun.nix diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/unit/sy/syntex/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/syntex/default.nix rename to pkgs/unit/sy/syntex/pkg-fun.nix diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/unit/sy/sysbench/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/sysbench/default.nix rename to pkgs/unit/sy/sysbench/pkg-fun.nix diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/unit/sy/syscall_limiter/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/syscall_limiter/default.nix rename to pkgs/unit/sy/syscall_limiter/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/unit/sy/sysfsutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sysfsutils/default.nix rename to pkgs/unit/sy/sysfsutils/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch b/pkgs/unit/sy/sysklogd/fix-includes-for-musl.patch similarity index 100% rename from pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch rename to pkgs/unit/sy/sysklogd/fix-includes-for-musl.patch diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/unit/sy/sysklogd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sysklogd/default.nix rename to pkgs/unit/sy/sysklogd/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/unit/sy/sysklogd/systemd.patch similarity index 100% rename from pkgs/os-specific/linux/sysklogd/systemd.patch rename to pkgs/unit/sy/sysklogd/systemd.patch diff --git a/pkgs/os-specific/linux/sysklogd/union-wait.patch b/pkgs/unit/sy/sysklogd/union-wait.patch similarity index 100% rename from pkgs/os-specific/linux/sysklogd/union-wait.patch rename to pkgs/unit/sy/sysklogd/union-wait.patch diff --git a/pkgs/os-specific/linux/syslinux/gcc10.patch b/pkgs/unit/sy/syslinux/gcc10.patch similarity index 100% rename from pkgs/os-specific/linux/syslinux/gcc10.patch rename to pkgs/unit/sy/syslinux/gcc10.patch diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/unit/sy/syslinux/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/syslinux/default.nix rename to pkgs/unit/sy/syslinux/pkg-fun.nix diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/unit/sy/syslogng/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/syslog-ng/default.nix rename to pkgs/unit/sy/syslogng/pkg-fun.nix diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/unit/sy/sysprof/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/profiling/sysprof/default.nix rename to pkgs/unit/sy/sysprof/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/unit/sy/sysstat/install.patch similarity index 100% rename from pkgs/os-specific/linux/sysstat/install.patch rename to pkgs/unit/sy/sysstat/install.patch diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/unit/sy/sysstat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sysstat/default.nix rename to pkgs/unit/sy/sysstat/pkg-fun.nix diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/unit/sy/system-syzygy/pkg-fun.nix similarity index 100% rename from pkgs/games/system-syzygy/default.nix rename to pkgs/unit/sy/system-syzygy/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/unit/sy/system76-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/system76-firmware/default.nix rename to pkgs/unit/sy/system76-firmware/pkg-fun.nix diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/unit/sy/system76-keyboard-configurator/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/system76-keyboard-configurator/default.nix rename to pkgs/unit/sy/system76-keyboard-configurator/pkg-fun.nix diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/unit/sy/systembus-notify/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/systembus-notify/default.nix rename to pkgs/unit/sy/systembus-notify/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/unit/sy/systemc/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/systemc/default.nix rename to pkgs/unit/sy/systemc/pkg-fun.nix diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/unit/sy/systemd-journal2gelf/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/systemd-journal2gelf/default.nix rename to pkgs/unit/sy/systemd-journal2gelf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/unit/sy/systemd-wait/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/systemd-wait/default.nix rename to pkgs/unit/sy/systemd-wait/pkg-fun.nix diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/unit/sy/systemfd/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/systemfd/default.nix rename to pkgs/unit/sy/systemfd/pkg-fun.nix diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/unit/sy/systeroid/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/systeroid/default.nix rename to pkgs/unit/sy/systeroid/pkg-fun.nix diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/unit/sy/systrayhelper/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/systrayhelper/default.nix rename to pkgs/unit/sy/systrayhelper/pkg-fun.nix diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/unit/sy/sysvinit/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/sysvinit/default.nix rename to pkgs/unit/sy/sysvinit/pkg-fun.nix diff --git a/pkgs/tools/misc/sysz/default.nix b/pkgs/unit/sy/sysz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/sysz/default.nix rename to pkgs/unit/sy/sysz/pkg-fun.nix diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/unit/sz/szip/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/szip/default.nix rename to pkgs/unit/sz/szip/pkg-fun.nix diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/unit/sz/szyszka/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/szyszka/default.nix rename to pkgs/unit/sz/szyszka/pkg-fun.nix diff --git a/pkgs/tools/misc/t/Gemfile b/pkgs/unit/t/t/Gemfile similarity index 100% rename from pkgs/tools/misc/t/Gemfile rename to pkgs/unit/t/t/Gemfile diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/unit/t/t/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/t/Gemfile.lock rename to pkgs/unit/t/t/Gemfile.lock diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/unit/t/t/gemset.nix similarity index 100% rename from pkgs/tools/misc/t/gemset.nix rename to pkgs/unit/t/t/gemset.nix diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/unit/t/t/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/t/default.nix rename to pkgs/unit/t/t/pkg-fun.nix diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/unit/t1/t1lib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/t1lib/default.nix rename to pkgs/unit/t1/t1lib/pkg-fun.nix diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/unit/t1/t1utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/t1utils/default.nix rename to pkgs/unit/t1/t1utils/pkg-fun.nix diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/unit/t4/t4kcommon/pkg-fun.nix similarity index 100% rename from pkgs/games/t4kcommon/default.nix rename to pkgs/unit/t4/t4kcommon/pkg-fun.nix diff --git a/pkgs/development/libraries/ta-lib/default.nix b/pkgs/unit/ta/ta-lib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ta-lib/default.nix rename to pkgs/unit/ta/ta-lib/pkg-fun.nix diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/unit/ta/tab/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/tab/default.nix rename to pkgs/unit/ta/tab/pkg-fun.nix diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/unit/ta/tabbed/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/tabbed/default.nix rename to pkgs/unit/ta/tabbed/pkg-fun.nix diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/unit/ta/tabnine/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/tabnine/default.nix rename to pkgs/unit/ta/tabnine/pkg-fun.nix diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/unit/ta/tabnine/sources.json similarity index 100% rename from pkgs/development/tools/tabnine/sources.json rename to pkgs/unit/ta/tabnine/sources.json diff --git a/pkgs/development/tools/tabnine/update.sh b/pkgs/unit/ta/tabnine/update.sh similarity index 100% rename from pkgs/development/tools/tabnine/update.sh rename to pkgs/unit/ta/tabnine/update.sh diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/unit/ta/tabula-java/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tabula-java/default.nix rename to pkgs/unit/ta/tabula-java/pkg-fun.nix diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/unit/ta/tabula/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tabula/default.nix rename to pkgs/unit/ta/tabula/pkg-fun.nix diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/unit/ta/tacacsplus/pkg-fun.nix similarity index 100% rename from pkgs/servers/tacacsplus/default.nix rename to pkgs/unit/ta/tacacsplus/pkg-fun.nix diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/unit/ta/tagger/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tagger/default.nix rename to pkgs/unit/ta/tagger/pkg-fun.nix diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/unit/ta/taglib-sharp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/taglib-sharp/default.nix rename to pkgs/unit/ta/taglib-sharp/pkg-fun.nix diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/unit/ta/taglib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/taglib/default.nix rename to pkgs/unit/ta/taglib/pkg-fun.nix diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/unit/ta/taglib_extras/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/taglib-extras/default.nix rename to pkgs/unit/ta/taglib_extras/pkg-fun.nix diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/unit/ta/tagparser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tagparser/default.nix rename to pkgs/unit/ta/tagparser/pkg-fun.nix diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/unit/ta/tagref/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tagref/default.nix rename to pkgs/unit/ta/tagref/pkg-fun.nix diff --git a/pkgs/applications/misc/tagtime/default.nix b/pkgs/unit/ta/tagtime/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tagtime/default.nix rename to pkgs/unit/ta/tagtime/pkg-fun.nix diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/unit/ta/tagutil/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tagutil/default.nix rename to pkgs/unit/ta/tagutil/pkg-fun.nix diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/unit/ta/tahoe-lafs/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/p2p/tahoe-lafs/default.nix rename to pkgs/unit/ta/tahoe-lafs/pkg-fun.nix diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/unit/ta/tailor/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/tailor/default.nix rename to pkgs/unit/ta/tailor/pkg-fun.nix diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/unit/ta/tailscale/pkg-fun.nix similarity index 100% rename from pkgs/servers/tailscale/default.nix rename to pkgs/unit/ta/tailscale/pkg-fun.nix diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/unit/ta/tailspin/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tailspin/default.nix rename to pkgs/unit/ta/tailspin/pkg-fun.nix diff --git a/pkgs/games/taisei/0001-lto-fix.patch b/pkgs/unit/ta/taisei/0001-lto-fix.patch similarity index 100% rename from pkgs/games/taisei/0001-lto-fix.patch rename to pkgs/unit/ta/taisei/0001-lto-fix.patch diff --git a/pkgs/games/taisei/default.nix b/pkgs/unit/ta/taisei/pkg-fun.nix similarity index 100% rename from pkgs/games/taisei/default.nix rename to pkgs/unit/ta/taisei/pkg-fun.nix diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/unit/ta/takao/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/takao/default.nix rename to pkgs/unit/ta/takao/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/unit/ta/taktuk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/taktuk/default.nix rename to pkgs/unit/ta/taktuk/pkg-fun.nix diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/unit/ta/talentedhack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/talentedhack/default.nix rename to pkgs/unit/ta/talentedhack/pkg-fun.nix diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/unit/ta/talkfilters/pkg-fun.nix similarity index 100% rename from pkgs/misc/talkfilters/default.nix rename to pkgs/unit/ta/talkfilters/pkg-fun.nix diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/unit/ta/talloc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/talloc/default.nix rename to pkgs/unit/ta/talloc/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/unit/ta/talosctl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/talosctl/default.nix rename to pkgs/unit/ta/talosctl/pkg-fun.nix diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/unit/ta/tambura/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tambura/default.nix rename to pkgs/unit/ta/tambura/pkg-fun.nix diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/unit/ta/tamsyn/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tamsyn/default.nix rename to pkgs/unit/ta/tamsyn/pkg-fun.nix diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/unit/ta/tamzen/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tamzen/default.nix rename to pkgs/unit/ta/tamzen/pkg-fun.nix diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/unit/ta/tandem-aligner/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/tandem-aligner/default.nix rename to pkgs/unit/ta/tandem-aligner/pkg-fun.nix diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/unit/ta/tandoor-recipes/common.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/common.nix rename to pkgs/unit/ta/tandoor-recipes/common.nix diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/unit/ta/tandoor-recipes/frontend.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/frontend.nix rename to pkgs/unit/ta/tandoor-recipes/frontend.nix diff --git a/pkgs/applications/misc/tandoor-recipes/media-root.patch b/pkgs/unit/ta/tandoor-recipes/media-root.patch similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/media-root.patch rename to pkgs/unit/ta/tandoor-recipes/media-root.patch diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/unit/ta/tandoor-recipes/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/default.nix rename to pkgs/unit/ta/tandoor-recipes/pkg-fun.nix diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/unit/ta/tandoor-recipes/update.sh similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/update.sh rename to pkgs/unit/ta/tandoor-recipes/update.sh diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/unit/ta/tangram/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/tangram/default.nix rename to pkgs/unit/ta/tangram/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/unit/ta/tanka/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tanka/default.nix rename to pkgs/unit/ta/tanka/pkg-fun.nix diff --git a/pkgs/tools/misc/taoup/cachefile.patch b/pkgs/unit/ta/taoup/cachefile.patch similarity index 100% rename from pkgs/tools/misc/taoup/cachefile.patch rename to pkgs/unit/ta/taoup/cachefile.patch diff --git a/pkgs/tools/misc/taoup/help.patch b/pkgs/unit/ta/taoup/help.patch similarity index 100% rename from pkgs/tools/misc/taoup/help.patch rename to pkgs/unit/ta/taoup/help.patch diff --git a/pkgs/tools/misc/taoup/default.nix b/pkgs/unit/ta/taoup/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/taoup/default.nix rename to pkgs/unit/ta/taoup/pkg-fun.nix diff --git a/pkgs/tools/misc/taoup/tput.patch b/pkgs/unit/ta/taoup/tput.patch similarity index 100% rename from pkgs/tools/misc/taoup/tput.patch rename to pkgs/unit/ta/taoup/tput.patch diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/unit/ta/tap-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tap-plugins/default.nix rename to pkgs/unit/ta/tap-plugins/pkg-fun.nix diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/unit/ta/tapview/dont_check_echo.patch similarity index 100% rename from pkgs/development/tools/tapview/dont_check_echo.patch rename to pkgs/unit/ta/tapview/dont_check_echo.patch diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/unit/ta/tapview/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/tapview/default.nix rename to pkgs/unit/ta/tapview/pkg-fun.nix diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/unit/ta/tar2ext4/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/tar2ext4/default.nix rename to pkgs/unit/ta/tar2ext4/pkg-fun.nix diff --git a/pkgs/servers/tarantool/default.nix b/pkgs/unit/ta/tarantool/pkg-fun.nix similarity index 100% rename from pkgs/servers/tarantool/default.nix rename to pkgs/unit/ta/tarantool/pkg-fun.nix diff --git a/pkgs/os-specific/linux/target-isns/install_prefix_path.patch b/pkgs/unit/ta/target-isns/install_prefix_path.patch similarity index 100% rename from pkgs/os-specific/linux/target-isns/install_prefix_path.patch rename to pkgs/unit/ta/target-isns/install_prefix_path.patch diff --git a/pkgs/os-specific/linux/target-isns/default.nix b/pkgs/unit/ta/target-isns/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/target-isns/default.nix rename to pkgs/unit/ta/target-isns/pkg-fun.nix diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/unit/ta/targetcli/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/targetcli/default.nix rename to pkgs/unit/ta/targetcli/pkg-fun.nix diff --git a/pkgs/tools/archivers/tarlz/default.nix b/pkgs/unit/ta/tarlz/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/tarlz/default.nix rename to pkgs/unit/ta/tarlz/pkg-fun.nix diff --git a/pkgs/applications/blockchains/taro/default.nix b/pkgs/unit/ta/taro/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/taro/default.nix rename to pkgs/unit/ta/taro/pkg-fun.nix diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/unit/ta/tarsnap/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/tarsnap/default.nix rename to pkgs/unit/ta/tarsnap/pkg-fun.nix diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/unit/ta/tarsnapper/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/tarsnapper/default.nix rename to pkgs/unit/ta/tarsnapper/pkg-fun.nix diff --git a/pkgs/tools/backup/tarsnapper/remove-argparse.patch b/pkgs/unit/ta/tarsnapper/remove-argparse.patch similarity index 100% rename from pkgs/tools/backup/tarsnapper/remove-argparse.patch rename to pkgs/unit/ta/tarsnapper/remove-argparse.patch diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/unit/ta/tarssh/pkg-fun.nix similarity index 100% rename from pkgs/servers/tarssh/default.nix rename to pkgs/unit/ta/tarssh/pkg-fun.nix diff --git a/pkgs/build-support/docker/tarsum.nix b/pkgs/unit/ta/tarsum/pkg-fun.nix similarity index 100% rename from pkgs/build-support/docker/tarsum.nix rename to pkgs/unit/ta/tarsum/pkg-fun.nix diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/unit/ta/tarsum/tarsum.go similarity index 100% rename from pkgs/build-support/docker/tarsum.go rename to pkgs/unit/ta/tarsum/tarsum.go diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/unit/ta/tartan/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/tartan/default.nix rename to pkgs/unit/ta/tartan/pkg-fun.nix diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/unit/ta/taskflow/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/taskflow/default.nix rename to pkgs/unit/ta/taskflow/pkg-fun.nix diff --git a/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/pkgs/unit/ta/taskflow/unvendor-doctest.patch similarity index 100% rename from pkgs/development/libraries/taskflow/unvendor-doctest.patch rename to pkgs/unit/ta/taskflow/unvendor-doctest.patch diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/unit/ta/taskjuggler/3.x/Gemfile similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile rename to pkgs/unit/ta/taskjuggler/3.x/Gemfile diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/unit/ta/taskjuggler/3.x/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock rename to pkgs/unit/ta/taskjuggler/3.x/Gemfile.lock diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/unit/ta/taskjuggler/3.x/gemset.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/gemset.nix rename to pkgs/unit/ta/taskjuggler/3.x/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/pkgs/unit/ta/taskjuggler/Gemfile similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile rename to pkgs/unit/ta/taskjuggler/Gemfile diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/unit/ta/taskjuggler/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile.lock rename to pkgs/unit/ta/taskjuggler/Gemfile.lock diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/unit/ta/taskjuggler/gemset.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/gemset.nix rename to pkgs/unit/ta/taskjuggler/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/unit/ta/taskjuggler/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/default.nix rename to pkgs/unit/ta/taskjuggler/pkg-fun.nix diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/unit/ta/tasknc/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tasknc/default.nix rename to pkgs/unit/ta/tasknc/pkg-fun.nix diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/unit/ta/taskopen/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/taskopen/default.nix rename to pkgs/unit/ta/taskopen/pkg-fun.nix diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/unit/ta/taskserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/taskserver/default.nix rename to pkgs/unit/ta/taskserver/pkg-fun.nix diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/unit/ta/tasksh/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tasksh/default.nix rename to pkgs/unit/ta/tasksh/pkg-fun.nix diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/unit/ta/taskspooler/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/taskspooler/default.nix rename to pkgs/unit/ta/taskspooler/pkg-fun.nix diff --git a/pkgs/applications/misc/tasktimer/default.nix b/pkgs/unit/ta/tasktimer/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tasktimer/default.nix rename to pkgs/unit/ta/tasktimer/pkg-fun.nix diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/unit/ta/taskwarrior-tui/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/taskwarrior-tui/default.nix rename to pkgs/unit/ta/taskwarrior-tui/pkg-fun.nix diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/unit/ta/taskwarrior/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/taskwarrior/default.nix rename to pkgs/unit/ta/taskwarrior/pkg-fun.nix diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/unit/ta/tauon/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tauon/default.nix rename to pkgs/unit/ta/tauon/pkg-fun.nix diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/unit/ta/taxi/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ftp/taxi/default.nix rename to pkgs/unit/ta/taxi/pkg-fun.nix diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/unit/ta/tayga/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tayga/default.nix rename to pkgs/unit/ta/tayga/pkg-fun.nix diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/unit/tb/tbb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tbb/default.nix rename to pkgs/unit/tb/tbb/pkg-fun.nix diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/unit/tb/tbls/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tbls/default.nix rename to pkgs/unit/tb/tbls/pkg-fun.nix diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/unit/tb/tboot/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tboot/default.nix rename to pkgs/unit/tb/tboot/pkg-fun.nix diff --git a/pkgs/tools/misc/tcat/default.nix b/pkgs/unit/tc/tcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tcat/default.nix rename to pkgs/unit/tc/tcat/pkg-fun.nix diff --git a/pkgs/tools/security/tcb/fix-makefiles.patch b/pkgs/unit/tc/tcb/fix-makefiles.patch similarity index 100% rename from pkgs/tools/security/tcb/fix-makefiles.patch rename to pkgs/unit/tc/tcb/fix-makefiles.patch diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/unit/tc/tcb/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tcb/default.nix rename to pkgs/unit/tc/tcb/pkg-fun.nix diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/unit/tc/tcl2048/pkg-fun.nix similarity index 100% rename from pkgs/games/tcl2048/default.nix rename to pkgs/unit/tc/tcl2048/pkg-fun.nix diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/unit/tc/tclap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tclap/default.nix rename to pkgs/unit/tc/tclap/pkg-fun.nix diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/unit/tc/tcllib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tcllib/default.nix rename to pkgs/unit/tc/tcllib/pkg-fun.nix diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/unit/tc/tclreadline/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/tclreadline/default.nix rename to pkgs/unit/tc/tclreadline/pkg-fun.nix diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/unit/tc/tcltls/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tcltls/default.nix rename to pkgs/unit/tc/tcltls/pkg-fun.nix diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/unit/tc/tclx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tclx/default.nix rename to pkgs/unit/tc/tclx/pkg-fun.nix diff --git a/pkgs/tools/networking/tcp-cutter/default.nix b/pkgs/unit/tc/tcp-cutter/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tcp-cutter/default.nix rename to pkgs/unit/tc/tcp-cutter/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/pkgs/unit/tc/tcp_wrappers/cdecls.patch similarity index 100% rename from pkgs/os-specific/linux/tcp-wrappers/cdecls.patch rename to pkgs/unit/tc/tcp_wrappers/cdecls.patch diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/unit/tc/tcp_wrappers/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tcp-wrappers/default.nix rename to pkgs/unit/tc/tcp_wrappers/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch b/pkgs/unit/tc/tcp_wrappers/tcp-wrappers-7.6-headers.patch similarity index 100% rename from pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch rename to pkgs/unit/tc/tcp_wrappers/tcp-wrappers-7.6-headers.patch diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/unit/tc/tcpcrypt/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tcpcrypt/default.nix rename to pkgs/unit/tc/tcpcrypt/pkg-fun.nix diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/unit/tc/tcpdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tcpdump/default.nix rename to pkgs/unit/tc/tcpdump/pkg-fun.nix diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/unit/tc/tcpflow/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tcpflow/default.nix rename to pkgs/unit/tc/tcpflow/pkg-fun.nix diff --git a/pkgs/applications/networking/tcping-go/default.nix b/pkgs/unit/tc/tcping-go/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/tcping-go/default.nix rename to pkgs/unit/tc/tcping-go/pkg-fun.nix diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/unit/tc/tcpkali/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/tcpkali/default.nix rename to pkgs/unit/tc/tcpkali/pkg-fun.nix diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/unit/tc/tcptraceroute/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tcptraceroute/default.nix rename to pkgs/unit/tc/tcptraceroute/pkg-fun.nix diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/unit/tc/tcptrack/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/tcptrack/default.nix rename to pkgs/unit/tc/tcptrack/pkg-fun.nix diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/unit/tc/tcsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/tcsh/default.nix rename to pkgs/unit/tc/tcsh/pkg-fun.nix diff --git a/pkgs/tools/misc/td/Gemfile b/pkgs/unit/td/td/Gemfile similarity index 100% rename from pkgs/tools/misc/td/Gemfile rename to pkgs/unit/td/td/Gemfile diff --git a/pkgs/tools/misc/td/Gemfile.lock b/pkgs/unit/td/td/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/td/Gemfile.lock rename to pkgs/unit/td/td/Gemfile.lock diff --git a/pkgs/tools/misc/td/gemset.nix b/pkgs/unit/td/td/gemset.nix similarity index 100% rename from pkgs/tools/misc/td/gemset.nix rename to pkgs/unit/td/td/gemset.nix diff --git a/pkgs/tools/misc/td/default.nix b/pkgs/unit/td/td/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/td/default.nix rename to pkgs/unit/td/td/pkg-fun.nix diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/unit/td/tdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tdb/default.nix rename to pkgs/unit/td/tdb/pkg-fun.nix diff --git a/pkgs/tools/misc/tdfgo/default.nix b/pkgs/unit/td/tdfgo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tdfgo/default.nix rename to pkgs/unit/td/tdfgo/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/pkgs/unit/td/tdlib-purple/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix rename to pkgs/unit/td/tdlib-purple/pkg-fun.nix diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/unit/td/tdlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tdlib/default.nix rename to pkgs/unit/td/tdlib/pkg-fun.nix diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/unit/td/tdns-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tdns-cli/default.nix rename to pkgs/unit/td/tdns-cli/pkg-fun.nix diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/unit/td/tdrop/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tdrop/default.nix rename to pkgs/unit/td/tdrop/pkg-fun.nix diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/unit/te/tea/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tea/default.nix rename to pkgs/unit/te/tea/pkg-fun.nix diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/unit/te/teamocil/Gemfile similarity index 100% rename from pkgs/tools/misc/teamocil/Gemfile rename to pkgs/unit/te/teamocil/Gemfile diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/unit/te/teamocil/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/teamocil/Gemfile.lock rename to pkgs/unit/te/teamocil/Gemfile.lock diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/unit/te/teamocil/gemset.nix similarity index 100% rename from pkgs/tools/misc/teamocil/gemset.nix rename to pkgs/unit/te/teamocil/gemset.nix diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/unit/te/teamocil/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/teamocil/default.nix rename to pkgs/unit/te/teamocil/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/unit/te/teams/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/teams/default.nix rename to pkgs/unit/te/teams/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/unit/te/teamspeak5_client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/teamspeak/client5.nix rename to pkgs/unit/te/teamspeak5_client/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/unit/te/teamspeak_server/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/teamspeak/server.nix rename to pkgs/unit/te/teamspeak_server/pkg-fun.nix diff --git a/pkgs/applications/office/teapot/001-fix-warning.patch b/pkgs/unit/te/teapot/001-fix-warning.patch similarity index 100% rename from pkgs/applications/office/teapot/001-fix-warning.patch rename to pkgs/unit/te/teapot/001-fix-warning.patch diff --git a/pkgs/applications/office/teapot/002-remove-help.patch b/pkgs/unit/te/teapot/002-remove-help.patch similarity index 100% rename from pkgs/applications/office/teapot/002-remove-help.patch rename to pkgs/unit/te/teapot/002-remove-help.patch diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/unit/te/teapot/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/teapot/default.nix rename to pkgs/unit/te/teapot/pkg-fun.nix diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/unit/te/tebreak/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/tebreak/default.nix rename to pkgs/unit/te/tebreak/pkg-fun.nix diff --git a/pkgs/os-specific/linux/teck-udev-rules/default.nix b/pkgs/unit/te/teck-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/teck-udev-rules/default.nix rename to pkgs/unit/te/teck-udev-rules/pkg-fun.nix diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/unit/te/tecla/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tecla/default.nix rename to pkgs/unit/te/tecla/pkg-fun.nix diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/unit/te/tecnoballz/pkg-fun.nix similarity index 100% rename from pkgs/games/tecnoballz/default.nix rename to pkgs/unit/te/tecnoballz/pkg-fun.nix diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/unit/te/tecoc/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/tecoc/default.nix rename to pkgs/unit/te/tecoc/pkg-fun.nix diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/unit/te/ted/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/ted/default.nix rename to pkgs/unit/te/ted/pkg-fun.nix diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/unit/te/teensy-loader-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/teensy-loader-cli/default.nix rename to pkgs/unit/te/teensy-loader-cli/pkg-fun.nix diff --git a/pkgs/os-specific/linux/teensy-udev-rules/default.nix b/pkgs/unit/te/teensy-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/teensy-udev-rules/default.nix rename to pkgs/unit/te/teensy-udev-rules/pkg-fun.nix diff --git a/pkgs/os-specific/linux/teensy-udev-rules/teensy.rules b/pkgs/unit/te/teensy-udev-rules/teensy.rules similarity index 100% rename from pkgs/os-specific/linux/teensy-udev-rules/teensy.rules rename to pkgs/unit/te/teensy-udev-rules/teensy.rules diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/unit/te/teetertorture/pkg-fun.nix similarity index 100% rename from pkgs/games/teetertorture/default.nix rename to pkgs/unit/te/teetertorture/pkg-fun.nix diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/unit/te/teeworlds/pkg-fun.nix similarity index 100% rename from pkgs/games/teeworlds/default.nix rename to pkgs/unit/te/teeworlds/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/unit/te/tegaki-zinnia-japanese/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix rename to pkgs/unit/te/tegaki-zinnia-japanese/pkg-fun.nix diff --git a/pkgs/servers/geospatial/tegola/default.nix b/pkgs/unit/te/tegola/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/tegola/default.nix rename to pkgs/unit/te/tegola/pkg-fun.nix diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/unit/te/teip/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/teip/default.nix rename to pkgs/unit/te/teip/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/unit/te/tektoncd-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tektoncd-cli/default.nix rename to pkgs/unit/te/tektoncd-cli/pkg-fun.nix diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/unit/te/tela-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/tela-icon-theme/default.nix rename to pkgs/unit/te/tela-icon-theme/pkg-fun.nix diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/unit/te/telegraf/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/telegraf/default.nix rename to pkgs/unit/te/telegraf/pkg-fun.nix diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/unit/te/telegram-bot-api/pkg-fun.nix similarity index 100% rename from pkgs/servers/telegram-bot-api/default.nix rename to pkgs/unit/te/telegram-bot-api/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/unit/te/telegram-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix rename to pkgs/unit/te/telegram-cli/pkg-fun.nix diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/unit/te/telepathy-farstream/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/telepathy/farstream/default.nix rename to pkgs/unit/te/telepathy-farstream/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/unit/te/telepathy-gabble/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix rename to pkgs/unit/te/telepathy-gabble/pkg-fun.nix diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/unit/te/telepathy-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/telepathy/glib/default.nix rename to pkgs/unit/te/telepathy-glib/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/unit/te/telepathy-haze/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix rename to pkgs/unit/te/telepathy-haze/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/unit/te/telepathy-idle/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix rename to pkgs/unit/te/telepathy-idle/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/unit/te/telepathy-logger/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix rename to pkgs/unit/te/telepathy-logger/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/unit/te/telepathy-mission-control/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix rename to pkgs/unit/te/telepathy-mission-control/pkg-fun.nix diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/unit/te/telepresence2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/telepresence2/default.nix rename to pkgs/unit/te/telepresence2/pkg-fun.nix diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/unit/te/teleprompter/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/teleprompter/default.nix rename to pkgs/unit/te/teleprompter/pkg-fun.nix diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/unit/te/teler/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/teler/default.nix rename to pkgs/unit/te/teler/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/unit/te/telescope/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/telescope/default.nix rename to pkgs/unit/te/telescope/pkg-fun.nix diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/unit/te/template-glib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/template-glib/default.nix rename to pkgs/unit/te/template-glib/pkg-fun.nix diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/unit/te/tempo/pkg-fun.nix similarity index 100% rename from pkgs/servers/tracing/tempo/default.nix rename to pkgs/unit/te/tempo/pkg-fun.nix diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/unit/te/tempora_lgc/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tempora-lgc/default.nix rename to pkgs/unit/te/tempora_lgc/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/unit/te/temporal-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/temporal-cli/default.nix rename to pkgs/unit/te/temporal-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/unit/te/temporal/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/temporal/default.nix rename to pkgs/unit/te/temporal/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/unit/te/temporalite/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/temporalite/default.nix rename to pkgs/unit/te/temporalite/pkg-fun.nix diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/unit/te/tenacity/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tenacity/default.nix rename to pkgs/unit/te/tenacity/pkg-fun.nix diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/unit/te/tendermint/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tendermint/default.nix rename to pkgs/unit/te/tendermint/pkg-fun.nix diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/unit/te/tenderness/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tenderness/default.nix rename to pkgs/unit/te/tenderness/pkg-fun.nix diff --git a/pkgs/games/tennix/fix_FTBFS.patch b/pkgs/unit/te/tennix/fix_FTBFS.patch similarity index 100% rename from pkgs/games/tennix/fix_FTBFS.patch rename to pkgs/unit/te/tennix/fix_FTBFS.patch diff --git a/pkgs/games/tennix/default.nix b/pkgs/unit/te/tennix/pkg-fun.nix similarity index 100% rename from pkgs/games/tennix/default.nix rename to pkgs/unit/te/tennix/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch b/pkgs/unit/te/tensorflow-lite/eigen_include_dir.patch similarity index 100% rename from pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch rename to pkgs/unit/te/tensorflow-lite/eigen_include_dir.patch diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/unit/te/tensorflow-lite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/tensorflow-lite/default.nix rename to pkgs/unit/te/tensorflow-lite/pkg-fun.nix diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/unit/te/tepl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tepl/default.nix rename to pkgs/unit/te/tepl/pkg-fun.nix diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/unit/te/tere/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tere/default.nix rename to pkgs/unit/te/tere/pkg-fun.nix diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/unit/te/termbox/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/termbox/default.nix rename to pkgs/unit/te/termbox/pkg-fun.nix diff --git a/pkgs/development/libraries/termcolor/default.nix b/pkgs/unit/te/termcolor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/termcolor/default.nix rename to pkgs/unit/te/termcolor/pkg-fun.nix diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/unit/te/termdbms/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/termdbms/default.nix rename to pkgs/unit/te/termdbms/pkg-fun.nix diff --git a/pkgs/development/tools/database/termdbms/viewer.patch b/pkgs/unit/te/termdbms/viewer.patch similarity index 100% rename from pkgs/development/tools/database/termdbms/viewer.patch rename to pkgs/unit/te/termdbms/viewer.patch diff --git a/pkgs/applications/misc/terminal-colors/default.nix b/pkgs/unit/te/terminal-colors/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/terminal-colors/default.nix rename to pkgs/unit/te/terminal-colors/pkg-fun.nix diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/unit/te/terminal-notifier/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/terminal-notifier/default.nix rename to pkgs/unit/te/terminal-notifier/pkg-fun.nix diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/unit/te/terminal-parrot/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/terminal-parrot/default.nix rename to pkgs/unit/te/terminal-parrot/pkg-fun.nix diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/unit/te/terminal-stocks/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/terminal-stocks/default.nix rename to pkgs/unit/te/terminal-stocks/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/unit/te/terminator/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/terminator/default.nix rename to pkgs/unit/te/terminator/pkg-fun.nix diff --git a/pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch b/pkgs/unit/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch similarity index 100% rename from pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch rename to pkgs/unit/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/unit/te/terminus_font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/terminus-font/default.nix rename to pkgs/unit/te/terminus_font/pkg-fun.nix diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/unit/te/terminus_font_ttf/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/terminus-font-ttf/default.nix rename to pkgs/unit/te/terminus_font_ttf/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/termite/add_errno_header.patch b/pkgs/unit/te/termite-unwrapped/add_errno_header.patch similarity index 100% rename from pkgs/applications/terminal-emulators/termite/add_errno_header.patch rename to pkgs/unit/te/termite-unwrapped/add_errno_header.patch diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/unit/te/termite-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/termite/default.nix rename to pkgs/unit/te/termite-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch b/pkgs/unit/te/termite-unwrapped/remove_ldflags_macos.patch similarity index 100% rename from pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch rename to pkgs/unit/te/termite-unwrapped/remove_ldflags_macos.patch diff --git a/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch b/pkgs/unit/te/termite-unwrapped/url_regexp_trailing.patch similarity index 100% rename from pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch rename to pkgs/unit/te/termite-unwrapped/url_regexp_trailing.patch diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch b/pkgs/unit/te/termite-unwrapped/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch similarity index 100% rename from pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch rename to pkgs/unit/te/termite-unwrapped/vte-ng-modified-patches/vte-0002-expose-function-for-setting-cursor-position.patch diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch b/pkgs/unit/te/termite-unwrapped/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch similarity index 100% rename from pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch rename to pkgs/unit/te/termite-unwrapped/vte-ng-modified-patches/vte-0003-add-function-for-setting-the-text-selections.patch diff --git a/pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch b/pkgs/unit/te/termite-unwrapped/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch similarity index 100% rename from pkgs/applications/terminal-emulators/termite/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch rename to pkgs/unit/te/termite-unwrapped/vte-ng-modified-patches/vte-0005-expose-function-for-getting-the-selected-text.patch diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/unit/te/termius/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/termius/default.nix rename to pkgs/unit/te/termius/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/unit/te/termonad/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/termonad/default.nix rename to pkgs/unit/te/termonad/pkg-fun.nix diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/unit/te/termplay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/termplay/default.nix rename to pkgs/unit/te/termplay/pkg-fun.nix diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/unit/te/termshark/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/termshark/default.nix rename to pkgs/unit/te/termshark/pkg-fun.nix diff --git a/pkgs/data/fonts/termsyn/default.nix b/pkgs/unit/te/termsyn/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/termsyn/default.nix rename to pkgs/unit/te/termsyn/pkg-fun.nix diff --git a/pkgs/applications/emulators/termtekst/default.nix b/pkgs/unit/te/termtekst/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/termtekst/default.nix rename to pkgs/unit/te/termtekst/pkg-fun.nix diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/unit/te/termtosvg/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/termtosvg/default.nix rename to pkgs/unit/te/termtosvg/pkg-fun.nix diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/unit/te/termusic/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/termusic/default.nix rename to pkgs/unit/te/termusic/pkg-fun.nix diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/unit/te/terra-station/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/terra-station/default.nix rename to pkgs/unit/te/terra-station/pkg-fun.nix diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/unit/te/terracognita/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/terracognita/default.nix rename to pkgs/unit/te/terracognita/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/unit/te/terraform-docs/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-docs/default.nix rename to pkgs/unit/te/terraform-docs/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/unit/te/terraform-inventory/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-inventory/default.nix rename to pkgs/unit/te/terraform-inventory/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/unit/te/terraform-landscape/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/terraform-landscape/Gemfile rename to pkgs/unit/te/terraform-landscape/Gemfile diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/unit/te/terraform-landscape/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock rename to pkgs/unit/te/terraform-landscape/Gemfile.lock diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/unit/te/terraform-landscape/gemset.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-landscape/gemset.nix rename to pkgs/unit/te/terraform-landscape/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/unit/te/terraform-landscape/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-landscape/default.nix rename to pkgs/unit/te/terraform-landscape/pkg-fun.nix diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/unit/te/terraform-ls/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/terraform-ls/default.nix rename to pkgs/unit/te/terraform-ls/pkg-fun.nix diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/unit/te/terraform-lsp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/terraform-lsp/default.nix rename to pkgs/unit/te/terraform-lsp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/unit/te/terraformer/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/terraformer/default.nix rename to pkgs/unit/te/terraformer/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terraforming/Gemfile b/pkgs/unit/te/terraforming/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/terraforming/Gemfile rename to pkgs/unit/te/terraforming/Gemfile diff --git a/pkgs/applications/networking/cluster/terraforming/Gemfile.lock b/pkgs/unit/te/terraforming/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/cluster/terraforming/Gemfile.lock rename to pkgs/unit/te/terraforming/Gemfile.lock diff --git a/pkgs/applications/networking/cluster/terraforming/gemset.nix b/pkgs/unit/te/terraforming/gemset.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraforming/gemset.nix rename to pkgs/unit/te/terraforming/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraforming/default.nix b/pkgs/unit/te/terraforming/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraforming/default.nix rename to pkgs/unit/te/terraforming/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/unit/te/terragrunt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terragrunt/default.nix rename to pkgs/unit/te/terragrunt/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/unit/te/terranix/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terranix/default.nix rename to pkgs/unit/te/terranix/pkg-fun.nix diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/unit/te/terraria-server/pkg-fun.nix similarity index 100% rename from pkgs/games/terraria-server/default.nix rename to pkgs/unit/te/terraria-server/pkg-fun.nix diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/unit/te/terrascan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/terrascan/default.nix rename to pkgs/unit/te/terrascan/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/unit/te/terraspace/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/Gemfile rename to pkgs/unit/te/terraspace/Gemfile diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/unit/te/terraspace/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/Gemfile.lock rename to pkgs/unit/te/terraspace/Gemfile.lock diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/unit/te/terraspace/gemset.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/gemset.nix rename to pkgs/unit/te/terraspace/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/unit/te/terraspace/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/default.nix rename to pkgs/unit/te/terraspace/pkg-fun.nix diff --git a/pkgs/games/tes3cmd/default.nix b/pkgs/unit/te/tes3cmd/pkg-fun.nix similarity index 100% rename from pkgs/games/tes3cmd/default.nix rename to pkgs/unit/te/tes3cmd/pkg-fun.nix diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/unit/te/teseq/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/teseq/default.nix rename to pkgs/unit/te/teseq/pkg-fun.nix diff --git a/pkgs/tools/security/tessen/default.nix b/pkgs/unit/te/tessen/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tessen/default.nix rename to pkgs/unit/te/tessen/pkg-fun.nix diff --git a/pkgs/applications/blockchains/tessera/default.nix b/pkgs/unit/te/tessera/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/tessera/default.nix rename to pkgs/unit/te/tessera/pkg-fun.nix diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/unit/te/testssl/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/testssl/default.nix rename to pkgs/unit/te/testssl/pkg-fun.nix diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/unit/te/tet/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/tet/default.nix rename to pkgs/unit/te/tet/pkg-fun.nix diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/unit/te/tetgen/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/geometry/tetgen/default.nix rename to pkgs/unit/te/tetgen/pkg-fun.nix diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/unit/te/tetgen_1_4/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/geometry/tetgen/1.4.nix rename to pkgs/unit/te/tetgen_1_4/pkg-fun.nix diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/unit/te/tetraproc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tetraproc/default.nix rename to pkgs/unit/te/tetraproc/pkg-fun.nix diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/unit/te/tetrd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/tetrd/default.nix rename to pkgs/unit/te/tetrd/pkg-fun.nix diff --git a/pkgs/games/tetrio-desktop/default.nix b/pkgs/unit/te/tetrio-desktop/pkg-fun.nix similarity index 100% rename from pkgs/games/tetrio-desktop/default.nix rename to pkgs/unit/te/tetrio-desktop/pkg-fun.nix diff --git a/pkgs/games/tetrio-desktop/tetrio-plus.nix b/pkgs/unit/te/tetrio-desktop/tetrio-plus.nix similarity index 100% rename from pkgs/games/tetrio-desktop/tetrio-plus.nix rename to pkgs/unit/te/tetrio-desktop/tetrio-plus.nix diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/unit/te/tev/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/tev/default.nix rename to pkgs/unit/te/tev/pkg-fun.nix diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/unit/te/tevent/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tevent/default.nix rename to pkgs/unit/te/tevent/pkg-fun.nix diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/unit/te/tewi-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tewi/default.nix rename to pkgs/unit/te/tewi-font/pkg-fun.nix diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/unit/te/tewisay/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tewisay/default.nix rename to pkgs/unit/te/tewisay/pkg-fun.nix diff --git a/pkgs/tools/typesetting/tex/tex-match/default.nix b/pkgs/unit/te/tex-match/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/tex/tex-match/default.nix rename to pkgs/unit/te/tex-match/pkg-fun.nix diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/unit/te/texi2html/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/texi2html/default.nix rename to pkgs/unit/te/texi2html/pkg-fun.nix diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/unit/te/texi2mdoc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/texi2mdoc/default.nix rename to pkgs/unit/te/texi2mdoc/pkg-fun.nix diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/unit/te/texinfo413/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/texinfo/4.13a.nix rename to pkgs/unit/te/texinfo413/pkg-fun.nix diff --git a/pkgs/development/libraries/text-engine/default.nix b/pkgs/unit/te/text-engine/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/text-engine/default.nix rename to pkgs/unit/te/text-engine/pkg-fun.nix diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/unit/te/textadept/deps.nix similarity index 100% rename from pkgs/applications/editors/textadept/deps.nix rename to pkgs/unit/te/textadept/deps.nix diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/unit/te/textadept/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/textadept/default.nix rename to pkgs/unit/te/textadept/pkg-fun.nix diff --git a/pkgs/tools/text/textpieces/default.nix b/pkgs/unit/te/textpieces/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/textpieces/default.nix rename to pkgs/unit/te/textpieces/pkg-fun.nix diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/unit/te/textplots/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/textplots/default.nix rename to pkgs/unit/te/textplots/pkg-fun.nix diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/unit/te/textql/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/textql/default.nix rename to pkgs/unit/te/textql/pkg-fun.nix diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/unit/te/texture-synthesis/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/texture-synthesis/default.nix rename to pkgs/unit/te/texture-synthesis/pkg-fun.nix diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/unit/te/teyjus/fix-lex-to-flex.patch similarity index 100% rename from pkgs/development/compilers/teyjus/fix-lex-to-flex.patch rename to pkgs/unit/te/teyjus/fix-lex-to-flex.patch diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/unit/te/teyjus/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/teyjus/default.nix rename to pkgs/unit/te/teyjus/pkg-fun.nix diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/unit/te/tezos-rust-libs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tezos-rust-libs/default.nix rename to pkgs/unit/te/tezos-rust-libs/pkg-fun.nix diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/unit/tf/tf2pulumi/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/tf2pulumi/default.nix rename to pkgs/unit/tf/tf2pulumi/pkg-fun.nix diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/unit/tf/tfk8s/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tfk8s/default.nix rename to pkgs/unit/tf/tfk8s/pkg-fun.nix diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/pkgs/unit/tf/tfk8s/tests/sample1/default.nix similarity index 100% rename from pkgs/tools/misc/tfk8s/tests/sample1/default.nix rename to pkgs/unit/tf/tfk8s/tests/sample1/default.nix diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/pkgs/unit/tf/tfk8s/tests/sample1/input.yaml similarity index 100% rename from pkgs/tools/misc/tfk8s/tests/sample1/input.yaml rename to pkgs/unit/tf/tfk8s/tests/sample1/input.yaml diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/pkgs/unit/tf/tfk8s/tests/sample1/output.tf similarity index 100% rename from pkgs/tools/misc/tfk8s/tests/sample1/output.tf rename to pkgs/unit/tf/tfk8s/tests/sample1/output.tf diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/unit/tf/tflint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/tflint/default.nix rename to pkgs/unit/tf/tflint/pkg-fun.nix diff --git a/pkgs/development/tools/tfplugindocs/default.nix b/pkgs/unit/tf/tfplugindocs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/tfplugindocs/default.nix rename to pkgs/unit/tf/tfplugindocs/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/unit/tf/tfsec/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/tfsec/default.nix rename to pkgs/unit/tf/tfsec/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/unit/tf/tfswitch/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tfswitch/default.nix rename to pkgs/unit/tf/tfswitch/pkg-fun.nix diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/unit/tf/tftp-hpa/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tftp-hpa/default.nix rename to pkgs/unit/tf/tftp-hpa/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/unit/tg/tgswitch/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tgswitch/default.nix rename to pkgs/unit/tg/tgswitch/pkg-fun.nix diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/unit/tg/tgt/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tgt/default.nix rename to pkgs/unit/tg/tgt/pkg-fun.nix diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/unit/th/thanos/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/thanos/default.nix rename to pkgs/unit/th/thanos/pkg-fun.nix diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/unit/th/thc-hydra/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/thc-hydra/default.nix rename to pkgs/unit/th/thc-hydra/pkg-fun.nix diff --git a/pkgs/tools/security/thc-ipv6/default.nix b/pkgs/unit/th/thc-ipv6/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/thc-ipv6/default.nix rename to pkgs/unit/th/thc-ipv6/pkg-fun.nix diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/unit/th/the-foundation/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/the-foundation/default.nix rename to pkgs/unit/th/the-foundation/pkg-fun.nix diff --git a/pkgs/games/the-legend-of-edgar/default.nix b/pkgs/unit/th/the-legend-of-edgar/pkg-fun.nix similarity index 100% rename from pkgs/games/the-legend-of-edgar/default.nix rename to pkgs/unit/th/the-legend-of-edgar/pkg-fun.nix diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/unit/th/the-way/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/the-way/default.nix rename to pkgs/unit/th/the-way/pkg-fun.nix diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/unit/th/theano/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/theano/default.nix rename to pkgs/unit/th/theano/pkg-fun.nix diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/unit/th/thedesk/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/thedesk/default.nix rename to pkgs/unit/th/thedesk/pkg-fun.nix diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/unit/th/theft/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/theft/default.nix rename to pkgs/unit/th/theft/pkg-fun.nix diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/unit/th/theharvester/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/theharvester/default.nix rename to pkgs/unit/th/theharvester/pkg-fun.nix diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/unit/th/theme-jade1/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/jade1/default.nix rename to pkgs/unit/th/theme-jade1/pkg-fun.nix diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/unit/th/theme-obsidian2/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/obsidian2/default.nix rename to pkgs/unit/th/theme-obsidian2/pkg-fun.nix diff --git a/pkgs/tools/misc/theme-sh/default.nix b/pkgs/unit/th/theme-sh/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/theme-sh/default.nix rename to pkgs/unit/th/theme-sh/pkg-fun.nix diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/unit/th/theme-vertex/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/vertex/default.nix rename to pkgs/unit/th/theme-vertex/pkg-fun.nix diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/unit/th/themechanger/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/themechanger/default.nix rename to pkgs/unit/th/themechanger/pkg-fun.nix diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/unit/th/thepeg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/physics/thepeg/default.nix rename to pkgs/unit/th/thepeg/pkg-fun.nix diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/unit/th/thermald/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/thermald/default.nix rename to pkgs/unit/th/thermald/pkg-fun.nix diff --git a/pkgs/applications/version-management/thicket/default.nix b/pkgs/unit/th/thicket/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/thicket/default.nix rename to pkgs/unit/th/thicket/pkg-fun.nix diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/unit/th/thiefmd/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/thiefmd/default.nix rename to pkgs/unit/th/thiefmd/pkg-fun.nix diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/unit/th/thin-provisioning-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/thin-provisioning-tools/default.nix rename to pkgs/unit/th/thin-provisioning-tools/pkg-fun.nix diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/unit/th/thinkfan/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/thinkfan/default.nix rename to pkgs/unit/th/thinkfan/pkg-fun.nix diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/unit/th/thinkingRock/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/thinking-rock/default.nix rename to pkgs/unit/th/thinkingRock/pkg-fun.nix diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/unit/th/thokr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/thokr/default.nix rename to pkgs/unit/th/thokr/pkg-fun.nix diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/unit/th/thonny/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/thonny/default.nix rename to pkgs/unit/th/thonny/pkg-fun.nix diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/unit/th/threatest/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/threatest/default.nix rename to pkgs/unit/th/threatest/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/unit/th/threema-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/threema-desktop/default.nix rename to pkgs/unit/th/threema-desktop/pkg-fun.nix diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/unit/th/thrift-0_10/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/thrift/0.10.nix rename to pkgs/unit/th/thrift-0_10/pkg-fun.nix diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/unit/th/throttled/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/throttled/default.nix rename to pkgs/unit/th/throttled/pkg-fun.nix diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/unit/th/thttpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/thttpd/default.nix rename to pkgs/unit/th/thttpd/pkg-fun.nix diff --git a/pkgs/applications/system/thumbdrives/default.nix b/pkgs/unit/th/thumbdrives/pkg-fun.nix similarity index 100% rename from pkgs/applications/system/thumbdrives/default.nix rename to pkgs/unit/th/thumbdrives/pkg-fun.nix diff --git a/pkgs/tools/misc/thumbs/fix.patch b/pkgs/unit/th/thumbs/fix.patch similarity index 100% rename from pkgs/tools/misc/thumbs/fix.patch rename to pkgs/unit/th/thumbs/fix.patch diff --git a/pkgs/tools/misc/thumbs/default.nix b/pkgs/unit/th/thumbs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/thumbs/default.nix rename to pkgs/unit/th/thumbs/pkg-fun.nix diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/unit/th/thunderbolt/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/thunderbolt/default.nix rename to pkgs/unit/th/thunderbolt/pkg-fun.nix diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/unit/ti/tibetan-machine/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tibetan-machine/default.nix rename to pkgs/unit/ti/tibetan-machine/pkg-fun.nix diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/unit/ti/ticker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ticker/default.nix rename to pkgs/unit/ti/ticker/pkg-fun.nix diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/unit/ti/ticpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ticpp/default.nix rename to pkgs/unit/ti/ticpp/pkg-fun.nix diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/unit/ti/tidal-hifi/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tidal-hifi/default.nix rename to pkgs/unit/ti/tidal-hifi/pkg-fun.nix diff --git a/pkgs/servers/tidb/default.nix b/pkgs/unit/ti/tidb/pkg-fun.nix similarity index 100% rename from pkgs/servers/tidb/default.nix rename to pkgs/unit/ti/tidb/pkg-fun.nix diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/unit/ti/tidy-viewer/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/tidy-viewer/default.nix rename to pkgs/unit/ti/tidy-viewer/pkg-fun.nix diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/unit/ti/tidyp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tidyp/default.nix rename to pkgs/unit/ti/tidyp/pkg-fun.nix diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/unit/ti/tie/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/tie/default.nix rename to pkgs/unit/ti/tie/pkg-fun.nix diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/unit/ti/tig/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/tig/default.nix rename to pkgs/unit/ti/tig/pkg-fun.nix diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/unit/ti/tigervnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/tigervnc/default.nix rename to pkgs/unit/ti/tigervnc/pkg-fun.nix diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/unit/ti/tile38/pkg-fun.nix similarity index 100% rename from pkgs/servers/geospatial/tile38/default.nix rename to pkgs/unit/ti/tile38/pkg-fun.nix diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/unit/ti/tiledb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tiledb/default.nix rename to pkgs/unit/ti/tiledb/pkg-fun.nix diff --git a/pkgs/applications/emulators/tilem/default.nix b/pkgs/unit/ti/tilem/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/tilem/default.nix rename to pkgs/unit/ti/tilem/pkg-fun.nix diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/unit/ti/tilemaker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tilemaker/default.nix rename to pkgs/unit/ti/tilemaker/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/unit/ti/tilix/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/tilix/default.nix rename to pkgs/unit/ti/tilix/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/unit/ti/tilt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tilt/default.nix rename to pkgs/unit/ti/tilt/pkg-fun.nix diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/unit/ti/time-decode/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/time-decode/default.nix rename to pkgs/unit/ti/time-decode/pkg-fun.nix diff --git a/pkgs/development/tools/time-ghc-modules/default.nix b/pkgs/unit/ti/time-ghc-modules/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/time-ghc-modules/default.nix rename to pkgs/unit/ti/time-ghc-modules/pkg-fun.nix diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/unit/ti/time/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/time/default.nix rename to pkgs/unit/ti/time/pkg-fun.nix diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/unit/ti/timelapse-deflicker/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/timelapse-deflicker/default.nix rename to pkgs/unit/ti/timelapse-deflicker/pkg-fun.nix diff --git a/pkgs/tools/misc/timelimit/default.nix b/pkgs/unit/ti/timelimit/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/timelimit/default.nix rename to pkgs/unit/ti/timelimit/pkg-fun.nix diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/unit/ti/timeline/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/timeline/default.nix rename to pkgs/unit/ti/timeline/pkg-fun.nix diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/unit/ti/timemachine/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/timemachine/default.nix rename to pkgs/unit/ti/timemachine/pkg-fun.nix diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/unit/ti/times-newer-roman/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/times-newer-roman/default.nix rename to pkgs/unit/ti/times-newer-roman/pkg-fun.nix diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/unit/ti/timescaledb-parallel-copy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/timescaledb-parallel-copy/default.nix rename to pkgs/unit/ti/timescaledb-parallel-copy/pkg-fun.nix diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/unit/ti/timescaledb-tune/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/timescaledb-tune/default.nix rename to pkgs/unit/ti/timescaledb-tune/pkg-fun.nix diff --git a/pkgs/servers/timetagger/default.nix b/pkgs/unit/ti/timetagger/pkg-fun.nix similarity index 100% rename from pkgs/servers/timetagger/default.nix rename to pkgs/unit/ti/timetagger/pkg-fun.nix diff --git a/pkgs/applications/office/timetrap/Gemfile b/pkgs/unit/ti/timetrap/Gemfile similarity index 100% rename from pkgs/applications/office/timetrap/Gemfile rename to pkgs/unit/ti/timetrap/Gemfile diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/unit/ti/timetrap/Gemfile.lock similarity index 100% rename from pkgs/applications/office/timetrap/Gemfile.lock rename to pkgs/unit/ti/timetrap/Gemfile.lock diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/unit/ti/timetrap/gemset.nix similarity index 100% rename from pkgs/applications/office/timetrap/gemset.nix rename to pkgs/unit/ti/timetrap/gemset.nix diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/unit/ti/timetrap/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/timetrap/default.nix rename to pkgs/unit/ti/timetrap/pkg-fun.nix diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/unit/ti/timeular/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/timeular/default.nix rename to pkgs/unit/ti/timeular/pkg-fun.nix diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/unit/ti/timew-sync-server/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/timew-sync-server/default.nix rename to pkgs/unit/ti/timew-sync-server/pkg-fun.nix diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/unit/ti/timewarrior/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/timewarrior/default.nix rename to pkgs/unit/ti/timewarrior/pkg-fun.nix diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/unit/ti/timezonemap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/timezonemap/default.nix rename to pkgs/unit/ti/timezonemap/pkg-fun.nix diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/unit/ti/timg/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/timg/default.nix rename to pkgs/unit/ti/timg/pkg-fun.nix diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/unit/ti/tinc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tinc/default.nix rename to pkgs/unit/ti/tinc/pkg-fun.nix diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/unit/ti/tinc_pre/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tinc/pre.nix rename to pkgs/unit/ti/tinc_pre/pkg-fun.nix diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/unit/ti/tini/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/tini/default.nix rename to pkgs/unit/ti/tini/pkg-fun.nix diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/unit/ti/tint2/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tint2/default.nix rename to pkgs/unit/ti/tint2/pkg-fun.nix diff --git a/pkgs/games/tintin/default.nix b/pkgs/unit/ti/tintin/pkg-fun.nix similarity index 100% rename from pkgs/games/tintin/default.nix rename to pkgs/unit/ti/tintin/pkg-fun.nix diff --git a/pkgs/applications/emulators/tiny8086/default.nix b/pkgs/unit/ti/tiny8086/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/tiny8086/default.nix rename to pkgs/unit/ti/tiny8086/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/unit/ti/tinyalsa/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tinyalsa/default.nix rename to pkgs/unit/ti/tinyalsa/pkg-fun.nix diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/unit/ti/tinycbor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tinycbor/default.nix rename to pkgs/unit/ti/tinycbor/pkg-fun.nix diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/unit/ti/tinycdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tinycdb/default.nix rename to pkgs/unit/ti/tinycdb/pkg-fun.nix diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/unit/ti/tinyemu/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/tinyemu/default.nix rename to pkgs/unit/ti/tinyemu/pkg-fun.nix diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/unit/ti/tinyfecvpn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tinyfecvpn/default.nix rename to pkgs/unit/ti/tinyfecvpn/pkg-fun.nix diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/unit/ti/tinyfugue/pkg-fun.nix similarity index 100% rename from pkgs/games/tinyfugue/default.nix rename to pkgs/unit/ti/tinyfugue/pkg-fun.nix diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/unit/ti/tinygltf/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tinygltf/default.nix rename to pkgs/unit/ti/tinygltf/pkg-fun.nix diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/unit/ti/tinyobjloader/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tinyobjloader/default.nix rename to pkgs/unit/ti/tinyobjloader/pkg-fun.nix diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/unit/ti/tinyprog/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/fpga/tinyprog/default.nix rename to pkgs/unit/ti/tinyprog/pkg-fun.nix diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/unit/ti/tinyproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tinyproxy/default.nix rename to pkgs/unit/ti/tinyproxy/pkg-fun.nix diff --git a/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch b/pkgs/unit/ti/tinyscheme/01-remove-macOS-main.patch similarity index 100% rename from pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch rename to pkgs/unit/ti/tinyscheme/01-remove-macOS-main.patch diff --git a/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch b/pkgs/unit/ti/tinyscheme/02-use-toolchain-env-vars.patch similarity index 100% rename from pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch rename to pkgs/unit/ti/tinyscheme/02-use-toolchain-env-vars.patch diff --git a/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch b/pkgs/unit/ti/tinyscheme/03-macOS-SOsuf.patch similarity index 100% rename from pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch rename to pkgs/unit/ti/tinyscheme/03-macOS-SOsuf.patch diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/unit/ti/tinyscheme/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/tinyscheme/default.nix rename to pkgs/unit/ti/tinyscheme/pkg-fun.nix diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/unit/ti/tinyssh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tinyssh/default.nix rename to pkgs/unit/ti/tinyssh/pkg-fun.nix diff --git a/pkgs/tools/networking/tinystatus/default.nix b/pkgs/unit/ti/tinystatus/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tinystatus/default.nix rename to pkgs/unit/ti/tinystatus/pkg-fun.nix diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/unit/ti/tinywl/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/tinywl/default.nix rename to pkgs/unit/ti/tinywl/pkg-fun.nix diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/unit/ti/tinywm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/tinywm/default.nix rename to pkgs/unit/ti/tinywm/pkg-fun.nix diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/unit/ti/tinyxml-2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tinyxml-2/default.nix rename to pkgs/unit/ti/tinyxml-2/pkg-fun.nix diff --git a/pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch b/pkgs/unit/ti/tinyxml2/2.6.2-add-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch rename to pkgs/unit/ti/tinyxml2/2.6.2-add-pkgconfig.patch diff --git a/pkgs/development/libraries/tinyxml/2.6.2-cxx.patch b/pkgs/unit/ti/tinyxml2/2.6.2-cxx.patch similarity index 100% rename from pkgs/development/libraries/tinyxml/2.6.2-cxx.patch rename to pkgs/unit/ti/tinyxml2/2.6.2-cxx.patch diff --git a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch b/pkgs/unit/ti/tinyxml2/2.6.2-entity.patch similarity index 100% rename from pkgs/development/libraries/tinyxml/2.6.2-entity.patch rename to pkgs/unit/ti/tinyxml2/2.6.2-entity.patch diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/unit/ti/tinyxml2/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tinyxml/2.6.2.nix rename to pkgs/unit/ti/tinyxml2/pkg-fun.nix diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/unit/ti/tio/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tio/default.nix rename to pkgs/unit/ti/tio/pkg-fun.nix diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/unit/ti/tipa/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tipa/default.nix rename to pkgs/unit/ti/tipa/pkg-fun.nix diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/unit/ti/tippecanoe/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tippecanoe/default.nix rename to pkgs/unit/ti/tippecanoe/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/unit/ti/tiptop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tiptop/default.nix rename to pkgs/unit/ti/tiptop/pkg-fun.nix diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/unit/ti/tiramisu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tiramisu/default.nix rename to pkgs/unit/ti/tiramisu/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tiscamera/0001-cmake-find-aravis-fix-pkg-cfg-include-dirs.patch b/pkgs/unit/ti/tiscamera/0001-cmake-find-aravis-fix-pkg-cfg-include-dirs.patch similarity index 100% rename from pkgs/os-specific/linux/tiscamera/0001-cmake-find-aravis-fix-pkg-cfg-include-dirs.patch rename to pkgs/unit/ti/tiscamera/0001-cmake-find-aravis-fix-pkg-cfg-include-dirs.patch diff --git a/pkgs/os-specific/linux/tiscamera/0001-tcamconvert-tcamsrc-add-missing-include-lib-dirs.patch b/pkgs/unit/ti/tiscamera/0001-tcamconvert-tcamsrc-add-missing-include-lib-dirs.patch similarity index 100% rename from pkgs/os-specific/linux/tiscamera/0001-tcamconvert-tcamsrc-add-missing-include-lib-dirs.patch rename to pkgs/unit/ti/tiscamera/0001-tcamconvert-tcamsrc-add-missing-include-lib-dirs.patch diff --git a/pkgs/os-specific/linux/tiscamera/0001-udev-rules-fix-install-location.patch b/pkgs/unit/ti/tiscamera/0001-udev-rules-fix-install-location.patch similarity index 100% rename from pkgs/os-specific/linux/tiscamera/0001-udev-rules-fix-install-location.patch rename to pkgs/unit/ti/tiscamera/0001-udev-rules-fix-install-location.patch diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/unit/ti/tiscamera/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tiscamera/default.nix rename to pkgs/unit/ti/tiscamera/pkg-fun.nix diff --git a/pkgs/games/titanion/default.nix b/pkgs/unit/ti/titanion/pkg-fun.nix similarity index 100% rename from pkgs/games/titanion/default.nix rename to pkgs/unit/ti/titanion/pkg-fun.nix diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/unit/ti/tiv/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tiv/default.nix rename to pkgs/unit/ti/tiv/pkg-fun.nix diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/unit/ti/tivodecode/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/tivodecode/default.nix rename to pkgs/unit/ti/tivodecode/pkg-fun.nix diff --git a/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch b/pkgs/unit/ti/tix/duplicated-xlowerwindow.patch similarity index 100% rename from pkgs/development/libraries/tix/duplicated-xlowerwindow.patch rename to pkgs/unit/ti/tix/duplicated-xlowerwindow.patch diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/unit/ti/tix/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tix/default.nix rename to pkgs/unit/ti/tix/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/unit/ti/tixati/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/tixati/default.nix rename to pkgs/unit/ti/tixati/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/unit/tk/tkgate/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/tkgate/1.x.nix rename to pkgs/unit/tk/tkgate/pkg-fun.nix diff --git a/pkgs/applications/version-management/tkrev/default.nix b/pkgs/unit/tk/tkrev/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/tkrev/default.nix rename to pkgs/unit/tk/tkrev/pkg-fun.nix diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/unit/tk/tkrzw/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tkrzw/default.nix rename to pkgs/unit/tk/tkrzw/pkg-fun.nix diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/unit/tl/tl-expected/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tl-expected/default.nix rename to pkgs/unit/tl/tl-expected/pkg-fun.nix diff --git a/pkgs/applications/version-management/arch/configure-tmpdir.patch b/pkgs/unit/tl/tla/configure-tmpdir.patch similarity index 100% rename from pkgs/applications/version-management/arch/configure-tmpdir.patch rename to pkgs/unit/tl/tla/configure-tmpdir.patch diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/unit/tl/tla/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/arch/default.nix rename to pkgs/unit/tl/tla/pkg-fun.nix diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/unit/tl/tlaplusToolbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/tlaplus/toolbox.nix rename to pkgs/unit/tl/tlaplusToolbox/pkg-fun.nix diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/unit/tl/tldr/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tldr/default.nix rename to pkgs/unit/tl/tldr/pkg-fun.nix diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/unit/tl/tlf/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/tlf/default.nix rename to pkgs/unit/tl/tlf/pkg-fun.nix diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/unit/tl/tllist/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tllist/default.nix rename to pkgs/unit/tl/tllist/pkg-fun.nix diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/unit/tl/tlsx/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tlsx/default.nix rename to pkgs/unit/tl/tlsx/pkg-fun.nix diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/unit/tl/tlwg/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tlwg/default.nix rename to pkgs/unit/tl/tlwg/pkg-fun.nix diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/unit/tm/tm/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/tm/default.nix rename to pkgs/unit/tm/tm/pkg-fun.nix diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/unit/tm/tmate-ssh-server/pkg-fun.nix similarity index 100% rename from pkgs/servers/tmate-ssh-server/default.nix rename to pkgs/unit/tm/tmate-ssh-server/pkg-fun.nix diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/unit/tm/tmate/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmate/default.nix rename to pkgs/unit/tm/tmate/pkg-fun.nix diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/unit/tm/tmatrix/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tmatrix/default.nix rename to pkgs/unit/tm/tmatrix/pkg-fun.nix diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/unit/tm/tmpmail/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/tmpmail/default.nix rename to pkgs/unit/tm/tmpmail/pkg-fun.nix diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/unit/tm/tmpwatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmpwatch/default.nix rename to pkgs/unit/tm/tmpwatch/pkg-fun.nix diff --git a/pkgs/tools/filesystems/tmsu/deps.nix b/pkgs/unit/tm/tmsu/deps.nix similarity index 100% rename from pkgs/tools/filesystems/tmsu/deps.nix rename to pkgs/unit/tm/tmsu/deps.nix diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/unit/tm/tmsu/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/tmsu/default.nix rename to pkgs/unit/tm/tmsu/pkg-fun.nix diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/unit/tm/tmux-cssh/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmux-cssh/default.nix rename to pkgs/unit/tm/tmux-cssh/pkg-fun.nix diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/unit/tm/tmux-mem-cpu-load/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmux-mem-cpu-load/default.nix rename to pkgs/unit/tm/tmux-mem-cpu-load/pkg-fun.nix diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/unit/tm/tmux-xpanes/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmux-xpanes/default.nix rename to pkgs/unit/tm/tmux-xpanes/pkg-fun.nix diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/unit/tm/tmux/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmux/default.nix rename to pkgs/unit/tm/tmux/pkg-fun.nix diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/unit/tm/tmuxinator/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmuxinator/default.nix rename to pkgs/unit/tm/tmuxinator/pkg-fun.nix diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/unit/tm/tmuxp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tmuxp/default.nix rename to pkgs/unit/tm/tmuxp/pkg-fun.nix diff --git a/pkgs/tools/networking/tnat64/default.nix b/pkgs/unit/tn/tnat64/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tnat64/default.nix rename to pkgs/unit/tn/tnat64/pkg-fun.nix diff --git a/pkgs/applications/radio/tncattach/default.nix b/pkgs/unit/tn/tncattach/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/tncattach/default.nix rename to pkgs/unit/tn/tncattach/pkg-fun.nix diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/unit/tn/tnef/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tnef/default.nix rename to pkgs/unit/tn/tnef/pkg-fun.nix diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/unit/tn/tnt/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tnt/default.nix rename to pkgs/unit/tn/tnt/pkg-fun.nix diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/unit/tn/tntdb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tntdb/default.nix rename to pkgs/unit/tn/tntdb/pkg-fun.nix diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/unit/tn/tntnet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tntnet/default.nix rename to pkgs/unit/tn/tntnet/pkg-fun.nix diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/unit/to/toast/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/toast/default.nix rename to pkgs/unit/to/toast/pkg-fun.nix diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/unit/to/tockloader/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/tockloader/default.nix rename to pkgs/unit/to/tockloader/pkg-fun.nix diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/unit/to/todiff/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/todiff/default.nix rename to pkgs/unit/to/todiff/pkg-fun.nix diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/unit/to/todo-txt-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/todo.txt-cli/default.nix rename to pkgs/unit/to/todo-txt-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/unit/to/todo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/todo/default.nix rename to pkgs/unit/to/todo/pkg-fun.nix diff --git a/pkgs/applications/office/todofi.sh/default.nix b/pkgs/unit/to/todofi-sh/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/todofi.sh/default.nix rename to pkgs/unit/to/todofi-sh/pkg-fun.nix diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/unit/to/todoist-electron/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/todoist-electron/default.nix rename to pkgs/unit/to/todoist-electron/pkg-fun.nix diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/unit/to/todoist/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/todoist/default.nix rename to pkgs/unit/to/todoist/pkg-fun.nix diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/unit/to/todoman/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/todoman/default.nix rename to pkgs/unit/to/todoman/pkg-fun.nix diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/unit/to/tofi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tofi/default.nix rename to pkgs/unit/to/tofi/pkg-fun.nix diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/unit/to/toil/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/toil/default.nix rename to pkgs/unit/to/toil/pkg-fun.nix diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/unit/to/toilet/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/toilet/default.nix rename to pkgs/unit/to/toilet/pkg-fun.nix diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/unit/to/toipe/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/toipe/default.nix rename to pkgs/unit/to/toipe/pkg-fun.nix diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/unit/to/tokio-console/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/tokio-console/default.nix rename to pkgs/unit/to/tokio-console/pkg-fun.nix diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/unit/to/tokyocabinet/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tokyo-cabinet/default.nix rename to pkgs/unit/to/tokyocabinet/pkg-fun.nix diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/unit/to/tokyotyrant/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tokyo-tyrant/default.nix rename to pkgs/unit/to/tokyotyrant/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/unit/to/tomb/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tomb/default.nix rename to pkgs/unit/to/tomb/pkg-fun.nix diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/unit/to/tomcat-native/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/tomcat/tomcat-native.nix rename to pkgs/unit/to/tomcat-native/pkg-fun.nix diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/unit/to/tomcat_connectors/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/apache-modules/tomcat-connectors/default.nix rename to pkgs/unit/to/tomcat_connectors/pkg-fun.nix diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/unit/to/tomcat_mysql_jdbc/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/tomcat/jdbc/mysql/default.nix rename to pkgs/unit/to/tomcat_mysql_jdbc/pkg-fun.nix diff --git a/pkgs/games/tome2/default.nix b/pkgs/unit/to/tome2/pkg-fun.nix similarity index 100% rename from pkgs/games/tome2/default.nix rename to pkgs/unit/to/tome2/pkg-fun.nix diff --git a/pkgs/games/tome4/default.nix b/pkgs/unit/to/tome4/pkg-fun.nix similarity index 100% rename from pkgs/games/tome4/default.nix rename to pkgs/unit/to/tome4/pkg-fun.nix diff --git a/pkgs/development/libraries/toml11/default.nix b/pkgs/unit/to/toml11/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/toml11/default.nix rename to pkgs/unit/to/toml11/pkg-fun.nix diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/unit/to/toml2json/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/toml2json/default.nix rename to pkgs/unit/to/toml2json/pkg-fun.nix diff --git a/pkgs/development/tools/toml2nix/Cargo.lock b/pkgs/unit/to/toml2nix/Cargo.lock similarity index 100% rename from pkgs/development/tools/toml2nix/Cargo.lock rename to pkgs/unit/to/toml2nix/Cargo.lock diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/unit/to/toml2nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/toml2nix/default.nix rename to pkgs/unit/to/toml2nix/pkg-fun.nix diff --git a/pkgs/development/libraries/tomlc99/default.nix b/pkgs/unit/to/tomlc99/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tomlc99/default.nix rename to pkgs/unit/to/tomlc99/pkg-fun.nix diff --git a/pkgs/development/libraries/tomlcpp/default.nix b/pkgs/unit/to/tomlcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tomlcpp/default.nix rename to pkgs/unit/to/tomlcpp/pkg-fun.nix diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/unit/to/tomlplusplus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tomlplusplus/default.nix rename to pkgs/unit/to/tomlplusplus/pkg-fun.nix diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/unit/to/tonelib-gfx/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tonelib-gfx/default.nix rename to pkgs/unit/to/tonelib-gfx/pkg-fun.nix diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/unit/to/tonelib-jam/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tonelib-jam/default.nix rename to pkgs/unit/to/tonelib-jam/pkg-fun.nix diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/unit/to/tonelib-metal/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tonelib-metal/default.nix rename to pkgs/unit/to/tonelib-metal/pkg-fun.nix diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/unit/to/tonelib-zoom/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tonelib-zoom/default.nix rename to pkgs/unit/to/tonelib-zoom/pkg-fun.nix diff --git a/pkgs/applications/virtualization/toolbox/glibc.patch b/pkgs/unit/to/toolbox/glibc.patch similarity index 100% rename from pkgs/applications/virtualization/toolbox/glibc.patch rename to pkgs/unit/to/toolbox/glibc.patch diff --git a/pkgs/applications/virtualization/toolbox/default.nix b/pkgs/unit/to/toolbox/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/toolbox/default.nix rename to pkgs/unit/to/toolbox/pkg-fun.nix diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/unit/to/toot/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/toot/default.nix rename to pkgs/unit/to/toot/pkg-fun.nix diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/unit/to/tootle/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tootle/default.nix rename to pkgs/unit/to/tootle/pkg-fun.nix diff --git a/pkgs/applications/version-management/topgit/default.nix b/pkgs/unit/to/top-git/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/topgit/default.nix rename to pkgs/unit/to/top-git/pkg-fun.nix diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/unit/to/topiary/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/topiary/default.nix rename to pkgs/unit/to/topiary/pkg-fun.nix diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/unit/to/topicctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/topicctl/default.nix rename to pkgs/unit/to/topicctl/pkg-fun.nix diff --git a/pkgs/games/toppler/default.nix b/pkgs/unit/to/toppler/pkg-fun.nix similarity index 100% rename from pkgs/games/toppler/default.nix rename to pkgs/unit/to/toppler/pkg-fun.nix diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/unit/to/topydo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/topydo/default.nix rename to pkgs/unit/to/topydo/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/unit/to/tor-browser-bundle-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix rename to pkgs/unit/to/tor-browser-bundle-bin/pkg-fun.nix diff --git a/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch b/pkgs/unit/to/tor/disable-monotonic-timer-tests.patch similarity index 100% rename from pkgs/tools/security/tor/disable-monotonic-timer-tests.patch rename to pkgs/unit/to/tor/disable-monotonic-timer-tests.patch diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/unit/to/tor/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tor/default.nix rename to pkgs/unit/to/tor/pkg-fun.nix diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/unit/to/tor/update.nix similarity index 100% rename from pkgs/tools/security/tor/update.nix rename to pkgs/unit/to/tor/update.nix diff --git a/pkgs/games/torcs/default.nix b/pkgs/unit/to/torcs/pkg-fun.nix similarity index 100% rename from pkgs/games/torcs/default.nix rename to pkgs/unit/to/torcs/pkg-fun.nix diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/unit/to/torq/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/torq/default.nix rename to pkgs/unit/to/torq/pkg-fun.nix diff --git a/pkgs/tools/archivers/torrent7z/default.nix b/pkgs/unit/to/torrent7z/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/torrent7z/default.nix rename to pkgs/unit/to/torrent7z/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/unit/to/torrential/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/torrential/default.nix rename to pkgs/unit/to/torrential/pkg-fun.nix diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/unit/to/torsocks/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tor/torsocks.nix rename to pkgs/unit/to/torsocks/pkg-fun.nix diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/unit/to/tortoisehg/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/tortoisehg/default.nix rename to pkgs/unit/to/tortoisehg/pkg-fun.nix diff --git a/pkgs/games/torus-trooper/default.nix b/pkgs/unit/to/torus-trooper/pkg-fun.nix similarity index 100% rename from pkgs/games/torus-trooper/default.nix rename to pkgs/unit/to/torus-trooper/pkg-fun.nix diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/unit/to/toss/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/toss/default.nix rename to pkgs/unit/to/toss/pkg-fun.nix diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/unit/to/totem-pl-parser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/totem-pl-parser/default.nix rename to pkgs/unit/to/totem-pl-parser/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/unit/to/touchegg/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/touchegg/default.nix rename to pkgs/unit/to/touchegg/pkg-fun.nix diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/unit/to/touchosc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/touchosc/default.nix rename to pkgs/unit/to/touchosc/pkg-fun.nix diff --git a/pkgs/applications/audio/touchosc/update.sh b/pkgs/unit/to/touchosc/update.sh similarity index 100% rename from pkgs/applications/audio/touchosc/update.sh rename to pkgs/unit/to/touchosc/update.sh diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/unit/to/tox-node/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tox-node/default.nix rename to pkgs/unit/to/tox-node/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/unit/to/toxic/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/toxic/default.nix rename to pkgs/unit/to/toxic/pkg-fun.nix diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/unit/to/toxiproxy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/toxiproxy/default.nix rename to pkgs/unit/to/toxiproxy/pkg-fun.nix diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/unit/to/toxvpn/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/toxvpn/default.nix rename to pkgs/unit/to/toxvpn/pkg-fun.nix diff --git a/pkgs/tools/system/tp-auto-kbbl/default.nix b/pkgs/unit/tp/tp-auto-kbbl/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/tp-auto-kbbl/default.nix rename to pkgs/unit/tp/tp-auto-kbbl/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/unit/tp/tpacpi-bat/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tpacpi-bat/default.nix rename to pkgs/unit/tp/tpacpi-bat/pkg-fun.nix diff --git a/pkgs/tools/security/tpm-luks/openssl-1.1.patch b/pkgs/unit/tp/tpm-luks/openssl-1.1.patch similarity index 100% rename from pkgs/tools/security/tpm-luks/openssl-1.1.patch rename to pkgs/unit/tp/tpm-luks/openssl-1.1.patch diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/unit/tp/tpm-luks/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tpm-luks/default.nix rename to pkgs/unit/tp/tpm-luks/pkg-fun.nix diff --git a/pkgs/tools/security/tpm-luks/signed-ptr.patch b/pkgs/unit/tp/tpm-luks/signed-ptr.patch similarity index 100% rename from pkgs/tools/security/tpm-luks/signed-ptr.patch rename to pkgs/unit/tp/tpm-luks/signed-ptr.patch diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/unit/tp/tpm-quote-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tpm-quote-tools/default.nix rename to pkgs/unit/tp/tpm-quote-tools/pkg-fun.nix diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/unit/tp/tpm-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tpm-tools/default.nix rename to pkgs/unit/tp/tpm-tools/pkg-fun.nix diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/unit/tp/tpm2-abrmd/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tpm2-abrmd/default.nix rename to pkgs/unit/tp/tpm2-abrmd/pkg-fun.nix diff --git a/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch b/pkgs/unit/tp/tpm2-pkcs11/0001-configure-ac-version.patch similarity index 100% rename from pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch rename to pkgs/unit/tp/tpm2-pkcs11/0001-configure-ac-version.patch diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/unit/tp/tpm2-pkcs11/pkg-fun.nix similarity index 100% rename from pkgs/misc/tpm2-pkcs11/default.nix rename to pkgs/unit/tp/tpm2-pkcs11/pkg-fun.nix diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/unit/tp/tpm2-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tpm2-tools/default.nix rename to pkgs/unit/tp/tpm2-tools/pkg-fun.nix diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/unit/tp/tptp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/tptp/default.nix rename to pkgs/unit/tp/tptp/pkg-fun.nix diff --git a/pkgs/games/tr-patcher/default.nix b/pkgs/unit/tr/tr-patcher/pkg-fun.nix similarity index 100% rename from pkgs/games/tr-patcher/default.nix rename to pkgs/unit/tr/tr-patcher/pkg-fun.nix diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/unit/tr/trace-cmd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/trace-cmd/default.nix rename to pkgs/unit/tr/trace-cmd/pkg-fun.nix diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/unit/tr/tracee/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/tracee/default.nix rename to pkgs/unit/tr/tracee/pkg-fun.nix diff --git a/pkgs/tools/security/tracee/use-our-libbpf.patch b/pkgs/unit/tr/tracee/use-our-libbpf.patch similarity index 100% rename from pkgs/tools/security/tracee/use-our-libbpf.patch rename to pkgs/unit/tr/tracee/use-our-libbpf.patch diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/pkgs/unit/tr/tracefilegen/gcc7.patch similarity index 100% rename from pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch rename to pkgs/unit/tr/tracefilegen/gcc7.patch diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/unit/tr/tracefilegen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix rename to pkgs/unit/tr/tracefilegen/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/unit/tr/tracefilesim/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix rename to pkgs/unit/tr/tracefilesim/pkg-fun.nix diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/unit/tr/traceroute/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/traceroute/default.nix rename to pkgs/unit/tr/traceroute/pkg-fun.nix diff --git a/pkgs/games/trackballs/default.nix b/pkgs/unit/tr/trackballs/pkg-fun.nix similarity index 100% rename from pkgs/games/trackballs/default.nix rename to pkgs/unit/tr/trackballs/pkg-fun.nix diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/unit/tr/tracker-miners/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tracker-miners/default.nix rename to pkgs/unit/tr/tracker-miners/pkg-fun.nix diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/unit/tr/tracker/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tracker/default.nix rename to pkgs/unit/tr/tracker/pkg-fun.nix diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/unit/tr/trackma/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/trackma/default.nix rename to pkgs/unit/tr/trackma/pkg-fun.nix diff --git a/pkgs/tools/misc/trackma/update.sh b/pkgs/unit/tr/trackma/update.sh similarity index 100% rename from pkgs/tools/misc/trackma/update.sh rename to pkgs/unit/tr/trackma/update.sh diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/unit/tr/tradcpp/aarch64.patch similarity index 100% rename from pkgs/development/tools/tradcpp/aarch64.patch rename to pkgs/unit/tr/tradcpp/aarch64.patch diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/unit/tr/tradcpp/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/tradcpp/default.nix rename to pkgs/unit/tr/tradcpp/pkg-fun.nix diff --git a/pkgs/development/tools/tradcpp/tradcpp-configure.patch b/pkgs/unit/tr/tradcpp/tradcpp-configure.patch similarity index 100% rename from pkgs/development/tools/tradcpp/tradcpp-configure.patch rename to pkgs/unit/tr/tradcpp/tradcpp-configure.patch diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/unit/tr/traefik-certs-dumper/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/traefik-certs-dumper/default.nix rename to pkgs/unit/tr/traefik-certs-dumper/pkg-fun.nix diff --git a/pkgs/servers/traefik/default.nix b/pkgs/unit/tr/traefik/pkg-fun.nix similarity index 100% rename from pkgs/servers/traefik/default.nix rename to pkgs/unit/tr/traefik/pkg-fun.nix diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/unit/tr/trafficserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/trafficserver/default.nix rename to pkgs/unit/tr/trafficserver/pkg-fun.nix diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/unit/tr/traitor/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/traitor/default.nix rename to pkgs/unit/tr/traitor/pkg-fun.nix diff --git a/pkgs/tools/networking/tran/default.nix b/pkgs/unit/tr/tran/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tran/default.nix rename to pkgs/unit/tr/tran/pkg-fun.nix diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/unit/tr/transcode/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/transcode/default.nix rename to pkgs/unit/tr/transcode/pkg-fun.nix diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/unit/tr/transcribe/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/transcribe/default.nix rename to pkgs/unit/tr/transcribe/pkg-fun.nix diff --git a/pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch b/pkgs/unit/tr/transcrypt/helper-scripts_depspathprefix.patch similarity index 100% rename from pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch rename to pkgs/unit/tr/transcrypt/helper-scripts_depspathprefix.patch diff --git a/pkgs/applications/version-management/transcrypt/default.nix b/pkgs/unit/tr/transcrypt/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/transcrypt/default.nix rename to pkgs/unit/tr/transcrypt/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/unit/tr/transgui/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/transgui/default.nix rename to pkgs/unit/tr/transgui/pkg-fun.nix diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/unit/tr/translate-shell/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/translate-shell/default.nix rename to pkgs/unit/tr/translate-shell/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/unit/tr/transmission-remote-gtk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix rename to pkgs/unit/tr/transmission-remote-gtk/pkg-fun.nix diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/unit/tr/trash-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/trash-cli/default.nix rename to pkgs/unit/tr/trash-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/unit/tr/trashy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/trashy/default.nix rename to pkgs/unit/tr/trashy/pkg-fun.nix diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/unit/tr/travis/Gemfile similarity index 100% rename from pkgs/development/tools/misc/travis/Gemfile rename to pkgs/unit/tr/travis/Gemfile diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/unit/tr/travis/Gemfile.lock similarity index 100% rename from pkgs/development/tools/misc/travis/Gemfile.lock rename to pkgs/unit/tr/travis/Gemfile.lock diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/unit/tr/travis/gemset.nix similarity index 100% rename from pkgs/development/tools/misc/travis/gemset.nix rename to pkgs/unit/tr/travis/gemset.nix diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/unit/tr/travis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/travis/default.nix rename to pkgs/unit/tr/travis/pkg-fun.nix diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/unit/tr/travis/shell.nix similarity index 100% rename from pkgs/development/tools/misc/travis/shell.nix rename to pkgs/unit/tr/travis/shell.nix diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/unit/tr/trayer/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/trayer/default.nix rename to pkgs/unit/tr/trayer/pkg-fun.nix diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/unit/tr/trdl-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/trdl-client/default.nix rename to pkgs/unit/tr/trdl-client/pkg-fun.nix diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/unit/tr/tre-command/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/tre-command/default.nix rename to pkgs/unit/tr/tre-command/pkg-fun.nix diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/unit/tr/tre/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tre/default.nix rename to pkgs/unit/tr/tre/pkg-fun.nix diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/unit/tr/trealla/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/trealla/default.nix rename to pkgs/unit/tr/trealla/pkg-fun.nix diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/pkgs/unit/tr/tree-from-tags/Gemfile similarity index 100% rename from pkgs/applications/audio/tree-from-tags/Gemfile rename to pkgs/unit/tr/tree-from-tags/Gemfile diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/unit/tr/tree-from-tags/Gemfile.lock similarity index 100% rename from pkgs/applications/audio/tree-from-tags/Gemfile.lock rename to pkgs/unit/tr/tree-from-tags/Gemfile.lock diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/pkgs/unit/tr/tree-from-tags/gemset.nix similarity index 100% rename from pkgs/applications/audio/tree-from-tags/gemset.nix rename to pkgs/unit/tr/tree-from-tags/gemset.nix diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/unit/tr/tree-from-tags/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tree-from-tags/default.nix rename to pkgs/unit/tr/tree-from-tags/pkg-fun.nix diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/unit/tr/tree/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/tree/default.nix rename to pkgs/unit/tr/tree/pkg-fun.nix diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/unit/tr/treefmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/treefmt/default.nix rename to pkgs/unit/tr/treefmt/pkg-fun.nix diff --git a/pkgs/applications/science/biology/treemix/default.nix b/pkgs/unit/tr/treemix/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/treemix/default.nix rename to pkgs/unit/tr/treemix/pkg-fun.nix diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/unit/tr/trellis/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/fpga/trellis/default.nix rename to pkgs/unit/tr/trellis/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/unit/tr/tremc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/tremc/default.nix rename to pkgs/unit/tr/tremc/pkg-fun.nix diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/unit/tr/tremor-language-server/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tremor-rs/ls.nix rename to pkgs/unit/tr/tremor-language-server/pkg-fun.nix diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/unit/tr/tremor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tremor/default.nix rename to pkgs/unit/tr/tremor/pkg-fun.nix diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/unit/tr/trezor-suite/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/trezor-suite/default.nix rename to pkgs/unit/tr/trezor-suite/pkg-fun.nix diff --git a/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/pkgs/unit/tr/trezor-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/trezor-udev-rules/default.nix rename to pkgs/unit/tr/trezor-udev-rules/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/unit/tr/tribler/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/tribler/default.nix rename to pkgs/unit/tr/tribler/pkg-fun.nix diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/unit/tr/trickle/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/trickle/default.nix rename to pkgs/unit/tr/trickle/pkg-fun.nix diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/unit/tr/trickster/pkg-fun.nix similarity index 100% rename from pkgs/servers/trickster/trickster.nix rename to pkgs/unit/tr/trickster/pkg-fun.nix diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/unit/tr/tridactyl-native/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tridactyl-native/default.nix rename to pkgs/unit/tr/tridactyl-native/pkg-fun.nix diff --git a/pkgs/tools/misc/triehash/default.nix b/pkgs/unit/tr/triehash/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/triehash/default.nix rename to pkgs/unit/tr/triehash/pkg-fun.nix diff --git a/pkgs/games/trigger/default.nix b/pkgs/unit/tr/trigger/pkg-fun.nix similarity index 100% rename from pkgs/games/trigger/default.nix rename to pkgs/unit/tr/trigger/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/unit/tr/triggerhappy/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/triggerhappy/default.nix rename to pkgs/unit/tr/triggerhappy/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/unit/tr/trillian-im/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/trillian-im/default.nix rename to pkgs/unit/tr/trillian-im/pkg-fun.nix diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/unit/tr/trillian/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/trillian/default.nix rename to pkgs/unit/tr/trillian/pkg-fun.nix diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/unit/tr/trimal/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/trimal/default.nix rename to pkgs/unit/tr/trimal/pkg-fun.nix diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/unit/tr/trinity/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/trinity/default.nix rename to pkgs/unit/tr/trinity/pkg-fun.nix diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/unit/tr/trino-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/trino-cli/default.nix rename to pkgs/unit/tr/trino-cli/pkg-fun.nix diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/unit/tr/trivy/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/trivy/default.nix rename to pkgs/unit/tr/trivy/pkg-fun.nix diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/unit/tr/trompeloeil/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/trompeloeil/default.nix rename to pkgs/unit/tr/trompeloeil/pkg-fun.nix diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/pkgs/unit/tr/trousers/allow-non-tss-config-file-owner.patch similarity index 100% rename from pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch rename to pkgs/unit/tr/trousers/allow-non-tss-config-file-owner.patch diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/unit/tr/trousers/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/trousers/default.nix rename to pkgs/unit/tr/trousers/pkg-fun.nix diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/unit/tr/truecrack/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/truecrack/default.nix rename to pkgs/unit/tr/truecrack/pkg-fun.nix diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/unit/tr/trueseeing/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/trueseeing/default.nix rename to pkgs/unit/tr/trueseeing/pkg-fun.nix diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/unit/tr/trufflehog/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/trufflehog/default.nix rename to pkgs/unit/tr/trufflehog/pkg-fun.nix diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/unit/tr/trunk-io/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/trunk-io/default.nix rename to pkgs/unit/tr/trunk-io/pkg-fun.nix diff --git a/pkgs/development/tools/trunk-io/update.sh b/pkgs/unit/tr/trunk-io/update.sh similarity index 100% rename from pkgs/development/tools/trunk-io/update.sh rename to pkgs/unit/tr/trunk-io/update.sh diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/unit/tr/truvari/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/truvari/default.nix rename to pkgs/unit/tr/truvari/pkg-fun.nix diff --git a/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/pkgs/unit/tr/trx/add_bctoolbox_ldlib.patch similarity index 100% rename from pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch rename to pkgs/unit/tr/trx/add_bctoolbox_ldlib.patch diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/unit/tr/trx/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/trx/default.nix rename to pkgs/unit/tr/trx/pkg-fun.nix diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/unit/tr/tryton/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/tryton/default.nix rename to pkgs/unit/tr/tryton/pkg-fun.nix diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/unit/ts/ts/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ts/default.nix rename to pkgs/unit/ts/ts/pkg-fun.nix diff --git a/pkgs/tools/video/tsduck/default.nix b/pkgs/unit/ts/tsduck/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/tsduck/default.nix rename to pkgs/unit/ts/tsduck/pkg-fun.nix diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/unit/ts/tsocks/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tsocks/default.nix rename to pkgs/unit/ts/tsocks/pkg-fun.nix diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/unit/ts/tsocks/poll.patch similarity index 100% rename from pkgs/development/libraries/tsocks/poll.patch rename to pkgs/unit/ts/tsocks/poll.patch diff --git a/pkgs/applications/misc/tsukae/default.nix b/pkgs/unit/ts/tsukae/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tsukae/default.nix rename to pkgs/unit/ts/tsukae/pkg-fun.nix diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/unit/ts/tsung/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/tsung/default.nix rename to pkgs/unit/ts/tsung/pkg-fun.nix diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/unit/tt/tt-rss-plugin-auth-ldap/pkg-fun.nix similarity index 100% rename from pkgs/servers/tt-rss/plugin-auth-ldap/default.nix rename to pkgs/unit/tt/tt-rss-plugin-auth-ldap/pkg-fun.nix diff --git a/pkgs/servers/tt-rss/plugin-feediron/default.nix b/pkgs/unit/tt/tt-rss-plugin-feediron/pkg-fun.nix similarity index 100% rename from pkgs/servers/tt-rss/plugin-feediron/default.nix rename to pkgs/unit/tt/tt-rss-plugin-feediron/pkg-fun.nix diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/unit/tt/tt-rss-plugin-ff-instagram/pkg-fun.nix similarity index 100% rename from pkgs/servers/tt-rss/plugin-ff-instagram/default.nix rename to pkgs/unit/tt/tt-rss-plugin-ff-instagram/pkg-fun.nix diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/unit/tt/tt-rss-theme-feedly/pkg-fun.nix similarity index 100% rename from pkgs/servers/tt-rss/theme-feedly/default.nix rename to pkgs/unit/tt/tt-rss-theme-feedly/pkg-fun.nix diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/unit/tt/tt-rss/pkg-fun.nix similarity index 100% rename from pkgs/servers/tt-rss/default.nix rename to pkgs/unit/tt/tt-rss/pkg-fun.nix diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/unit/tt/tt2020/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/tt2020/default.nix rename to pkgs/unit/tt/tt2020/pkg-fun.nix diff --git a/pkgs/tools/misc/ttchat/default.nix b/pkgs/unit/tt/ttchat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttchat/default.nix rename to pkgs/unit/tt/ttchat/pkg-fun.nix diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/unit/tt/ttf-envy-code-r/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ttf-envy-code-r/default.nix rename to pkgs/unit/tt/ttf-envy-code-r/pkg-fun.nix diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/unit/tt/ttf-tw-moe/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ttf-tw-moe/default.nix rename to pkgs/unit/tt/ttf-tw-moe/pkg-fun.nix diff --git a/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch b/pkgs/unit/tt/ttf2pt1/gentoo-makefile.patch similarity index 100% rename from pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch rename to pkgs/unit/tt/ttf2pt1/gentoo-makefile.patch diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/unit/tt/ttf2pt1/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttf2pt1/default.nix rename to pkgs/unit/tt/ttf2pt1/pkg-fun.nix diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/unit/tt/ttf_bitstream_vera/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ttf-bitstream-vera/default.nix rename to pkgs/unit/tt/ttf_bitstream_vera/pkg-fun.nix diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/unit/tt/tthsum/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tthsum/default.nix rename to pkgs/unit/tt/tthsum/pkg-fun.nix diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/pkgs/unit/tt/ttmkfdir/cstring.patch similarity index 100% rename from pkgs/tools/misc/ttmkfdir/cstring.patch rename to pkgs/unit/tt/ttmkfdir/cstring.patch diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/unit/tt/ttmkfdir/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttmkfdir/default.nix rename to pkgs/unit/tt/ttmkfdir/pkg-fun.nix diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/unit/tt/tts/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/tts/default.nix rename to pkgs/unit/tt/tts/pkg-fun.nix diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/unit/tt/ttwatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttwatch/default.nix rename to pkgs/unit/tt/ttwatch/pkg-fun.nix diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/unit/tt/tty-clock/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tty-clock/default.nix rename to pkgs/unit/tt/tty-clock/pkg-fun.nix diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/unit/tt/tty-share/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tty-share/default.nix rename to pkgs/unit/tt/tty-share/pkg-fun.nix diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/unit/tt/tty-solitaire/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tty-solitaire/default.nix rename to pkgs/unit/tt/tty-solitaire/pkg-fun.nix diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/unit/tt/ttyd/pkg-fun.nix similarity index 100% rename from pkgs/servers/ttyd/default.nix rename to pkgs/unit/tt/ttyd/pkg-fun.nix diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/unit/tt/ttygif/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttygif/default.nix rename to pkgs/unit/tt/ttygif/pkg-fun.nix diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/unit/tt/ttylog/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttylog/default.nix rename to pkgs/unit/tt/ttylog/pkg-fun.nix diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/unit/tt/ttyper/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ttyper/default.nix rename to pkgs/unit/tt/ttyper/pkg-fun.nix diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/unit/tt/ttyplot/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ttyplot/default.nix rename to pkgs/unit/tt/ttyplot/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/unit/tu/tubekit-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tubekit/default.nix rename to pkgs/unit/tu/tubekit-unwrapped/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/tubekit/wrapper.nix b/pkgs/unit/tu/tubekit/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/tubekit/wrapper.nix rename to pkgs/unit/tu/tubekit/pkg-fun.nix diff --git a/pkgs/tools/text/tuc/default.nix b/pkgs/unit/tu/tuc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/tuc/default.nix rename to pkgs/unit/tu/tuc/pkg-fun.nix diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/unit/tu/tudu/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/tudu/default.nix rename to pkgs/unit/tu/tudu/pkg-fun.nix diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/unit/tu/tuhi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tuhi/default.nix rename to pkgs/unit/tu/tuhi/pkg-fun.nix diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/unit/tu/tuir/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tuir/default.nix rename to pkgs/unit/tu/tuir/pkg-fun.nix diff --git a/pkgs/games/tumiki-fighters/default.nix b/pkgs/unit/tu/tumiki-fighters/pkg-fun.nix similarity index 100% rename from pkgs/games/tumiki-fighters/default.nix rename to pkgs/unit/tu/tumiki-fighters/pkg-fun.nix diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/unit/tu/tun2socks/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tun2socks/default.nix rename to pkgs/unit/tu/tun2socks/pkg-fun.nix diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/unit/tu/tunctl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/tunctl/default.nix rename to pkgs/unit/tu/tunctl/pkg-fun.nix diff --git a/pkgs/applications/audio/tuner/default.nix b/pkgs/unit/tu/tuner/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/tuner/default.nix rename to pkgs/unit/tu/tuner/pkg-fun.nix diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/unit/tu/tuntox/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/tuntox/default.nix rename to pkgs/unit/tu/tuntox/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/tup/fusermount-setuid.patch b/pkgs/unit/tu/tup/fusermount-setuid.patch similarity index 100% rename from pkgs/development/tools/build-managers/tup/fusermount-setuid.patch rename to pkgs/unit/tu/tup/fusermount-setuid.patch diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/unit/tu/tup/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/tup/default.nix rename to pkgs/unit/tu/tup/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/tup/setup-hook.sh b/pkgs/unit/tu/tup/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/tup/setup-hook.sh rename to pkgs/unit/tu/tup/setup-hook.sh diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/unit/tu/tuptime/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/tuptime/default.nix rename to pkgs/unit/tu/tuptime/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/unit/tu/turses/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/turses/default.nix rename to pkgs/unit/tu/turses/pkg-fun.nix diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/unit/tu/tusk/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/tusk/default.nix rename to pkgs/unit/tu/tusk/pkg-fun.nix diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/unit/tu/tut/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tut/default.nix rename to pkgs/unit/tu/tut/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/unit/tu/tutanota-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix rename to pkgs/unit/tu/tutanota-desktop/pkg-fun.nix diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/unit/tu/tuxpaint/pkg-fun.nix similarity index 100% rename from pkgs/games/tuxpaint/default.nix rename to pkgs/unit/tu/tuxpaint/pkg-fun.nix diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/unit/tu/tuxpaint/tuxpaint-completion.diff similarity index 100% rename from pkgs/games/tuxpaint/tuxpaint-completion.diff rename to pkgs/unit/tu/tuxpaint/tuxpaint-completion.diff diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/unit/tu/tuxtype/pkg-fun.nix similarity index 100% rename from pkgs/games/tuxtype/default.nix rename to pkgs/unit/tu/tuxtype/pkg-fun.nix diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/unit/tv/tv/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/tv/default.nix rename to pkgs/unit/tv/tv/pkg-fun.nix diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/unit/tv/tvbrowser-bin/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tvbrowser/bin.nix rename to pkgs/unit/tv/tvbrowser-bin/pkg-fun.nix diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/unit/tv/tvm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/tvm/default.nix rename to pkgs/unit/tv/tvm/pkg-fun.nix diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/unit/tv/tvnamer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tvnamer/default.nix rename to pkgs/unit/tv/tvnamer/pkg-fun.nix diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/unit/tw/twa/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/twa/default.nix rename to pkgs/unit/tw/twa/pkg-fun.nix diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/unit/tw/tweak/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/tweak/default.nix rename to pkgs/unit/tw/tweak/pkg-fun.nix diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/unit/tw/tweeny/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/tweeny/default.nix rename to pkgs/unit/tw/tweeny/pkg-fun.nix diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/unit/tw/twelf/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/twelf/default.nix rename to pkgs/unit/tw/twelf/pkg-fun.nix diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/unit/tw/twemoji-color-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/twemoji-color-font/default.nix rename to pkgs/unit/tw/twemoji-color-font/pkg-fun.nix diff --git a/pkgs/development/tools/twiggy/default.nix b/pkgs/unit/tw/twiggy/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/twiggy/default.nix rename to pkgs/unit/tw/twiggy/pkg-fun.nix diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/unit/tw/twilio-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/twilio-cli/default.nix rename to pkgs/unit/tw/twilio-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/unit/tw/twingate/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/twingate/default.nix rename to pkgs/unit/tw/twingate/pkg-fun.nix diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/unit/tw/twitter-color-emoji/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/twitter-color-emoji/default.nix rename to pkgs/unit/tw/twitter-color-emoji/pkg-fun.nix diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/unit/tw/twitterBootstrap/pkg-fun.nix similarity index 100% rename from pkgs/development/web/twitter-bootstrap/default.nix rename to pkgs/unit/tw/twitterBootstrap/pkg-fun.nix diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/unit/tw/twolame/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/twolame/default.nix rename to pkgs/unit/tw/twolame/pkg-fun.nix diff --git a/pkgs/games/tworld2/default.nix b/pkgs/unit/tw/tworld2/pkg-fun.nix similarity index 100% rename from pkgs/games/tworld2/default.nix rename to pkgs/unit/tw/tworld2/pkg-fun.nix diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/unit/tw/twspace-dl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/twspace-dl/default.nix rename to pkgs/unit/tw/twspace-dl/pkg-fun.nix diff --git a/pkgs/tools/misc/twurl/Gemfile b/pkgs/unit/tw/twurl/Gemfile similarity index 100% rename from pkgs/tools/misc/twurl/Gemfile rename to pkgs/unit/tw/twurl/Gemfile diff --git a/pkgs/tools/misc/twurl/Gemfile.lock b/pkgs/unit/tw/twurl/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/twurl/Gemfile.lock rename to pkgs/unit/tw/twurl/Gemfile.lock diff --git a/pkgs/tools/misc/twurl/gemset.nix b/pkgs/unit/tw/twurl/gemset.nix similarity index 100% rename from pkgs/tools/misc/twurl/gemset.nix rename to pkgs/unit/tw/twurl/gemset.nix diff --git a/pkgs/tools/misc/twurl/default.nix b/pkgs/unit/tw/twurl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/twurl/default.nix rename to pkgs/unit/tw/twurl/pkg-fun.nix diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/unit/tx/txr/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/txr/default.nix rename to pkgs/unit/tx/txr/pkg-fun.nix diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/unit/tx/txt2man/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/txt2man/default.nix rename to pkgs/unit/tx/txt2man/pkg-fun.nix diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/unit/tx/txt2tags/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/txt2tags/default.nix rename to pkgs/unit/tx/txt2tags/pkg-fun.nix diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/unit/tx/txtpbfmt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/txtpbfmt/default.nix rename to pkgs/unit/tx/txtpbfmt/pkg-fun.nix diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/unit/tx/txtw/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/txtw/default.nix rename to pkgs/unit/tx/txtw/pkg-fun.nix diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/unit/ty/tydra/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tydra/default.nix rename to pkgs/unit/ty/tydra/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/unit/ty/tym/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/tym/default.nix rename to pkgs/unit/ty/tym/pkg-fun.nix diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/unit/ty/typeshare/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/rust/typeshare/default.nix rename to pkgs/unit/ty/typeshare/pkg-fun.nix diff --git a/pkgs/games/typespeed/default.nix b/pkgs/unit/ty/typespeed/pkg-fun.nix similarity index 100% rename from pkgs/games/typespeed/default.nix rename to pkgs/unit/ty/typespeed/pkg-fun.nix diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/unit/ty/typespeed/typespeed-config-in-home.patch similarity index 100% rename from pkgs/games/typespeed/typespeed-config-in-home.patch rename to pkgs/unit/ty/typespeed/typespeed-config-in-home.patch diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/unit/ty/typos/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/typos/default.nix rename to pkgs/unit/ty/typos/pkg-fun.nix diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/unit/tz/tz/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/tz/default.nix rename to pkgs/unit/tz/tz/pkg-fun.nix diff --git a/pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch b/pkgs/unit/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch similarity index 100% rename from pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch rename to pkgs/unit/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/unit/tz/tzdata/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/tzdata/default.nix rename to pkgs/unit/tz/tzdata/pkg-fun.nix diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/unit/tz/tzdata/tzdata-setup-hook.sh similarity index 100% rename from pkgs/data/misc/tzdata/tzdata-setup-hook.sh rename to pkgs/unit/tz/tzdata/tzdata-setup-hook.sh diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/unit/tz/tzupdate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/tzupdate/default.nix rename to pkgs/unit/tz/tzupdate/pkg-fun.nix diff --git a/pkgs/data/fonts/u001/default.nix b/pkgs/unit/u0/u001-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/u001/default.nix rename to pkgs/unit/u0/u001-font/pkg-fun.nix diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/unit/u3/u3-tool/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/u3-tool/default.nix rename to pkgs/unit/u3/u3-tool/pkg-fun.nix diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/unit/u9/u9fs/pkg-fun.nix similarity index 100% rename from pkgs/servers/u9fs/default.nix rename to pkgs/unit/u9/u9fs/pkg-fun.nix diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/unit/ua/ua/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ua/default.nix rename to pkgs/unit/ua/ua/pkg-fun.nix diff --git a/pkgs/tools/admin/uacme/default.nix b/pkgs/unit/ua/uacme/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/uacme/default.nix rename to pkgs/unit/ua/uacme/pkg-fun.nix diff --git a/pkgs/applications/audio/uade/default.nix b/pkgs/unit/ua/uade/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/uade/default.nix rename to pkgs/unit/ua/uade/pkg-fun.nix diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/unit/ua/uae/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/uae/default.nix rename to pkgs/unit/ua/uae/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/pkgs/unit/ua/uarmsolver/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/uarmsolver/default.nix rename to pkgs/unit/ua/uarmsolver/pkg-fun.nix diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/unit/ua/uasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/uasm/default.nix rename to pkgs/unit/ua/uasm/pkg-fun.nix diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/unit/ub/ubertooth/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/ubertooth/default.nix rename to pkgs/unit/ub/ubertooth/pkg-fun.nix diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/unit/ub/ubridge/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ubridge/default.nix rename to pkgs/unit/ub/ubridge/pkg-fun.nix diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/unit/ub/ubuntu-themes/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/ubuntu-themes/default.nix rename to pkgs/unit/ub/ubuntu-themes/pkg-fun.nix diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/unit/ub/ubuntu_font_family/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ubuntu-font-family/default.nix rename to pkgs/unit/ub/ubuntu_font_family/pkg-fun.nix diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/unit/ub/ubus/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ubus/default.nix rename to pkgs/unit/ub/ubus/pkg-fun.nix diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/unit/uc/ucarp/pkg-fun.nix similarity index 100% rename from pkgs/servers/ucarp/default.nix rename to pkgs/unit/uc/ucarp/pkg-fun.nix diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/unit/uc/ucc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ucc/default.nix rename to pkgs/unit/uc/ucc/pkg-fun.nix diff --git a/pkgs/games/uchess/default.nix b/pkgs/unit/uc/uchess/pkg-fun.nix similarity index 100% rename from pkgs/games/uchess/default.nix rename to pkgs/unit/uc/uchess/pkg-fun.nix diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/unit/uc/uci/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/uci/default.nix rename to pkgs/unit/uc/uci/pkg-fun.nix diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/unit/uc/ucl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ucl/default.nix rename to pkgs/unit/uc/ucl/pkg-fun.nix diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/unit/uc/ucommon/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ucommon/default.nix rename to pkgs/unit/uc/ucommon/pkg-fun.nix diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/unit/uc/ucs-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ucs-fonts/default.nix rename to pkgs/unit/uc/ucs-fonts/pkg-fun.nix diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/unit/uc/ucspi-tcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ucspi-tcp/default.nix rename to pkgs/unit/uc/ucspi-tcp/pkg-fun.nix diff --git a/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch b/pkgs/unit/uc/ucspi-tcp/remove-setuid.patch similarity index 100% rename from pkgs/tools/networking/ucspi-tcp/remove-setuid.patch rename to pkgs/unit/uc/ucspi-tcp/remove-setuid.patch diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/unit/uc/ucx/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ucx/default.nix rename to pkgs/unit/uc/ucx/pkg-fun.nix diff --git a/pkgs/tools/security/uddup/default.nix b/pkgs/unit/ud/uddup/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/uddup/default.nix rename to pkgs/unit/ud/uddup/pkg-fun.nix diff --git a/pkgs/applications/misc/udevil/device-info-sys-stat.patch b/pkgs/unit/ud/udevil/device-info-sys-stat.patch similarity index 100% rename from pkgs/applications/misc/udevil/device-info-sys-stat.patch rename to pkgs/unit/ud/udevil/device-info-sys-stat.patch diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/unit/ud/udevil/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/udevil/default.nix rename to pkgs/unit/ud/udevil/pkg-fun.nix diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/unit/ud/udftools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/udftools/default.nix rename to pkgs/unit/ud/udftools/pkg-fun.nix diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/unit/ud/udig/pkg-fun.nix similarity index 100% rename from pkgs/applications/gis/udig/default.nix rename to pkgs/unit/ud/udig/pkg-fun.nix diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/unit/ud/udis86/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/udis86/default.nix rename to pkgs/unit/ud/udis86/pkg-fun.nix diff --git a/pkgs/applications/misc/udiskie/locale-path.patch b/pkgs/unit/ud/udiskie/locale-path.patch similarity index 100% rename from pkgs/applications/misc/udiskie/locale-path.patch rename to pkgs/unit/ud/udiskie/locale-path.patch diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/unit/ud/udiskie/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/udiskie/default.nix rename to pkgs/unit/ud/udiskie/pkg-fun.nix diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/unit/ud/udisks2/fix-paths.patch similarity index 100% rename from pkgs/os-specific/linux/udisks/fix-paths.patch rename to pkgs/unit/ud/udisks2/fix-paths.patch diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/unit/ud/udisks2/force-path.patch similarity index 100% rename from pkgs/os-specific/linux/udisks/force-path.patch rename to pkgs/unit/ud/udisks2/force-path.patch diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/unit/ud/udisks2/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/udisks/2-default.nix rename to pkgs/unit/ud/udisks2/pkg-fun.nix diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/unit/ud/udns/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/udns/default.nix rename to pkgs/unit/ud/udns/pkg-fun.nix diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/unit/ud/udocker/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/udocker/default.nix rename to pkgs/unit/ud/udocker/pkg-fun.nix diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/unit/ud/udp2raw/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/udp2raw/default.nix rename to pkgs/unit/ud/udp2raw/pkg-fun.nix diff --git a/pkgs/tools/networking/udpreplay/default.nix b/pkgs/unit/ud/udpreplay/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/udpreplay/default.nix rename to pkgs/unit/ud/udpreplay/pkg-fun.nix diff --git a/pkgs/servers/udpt/default.nix b/pkgs/unit/ud/udpt/pkg-fun.nix similarity index 100% rename from pkgs/servers/udpt/default.nix rename to pkgs/unit/ud/udpt/pkg-fun.nix diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/unit/ud/udptunnel/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/udptunnel/default.nix rename to pkgs/unit/ud/udptunnel/pkg-fun.nix diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/unit/ud/udunits/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/udunits/default.nix rename to pkgs/unit/ud/udunits/pkg-fun.nix diff --git a/pkgs/games/ue4/cdn-deps.nix b/pkgs/unit/ue/ue4/cdn-deps.nix similarity index 100% rename from pkgs/games/ue4/cdn-deps.nix rename to pkgs/unit/ue/ue4/cdn-deps.nix diff --git a/pkgs/games/ue4/generate-expr-from-cdn.sh b/pkgs/unit/ue/ue4/generate-expr-from-cdn.sh similarity index 100% rename from pkgs/games/ue4/generate-expr-from-cdn.sh rename to pkgs/unit/ue/ue4/generate-expr-from-cdn.sh diff --git a/pkgs/games/ue4/default.nix b/pkgs/unit/ue/ue4/pkg-fun.nix similarity index 100% rename from pkgs/games/ue4/default.nix rename to pkgs/unit/ue/ue4/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/unit/ue/uefi-firmware-parser/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/uefi-firmware-parser/default.nix rename to pkgs/unit/ue/uefi-firmware-parser/pkg-fun.nix diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/unit/ue/uefi-run/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/uefi-run/default.nix rename to pkgs/unit/ue/uefi-run/pkg-fun.nix diff --git a/pkgs/tools/system/ufiformat/default.nix b/pkgs/unit/uf/ufiformat/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/ufiformat/default.nix rename to pkgs/unit/uf/ufiformat/pkg-fun.nix diff --git a/pkgs/games/ufoai/default.nix b/pkgs/unit/uf/ufoai/pkg-fun.nix similarity index 100% rename from pkgs/games/ufoai/default.nix rename to pkgs/unit/uf/ufoai/pkg-fun.nix diff --git a/pkgs/servers/uftp/default.nix b/pkgs/unit/uf/uftp/pkg-fun.nix similarity index 100% rename from pkgs/servers/uftp/default.nix rename to pkgs/unit/uf/uftp/pkg-fun.nix diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/unit/uf/uftrace/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/uftrace/default.nix rename to pkgs/unit/uf/uftrace/pkg-fun.nix diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/unit/ug/uget-integrator/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/uget-integrator/default.nix rename to pkgs/unit/ug/uget-integrator/pkg-fun.nix diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/unit/ug/uget/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/uget/default.nix rename to pkgs/unit/ug/uget/pkg-fun.nix diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/unit/ug/ugrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/ugrep/default.nix rename to pkgs/unit/ug/ugrep/pkg-fun.nix diff --git a/pkgs/tools/misc/ugtrain/default.nix b/pkgs/unit/ug/ugtrain/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ugtrain/default.nix rename to pkgs/unit/ug/ugtrain/pkg-fun.nix diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/unit/uh/uhdm/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/uhdm/default.nix rename to pkgs/unit/uh/uhdm/pkg-fun.nix diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/unit/uh/uhexen2/pkg-fun.nix similarity index 100% rename from pkgs/games/uhexen2/default.nix rename to pkgs/unit/uh/uhexen2/pkg-fun.nix diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/unit/uh/uhk-agent/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/uhk-agent/default.nix rename to pkgs/unit/uh/uhk-agent/pkg-fun.nix diff --git a/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/pkgs/unit/uh/uhk-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/uhk-udev-rules/default.nix rename to pkgs/unit/uh/uhk-udev-rules/pkg-fun.nix diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/unit/uh/uhttpmock/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/uhttpmock/default.nix rename to pkgs/unit/uh/uhttpmock/pkg-fun.nix diff --git a/pkgs/servers/uhub/default.nix b/pkgs/unit/uh/uhub/pkg-fun.nix similarity index 100% rename from pkgs/servers/uhub/default.nix rename to pkgs/unit/uh/uhub/pkg-fun.nix diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/unit/uh/uhubctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/uhubctl/default.nix rename to pkgs/unit/uh/uhubctl/pkg-fun.nix diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/unit/ui/uid_wrapper/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/uid_wrapper/default.nix rename to pkgs/unit/ui/uid_wrapper/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/unit/ui/uif2iso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/uif2iso/default.nix rename to pkgs/unit/ui/uif2iso/pkg-fun.nix diff --git a/pkgs/development/embedded/uisp/default.nix b/pkgs/unit/ui/uisp/pkg-fun.nix similarity index 100% rename from pkgs/development/embedded/uisp/default.nix rename to pkgs/unit/ui/uisp/pkg-fun.nix diff --git a/pkgs/applications/editors/uivonim/package.json b/pkgs/unit/ui/uivonim/package.json similarity index 100% rename from pkgs/applications/editors/uivonim/package.json rename to pkgs/unit/ui/uivonim/package.json diff --git a/pkgs/applications/editors/uivonim/default.nix b/pkgs/unit/ui/uivonim/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/uivonim/default.nix rename to pkgs/unit/ui/uivonim/pkg-fun.nix diff --git a/pkgs/applications/editors/uivonim/yarn.lock b/pkgs/unit/ui/uivonim/yarn.lock similarity index 100% rename from pkgs/applications/editors/uivonim/yarn.lock rename to pkgs/unit/ui/uivonim/yarn.lock diff --git a/pkgs/applications/editors/uivonim/yarn.nix b/pkgs/unit/ui/uivonim/yarn.nix similarity index 100% rename from pkgs/applications/editors/uivonim/yarn.nix rename to pkgs/unit/ui/uivonim/yarn.nix diff --git a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch b/pkgs/unit/ul/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch similarity index 100% rename from pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch rename to pkgs/unit/ul/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch diff --git a/pkgs/applications/misc/ulauncher/fix-extensions.patch b/pkgs/unit/ul/ulauncher/fix-extensions.patch similarity index 100% rename from pkgs/applications/misc/ulauncher/fix-extensions.patch rename to pkgs/unit/ul/ulauncher/fix-extensions.patch diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/pkgs/unit/ul/ulauncher/fix-path.patch similarity index 100% rename from pkgs/applications/misc/ulauncher/fix-path.patch rename to pkgs/unit/ul/ulauncher/fix-path.patch diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/unit/ul/ulauncher/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ulauncher/default.nix rename to pkgs/unit/ul/ulauncher/pkg-fun.nix diff --git a/pkgs/os-specific/linux/ulogd/default.nix b/pkgs/unit/ul/ulogd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/ulogd/default.nix rename to pkgs/unit/ul/ulogd/pkg-fun.nix diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/unit/ul/ultimate-oldschool-pc-font-pack/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix rename to pkgs/unit/ul/ultimate-oldschool-pc-font-pack/pkg-fun.nix diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/unit/ul/ultimatestunts/pkg-fun.nix similarity index 100% rename from pkgs/games/ultimatestunts/default.nix rename to pkgs/unit/ul/ultimatestunts/pkg-fun.nix diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/unit/ul/ultralist/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ultralist/default.nix rename to pkgs/unit/ul/ultralist/pkg-fun.nix diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/unit/ul/ultrastardx/pkg-fun.nix similarity index 100% rename from pkgs/games/ultrastardx/default.nix rename to pkgs/unit/ul/ultrastardx/pkg-fun.nix diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/unit/um/umlet/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/umlet/default.nix rename to pkgs/unit/um/umlet/pkg-fun.nix diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/unit/um/umoci/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/umoci/default.nix rename to pkgs/unit/um/umoci/pkg-fun.nix diff --git a/pkgs/development/libraries/umockdev/hardcode-paths.patch b/pkgs/unit/um/umockdev/hardcode-paths.patch similarity index 100% rename from pkgs/development/libraries/umockdev/hardcode-paths.patch rename to pkgs/unit/um/umockdev/hardcode-paths.patch diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/unit/um/umockdev/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/umockdev/default.nix rename to pkgs/unit/um/umockdev/pkg-fun.nix diff --git a/pkgs/games/umoria/default.nix b/pkgs/unit/um/umoria/pkg-fun.nix similarity index 100% rename from pkgs/games/umoria/default.nix rename to pkgs/unit/um/umoria/pkg-fun.nix diff --git a/pkgs/servers/ums/default.nix b/pkgs/unit/um/ums/pkg-fun.nix similarity index 100% rename from pkgs/servers/ums/default.nix rename to pkgs/unit/um/ums/pkg-fun.nix diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/unit/um/umurmur/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/umurmur/default.nix rename to pkgs/unit/um/umurmur/pkg-fun.nix diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/unit/un/unbound/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/unbound/default.nix rename to pkgs/unit/un/unbound/pkg-fun.nix diff --git a/pkgs/games/unciv/default.nix b/pkgs/unit/un/unciv/pkg-fun.nix similarity index 100% rename from pkgs/games/unciv/default.nix rename to pkgs/unit/un/unciv/pkg-fun.nix diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/unit/un/unclutter-xfixes/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/unclutter-xfixes/default.nix rename to pkgs/unit/un/unclutter-xfixes/pkg-fun.nix diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/unit/un/unclutter/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/unclutter/default.nix rename to pkgs/unit/un/unclutter/pkg-fun.nix diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/unit/un/unconvert/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/unconvert/default.nix rename to pkgs/unit/un/unconvert/pkg-fun.nix diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/unit/un/uncover/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/uncover/default.nix rename to pkgs/unit/un/uncover/pkg-fun.nix diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/unit/un/uncrustify/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/uncrustify/default.nix rename to pkgs/unit/un/uncrustify/pkg-fun.nix diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/unit/un/undaemonize/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/undaemonize/default.nix rename to pkgs/unit/un/undaemonize/pkg-fun.nix diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/unit/un/undefined-medium/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/undefined-medium/default.nix rename to pkgs/unit/un/undefined-medium/pkg-fun.nix diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/unit/un/undervolt/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/undervolt/default.nix rename to pkgs/unit/un/undervolt/pkg-fun.nix diff --git a/pkgs/shells/bash/undistract-me/default.nix b/pkgs/unit/un/undistract-me/pkg-fun.nix similarity index 100% rename from pkgs/shells/bash/undistract-me/default.nix rename to pkgs/unit/un/undistract-me/pkg-fun.nix diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/unit/un/undmg/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/undmg/default.nix rename to pkgs/unit/un/undmg/pkg-fun.nix diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/unit/un/undmg/setup-hook.sh similarity index 100% rename from pkgs/tools/archivers/undmg/setup-hook.sh rename to pkgs/unit/un/undmg/setup-hook.sh diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/unit/un/undocker/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/undocker/default.nix rename to pkgs/unit/un/undocker/pkg-fun.nix diff --git a/pkgs/tools/audio/unflac/default.nix b/pkgs/unit/un/unflac/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/unflac/default.nix rename to pkgs/unit/un/unflac/pkg-fun.nix diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/unit/un/unfonts-core/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/unfonts-core/default.nix rename to pkgs/unit/un/unfonts-core/pkg-fun.nix diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/unit/un/unfs3/pkg-fun.nix similarity index 100% rename from pkgs/servers/unfs3/default.nix rename to pkgs/unit/un/unfs3/pkg-fun.nix diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/unit/un/uni-vga/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/uni-vga/default.nix rename to pkgs/unit/un/uni-vga/pkg-fun.nix diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/unit/un/uni/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/uni/default.nix rename to pkgs/unit/un/uni/pkg-fun.nix diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/unit/un/uni2ascii/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/uni2ascii/default.nix rename to pkgs/unit/un/uni2ascii/pkg-fun.nix diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/unit/un/unibilium/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/unibilium/default.nix rename to pkgs/unit/un/unibilium/pkg-fun.nix diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/unit/un/unicap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/unicap/default.nix rename to pkgs/unit/un/unicap/pkg-fun.nix diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/unit/un/unicode-character-database/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/unicode-character-database/default.nix rename to pkgs/unit/un/unicode-character-database/pkg-fun.nix diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/unit/un/unicode-emoji/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/unicode-emoji/default.nix rename to pkgs/unit/un/unicode-emoji/pkg-fun.nix diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/unit/un/unicode-paracode/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/unicode/default.nix rename to pkgs/unit/un/unicode-paracode/pkg-fun.nix diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/unit/un/unicon-lang/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/unicon-lang/default.nix rename to pkgs/unit/un/unicon-lang/pkg-fun.nix diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/unit/un/unifdef/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/unifdef/default.nix rename to pkgs/unit/un/unifdef/pkg-fun.nix diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/unit/un/uniffi-bindgen/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/uniffi-bindgen/default.nix rename to pkgs/unit/un/uniffi-bindgen/pkg-fun.nix diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/unit/un/unifi-protect-backup/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/unifi-protect-backup/default.nix rename to pkgs/unit/un/unifi-protect-backup/pkg-fun.nix diff --git a/pkgs/servers/unifi-video/default.nix b/pkgs/unit/un/unifi-video/pkg-fun.nix similarity index 100% rename from pkgs/servers/unifi-video/default.nix rename to pkgs/unit/un/unifi-video/pkg-fun.nix diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/unit/un/unifiedpush-common-proxies/pkg-fun.nix similarity index 100% rename from pkgs/servers/unifiedpush-common-proxies/default.nix rename to pkgs/unit/un/unifiedpush-common-proxies/pkg-fun.nix diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/unit/un/unifont/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/unifont/default.nix rename to pkgs/unit/un/unifont/pkg-fun.nix diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/unit/un/unifont_upper/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/unifont_upper/default.nix rename to pkgs/unit/un/unifont_upper/pkg-fun.nix diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/unit/un/unigine-heaven/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/unigine-heaven/default.nix rename to pkgs/unit/un/unigine-heaven/pkg-fun.nix diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/unit/un/unigine-valley/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/unigine-valley/default.nix rename to pkgs/unit/un/unigine-valley/pkg-fun.nix diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/unit/un/unihan-database/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/unihan-database/default.nix rename to pkgs/unit/un/unihan-database/pkg-fun.nix diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/unit/un/unionfs-fuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/unionfs-fuse/default.nix rename to pkgs/unit/un/unionfs-fuse/pkg-fun.nix diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/pkgs/unit/un/unionfs-fuse/prevent-kill-on-shutdown.patch similarity index 100% rename from pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch rename to pkgs/unit/un/unionfs-fuse/prevent-kill-on-shutdown.patch diff --git a/pkgs/applications/misc/unipicker/default.nix b/pkgs/unit/un/unipicker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/unipicker/default.nix rename to pkgs/unit/un/unipicker/pkg-fun.nix diff --git a/pkgs/tools/text/uniscribe/Gemfile b/pkgs/unit/un/uniscribe/Gemfile similarity index 100% rename from pkgs/tools/text/uniscribe/Gemfile rename to pkgs/unit/un/uniscribe/Gemfile diff --git a/pkgs/tools/text/uniscribe/Gemfile.lock b/pkgs/unit/un/uniscribe/Gemfile.lock similarity index 100% rename from pkgs/tools/text/uniscribe/Gemfile.lock rename to pkgs/unit/un/uniscribe/Gemfile.lock diff --git a/pkgs/tools/text/uniscribe/gemset.nix b/pkgs/unit/un/uniscribe/gemset.nix similarity index 100% rename from pkgs/tools/text/uniscribe/gemset.nix rename to pkgs/unit/un/uniscribe/gemset.nix diff --git a/pkgs/tools/text/uniscribe/default.nix b/pkgs/unit/un/uniscribe/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/uniscribe/default.nix rename to pkgs/unit/un/uniscribe/pkg-fun.nix diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/unit/un/unison-ucm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/unison/default.nix rename to pkgs/unit/un/unison-ucm/pkg-fun.nix diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/unit/un/unit/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/unit/default.nix rename to pkgs/unit/un/unit/pkg-fun.nix diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/unit/un/unittest-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/unittest-cpp/default.nix rename to pkgs/unit/un/unittest-cpp/pkg-fun.nix diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/unit/un/unityhub/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/unityhub/default.nix rename to pkgs/unit/un/unityhub/pkg-fun.nix diff --git a/pkgs/development/tools/misc/universal-ctags/000-nixos-specific.patch b/pkgs/unit/un/universal-ctags/000-nixos-specific.patch similarity index 100% rename from pkgs/development/tools/misc/universal-ctags/000-nixos-specific.patch rename to pkgs/unit/un/universal-ctags/000-nixos-specific.patch diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/unit/un/universal-ctags/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/universal-ctags/default.nix rename to pkgs/unit/un/universal-ctags/pkg-fun.nix diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/unit/un/unixODBC/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/unixODBC/default.nix rename to pkgs/unit/un/unixODBC/pkg-fun.nix diff --git a/pkgs/games/unnethack/default.nix b/pkgs/unit/un/unnethack/pkg-fun.nix similarity index 100% rename from pkgs/games/unnethack/default.nix rename to pkgs/unit/un/unnethack/pkg-fun.nix diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/unit/un/unoconv/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/unoconv/default.nix rename to pkgs/unit/un/unoconv/pkg-fun.nix diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/unit/un/unp/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/unp/default.nix rename to pkgs/unit/un/unp/pkg-fun.nix diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/unit/un/unpaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/unpaper/default.nix rename to pkgs/unit/un/unpaper/pkg-fun.nix diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/unit/un/unparam/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/unparam/default.nix rename to pkgs/unit/un/unparam/pkg-fun.nix diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/unit/un/unpfs/pkg-fun.nix similarity index 100% rename from pkgs/servers/unpfs/default.nix rename to pkgs/unit/un/unpfs/pkg-fun.nix diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/unit/un/unpoller/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/unpoller/default.nix rename to pkgs/unit/un/unpoller/pkg-fun.nix diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/unit/un/unrar/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/unrar/default.nix rename to pkgs/unit/un/unrar/pkg-fun.nix diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/pkgs/unit/un/unrar/setup-hook.sh similarity index 100% rename from pkgs/tools/archivers/unrar/setup-hook.sh rename to pkgs/unit/un/unrar/setup-hook.sh diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/unit/un/unrtf/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/unrtf/default.nix rename to pkgs/unit/un/unrtf/pkg-fun.nix diff --git a/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch b/pkgs/unit/un/unscd/0001-adjust-socket-paths-for-nixos.patch similarity index 100% rename from pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch rename to pkgs/unit/un/unscd/0001-adjust-socket-paths-for-nixos.patch diff --git a/pkgs/os-specific/linux/unscd/default.nix b/pkgs/unit/un/unscd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/unscd/default.nix rename to pkgs/unit/un/unscd/pkg-fun.nix diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/unit/un/unscii/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/unscii/default.nix rename to pkgs/unit/un/unscii/pkg-fun.nix diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/unit/un/unshield/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/unshield/default.nix rename to pkgs/unit/un/unshield/pkg-fun.nix diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/unit/un/unstableGitUpdater/pkg-fun.nix similarity index 100% rename from pkgs/common-updater/unstable-updater.nix rename to pkgs/unit/un/unstableGitUpdater/pkg-fun.nix diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/unit/un/unstick/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/unstick/default.nix rename to pkgs/unit/un/unstick/pkg-fun.nix diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/unit/un/untex/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/untex/default.nix rename to pkgs/unit/un/untex/pkg-fun.nix diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/unit/un/untie/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/untie/default.nix rename to pkgs/unit/un/untie/pkg-fun.nix diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/unit/un/untrunc-anthwlock/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/untrunc-anthwlock/default.nix rename to pkgs/unit/un/untrunc-anthwlock/pkg-fun.nix diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/unit/un/unused/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/unused/default.nix rename to pkgs/unit/un/unused/pkg-fun.nix diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/unit/un/unvanquished/pkg-fun.nix similarity index 100% rename from pkgs/games/unvanquished/default.nix rename to pkgs/unit/un/unvanquished/pkg-fun.nix diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8139.diff b/pkgs/unit/un/unzip/CVE-2014-8139.diff similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2014-8139.diff rename to pkgs/unit/un/unzip/CVE-2014-8139.diff diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8140.diff b/pkgs/unit/un/unzip/CVE-2014-8140.diff similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2014-8140.diff rename to pkgs/unit/un/unzip/CVE-2014-8140.diff diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8141.diff b/pkgs/unit/un/unzip/CVE-2014-8141.diff similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2014-8141.diff rename to pkgs/unit/un/unzip/CVE-2014-8141.diff diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/pkgs/unit/un/unzip/CVE-2014-9636.diff similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2014-9636.diff rename to pkgs/unit/un/unzip/CVE-2014-9636.diff diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/pkgs/unit/un/unzip/CVE-2014-9913.patch similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2014-9913.patch rename to pkgs/unit/un/unzip/CVE-2014-9913.patch diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7696.diff b/pkgs/unit/un/unzip/CVE-2015-7696.diff similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2015-7696.diff rename to pkgs/unit/un/unzip/CVE-2015-7696.diff diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7697.diff b/pkgs/unit/un/unzip/CVE-2015-7697.diff similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2015-7697.diff rename to pkgs/unit/un/unzip/CVE-2015-7697.diff diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/pkgs/unit/un/unzip/CVE-2016-9844.patch similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2016-9844.patch rename to pkgs/unit/un/unzip/CVE-2016-9844.patch diff --git a/pkgs/tools/archivers/unzip/CVE-2018-18384.patch b/pkgs/unit/un/unzip/CVE-2018-18384.patch similarity index 100% rename from pkgs/tools/archivers/unzip/CVE-2018-18384.patch rename to pkgs/unit/un/unzip/CVE-2018-18384.patch diff --git a/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch b/pkgs/unit/un/unzip/dont-hardcode-cc.patch similarity index 100% rename from pkgs/tools/archivers/unzip/dont-hardcode-cc.patch rename to pkgs/unit/un/unzip/dont-hardcode-cc.patch diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/unit/un/unzip/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/unzip/default.nix rename to pkgs/unit/un/unzip/pkg-fun.nix diff --git a/pkgs/tools/archivers/unzip/setup-hook.sh b/pkgs/unit/un/unzip/setup-hook.sh similarity index 100% rename from pkgs/tools/archivers/unzip/setup-hook.sh rename to pkgs/unit/un/unzip/setup-hook.sh diff --git a/pkgs/tools/archivers/unzoo/default.nix b/pkgs/unit/un/unzoo/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/unzoo/default.nix rename to pkgs/unit/un/unzoo/pkg-fun.nix diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/unit/up/up/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/up/default.nix rename to pkgs/unit/up/up/pkg-fun.nix diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/unit/up/upbound/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/upbound/default.nix rename to pkgs/unit/up/upbound/pkg-fun.nix diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/unit/up/update-python-libraries/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/python/update-python-libraries/default.nix rename to pkgs/unit/up/update-python-libraries/pkg-fun.nix diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/unit/up/update-python-libraries/update-python-libraries.py similarity index 100% rename from pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py rename to pkgs/unit/up/update-python-libraries/update-python-libraries.py diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/unit/up/update-resolv-conf/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openvpn/update-resolv-conf.nix rename to pkgs/unit/up/update-resolv-conf/pkg-fun.nix diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/unit/up/update-systemd-resolved/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/openvpn/update-systemd-resolved.nix rename to pkgs/unit/up/update-systemd-resolved/pkg-fun.nix diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.patch b/pkgs/unit/up/update-systemd-resolved/update-systemd-resolved.patch similarity index 100% rename from pkgs/tools/networking/openvpn/update-systemd-resolved.patch rename to pkgs/unit/up/update-systemd-resolved/update-systemd-resolved.patch diff --git a/pkgs/tools/networking/updog/default.nix b/pkgs/unit/up/updog/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/updog/default.nix rename to pkgs/unit/up/updog/pkg-fun.nix diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/unit/up/upnp-router-control/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/upnp-router-control/default.nix rename to pkgs/unit/up/upnp-router-control/pkg-fun.nix diff --git a/pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch b/pkgs/unit/up/upower/i686-test-remove-battery-check.patch similarity index 100% rename from pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch rename to pkgs/unit/up/upower/i686-test-remove-battery-check.patch diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/unit/up/upower/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/upower/default.nix rename to pkgs/unit/up/upower/pkg-fun.nix diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/unit/up/upterm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/upterm/default.nix rename to pkgs/unit/up/upterm/pkg-fun.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/composition.nix b/pkgs/unit/up/uptime-kuma/composition.nix similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/composition.nix rename to pkgs/unit/up/uptime-kuma/composition.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch b/pkgs/unit/up/uptime-kuma/fix-database-permissions.patch similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch rename to pkgs/unit/up/uptime-kuma/fix-database-permissions.patch diff --git a/pkgs/tools/misc/fx_cast/node-env.nix b/pkgs/unit/up/uptime-kuma/node-env.nix similarity index 100% rename from pkgs/tools/misc/fx_cast/node-env.nix rename to pkgs/unit/up/uptime-kuma/node-env.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix b/pkgs/unit/up/uptime-kuma/node-packages.nix similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/node-packages.nix rename to pkgs/unit/up/uptime-kuma/node-packages.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/unit/up/uptime-kuma/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/default.nix rename to pkgs/unit/up/uptime-kuma/pkg-fun.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/update.sh b/pkgs/unit/up/uptime-kuma/update.sh similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/update.sh rename to pkgs/unit/up/uptime-kuma/update.sh diff --git a/pkgs/tools/system/uptimed/no-var-spool-install.patch b/pkgs/unit/up/uptimed/no-var-spool-install.patch similarity index 100% rename from pkgs/tools/system/uptimed/no-var-spool-install.patch rename to pkgs/unit/up/uptimed/no-var-spool-install.patch diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/unit/up/uptimed/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/uptimed/default.nix rename to pkgs/unit/up/uptimed/pkg-fun.nix diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/unit/up/upwork/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/upwork/default.nix rename to pkgs/unit/up/upwork/pkg-fun.nix diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/unit/up/upx/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/upx/default.nix rename to pkgs/unit/up/upx/pkg-fun.nix diff --git a/pkgs/misc/uq/default.nix b/pkgs/unit/uq/uq/pkg-fun.nix similarity index 100% rename from pkgs/misc/uq/default.nix rename to pkgs/unit/uq/uq/pkg-fun.nix diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/unit/uq/uqm/3dovideo.nix similarity index 100% rename from pkgs/games/uqm/3dovideo.nix rename to pkgs/unit/uq/uqm/3dovideo.nix diff --git a/pkgs/games/uqm/default.nix b/pkgs/unit/uq/uqm/pkg-fun.nix similarity index 100% rename from pkgs/games/uqm/default.nix rename to pkgs/unit/uq/uqm/pkg-fun.nix diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/unit/uq/uqmi/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/uqmi/default.nix rename to pkgs/unit/uq/uqmi/pkg-fun.nix diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/unit/ur/urbackup-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/urbackup-client/default.nix rename to pkgs/unit/ur/urbackup-client/pkg-fun.nix diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/unit/ur/urbanterror/pkg-fun.nix similarity index 100% rename from pkgs/games/urbanterror/default.nix rename to pkgs/unit/ur/urbanterror/pkg-fun.nix diff --git a/pkgs/misc/urbit/default.nix b/pkgs/unit/ur/urbit/pkg-fun.nix similarity index 100% rename from pkgs/misc/urbit/default.nix rename to pkgs/unit/ur/urbit/pkg-fun.nix diff --git a/pkgs/development/libraries/urdfdom-headers/default.nix b/pkgs/unit/ur/urdfdom-headers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/urdfdom-headers/default.nix rename to pkgs/unit/ur/urdfdom-headers/pkg-fun.nix diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/unit/ur/urdfdom/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/urdfdom/default.nix rename to pkgs/unit/ur/urdfdom/pkg-fun.nix diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/unit/ur/urh/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/urh/default.nix rename to pkgs/unit/ur/urh/pkg-fun.nix diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/unit/ur/uriparser/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/uriparser/default.nix rename to pkgs/unit/ur/uriparser/pkg-fun.nix diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/unit/ur/urjtag/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/urjtag/default.nix rename to pkgs/unit/ur/urjtag/pkg-fun.nix diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/unit/ur/urlhunter/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/urlhunter/default.nix rename to pkgs/unit/ur/urlhunter/pkg-fun.nix diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/unit/ur/urlscan/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/urlscan/default.nix rename to pkgs/unit/ur/urlscan/pkg-fun.nix diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/unit/ur/urlview/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/urlview/default.nix rename to pkgs/unit/ur/urlview/pkg-fun.nix diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/unit/ur/urlwatch/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/urlwatch/default.nix rename to pkgs/unit/ur/urlwatch/pkg-fun.nix diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/unit/ur/urn-timer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/urn-timer/default.nix rename to pkgs/unit/ur/urn-timer/pkg-fun.nix diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/unit/ur/urn/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/urn/default.nix rename to pkgs/unit/ur/urn/pkg-fun.nix diff --git a/pkgs/tools/system/uroboros/default.nix b/pkgs/unit/ur/uroboros/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/uroboros/default.nix rename to pkgs/unit/ur/uroboros/pkg-fun.nix diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/unit/ur/ursadb/pkg-fun.nix similarity index 100% rename from pkgs/servers/ursadb/default.nix rename to pkgs/unit/ur/ursadb/pkg-fun.nix diff --git a/pkgs/servers/urserver/default.nix b/pkgs/unit/ur/urserver/pkg-fun.nix similarity index 100% rename from pkgs/servers/urserver/default.nix rename to pkgs/unit/ur/urserver/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/pkgs/unit/us/usb-blaster-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix rename to pkgs/unit/us/usb-blaster-udev-rules/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/pkgs/unit/us/usb-blaster-udev-rules/usb-blaster.rules similarity index 100% rename from pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules rename to pkgs/unit/us/usb-blaster-udev-rules/usb-blaster.rules diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/unit/us/usb-modeswitch-data/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/data.nix rename to pkgs/unit/us/usb-modeswitch-data/pkg-fun.nix diff --git a/pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch b/pkgs/unit/us/usb-modeswitch/configurable-usb-modeswitch.patch similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch rename to pkgs/unit/us/usb-modeswitch/configurable-usb-modeswitch.patch diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/unit/us/usb-modeswitch/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/usb-modeswitch/default.nix rename to pkgs/unit/us/usb-modeswitch/pkg-fun.nix diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/unit/us/usb-reset/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/usb-reset/default.nix rename to pkgs/unit/us/usb-reset/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/unit/us/usbguard/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usbguard/default.nix rename to pkgs/unit/us/usbguard/pkg-fun.nix diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/unit/us/usbimager/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/usbimager/default.nix rename to pkgs/unit/us/usbimager/pkg-fun.nix diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/unit/us/usbmuxd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/usbmuxd/default.nix rename to pkgs/unit/us/usbmuxd/pkg-fun.nix diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/unit/us/usbmuxd2/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/usbmuxd2/default.nix rename to pkgs/unit/us/usbmuxd2/pkg-fun.nix diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/unit/us/usbredir/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/usbredir/default.nix rename to pkgs/unit/us/usbredir/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/unit/us/usbrelay/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usbrelay/default.nix rename to pkgs/unit/us/usbrelay/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usbrelay/daemon.nix b/pkgs/unit/us/usbrelayd/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usbrelay/daemon.nix rename to pkgs/unit/us/usbrelayd/pkg-fun.nix diff --git a/pkgs/tools/security/usbrip/default.nix b/pkgs/unit/us/usbrip/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/usbrip/default.nix rename to pkgs/unit/us/usbrip/pkg-fun.nix diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/unit/us/usbsdmux/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/usbsdmux/default.nix rename to pkgs/unit/us/usbsdmux/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/unit/us/usbtop/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usbtop/default.nix rename to pkgs/unit/us/usbtop/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/unit/us/usbutils/fix-paths.patch similarity index 100% rename from pkgs/os-specific/linux/usbutils/fix-paths.patch rename to pkgs/unit/us/usbutils/fix-paths.patch diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/unit/us/usbutils/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usbutils/default.nix rename to pkgs/unit/us/usbutils/pkg-fun.nix diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/unit/us/usbview/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/usbview/default.nix rename to pkgs/unit/us/usbview/pkg-fun.nix diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/unit/us/userhosts/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/userhosts/default.nix rename to pkgs/unit/us/userhosts/pkg-fun.nix diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/unit/us/usermount/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/usermount/default.nix rename to pkgs/unit/us/usermount/pkg-fun.nix diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/unit/us/usql/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/usql/default.nix rename to pkgs/unit/us/usql/pkg-fun.nix diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/unit/us/usrsctp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/usrsctp/default.nix rename to pkgs/unit/us/usrsctp/pkg-fun.nix diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/unit/us/ustr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ustr/default.nix rename to pkgs/unit/us/ustr/pkg-fun.nix diff --git a/pkgs/development/libraries/ustr/va_args.patch b/pkgs/unit/us/ustr/va_args.patch similarity index 100% rename from pkgs/development/libraries/ustr/va_args.patch rename to pkgs/unit/us/ustr/va_args.patch diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/unit/us/ustreamer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/ustreamer/default.nix rename to pkgs/unit/us/ustreamer/pkg-fun.nix diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/unit/us/usync/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/usync/default.nix rename to pkgs/unit/us/usync/pkg-fun.nix diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/unit/ut/utahfs/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/utahfs/default.nix rename to pkgs/unit/ut/utahfs/pkg-fun.nix diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/unit/ut/utf8cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/utf8cpp/default.nix rename to pkgs/unit/ut/utf8cpp/pkg-fun.nix diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/unit/ut/utf8proc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/utf8proc/default.nix rename to pkgs/unit/ut/utf8proc/pkg-fun.nix diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/unit/ut/uthash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/uthash/default.nix rename to pkgs/unit/ut/uthash/pkg-fun.nix diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/unit/ut/uthenticode/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/uthenticode/default.nix rename to pkgs/unit/ut/uthenticode/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/unit/ut/utm/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/utm/default.nix rename to pkgs/unit/ut/utm/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/unit/ut/utox/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/utox/default.nix rename to pkgs/unit/ut/utox/pkg-fun.nix diff --git a/pkgs/misc/drivers/utsushi/networkscan.nix b/pkgs/unit/ut/utsushi-networkscan/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/utsushi/networkscan.nix rename to pkgs/unit/ut/utsushi-networkscan/pkg-fun.nix diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/unit/ut/utsushi/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/utsushi/default.nix rename to pkgs/unit/ut/utsushi/pkg-fun.nix diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/unit/uu/uucp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/uucp/default.nix rename to pkgs/unit/uu/uucp/pkg-fun.nix diff --git a/pkgs/tools/misc/uudeview/matherr.patch b/pkgs/unit/uu/uudeview/matherr.patch similarity index 100% rename from pkgs/tools/misc/uudeview/matherr.patch rename to pkgs/unit/uu/uudeview/matherr.patch diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/unit/uu/uudeview/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/uudeview/default.nix rename to pkgs/unit/uu/uudeview/pkg-fun.nix diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/unit/uv/uvccapture/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/uvccapture/default.nix rename to pkgs/unit/uv/uvccapture/pkg-fun.nix diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/unit/uv/uvcdynctrl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/uvcdynctrl/default.nix rename to pkgs/unit/uv/uvcdynctrl/pkg-fun.nix diff --git a/pkgs/data/fonts/uw-ttyp0/determinism.patch b/pkgs/unit/uw/uw-ttyp0/determinism.patch similarity index 100% rename from pkgs/data/fonts/uw-ttyp0/determinism.patch rename to pkgs/unit/uw/uw-ttyp0/determinism.patch diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/unit/uw/uw-ttyp0/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/uw-ttyp0/default.nix rename to pkgs/unit/uw/uw-ttyp0/pkg-fun.nix diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/unit/uw/uwc/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/uwc/default.nix rename to pkgs/unit/uw/uwc/pkg-fun.nix diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/unit/uw/uwimap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/uwimap/default.nix rename to pkgs/unit/uw/uwimap/pkg-fun.nix diff --git a/pkgs/servers/uwsgi/additional-php-ldflags.patch b/pkgs/unit/uw/uwsgi/additional-php-ldflags.patch similarity index 100% rename from pkgs/servers/uwsgi/additional-php-ldflags.patch rename to pkgs/unit/uw/uwsgi/additional-php-ldflags.patch diff --git a/pkgs/servers/uwsgi/nixos.ini b/pkgs/unit/uw/uwsgi/nixos.ini similarity index 100% rename from pkgs/servers/uwsgi/nixos.ini rename to pkgs/unit/uw/uwsgi/nixos.ini diff --git a/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch b/pkgs/unit/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch similarity index 100% rename from pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch rename to pkgs/unit/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/unit/uw/uwsgi/pkg-fun.nix similarity index 100% rename from pkgs/servers/uwsgi/default.nix rename to pkgs/unit/uw/uwsgi/pkg-fun.nix diff --git a/pkgs/tools/misc/uwufetch/fix-paths.patch b/pkgs/unit/uw/uwufetch/fix-paths.patch similarity index 100% rename from pkgs/tools/misc/uwufetch/fix-paths.patch rename to pkgs/unit/uw/uwufetch/fix-paths.patch diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/unit/uw/uwufetch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/uwufetch/default.nix rename to pkgs/unit/uw/uwufetch/pkg-fun.nix diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/unit/uw/uwuify/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/uwuify/default.nix rename to pkgs/unit/uw/uwuify/pkg-fun.nix diff --git a/pkgs/applications/emulators/uxn/default.nix b/pkgs/unit/ux/uxn/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/uxn/default.nix rename to pkgs/unit/ux/uxn/pkg-fun.nix diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/unit/ux/uxplay/pkg-fun.nix similarity index 100% rename from pkgs/servers/uxplay/default.nix rename to pkgs/unit/ux/uxplay/pkg-fun.nix diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/unit/v2/v2ray-domain-list-community/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/v2ray-domain-list-community/default.nix rename to pkgs/unit/v2/v2ray-domain-list-community/pkg-fun.nix diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/unit/v2/v2ray-geoip/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/v2ray-geoip/default.nix rename to pkgs/unit/v2/v2ray-geoip/pkg-fun.nix diff --git a/pkgs/data/misc/v2ray-geoip/update.sh b/pkgs/unit/v2/v2ray-geoip/update.sh similarity index 100% rename from pkgs/data/misc/v2ray-geoip/update.sh rename to pkgs/unit/v2/v2ray-geoip/update.sh diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/unit/v2/v2ray/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/v2ray/default.nix rename to pkgs/unit/v2/v2ray/pkg-fun.nix diff --git a/pkgs/tools/networking/v2raya/package.json b/pkgs/unit/v2/v2raya/package.json similarity index 100% rename from pkgs/tools/networking/v2raya/package.json rename to pkgs/unit/v2/v2raya/package.json diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/unit/v2/v2raya/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/v2raya/default.nix rename to pkgs/unit/v2/v2raya/pkg-fun.nix diff --git a/pkgs/tools/networking/v2raya/yarn.lock b/pkgs/unit/v2/v2raya/yarn.lock similarity index 100% rename from pkgs/tools/networking/v2raya/yarn.lock rename to pkgs/unit/v2/v2raya/yarn.lock diff --git a/pkgs/tools/networking/v2raya/yarn.nix b/pkgs/unit/v2/v2raya/yarn.nix similarity index 100% rename from pkgs/tools/networking/v2raya/yarn.nix rename to pkgs/unit/v2/v2raya/yarn.nix diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/unit/va/vaapi-intel-hybrid/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vaapi-intel-hybrid/default.nix rename to pkgs/unit/va/vaapi-intel-hybrid/pkg-fun.nix diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/unit/va/vaapiIntel/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vaapi-intel/default.nix rename to pkgs/unit/va/vaapiIntel/pkg-fun.nix diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/unit/va/vaapiVdpau/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vaapi-vdpau/default.nix rename to pkgs/unit/va/vaapiVdpau/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/unit/va/vacuum/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/vacuum/default.nix rename to pkgs/unit/va/vacuum/pkg-fun.nix diff --git a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/unit/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch similarity index 100% rename from pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch rename to pkgs/unit/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/unit/va/vagrant/0004-Support-system-installed-plugins.patch similarity index 100% rename from pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch rename to pkgs/unit/va/vagrant/0004-Support-system-installed-plugins.patch diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/unit/va/vagrant/gemset.nix similarity index 100% rename from pkgs/development/tools/vagrant/gemset.nix rename to pkgs/unit/va/vagrant/gemset.nix diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/unit/va/vagrant/gemset_libvirt.nix similarity index 100% rename from pkgs/development/tools/vagrant/gemset_libvirt.nix rename to pkgs/unit/va/vagrant/gemset_libvirt.nix diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/unit/va/vagrant/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vagrant/default.nix rename to pkgs/unit/va/vagrant/pkg-fun.nix diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/unit/va/vagrant/unofficial-installation-nowarn.patch similarity index 100% rename from pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch rename to pkgs/unit/va/vagrant/unofficial-installation-nowarn.patch diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/unit/va/vagrant/use-system-bundler-version.patch similarity index 100% rename from pkgs/development/tools/vagrant/use-system-bundler-version.patch rename to pkgs/unit/va/vagrant/use-system-bundler-version.patch diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/pkgs/unit/va/vagrant/vagrant-libvirt.json.in similarity index 100% rename from pkgs/development/tools/vagrant/vagrant-libvirt.json.in rename to pkgs/unit/va/vagrant/vagrant-libvirt.json.in diff --git a/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/unit/va/vala-language-server/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/vala-language-server/default.nix rename to pkgs/unit/va/vala-language-server/pkg-fun.nix diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/unit/va/vala-lint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vala-lint/default.nix rename to pkgs/unit/va/vala-lint/pkg-fun.nix diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/unit/va/vale/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/vale/default.nix rename to pkgs/unit/va/vale/pkg-fun.nix diff --git a/pkgs/tools/text/validator-nu/default.nix b/pkgs/unit/va/validator-nu/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/validator-nu/default.nix rename to pkgs/unit/va/validator-nu/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/unit/va/valkyrie/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/valkyrie/default.nix rename to pkgs/unit/va/valkyrie/pkg-fun.nix diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/unit/va/vals/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vals/default.nix rename to pkgs/unit/va/vals/pkg-fun.nix diff --git a/pkgs/development/web/valum/default.nix b/pkgs/unit/va/valum/pkg-fun.nix similarity index 100% rename from pkgs/development/web/valum/default.nix rename to pkgs/unit/va/valum/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/unit/va/vamp-plugin-sdk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix rename to pkgs/unit/va/vamp-plugin-sdk/pkg-fun.nix diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/unit/va/vampire/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/vampire/default.nix rename to pkgs/unit/va/vampire/pkg-fun.nix diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/unit/va/vanilla-dmz/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/vanilla-dmz/default.nix rename to pkgs/unit/va/vanilla-dmz/pkg-fun.nix diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/unit/va/vapoursynth-mvtools/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vapoursynth-mvtools/default.nix rename to pkgs/unit/va/vapoursynth-mvtools/pkg-fun.nix diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/unit/va/variety/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/variety/default.nix rename to pkgs/unit/va/variety/pkg-fun.nix diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/unit/va/varscan/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/varscan/default.nix rename to pkgs/unit/va/varscan/pkg-fun.nix diff --git a/pkgs/games/vassal/default.nix b/pkgs/unit/va/vassal/pkg-fun.nix similarity index 100% rename from pkgs/games/vassal/default.nix rename to pkgs/unit/va/vassal/pkg-fun.nix diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/unit/va/vault-bin/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vault/vault-bin.nix rename to pkgs/unit/va/vault-bin/pkg-fun.nix diff --git a/pkgs/tools/security/vault/update-bin.sh b/pkgs/unit/va/vault-bin/update-bin.sh similarity index 100% rename from pkgs/tools/security/vault/update-bin.sh rename to pkgs/unit/va/vault-bin/update-bin.sh diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/unit/va/vault-medusa/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vault-medusa/default.nix rename to pkgs/unit/va/vault-medusa/pkg-fun.nix diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/unit/va/vault/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vault/default.nix rename to pkgs/unit/va/vault/pkg-fun.nix diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/unit/va/vazir-code-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vazir-code-font/default.nix rename to pkgs/unit/va/vazir-code-font/pkg-fun.nix diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/unit/va/vazir-fonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vazir-fonts/default.nix rename to pkgs/unit/va/vazir-fonts/pkg-fun.nix diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/unit/vb/vbam/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/vbam/default.nix rename to pkgs/unit/vb/vbam/pkg-fun.nix diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/unit/vb/vbetool/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/vbetool/default.nix rename to pkgs/unit/vb/vbetool/pkg-fun.nix diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/unit/vb/vbindiff/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/vbindiff/default.nix rename to pkgs/unit/vb/vbindiff/pkg-fun.nix diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/pkgs/unit/vb/vboot_reference/dont_static_link.patch similarity index 100% rename from pkgs/tools/system/vboot_reference/dont_static_link.patch rename to pkgs/unit/vb/vboot_reference/dont_static_link.patch diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/unit/vb/vboot_reference/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/vboot_reference/default.nix rename to pkgs/unit/vb/vboot_reference/pkg-fun.nix diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/unit/vc/vc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vc/default.nix rename to pkgs/unit/vc/vc/pkg-fun.nix diff --git a/pkgs/development/misc/vc4/newlib.nix b/pkgs/unit/vc/vc4-newlib/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/vc4/newlib.nix rename to pkgs/unit/vc/vc4-newlib/pkg-fun.nix diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/unit/vc/vc_0_7/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vc/0.7.nix rename to pkgs/unit/vc/vc_0_7/pkg-fun.nix diff --git a/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch b/pkgs/unit/vc/vc_0_7/vc_0_7_clang_fix.patch similarity index 100% rename from pkgs/development/libraries/vc/vc_0_7_clang_fix.patch rename to pkgs/unit/vc/vc_0_7/vc_0_7_clang_fix.patch diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/unit/vc/vcal/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/vcal/default.nix rename to pkgs/unit/vc/vcal/pkg-fun.nix diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/unit/vc/vcdimager/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vcdimager/default.nix rename to pkgs/unit/vc/vcdimager/pkg-fun.nix diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/unit/vc/vcftools/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/vcftools/default.nix rename to pkgs/unit/vc/vcftools/pkg-fun.nix diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/unit/vc/vcg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vcg/default.nix rename to pkgs/unit/vc/vcg/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/unit/vc/vcluster/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/vcluster/default.nix rename to pkgs/unit/vc/vcluster/pkg-fun.nix diff --git a/pkgs/applications/video/vcs/fonts.patch b/pkgs/unit/vc/vcs/fonts.patch similarity index 100% rename from pkgs/applications/video/vcs/fonts.patch rename to pkgs/unit/vc/vcs/fonts.patch diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/unit/vc/vcs/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/vcs/default.nix rename to pkgs/unit/vc/vcs/pkg-fun.nix diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/unit/vc/vcs_query/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vcs_query/default.nix rename to pkgs/unit/vc/vcs_query/pkg-fun.nix diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/unit/vc/vcsh/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/vcsh/default.nix rename to pkgs/unit/vc/vcsh/pkg-fun.nix diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/unit/vc/vcsi/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/vcsi/default.nix rename to pkgs/unit/vc/vcsi/pkg-fun.nix diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/unit/vc/vcstool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vcstool/default.nix rename to pkgs/unit/vc/vcstool/pkg-fun.nix diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/unit/vc/vcv-rack/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vcv-rack/default.nix rename to pkgs/unit/vc/vcv-rack/pkg-fun.nix diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/unit/vc/vcv-rack/rack-minimize-vendoring.patch similarity index 100% rename from pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch rename to pkgs/unit/vc/vcv-rack/rack-minimize-vendoring.patch diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/unit/vd/vde2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/vde2/default.nix rename to pkgs/unit/vd/vde2/pkg-fun.nix diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/unit/vd/vdmfec/pkg-fun.nix similarity index 100% rename from pkgs/applications/backup/vdmfec/default.nix rename to pkgs/unit/vd/vdmfec/pkg-fun.nix diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/unit/vd/vdo/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/vdo/default.nix rename to pkgs/unit/vd/vdo/pkg-fun.nix diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/unit/vd/vdpauinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/vdpauinfo/default.nix rename to pkgs/unit/vd/vdpauinfo/pkg-fun.nix diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/unit/vd/vdr/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/vdr/default.nix rename to pkgs/unit/vd/vdr/pkg-fun.nix diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/unit/vd/vdrift/0001-Ignore-missing-data-for-installation.patch similarity index 100% rename from pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch rename to pkgs/unit/vd/vdrift/0001-Ignore-missing-data-for-installation.patch diff --git a/pkgs/games/vdrift/default.nix b/pkgs/unit/vd/vdrift/pkg-fun.nix similarity index 100% rename from pkgs/games/vdrift/default.nix rename to pkgs/unit/vd/vdrift/pkg-fun.nix diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/unit/vd/vdrsymbols/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vdrsymbols/default.nix rename to pkgs/unit/vd/vdrsymbols/pkg-fun.nix diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/unit/ve/vectoroids/pkg-fun.nix similarity index 100% rename from pkgs/games/vectoroids/default.nix rename to pkgs/unit/ve/vectoroids/pkg-fun.nix diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/unit/ve/vegeta/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/vegeta/default.nix rename to pkgs/unit/ve/vegeta/pkg-fun.nix diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/unit/ve/vegur/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vegur/default.nix rename to pkgs/unit/ve/vegur/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/unit/ve/velero/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/velero/default.nix rename to pkgs/unit/ve/velero/pkg-fun.nix diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/unit/ve/vendir/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vendir/default.nix rename to pkgs/unit/ve/vendir/pkg-fun.nix diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/unit/ve/venta/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/venta/default.nix rename to pkgs/unit/ve/venta/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/ventoy-bin/000-nixos-sanitization.patch b/pkgs/unit/ve/ventoy-bin/000-nixos-sanitization.patch similarity index 100% rename from pkgs/tools/cd-dvd/ventoy-bin/000-nixos-sanitization.patch rename to pkgs/unit/ve/ventoy-bin/000-nixos-sanitization.patch diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/unit/ve/ventoy-bin/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/ventoy-bin/default.nix rename to pkgs/unit/ve/ventoy-bin/pkg-fun.nix diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/unit/ve/verco/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/verco/default.nix rename to pkgs/unit/ve/verco/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/unit/ve/verible/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/language-servers/verible/default.nix rename to pkgs/unit/ve/verible/pkg-fun.nix diff --git a/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch b/pkgs/unit/ve/verible/remove-unused-deps.patch similarity index 100% rename from pkgs/development/tools/language-servers/verible/remove-unused-deps.patch rename to pkgs/unit/ve/verible/remove-unused-deps.patch diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/unit/ve/verifast/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/verifast/default.nix rename to pkgs/unit/ve/verifast/pkg-fun.nix diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/unit/ve/verifpal/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/verifpal/default.nix rename to pkgs/unit/ve/verifpal/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/unit/ve/verilator/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/verilator/default.nix rename to pkgs/unit/ve/verilator/pkg-fun.nix diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/unit/ve/versus/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/versus/default.nix rename to pkgs/unit/ve/versus/pkg-fun.nix diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/unit/ve/veryfasttree/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/veryfasttree/default.nix rename to pkgs/unit/ve/veryfasttree/pkg-fun.nix diff --git a/pkgs/tools/security/vexctl/default.nix b/pkgs/unit/ve/vexctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vexctl/default.nix rename to pkgs/unit/ve/vexctl/pkg-fun.nix diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/unit/vg/vgmplay-libvgm/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vgmplay-libvgm/default.nix rename to pkgs/unit/vg/vgmplay-libvgm/pkg-fun.nix diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/unit/vg/vgmstream/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vgmstream/default.nix rename to pkgs/unit/vg/vgmstream/pkg-fun.nix diff --git a/pkgs/applications/audio/vgmstream/update.sh b/pkgs/unit/vg/vgmstream/update.sh similarity index 100% rename from pkgs/applications/audio/vgmstream/update.sh rename to pkgs/unit/vg/vgmstream/update.sh diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/unit/vg/vgmtools/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/vgmtools/default.nix rename to pkgs/unit/vg/vgmtools/pkg-fun.nix diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/unit/vg/vgrep/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/vgrep/default.nix rename to pkgs/unit/vg/vgrep/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/unit/vh/vhd2vl/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/vhd2vl/default.nix rename to pkgs/unit/vh/vhd2vl/pkg-fun.nix diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/unit/vh/vhs/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/vhs/default.nix rename to pkgs/unit/vh/vhs/pkg-fun.nix diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/unit/vi/ViennaRNA/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/molecular-dynamics/viennarna/default.nix rename to pkgs/unit/vi/ViennaRNA/pkg-fun.nix diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/unit/vi/via/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/via/default.nix rename to pkgs/unit/vi/via/pkg-fun.nix diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/unit/vi/vial/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vial/default.nix rename to pkgs/unit/vi/vial/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/unit/vi/viber/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/viber/default.nix rename to pkgs/unit/vi/viber/pkg-fun.nix diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/unit/vi/vice/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/vice/default.nix rename to pkgs/unit/vi/vice/pkg-fun.nix diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/unit/vi/victor-mono/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/victor-mono/default.nix rename to pkgs/unit/vi/victor-mono/pkg-fun.nix diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/unit/vi/victoriametrics/pkg-fun.nix similarity index 100% rename from pkgs/servers/nosql/victoriametrics/default.nix rename to pkgs/unit/vi/victoriametrics/pkg-fun.nix diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/unit/vi/viddy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/viddy/default.nix rename to pkgs/unit/vi/viddy/pkg-fun.nix diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/unit/vi/video-trimmer/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/video-trimmer/default.nix rename to pkgs/unit/vi/video-trimmer/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/unit/vi/vieb/package.json similarity index 100% rename from pkgs/applications/networking/browsers/vieb/package.json rename to pkgs/unit/vi/vieb/package.json diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/unit/vi/vieb/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/vieb/default.nix rename to pkgs/unit/vi/vieb/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/unit/vi/vieb/yarn.lock similarity index 100% rename from pkgs/applications/networking/browsers/vieb/yarn.lock rename to pkgs/unit/vi/vieb/yarn.lock diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/unit/vi/vieb/yarn.nix similarity index 100% rename from pkgs/applications/networking/browsers/vieb/yarn.nix rename to pkgs/unit/vi/vieb/yarn.nix diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/unit/vi/viewnior/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/viewnior/default.nix rename to pkgs/unit/vi/viewnior/pkg-fun.nix diff --git a/pkgs/applications/file-managers/vifm/default.nix b/pkgs/unit/vi/vifm/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/vifm/default.nix rename to pkgs/unit/vi/vifm/pkg-fun.nix diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/unit/vi/viking/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/viking/default.nix rename to pkgs/unit/vi/viking/pkg-fun.nix diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/unit/vi/vikunja-api/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/vikunja/api.nix rename to pkgs/unit/vi/vikunja-api/pkg-fun.nix diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/unit/vi/vikunja-frontend/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/vikunja/frontend.nix rename to pkgs/unit/vi/vikunja-frontend/pkg-fun.nix diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/unit/vi/vim-vint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vim-vint/default.nix rename to pkgs/unit/vi/vim-vint/pkg-fun.nix diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/unit/vi/vimUtils/build-vim-plugin.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/build-vim-plugin.nix rename to pkgs/unit/vi/vimUtils/build-vim-plugin.nix diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/unit/vi/vimUtils/neovim-require-check-hook.sh similarity index 100% rename from pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh rename to pkgs/unit/vi/vimUtils/neovim-require-check-hook.sh diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/unit/vi/vimUtils/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-utils.nix rename to pkgs/unit/vi/vimUtils/pkg-fun.nix diff --git a/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh b/pkgs/unit/vi/vimUtils/vim-command-check-hook.sh similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh rename to pkgs/unit/vi/vimUtils/vim-command-check-hook.sh diff --git a/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh b/pkgs/unit/vi/vimUtils/vim-gen-doc-hook.sh similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh rename to pkgs/unit/vi/vimUtils/vim-gen-doc-hook.sh diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/unit/vi/vimacs/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/vim/vimacs.nix rename to pkgs/unit/vi/vimacs/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/unit/vi/vimb-unwrapped/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/vimb/default.nix rename to pkgs/unit/vi/vimb-unwrapped/pkg-fun.nix diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/unit/vi/vimer/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vimer/default.nix rename to pkgs/unit/vi/vimer/pkg-fun.nix diff --git a/pkgs/games/vimgolf/Gemfile b/pkgs/unit/vi/vimgolf/Gemfile similarity index 100% rename from pkgs/games/vimgolf/Gemfile rename to pkgs/unit/vi/vimgolf/Gemfile diff --git a/pkgs/games/vimgolf/Gemfile.lock b/pkgs/unit/vi/vimgolf/Gemfile.lock similarity index 100% rename from pkgs/games/vimgolf/Gemfile.lock rename to pkgs/unit/vi/vimgolf/Gemfile.lock diff --git a/pkgs/games/vimgolf/gemset.nix b/pkgs/unit/vi/vimgolf/gemset.nix similarity index 100% rename from pkgs/games/vimgolf/gemset.nix rename to pkgs/unit/vi/vimgolf/gemset.nix diff --git a/pkgs/games/vimgolf/default.nix b/pkgs/unit/vi/vimgolf/pkg-fun.nix similarity index 100% rename from pkgs/games/vimgolf/default.nix rename to pkgs/unit/vi/vimgolf/pkg-fun.nix diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/unit/vi/vimiv-qt/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/vimiv-qt/default.nix rename to pkgs/unit/vi/vimiv-qt/pkg-fun.nix diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/unit/vi/vimix-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/vimix-icon-theme/default.nix rename to pkgs/unit/vi/vimix-icon-theme/pkg-fun.nix diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/unit/vi/vimpc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vimpc/default.nix rename to pkgs/unit/vi/vimpc/pkg-fun.nix diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/unit/vi/vimv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vimv/default.nix rename to pkgs/unit/vi/vimv/pkg-fun.nix diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/unit/vi/vintagestory/pkg-fun.nix similarity index 100% rename from pkgs/games/vintagestory/default.nix rename to pkgs/unit/vi/vintagestory/pkg-fun.nix diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/unit/vi/viper4linux/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/viper4linux/default.nix rename to pkgs/unit/vi/viper4linux/pkg-fun.nix diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/unit/vi/vipsdisp/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/vipsdisp/default.nix rename to pkgs/unit/vi/vipsdisp/pkg-fun.nix diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/unit/vi/virglrenderer/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/virglrenderer/default.nix rename to pkgs/unit/vi/virglrenderer/pkg-fun.nix diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/unit/vi/virt-top/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/virt-top/default.nix rename to pkgs/unit/vi/virt-top/pkg-fun.nix diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/unit/vi/virt-viewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/virt-viewer/default.nix rename to pkgs/unit/vi/virt-viewer/pkg-fun.nix diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/unit/vi/virt-what/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/virt-what/default.nix rename to pkgs/unit/vi/virt-what/pkg-fun.nix diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/unit/vi/virtiofsd/pkg-fun.nix similarity index 100% rename from pkgs/servers/misc/virtiofsd/default.nix rename to pkgs/unit/vi/virtiofsd/pkg-fun.nix diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/unit/vi/virtscreen/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/virtscreen/default.nix rename to pkgs/unit/vi/virtscreen/pkg-fun.nix diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/unit/vi/virtual-ans/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/virtual-ans/default.nix rename to pkgs/unit/vi/virtual-ans/pkg-fun.nix diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/unit/vi/virtualboxExtpack/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/virtualbox/extpack.nix rename to pkgs/unit/vi/virtualboxExtpack/pkg-fun.nix diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/unit/vi/virtualpg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/virtualpg/default.nix rename to pkgs/unit/vi/virtualpg/pkg-fun.nix diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/unit/vi/vis/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/vis/default.nix rename to pkgs/unit/vi/vis/pkg-fun.nix diff --git a/pkgs/data/fonts/vista-fonts-chs/no-op.conf b/pkgs/unit/vi/vistafonts-chs/no-op.conf similarity index 100% rename from pkgs/data/fonts/vista-fonts-chs/no-op.conf rename to pkgs/unit/vi/vistafonts-chs/no-op.conf diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/unit/vi/vistafonts-chs/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vista-fonts-chs/default.nix rename to pkgs/unit/vi/vistafonts-chs/pkg-fun.nix diff --git a/pkgs/data/fonts/vista-fonts-cht/no-op.conf b/pkgs/unit/vi/vistafonts-cht/no-op.conf similarity index 100% rename from pkgs/data/fonts/vista-fonts-cht/no-op.conf rename to pkgs/unit/vi/vistafonts-cht/no-op.conf diff --git a/pkgs/data/fonts/vista-fonts-cht/default.nix b/pkgs/unit/vi/vistafonts-cht/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vista-fonts-cht/default.nix rename to pkgs/unit/vi/vistafonts-cht/pkg-fun.nix diff --git a/pkgs/data/fonts/vista-fonts/no-op.conf b/pkgs/unit/vi/vistafonts/no-op.conf similarity index 100% rename from pkgs/data/fonts/vista-fonts/no-op.conf rename to pkgs/unit/vi/vistafonts/no-op.conf diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/unit/vi/vistafonts/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vista-fonts/default.nix rename to pkgs/unit/vi/vistafonts/pkg-fun.nix diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/unit/vi/visualvm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/java/visualvm/default.nix rename to pkgs/unit/vi/visualvm/pkg-fun.nix diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/unit/vi/vit/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/vit/default.nix rename to pkgs/unit/vi/vit/pkg-fun.nix diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/unit/vi/vite/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/misc/vite/default.nix rename to pkgs/unit/vi/vite/pkg-fun.nix diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/unit/vi/vitess/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/vitess/default.nix rename to pkgs/unit/vi/vitess/pkg-fun.nix diff --git a/pkgs/games/vitetris/default.nix b/pkgs/unit/vi/vitetris/pkg-fun.nix similarity index 100% rename from pkgs/games/vitetris/default.nix rename to pkgs/unit/vi/vitetris/pkg-fun.nix diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/unit/vi/viu/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/viu/default.nix rename to pkgs/unit/vi/viu/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/unit/vi/vivaldi-ffmpeg-codecs/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix rename to pkgs/unit/vi/vivaldi-ffmpeg-codecs/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/unit/vi/vivaldi-widevine/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/vivaldi/widevine.nix rename to pkgs/unit/vi/vivaldi-widevine/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/unit/vi/vivaldi/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/vivaldi/default.nix rename to pkgs/unit/vi/vivaldi/pkg-fun.nix diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/unit/vi/vivid/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vivid/default.nix rename to pkgs/unit/vi/vivid/pkg-fun.nix diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/unit/vi/viw/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/viw/default.nix rename to pkgs/unit/vi/viw/pkg-fun.nix diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/unit/vi/vix/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vix/default.nix rename to pkgs/unit/vi/vix/pkg-fun.nix diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/unit/vk/vk-bootstrap/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vk-bootstrap/default.nix rename to pkgs/unit/vk/vk-bootstrap/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/unit/vk/vk-cli/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/vk-cli/default.nix rename to pkgs/unit/vk/vk-cli/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/unit/vk/vk-messenger/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/vk-messenger/default.nix rename to pkgs/unit/vk/vk-messenger/pkg-fun.nix diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/unit/vk/vkbasalt-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/vkbasalt-cli/default.nix rename to pkgs/unit/vk/vkbasalt-cli/pkg-fun.nix diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/unit/vk/vkdisplayinfo/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/vkdisplayinfo/default.nix rename to pkgs/unit/vk/vkdisplayinfo/pkg-fun.nix diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/unit/vk/vkdt/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/vkdt/default.nix rename to pkgs/unit/vk/vkdt/pkg-fun.nix diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/unit/vk/vkeybd/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vkeybd/default.nix rename to pkgs/unit/vk/vkeybd/pkg-fun.nix diff --git a/pkgs/tools/graphics/vkmark/default.nix b/pkgs/unit/vk/vkmark/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/vkmark/default.nix rename to pkgs/unit/vk/vkmark/pkg-fun.nix diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/unit/vl/vlan/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/vlan/default.nix rename to pkgs/unit/vl/vlan/pkg-fun.nix diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/unit/vl/vlang/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/vlang/default.nix rename to pkgs/unit/vl/vlang/pkg-fun.nix diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/pkgs/unit/vl/vlock/eintr.patch similarity index 100% rename from pkgs/misc/screensavers/vlock/eintr.patch rename to pkgs/unit/vl/vlock/eintr.patch diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/unit/vl/vlock/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/vlock/default.nix rename to pkgs/unit/vl/vlock/pkg-fun.nix diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/unit/vm/vmagent/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/vmagent/default.nix rename to pkgs/unit/vm/vmagent/pkg-fun.nix diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/unit/vm/vmfs-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/vmfs-tools/default.nix rename to pkgs/unit/vm/vmfs-tools/pkg-fun.nix diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/unit/vm/vmime/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vmime/default.nix rename to pkgs/unit/vm/vmime/pkg-fun.nix diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/unit/vm/vms-empire/pkg-fun.nix similarity index 100% rename from pkgs/games/vms-empire/default.nix rename to pkgs/unit/vm/vms-empire/pkg-fun.nix diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/unit/vm/vmtouch/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vmtouch/default.nix rename to pkgs/unit/vm/vmtouch/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/unit/vm/vmware-horizon-client/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/vmware-horizon-client/default.nix rename to pkgs/unit/vm/vmware-horizon-client/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/pkgs/unit/vm/vmware-horizon-client/update.sh similarity index 100% rename from pkgs/applications/networking/remote/vmware-horizon-client/update.sh rename to pkgs/unit/vm/vmware-horizon-client/update.sh diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/unit/vm/vmware-workstation/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/vmware-workstation/default.nix rename to pkgs/unit/vm/vmware-workstation/pkg-fun.nix diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/unit/vm/vmware-workstation/vmware-bootstrap similarity index 100% rename from pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap rename to pkgs/unit/vm/vmware-workstation/vmware-bootstrap diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/unit/vm/vmware-workstation/vmware-config similarity index 100% rename from pkgs/applications/virtualization/vmware-workstation/vmware-config rename to pkgs/unit/vm/vmware-workstation/vmware-config diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/unit/vm/vmware-workstation/vmware-installer-bootstrap similarity index 100% rename from pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap rename to pkgs/unit/vm/vmware-workstation/vmware-installer-bootstrap diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/unit/vm/vmware-workstation/vmware-modconfig similarity index 100% rename from pkgs/applications/virtualization/vmware-workstation/vmware-modconfig rename to pkgs/unit/vm/vmware-workstation/vmware-modconfig diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/unit/vn/vncrec/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/vncrec/default.nix rename to pkgs/unit/vn/vncrec/pkg-fun.nix diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/unit/vn/vndr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vndr/default.nix rename to pkgs/unit/vn/vndr/pkg-fun.nix diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/unit/vn/vnstat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/vnstat/default.nix rename to pkgs/unit/vn/vnstat/pkg-fun.nix diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/unit/vo/vo-aacenc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vo-aacenc/default.nix rename to pkgs/unit/vo/vo-aacenc/pkg-fun.nix diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/unit/vo/vo-amrwbenc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vo-amrwbenc/default.nix rename to pkgs/unit/vo/vo-amrwbenc/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/unit/vo/vobcopy/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/vobcopy/default.nix rename to pkgs/unit/vo/vobcopy/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/unit/vo/vobsub2srt/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/vobsub2srt/default.nix rename to pkgs/unit/vo/vobsub2srt/pkg-fun.nix diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/unit/vo/vocal/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vocal/default.nix rename to pkgs/unit/vo/vocal/pkg-fun.nix diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/unit/vo/vocproc/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/vocproc/default.nix rename to pkgs/unit/vo/vocproc/pkg-fun.nix diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/unit/vo/void/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/void/default.nix rename to pkgs/unit/vo/void/pkg-fun.nix diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/unit/vo/volatility/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/volatility/default.nix rename to pkgs/unit/vo/volatility/pkg-fun.nix diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/unit/vo/volatility3/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/volatility3/default.nix rename to pkgs/unit/vo/volatility3/pkg-fun.nix diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/unit/vo/volctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/volctl/default.nix rename to pkgs/unit/vo/volctl/pkg-fun.nix diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/unit/vo/volk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/volk/default.nix rename to pkgs/unit/vo/volk/pkg-fun.nix diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/unit/vo/vollkorn/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/vollkorn/default.nix rename to pkgs/unit/vo/vollkorn/pkg-fun.nix diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/unit/vo/volnoti/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/volnoti/default.nix rename to pkgs/unit/vo/volnoti/pkg-fun.nix diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/unit/vo/volume_key/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/volume-key/default.nix rename to pkgs/unit/vo/volume_key/pkg-fun.nix diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/unit/vo/volumeicon/pkg-fun.nix similarity index 100% rename from pkgs/tools/audio/volumeicon/default.nix rename to pkgs/unit/vo/volumeicon/pkg-fun.nix diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/unit/vo/voms/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/voms/default.nix rename to pkgs/unit/vo/voms/pkg-fun.nix diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/unit/vo/vopono/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/vopono/default.nix rename to pkgs/unit/vo/vopono/pkg-fun.nix diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/unit/vo/vorbisgain/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vorbisgain/default.nix rename to pkgs/unit/vo/vorbisgain/pkg-fun.nix diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/unit/vo/vouch-proxy/pkg-fun.nix similarity index 100% rename from pkgs/servers/vouch-proxy/default.nix rename to pkgs/unit/vo/vouch-proxy/pkg-fun.nix diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/unit/vo/vowpal-wabbit/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix rename to pkgs/unit/vo/vowpal-wabbit/pkg-fun.nix diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/unit/vp/vpcs/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/vpcs/default.nix rename to pkgs/unit/vp/vpcs/pkg-fun.nix diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/unit/vp/vpnc-scripts/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/vpnc-scripts/default.nix rename to pkgs/unit/vp/vpnc-scripts/pkg-fun.nix diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/unit/vp/vpnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/vpnc/default.nix rename to pkgs/unit/vp/vpnc/pkg-fun.nix diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/unit/vp/vpsfree-client/Gemfile similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/Gemfile rename to pkgs/unit/vp/vpsfree-client/Gemfile diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/unit/vp/vpsfree-client/Gemfile.lock similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/Gemfile.lock rename to pkgs/unit/vp/vpsfree-client/Gemfile.lock diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/unit/vp/vpsfree-client/gemset.nix similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/gemset.nix rename to pkgs/unit/vp/vpsfree-client/gemset.nix diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/unit/vp/vpsfree-client/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/default.nix rename to pkgs/unit/vp/vpsfree-client/pkg-fun.nix diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/unit/vr/vrb/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vrb/default.nix rename to pkgs/unit/vr/vrb/pkg-fun.nix diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/unit/vr/vrb/removed_options.patch similarity index 100% rename from pkgs/development/libraries/vrb/removed_options.patch rename to pkgs/unit/vr/vrb/removed_options.patch diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/unit/vr/vrb/unused-but-set-variable.patch similarity index 100% rename from pkgs/development/libraries/vrb/unused-but-set-variable.patch rename to pkgs/unit/vr/vrb/unused-but-set-variable.patch diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/unit/vr/vrpn/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vrpn/default.nix rename to pkgs/unit/vr/vrpn/pkg-fun.nix diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/unit/vs/vsce/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vsce/default.nix rename to pkgs/unit/vs/vsce/pkg-fun.nix diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/unit/vs/vscode-with-extensions/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/vscode/with-extensions.nix rename to pkgs/unit/vs/vscode-with-extensions/pkg-fun.nix diff --git a/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch b/pkgs/unit/vs/vsftpd/CVE-2015-1419.patch similarity index 100% rename from pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch rename to pkgs/unit/vs/vsftpd/CVE-2015-1419.patch diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/unit/vs/vsftpd/pkg-fun.nix similarity index 100% rename from pkgs/servers/ftp/vsftpd/default.nix rename to pkgs/unit/vs/vsftpd/pkg-fun.nix diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/unit/vs/vsh/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vsh/default.nix rename to pkgs/unit/vs/vsh/pkg-fun.nix diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/unit/vs/vsmtp/pkg-fun.nix similarity index 100% rename from pkgs/servers/mail/vsmtp/default.nix rename to pkgs/unit/vs/vsmtp/pkg-fun.nix diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/unit/vs/vsqlite/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vsqlite/default.nix rename to pkgs/unit/vs/vsqlite/pkg-fun.nix diff --git a/pkgs/tools/security/vt-cli/default.nix b/pkgs/unit/vt/vt-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vt-cli/default.nix rename to pkgs/unit/vt/vt-cli/pkg-fun.nix diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/unit/vt/vtable-dumper/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/vtable-dumper/default.nix rename to pkgs/unit/vt/vtable-dumper/pkg-fun.nix diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/unit/vt/vtm/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vtm/default.nix rename to pkgs/unit/vt/vtm/pkg-fun.nix diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/unit/vt/vttest/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/vttest/default.nix rename to pkgs/unit/vt/vttest/pkg-fun.nix diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/unit/vu/vue/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/vue/default.nix rename to pkgs/unit/vu/vue/pkg-fun.nix diff --git a/pkgs/applications/misc/vul/default.nix b/pkgs/unit/vu/vul/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/vul/default.nix rename to pkgs/unit/vu/vul/pkg-fun.nix diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/unit/vu/vulkan-cts/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/default.nix rename to pkgs/unit/vu/vulkan-cts/pkg-fun.nix diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/unit/vu/vulkan-extension-layer/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-extension-layer/default.nix rename to pkgs/unit/vu/vulkan-extension-layer/pkg-fun.nix diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/unit/vu/vulkan-headers/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vulkan-headers/default.nix rename to pkgs/unit/vu/vulkan-headers/pkg-fun.nix diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch b/pkgs/unit/vu/vulkan-tools-lunarg/gtest.patch similarity index 100% rename from pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch rename to pkgs/unit/vu/vulkan-tools-lunarg/gtest.patch diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/unit/vu/vulkan-tools-lunarg/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-tools-lunarg/default.nix rename to pkgs/unit/vu/vulkan-tools-lunarg/pkg-fun.nix diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/unit/vu/vulkan-validation-layers/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vulkan-validation-layers/default.nix rename to pkgs/unit/vu/vulkan-validation-layers/pkg-fun.nix diff --git a/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/unit/vu/vulkan-validation-layers/robin-hood-hashing.nix similarity index 100% rename from pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix rename to pkgs/unit/vu/vulkan-validation-layers/robin-hood-hashing.nix diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/unit/vu/vulnix/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/vulnix/default.nix rename to pkgs/unit/vu/vulnix/pkg-fun.nix diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/unit/vu/vultr-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vultr-cli/default.nix rename to pkgs/unit/vu/vultr-cli/pkg-fun.nix diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/unit/vu/vultr/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/vultr/default.nix rename to pkgs/unit/vu/vultr/pkg-fun.nix diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/unit/vw/vwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/vwm/default.nix rename to pkgs/unit/vw/vwm/pkg-fun.nix diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/unit/vx/vxl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/vxl/default.nix rename to pkgs/unit/vx/vxl/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch b/pkgs/unit/w3/w3m/RAND_egd.libressl.patch similarity index 100% rename from pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch rename to pkgs/unit/w3/w3m/RAND_egd.libressl.patch diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/unit/w3/w3m/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/w3m/default.nix rename to pkgs/unit/w3/w3m/pkg-fun.nix diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/unit/w_/w_scan/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/w_scan/default.nix rename to pkgs/unit/w_/w_scan/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/unit/wa/waagent/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/waagent/default.nix rename to pkgs/unit/wa/waagent/pkg-fun.nix diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/unit/wa/wabt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wabt/default.nix rename to pkgs/unit/wa/wabt/pkg-fun.nix diff --git a/pkgs/tools/security/wad/default.nix b/pkgs/unit/wa/wad/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/wad/default.nix rename to pkgs/unit/wa/wad/pkg-fun.nix diff --git a/pkgs/tools/security/waf-tester/default.nix b/pkgs/unit/wa/waf-tester/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/waf-tester/default.nix rename to pkgs/unit/wa/waf-tester/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/unit/wa/waf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/waf/default.nix rename to pkgs/unit/wa/waf/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/unit/wa/wafHook/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/build-managers/wafHook/default.nix rename to pkgs/unit/wa/wafHook/pkg-fun.nix diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/unit/wa/wafHook/setup-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/wafHook/setup-hook.sh rename to pkgs/unit/wa/wafHook/setup-hook.sh diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/unit/wa/waffle/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/waffle/default.nix rename to pkgs/unit/wa/waffle/pkg-fun.nix diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/unit/wa/wafw00f/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/wafw00f/default.nix rename to pkgs/unit/wa/wafw00f/pkg-fun.nix diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/unit/wa/wails/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wails/default.nix rename to pkgs/unit/wa/wails/pkg-fun.nix diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/unit/wa/waitron/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/waitron/default.nix rename to pkgs/unit/wa/waitron/pkg-fun.nix diff --git a/pkgs/tools/networking/waitron/staticfiles-directory.patch b/pkgs/unit/wa/waitron/staticfiles-directory.patch similarity index 100% rename from pkgs/tools/networking/waitron/staticfiles-directory.patch rename to pkgs/unit/wa/waitron/staticfiles-directory.patch diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/unit/wa/wakelan/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wakelan/default.nix rename to pkgs/unit/wa/wakelan/pkg-fun.nix diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/unit/wa/wakeonlan/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wakeonlan/default.nix rename to pkgs/unit/wa/wakeonlan/pkg-fun.nix diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/unit/wa/wal-g/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/wal-g/default.nix rename to pkgs/unit/wa/wal-g/pkg-fun.nix diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/unit/wa/wal_e/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/wal-e/default.nix rename to pkgs/unit/wa/wal_e/pkg-fun.nix diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/unit/wa/wallabag/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/wallabag/default.nix rename to pkgs/unit/wa/wallabag/pkg-fun.nix diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/unit/wa/wallabag/wallabag-data.patch similarity index 100% rename from pkgs/servers/web-apps/wallabag/wallabag-data.patch rename to pkgs/unit/wa/wallabag/wallabag-data.patch diff --git a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch b/pkgs/unit/wa/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch similarity index 100% rename from pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch rename to pkgs/unit/wa/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/unit/wa/wallutils/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/wallutils/default.nix rename to pkgs/unit/wa/wallutils/pkg-fun.nix diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/unit/wa/wally-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wally-cli/default.nix rename to pkgs/unit/wa/wally-cli/pkg-fun.nix diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/unit/wa/wander/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/wander/default.nix rename to pkgs/unit/wa/wander/pkg-fun.nix diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/unit/wa/waon/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/waon/default.nix rename to pkgs/unit/wa/waon/pkg-fun.nix diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/unit/wa/wapiti/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/wapiti/default.nix rename to pkgs/unit/wa/wapiti/pkg-fun.nix diff --git a/pkgs/games/wargus/default.nix b/pkgs/unit/wa/wargus/pkg-fun.nix similarity index 100% rename from pkgs/games/wargus/default.nix rename to pkgs/unit/wa/wargus/pkg-fun.nix diff --git a/pkgs/games/wargus/stratagus.nix b/pkgs/unit/wa/wargus/stratagus.nix similarity index 100% rename from pkgs/games/wargus/stratagus.nix rename to pkgs/unit/wa/wargus/stratagus.nix diff --git a/pkgs/games/warmux/default.nix b/pkgs/unit/wa/warmux/pkg-fun.nix similarity index 100% rename from pkgs/games/warmux/default.nix rename to pkgs/unit/wa/warmux/pkg-fun.nix diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/unit/wa/warp/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/warp/default.nix rename to pkgs/unit/wa/warp/pkg-fun.nix diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/unit/wa/warpd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/warpd/default.nix rename to pkgs/unit/wa/warpd/pkg-fun.nix diff --git a/pkgs/games/warsow/libpath.patch b/pkgs/unit/wa/warsow-engine/libpath.patch similarity index 100% rename from pkgs/games/warsow/libpath.patch rename to pkgs/unit/wa/warsow-engine/libpath.patch diff --git a/pkgs/games/warsow/engine.nix b/pkgs/unit/wa/warsow-engine/pkg-fun.nix similarity index 100% rename from pkgs/games/warsow/engine.nix rename to pkgs/unit/wa/warsow-engine/pkg-fun.nix diff --git a/pkgs/games/warsow/default.nix b/pkgs/unit/wa/warsow/pkg-fun.nix similarity index 100% rename from pkgs/games/warsow/default.nix rename to pkgs/unit/wa/warsow/pkg-fun.nix diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/unit/wa/warzone2100/pkg-fun.nix similarity index 100% rename from pkgs/games/warzone2100/default.nix rename to pkgs/unit/wa/warzone2100/pkg-fun.nix diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/unit/wa/wasabibackend/deps.nix similarity index 100% rename from pkgs/applications/blockchains/wasabibackend/deps.nix rename to pkgs/unit/wa/wasabibackend/deps.nix diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/unit/wa/wasabibackend/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/wasabibackend/default.nix rename to pkgs/unit/wa/wasabibackend/pkg-fun.nix diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/unit/wa/wasabiwallet/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/wasabiwallet/default.nix rename to pkgs/unit/wa/wasabiwallet/pkg-fun.nix diff --git a/pkgs/development/interpreters/wasm3/default.nix b/pkgs/unit/wa/wasm3/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/wasm3/default.nix rename to pkgs/unit/wa/wasm3/pkg-fun.nix diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/unit/wa/wasmtime/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/wasmtime/default.nix rename to pkgs/unit/wa/wasmtime/pkg-fun.nix diff --git a/pkgs/development/tools/wasynth/Cargo.lock b/pkgs/unit/wa/wasynth/Cargo.lock similarity index 100% rename from pkgs/development/tools/wasynth/Cargo.lock rename to pkgs/unit/wa/wasynth/Cargo.lock diff --git a/pkgs/development/tools/wasynth/default.nix b/pkgs/unit/wa/wasynth/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wasynth/default.nix rename to pkgs/unit/wa/wasynth/pkg-fun.nix diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/unit/wa/watchlog/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/watchlog/default.nix rename to pkgs/unit/wa/watchlog/pkg-fun.nix diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/unit/wa/watchmate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/watchmate/default.nix rename to pkgs/unit/wa/watchmate/pkg-fun.nix diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile b/pkgs/unit/wa/watson-ruby/Gemfile similarity index 100% rename from pkgs/development/tools/misc/watson-ruby/Gemfile rename to pkgs/unit/wa/watson-ruby/Gemfile diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/unit/wa/watson-ruby/Gemfile.lock similarity index 100% rename from pkgs/development/tools/misc/watson-ruby/Gemfile.lock rename to pkgs/unit/wa/watson-ruby/Gemfile.lock diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/pkgs/unit/wa/watson-ruby/gemset.nix similarity index 100% rename from pkgs/development/tools/misc/watson-ruby/gemset.nix rename to pkgs/unit/wa/watson-ruby/gemset.nix diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/unit/wa/watson-ruby/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/watson-ruby/default.nix rename to pkgs/unit/wa/watson-ruby/pkg-fun.nix diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/unit/wa/watson/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/watson/default.nix rename to pkgs/unit/wa/watson/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/unit/wa/wavebox/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/wavebox/default.nix rename to pkgs/unit/wa/wavebox/pkg-fun.nix diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/unit/wa/wavefunctioncollapse/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/wavefunctioncollapse/default.nix rename to pkgs/unit/wa/wavefunctioncollapse/pkg-fun.nix diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/unit/wa/wavegain/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/wavegain/default.nix rename to pkgs/unit/wa/wavegain/pkg-fun.nix diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/unit/wa/wavemon/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wavemon/default.nix rename to pkgs/unit/wa/wavemon/pkg-fun.nix diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/unit/wa/wavpack/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wavpack/default.nix rename to pkgs/unit/wa/wavpack/pkg-fun.nix diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/unit/wa/wavrsocvt/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/audio/wavrsocvt/default.nix rename to pkgs/unit/wa/wavrsocvt/pkg-fun.nix diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/unit/wa/way-displays/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/way-displays/default.nix rename to pkgs/unit/wa/way-displays/pkg-fun.nix diff --git a/pkgs/tools/misc/wayback-machine-archiver/default.nix b/pkgs/unit/wa/wayback-machine-archiver/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wayback-machine-archiver/default.nix rename to pkgs/unit/wa/wayback-machine-archiver/pkg-fun.nix diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile b/pkgs/unit/wa/wayback_machine_downloader/Gemfile similarity index 100% rename from pkgs/applications/networking/wayback_machine_downloader/Gemfile rename to pkgs/unit/wa/wayback_machine_downloader/Gemfile diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/pkgs/unit/wa/wayback_machine_downloader/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock rename to pkgs/unit/wa/wayback_machine_downloader/Gemfile.lock diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/pkgs/unit/wa/wayback_machine_downloader/gemset.nix similarity index 100% rename from pkgs/applications/networking/wayback_machine_downloader/gemset.nix rename to pkgs/unit/wa/wayback_machine_downloader/gemset.nix diff --git a/pkgs/applications/networking/wayback_machine_downloader/default.nix b/pkgs/unit/wa/wayback_machine_downloader/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/wayback_machine_downloader/default.nix rename to pkgs/unit/wa/wayback_machine_downloader/pkg-fun.nix diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/unit/wa/waybar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/waybar/default.nix rename to pkgs/unit/wa/waybar/pkg-fun.nix diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/unit/wa/waydroid/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/waydroid/default.nix rename to pkgs/unit/wa/waydroid/pkg-fun.nix diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/unit/wa/wayland-protocols/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wayland/protocols.nix rename to pkgs/unit/wa/wayland-protocols/pkg-fun.nix diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/unit/wa/wayland-proxy-virtwl/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wayland-proxy-virtwl/default.nix rename to pkgs/unit/wa/wayland-proxy-virtwl/pkg-fun.nix diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/unit/wa/wayland-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wayland-utils/default.nix rename to pkgs/unit/wa/wayland-utils/pkg-fun.nix diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/unit/wa/wayland/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wayland/default.nix rename to pkgs/unit/wa/wayland/pkg-fun.nix diff --git a/pkgs/tools/misc/waylevel/default.nix b/pkgs/unit/wa/waylevel/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/waylevel/default.nix rename to pkgs/unit/wa/waylevel/pkg-fun.nix diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/unit/wa/waylock/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/waylock/default.nix rename to pkgs/unit/wa/waylock/pkg-fun.nix diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/unit/wa/waynergy/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/waynergy/default.nix rename to pkgs/unit/wa/waynergy/pkg-fun.nix diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/unit/wa/wayout/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wayout/default.nix rename to pkgs/unit/wa/wayout/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/unit/wa/waypipe/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/waypipe/default.nix rename to pkgs/unit/wa/waypipe/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/unit/wa/waypoint/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/waypoint/default.nix rename to pkgs/unit/wa/waypoint/pkg-fun.nix diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/unit/wa/wayshot/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wayshot/default.nix rename to pkgs/unit/wa/wayshot/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/unit/wa/wayst/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/wayst/default.nix rename to pkgs/unit/wa/wayst/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/wayst/utf8proc.patch b/pkgs/unit/wa/wayst/utf8proc.patch similarity index 100% rename from pkgs/applications/terminal-emulators/wayst/utf8proc.patch rename to pkgs/unit/wa/wayst/utf8proc.patch diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/unit/wa/wayv/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/wayv/default.nix rename to pkgs/unit/wa/wayv/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/unit/wa/wayvnc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/wayvnc/default.nix rename to pkgs/unit/wa/wayvnc/pkg-fun.nix diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/unit/wb/wbg/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wbg/default.nix rename to pkgs/unit/wb/wbg/pkg-fun.nix diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/unit/wb/wbox/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wbox/default.nix rename to pkgs/unit/wb/wbox/pkg-fun.nix diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/unit/wc/wcalc/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wcalc/default.nix rename to pkgs/unit/wc/wcalc/pkg-fun.nix diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/unit/wc/wcc/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/wcc/default.nix rename to pkgs/unit/wc/wcc/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/wcpg/default.nix b/pkgs/unit/wc/wcpg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/wcpg/default.nix rename to pkgs/unit/wc/wcpg/pkg-fun.nix diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/unit/wc/wcslib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/astronomy/wcslib/default.nix rename to pkgs/unit/wc/wcslib/pkg-fun.nix diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/unit/wd/wdfs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/wdfs/default.nix rename to pkgs/unit/wd/wdfs/pkg-fun.nix diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/unit/wd/wdiff/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/wdiff/default.nix rename to pkgs/unit/wd/wdiff/pkg-fun.nix diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/unit/wd/wdisplays/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/wdisplays/default.nix rename to pkgs/unit/wd/wdisplays/pkg-fun.nix diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/unit/wd/wdomirror/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wdomirror/default.nix rename to pkgs/unit/wd/wdomirror/pkg-fun.nix diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/unit/wd/wdt/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sync/wdt/default.nix rename to pkgs/unit/wd/wdt/pkg-fun.nix diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/unit/we/weather-icons/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/weather-icons/default.nix rename to pkgs/unit/we/weather-icons/pkg-fun.nix diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/unit/we/weather/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/weather/default.nix rename to pkgs/unit/we/weather/pkg-fun.nix diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/unit/we/webalizer/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/webalizer/default.nix rename to pkgs/unit/we/webalizer/pkg-fun.nix diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/unit/we/webanalyze/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/webanalyze/default.nix rename to pkgs/unit/we/webanalyze/pkg-fun.nix diff --git a/pkgs/tools/misc/webcat/default.nix b/pkgs/unit/we/webcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/webcat/default.nix rename to pkgs/unit/we/webcat/pkg-fun.nix diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/unit/we/webdav-server-rs/pkg-fun.nix similarity index 100% rename from pkgs/servers/webdav-server-rs/default.nix rename to pkgs/unit/we/webdav-server-rs/pkg-fun.nix diff --git a/pkgs/servers/webdav/default.nix b/pkgs/unit/we/webdav/pkg-fun.nix similarity index 100% rename from pkgs/servers/webdav/default.nix rename to pkgs/unit/we/webdav/pkg-fun.nix diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/unit/we/webdis/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/database/webdis/default.nix rename to pkgs/unit/we/webdis/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/unit/we/webex/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/webex/default.nix rename to pkgs/unit/we/webex/pkg-fun.nix diff --git a/pkgs/servers/http/webfs/ls.c.patch b/pkgs/unit/we/webfs/ls.c.patch similarity index 100% rename from pkgs/servers/http/webfs/ls.c.patch rename to pkgs/unit/we/webfs/ls.c.patch diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/unit/we/webfs/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/webfs/default.nix rename to pkgs/unit/we/webfs/pkg-fun.nix diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/unit/we/webhook/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/webhook/default.nix rename to pkgs/unit/we/webhook/pkg-fun.nix diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/unit/we/webkit2-sharp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/webkit2-sharp/default.nix rename to pkgs/unit/we/webkit2-sharp/pkg-fun.nix diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/unit/we/webmetro/pkg-fun.nix similarity index 100% rename from pkgs/servers/webmetro/default.nix rename to pkgs/unit/we/webmetro/pkg-fun.nix diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/unit/we/webp-pixbuf-loader/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/webp-pixbuf-loader/default.nix rename to pkgs/unit/we/webp-pixbuf-loader/pkg-fun.nix diff --git a/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch b/pkgs/unit/we/webrtc-audio-processing_0_3/enable-powerpc.patch similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch rename to pkgs/unit/we/webrtc-audio-processing_0_3/enable-powerpc.patch diff --git a/pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch b/pkgs/unit/we/webrtc-audio-processing_0_3/enable-riscv.patch similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/enable-riscv.patch rename to pkgs/unit/we/webrtc-audio-processing_0_3/enable-riscv.patch diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/unit/we/webrtc-audio-processing_0_3/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/webrtc-audio-processing/0.3.nix rename to pkgs/unit/we/webrtc-audio-processing_0_3/pkg-fun.nix diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/unit/we/websocketd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/websocketd/default.nix rename to pkgs/unit/we/websocketd/pkg-fun.nix diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/unit/we/websocketpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/websocket++/default.nix rename to pkgs/unit/we/websocketpp/pkg-fun.nix diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/unit/we/webtorrent_desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/webtorrent_desktop/default.nix rename to pkgs/unit/we/webtorrent_desktop/pkg-fun.nix diff --git a/pkgs/tools/networking/webwormhole/default.nix b/pkgs/unit/we/webwormhole/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/webwormhole/default.nix rename to pkgs/unit/we/webwormhole/pkg-fun.nix diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/unit/we/wego/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wego/default.nix rename to pkgs/unit/we/wego/pkg-fun.nix diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/unit/we/weidu/pkg-fun.nix similarity index 100% rename from pkgs/tools/games/weidu/default.nix rename to pkgs/unit/we/weidu/pkg-fun.nix diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/unit/we/welkin/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/welkin/default.nix rename to pkgs/unit/we/welkin/pkg-fun.nix diff --git a/pkgs/tools/misc/wemux/default.nix b/pkgs/unit/we/wemux/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wemux/default.nix rename to pkgs/unit/we/wemux/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/unit/we/werf/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/werf/default.nix rename to pkgs/unit/we/werf/pkg-fun.nix diff --git a/pkgs/servers/wesher/default.nix b/pkgs/unit/we/wesher/pkg-fun.nix similarity index 100% rename from pkgs/servers/wesher/default.nix rename to pkgs/unit/we/wesher/pkg-fun.nix diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/unit/we/weston/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/weston/default.nix rename to pkgs/unit/we/weston/pkg-fun.nix diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/unit/we/wev/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wev/default.nix rename to pkgs/unit/we/wev/pkg-fun.nix diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/unit/wf/wf-config/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/wayfire/wf-config.nix rename to pkgs/unit/wf/wf-config/pkg-fun.nix diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/unit/wf/wf-recorder/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/wf-recorder/default.nix rename to pkgs/unit/wf/wf-recorder/pkg-fun.nix diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/unit/wg/wg-bond/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/wg-bond/default.nix rename to pkgs/unit/wg/wg-bond/pkg-fun.nix diff --git a/pkgs/tools/networking/wg-friendly-peer-names/default.nix b/pkgs/unit/wg/wg-friendly-peer-names/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wg-friendly-peer-names/default.nix rename to pkgs/unit/wg/wg-friendly-peer-names/pkg-fun.nix diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/unit/wg/wgcf/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/wgcf/default.nix rename to pkgs/unit/wg/wgcf/pkg-fun.nix diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/unit/wg/wget/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wget/default.nix rename to pkgs/unit/wg/wget/pkg-fun.nix diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/pkgs/unit/wg/wget/remove-runtime-dep-on-openssl-headers.patch similarity index 100% rename from pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch rename to pkgs/unit/wg/wget/remove-runtime-dep-on-openssl-headers.patch diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/unit/wg/wgetpaste/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/wgetpaste/default.nix rename to pkgs/unit/wg/wgetpaste/pkg-fun.nix diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/unit/wh/whatip/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/whatip/default.nix rename to pkgs/unit/wh/whatip/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/unit/wh/whatsapp-for-linux/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix rename to pkgs/unit/wh/whatsapp-for-linux/pkg-fun.nix diff --git a/pkgs/tools/security/whatweb/Gemfile b/pkgs/unit/wh/whatweb/Gemfile similarity index 100% rename from pkgs/tools/security/whatweb/Gemfile rename to pkgs/unit/wh/whatweb/Gemfile diff --git a/pkgs/tools/security/whatweb/Gemfile.lock b/pkgs/unit/wh/whatweb/Gemfile.lock similarity index 100% rename from pkgs/tools/security/whatweb/Gemfile.lock rename to pkgs/unit/wh/whatweb/Gemfile.lock diff --git a/pkgs/tools/security/whatweb/gemset.nix b/pkgs/unit/wh/whatweb/gemset.nix similarity index 100% rename from pkgs/tools/security/whatweb/gemset.nix rename to pkgs/unit/wh/whatweb/gemset.nix diff --git a/pkgs/tools/security/whatweb/default.nix b/pkgs/unit/wh/whatweb/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/whatweb/default.nix rename to pkgs/unit/wh/whatweb/pkg-fun.nix diff --git a/pkgs/tools/system/which/default.nix b/pkgs/unit/wh/which/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/which/default.nix rename to pkgs/unit/wh/which/pkg-fun.nix diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/unit/wh/whipper/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/whipper/default.nix rename to pkgs/unit/wh/whipper/pkg-fun.nix diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/unit/wh/whisper/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/whisper/default.nix rename to pkgs/unit/wh/whisper/pkg-fun.nix diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/unit/wh/whitesur-icon-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/icons/whitesur-icon-theme/default.nix rename to pkgs/unit/wh/whitesur-icon-theme/pkg-fun.nix diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/unit/wh/whois/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/whois/default.nix rename to pkgs/unit/wh/whois/pkg-fun.nix diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/unit/wh/whsniff/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/sniffers/whsniff/default.nix rename to pkgs/unit/wh/whsniff/pkg-fun.nix diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/unit/wh/why3/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/why3/default.nix rename to pkgs/unit/wh/why3/pkg-fun.nix diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/unit/wh/why3/with-provers.nix similarity index 100% rename from pkgs/applications/science/logic/why3/with-provers.nix rename to pkgs/unit/wh/why3/with-provers.nix diff --git a/pkgs/games/widelands/default.nix b/pkgs/unit/wi/widelands/pkg-fun.nix similarity index 100% rename from pkgs/games/widelands/default.nix rename to pkgs/unit/wi/widelands/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/unit/wi/widevine-cdm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/misc/widevine-cdm.nix rename to pkgs/unit/wi/widevine-cdm/pkg-fun.nix diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/unit/wi/wifi-password/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/darwin/wifi-password/default.nix rename to pkgs/unit/wi/wifi-password/pkg-fun.nix diff --git a/pkgs/tools/networking/wifish/default.nix b/pkgs/unit/wi/wifish/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wifish/default.nix rename to pkgs/unit/wi/wifish/pkg-fun.nix diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/unit/wi/wifite2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wifite2/default.nix rename to pkgs/unit/wi/wifite2/pkg-fun.nix diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/unit/wi/wiggle/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wiggle/default.nix rename to pkgs/unit/wi/wiggle/pkg-fun.nix diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/unit/wi/wiiload/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wiiload/default.nix rename to pkgs/unit/wi/wiiload/pkg-fun.nix diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff b/pkgs/unit/wi/wiimms-iso-tools/fix-paths.diff similarity index 100% rename from pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff rename to pkgs/unit/wi/wiimms-iso-tools/fix-paths.diff diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/unit/wi/wiimms-iso-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/wiimms-iso-tools/default.nix rename to pkgs/unit/wi/wiimms-iso-tools/pkg-fun.nix diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/unit/wi/wike/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wike/default.nix rename to pkgs/unit/wi/wike/pkg-fun.nix diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/unit/wi/wiki-js/pkg-fun.nix similarity index 100% rename from pkgs/servers/web-apps/wiki-js/default.nix rename to pkgs/unit/wi/wiki-js/pkg-fun.nix diff --git a/pkgs/servers/web-apps/wiki-js/update.sh b/pkgs/unit/wi/wiki-js/update.sh similarity index 100% rename from pkgs/servers/web-apps/wiki-js/update.sh rename to pkgs/unit/wi/wiki-js/update.sh diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/unit/wi/wildmidi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wildmidi/default.nix rename to pkgs/unit/wi/wildmidi/pkg-fun.nix diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/unit/wi/wily/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/wily/default.nix rename to pkgs/unit/wi/wily/pkg-fun.nix diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/unit/wi/wimboot/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wimboot/default.nix rename to pkgs/unit/wi/wimboot/pkg-fun.nix diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/unit/wi/wimlib/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/wimlib/default.nix rename to pkgs/unit/wi/wimlib/pkg-fun.nix diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/unit/wi/win-pvdrivers/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/driver/win-pvdrivers/default.nix rename to pkgs/unit/wi/win-pvdrivers/pkg-fun.nix diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/unit/wi/win-qemu/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/driver/win-qemu/default.nix rename to pkgs/unit/wi/win-qemu/pkg-fun.nix diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/unit/wi/win-signed-gplpv-drivers/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix rename to pkgs/unit/wi/win-signed-gplpv-drivers/pkg-fun.nix diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/unit/wi/win-spice/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/driver/win-spice/default.nix rename to pkgs/unit/wi/win-spice/pkg-fun.nix diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/unit/wi/win-virtio/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/driver/win-virtio/default.nix rename to pkgs/unit/wi/win-virtio/pkg-fun.nix diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/unit/wi/windowchef/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/windowchef/default.nix rename to pkgs/unit/wi/windowchef/pkg-fun.nix diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/unit/wi/windowlab/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/windowlab/default.nix rename to pkgs/unit/wi/windowlab/pkg-fun.nix diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/unit/wi/windowmaker/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/windowmaker/default.nix rename to pkgs/unit/wi/windowmaker/pkg-fun.nix diff --git a/pkgs/applications/emulators/wineasio/default.nix b/pkgs/unit/wi/wineasio/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/wineasio/default.nix rename to pkgs/unit/wi/wineasio/pkg-fun.nix diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch b/pkgs/unit/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch similarity index 100% rename from pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch rename to pkgs/unit/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/unit/wi/wingpanel-indicator-ayatana/pkg-fun.nix similarity index 100% rename from pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix rename to pkgs/unit/wi/wingpanel-indicator-ayatana/pkg-fun.nix diff --git a/pkgs/tools/security/wipe/fix-install.patch b/pkgs/unit/wi/wipe/fix-install.patch similarity index 100% rename from pkgs/tools/security/wipe/fix-install.patch rename to pkgs/unit/wi/wipe/fix-install.patch diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/unit/wi/wipe/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/wipe/default.nix rename to pkgs/unit/wi/wipe/pkg-fun.nix diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/unit/wi/wipefreespace/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/wipefreespace/default.nix rename to pkgs/unit/wi/wipefreespace/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/unit/wi/wire-desktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/wire-desktop/default.nix rename to pkgs/unit/wi/wire-desktop/pkg-fun.nix diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/unit/wi/wire/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wire/default.nix rename to pkgs/unit/wi/wire/pkg-fun.nix diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/unit/wi/wiredtiger/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wiredtiger/default.nix rename to pkgs/unit/wi/wiredtiger/pkg-fun.nix diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/unit/wi/wireguard-go/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wireguard-go/default.nix rename to pkgs/unit/wi/wireguard-go/pkg-fun.nix diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/unit/wi/wireguard-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wireguard-tools/default.nix rename to pkgs/unit/wi/wireguard-tools/pkg-fun.nix diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/pkgs/unit/wi/wireguard-tools/update.sh similarity index 100% rename from pkgs/tools/networking/wireguard-tools/update.sh rename to pkgs/unit/wi/wireguard-tools/update.sh diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/unit/wi/wireless-regdb/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/wireless-regdb/default.nix rename to pkgs/unit/wi/wireless-regdb/pkg-fun.nix diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/unit/wi/wirelesstools/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/wireless-tools/default.nix rename to pkgs/unit/wi/wirelesstools/pkg-fun.nix diff --git a/pkgs/tools/networking/wiremock/default.nix b/pkgs/unit/wi/wiremock/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wiremock/default.nix rename to pkgs/unit/wi/wiremock/pkg-fun.nix diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/unit/wi/wireplumber/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/pipewire/wireplumber.nix rename to pkgs/unit/wi/wireplumber/pkg-fun.nix diff --git a/pkgs/tools/networking/wireproxy/default.nix b/pkgs/unit/wi/wireproxy/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wireproxy/default.nix rename to pkgs/unit/wi/wireproxy/pkg-fun.nix diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/unit/wi/wiringpi/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/wiringpi/default.nix rename to pkgs/unit/wi/wiringpi/pkg-fun.nix diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/unit/wi/wishbone-tool/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/wishbone-tool/default.nix rename to pkgs/unit/wi/wishbone-tool/pkg-fun.nix diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/unit/wi/wishlist/pkg-fun.nix similarity index 100% rename from pkgs/servers/wishlist/default.nix rename to pkgs/unit/wi/wishlist/pkg-fun.nix diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/unit/wi/with-shell/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/with-shell/default.nix rename to pkgs/unit/wi/with-shell/pkg-fun.nix diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/unit/wi/witness/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/witness/default.nix rename to pkgs/unit/wi/witness/pkg-fun.nix diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/unit/wl/wl-clipboard-x11/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wl-clipboard-x11/default.nix rename to pkgs/unit/wl/wl-clipboard-x11/pkg-fun.nix diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/unit/wl/wl-clipboard/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wl-clipboard/default.nix rename to pkgs/unit/wl/wl-clipboard/pkg-fun.nix diff --git a/pkgs/tools/wayland/wl-color-picker/default.nix b/pkgs/unit/wl/wl-color-picker/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wl-color-picker/default.nix rename to pkgs/unit/wl/wl-color-picker/pkg-fun.nix diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/unit/wl/wl-gammactl/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wl-gammactl/default.nix rename to pkgs/unit/wl/wl-gammactl/pkg-fun.nix diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/unit/wl/wl-mirror/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wl-mirror/default.nix rename to pkgs/unit/wl/wl-mirror/pkg-fun.nix diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/unit/wl/wla-dx/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/wla-dx/default.nix rename to pkgs/unit/wl/wla-dx/pkg-fun.nix diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/unit/wl/wlc/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wlc/default.nix rename to pkgs/unit/wl/wlc/pkg-fun.nix diff --git a/pkgs/applications/misc/wlclock/default.nix b/pkgs/unit/wl/wlclock/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wlclock/default.nix rename to pkgs/unit/wl/wlclock/pkg-fun.nix diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/unit/wl/wlcs/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wlcs/default.nix rename to pkgs/unit/wl/wlcs/pkg-fun.nix diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/unit/wl/wllvm/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wllvm/default.nix rename to pkgs/unit/wl/wllvm/pkg-fun.nix diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/unit/wl/wlogout/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wlogout/default.nix rename to pkgs/unit/wl/wlogout/pkg-fun.nix diff --git a/pkgs/tools/wayland/wlopm/default.nix b/pkgs/unit/wl/wlopm/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wlopm/default.nix rename to pkgs/unit/wl/wlopm/pkg-fun.nix diff --git a/pkgs/tools/wayland/wlprop/default.nix b/pkgs/unit/wl/wlprop/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wlprop/default.nix rename to pkgs/unit/wl/wlprop/pkg-fun.nix diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/unit/wl/wlr-protocols/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wlroots/protocols.nix rename to pkgs/unit/wl/wlr-protocols/pkg-fun.nix diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/unit/wl/wlr-randr/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wlr-randr/default.nix rename to pkgs/unit/wl/wlr-randr/pkg-fun.nix diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/unit/wl/wlrctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wlrctl/default.nix rename to pkgs/unit/wl/wlrctl/pkg-fun.nix diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/unit/wl/wlsunset/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wlsunset/default.nix rename to pkgs/unit/wl/wlsunset/pkg-fun.nix diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/unit/wl/wluma/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wluma/default.nix rename to pkgs/unit/wl/wluma/pkg-fun.nix diff --git a/pkgs/tools/X11/wmctrl/64-bit-data.patch b/pkgs/unit/wm/wmctrl/64-bit-data.patch similarity index 100% rename from pkgs/tools/X11/wmctrl/64-bit-data.patch rename to pkgs/unit/wm/wmctrl/64-bit-data.patch diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/unit/wm/wmctrl/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/wmctrl/default.nix rename to pkgs/unit/wm/wmctrl/pkg-fun.nix diff --git a/pkgs/applications/window-managers/wmderland/0001-remove-flto.patch b/pkgs/unit/wm/wmderland/0001-remove-flto.patch similarity index 100% rename from pkgs/applications/window-managers/wmderland/0001-remove-flto.patch rename to pkgs/unit/wm/wmderland/0001-remove-flto.patch diff --git a/pkgs/applications/window-managers/wmderland/default.nix b/pkgs/unit/wm/wmderland/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/wmderland/default.nix rename to pkgs/unit/wm/wmderland/pkg-fun.nix diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/unit/wm/wmderlandc/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/wmderlandc/default.nix rename to pkgs/unit/wm/wmderlandc/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/unit/wm/wmfocus/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/wmfocus.nix rename to pkgs/unit/wm/wmfocus/pkg-fun.nix diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/unit/wm/wmfs/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/wmfs/default.nix rename to pkgs/unit/wm/wmfs/pkg-fun.nix diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/unit/wm/wmic-bin/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/plugins/wmic-bin.nix rename to pkgs/unit/wm/wmic-bin/pkg-fun.nix diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/unit/wm/wmii/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/wmii/default.nix rename to pkgs/unit/wm/wmii/pkg-fun.nix diff --git a/pkgs/development/web/wml/dynaloader.patch b/pkgs/unit/wm/wml/dynaloader.patch similarity index 100% rename from pkgs/development/web/wml/dynaloader.patch rename to pkgs/unit/wm/wml/dynaloader.patch diff --git a/pkgs/development/web/wml/no_bitvector.patch b/pkgs/unit/wm/wml/no_bitvector.patch similarity index 100% rename from pkgs/development/web/wml/no_bitvector.patch rename to pkgs/unit/wm/wml/no_bitvector.patch diff --git a/pkgs/development/web/wml/default.nix b/pkgs/unit/wm/wml/pkg-fun.nix similarity index 100% rename from pkgs/development/web/wml/default.nix rename to pkgs/unit/wm/wml/pkg-fun.nix diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/pkgs/unit/wm/wml/redhat-with-thr.patch similarity index 100% rename from pkgs/development/web/wml/redhat-with-thr.patch rename to pkgs/unit/wm/wml/redhat-with-thr.patch diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/unit/wm/wmname/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wmname/default.nix rename to pkgs/unit/wm/wmname/pkg-fun.nix diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/unit/wm/wmutils-core/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/wmutils-core/default.nix rename to pkgs/unit/wm/wmutils-core/pkg-fun.nix diff --git a/pkgs/tools/X11/wmutils-libwm/default.nix b/pkgs/unit/wm/wmutils-libwm/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/wmutils-libwm/default.nix rename to pkgs/unit/wm/wmutils-libwm/pkg-fun.nix diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/unit/wm/wmutils-opt/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/wmutils-opt/default.nix rename to pkgs/unit/wm/wmutils-opt/pkg-fun.nix diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/unit/wo/wob/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wob/default.nix rename to pkgs/unit/wo/wob/pkg-fun.nix diff --git a/pkgs/tools/misc/woeusb-ng/default.nix b/pkgs/unit/wo/woeusb-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/woeusb-ng/default.nix rename to pkgs/unit/wo/woeusb-ng/pkg-fun.nix diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/unit/wo/woeusb/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/woeusb/default.nix rename to pkgs/unit/wo/woeusb/pkg-fun.nix diff --git a/pkgs/development/web/woff2/brotli-static.patch b/pkgs/unit/wo/woff2/brotli-static.patch similarity index 100% rename from pkgs/development/web/woff2/brotli-static.patch rename to pkgs/unit/wo/woff2/brotli-static.patch diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/unit/wo/woff2/pkg-fun.nix similarity index 100% rename from pkgs/development/web/woff2/default.nix rename to pkgs/unit/wo/woff2/pkg-fun.nix diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/unit/wo/wofi-emoji/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wofi-emoji/default.nix rename to pkgs/unit/wo/wofi-emoji/pkg-fun.nix diff --git a/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/pkgs/unit/wo/wofi/do_not_follow_symlinks.patch similarity index 100% rename from pkgs/applications/misc/wofi/do_not_follow_symlinks.patch rename to pkgs/unit/wo/wofi/do_not_follow_symlinks.patch diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/unit/wo/wofi/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wofi/default.nix rename to pkgs/unit/wo/wofi/pkg-fun.nix diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/unit/wo/wol/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wol/default.nix rename to pkgs/unit/wo/wol/pkg-fun.nix diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/unit/wo/wolf-shaper/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/wolf-shaper/default.nix rename to pkgs/unit/wo/wolf-shaper/pkg-fun.nix diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/unit/wo/wolfebin/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wolfebin/default.nix rename to pkgs/unit/wo/wolfebin/pkg-fun.nix diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix b/pkgs/unit/wo/wolfram-for-jupyter-kernel/kernel.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix rename to pkgs/unit/wo/wolfram-for-jupyter-kernel/kernel.nix diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/unit/wo/wolfram-for-jupyter-kernel/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/jupyter-kernels/wolfram/default.nix rename to pkgs/unit/wo/wolfram-for-jupyter-kernel/pkg-fun.nix diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/unit/wo/wolfram-notebook/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/math/wolfram-engine/notebook.nix rename to pkgs/unit/wo/wolfram-notebook/pkg-fun.nix diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/unit/wo/woof/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/woof/default.nix rename to pkgs/unit/wo/woof/pkg-fun.nix diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/unit/wo/wootility/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wootility/default.nix rename to pkgs/unit/wo/wootility/pkg-fun.nix diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/unit/wo/wooting-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/wooting-udev-rules/default.nix rename to pkgs/unit/wo/wooting-udev-rules/pkg-fun.nix diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/unit/wo/wooting-udev-rules/wooting.rules similarity index 100% rename from pkgs/os-specific/linux/wooting-udev-rules/wooting.rules rename to pkgs/unit/wo/wooting-udev-rules/wooting.rules diff --git a/pkgs/applications/misc/wordbook/default.nix b/pkgs/unit/wo/wordbook/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wordbook/default.nix rename to pkgs/unit/wo/wordbook/pkg-fun.nix diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/unit/wo/wordgrinder/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/wordgrinder/default.nix rename to pkgs/unit/wo/wordgrinder/pkg-fun.nix diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/unit/wo/work-sans/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/work-sans/default.nix rename to pkgs/unit/wo/work-sans/pkg-fun.nix diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/unit/wo/workcraft/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/workcraft/default.nix rename to pkgs/unit/wo/workcraft/pkg-fun.nix diff --git a/pkgs/applications/file-managers/worker/default.nix b/pkgs/unit/wo/worker/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/worker/default.nix rename to pkgs/unit/wo/worker/pkg-fun.nix diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/unit/wo/workstyle/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/i3/workstyle.nix rename to pkgs/unit/wo/workstyle/pkg-fun.nix diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/unit/wo/worldofgoo/pkg-fun.nix similarity index 100% rename from pkgs/games/worldofgoo/default.nix rename to pkgs/unit/wo/worldofgoo/pkg-fun.nix diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/unit/wo/wormhole-william/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wormhole-william/default.nix rename to pkgs/unit/wo/wormhole-william/pkg-fun.nix diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/unit/wp/wp-cli/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wp-cli/default.nix rename to pkgs/unit/wp/wp-cli/pkg-fun.nix diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/unit/wp/wp4nix/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/wp4nix/default.nix rename to pkgs/unit/wp/wp4nix/pkg-fun.nix diff --git a/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch b/pkgs/unit/wp/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch rename to pkgs/unit/wp/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch diff --git a/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch b/pkgs/unit/wp/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch rename to pkgs/unit/wp/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/unit/wp/wpa_supplicant/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/wpa_supplicant/default.nix rename to pkgs/unit/wp/wpa_supplicant/pkg-fun.nix diff --git a/pkgs/tools/wayland/wpaperd/default.nix b/pkgs/unit/wp/wpaperd/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wpaperd/default.nix rename to pkgs/unit/wp/wpaperd/pkg-fun.nix diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/unit/wp/wpgtk/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/wpgtk/default.nix rename to pkgs/unit/wp/wpgtk/pkg-fun.nix diff --git a/pkgs/tools/security/wprecon/default.nix b/pkgs/unit/wp/wprecon/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/wprecon/default.nix rename to pkgs/unit/wp/wprecon/pkg-fun.nix diff --git a/pkgs/tools/security/wpscan/Gemfile b/pkgs/unit/wp/wpscan/Gemfile similarity index 100% rename from pkgs/tools/security/wpscan/Gemfile rename to pkgs/unit/wp/wpscan/Gemfile diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/unit/wp/wpscan/Gemfile.lock similarity index 100% rename from pkgs/tools/security/wpscan/Gemfile.lock rename to pkgs/unit/wp/wpscan/Gemfile.lock diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/unit/wp/wpscan/gemset.nix similarity index 100% rename from pkgs/tools/security/wpscan/gemset.nix rename to pkgs/unit/wp/wpscan/gemset.nix diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/unit/wp/wpscan/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/wpscan/default.nix rename to pkgs/unit/wp/wpscan/pkg-fun.nix diff --git a/pkgs/tools/security/wpscan/update.sh b/pkgs/unit/wp/wpscan/update.sh similarity index 100% rename from pkgs/tools/security/wpscan/update.sh rename to pkgs/unit/wp/wpscan/update.sh diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/unit/wq/wqy_microhei/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/wqy-microhei/default.nix rename to pkgs/unit/wq/wqy_microhei/pkg-fun.nix diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/unit/wq/wqy_zenhei/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/wqy-zenhei/default.nix rename to pkgs/unit/wq/wqy_zenhei/pkg-fun.nix diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/unit/wr/wrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/wrap/default.nix rename to pkgs/unit/wr/wrap/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/unit/wr/wrapFirefox/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox/wrapper.nix rename to pkgs/unit/wr/wrapFirefox/pkg-fun.nix diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/unit/wr/wrapFish/pkg-fun.nix similarity index 100% rename from pkgs/shells/fish/wrapper.nix rename to pkgs/unit/wr/wrapFish/pkg-fun.nix diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/unit/wr/wrapHelm/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/cluster/helm/wrapper.nix rename to pkgs/unit/wr/wrapHelm/pkg-fun.nix diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/unit/wr/wrapMpv/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/mpv/wrapper.nix rename to pkgs/unit/wr/wrapMpv/pkg-fun.nix diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/unit/wr/wrapNeovimUnstable/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/neovim/wrapper.nix rename to pkgs/unit/wr/wrapNeovimUnstable/pkg-fun.nix diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/unit/wr/wrapNeovimUnstable/tests/default.nix similarity index 100% rename from pkgs/applications/editors/neovim/tests/default.nix rename to pkgs/unit/wr/wrapNeovimUnstable/tests/default.nix diff --git a/pkgs/applications/editors/neovim/tests/init-override.vim b/pkgs/unit/wr/wrapNeovimUnstable/tests/init-override.vim similarity index 100% rename from pkgs/applications/editors/neovim/tests/init-override.vim rename to pkgs/unit/wr/wrapNeovimUnstable/tests/init-override.vim diff --git a/pkgs/applications/editors/neovim/tests/init-single-lines.vim b/pkgs/unit/wr/wrapNeovimUnstable/tests/init-single-lines.vim similarity index 100% rename from pkgs/applications/editors/neovim/tests/init-single-lines.vim rename to pkgs/unit/wr/wrapNeovimUnstable/tests/init-single-lines.vim diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/unit/wr/wrapOBS/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/obs-studio/wrapper.nix rename to pkgs/unit/wr/wrapOBS/pkg-fun.nix diff --git a/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c b/pkgs/unit/wr/wrapQemuBinfmtP/binfmt-p-wrapper.c similarity index 100% rename from pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c rename to pkgs/unit/wr/wrapQemuBinfmtP/binfmt-p-wrapper.c diff --git a/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix b/pkgs/unit/wr/wrapQemuBinfmtP/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix rename to pkgs/unit/wr/wrapQemuBinfmtP/pkg-fun.nix diff --git a/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix b/pkgs/unit/wr/wrapThunderbird/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix rename to pkgs/unit/wr/wrapThunderbird/pkg-fun.nix diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/unit/wr/wrapVdr/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/vdr/wrapper.nix rename to pkgs/unit/wr/wrapVdr/pkg-fun.nix diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/unit/wr/wrapWatcom/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/open-watcom/wrapper.nix rename to pkgs/unit/wr/wrapWatcom/pkg-fun.nix diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/unit/wr/wrapWeechat/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/irc/weechat/wrapper.nix rename to pkgs/unit/wr/wrapWeechat/pkg-fun.nix diff --git a/pkgs/development/tools/cue/validator.nix b/pkgs/unit/wr/writeCueValidator/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/cue/validator.nix rename to pkgs/unit/wr/writeCueValidator/pkg-fun.nix diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/unit/wr/writeDarwinBundle/pkg-fun.nix similarity index 100% rename from pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix rename to pkgs/unit/wr/writeDarwinBundle/pkg-fun.nix diff --git a/pkgs/tools/misc/writedisk/default.nix b/pkgs/unit/wr/writedisk/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/writedisk/default.nix rename to pkgs/unit/wr/writedisk/pkg-fun.nix diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/unit/wr/writefreely/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/writefreely/default.nix rename to pkgs/unit/wr/writefreely/pkg-fun.nix diff --git a/pkgs/build-support/writers/aliases.nix b/pkgs/unit/wr/writers/aliases.nix similarity index 100% rename from pkgs/build-support/writers/aliases.nix rename to pkgs/unit/wr/writers/aliases.nix diff --git a/pkgs/build-support/writers/default.nix b/pkgs/unit/wr/writers/pkg-fun.nix similarity index 100% rename from pkgs/build-support/writers/default.nix rename to pkgs/unit/wr/writers/pkg-fun.nix diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/unit/wr/wrk/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wrk/default.nix rename to pkgs/unit/wr/wrk/pkg-fun.nix diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/unit/wr/wrk2/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wrk2/default.nix rename to pkgs/unit/wr/wrk2/pkg-fun.nix diff --git a/pkgs/servers/wsdd/increase_timeout.patch b/pkgs/unit/ws/wsdd/increase_timeout.patch similarity index 100% rename from pkgs/servers/wsdd/increase_timeout.patch rename to pkgs/unit/ws/wsdd/increase_timeout.patch diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/unit/ws/wsdd/pkg-fun.nix similarity index 100% rename from pkgs/servers/wsdd/default.nix rename to pkgs/unit/ws/wsdd/pkg-fun.nix diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/unit/ws/wshowkeys/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wshowkeys/default.nix rename to pkgs/unit/ws/wshowkeys/pkg-fun.nix diff --git a/pkgs/tools/misc/wsl-open/default.nix b/pkgs/unit/ws/wsl-open/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wsl-open/default.nix rename to pkgs/unit/ws/wsl-open/pkg-fun.nix diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/unit/ws/wslu/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/wslu/default.nix rename to pkgs/unit/ws/wslu/pkg-fun.nix diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/unit/ws/wsmancli/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/wsmancli/default.nix rename to pkgs/unit/ws/wsmancli/pkg-fun.nix diff --git a/pkgs/tools/system/wsysmon/dependencies.patch b/pkgs/unit/ws/wsysmon/dependencies.patch similarity index 100% rename from pkgs/tools/system/wsysmon/dependencies.patch rename to pkgs/unit/ws/wsysmon/dependencies.patch diff --git a/pkgs/tools/system/wsysmon/install.patch b/pkgs/unit/ws/wsysmon/install.patch similarity index 100% rename from pkgs/tools/system/wsysmon/install.patch rename to pkgs/unit/ws/wsysmon/install.patch diff --git a/pkgs/tools/system/wsysmon/default.nix b/pkgs/unit/ws/wsysmon/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/wsysmon/default.nix rename to pkgs/unit/ws/wsysmon/pkg-fun.nix diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/unit/wt/wtf/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/wtf/default.nix rename to pkgs/unit/wt/wtf/pkg-fun.nix diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/unit/wt/wtk/builder.sh similarity index 100% rename from pkgs/development/libraries/wtk/builder.sh rename to pkgs/unit/wt/wtk/builder.sh diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/unit/wt/wtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/wtk/default.nix rename to pkgs/unit/wt/wtk/pkg-fun.nix diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/unit/wt/wtwitch/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/wtwitch/default.nix rename to pkgs/unit/wt/wtwitch/pkg-fun.nix diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/unit/wt/wtype/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/wtype/default.nix rename to pkgs/unit/wt/wtype/pkg-fun.nix diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/unit/wu/wuzz/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/wuzz/default.nix rename to pkgs/unit/wu/wuzz/pkg-fun.nix diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/unit/wv/wv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wv/default.nix rename to pkgs/unit/wv/wv/pkg-fun.nix diff --git a/pkgs/tools/misc/wv2/fix-include.patch b/pkgs/unit/wv/wv2/fix-include.patch similarity index 100% rename from pkgs/tools/misc/wv2/fix-include.patch rename to pkgs/unit/wv/wv2/fix-include.patch diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/unit/wv/wv2/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wv2/default.nix rename to pkgs/unit/wv/wv2/pkg-fun.nix diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/unit/wv/wvkbd/pkg-fun.nix similarity index 100% rename from pkgs/applications/accessibility/wvkbd/default.nix rename to pkgs/unit/wv/wvkbd/pkg-fun.nix diff --git a/pkgs/tools/misc/wwcd/default.nix b/pkgs/unit/ww/wwcd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/wwcd/default.nix rename to pkgs/unit/ww/wwcd/pkg-fun.nix diff --git a/pkgs/games/wyvern/default.nix b/pkgs/unit/wy/wyvern/pkg-fun.nix similarity index 100% rename from pkgs/games/wyvern/default.nix rename to pkgs/unit/wy/wyvern/pkg-fun.nix diff --git a/pkgs/applications/window-managers/x-create-mouse-void/default.nix b/pkgs/unit/x-/x-create-mouse-void/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/x-create-mouse-void/default.nix rename to pkgs/unit/x-/x-create-mouse-void/pkg-fun.nix diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/unit/x1/x11_ssh_askpass/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/x11-ssh-askpass/default.nix rename to pkgs/unit/x1/x11_ssh_askpass/pkg-fun.nix diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/unit/x1/x11docker/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/x11docker/default.nix rename to pkgs/unit/x1/x11docker/pkg-fun.nix diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/unit/x1/x11idle/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/x11idle/default.nix rename to pkgs/unit/x1/x11idle/pkg-fun.nix diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/unit/x1/x11spice/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/x11spice/default.nix rename to pkgs/unit/x1/x11spice/pkg-fun.nix diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/unit/x1/x11vnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/x11vnc/default.nix rename to pkgs/unit/x1/x11vnc/pkg-fun.nix diff --git a/pkgs/applications/emulators/commanderx16/emulator.nix b/pkgs/unit/x1/x16-emulator/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/commanderx16/emulator.nix rename to pkgs/unit/x1/x16-emulator/pkg-fun.nix diff --git a/pkgs/applications/emulators/commanderx16/rom.nix b/pkgs/unit/x1/x16-rom/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/commanderx16/rom.nix rename to pkgs/unit/x1/x16-rom/pkg-fun.nix diff --git a/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/pkgs/unit/x2/x264/disable-arm-neon-default.patch similarity index 100% rename from pkgs/development/libraries/x264/disable-arm-neon-default.patch rename to pkgs/unit/x2/x264/disable-arm-neon-default.patch diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/unit/x2/x264/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/x264/default.nix rename to pkgs/unit/x2/x264/pkg-fun.nix diff --git a/pkgs/development/libraries/x265/fix-neon-detection.patch b/pkgs/unit/x2/x265/fix-neon-detection.patch similarity index 100% rename from pkgs/development/libraries/x265/fix-neon-detection.patch rename to pkgs/unit/x2/x265/fix-neon-detection.patch diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/unit/x2/x265/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/x265/default.nix rename to pkgs/unit/x2/x265/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/unit/x2/x2goserver/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/x2goserver/default.nix rename to pkgs/unit/x2/x2goserver/pkg-fun.nix diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/unit/x2/x2vnc/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/x2vnc/default.nix rename to pkgs/unit/x2/x2vnc/pkg-fun.nix diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/unit/x2/x2x/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/x2x/default.nix rename to pkgs/unit/x2/x2x/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/unit/x3/x3270/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/x3270/default.nix rename to pkgs/unit/x3/x3270/pkg-fun.nix diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/unit/x4/x42-avldrums/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/x42-avldrums/default.nix rename to pkgs/unit/x4/x42-avldrums/pkg-fun.nix diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/unit/x4/x42-gmsynth/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/x42-gmsynth/default.nix rename to pkgs/unit/x4/x42-gmsynth/pkg-fun.nix diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/unit/x4/x42-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/x42-plugins/default.nix rename to pkgs/unit/x4/x42-plugins/pkg-fun.nix diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/unit/x8/x86info/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/x86info/default.nix rename to pkgs/unit/x8/x86info/pkg-fun.nix diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/unit/xa/Xaw3d/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/Xaw3d/default.nix rename to pkgs/unit/xa/Xaw3d/pkg-fun.nix diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/unit/xa/xa/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/xa/xa.nix rename to pkgs/unit/xa/xa/pkg-fun.nix diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/unit/xa/xalanc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xalanc/default.nix rename to pkgs/unit/xa/xalanc/pkg-fun.nix diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/unit/xa/xandikos/pkg-fun.nix similarity index 100% rename from pkgs/servers/xandikos/default.nix rename to pkgs/unit/xa/xandikos/pkg-fun.nix diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/unit/xa/xannotate/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xannotate/default.nix rename to pkgs/unit/xa/xannotate/pkg-fun.nix diff --git a/pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch b/pkgs/unit/xa/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch similarity index 100% rename from pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch rename to pkgs/unit/xa/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch diff --git a/pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch b/pkgs/unit/xa/xar/0002-Use-pkg-config-for-libxml2.patch similarity index 100% rename from pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch rename to pkgs/unit/xa/xar/0002-Use-pkg-config-for-libxml2.patch diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/unit/xa/xar/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/xar/default.nix rename to pkgs/unit/xa/xar/pkg-fun.nix diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/unit/xa/xarchive/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/xarchive/default.nix rename to pkgs/unit/xa/xarchive/pkg-fun.nix diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/unit/xa/xarchiver/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/xarchiver/default.nix rename to pkgs/unit/xa/xarchiver/pkg-fun.nix diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/unit/xa/xautoclick/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xautoclick/default.nix rename to pkgs/unit/xa/xautoclick/pkg-fun.nix diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/unit/xa/xautolock/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/xautolock/default.nix rename to pkgs/unit/xa/xautolock/pkg-fun.nix diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/unit/xa/xautomation/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xautomation/default.nix rename to pkgs/unit/xa/xautomation/pkg-fun.nix diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/unit/xa/xavs/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xavs/default.nix rename to pkgs/unit/xa/xavs/pkg-fun.nix diff --git a/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch b/pkgs/unit/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch similarity index 100% rename from pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch rename to pkgs/unit/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/unit/xa/xawtv/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/xawtv/default.nix rename to pkgs/unit/xa/xawtv/pkg-fun.nix diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/unit/xb/xbanish/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xbanish/default.nix rename to pkgs/unit/xb/xbanish/pkg-fun.nix diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/unit/xb/xbase/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xbase/default.nix rename to pkgs/unit/xb/xbase/pkg-fun.nix diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/pkgs/unit/xb/xbase/xbase-fixes.patch similarity index 100% rename from pkgs/development/libraries/xbase/xbase-fixes.patch rename to pkgs/unit/xb/xbase/xbase-fixes.patch diff --git a/pkgs/applications/misc/xbattbar/default.nix b/pkgs/unit/xb/xbattbar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xbattbar/default.nix rename to pkgs/unit/xb/xbattbar/pkg-fun.nix diff --git a/pkgs/applications/misc/xbattbar/sys-by-default.patch b/pkgs/unit/xb/xbattbar/sys-by-default.patch similarity index 100% rename from pkgs/applications/misc/xbattbar/sys-by-default.patch rename to pkgs/unit/xb/xbattbar/sys-by-default.patch diff --git a/pkgs/games/xbill/default.nix b/pkgs/unit/xb/xbill/pkg-fun.nix similarity index 100% rename from pkgs/games/xbill/default.nix rename to pkgs/unit/xb/xbill/pkg-fun.nix diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/unit/xb/xbindkeys/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xbindkeys/default.nix rename to pkgs/unit/xb/xbindkeys/pkg-fun.nix diff --git a/pkgs/games/xboard/default.nix b/pkgs/unit/xb/xboard/pkg-fun.nix similarity index 100% rename from pkgs/games/xboard/default.nix rename to pkgs/unit/xb/xboard/pkg-fun.nix diff --git a/pkgs/games/xbomb/default.nix b/pkgs/unit/xb/xbomb/pkg-fun.nix similarity index 100% rename from pkgs/games/xbomb/default.nix rename to pkgs/unit/xb/xbomb/pkg-fun.nix diff --git a/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/pkgs/unit/xb/xboxdrv/fix-60-sec-delay.patch similarity index 100% rename from pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch rename to pkgs/unit/xb/xboxdrv/fix-60-sec-delay.patch diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/unit/xb/xboxdrv/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/xboxdrv/default.nix rename to pkgs/unit/xb/xboxdrv/pkg-fun.nix diff --git a/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/pkgs/unit/xb/xboxdrv/scons-py3.patch similarity index 100% rename from pkgs/misc/drivers/xboxdrv/scons-py3.patch rename to pkgs/unit/xb/xboxdrv/scons-py3.patch diff --git a/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/pkgs/unit/xb/xboxdrv/scons-v4.2.0.patch similarity index 100% rename from pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch rename to pkgs/unit/xb/xboxdrv/scons-v4.2.0.patch diff --git a/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/pkgs/unit/xb/xboxdrv/xboxdrvctl-py3.patch similarity index 100% rename from pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch rename to pkgs/unit/xb/xboxdrv/xboxdrvctl-py3.patch diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/unit/xb/xbrightness/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xbrightness/default.nix rename to pkgs/unit/xb/xbrightness/pkg-fun.nix diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/unit/xc/xcaddy/pkg-fun.nix similarity index 100% rename from pkgs/servers/caddy/xcaddy/default.nix rename to pkgs/unit/xc/xcaddy/pkg-fun.nix diff --git a/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff b/pkgs/unit/xc/xcaddy/use_tmpdir_on_darwin.diff similarity index 100% rename from pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff rename to pkgs/unit/xc/xcaddy/use_tmpdir_on_darwin.diff diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/unit/xc/xcalib/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xcalib/default.nix rename to pkgs/unit/xc/xcalib/pkg-fun.nix diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/unit/xc/xcape/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xcape/default.nix rename to pkgs/unit/xc/xcape/pkg-fun.nix diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/unit/xc/xcat/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/xcat/default.nix rename to pkgs/unit/xc/xcat/pkg-fun.nix diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/unit/xc/xcb-imdkit/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xcb-imdkit/default.nix rename to pkgs/unit/xc/xcb-imdkit/pkg-fun.nix diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 b/pkgs/unit/xc/xcb-util-cursor-HEAD/m4/ax_compare_version.m4 similarity index 100% rename from pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 rename to pkgs/unit/xc/xcb-util-cursor-HEAD/m4/ax_compare_version.m4 diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 b/pkgs/unit/xc/xcb-util-cursor-HEAD/m4/xcb_util_common.m4 similarity index 100% rename from pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 rename to pkgs/unit/xc/xcb-util-cursor-HEAD/m4/xcb_util_common.m4 diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 b/pkgs/unit/xc/xcb-util-cursor-HEAD/m4/xcb_util_m4_with_include_path.m4 similarity index 100% rename from pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 rename to pkgs/unit/xc/xcb-util-cursor-HEAD/m4/xcb_util_m4_with_include_path.m4 diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/unit/xc/xcb-util-cursor-HEAD/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xcb-util-cursor/HEAD.nix rename to pkgs/unit/xc/xcb-util-cursor-HEAD/pkg-fun.nix diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/unit/xc/xcbutilxrm/pkg-fun.nix similarity index 100% rename from pkgs/servers/x11/xorg/xcb-util-xrm.nix rename to pkgs/unit/xc/xcbutilxrm/pkg-fun.nix diff --git a/pkgs/tools/misc/xcd/default.nix b/pkgs/unit/xc/xcd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xcd/default.nix rename to pkgs/unit/xc/xcd/pkg-fun.nix diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/unit/xc/xcftools/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/xcftools/default.nix rename to pkgs/unit/xc/xcftools/pkg-fun.nix diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/unit/xc/xcfun/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/chemistry/xcfun/default.nix rename to pkgs/unit/xc/xcfun/pkg-fun.nix diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/unit/xc/xchainkeys/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xchainkeys/default.nix rename to pkgs/unit/xc/xchainkeys/pkg-fun.nix diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/unit/xc/xchm/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xchm/default.nix rename to pkgs/unit/xc/xchm/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/unit/xc/xcircuit/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/xcircuit/default.nix rename to pkgs/unit/xc/xcircuit/pkg-fun.nix diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/unit/xc/xclip/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xclip/default.nix rename to pkgs/unit/xc/xclip/pkg-fun.nix diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/unit/xc/xcode-install/Gemfile similarity index 100% rename from pkgs/development/tools/xcode-install/Gemfile rename to pkgs/unit/xc/xcode-install/Gemfile diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/unit/xc/xcode-install/Gemfile.lock similarity index 100% rename from pkgs/development/tools/xcode-install/Gemfile.lock rename to pkgs/unit/xc/xcode-install/Gemfile.lock diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/unit/xc/xcode-install/gemset.nix similarity index 100% rename from pkgs/development/tools/xcode-install/gemset.nix rename to pkgs/unit/xc/xcode-install/gemset.nix diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/unit/xc/xcode-install/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/xcode-install/default.nix rename to pkgs/unit/xc/xcode-install/pkg-fun.nix diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/unit/xc/xcolor/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/xcolor/default.nix rename to pkgs/unit/xc/xcolor/pkg-fun.nix diff --git a/pkgs/games/xcowsay/default.nix b/pkgs/unit/xc/xcowsay/pkg-fun.nix similarity index 100% rename from pkgs/games/xcowsay/default.nix rename to pkgs/unit/xc/xcowsay/pkg-fun.nix diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/unit/xc/xcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xcp/default.nix rename to pkgs/unit/xc/xcp/pkg-fun.nix diff --git a/pkgs/applications/emulators/xcpc/default.nix b/pkgs/unit/xc/xcpc/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/xcpc/default.nix rename to pkgs/unit/xc/xcpc/pkg-fun.nix diff --git a/pkgs/development/tools/xcpretty/Gemfile b/pkgs/unit/xc/xcpretty/Gemfile similarity index 100% rename from pkgs/development/tools/xcpretty/Gemfile rename to pkgs/unit/xc/xcpretty/Gemfile diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/unit/xc/xcpretty/Gemfile.lock similarity index 100% rename from pkgs/development/tools/xcpretty/Gemfile.lock rename to pkgs/unit/xc/xcpretty/Gemfile.lock diff --git a/pkgs/development/tools/xcpretty/gemset.nix b/pkgs/unit/xc/xcpretty/gemset.nix similarity index 100% rename from pkgs/development/tools/xcpretty/gemset.nix rename to pkgs/unit/xc/xcpretty/gemset.nix diff --git a/pkgs/development/tools/xcpretty/default.nix b/pkgs/unit/xc/xcpretty/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/xcpretty/default.nix rename to pkgs/unit/xc/xcpretty/pkg-fun.nix diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/unit/xc/xcruiser/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xcruiser/default.nix rename to pkgs/unit/xc/xcruiser/pkg-fun.nix diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/unit/xc/xcur2png/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/xcur2png/default.nix rename to pkgs/unit/xc/xcur2png/pkg-fun.nix diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/unit/xc/xcwd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xcwd/default.nix rename to pkgs/unit/xc/xcwd/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/unit/xd/xd/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/xd/default.nix rename to pkgs/unit/xd/xd/pkg-fun.nix diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/unit/xd/xdaliclock/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xdaliclock/default.nix rename to pkgs/unit/xd/xdaliclock/pkg-fun.nix diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/unit/xd/xdelta/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/xdelta/default.nix rename to pkgs/unit/xd/xdelta/pkg-fun.nix diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/unit/xd/xdeltaUnstable/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/xdelta/unstable.nix rename to pkgs/unit/xd/xdeltaUnstable/pkg-fun.nix diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/unit/xd/xdg-dbus-proxy/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xdg-dbus-proxy/default.nix rename to pkgs/unit/xd/xdg-dbus-proxy/pkg-fun.nix diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/unit/xd/xdg-desktop-portal-gnome/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix rename to pkgs/unit/xd/xdg-desktop-portal-gnome/pkg-fun.nix diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/unit/xd/xdg-desktop-portal-gtk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix rename to pkgs/unit/xd/xdg-desktop-portal-gtk/pkg-fun.nix diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/unit/xd/xdg-desktop-portal-wlr/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix rename to pkgs/unit/xd/xdg-desktop-portal-wlr/pkg-fun.nix diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/unit/xd/xdg-launch/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xdg-launch/default.nix rename to pkgs/unit/xd/xdg-launch/pkg-fun.nix diff --git a/pkgs/tools/misc/xdg-ninja/default.nix b/pkgs/unit/xd/xdg-ninja/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xdg-ninja/default.nix rename to pkgs/unit/xd/xdg-ninja/pkg-fun.nix diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/unit/xd/xdg-user-dirs/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xdg-user-dirs/default.nix rename to pkgs/unit/xd/xdg-user-dirs/pkg-fun.nix diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/unit/xd/xdgmenumaker/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xdgmenumaker/default.nix rename to pkgs/unit/xd/xdgmenumaker/pkg-fun.nix diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/unit/xd/xdo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xdo/default.nix rename to pkgs/unit/xd/xdo/pkg-fun.nix diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/unit/xd/xdotool/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xdotool/default.nix rename to pkgs/unit/xd/xdotool/pkg-fun.nix diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/unit/xd/xdummy/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xdummy/default.nix rename to pkgs/unit/xd/xdummy/pkg-fun.nix diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/unit/xd/xdxf2slob/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xdxf2slob/default.nix rename to pkgs/unit/xd/xdxf2slob/pkg-fun.nix diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/unit/xe/xe-guest-utilities/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/xe-guest-utilities/default.nix rename to pkgs/unit/xe/xe-guest-utilities/pkg-fun.nix diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/unit/xe/xe/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/xe/default.nix rename to pkgs/unit/xe/xe/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/unit/xe/xearth/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/xearth/default.nix rename to pkgs/unit/xe/xearth/pkg-fun.nix diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/unit/xe/xed/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xed/default.nix rename to pkgs/unit/xe/xed/pkg-fun.nix diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/unit/xe/xedit/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/xedit/default.nix rename to pkgs/unit/xe/xedit/pkg-fun.nix diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/unit/xe/xenomapper/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/biology/xenomapper/default.nix rename to pkgs/unit/xe/xenomapper/pkg-fun.nix diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/unit/xe/xercesc/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xercesc/default.nix rename to pkgs/unit/xe/xercesc/pkg-fun.nix diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/unit/xf/xf86_input_cmt/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/xf86-input-cmt/default.nix rename to pkgs/unit/xf/xf86_input_cmt/pkg-fun.nix diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/unit/xf/xf86_input_wacom/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/xf86-input-wacom/default.nix rename to pkgs/unit/xf/xf86_input_wacom/pkg-fun.nix diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/unit/xf/xf86_video_nested/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/xf86-video-nested/default.nix rename to pkgs/unit/xf/xf86_video_nested/pkg-fun.nix diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/unit/xf/xfig/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/xfig/default.nix rename to pkgs/unit/xf/xfig/pkg-fun.nix diff --git a/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch b/pkgs/unit/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch similarity index 100% rename from pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch rename to pkgs/unit/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/unit/xf/xfitter/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/xfitter/default.nix rename to pkgs/unit/xf/xfitter/pkg-fun.nix diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/unit/xf/xflux/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xflux/default.nix rename to pkgs/unit/xf/xflux/pkg-fun.nix diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/unit/xf/xfontsel/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xfontsel/default.nix rename to pkgs/unit/xf/xfontsel/pkg-fun.nix diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/unit/xf/xfractint/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/xfractint/default.nix rename to pkgs/unit/xf/xfractint/pkg-fun.nix diff --git a/pkgs/tools/filesystems/xfsdump/default.nix b/pkgs/unit/xf/xfsdump/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/xfsdump/default.nix rename to pkgs/unit/xf/xfsdump/pkg-fun.nix diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/unit/xf/xfsprogs/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/xfsprogs/default.nix rename to pkgs/unit/xf/xfsprogs/pkg-fun.nix diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/unit/xf/xfstests/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xfstests/default.nix rename to pkgs/unit/xf/xfstests/pkg-fun.nix diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/unit/xg/xgboost/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xgboost/default.nix rename to pkgs/unit/xg/xgboost/pkg-fun.nix diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/unit/xg/xgeometry-select/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xgeometry-select/default.nix rename to pkgs/unit/xg/xgeometry-select/pkg-fun.nix diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/unit/xh/xhtml1/pkg-fun.nix similarity index 100% rename from pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix rename to pkgs/unit/xh/xhtml1/pkg-fun.nix diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/unit/xi/xib2nib/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/xib2nib/default.nix rename to pkgs/unit/xi/xib2nib/pkg-fun.nix diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/unit/xi/xiccd/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xiccd/default.nix rename to pkgs/unit/xi/xiccd/pkg-fun.nix diff --git a/pkgs/tools/misc/xilinx-bootgen/default.nix b/pkgs/unit/xi/xilinx-bootgen/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xilinx-bootgen/default.nix rename to pkgs/unit/xi/xilinx-bootgen/pkg-fun.nix diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/unit/xi/xine-lib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xine-lib/default.nix rename to pkgs/unit/xi/xine-lib/pkg-fun.nix diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/unit/xi/xine-ui/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/xine-ui/default.nix rename to pkgs/unit/xi/xine-ui/pkg-fun.nix diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/unit/xi/xinetd/pkg-fun.nix similarity index 100% rename from pkgs/servers/xinetd/default.nix rename to pkgs/unit/xi/xinetd/pkg-fun.nix diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/unit/xi/xinput_calibrator/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xinput_calibrator/default.nix rename to pkgs/unit/xi/xinput_calibrator/pkg-fun.nix diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/unit/xi/xits-math/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/xits-math/default.nix rename to pkgs/unit/xi/xits-math/pkg-fun.nix diff --git a/pkgs/games/xivlauncher/deps.nix b/pkgs/unit/xi/xivlauncher/deps.nix similarity index 100% rename from pkgs/games/xivlauncher/deps.nix rename to pkgs/unit/xi/xivlauncher/deps.nix diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/unit/xi/xivlauncher/pkg-fun.nix similarity index 100% rename from pkgs/games/xivlauncher/default.nix rename to pkgs/unit/xi/xivlauncher/pkg-fun.nix diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/unit/xj/xjadeo/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/xjadeo/default.nix rename to pkgs/unit/xj/xjadeo/pkg-fun.nix diff --git a/pkgs/tools/misc/xjobs/default.nix b/pkgs/unit/xj/xjobs/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xjobs/default.nix rename to pkgs/unit/xj/xjobs/pkg-fun.nix diff --git a/pkgs/games/xjump/darwin.patch b/pkgs/unit/xj/xjump/darwin.patch similarity index 100% rename from pkgs/games/xjump/darwin.patch rename to pkgs/unit/xj/xjump/darwin.patch diff --git a/pkgs/games/xjump/default.nix b/pkgs/unit/xj/xjump/pkg-fun.nix similarity index 100% rename from pkgs/games/xjump/default.nix rename to pkgs/unit/xj/xjump/pkg-fun.nix diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/unit/xk/xkb-switch-i3/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xkb-switch-i3/default.nix rename to pkgs/unit/xk/xkb-switch-i3/pkg-fun.nix diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/unit/xk/xkb-switch/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xkb-switch/default.nix rename to pkgs/unit/xk/xkb-switch/pkg-fun.nix diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/unit/xk/xkbd/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xkbd/default.nix rename to pkgs/unit/xk/xkbd/pkg-fun.nix diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/unit/xk/xkblayout-state/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xkblayout-state/default.nix rename to pkgs/unit/xk/xkblayout-state/pkg-fun.nix diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/unit/xk/xkbmon/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xkbmon/default.nix rename to pkgs/unit/xk/xkbmon/pkg-fun.nix diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/unit/xk/xkbset/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xkbset/default.nix rename to pkgs/unit/xk/xkbset/pkg-fun.nix diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/unit/xk/xkbvalidate/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xkbvalidate/default.nix rename to pkgs/unit/xk/xkbvalidate/pkg-fun.nix diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/unit/xk/xkbvalidate/xkbvalidate.c similarity index 100% rename from pkgs/tools/X11/xkbvalidate/xkbvalidate.c rename to pkgs/unit/xk/xkbvalidate/xkbvalidate.c diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/unit/xk/xkcd-font/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/xkcd-font/default.nix rename to pkgs/unit/xk/xkcd-font/pkg-fun.nix diff --git a/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py b/pkgs/unit/xk/xkeysnail/browser-emacs-bindings.py similarity index 100% rename from pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py rename to pkgs/unit/xk/xkeysnail/browser-emacs-bindings.py diff --git a/pkgs/tools/X11/xkeysnail/default.nix b/pkgs/unit/xk/xkeysnail/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xkeysnail/default.nix rename to pkgs/unit/xk/xkeysnail/pkg-fun.nix diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/unit/xl/xl2tpd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/xl2tpd/default.nix rename to pkgs/unit/xl/xl2tpd/pkg-fun.nix diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/unit/xl/xlayoutdisplay/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xlayoutdisplay/default.nix rename to pkgs/unit/xl/xlayoutdisplay/pkg-fun.nix diff --git a/pkgs/applications/graphics/xlife/default.nix b/pkgs/unit/xl/xlife/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/xlife/default.nix rename to pkgs/unit/xl/xlife/pkg-fun.nix diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/unit/xl/xloadimage/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xloadimage/default.nix rename to pkgs/unit/xl/xloadimage/pkg-fun.nix diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/unit/xl/xlockmore/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/xlockmore/default.nix rename to pkgs/unit/xl/xlockmore/pkg-fun.nix diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/unit/xl/xlog/pkg-fun.nix similarity index 100% rename from pkgs/applications/radio/xlog/default.nix rename to pkgs/unit/xl/xlog/pkg-fun.nix diff --git a/pkgs/tools/X11/xlogo/default.nix b/pkgs/unit/xl/xlogo/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xlogo/default.nix rename to pkgs/unit/xl/xlogo/pkg-fun.nix diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/unit/xl/xlslib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xlslib/default.nix rename to pkgs/unit/xl/xlslib/pkg-fun.nix diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/unit/xl/xlsxgrep/pkg-fun.nix similarity index 100% rename from pkgs/applications/search/xlsxgrep/default.nix rename to pkgs/unit/xl/xlsxgrep/pkg-fun.nix diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/unit/xm/xmacro/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xmacro/default.nix rename to pkgs/unit/xm/xmacro/pkg-fun.nix diff --git a/pkgs/games/xmage/default.nix b/pkgs/unit/xm/xmage/pkg-fun.nix similarity index 100% rename from pkgs/games/xmage/default.nix rename to pkgs/unit/xm/xmage/pkg-fun.nix diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/unit/xm/xmagnify/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xmagnify/default.nix rename to pkgs/unit/xm/xmagnify/pkg-fun.nix diff --git a/pkgs/tools/X11/xmcp/default.nix b/pkgs/unit/xm/xmcp/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xmcp/default.nix rename to pkgs/unit/xm/xmcp/pkg-fun.nix diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/unit/xm/xmedcon/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/medicine/xmedcon/default.nix rename to pkgs/unit/xm/xmedcon/pkg-fun.nix diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/unit/xm/xmenu/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xmenu/default.nix rename to pkgs/unit/xm/xmenu/pkg-fun.nix diff --git a/pkgs/applications/misc/xmind/java-env-config-fixes.patch b/pkgs/unit/xm/xmind/java-env-config-fixes.patch similarity index 100% rename from pkgs/applications/misc/xmind/java-env-config-fixes.patch rename to pkgs/unit/xm/xmind/java-env-config-fixes.patch diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/unit/xm/xmind/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xmind/default.nix rename to pkgs/unit/xm/xmind/pkg-fun.nix diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/unit/xm/xml-security-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xml-security-c/default.nix rename to pkgs/unit/xm/xml-security-c/pkg-fun.nix diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/unit/xm/xml-tooling-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xml-tooling-c/default.nix rename to pkgs/unit/xm/xml-tooling-c/pkg-fun.nix diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/unit/xm/xml2/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/xml2/default.nix rename to pkgs/unit/xm/xml2/pkg-fun.nix diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/unit/xm/xmlada/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/ada/xmlada/default.nix rename to pkgs/unit/xm/xmlada/pkg-fun.nix diff --git a/pkgs/tools/misc/xmlbeans/default.nix b/pkgs/unit/xm/xmlbeans/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xmlbeans/default.nix rename to pkgs/unit/xm/xmlbeans/pkg-fun.nix diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/unit/xm/xmlformat/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/xmlformat/default.nix rename to pkgs/unit/xm/xmlformat/pkg-fun.nix diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/unit/xm/xmlindent/pkg-fun.nix similarity index 100% rename from pkgs/development/web/xmlindent/default.nix rename to pkgs/unit/xm/xmlindent/pkg-fun.nix diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/unit/xm/xmloscopy/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/xmloscopy/default.nix rename to pkgs/unit/xm/xmloscopy/pkg-fun.nix diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/unit/xm/xmlroff/pkg-fun.nix similarity index 100% rename from pkgs/tools/typesetting/xmlroff/default.nix rename to pkgs/unit/xm/xmlroff/pkg-fun.nix diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/unit/xm/xmlrpc_c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xmlrpc-c/default.nix rename to pkgs/unit/xm/xmlrpc_c/pkg-fun.nix diff --git a/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch b/pkgs/unit/xm/xmlsec/lt_dladdsearchdir.patch similarity index 100% rename from pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch rename to pkgs/unit/xm/xmlsec/lt_dladdsearchdir.patch diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/unit/xm/xmlsec/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xmlsec/default.nix rename to pkgs/unit/xm/xmlsec/pkg-fun.nix diff --git a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/pkgs/unit/xm/xmlsec/remove_bsd_base64_decode_flag.patch similarity index 100% rename from pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch rename to pkgs/unit/xm/xmlsec/remove_bsd_base64_decode_flag.patch diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/unit/xm/xmlstarlet/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xml/xmlstarlet/default.nix rename to pkgs/unit/xm/xmlstarlet/pkg-fun.nix diff --git a/pkgs/tools/misc/xmonad-log/deps.nix b/pkgs/unit/xm/xmonad-log/deps.nix similarity index 100% rename from pkgs/tools/misc/xmonad-log/deps.nix rename to pkgs/unit/xm/xmonad-log/deps.nix diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/unit/xm/xmonad-log/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xmonad-log/default.nix rename to pkgs/unit/xm/xmonad-log/pkg-fun.nix diff --git a/pkgs/games/xmoto/default.nix b/pkgs/unit/xm/xmoto/pkg-fun.nix similarity index 100% rename from pkgs/games/xmoto/default.nix rename to pkgs/unit/xm/xmoto/pkg-fun.nix diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/unit/xm/xmountains/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/xmountains/default.nix rename to pkgs/unit/xm/xmountains/pkg-fun.nix diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/unit/xm/xmousepasteblock/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xmousepasteblock/default.nix rename to pkgs/unit/xm/xmousepasteblock/pkg-fun.nix diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/unit/xm/xmp/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/xmp/default.nix rename to pkgs/unit/xm/xmp/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/xmppc/default.nix b/pkgs/unit/xm/xmppc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/xmppc/default.nix rename to pkgs/unit/xm/xmppc/pkg-fun.nix diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/unit/xm/xmr-stak/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xmr-stak/default.nix rename to pkgs/unit/xm/xmr-stak/pkg-fun.nix diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/unit/xm/xmrig-mo/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xmrig/moneroocean.nix rename to pkgs/unit/xm/xmrig-mo/pkg-fun.nix diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/unit/xm/xmrig-proxy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xmrig/proxy.nix rename to pkgs/unit/xm/xmrig-proxy/pkg-fun.nix diff --git a/pkgs/applications/misc/xmrig/donate-level.patch b/pkgs/unit/xm/xmrig/donate-level.patch similarity index 100% rename from pkgs/applications/misc/xmrig/donate-level.patch rename to pkgs/unit/xm/xmrig/donate-level.patch diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/unit/xm/xmrig/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xmrig/default.nix rename to pkgs/unit/xm/xmrig/pkg-fun.nix diff --git a/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch b/pkgs/unit/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch similarity index 100% rename from pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch rename to pkgs/unit/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/unit/xn/xnbd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/xnbd/default.nix rename to pkgs/unit/xn/xnbd/pkg-fun.nix diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/unit/xn/xnec2c/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/physics/xnec2c/default.nix rename to pkgs/unit/xn/xnec2c/pkg-fun.nix diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/unit/xn/xnee/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xnee/default.nix rename to pkgs/unit/xn/xnee/pkg-fun.nix diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/unit/xn/xneur/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xneur/default.nix rename to pkgs/unit/xn/xneur/pkg-fun.nix diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/unit/xn/xnotify/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xnotify/default.nix rename to pkgs/unit/xn/xnotify/pkg-fun.nix diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/unit/xo/xob/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xob/default.nix rename to pkgs/unit/xo/xob/pkg-fun.nix diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/unit/xo/xonsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/xonsh/default.nix rename to pkgs/unit/xo/xonsh/pkg-fun.nix diff --git a/pkgs/tools/security/xorex/default.nix b/pkgs/unit/xo/xorex/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/xorex/default.nix rename to pkgs/unit/xo/xorex/pkg-fun.nix diff --git a/pkgs/development/tools/misc/xorg-autoconf/default.nix b/pkgs/unit/xo/xorg-autoconf/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/xorg-autoconf/default.nix rename to pkgs/unit/xo/xorg-autoconf/pkg-fun.nix diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/unit/xo/xorg-rgb/pkg-fun.nix similarity index 100% rename from pkgs/data/misc/xorg-rgb/default.nix rename to pkgs/unit/xo/xorg-rgb/pkg-fun.nix diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/unit/xo/xorg_sys_opengl/builder.sh similarity index 100% rename from pkgs/os-specific/linux/opengl/xorg-sys/builder.sh rename to pkgs/unit/xo/xorg_sys_opengl/builder.sh diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/unit/xo/xorg_sys_opengl/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/opengl/xorg-sys/default.nix rename to pkgs/unit/xo/xorg_sys_opengl/pkg-fun.nix diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/unit/xo/xorriso/pkg-fun.nix similarity index 100% rename from pkgs/tools/cd-dvd/xorriso/default.nix rename to pkgs/unit/xo/xorriso/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/unit/xo/xoscope/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/xoscope/default.nix rename to pkgs/unit/xo/xoscope/pkg-fun.nix diff --git a/pkgs/misc/xosd/default.nix b/pkgs/unit/xo/xosd/pkg-fun.nix similarity index 100% rename from pkgs/misc/xosd/default.nix rename to pkgs/unit/xo/xosd/pkg-fun.nix diff --git a/pkgs/tools/X11/xosview/default.nix b/pkgs/unit/xo/xosview/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xosview/default.nix rename to pkgs/unit/xo/xosview/pkg-fun.nix diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/unit/xo/xosview2/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xosview2/default.nix rename to pkgs/unit/xo/xosview2/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/unit/xo/xow_dongle-firmware/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix rename to pkgs/unit/xo/xow_dongle-firmware/pkg-fun.nix diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/unit/xp/xpad/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xpad/default.nix rename to pkgs/unit/xp/xpad/pkg-fun.nix diff --git a/pkgs/tools/text/xpaste/default.nix b/pkgs/unit/xp/xpaste/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xpaste/default.nix rename to pkgs/unit/xp/xpaste/pkg-fun.nix diff --git a/pkgs/games/xpilot/default.nix b/pkgs/unit/xp/xpilot-ng/pkg-fun.nix similarity index 100% rename from pkgs/games/xpilot/default.nix rename to pkgs/unit/xp/xpilot-ng/pkg-fun.nix diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/unit/xp/xplanet/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/astronomy/xplanet/default.nix rename to pkgs/unit/xp/xplanet/pkg-fun.nix diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/unit/xp/xplr/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xplr/default.nix rename to pkgs/unit/xp/xplr/pkg-fun.nix diff --git a/pkgs/tools/X11/xplugd/default.nix b/pkgs/unit/xp/xplugd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xplugd/default.nix rename to pkgs/unit/xp/xplugd/pkg-fun.nix diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/unit/xp/xpointerbarrier/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xpointerbarrier/default.nix rename to pkgs/unit/xp/xpointerbarrier/pkg-fun.nix diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/unit/xp/xprintidle-ng/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xprintidle-ng/default.nix rename to pkgs/unit/xp/xprintidle-ng/pkg-fun.nix diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/unit/xp/xprintidle/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xprintidle/default.nix rename to pkgs/unit/xp/xprintidle/pkg-fun.nix diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/unit/xp/xprompt/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xprompt/default.nix rename to pkgs/unit/xp/xprompt/pkg-fun.nix diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/unit/xp/xpwn/pkg-fun.nix similarity index 100% rename from pkgs/development/mobile/xpwn/default.nix rename to pkgs/unit/xp/xpwn/pkg-fun.nix diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/unit/xq/xq/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xq/default.nix rename to pkgs/unit/xq/xq/pkg-fun.nix diff --git a/pkgs/servers/x11/xquartz/X11 b/pkgs/unit/xq/xquartz/X11 similarity index 100% rename from pkgs/servers/x11/xquartz/X11 rename to pkgs/unit/xq/xquartz/X11 diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/unit/xq/xquartz/font_cache similarity index 100% rename from pkgs/servers/x11/xquartz/font_cache rename to pkgs/unit/xq/xquartz/font_cache diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist b/pkgs/unit/xq/xquartz/org.nixos.xquartz.privileged_startx.plist similarity index 100% rename from pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist rename to pkgs/unit/xq/xquartz/org.nixos.xquartz.privileged_startx.plist diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist b/pkgs/unit/xq/xquartz/org.nixos.xquartz.startx.plist similarity index 100% rename from pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist rename to pkgs/unit/xq/xquartz/org.nixos.xquartz.startx.plist diff --git a/pkgs/servers/x11/xquartz/patch_plist.rb b/pkgs/unit/xq/xquartz/patch_plist.rb similarity index 100% rename from pkgs/servers/x11/xquartz/patch_plist.rb rename to pkgs/unit/xq/xquartz/patch_plist.rb diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/unit/xq/xquartz/pkg-fun.nix similarity index 100% rename from pkgs/servers/x11/xquartz/default.nix rename to pkgs/unit/xq/xquartz/pkg-fun.nix diff --git a/pkgs/servers/x11/xquartz/privileged b/pkgs/unit/xq/xquartz/privileged similarity index 100% rename from pkgs/servers/x11/xquartz/privileged rename to pkgs/unit/xq/xquartz/privileged diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/unit/xq/xquartz/startx similarity index 100% rename from pkgs/servers/x11/xquartz/startx rename to pkgs/unit/xq/xquartz/startx diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/pkgs/unit/xq/xquartz/system-fonts.nix similarity index 100% rename from pkgs/servers/x11/xquartz/system-fonts.nix rename to pkgs/unit/xq/xquartz/system-fonts.nix diff --git a/pkgs/servers/x11/xquartz/xinitrc b/pkgs/unit/xq/xquartz/xinitrc similarity index 100% rename from pkgs/servers/x11/xquartz/xinitrc rename to pkgs/unit/xq/xquartz/xinitrc diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/unit/xr/xrandr-invert-colors/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xrandr-invert-colors/default.nix rename to pkgs/unit/xr/xrandr-invert-colors/pkg-fun.nix diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/unit/xr/xray/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/xray/default.nix rename to pkgs/unit/xr/xray/pkg-fun.nix diff --git a/pkgs/applications/networking/remote/xrdp/dynamic_config.patch b/pkgs/unit/xr/xrdp/dynamic_config.patch similarity index 100% rename from pkgs/applications/networking/remote/xrdp/dynamic_config.patch rename to pkgs/unit/xr/xrdp/dynamic_config.patch diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/unit/xr/xrdp/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/remote/xrdp/default.nix rename to pkgs/unit/xr/xrdp/pkg-fun.nix diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/unit/xr/xrectsel/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xrectsel/default.nix rename to pkgs/unit/xr/xrectsel/pkg-fun.nix diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/unit/xr/xrestop/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xrestop/default.nix rename to pkgs/unit/xr/xrestop/pkg-fun.nix diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/unit/xr/xrgears/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/xrgears/default.nix rename to pkgs/unit/xr/xrgears/pkg-fun.nix diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/unit/xr/xrootd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/xrootd/default.nix rename to pkgs/unit/xr/xrootd/pkg-fun.nix diff --git a/pkgs/tools/networking/xrootd/test-runner.nix b/pkgs/unit/xr/xrootd/test-runner.nix similarity index 100% rename from pkgs/tools/networking/xrootd/test-runner.nix rename to pkgs/unit/xr/xrootd/test-runner.nix diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/unit/xr/xrq/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xrq/default.nix rename to pkgs/unit/xr/xrq/pkg-fun.nix diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/unit/xs/xscast/pkg-fun.nix similarity index 100% rename from pkgs/applications/video/xscast/default.nix rename to pkgs/unit/xs/xscast/pkg-fun.nix diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/unit/xs/xschem/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/electronics/xschem/default.nix rename to pkgs/unit/xs/xschem/pkg-fun.nix diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/unit/xs/xscope/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xscope/default.nix rename to pkgs/unit/xs/xscope/pkg-fun.nix diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/unit/xs/xscreensaver/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/xscreensaver/default.nix rename to pkgs/unit/xs/xscreensaver/pkg-fun.nix diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/unit/xs/xsecurelock/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xsecurelock/default.nix rename to pkgs/unit/xs/xsecurelock/pkg-fun.nix diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/unit/xs/xsel/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xsel/default.nix rename to pkgs/unit/xs/xsel/pkg-fun.nix diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/unit/xs/xsensors/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/xsensors/default.nix rename to pkgs/unit/xs/xsensors/pkg-fun.nix diff --git a/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch b/pkgs/unit/xs/xsensors/remove-unused-variables.patch similarity index 100% rename from pkgs/os-specific/linux/xsensors/remove-unused-variables.patch rename to pkgs/unit/xs/xsensors/remove-unused-variables.patch diff --git a/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch b/pkgs/unit/xs/xsensors/replace-deprecated-gtk.patch similarity index 100% rename from pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch rename to pkgs/unit/xs/xsensors/replace-deprecated-gtk.patch diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/unit/xs/xsettingsd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xsettingsd/default.nix rename to pkgs/unit/xs/xsettingsd/pkg-fun.nix diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/unit/xs/xsimd/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xsimd/default.nix rename to pkgs/unit/xs/xsimd/pkg-fun.nix diff --git a/pkgs/games/xskat/default.nix b/pkgs/unit/xs/xskat/pkg-fun.nix similarity index 100% rename from pkgs/games/xskat/default.nix rename to pkgs/unit/xs/xskat/pkg-fun.nix diff --git a/pkgs/games/xsnow/default.nix b/pkgs/unit/xs/xsnow/pkg-fun.nix similarity index 100% rename from pkgs/games/xsnow/default.nix rename to pkgs/unit/xs/xsnow/pkg-fun.nix diff --git a/pkgs/games/xsok/default.nix b/pkgs/unit/xs/xsok/pkg-fun.nix similarity index 100% rename from pkgs/games/xsok/default.nix rename to pkgs/unit/xs/xsok/pkg-fun.nix diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/unit/xs/xsokoban/pkg-fun.nix similarity index 100% rename from pkgs/games/xsokoban/default.nix rename to pkgs/unit/xs/xsokoban/pkg-fun.nix diff --git a/pkgs/os-specific/linux/xsos/default.nix b/pkgs/unit/xs/xsos/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/xsos/default.nix rename to pkgs/unit/xs/xsos/pkg-fun.nix diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/unit/xs/xspim/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/xspim/default.nix rename to pkgs/unit/xs/xspim/pkg-fun.nix diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/unit/xs/xss-lock/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/xss-lock/default.nix rename to pkgs/unit/xs/xss-lock/pkg-fun.nix diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/unit/xs/xssproxy/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/xssproxy/default.nix rename to pkgs/unit/xs/xssproxy/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/unit/xs/xst/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/st/xst.nix rename to pkgs/unit/xs/xst/pkg-fun.nix diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/unit/xs/xstow/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xstow/default.nix rename to pkgs/unit/xs/xstow/pkg-fun.nix diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/unit/xs/xsuspender/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xsuspender/default.nix rename to pkgs/unit/xs/xsuspender/pkg-fun.nix diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/unit/xs/xsynth_dssi/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/xsynth-dssi/default.nix rename to pkgs/unit/xs/xsynth_dssi/pkg-fun.nix diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/unit/xt/xteddy/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xteddy/default.nix rename to pkgs/unit/xt/xteddy/pkg-fun.nix diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/unit/xt/xtensor/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xtensor/default.nix rename to pkgs/unit/xt/xtensor/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/unit/xt/xterm/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/xterm/default.nix rename to pkgs/unit/xt/xterm/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch b/pkgs/unit/xt/xterm/sixel-256.support.patch similarity index 100% rename from pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch rename to pkgs/unit/xt/xterm/sixel-256.support.patch diff --git a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/pkgs/unit/xt/xtermcontrol/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/xtermcontrol/default.nix rename to pkgs/unit/xt/xtermcontrol/pkg-fun.nix diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/unit/xt/xtitle/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xtitle/default.nix rename to pkgs/unit/xt/xtitle/pkg-fun.nix diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/unit/xt/xtl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xtl/default.nix rename to pkgs/unit/xt/xtl/pkg-fun.nix diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/unit/xt/xtrace/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xtrace/default.nix rename to pkgs/unit/xt/xtrace/pkg-fun.nix diff --git a/pkgs/games/xtris/default.nix b/pkgs/unit/xt/xtris/pkg-fun.nix similarity index 100% rename from pkgs/games/xtris/default.nix rename to pkgs/unit/xt/xtris/pkg-fun.nix diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/unit/xt/xtrlock-pam/pkg-fun.nix similarity index 100% rename from pkgs/misc/screensavers/xtrlock-pam/default.nix rename to pkgs/unit/xt/xtrlock-pam/pkg-fun.nix diff --git a/pkgs/tools/archivers/xtrt/default.nix b/pkgs/unit/xt/xtrt/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/xtrt/default.nix rename to pkgs/unit/xt/xtrt/pkg-fun.nix diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/unit/xt/xtruss/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xtruss/default.nix rename to pkgs/unit/xt/xtruss/pkg-fun.nix diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/unit/xt/xtuner/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/xtuner/default.nix rename to pkgs/unit/xt/xtuner/pkg-fun.nix diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/unit/xu/xurls/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/xurls/default.nix rename to pkgs/unit/xu/xurls/pkg-fun.nix diff --git a/pkgs/tools/virtualization/xva-img/default.nix b/pkgs/unit/xv/xva-img/pkg-fun.nix similarity index 100% rename from pkgs/tools/virtualization/xva-img/default.nix rename to pkgs/unit/xv/xva-img/pkg-fun.nix diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/unit/xv/xvidcore/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xvidcore/default.nix rename to pkgs/unit/xv/xvidcore/pkg-fun.nix diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/unit/xv/xvkbd/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xvkbd/default.nix rename to pkgs/unit/xv/xvkbd/pkg-fun.nix diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/unit/xw/xwallpaper/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xwallpaper/default.nix rename to pkgs/unit/xw/xwallpaper/pkg-fun.nix diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/unit/xw/xwayland/pkg-fun.nix similarity index 100% rename from pkgs/servers/x11/xorg/xwayland.nix rename to pkgs/unit/xw/xwayland/pkg-fun.nix diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/unit/xw/xwiimote/pkg-fun.nix similarity index 100% rename from pkgs/misc/drivers/xwiimote/default.nix rename to pkgs/unit/xw/xwiimote/pkg-fun.nix diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/unit/xw/xwinmosaic/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xwinmosaic/default.nix rename to pkgs/unit/xw/xwinmosaic/pkg-fun.nix diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/unit/xw/xwinwrap/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xwinwrap/default.nix rename to pkgs/unit/xw/xwinwrap/pkg-fun.nix diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/unit/xx/xxHash/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xxHash/default.nix rename to pkgs/unit/xx/xxHash/pkg-fun.nix diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/unit/xx/xxe-pe/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/xxe-pe/default.nix rename to pkgs/unit/xx/xxe-pe/pkg-fun.nix diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/unit/xx/xxgdb/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/xxgdb/default.nix rename to pkgs/unit/xx/xxgdb/pkg-fun.nix diff --git a/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch b/pkgs/unit/xx/xxgdb/xxgdb-pty.patch similarity index 100% rename from pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch rename to pkgs/unit/xx/xxgdb/xxgdb-pty.patch diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/unit/xx/xxh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/xxh/default.nix rename to pkgs/unit/xx/xxh/pkg-fun.nix diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/unit/xx/xxkb/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/xxkb/default.nix rename to pkgs/unit/xx/xxkb/pkg-fun.nix diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/unit/xx/xxv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/xxv/default.nix rename to pkgs/unit/xx/xxv/pkg-fun.nix diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/unit/xy/xylib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/xylib/default.nix rename to pkgs/unit/xy/xylib/pkg-fun.nix diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/unit/xz/xz/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/xz/default.nix rename to pkgs/unit/xz/xz/pkg-fun.nix diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/unit/xz/xzgv/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/xzgv/default.nix rename to pkgs/unit/xz/xzgv/pkg-fun.nix diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/unit/xz/xzoom/pkg-fun.nix similarity index 100% rename from pkgs/tools/X11/xzoom/default.nix rename to pkgs/unit/xz/xzoom/pkg-fun.nix diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/unit/ya/yabasic/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/yabasic/default.nix rename to pkgs/unit/ya/yabasic/pkg-fun.nix diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/unit/ya/yad/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yad/default.nix rename to pkgs/unit/ya/yad/pkg-fun.nix diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/unit/ya/yadm/pkg-fun.nix similarity index 100% rename from pkgs/applications/version-management/yadm/default.nix rename to pkgs/unit/ya/yadm/pkg-fun.nix diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/unit/ya/yaft/pkg-fun.nix similarity index 100% rename from pkgs/applications/terminal-emulators/yaft/default.nix rename to pkgs/unit/ya/yaft/pkg-fun.nix diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/unit/ya/yajl/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/yajl/default.nix rename to pkgs/unit/ya/yajl/pkg-fun.nix diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/unit/ya/yajsv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yajsv/default.nix rename to pkgs/unit/ya/yajsv/pkg-fun.nix diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/unit/ya/yallback/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/analysis/yallback/default.nix rename to pkgs/unit/ya/yallback/pkg-fun.nix diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/unit/ya/yambar/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/yambar/default.nix rename to pkgs/unit/ya/yambar/pkg-fun.nix diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/unit/ya/yamdi/pkg-fun.nix similarity index 100% rename from pkgs/tools/video/yamdi/default.nix rename to pkgs/unit/ya/yamdi/pkg-fun.nix diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/unit/ya/yaml-merge/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/yaml-merge/default.nix rename to pkgs/unit/ya/yaml-merge/pkg-fun.nix diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/unit/ya/yaml2json/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/yaml2json/default.nix rename to pkgs/unit/ya/yaml2json/pkg-fun.nix diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/unit/ya/yamlpath/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/yamlpath/default.nix rename to pkgs/unit/ya/yamlpath/pkg-fun.nix diff --git a/pkgs/applications/audio/yams/default.nix b/pkgs/unit/ya/yams/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/yams/default.nix rename to pkgs/unit/ya/yams/pkg-fun.nix diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/unit/ya/yandex-browser/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/browsers/yandex-browser/default.nix rename to pkgs/unit/ya/yandex-browser/pkg-fun.nix diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/unit/ya/yandex-disk/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/yandex-disk/default.nix rename to pkgs/unit/ya/yandex-disk/pkg-fun.nix diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/unit/ya/yank/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yank/default.nix rename to pkgs/unit/ya/yank/pkg-fun.nix diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/unit/ya/yanone-kaffeesatz/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/yanone-kaffeesatz/default.nix rename to pkgs/unit/ya/yanone-kaffeesatz/pkg-fun.nix diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/unit/ya/yap/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/yap/default.nix rename to pkgs/unit/ya/yap/pkg-fun.nix diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/unit/ya/yapesdl/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/yapesdl/default.nix rename to pkgs/unit/ya/yapesdl/pkg-fun.nix diff --git a/pkgs/tools/security/yarGen/default.nix b/pkgs/unit/ya/yarGen/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yarGen/default.nix rename to pkgs/unit/ya/yarGen/pkg-fun.nix diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/unit/ya/yara/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yara/default.nix rename to pkgs/unit/ya/yara/pkg-fun.nix diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/unit/ya/yarn-bash-completion/pkg-fun.nix similarity index 100% rename from pkgs/shells/bash/yarn-completion/default.nix rename to pkgs/unit/ya/yarn-bash-completion/pkg-fun.nix diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/unit/ya/yarn/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/yarn/default.nix rename to pkgs/unit/ya/yarn/pkg-fun.nix diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/unit/ya/yarp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/robotics/yarp/default.nix rename to pkgs/unit/ya/yarp/pkg-fun.nix diff --git a/pkgs/applications/networking/feedreaders/yarr/default.nix b/pkgs/unit/ya/yarr/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/feedreaders/yarr/default.nix rename to pkgs/unit/ya/yarr/pkg-fun.nix diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/unit/ya/yaru-remix-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/yaru-remix/default.nix rename to pkgs/unit/ya/yaru-remix-theme/pkg-fun.nix diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/unit/ya/yaru-theme/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/yaru/default.nix rename to pkgs/unit/ya/yaru-theme/pkg-fun.nix diff --git a/pkgs/development/libraries/yascreen/default.nix b/pkgs/unit/ya/yascreen/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/yascreen/default.nix rename to pkgs/unit/ya/yascreen/pkg-fun.nix diff --git a/pkgs/shells/yash/default.nix b/pkgs/unit/ya/yash/pkg-fun.nix similarity index 100% rename from pkgs/shells/yash/default.nix rename to pkgs/unit/ya/yash/pkg-fun.nix diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/unit/ya/yasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/yasm/default.nix rename to pkgs/unit/ya/yasm/pkg-fun.nix diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch b/pkgs/unit/ya/yasr/10_fix_openpty_forkpty_declarations.patch similarity index 100% rename from pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch rename to pkgs/unit/ya/yasr/10_fix_openpty_forkpty_declarations.patch diff --git a/pkgs/applications/audio/yasr/20_maxpathlen.patch b/pkgs/unit/ya/yasr/20_maxpathlen.patch similarity index 100% rename from pkgs/applications/audio/yasr/20_maxpathlen.patch rename to pkgs/unit/ya/yasr/20_maxpathlen.patch diff --git a/pkgs/applications/audio/yasr/30_conf.patch b/pkgs/unit/ya/yasr/30_conf.patch similarity index 100% rename from pkgs/applications/audio/yasr/30_conf.patch rename to pkgs/unit/ya/yasr/30_conf.patch diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch b/pkgs/unit/ya/yasr/40_dectalk_extended_chars.patch similarity index 100% rename from pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch rename to pkgs/unit/ya/yasr/40_dectalk_extended_chars.patch diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/unit/ya/yasr/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/yasr/default.nix rename to pkgs/unit/ya/yasr/pkg-fun.nix diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/unit/ya/yate/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/yate/default.nix rename to pkgs/unit/ya/yate/pkg-fun.nix diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/unit/ya/yaup/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/yaup/default.nix rename to pkgs/unit/ya/yaup/pkg-fun.nix diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/unit/ya/yaws/pkg-fun.nix similarity index 100% rename from pkgs/servers/http/yaws/default.nix rename to pkgs/unit/ya/yaws/pkg-fun.nix diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/unit/ya/yaxg/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/yaxg/default.nix rename to pkgs/unit/ya/yaxg/pkg-fun.nix diff --git a/pkgs/development/libraries/yder/fix-pkgconfig.patch b/pkgs/unit/yd/yder/fix-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/yder/fix-pkgconfig.patch rename to pkgs/unit/yd/yder/fix-pkgconfig.patch diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/unit/yd/yder/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/yder/default.nix rename to pkgs/unit/yd/yder/pkg-fun.nix diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/unit/yd/ydict/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/ydict/default.nix rename to pkgs/unit/yd/ydict/pkg-fun.nix diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/unit/yd/ydotool/pkg-fun.nix similarity index 100% rename from pkgs/tools/wayland/ydotool/default.nix rename to pkgs/unit/yd/ydotool/pkg-fun.nix diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/unit/ye/yeahwm/pkg-fun.nix similarity index 100% rename from pkgs/applications/window-managers/yeahwm/default.nix rename to pkgs/unit/ye/yeahwm/pkg-fun.nix diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/unit/ye/yed/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/yed/default.nix rename to pkgs/unit/ye/yed/pkg-fun.nix diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/unit/ye/yeetgif/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/yeetgif/default.nix rename to pkgs/unit/ye/yeetgif/pkg-fun.nix diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/unit/ye/yelp-tools/pkg-fun.nix similarity index 100% rename from pkgs/development/misc/yelp-tools/default.nix rename to pkgs/unit/ye/yelp-tools/pkg-fun.nix diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/unit/ye/yersinia/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yersinia/default.nix rename to pkgs/unit/ye/yersinia/pkg-fun.nix diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/unit/ye/yeshup/pkg-fun.nix similarity index 100% rename from pkgs/tools/system/yeshup/default.nix rename to pkgs/unit/ye/yeshup/pkg-fun.nix diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/unit/ye/yex-lang/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/yex-lang/default.nix rename to pkgs/unit/ye/yex-lang/pkg-fun.nix diff --git a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch b/pkgs/unit/yg/yggdrasil/change-runtime-dir.patch similarity index 100% rename from pkgs/tools/networking/yggdrasil/change-runtime-dir.patch rename to pkgs/unit/yg/yggdrasil/change-runtime-dir.patch diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/unit/yg/yggdrasil/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/yggdrasil/default.nix rename to pkgs/unit/yg/yggdrasil/pkg-fun.nix diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/unit/yj/yj/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/yj/default.nix rename to pkgs/unit/yj/yj/pkg-fun.nix diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/unit/yl/yle-dl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yle-dl/default.nix rename to pkgs/unit/yl/yle-dl/pkg-fun.nix diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/unit/ym/ympd/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ympd/default.nix rename to pkgs/unit/ym/ympd/pkg-fun.nix diff --git a/pkgs/applications/audio/ymuse/default.nix b/pkgs/unit/ym/ymuse/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ymuse/default.nix rename to pkgs/unit/ym/ymuse/pkg-fun.nix diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/unit/yo/yodl/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/misc/yodl/default.nix rename to pkgs/unit/yo/yodl/pkg-fun.nix diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/unit/yo/yojimbo/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/yojimbo/default.nix rename to pkgs/unit/yo/yojimbo/pkg-fun.nix diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/unit/yo/yoshimi/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/yoshimi/default.nix rename to pkgs/unit/yo/yoshimi/pkg-fun.nix diff --git a/pkgs/development/compilers/yosys/plugins/bluespec.nix b/pkgs/unit/yo/yosys-bluespec/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/yosys/plugins/bluespec.nix rename to pkgs/unit/yo/yosys-bluespec/pkg-fun.nix diff --git a/pkgs/development/compilers/yosys/plugins/ghdl.nix b/pkgs/unit/yo/yosys-ghdl/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/yosys/plugins/ghdl.nix rename to pkgs/unit/yo/yosys-ghdl/pkg-fun.nix diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/unit/yo/yosys-symbiflow/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/yosys/plugins/symbiflow.nix rename to pkgs/unit/yo/yosys-symbiflow/pkg-fun.nix diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow-pmgen.patch b/pkgs/unit/yo/yosys-symbiflow/symbiflow-pmgen.patch similarity index 100% rename from pkgs/development/compilers/yosys/plugins/symbiflow-pmgen.patch rename to pkgs/unit/yo/yosys-symbiflow/symbiflow-pmgen.patch diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/unit/yo/yosys/fix-clang-build.patch similarity index 100% rename from pkgs/development/compilers/yosys/fix-clang-build.patch rename to pkgs/unit/yo/yosys/fix-clang-build.patch diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/unit/yo/yosys/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/yosys/default.nix rename to pkgs/unit/yo/yosys/pkg-fun.nix diff --git a/pkgs/development/compilers/yosys/plugin-search-dirs.patch b/pkgs/unit/yo/yosys/plugin-search-dirs.patch similarity index 100% rename from pkgs/development/compilers/yosys/plugin-search-dirs.patch rename to pkgs/unit/yo/yosys/plugin-search-dirs.patch diff --git a/pkgs/development/compilers/yosys/setup-hook.sh b/pkgs/unit/yo/yosys/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/yosys/setup-hook.sh rename to pkgs/unit/yo/yosys/setup-hook.sh diff --git a/pkgs/tools/misc/you-get/ffmpeg-path.patch b/pkgs/unit/yo/you-get/ffmpeg-path.patch similarity index 100% rename from pkgs/tools/misc/you-get/ffmpeg-path.patch rename to pkgs/unit/yo/you-get/ffmpeg-path.patch diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/unit/yo/you-get/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/you-get/default.nix rename to pkgs/unit/yo/you-get/pkg-fun.nix diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/unit/yo/youki/pkg-fun.nix similarity index 100% rename from pkgs/applications/virtualization/youki/default.nix rename to pkgs/unit/yo/youki/pkg-fun.nix diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/unit/yo/youtrack/pkg-fun.nix similarity index 100% rename from pkgs/servers/jetbrains/youtrack.nix rename to pkgs/unit/yo/youtrack/pkg-fun.nix diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/unit/yo/youtube-music/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/youtube-music/default.nix rename to pkgs/unit/yo/youtube-music/pkg-fun.nix diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/unit/yq/yq-go/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/yq-go/default.nix rename to pkgs/unit/yq/yq-go/pkg-fun.nix diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/unit/yr/yrd/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/yrd/default.nix rename to pkgs/unit/yr/yrd/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/unit/yt/ytalk/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/ytalk/default.nix rename to pkgs/unit/yt/ytalk/pkg-fun.nix diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/unit/yt/ytarchive/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ytarchive/default.nix rename to pkgs/unit/yt/ytarchive/pkg-fun.nix diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/unit/yt/ytcast/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ytcast/default.nix rename to pkgs/unit/yt/ytcast/pkg-fun.nix diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/unit/yt/ytcc/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/ytcc/default.nix rename to pkgs/unit/yt/ytcc/pkg-fun.nix diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/unit/yt/ytfzf/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ytfzf/default.nix rename to pkgs/unit/yt/ytfzf/pkg-fun.nix diff --git a/pkgs/applications/audio/ytmdesktop/default.nix b/pkgs/unit/yt/ytmdesktop/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/ytmdesktop/default.nix rename to pkgs/unit/yt/ytmdesktop/pkg-fun.nix diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/unit/yt/ytmdl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/ytmdl/default.nix rename to pkgs/unit/yt/ytmdl/pkg-fun.nix diff --git a/pkgs/applications/file-managers/ytree/default.nix b/pkgs/unit/yt/ytree/pkg-fun.nix similarity index 100% rename from pkgs/applications/file-managers/ytree/default.nix rename to pkgs/unit/yt/ytree/pkg-fun.nix diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/unit/yt/ytt/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/ytt/default.nix rename to pkgs/unit/yt/ytt/pkg-fun.nix diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/unit/yu/yubico-pam/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/yubico-pam/default.nix rename to pkgs/unit/yu/yubico-pam/pkg-fun.nix diff --git a/pkgs/tools/security/yubihsm-connector/lockfile-fix.patch b/pkgs/unit/yu/yubihsm-connector/lockfile-fix.patch similarity index 100% rename from pkgs/tools/security/yubihsm-connector/lockfile-fix.patch rename to pkgs/unit/yu/yubihsm-connector/lockfile-fix.patch diff --git a/pkgs/tools/security/yubihsm-connector/default.nix b/pkgs/unit/yu/yubihsm-connector/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yubihsm-connector/default.nix rename to pkgs/unit/yu/yubihsm-connector/pkg-fun.nix diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/unit/yu/yubihsm-shell/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yubihsm-shell/default.nix rename to pkgs/unit/yu/yubihsm-shell/pkg-fun.nix diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/unit/yu/yubikey-agent/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yubikey-agent/default.nix rename to pkgs/unit/yu/yubikey-agent/pkg-fun.nix diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/unit/yu/yubikey-manager/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yubikey-manager/default.nix rename to pkgs/unit/yu/yubikey-manager/pkg-fun.nix diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/unit/yu/yubikey-manager4/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yubikey-manager/4.nix rename to pkgs/unit/yu/yubikey-manager4/pkg-fun.nix diff --git a/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch b/pkgs/unit/yu/yubikey-manager4/remove-pyopenssl-tests.patch similarity index 100% rename from pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch rename to pkgs/unit/yu/yubikey-manager4/remove-pyopenssl-tests.patch diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/unit/yu/yubikey-personalization/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yubikey-personalization/default.nix rename to pkgs/unit/yu/yubikey-personalization/pkg-fun.nix diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/unit/yu/yubikey-touch-detector/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/yubikey-touch-detector/default.nix rename to pkgs/unit/yu/yubikey-touch-detector/pkg-fun.nix diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/unit/yu/yubioath-flutter/helper.nix similarity index 100% rename from pkgs/applications/misc/yubioath-flutter/helper.nix rename to pkgs/unit/yu/yubioath-flutter/helper.nix diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/unit/yu/yubioath-flutter/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/yubioath-flutter/default.nix rename to pkgs/unit/yu/yubioath-flutter/pkg-fun.nix diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/unit/yu/yuicompressor/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/yuicompressor/default.nix rename to pkgs/unit/yu/yuicompressor/pkg-fun.nix diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/unit/yu/yutto/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/yutto/default.nix rename to pkgs/unit/yu/yutto/pkg-fun.nix diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/unit/z-/z-lua/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/z-lua/default.nix rename to pkgs/unit/z-/z-lua/pkg-fun.nix diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/unit/z3/z3-tptp/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/z3/tptp.nix rename to pkgs/unit/z3/z3-tptp/pkg-fun.nix diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/unit/z8/z88dk/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/z88dk/default.nix rename to pkgs/unit/z8/z88dk/pkg-fun.nix diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/unit/za/zabbix-cli/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zabbix-cli/default.nix rename to pkgs/unit/za/zabbix-cli/pkg-fun.nix diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/unit/za/zabbixctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zabbixctl/default.nix rename to pkgs/unit/za/zabbixctl/pkg-fun.nix diff --git a/pkgs/tools/misc/zalgo/default.nix b/pkgs/unit/za/zalgo/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zalgo/default.nix rename to pkgs/unit/za/zalgo/pkg-fun.nix diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/unit/za/zam-plugins/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/zam-plugins/default.nix rename to pkgs/unit/za/zam-plugins/pkg-fun.nix diff --git a/pkgs/applications/networking/misc/zammad/0001-nulldb.patch b/pkgs/unit/za/zammad/0001-nulldb.patch similarity index 100% rename from pkgs/applications/networking/misc/zammad/0001-nulldb.patch rename to pkgs/unit/za/zammad/0001-nulldb.patch diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/unit/za/zammad/gemset.nix similarity index 100% rename from pkgs/applications/networking/misc/zammad/gemset.nix rename to pkgs/unit/za/zammad/gemset.nix diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/unit/za/zammad/package.json similarity index 100% rename from pkgs/applications/networking/misc/zammad/package.json rename to pkgs/unit/za/zammad/package.json diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/unit/za/zammad/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/misc/zammad/default.nix rename to pkgs/unit/za/zammad/pkg-fun.nix diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/unit/za/zammad/source.json similarity index 100% rename from pkgs/applications/networking/misc/zammad/source.json rename to pkgs/unit/za/zammad/source.json diff --git a/pkgs/applications/networking/misc/zammad/update.nix b/pkgs/unit/za/zammad/update.nix similarity index 100% rename from pkgs/applications/networking/misc/zammad/update.nix rename to pkgs/unit/za/zammad/update.nix diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/unit/za/zammad/update.sh similarity index 100% rename from pkgs/applications/networking/misc/zammad/update.sh rename to pkgs/unit/za/zammad/update.sh diff --git a/pkgs/applications/networking/misc/zammad/yarn.lock b/pkgs/unit/za/zammad/yarn.lock similarity index 100% rename from pkgs/applications/networking/misc/zammad/yarn.lock rename to pkgs/unit/za/zammad/yarn.lock diff --git a/pkgs/applications/networking/misc/zammad/yarn.nix b/pkgs/unit/za/zammad/yarn.nix similarity index 100% rename from pkgs/applications/networking/misc/zammad/yarn.nix rename to pkgs/unit/za/zammad/yarn.nix diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/unit/za/zap/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/zap/default.nix rename to pkgs/unit/za/zap/pkg-fun.nix diff --git a/pkgs/tools/archivers/zarchive/default.nix b/pkgs/unit/za/zarchive/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/zarchive/default.nix rename to pkgs/unit/za/zarchive/pkg-fun.nix diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/unit/za/zasm/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/zasm/default.nix rename to pkgs/unit/za/zasm/pkg-fun.nix diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/unit/za/zathuraPkgs/cb/default.nix similarity index 100% rename from pkgs/applications/misc/zathura/cb/default.nix rename to pkgs/unit/za/zathuraPkgs/cb/default.nix diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/unit/za/zathuraPkgs/core/default.nix similarity index 100% rename from pkgs/applications/misc/zathura/core/default.nix rename to pkgs/unit/za/zathuraPkgs/core/default.nix diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/unit/za/zathuraPkgs/djvu/default.nix similarity index 100% rename from pkgs/applications/misc/zathura/djvu/default.nix rename to pkgs/unit/za/zathuraPkgs/djvu/default.nix diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/unit/za/zathuraPkgs/pdf-mupdf/default.nix similarity index 100% rename from pkgs/applications/misc/zathura/pdf-mupdf/default.nix rename to pkgs/unit/za/zathuraPkgs/pdf-mupdf/default.nix diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/unit/za/zathuraPkgs/pdf-poppler/default.nix similarity index 100% rename from pkgs/applications/misc/zathura/pdf-poppler/default.nix rename to pkgs/unit/za/zathuraPkgs/pdf-poppler/default.nix diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/unit/za/zathuraPkgs/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/zathura/default.nix rename to pkgs/unit/za/zathuraPkgs/pkg-fun.nix diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/unit/za/zathuraPkgs/ps/default.nix similarity index 100% rename from pkgs/applications/misc/zathura/ps/default.nix rename to pkgs/unit/za/zathuraPkgs/ps/default.nix diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/unit/za/zathuraPkgs/wrapper.nix similarity index 100% rename from pkgs/applications/misc/zathura/wrapper.nix rename to pkgs/unit/za/zathuraPkgs/wrapper.nix diff --git a/pkgs/games/zaz/default.nix b/pkgs/unit/za/zaz/pkg-fun.nix similarity index 100% rename from pkgs/games/zaz/default.nix rename to pkgs/unit/za/zaz/pkg-fun.nix diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/unit/zb/zbackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/zbackup/default.nix rename to pkgs/unit/zb/zbackup/pkg-fun.nix diff --git a/pkgs/tools/backup/zbackup/protobuf-api-change.patch b/pkgs/unit/zb/zbackup/protobuf-api-change.patch similarity index 100% rename from pkgs/tools/backup/zbackup/protobuf-api-change.patch rename to pkgs/unit/zb/zbackup/protobuf-api-change.patch diff --git a/pkgs/tools/admin/zbctl/default.nix b/pkgs/unit/zb/zbctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/admin/zbctl/default.nix rename to pkgs/unit/zb/zbctl/pkg-fun.nix diff --git a/pkgs/applications/science/logic/zchaff/default.nix b/pkgs/unit/zc/zchaff/pkg-fun.nix similarity index 100% rename from pkgs/applications/science/logic/zchaff/default.nix rename to pkgs/unit/zc/zchaff/pkg-fun.nix diff --git a/pkgs/applications/science/logic/zchaff/sat_solver.patch b/pkgs/unit/zc/zchaff/sat_solver.patch similarity index 100% rename from pkgs/applications/science/logic/zchaff/sat_solver.patch rename to pkgs/unit/zc/zchaff/sat_solver.patch diff --git a/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch b/pkgs/unit/zc/zchunk/0001-meson-fix-argp-standalone.patch similarity index 100% rename from pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch rename to pkgs/unit/zc/zchunk/0001-meson-fix-argp-standalone.patch diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/unit/zc/zchunk/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zchunk/default.nix rename to pkgs/unit/zc/zchunk/pkg-fun.nix diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/unit/zd/zd1211fw/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/zd1211/default.nix rename to pkgs/unit/zd/zd1211fw/pkg-fun.nix diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/unit/zd/zdbsp/pkg-fun.nix similarity index 100% rename from pkgs/games/zdoom/zdbsp.nix rename to pkgs/unit/zd/zdbsp/pkg-fun.nix diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/unit/zd/zdelta/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/zdelta/default.nix rename to pkgs/unit/zd/zdelta/pkg-fun.nix diff --git a/pkgs/tools/security/zdns/default.nix b/pkgs/unit/zd/zdns/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zdns/default.nix rename to pkgs/unit/zd/zdns/pkg-fun.nix diff --git a/pkgs/games/zdoom/default.nix b/pkgs/unit/zd/zdoom/pkg-fun.nix similarity index 100% rename from pkgs/games/zdoom/default.nix rename to pkgs/unit/zd/zdoom/pkg-fun.nix diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/unit/ze/zecwallet-lite/pkg-fun.nix similarity index 100% rename from pkgs/applications/blockchains/zecwallet-lite/default.nix rename to pkgs/unit/ze/zecwallet-lite/pkg-fun.nix diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/unit/ze/zed/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/zed/default.nix rename to pkgs/unit/ze/zed/pkg-fun.nix diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/unit/ze/zeek/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/ids/zeek/default.nix rename to pkgs/unit/ze/zeek/pkg-fun.nix diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/unit/ze/zef/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/rakudo/zef.nix rename to pkgs/unit/ze/zef/pkg-fun.nix diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/unit/ze/zeitgeist/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zeitgeist/default.nix rename to pkgs/unit/ze/zeitgeist/pkg-fun.nix diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/unit/ze/zenmonitor/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/zenmonitor/default.nix rename to pkgs/unit/ze/zenmonitor/pkg-fun.nix diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/unit/ze/zenstates/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/zenstates/default.nix rename to pkgs/unit/ze/zenstates/pkg-fun.nix diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/unit/ze/zerobin/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/zerobin/default.nix rename to pkgs/unit/ze/zerobin/pkg-fun.nix diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/unit/ze/zeroc-ice/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zeroc-ice/default.nix rename to pkgs/unit/ze/zeroc-ice/pkg-fun.nix diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/unit/ze/zerofree/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/zerofree/default.nix rename to pkgs/unit/ze/zerofree/pkg-fun.nix diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/unit/ze/zeromq4/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zeromq/4.x.nix rename to pkgs/unit/ze/zeromq4/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/unit/ze/zeronet-conservancy/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/zeronet-conservancy/default.nix rename to pkgs/unit/ze/zeronet-conservancy/pkg-fun.nix diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/unit/ze/zeronet/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/p2p/zeronet/default.nix rename to pkgs/unit/ze/zeronet/pkg-fun.nix diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/unit/ze/zerotierone/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/zerotierone/default.nix rename to pkgs/unit/ze/zerotierone/pkg-fun.nix diff --git a/pkgs/applications/emulators/zesarux/default.nix b/pkgs/unit/ze/zesarux/pkg-fun.nix similarity index 100% rename from pkgs/applications/emulators/zesarux/default.nix rename to pkgs/unit/ze/zesarux/pkg-fun.nix diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/unit/zf/zfp/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/zfp/default.nix rename to pkgs/unit/zf/zfp/pkg-fun.nix diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/unit/zf/zfs-autobackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/zfs-autobackup/default.nix rename to pkgs/unit/zf/zfs-autobackup/pkg-fun.nix diff --git a/pkgs/tools/backup/zfs-prune-snapshots/default.nix b/pkgs/unit/zf/zfs-prune-snapshots/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/zfs-prune-snapshots/default.nix rename to pkgs/unit/zf/zfs-prune-snapshots/pkg-fun.nix diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/unit/zf/zfsbackup/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/zfsbackup/default.nix rename to pkgs/unit/zf/zfsbackup/pkg-fun.nix diff --git a/pkgs/tools/backup/zfsnap/default.nix b/pkgs/unit/zf/zfsnap/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/zfsnap/default.nix rename to pkgs/unit/zf/zfsnap/pkg-fun.nix diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/unit/zf/zfstools/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/zfstools/default.nix rename to pkgs/unit/zf/zfstools/pkg-fun.nix diff --git a/pkgs/tools/security/zgrab2/default.nix b/pkgs/unit/zg/zgrab2/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zgrab2/default.nix rename to pkgs/unit/zg/zgrab2/pkg-fun.nix diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/unit/zg/zgrviewer/pkg-fun.nix similarity index 100% rename from pkgs/applications/graphics/zgrviewer/default.nix rename to pkgs/unit/zg/zgrviewer/pkg-fun.nix diff --git a/pkgs/shells/zsh/zi/default.nix b/pkgs/unit/zi/zi/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zi/default.nix rename to pkgs/unit/zi/zi/pkg-fun.nix diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/unit/zi/zigbee2mqtt/pkg-fun.nix similarity index 100% rename from pkgs/servers/zigbee2mqtt/default.nix rename to pkgs/unit/zi/zigbee2mqtt/pkg-fun.nix diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/unit/zi/zile/pkg-fun.nix similarity index 100% rename from pkgs/applications/editors/zile/default.nix rename to pkgs/unit/zi/zile/pkg-fun.nix diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/unit/zi/zilla-slab/pkg-fun.nix similarity index 100% rename from pkgs/data/fonts/zilla-slab/default.nix rename to pkgs/unit/zi/zilla-slab/pkg-fun.nix diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/unit/zi/zim-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/zim-tools/default.nix rename to pkgs/unit/zi/zim-tools/pkg-fun.nix diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/unit/zi/zim/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/zim/default.nix rename to pkgs/unit/zi/zim/pkg-fun.nix diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/unit/zi/zimfw/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zimfw/default.nix rename to pkgs/unit/zi/zimfw/pkg-fun.nix diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/unit/zi/zimg/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zimg/default.nix rename to pkgs/unit/zi/zimg/pkg-fun.nix diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/unit/zi/zimlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zimlib/default.nix rename to pkgs/unit/zi/zimlib/pkg-fun.nix diff --git a/pkgs/servers/search/zinc/default.nix b/pkgs/unit/zi/zinc/pkg-fun.nix similarity index 100% rename from pkgs/servers/search/zinc/default.nix rename to pkgs/unit/zi/zinc/pkg-fun.nix diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/unit/zi/zinit/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zinit/default.nix rename to pkgs/unit/zi/zinit/pkg-fun.nix diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/unit/zi/zinnia/pkg-fun.nix similarity index 100% rename from pkgs/tools/inputmethods/zinnia/default.nix rename to pkgs/unit/zi/zinnia/pkg-fun.nix diff --git a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/pkgs/unit/zi/zip/natspec-gentoo.patch.bz2 similarity index 100% rename from pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 rename to pkgs/unit/zi/zip/natspec-gentoo.patch.bz2 diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/unit/zi/zip/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/zip/default.nix rename to pkgs/unit/zi/zip/pkg-fun.nix diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/unit/zi/zipkin/pkg-fun.nix similarity index 100% rename from pkgs/servers/monitoring/zipkin/default.nix rename to pkgs/unit/zi/zipkin/pkg-fun.nix diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/unit/zi/zita-ajbridge/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/zita-ajbridge/default.nix rename to pkgs/unit/zi/zita-ajbridge/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/unit/zi/zita-alsa-pcmi/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix rename to pkgs/unit/zi/zita-alsa-pcmi/pkg-fun.nix diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/unit/zi/zita-at1/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/zita-at1/default.nix rename to pkgs/unit/zi/zita-at1/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/unit/zi/zita-convolver/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/zita-convolver/default.nix rename to pkgs/unit/zi/zita-convolver/pkg-fun.nix diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/unit/zi/zita-njbridge/pkg-fun.nix similarity index 100% rename from pkgs/applications/audio/zita-njbridge/default.nix rename to pkgs/unit/zi/zita-njbridge/pkg-fun.nix diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/unit/zi/zita-resampler/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/audio/zita-resampler/default.nix rename to pkgs/unit/zi/zita-resampler/pkg-fun.nix diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/unit/zk/zk-shell/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/zk-shell/default.nix rename to pkgs/unit/zk/zk-shell/pkg-fun.nix diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/unit/zk/zk/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/zk/default.nix rename to pkgs/unit/zk/zk/pkg-fun.nix diff --git a/pkgs/tools/security/zkar/default.nix b/pkgs/unit/zk/zkar/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zkar/default.nix rename to pkgs/unit/zk/zkar/pkg-fun.nix diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/unit/zk/zkfuse/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/zkfuse/default.nix rename to pkgs/unit/zk/zkfuse/pkg-fun.nix diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/unit/zk/zktree/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/zktree/default.nix rename to pkgs/unit/zk/zktree/pkg-fun.nix diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/unit/zl/zld/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/zld/default.nix rename to pkgs/unit/zl/zld/pkg-fun.nix diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/unit/zl/zlib-ng/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zlib-ng/default.nix rename to pkgs/unit/zl/zlib-ng/pkg-fun.nix diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/unit/zl/zlib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zlib/default.nix rename to pkgs/unit/zl/zlib/pkg-fun.nix diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/unit/zl/zlint/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zlint/default.nix rename to pkgs/unit/zl/zlint/pkg-fun.nix diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/unit/zl/zlog/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zlog/default.nix rename to pkgs/unit/zl/zlog/pkg-fun.nix diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/unit/zl/zls/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/zls/default.nix rename to pkgs/unit/zl/zls/pkg-fun.nix diff --git a/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch b/pkgs/unit/zm/zmap/cmake-json-0.14-fix.patch similarity index 100% rename from pkgs/tools/security/zmap/cmake-json-0.14-fix.patch rename to pkgs/unit/zm/zmap/cmake-json-0.14-fix.patch diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/unit/zm/zmap/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zmap/default.nix rename to pkgs/unit/zm/zmap/pkg-fun.nix diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/unit/zm/zmqpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zmqpp/default.nix rename to pkgs/unit/zm/zmqpp/pkg-fun.nix diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/unit/zm/zmusic/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zmusic/default.nix rename to pkgs/unit/zm/zmusic/pkg-fun.nix diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/unit/zn/zn_poly/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/science/math/zn_poly/default.nix rename to pkgs/unit/zn/zn_poly/pkg-fun.nix diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/unit/zn/znapzend/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/znapzend/default.nix rename to pkgs/unit/zn/znapzend/pkg-fun.nix diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/unit/zn/znc/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/znc/default.nix rename to pkgs/unit/zn/znc/pkg-fun.nix diff --git a/pkgs/games/zod/0002-add-scaling-factor-to-source.patch b/pkgs/unit/zo/zod/0002-add-scaling-factor-to-source.patch similarity index 100% rename from pkgs/games/zod/0002-add-scaling-factor-to-source.patch rename to pkgs/unit/zo/zod/0002-add-scaling-factor-to-source.patch diff --git a/pkgs/games/zod/default.nix b/pkgs/unit/zo/zod/pkg-fun.nix similarity index 100% rename from pkgs/games/zod/default.nix rename to pkgs/unit/zo/zod/pkg-fun.nix diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/unit/zo/zoekt/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/zoekt/default.nix rename to pkgs/unit/zo/zoekt/pkg-fun.nix diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/unit/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch similarity index 100% rename from pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch rename to pkgs/unit/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch diff --git a/pkgs/servers/zoneminder/default-to-http-1dot1.patch b/pkgs/unit/zo/zoneminder/default-to-http-1dot1.patch similarity index 100% rename from pkgs/servers/zoneminder/default-to-http-1dot1.patch rename to pkgs/unit/zo/zoneminder/default-to-http-1dot1.patch diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/unit/zo/zoneminder/pkg-fun.nix similarity index 100% rename from pkgs/servers/zoneminder/default.nix rename to pkgs/unit/zo/zoneminder/pkg-fun.nix diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/unit/zo/zookeeper/pkg-fun.nix similarity index 100% rename from pkgs/servers/zookeeper/default.nix rename to pkgs/unit/zo/zookeeper/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/unit/zo/zoom-us/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/zoom-us/default.nix rename to pkgs/unit/zo/zoom-us/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/unit/zo/zoom-us/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/zoom-us/update.sh rename to pkgs/unit/zo/zoom-us/update.sh diff --git a/pkgs/games/zoom/default.nix b/pkgs/unit/zo/zoom/pkg-fun.nix similarity index 100% rename from pkgs/games/zoom/default.nix rename to pkgs/unit/zo/zoom/pkg-fun.nix diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/unit/zo/zopfli/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/zopfli/default.nix rename to pkgs/unit/zo/zopfli/pkg-fun.nix diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/unit/zo/zotero/pkg-fun.nix similarity index 100% rename from pkgs/applications/office/zotero/default.nix rename to pkgs/unit/zo/zotero/pkg-fun.nix diff --git a/pkgs/applications/office/zotero/zotero.sh b/pkgs/unit/zo/zotero/zotero.sh similarity index 100% rename from pkgs/applications/office/zotero/zotero.sh rename to pkgs/unit/zo/zotero/zotero.sh diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/unit/zo/zoxide/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zoxide/default.nix rename to pkgs/unit/zo/zoxide/pkg-fun.nix diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/unit/zp/zpaq/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/zpaq/default.nix rename to pkgs/unit/zp/zpaq/pkg-fun.nix diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/unit/zp/zpaqd/pkg-fun.nix similarity index 100% rename from pkgs/tools/archivers/zpaq/zpaqd.nix rename to pkgs/unit/zp/zpaqd/pkg-fun.nix diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/unit/zp/zplug/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zplug/default.nix rename to pkgs/unit/zp/zplug/pkg-fun.nix diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/unit/zp/zpool-auto-expand-partitions/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix rename to pkgs/unit/zp/zpool-auto-expand-partitions/pkg-fun.nix diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/unit/zp/zpool-iostat-viz/pkg-fun.nix similarity index 100% rename from pkgs/tools/filesystems/zpool-iostat-viz/default.nix rename to pkgs/unit/zp/zpool-iostat-viz/pkg-fun.nix diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/unit/zp/zprint/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/zprint/default.nix rename to pkgs/unit/zp/zprint/pkg-fun.nix diff --git a/pkgs/development/tools/zq/default.nix b/pkgs/unit/zq/zq/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/zq/default.nix rename to pkgs/unit/zq/zq/pkg-fun.nix diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/unit/zr/zrepl/pkg-fun.nix similarity index 100% rename from pkgs/tools/backup/zrepl/default.nix rename to pkgs/unit/zr/zrepl/pkg-fun.nix diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/unit/zs/zs-apc-spdu-ctl/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/zs-apc-spdu-ctl/default.nix rename to pkgs/unit/zs/zs-apc-spdu-ctl/pkg-fun.nix diff --git a/pkgs/tools/networking/zs-wait4host/default.nix b/pkgs/unit/zs/zs-wait4host/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/zs-wait4host/default.nix rename to pkgs/unit/zs/zs-wait4host/pkg-fun.nix diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/unit/zs/zsa-udev-rules/pkg-fun.nix similarity index 100% rename from pkgs/os-specific/linux/zsa-udev-rules/default.nix rename to pkgs/unit/zs/zsa-udev-rules/pkg-fun.nix diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/unit/zs/zscroll/pkg-fun.nix similarity index 100% rename from pkgs/applications/misc/zscroll/default.nix rename to pkgs/unit/zs/zscroll/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/unit/zs/zsh-autocomplete/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-autocomplete/default.nix rename to pkgs/unit/zs/zsh-autocomplete/pkg-fun.nix diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/unit/zs/zsh-autoenv/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zsh-autoenv/default.nix rename to pkgs/unit/zs/zsh-autoenv/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/unit/zs/zsh-autopair/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-autopair/default.nix rename to pkgs/unit/zs/zsh-autopair/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/unit/zs/zsh-autosuggestions/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-autosuggestions/default.nix rename to pkgs/unit/zs/zsh-autosuggestions/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/unit/zs/zsh-bd/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-bd/default.nix rename to pkgs/unit/zs/zsh-bd/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/unit/zs/zsh-better-npm-completion/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-better-npm-completion/default.nix rename to pkgs/unit/zs/zsh-better-npm-completion/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh b/pkgs/unit/zs/zsh-clipboard/clipboard.plugin.zsh similarity index 100% rename from pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh rename to pkgs/unit/zs/zsh-clipboard/clipboard.plugin.zsh diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/unit/zs/zsh-clipboard/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-clipboard/default.nix rename to pkgs/unit/zs/zsh-clipboard/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/unit/zs/zsh-command-time/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-command-time/default.nix rename to pkgs/unit/zs/zsh-command-time/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/unit/zs/zsh-completions/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-completions/default.nix rename to pkgs/unit/zs/zsh-completions/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-edit/default.nix b/pkgs/unit/zs/zsh-edit/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-edit/default.nix rename to pkgs/unit/zs/zsh-edit/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/unit/zs/zsh-fast-syntax-highlighting/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix rename to pkgs/unit/zs/zsh-fast-syntax-highlighting/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/unit/zs/zsh-forgit/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-forgit/default.nix rename to pkgs/unit/zs/zsh-forgit/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/unit/zs/zsh-fzf-tab/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-fzf-tab/default.nix rename to pkgs/unit/zs/zsh-fzf-tab/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/unit/zs/zsh-git-prompt/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-git-prompt/default.nix rename to pkgs/unit/zs/zsh-git-prompt/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix b/pkgs/unit/zs/zsh-history-search-multi-word/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-history-search-multi-word/default.nix rename to pkgs/unit/zs/zsh-history-search-multi-word/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/unit/zs/zsh-history-substring-search/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-history-substring-search/default.nix rename to pkgs/unit/zs/zsh-history-substring-search/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/unit/zs/zsh-history/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-history/default.nix rename to pkgs/unit/zs/zsh-history/pkg-fun.nix diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/unit/zs/zsh-navigation-tools/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zsh-navigation-tools/default.nix rename to pkgs/unit/zs/zsh-navigation-tools/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/unit/zs/zsh-nix-shell/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-nix-shell/default.nix rename to pkgs/unit/zs/zsh-nix-shell/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch b/pkgs/unit/zs/zsh-powerlevel10k/gitstatusd.patch similarity index 100% rename from pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch rename to pkgs/unit/zs/zsh-powerlevel10k/gitstatusd.patch diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/unit/zs/zsh-powerlevel10k/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-powerlevel10k/default.nix rename to pkgs/unit/zs/zsh-powerlevel10k/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/unit/zs/zsh-powerlevel9k/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-powerlevel9k/default.nix rename to pkgs/unit/zs/zsh-powerlevel9k/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/unit/zs/zsh-prezto/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-prezto/default.nix rename to pkgs/unit/zs/zsh-prezto/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/unit/zs/zsh-syntax-highlighting/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-syntax-highlighting/default.nix rename to pkgs/unit/zs/zsh-syntax-highlighting/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/unit/zs/zsh-system-clipboard/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-system-clipboard/default.nix rename to pkgs/unit/zs/zsh-system-clipboard/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/unit/zs/zsh-vi-mode/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-vi-mode/default.nix rename to pkgs/unit/zs/zsh-vi-mode/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/unit/zs/zsh-you-should-use/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-you-should-use/default.nix rename to pkgs/unit/zs/zsh-you-should-use/pkg-fun.nix diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/unit/zs/zsh-z/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/zsh-z/default.nix rename to pkgs/unit/zs/zsh-z/pkg-fun.nix diff --git a/pkgs/shells/zsh/default.nix b/pkgs/unit/zs/zsh/pkg-fun.nix similarity index 100% rename from pkgs/shells/zsh/default.nix rename to pkgs/unit/zs/zsh/pkg-fun.nix diff --git a/pkgs/shells/zsh/tz_completion.patch b/pkgs/unit/zs/zsh/tz_completion.patch similarity index 100% rename from pkgs/shells/zsh/tz_completion.patch rename to pkgs/unit/zs/zsh/tz_completion.patch diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/unit/zs/zssh/pkg-fun.nix similarity index 100% rename from pkgs/tools/networking/zssh/default.nix rename to pkgs/unit/zs/zssh/pkg-fun.nix diff --git a/pkgs/tools/security/zsteg/Gemfile b/pkgs/unit/zs/zsteg/Gemfile similarity index 100% rename from pkgs/tools/security/zsteg/Gemfile rename to pkgs/unit/zs/zsteg/Gemfile diff --git a/pkgs/tools/security/zsteg/Gemfile.lock b/pkgs/unit/zs/zsteg/Gemfile.lock similarity index 100% rename from pkgs/tools/security/zsteg/Gemfile.lock rename to pkgs/unit/zs/zsteg/Gemfile.lock diff --git a/pkgs/tools/security/zsteg/gemset.nix b/pkgs/unit/zs/zsteg/gemset.nix similarity index 100% rename from pkgs/tools/security/zsteg/gemset.nix rename to pkgs/unit/zs/zsteg/gemset.nix diff --git a/pkgs/tools/security/zsteg/default.nix b/pkgs/unit/zs/zsteg/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zsteg/default.nix rename to pkgs/unit/zs/zsteg/pkg-fun.nix diff --git a/pkgs/tools/text/zstxtns-utils/default.nix b/pkgs/unit/zs/zstxtns-utils/pkg-fun.nix similarity index 100% rename from pkgs/tools/text/zstxtns-utils/default.nix rename to pkgs/unit/zs/zstxtns-utils/pkg-fun.nix diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/unit/zs/zsv/pkg-fun.nix similarity index 100% rename from pkgs/development/tools/zsv/default.nix rename to pkgs/unit/zs/zsv/pkg-fun.nix diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/unit/zs/zsync/pkg-fun.nix similarity index 100% rename from pkgs/tools/compression/zsync/default.nix rename to pkgs/unit/zs/zsync/pkg-fun.nix diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/unit/zt/zthrottle/pkg-fun.nix similarity index 100% rename from pkgs/tools/misc/zthrottle/default.nix rename to pkgs/unit/zt/zthrottle/pkg-fun.nix diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/unit/zu/zuki-themes/pkg-fun.nix similarity index 100% rename from pkgs/data/themes/zuki/default.nix rename to pkgs/unit/zu/zuki-themes/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/unit/zu/zulip-term/pkg-fun.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/zulip-term/default.nix rename to pkgs/unit/zu/zulip-term/pkg-fun.nix diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/pkgs/unit/zu/zulip-term/pytest-executable-name.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch rename to pkgs/unit/zu/zulip-term/pytest-executable-name.patch diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/unit/zu/zulu/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/zulu/default.nix rename to pkgs/unit/zu/zulu/pkg-fun.nix diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/unit/zu/zulu8/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/zulu/8.nix rename to pkgs/unit/zu/zulu8/pkg-fun.nix diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/unit/zu/zuo/pkg-fun.nix similarity index 100% rename from pkgs/development/interpreters/zuo/default.nix rename to pkgs/unit/zu/zuo/pkg-fun.nix diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/unit/zx/zxcvbn-c/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zxcvbn-c/default.nix rename to pkgs/unit/zx/zxcvbn-c/pkg-fun.nix diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/unit/zx/zxing-cpp/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zxing-cpp/default.nix rename to pkgs/unit/zx/zxing-cpp/pkg-fun.nix diff --git a/pkgs/tools/graphics/zxing/java-zxing.sh b/pkgs/unit/zx/zxing/java-zxing.sh similarity index 100% rename from pkgs/tools/graphics/zxing/java-zxing.sh rename to pkgs/unit/zx/zxing/java-zxing.sh diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/unit/zx/zxing/pkg-fun.nix similarity index 100% rename from pkgs/tools/graphics/zxing/default.nix rename to pkgs/unit/zx/zxing/pkg-fun.nix diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/pkgs/unit/zx/zxing/zxing-cmdline-encoder.sh similarity index 100% rename from pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh rename to pkgs/unit/zx/zxing/zxing-cmdline-encoder.sh diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/pkgs/unit/zx/zxing/zxing-cmdline-runner.sh similarity index 100% rename from pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh rename to pkgs/unit/zx/zxing/zxing-cmdline-runner.sh diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/unit/zx/zxing/zxing.sh similarity index 100% rename from pkgs/tools/graphics/zxing/zxing.sh rename to pkgs/unit/zx/zxing/zxing.sh diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/unit/zy/zydis/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zydis/default.nix rename to pkgs/unit/zy/zydis/pkg-fun.nix diff --git a/pkgs/development/libraries/zydis/zycore.nix b/pkgs/unit/zy/zydis/zycore.nix similarity index 100% rename from pkgs/development/libraries/zydis/zycore.nix rename to pkgs/unit/zy/zydis/zycore.nix diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/unit/zz/zz/pkg-fun.nix similarity index 100% rename from pkgs/development/compilers/zz/default.nix rename to pkgs/unit/zz/zz/pkg-fun.nix diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/unit/zz/zziplib/pkg-fun.nix similarity index 100% rename from pkgs/development/libraries/zziplib/default.nix rename to pkgs/unit/zz/zziplib/pkg-fun.nix diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/unit/zz/zzuf/pkg-fun.nix similarity index 100% rename from pkgs/tools/security/zzuf/default.nix rename to pkgs/unit/zz/zzuf/pkg-fun.nix From 5727203f8f534915eb4ed834d09942b4b1b0c37e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 20 Jan 2023 22:20:50 +0100 Subject: [PATCH 5/8] Fix evaluation from previous automatic migration Tested with nix-env -qaf . The res -> super changes are necessary because res points to the result of the current overlay, but some of the packages were moved to the previous overlay, which can be accessed with super. This is a fundamental problem to be fixed, see https://github.com/NixOS/nixpkgs/pull/55061 and related issues The schleuder change is necessary because the ./default.nix file referenced ./., but there's also another package in ./bin. The tool couldn't move the gemfiles in ./. because The schleuder change is necessary because the tool isn't smart enough and this is a special case of the default.nix reading gemfiles from a ./. reference and there being both schleuder in pkgs/tools/security/schleuder and schleuder-cli in pkgs/tools/security/schleuder/cli --- pkgs/top-level/all-packages.nix | 14 +++++++------- pkgs/{tools/misc => unit/an}/anystyle-cli/Gemfile | 0 .../misc => unit/an}/anystyle-cli/Gemfile.lock | 0 .../misc => unit/an}/anystyle-cli/anystyle.gemspec | 0 .../scripts/list-archive-two-levels-versions | 0 .../scripts/list-directory-versions | 0 .../common-updater-scripts}/scripts/list-git-tags | 0 .../co/common-updater-scripts}/scripts/mark-broken | 0 .../scripts/update-source-version | 0 .../fx/fx_cast_bridge}/package-lock.json | 0 .../fx/fx_cast_bridge}/package.json | 0 .../ka}/karma/generate-dependencies.sh | 0 .../monitoring => unit/ka}/karma/package.json | 0 .../ma/makeInitrdNGTool}/make-initrd-ng/Cargo.toml | 0 .../ma/makeInitrdNGTool}/make-initrd-ng/README.md | 0 .../makeInitrdNGTool}/make-initrd-ng/src/main.rs | 0 pkgs/{servers => unit/ma}/mastodon/gemset.nix | 0 pkgs/{tools/security => unit/sc}/schleuder/Gemfile | 0 .../security => unit/sc}/schleuder/Gemfile.lock | 0 .../security => unit/sc}/schleuder/gemset.nix | 0 .../monitoring => unit/up}/uptime-kuma/.npmrc | 0 .../up}/uptime-kuma/package.json | 0 22 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/{tools/misc => unit/an}/anystyle-cli/Gemfile (100%) rename pkgs/{tools/misc => unit/an}/anystyle-cli/Gemfile.lock (100%) rename pkgs/{tools/misc => unit/an}/anystyle-cli/anystyle.gemspec (100%) rename pkgs/{common-updater => unit/co/common-updater-scripts}/scripts/list-archive-two-levels-versions (100%) rename pkgs/{common-updater => unit/co/common-updater-scripts}/scripts/list-directory-versions (100%) rename pkgs/{common-updater => unit/co/common-updater-scripts}/scripts/list-git-tags (100%) rename pkgs/{common-updater => unit/co/common-updater-scripts}/scripts/mark-broken (100%) rename pkgs/{common-updater => unit/co/common-updater-scripts}/scripts/update-source-version (100%) rename pkgs/{tools/misc/fx_cast => unit/fx/fx_cast_bridge}/package-lock.json (100%) rename pkgs/{tools/misc/fx_cast => unit/fx/fx_cast_bridge}/package.json (100%) rename pkgs/{servers/monitoring => unit/ka}/karma/generate-dependencies.sh (100%) rename pkgs/{servers/monitoring => unit/ka}/karma/package.json (100%) rename pkgs/{build-support/kernel => unit/ma/makeInitrdNGTool}/make-initrd-ng/Cargo.toml (100%) rename pkgs/{build-support/kernel => unit/ma/makeInitrdNGTool}/make-initrd-ng/README.md (100%) rename pkgs/{build-support/kernel => unit/ma/makeInitrdNGTool}/make-initrd-ng/src/main.rs (100%) rename pkgs/{servers => unit/ma}/mastodon/gemset.nix (100%) rename pkgs/{tools/security => unit/sc}/schleuder/Gemfile (100%) rename pkgs/{tools/security => unit/sc}/schleuder/Gemfile.lock (100%) rename pkgs/{tools/security => unit/sc}/schleuder/gemset.nix (100%) rename pkgs/{servers/monitoring => unit/up}/uptime-kuma/.npmrc (100%) rename pkgs/{servers/monitoring => unit/up}/uptime-kuma/package.json (100%) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b972fcdb9734..e9000e06741ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9928,9 +9928,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; - pcre16 = res.pcre.override { variant = "pcre16"; }; + pcre16 = super.pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = res.pcre.override { variant = "cpp"; }; + pcre-cpp = super.pcre.override { variant = "cpp"; }; inherit (callPackage ../development/libraries/physfs { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -12649,7 +12649,7 @@ with pkgs; espeak-classic = callPackage ../applications/audio/espeak { }; - espeak = res.espeak-ng; + espeak = super.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -12929,7 +12929,7 @@ with pkgs; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; - firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = super.wrapFirefox firefox-beta-bin-unwrapped { pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -12940,7 +12940,7 @@ with pkgs; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; }; - firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = super.wrapFirefox firefox-devedition-bin-unwrapped { nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; @@ -16815,7 +16815,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; }; - faust = res.faust2; + faust = super.faust2; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -17155,7 +17155,7 @@ with pkgs; mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver; mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper; - samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = super.samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile b/pkgs/unit/an/anystyle-cli/Gemfile similarity index 100% rename from pkgs/tools/misc/anystyle-cli/Gemfile rename to pkgs/unit/an/anystyle-cli/Gemfile diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/pkgs/unit/an/anystyle-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/anystyle-cli/Gemfile.lock rename to pkgs/unit/an/anystyle-cli/Gemfile.lock diff --git a/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/pkgs/unit/an/anystyle-cli/anystyle.gemspec similarity index 100% rename from pkgs/tools/misc/anystyle-cli/anystyle.gemspec rename to pkgs/unit/an/anystyle-cli/anystyle.gemspec diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/unit/co/common-updater-scripts/scripts/list-archive-two-levels-versions similarity index 100% rename from pkgs/common-updater/scripts/list-archive-two-levels-versions rename to pkgs/unit/co/common-updater-scripts/scripts/list-archive-two-levels-versions diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/unit/co/common-updater-scripts/scripts/list-directory-versions similarity index 100% rename from pkgs/common-updater/scripts/list-directory-versions rename to pkgs/unit/co/common-updater-scripts/scripts/list-directory-versions diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/unit/co/common-updater-scripts/scripts/list-git-tags similarity index 100% rename from pkgs/common-updater/scripts/list-git-tags rename to pkgs/unit/co/common-updater-scripts/scripts/list-git-tags diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/unit/co/common-updater-scripts/scripts/mark-broken similarity index 100% rename from pkgs/common-updater/scripts/mark-broken rename to pkgs/unit/co/common-updater-scripts/scripts/mark-broken diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/unit/co/common-updater-scripts/scripts/update-source-version similarity index 100% rename from pkgs/common-updater/scripts/update-source-version rename to pkgs/unit/co/common-updater-scripts/scripts/update-source-version diff --git a/pkgs/tools/misc/fx_cast/package-lock.json b/pkgs/unit/fx/fx_cast_bridge/package-lock.json similarity index 100% rename from pkgs/tools/misc/fx_cast/package-lock.json rename to pkgs/unit/fx/fx_cast_bridge/package-lock.json diff --git a/pkgs/tools/misc/fx_cast/package.json b/pkgs/unit/fx/fx_cast_bridge/package.json similarity index 100% rename from pkgs/tools/misc/fx_cast/package.json rename to pkgs/unit/fx/fx_cast_bridge/package.json diff --git a/pkgs/servers/monitoring/karma/generate-dependencies.sh b/pkgs/unit/ka/karma/generate-dependencies.sh similarity index 100% rename from pkgs/servers/monitoring/karma/generate-dependencies.sh rename to pkgs/unit/ka/karma/generate-dependencies.sh diff --git a/pkgs/servers/monitoring/karma/package.json b/pkgs/unit/ka/karma/package.json similarity index 100% rename from pkgs/servers/monitoring/karma/package.json rename to pkgs/unit/ka/karma/package.json diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/Cargo.toml similarity index 100% rename from pkgs/build-support/kernel/make-initrd-ng/Cargo.toml rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/Cargo.toml diff --git a/pkgs/build-support/kernel/make-initrd-ng/README.md b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/README.md similarity index 100% rename from pkgs/build-support/kernel/make-initrd-ng/README.md rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/README.md diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/src/main.rs similarity index 100% rename from pkgs/build-support/kernel/make-initrd-ng/src/main.rs rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/src/main.rs diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/unit/ma/mastodon/gemset.nix similarity index 100% rename from pkgs/servers/mastodon/gemset.nix rename to pkgs/unit/ma/mastodon/gemset.nix diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/unit/sc/schleuder/Gemfile similarity index 100% rename from pkgs/tools/security/schleuder/Gemfile rename to pkgs/unit/sc/schleuder/Gemfile diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/unit/sc/schleuder/Gemfile.lock similarity index 100% rename from pkgs/tools/security/schleuder/Gemfile.lock rename to pkgs/unit/sc/schleuder/Gemfile.lock diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/unit/sc/schleuder/gemset.nix similarity index 100% rename from pkgs/tools/security/schleuder/gemset.nix rename to pkgs/unit/sc/schleuder/gemset.nix diff --git a/pkgs/servers/monitoring/uptime-kuma/.npmrc b/pkgs/unit/up/uptime-kuma/.npmrc similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/.npmrc rename to pkgs/unit/up/uptime-kuma/.npmrc diff --git a/pkgs/servers/monitoring/uptime-kuma/package.json b/pkgs/unit/up/uptime-kuma/package.json similarity index 100% rename from pkgs/servers/monitoring/uptime-kuma/package.json rename to pkgs/unit/up/uptime-kuma/package.json From fd7080ee23633f174a524aca7d79c54979b9e3b8 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 15 May 2023 20:46:54 +0200 Subject: [PATCH 6/8] Update backport.yml --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f402376ebfb03..bd9f72cbf3f36 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -17,7 +17,7 @@ jobs: contents: write # for korthout/backport-action to create branch pull-requests: write # for korthout/backport-action to create PR to backport name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) + if: github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 60f90847d9cbf41fc7b10c85cc030a62ba636efe Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 15 May 2023 20:50:25 +0200 Subject: [PATCH 7/8] Testing backports for moved files --- pkgs/unit/he/heisenbridge/pkg-fun.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/unit/he/heisenbridge/pkg-fun.nix b/pkgs/unit/he/heisenbridge/pkg-fun.nix index db7d40ad35d5a..2535cfc9a8fc8 100644 --- a/pkgs/unit/he/heisenbridge/pkg-fun.nix +++ b/pkgs/unit/he/heisenbridge/pkg-fun.nix @@ -15,7 +15,7 @@ let }; in python.pkgs.buildPythonApplication rec { - pname = "heisenbridge"; + pname = "eisenbridge"; version = "1.13.1"; src = fetchFromGitHub { From 1b9cae47355feb8ce68ef8be33f13ae120a2745a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 15 May 2023 21:01:21 +0200 Subject: [PATCH 8/8] PR test 2 --- pkgs/unit/he/heisenbridge/pkg-fun.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/unit/he/heisenbridge/pkg-fun.nix b/pkgs/unit/he/heisenbridge/pkg-fun.nix index 2535cfc9a8fc8..a8414a0b1b0d4 100644 --- a/pkgs/unit/he/heisenbridge/pkg-fun.nix +++ b/pkgs/unit/he/heisenbridge/pkg-fun.nix @@ -39,6 +39,7 @@ in python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ pytestCheckHook + pytestCheckHook ]; meta = with lib; {