Run automatic migration

Using nixpkgs-architecture/nix-spp@e292b27
NixOS · Jan 20, 2023 · 9a44f9f · 9a44f9f
1 parent ddb1de2
commit 9a44f9f
Show file tree

Hide file tree

Showing 13,282 changed files with 404 additions and 21,569 deletions.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
diff --git a/...pplications/audio/AMB-plugins/default.nix → pkgs/unit/AM/AMB-plugins/pkg-fun.nix b/...pplications/audio/AMB-plugins/default.nix → pkgs/unit/AM/AMB-plugins/pkg-fun.nix
diff --git a/...erModManager/add-runtime-identifier.patch → ...erModManager/add-runtime-identifier.patch b/...erModManager/add-runtime-identifier.patch → ...erModManager/add-runtime-identifier.patch
diff --git a/pkgs/games/BeatSaberModManager/deps.nix → pkgs/unit/Be/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix → pkgs/unit/Be/BeatSaberModManager/deps.nix
diff --git a/pkgs/games/BeatSaberModManager/default.nix → pkgs/unit/Be/BeatSaberModManager/pkg-fun.nix b/pkgs/games/BeatSaberModManager/default.nix → pkgs/unit/Be/BeatSaberModManager/pkg-fun.nix
diff --git a/...lications/audio/CHOWTapeModel/default.nix → pkgs/unit/CH/CHOWTapeModel/pkg-fun.nix b/...lications/audio/CHOWTapeModel/default.nix → pkgs/unit/CH/CHOWTapeModel/pkg-fun.nix
diff --git a/...pplications/audio/ChowCentaur/default.nix → pkgs/unit/Ch/ChowCentaur/pkg-fun.nix b/...pplications/audio/ChowCentaur/default.nix → pkgs/unit/Ch/ChowCentaur/pkg-fun.nix
diff --git a/pkgs/applications/audio/ChowKick/default.nix → pkgs/unit/Ch/ChowKick/pkg-fun.nix b/pkgs/applications/audio/ChowKick/default.nix → pkgs/unit/Ch/ChowKick/pkg-fun.nix
diff --git a/...applications/audio/ChowPhaser/default.nix → pkgs/unit/Ch/ChowPhaser/pkg-fun.nix b/...applications/audio/ChowPhaser/default.nix → pkgs/unit/Ch/ChowPhaser/pkg-fun.nix
diff --git a/.../development/libraries/CoinMP/default.nix → pkgs/unit/Co/CoinMP/pkg-fun.nix b/.../development/libraries/CoinMP/default.nix → pkgs/unit/Co/CoinMP/pkg-fun.nix
diff --git a/...braries/science/biology/EBTKS/default.nix → pkgs/unit/EB/EBTKS/pkg-fun.nix b/...braries/science/biology/EBTKS/default.nix → pkgs/unit/EB/EBTKS/pkg-fun.nix
diff --git a/...-bundle-system-glm-in-seriousproton.patch → ...-bundle-system-glm-in-seriousproton.patch b/...-bundle-system-glm-in-seriousproton.patch → ...-bundle-system-glm-in-seriousproton.patch
diff --git a/pkgs/games/empty-epsilon/default.nix → pkgs/unit/Em/EmptyEpsilon/pkg-fun.nix b/pkgs/games/empty-epsilon/default.nix → pkgs/unit/Em/EmptyEpsilon/pkg-fun.nix
diff --git a/...pplications/audio/FIL-plugins/default.nix → pkgs/unit/FI/FIL-plugins/pkg-fun.nix b/...pplications/audio/FIL-plugins/default.nix → pkgs/unit/FI/FIL-plugins/pkg-fun.nix
diff --git a/...pplications/misc/HentaiAtHome/default.nix → pkgs/unit/He/HentaiAtHome/pkg-fun.nix b/...pplications/misc/HentaiAtHome/default.nix → pkgs/unit/He/HentaiAtHome/pkg-fun.nix
diff --git a/...t/libraries/LAStools/drop-64-suffix.patch → pkgs/unit/LA/LAStools/drop-64-suffix.patch b/...t/libraries/LAStools/drop-64-suffix.patch → pkgs/unit/LA/LAStools/drop-64-suffix.patch
diff --git a/...evelopment/libraries/LAStools/default.nix → pkgs/unit/LA/LAStools/pkg-fun.nix b/...evelopment/libraries/LAStools/default.nix → pkgs/unit/LA/LAStools/pkg-fun.nix
diff --git a/.../development/libraries/LASzip/default.nix → pkgs/unit/LA/LASzip/pkg-fun.nix b/.../development/libraries/LASzip/default.nix → pkgs/unit/LA/LASzip/pkg-fun.nix
diff --git a/.../development/libraries/LASzip/LASzip2.nix → pkgs/unit/LA/LASzip2/pkg-fun.nix b/.../development/libraries/LASzip/LASzip2.nix → pkgs/unit/LA/LASzip2/pkg-fun.nix
diff --git a/pkgs/applications/audio/LibreArp/lv2.nix → pkgs/unit/Li/LibreArp-lv2/pkg-fun.nix b/pkgs/applications/audio/LibreArp/lv2.nix → pkgs/unit/Li/LibreArp-lv2/pkg-fun.nix
diff --git a/pkgs/applications/audio/LibreArp/default.nix → pkgs/unit/Li/LibreArp/pkg-fun.nix b/pkgs/applications/audio/LibreArp/default.nix → pkgs/unit/Li/LibreArp/pkg-fun.nix
diff --git a/...literate-programming/Literate/default.nix → pkgs/unit/Li/Literate/pkg-fun.nix b/...literate-programming/Literate/default.nix → pkgs/unit/Li/Literate/pkg-fun.nix
diff --git a/...cations/science/biology/MACS2/default.nix → pkgs/unit/MA/MACS2/pkg-fun.nix b/...cations/science/biology/MACS2/default.nix → pkgs/unit/MA/MACS2/pkg-fun.nix
diff --git a/pkgs/applications/audio/MMA/default.nix → pkgs/unit/MM/MMA/pkg-fun.nix b/pkgs/applications/audio/MMA/default.nix → pkgs/unit/MM/MMA/pkg-fun.nix
diff --git a/...development/libraries/NSPlist/default.nix → pkgs/unit/NS/NSPlist/pkg-fun.nix b/...development/libraries/NSPlist/default.nix → pkgs/unit/NS/NSPlist/pkg-fun.nix
diff --git a/...aries/science/math/QuadProgpp/default.nix → pkgs/unit/Qu/QuadProgpp/pkg-fun.nix b/...aries/science/math/QuadProgpp/default.nix → pkgs/unit/Qu/QuadProgpp/pkg-fun.nix
diff --git a/...evelopment/libraries/SDL2_gfx/default.nix → pkgs/unit/SD/SDL2_gfx/pkg-fun.nix b/...evelopment/libraries/SDL2_gfx/default.nix → pkgs/unit/SD/SDL2_gfx/pkg-fun.nix
diff --git a/...evelopment/libraries/SDL2_net/default.nix → pkgs/unit/SD/SDL2_net/pkg-fun.nix b/...evelopment/libraries/SDL2_net/default.nix → pkgs/unit/SD/SDL2_net/pkg-fun.nix
diff --git a/...evelopment/libraries/SDL2_ttf/default.nix → pkgs/unit/SD/SDL2_ttf/pkg-fun.nix b/...evelopment/libraries/SDL2_ttf/default.nix → pkgs/unit/SD/SDL2_ttf/pkg-fun.nix
diff --git a/...development/libraries/SDL2_ttf/2.0.15.nix → pkgs/unit/SD/SDL2_ttf_2_0_15/pkg-fun.nix b/...development/libraries/SDL2_ttf/2.0.15.nix → pkgs/unit/SD/SDL2_ttf_2_0_15/pkg-fun.nix
diff --git a/...velopment/libraries/SDL_Pango/fixes.patch → pkgs/unit/SD/SDL_Pango/fixes.patch b/...velopment/libraries/SDL_Pango/fixes.patch → pkgs/unit/SD/SDL_Pango/fixes.patch
diff --git a/...velopment/libraries/SDL_Pango/default.nix → pkgs/unit/SD/SDL_Pango/pkg-fun.nix b/...velopment/libraries/SDL_Pango/default.nix → pkgs/unit/SD/SDL_Pango/pkg-fun.nix
diff --git a/...opment/libraries/SDL_audiolib/default.nix → pkgs/unit/SD/SDL_audiolib/pkg-fun.nix b/...opment/libraries/SDL_audiolib/default.nix → pkgs/unit/SD/SDL_audiolib/pkg-fun.nix
diff --git a/...development/libraries/SDL_gfx/default.nix → pkgs/unit/SD/SDL_gfx/pkg-fun.nix b/...development/libraries/SDL_gfx/default.nix → pkgs/unit/SD/SDL_gfx/pkg-fun.nix
diff --git a/...development/libraries/SDL_gpu/default.nix → pkgs/unit/SD/SDL_gpu/pkg-fun.nix b/...development/libraries/SDL_gpu/default.nix → pkgs/unit/SD/SDL_gpu/pkg-fun.nix
diff --git a/...velopment/libraries/SDL_image/default.nix → pkgs/unit/SD/SDL_image/pkg-fun.nix b/...velopment/libraries/SDL_image/default.nix → pkgs/unit/SD/SDL_image/pkg-fun.nix
diff --git a/...velopment/libraries/SDL_mixer/default.nix → pkgs/unit/SD/SDL_mixer/pkg-fun.nix b/...velopment/libraries/SDL_mixer/default.nix → pkgs/unit/SD/SDL_mixer/pkg-fun.nix
diff --git a/...development/libraries/SDL_net/default.nix → pkgs/unit/SD/SDL_net/pkg-fun.nix b/...development/libraries/SDL_net/default.nix → pkgs/unit/SD/SDL_net/pkg-fun.nix
diff --git a/...velopment/libraries/SDL_sixel/default.nix → pkgs/unit/SD/SDL_sixel/pkg-fun.nix b/...velopment/libraries/SDL_sixel/default.nix → pkgs/unit/SD/SDL_sixel/pkg-fun.nix
diff --git a/...velopment/libraries/SDL_sound/default.nix → pkgs/unit/SD/SDL_sound/pkg-fun.nix b/...velopment/libraries/SDL_sound/default.nix → pkgs/unit/SD/SDL_sound/pkg-fun.nix
diff --git a/...lopment/libraries/SDL_stretch/default.nix → pkgs/unit/SD/SDL_stretch/pkg-fun.nix b/...lopment/libraries/SDL_stretch/default.nix → pkgs/unit/SD/SDL_stretch/pkg-fun.nix
diff --git a/...development/libraries/SDL_ttf/default.nix → pkgs/unit/SD/SDL_ttf/pkg-fun.nix b/...development/libraries/SDL_ttf/default.nix → pkgs/unit/SD/SDL_ttf/pkg-fun.nix
diff --git a/...ations/science/biology/spades/default.nix → pkgs/unit/SP/SPAdes/pkg-fun.nix b/...ations/science/biology/spades/default.nix → pkgs/unit/SP/SPAdes/pkg-fun.nix
diff --git a/...nstant-messengers/SkypeExport/default.nix → pkgs/unit/Sk/SkypeExport/pkg-fun.nix b/...nstant-messengers/SkypeExport/default.nix → pkgs/unit/Sk/SkypeExport/pkg-fun.nix
diff --git a/...evelopment/libraries/StormLib/default.nix → pkgs/unit/St/StormLib/pkg-fun.nix b/...evelopment/libraries/StormLib/default.nix → pkgs/unit/St/StormLib/pkg-fun.nix
diff --git a/.../applications/networking/Sylk/default.nix → pkgs/unit/Sy/Sylk/pkg-fun.nix b/.../applications/networking/Sylk/default.nix → pkgs/unit/Sy/Sylk/pkg-fun.nix
diff --git a/.../molecular-dynamics/viennarna/default.nix → pkgs/unit/Vi/ViennaRNA/pkg-fun.nix b/.../molecular-dynamics/viennarna/default.nix → pkgs/unit/Vi/ViennaRNA/pkg-fun.nix
diff --git a/pkgs/development/libraries/Xaw3d/default.nix → pkgs/unit/Xa/Xaw3d/pkg-fun.nix b/pkgs/development/libraries/Xaw3d/default.nix → pkgs/unit/Xa/Xaw3d/pkg-fun.nix
diff --git a/pkgs/games/0verkill/default.nix → pkgs/unit/_0/_0verkill/pkg-fun.nix b/pkgs/games/0verkill/default.nix → pkgs/unit/_0/_0verkill/pkg-fun.nix
diff --git a/pkgs/tools/misc/0x/add-Cargo-lock.diff → pkgs/unit/_0/_0x/add-Cargo-lock.diff b/pkgs/tools/misc/0x/add-Cargo-lock.diff → pkgs/unit/_0/_0x/add-Cargo-lock.diff
diff --git a/pkgs/tools/misc/0x/default.nix → pkgs/unit/_0/_0x/pkg-fun.nix b/pkgs/tools/misc/0x/default.nix → pkgs/unit/_0/_0x/pkg-fun.nix
diff --git a/pkgs/games/1oom/default.nix → pkgs/unit/_1/_1oom/pkg-fun.nix b/pkgs/games/1oom/default.nix → pkgs/unit/_1/_1oom/pkg-fun.nix
diff --git a/pkgs/applications/misc/1password/default.nix → pkgs/unit/_1/_1password/pkg-fun.nix b/pkgs/applications/misc/1password/default.nix → pkgs/unit/_1/_1password/pkg-fun.nix
diff --git a/pkgs/games/2048-in-terminal/default.nix → pkgs/unit/_2/_2048-in-terminal/pkg-fun.nix b/pkgs/games/2048-in-terminal/default.nix → pkgs/unit/_2/_2048-in-terminal/pkg-fun.nix
diff --git a/pkgs/games/20kly/default.nix → pkgs/unit/_2/_20kly/pkg-fun.nix b/pkgs/games/20kly/default.nix → pkgs/unit/_2/_20kly/pkg-fun.nix
diff --git a/pkgs/data/fonts/3270font/default.nix → pkgs/unit/_3/_3270font/pkg-fun.nix b/pkgs/data/fonts/3270font/default.nix → pkgs/unit/_3/_3270font/pkg-fun.nix
diff --git a/pkgs/servers/ldap/389/default.nix → pkgs/unit/_3/_389-ds-base/pkg-fun.nix b/pkgs/servers/ldap/389/default.nix → pkgs/unit/_3/_389-ds-base/pkg-fun.nix
diff --git a/pkgs/tools/misc/3llo/Gemfile → pkgs/unit/_3/_3llo/Gemfile b/pkgs/tools/misc/3llo/Gemfile → pkgs/unit/_3/_3llo/Gemfile
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock → pkgs/unit/_3/_3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock → pkgs/unit/_3/_3llo/Gemfile.lock
diff --git a/pkgs/tools/misc/3llo/gemset.nix → pkgs/unit/_3/_3llo/gemset.nix b/pkgs/tools/misc/3llo/gemset.nix → pkgs/unit/_3/_3llo/gemset.nix
diff --git a/pkgs/tools/misc/3llo/default.nix → pkgs/unit/_3/_3llo/pkg-fun.nix b/pkgs/tools/misc/3llo/default.nix → pkgs/unit/_3/_3llo/pkg-fun.nix
diff --git a/pkgs/tools/misc/3mux/default.nix → pkgs/unit/_3/_3mux/pkg-fun.nix b/pkgs/tools/misc/3mux/default.nix → pkgs/unit/_3/_3mux/pkg-fun.nix
diff --git a/...pplications/networking/3proxy/default.nix → pkgs/unit/_3/_3proxy/pkg-fun.nix b/...pplications/networking/3proxy/default.nix → pkgs/unit/_3/_3proxy/pkg-fun.nix
diff --git a/...mpilers/4th/001-install-manual-fixup.diff → ...nit/_4/_4th/001-install-manual-fixup.diff b/...mpilers/4th/001-install-manual-fixup.diff → ...nit/_4/_4th/001-install-manual-fixup.diff
diff --git a/pkgs/development/compilers/4th/default.nix → pkgs/unit/_4/_4th/pkg-fun.nix b/pkgs/development/compilers/4th/default.nix → pkgs/unit/_4/_4th/pkg-fun.nix
diff --git a/...pplications/science/math/4ti2/default.nix → pkgs/unit/_4/_4ti2/pkg-fun.nix b/...pplications/science/math/4ti2/default.nix → pkgs/unit/_4/_4ti2/pkg-fun.nix
diff --git a/pkgs/tools/networking/6tunnel/default.nix → pkgs/unit/_6/_6tunnel/pkg-fun.nix b/pkgs/tools/networking/6tunnel/default.nix → pkgs/unit/_6/_6tunnel/pkg-fun.nix
diff --git a/pkgs/games/7kaa/default.nix → pkgs/unit/_7/_7kaa/pkg-fun.nix b/pkgs/games/7kaa/default.nix → pkgs/unit/_7/_7kaa/pkg-fun.nix
diff --git a/...-specific/linux/915resolution/default.nix → pkgs/unit/_9/_915resolution/pkg-fun.nix b/...-specific/linux/915resolution/default.nix → pkgs/unit/_9/_915resolution/pkg-fun.nix
diff --git a/pkgs/applications/misc/9menu/default.nix → pkgs/unit/_9/_9menu/pkg-fun.nix b/pkgs/applications/misc/9menu/default.nix → pkgs/unit/_9/_9menu/pkg-fun.nix
diff --git a/...s/filesystems/9pfs/fix-darwin-build.patch → pkgs/unit/_9/_9pfs/fix-darwin-build.patch b/...s/filesystems/9pfs/fix-darwin-build.patch → pkgs/unit/_9/_9pfs/fix-darwin-build.patch
diff --git a/pkgs/tools/filesystems/9pfs/default.nix → pkgs/unit/_9/_9pfs/pkg-fun.nix b/pkgs/tools/filesystems/9pfs/default.nix → pkgs/unit/_9/_9pfs/pkg-fun.nix
diff --git a/pkgs/common-updater/combinators.nix → ...tal-update-script-combinators/pkg-fun.nix b/pkgs/common-updater/combinators.nix → ...tal-update-script-combinators/pkg-fun.nix
diff --git a/pkgs/applications/audio/a2jmidid/default.nix → pkgs/unit/a2/a2jmidid/pkg-fun.nix b/pkgs/applications/audio/a2jmidid/default.nix → pkgs/unit/a2/a2jmidid/pkg-fun.nix
diff --git a/pkgs/tools/text/a2ps/default.nix → pkgs/unit/a2/a2ps/pkg-fun.nix b/pkgs/tools/text/a2ps/default.nix → pkgs/unit/a2/a2ps/pkg-fun.nix
diff --git a/.../development/libraries/a52dec/default.nix → pkgs/unit/a5/a52dec/pkg-fun.nix b/.../development/libraries/a52dec/default.nix → pkgs/unit/a5/a52dec/pkg-fun.nix
diff --git a/pkgs/tools/misc/aaa/default.nix → pkgs/unit/aa/aaa/pkg-fun.nix b/pkgs/tools/misc/aaa/default.nix → pkgs/unit/aa/aaa/pkg-fun.nix
diff --git a/pkgs/applications/audio/aacgain/default.nix → pkgs/unit/aa/aacgain/pkg-fun.nix b/pkgs/applications/audio/aacgain/default.nix → pkgs/unit/aa/aacgain/pkg-fun.nix
diff --git a/.../development/libraries/aalib/darwin.patch → pkgs/unit/aa/aalib/darwin.patch b/.../development/libraries/aalib/darwin.patch → pkgs/unit/aa/aalib/darwin.patch
diff --git a/pkgs/development/libraries/aalib/default.nix → pkgs/unit/aa/aalib/pkg-fun.nix b/pkgs/development/libraries/aalib/default.nix → pkgs/unit/aa/aalib/pkg-fun.nix
diff --git a/pkgs/tools/graphics/aaphoto/default.nix → pkgs/unit/aa/aaphoto/pkg-fun.nix b/pkgs/tools/graphics/aaphoto/default.nix → pkgs/unit/aa/aaphoto/pkg-fun.nix
diff --git a/...tools/networking/aardvark-dns/default.nix → pkgs/unit/aa/aardvark-dns/pkg-fun.nix b/...tools/networking/aardvark-dns/default.nix → pkgs/unit/aa/aardvark-dns/pkg-fun.nix
diff --git a/pkgs/applications/audio/aaxtomp3/default.nix → pkgs/unit/aa/aaxtomp3/pkg-fun.nix b/pkgs/applications/audio/aaxtomp3/default.nix → pkgs/unit/aa/aaxtomp3/pkg-fun.nix
diff --git a/pkgs/games/abbaye-des-morts/default.nix → pkgs/unit/ab/abbaye-des-morts/pkg-fun.nix b/pkgs/games/abbaye-des-morts/default.nix → pkgs/unit/ab/abbaye-des-morts/pkg-fun.nix
diff --git a/...pplications/science/logic/abc/default.nix → pkgs/unit/ab/abc-verifier/pkg-fun.nix b/...pplications/science/logic/abc/default.nix → pkgs/unit/ab/abc-verifier/pkg-fun.nix
diff --git a/pkgs/development/compilers/abcl/default.nix → pkgs/unit/ab/abcl/pkg-fun.nix b/pkgs/development/compilers/abcl/default.nix → pkgs/unit/ab/abcl/pkg-fun.nix
diff --git a/pkgs/tools/audio/abcm2ps/default.nix → pkgs/unit/ab/abcm2ps/pkg-fun.nix b/pkgs/tools/audio/abcm2ps/default.nix → pkgs/unit/ab/abcm2ps/pkg-fun.nix
diff --git a/pkgs/tools/audio/abcmidi/default.nix → pkgs/unit/ab/abcmidi/pkg-fun.nix b/pkgs/tools/audio/abcmidi/default.nix → pkgs/unit/ab/abcmidi/pkg-fun.nix
diff --git a/pkgs/tools/misc/abduco/default.nix → pkgs/unit/ab/abduco/pkg-fun.nix b/pkgs/tools/misc/abduco/default.nix → pkgs/unit/ab/abduco/pkg-fun.nix
diff --git a/...s/misc/abi-compliance-checker/default.nix → ...nit/ab/abi-compliance-checker/pkg-fun.nix b/...s/misc/abi-compliance-checker/default.nix → ...nit/ab/abi-compliance-checker/pkg-fun.nix
diff --git a/...lopment/tools/misc/abi-dumper/default.nix → pkgs/unit/ab/abi-dumper/pkg-fun.nix b/...lopment/tools/misc/abi-dumper/default.nix → pkgs/unit/ab/abi-dumper/pkg-fun.nix
diff --git a/pkgs/applications/office/abiword/default.nix → pkgs/unit/ab/abiword/pkg-fun.nix b/pkgs/applications/office/abiword/default.nix → pkgs/unit/ab/abiword/pkg-fun.nix
diff --git a/pkgs/applications/misc/ablog/default.nix → pkgs/unit/ab/ablog/pkg-fun.nix b/pkgs/applications/misc/ablog/default.nix → pkgs/unit/ab/ablog/pkg-fun.nix
diff --git a/pkgs/applications/misc/abook/default.nix → pkgs/unit/ab/abook/pkg-fun.nix b/pkgs/applications/misc/abook/default.nix → pkgs/unit/ab/abook/pkg-fun.nix
diff --git a/pkgs/development/mobile/abootimg/default.nix → pkgs/unit/ab/abootimg/pkg-fun.nix b/pkgs/development/mobile/abootimg/default.nix → pkgs/unit/ab/abootimg/pkg-fun.nix
diff --git a/...velopment/libraries/abseil-cpp/202103.nix → pkgs/unit/ab/abseil-cpp_202103/pkg-fun.nix b/...velopment/libraries/abseil-cpp/202103.nix → pkgs/unit/ab/abseil-cpp_202103/pkg-fun.nix
diff --git a/...velopment/libraries/abseil-cpp/202111.nix → pkgs/unit/ab/abseil-cpp_202111/pkg-fun.nix b/...velopment/libraries/abseil-cpp/202111.nix → pkgs/unit/ab/abseil-cpp_202111/pkg-fun.nix
diff --git a/...velopment/libraries/abseil-cpp/202206.nix → pkgs/unit/ab/abseil-cpp_202206/pkg-fun.nix b/...velopment/libraries/abseil-cpp/202206.nix → pkgs/unit/ab/abseil-cpp_202206/pkg-fun.nix
diff --git a/pkgs/development/tools/abuild/default.nix → pkgs/unit/ab/abuild/pkg-fun.nix b/pkgs/development/tools/abuild/default.nix → pkgs/unit/ab/abuild/pkg-fun.nix
diff --git a/pkgs/games/abuse/abuse.sh → pkgs/unit/ab/abuse/abuse.sh b/pkgs/games/abuse/abuse.sh → pkgs/unit/ab/abuse/abuse.sh
diff --git a/pkgs/games/abuse/default.nix → pkgs/unit/ab/abuse/pkg-fun.nix b/pkgs/games/abuse/default.nix → pkgs/unit/ab/abuse/pkg-fun.nix
diff --git a/...mputer-architecture/accelergy/default.nix → pkgs/unit/ac/accelergy/pkg-fun.nix b/...mputer-architecture/accelergy/default.nix → pkgs/unit/ac/accelergy/pkg-fun.nix
diff --git a/...le-methods-that-change-files-in-etc.patch → ...le-methods-that-change-files-in-etc.patch b/...le-methods-that-change-files-in-etc.patch → ...le-methods-that-change-files-in-etc.patch
diff --git a/...ervice/drop-prefix-check-extensions.patch → ...ervice/drop-prefix-check-extensions.patch b/...ervice/drop-prefix-check-extensions.patch → ...ervice/drop-prefix-check-extensions.patch
diff --git a/...libraries/accountsservice/fix-paths.patch → pkgs/unit/ac/accountsservice/fix-paths.patch b/...libraries/accountsservice/fix-paths.patch → pkgs/unit/ac/accountsservice/fix-paths.patch
diff --git a/...ries/accountsservice/no-create-dirs.patch → ...t/ac/accountsservice/no-create-dirs.patch b/...ries/accountsservice/no-create-dirs.patch → ...t/ac/accountsservice/no-create-dirs.patch
diff --git a/...ent/libraries/accountsservice/default.nix → pkgs/unit/ac/accountsservice/pkg-fun.nix b/...ent/libraries/accountsservice/default.nix → pkgs/unit/ac/accountsservice/pkg-fun.nix
diff --git a/pkgs/tools/system/acct/default.nix → pkgs/unit/ac/acct/pkg-fun.nix b/pkgs/tools/system/acct/default.nix → pkgs/unit/ac/acct/pkg-fun.nix
diff --git a/...ls/audio/accuraterip-checksum/default.nix → .../unit/ac/accuraterip-checksum/pkg-fun.nix b/...ls/audio/accuraterip-checksum/default.nix → .../unit/ac/accuraterip-checksum/pkg-fun.nix
diff --git a/...e-of-penguins/fixup-miscompilations.patch → ...e-of-penguins/fixup-miscompilations.patch b/...e-of-penguins/fixup-miscompilations.patch → ...e-of-penguins/fixup-miscompilations.patch
diff --git a/pkgs/games/ace-of-penguins/default.nix → pkgs/unit/ac/ace-of-penguins/pkg-fun.nix b/pkgs/games/ace-of-penguins/default.nix → pkgs/unit/ac/ace-of-penguins/pkg-fun.nix
diff --git a/pkgs/development/libraries/ace/default.nix → pkgs/unit/ac/ace/pkg-fun.nix b/pkgs/development/libraries/ace/default.nix → pkgs/unit/ac/ace/pkg-fun.nix
diff --git a/...lications/science/logic/acgtk/default.nix → pkgs/unit/ac/acgtk/pkg-fun.nix b/...lications/science/logic/acgtk/default.nix → pkgs/unit/ac/acgtk/pkg-fun.nix
diff --git a/pkgs/development/libraries/acl/default.nix → pkgs/unit/ac/acl/pkg-fun.nix b/pkgs/development/libraries/acl/default.nix → pkgs/unit/ac/acl/pkg-fun.nix
diff --git a/pkgs/tools/admin/acme-sh/default.nix → pkgs/unit/ac/acme-sh/pkg-fun.nix b/pkgs/tools/admin/acme-sh/default.nix → pkgs/unit/ac/acme-sh/pkg-fun.nix
diff --git a/pkgs/development/compilers/acme/default.nix → pkgs/unit/ac/acme/pkg-fun.nix b/pkgs/development/compilers/acme/default.nix → pkgs/unit/ac/acme/pkg-fun.nix
diff --git a/...ions/networking/cluster/acorn/default.nix → pkgs/unit/ac/acorn/pkg-fun.nix b/...ions/networking/cluster/acorn/default.nix → pkgs/unit/ac/acorn/pkg-fun.nix
diff --git a/...s/audio/acousticbrainz-client/default.nix → ...unit/ac/acousticbrainz-client/pkg-fun.nix b/...s/audio/acousticbrainz-client/default.nix → ...unit/ac/acousticbrainz-client/pkg-fun.nix
diff --git a/.../audio/acoustid-fingerprinter/default.nix → ...unit/ac/acoustidFingerprinter/pkg-fun.nix b/.../audio/acoustid-fingerprinter/default.nix → ...unit/ac/acoustidFingerprinter/pkg-fun.nix
diff --git a/pkgs/os-specific/linux/acpi/default.nix → pkgs/unit/ac/acpi/pkg-fun.nix b/pkgs/os-specific/linux/acpi/default.nix → pkgs/unit/ac/acpi/pkg-fun.nix
diff --git a/pkgs/tools/system/acpica-tools/default.nix → pkgs/unit/ac/acpica-tools/pkg-fun.nix b/pkgs/tools/system/acpica-tools/default.nix → pkgs/unit/ac/acpica-tools/pkg-fun.nix
diff --git a/pkgs/os-specific/linux/acpid/default.nix → pkgs/unit/ac/acpid/pkg-fun.nix b/pkgs/os-specific/linux/acpid/default.nix → pkgs/unit/ac/acpid/pkg-fun.nix
diff --git a/pkgs/misc/acpilight/default.nix → pkgs/unit/ac/acpilight/pkg-fun.nix b/pkgs/misc/acpilight/default.nix → pkgs/unit/ac/acpilight/pkg-fun.nix
diff --git a/pkgs/os-specific/linux/acpitool/default.nix → pkgs/unit/ac/acpitool/pkg-fun.nix b/pkgs/os-specific/linux/acpitool/default.nix → pkgs/unit/ac/acpitool/pkg-fun.nix
diff --git a/pkgs/development/tools/misc/acr/default.nix → pkgs/unit/ac/acr/pkg-fun.nix b/pkgs/development/tools/misc/acr/default.nix → pkgs/unit/ac/acr/pkg-fun.nix
diff --git a/pkgs/tools/security/acsccid/default.nix → pkgs/unit/ac/acsccid/pkg-fun.nix b/pkgs/tools/security/acsccid/default.nix → pkgs/unit/ac/acsccid/pkg-fun.nix
diff --git a/pkgs/development/tools/misc/act/default.nix → pkgs/unit/ac/act/pkg-fun.nix b/pkgs/development/tools/misc/act/default.nix → pkgs/unit/ac/act/pkg-fun.nix
diff --git a/...ent/tools/analysis/actionlint/default.nix → pkgs/unit/ac/actionlint/pkg-fun.nix b/...ent/tools/analysis/actionlint/default.nix → pkgs/unit/ac/actionlint/pkg-fun.nix
diff --git a/...lications/misc/activate-linux/default.nix → pkgs/unit/ac/activate-linux/pkg-fun.nix b/...lications/misc/activate-linux/default.nix → pkgs/unit/ac/activate-linux/pkg-fun.nix
diff --git a/...ent/libraries/apache-activemq/default.nix → pkgs/unit/ac/activemq/pkg-fun.nix b/...ent/libraries/apache-activemq/default.nix → pkgs/unit/ac/activemq/pkg-fun.nix
diff --git a/pkgs/tools/system/actkbd/default.nix → pkgs/unit/ac/actkbd/pkg-fun.nix b/pkgs/tools/system/actkbd/default.nix → pkgs/unit/ac/actkbd/pkg-fun.nix
diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix → pkgs/unit/ad/adafruit-ampy/pkg-fun.nix b/pkgs/tools/misc/adafruit-ampy/default.nix → pkgs/unit/ad/adafruit-ampy/pkg-fun.nix
diff --git a/.../data/misc/adapta-backgrounds/default.nix → pkgs/unit/ad/adapta-backgrounds/pkg-fun.nix b/.../data/misc/adapta-backgrounds/default.nix → pkgs/unit/ad/adapta-backgrounds/pkg-fun.nix
diff --git a/pkgs/data/themes/adapta/default.nix → pkgs/unit/ad/adapta-gtk-theme/pkg-fun.nix b/pkgs/data/themes/adapta/default.nix → pkgs/unit/ad/adapta-gtk-theme/pkg-fun.nix
diff --git a/pkgs/data/themes/adapta-kde/default.nix → pkgs/unit/ad/adapta-kde-theme/pkg-fun.nix b/pkgs/data/themes/adapta-kde/default.nix → pkgs/unit/ad/adapta-kde-theme/pkg-fun.nix
diff --git a/pkgs/os-specific/linux/adcli/default.nix → pkgs/unit/ad/adcli/pkg-fun.nix b/pkgs/os-specific/linux/adcli/default.nix → pkgs/unit/ad/adcli/pkg-fun.nix
diff --git a/...ld-support/add-opengl-runpath/default.nix → pkgs/unit/ad/addOpenGLRunpath/pkg-fun.nix b/...ld-support/add-opengl-runpath/default.nix → pkgs/unit/ad/addOpenGLRunpath/pkg-fun.nix
diff --git a/...-support/add-opengl-runpath/setup-hook.sh → pkgs/unit/ad/addOpenGLRunpath/setup-hook.sh b/...-support/add-opengl-runpath/setup-hook.sh → pkgs/unit/ad/addOpenGLRunpath/setup-hook.sh
diff --git a/pkgs/tools/misc/addic7ed-cli/default.nix → pkgs/unit/ad/addic7ed-cli/pkg-fun.nix b/pkgs/tools/misc/addic7ed-cli/default.nix → pkgs/unit/ad/addic7ed-cli/pkg-fun.nix
diff --git a/pkgs/tools/misc/addlicense/default.nix → pkgs/unit/ad/addlicense/pkg-fun.nix b/pkgs/tools/misc/addlicense/default.nix → pkgs/unit/ad/addlicense/pkg-fun.nix
diff --git a/pkgs/data/themes/adementary/default.nix → pkgs/unit/ad/adementary-theme/pkg-fun.nix b/pkgs/data/themes/adementary/default.nix → pkgs/unit/ad/adementary-theme/pkg-fun.nix
diff --git a/pkgs/tools/security/adenum/default.nix → pkgs/unit/ad/adenum/pkg-fun.nix b/pkgs/tools/security/adenum/default.nix → pkgs/unit/ad/adenum/pkg-fun.nix
diff --git a/pkgs/servers/adguardhome/bins.nix → pkgs/unit/ad/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix → pkgs/unit/ad/adguardhome/bins.nix
diff --git a/pkgs/servers/adguardhome/default.nix → pkgs/unit/ad/adguardhome/pkg-fun.nix b/pkgs/servers/adguardhome/default.nix → pkgs/unit/ad/adguardhome/pkg-fun.nix
diff --git a/pkgs/servers/adguardhome/update.sh → pkgs/unit/ad/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh → pkgs/unit/ad/adguardhome/update.sh
diff --git a/pkgs/applications/video/adl/default.nix → pkgs/unit/ad/adl/pkg-fun.nix b/pkgs/applications/video/adl/default.nix → pkgs/unit/ad/adl/pkg-fun.nix
diff --git a/pkgs/servers/adminer/default.nix → pkgs/unit/ad/adminer/pkg-fun.nix b/pkgs/servers/adminer/default.nix → pkgs/unit/ad/adminer/pkg-fun.nix
diff --git a/...ions/science/electronics/adms/default.nix → pkgs/unit/ad/adms/pkg-fun.nix b/...ions/science/electronics/adms/default.nix → pkgs/unit/ad/adms/pkg-fun.nix
diff --git a/pkgs/development/libraries/adns/default.nix → pkgs/unit/ad/adns/pkg-fun.nix b/pkgs/development/libraries/adns/default.nix → pkgs/unit/ad/adns/pkg-fun.nix
diff --git a/...plications/science/math/adolc/default.nix → pkgs/unit/ad/adolc/pkg-fun.nix b/...plications/science/math/adolc/default.nix → pkgs/unit/ad/adolc/pkg-fun.nix
diff --git a/pkgs/games/adom/default.nix → pkgs/unit/ad/adom/pkg-fun.nix b/pkgs/games/adom/default.nix → pkgs/unit/ad/adom/pkg-fun.nix
diff --git a/pkgs/tools/security/adreaper/default.nix → pkgs/unit/ad/adreaper/pkg-fun.nix b/pkgs/tools/security/adreaper/default.nix → pkgs/unit/ad/adreaper/pkg-fun.nix
diff --git a/pkgs/tools/misc/adrgen/default.nix → pkgs/unit/ad/adrgen/pkg-fun.nix b/pkgs/tools/misc/adrgen/default.nix → pkgs/unit/ad/adrgen/pkg-fun.nix
diff --git a/pkgs/tools/graphics/adriconf/default.nix → pkgs/unit/ad/adriconf/pkg-fun.nix b/pkgs/tools/graphics/adriconf/default.nix → pkgs/unit/ad/adriconf/pkg-fun.nix
diff --git a/.../development/libraries/adslib/default.nix → pkgs/unit/ad/adslib/pkg-fun.nix b/.../development/libraries/adslib/default.nix → pkgs/unit/ad/adslib/pkg-fun.nix
diff --git a/pkgs/tools/admin/adtool/default.nix → pkgs/unit/ad/adtool/pkg-fun.nix b/pkgs/tools/admin/adtool/default.nix → pkgs/unit/ad/adtool/pkg-fun.nix
diff --git a/...tools/compression/advancecomp/default.nix → pkgs/unit/ad/advancecomp/pkg-fun.nix b/...tools/compression/advancecomp/default.nix → pkgs/unit/ad/advancecomp/pkg-fun.nix
diff --git a/pkgs/data/themes/adw-gtk3/default.nix → pkgs/unit/ad/adw-gtk3/pkg-fun.nix b/pkgs/data/themes/adw-gtk3/default.nix → pkgs/unit/ad/adw-gtk3/pkg-fun.nix
diff --git a/pkgs/tools/filesystems/aefs/default.nix → pkgs/unit/ae/aefs/pkg-fun.nix b/pkgs/tools/filesystems/aefs/default.nix → pkgs/unit/ae/aefs/pkg-fun.nix
diff --git a/pkgs/applications/audio/aeolus/default.nix → pkgs/unit/ae/aeolus/pkg-fun.nix b/pkgs/applications/audio/aeolus/default.nix → pkgs/unit/ae/aeolus/pkg-fun.nix
diff --git a/...s/networking/mailreaders/aerc/default.nix → pkgs/unit/ae/aerc/pkg-fun.nix b/...s/networking/mailreaders/aerc/default.nix → pkgs/unit/ae/aerc/pkg-fun.nix
diff --git a/...g/mailreaders/aerc/runtime-sharedir.patch → pkgs/unit/ae/aerc/runtime-sharedir.patch b/...g/mailreaders/aerc/runtime-sharedir.patch → pkgs/unit/ae/aerc/runtime-sharedir.patch
diff --git a/pkgs/servers/nosql/aerospike/default.nix → pkgs/unit/ae/aerospike/pkg-fun.nix b/pkgs/servers/nosql/aerospike/default.nix → pkgs/unit/ae/aerospike/pkg-fun.nix
diff --git a/pkgs/tools/misc/aescrypt/default.nix → pkgs/unit/ae/aescrypt/pkg-fun.nix b/pkgs/tools/misc/aescrypt/default.nix → pkgs/unit/ae/aescrypt/pkg-fun.nix
diff --git a/pkgs/tools/security/aesfix/default.nix → pkgs/unit/ae/aesfix/pkg-fun.nix b/pkgs/tools/security/aesfix/default.nix → pkgs/unit/ae/aesfix/pkg-fun.nix
diff --git a/pkgs/tools/security/aeskeyfind/default.nix → pkgs/unit/ae/aeskeyfind/pkg-fun.nix b/pkgs/tools/security/aeskeyfind/default.nix → pkgs/unit/ae/aeskeyfind/pkg-fun.nix
diff --git a/pkgs/tools/security/aespipe/default.nix → pkgs/unit/ae/aespipe/pkg-fun.nix b/pkgs/tools/security/aespipe/default.nix → pkgs/unit/ae/aespipe/pkg-fun.nix
diff --git a/...applications/audio/aether-lv2/default.nix → pkgs/unit/ae/aether-lv2/pkg-fun.nix b/...applications/audio/aether-lv2/default.nix → pkgs/unit/ae/aether-lv2/pkg-fun.nix
diff --git a/...pplications/networking/aether/default.nix → pkgs/unit/ae/aether/pkg-fun.nix b/...pplications/networking/aether/default.nix → pkgs/unit/ae/aether/pkg-fun.nix
diff --git a/pkgs/applications/editors/aewan/default.nix → pkgs/unit/ae/aewan/pkg-fun.nix b/pkgs/applications/editors/aewan/default.nix → pkgs/unit/ae/aewan/pkg-fun.nix
diff --git a/pkgs/tools/misc/afetch/default.nix → pkgs/unit/af/afetch/pkg-fun.nix b/pkgs/tools/misc/afetch/default.nix → pkgs/unit/af/afetch/pkg-fun.nix
diff --git a/...s/networking/mailreaders/afew/default.nix → pkgs/unit/af/afew/pkg-fun.nix b/...s/networking/mailreaders/afew/default.nix → pkgs/unit/af/afew/pkg-fun.nix
diff --git a/.../development/libraries/afflib/default.nix → pkgs/unit/af/afflib/pkg-fun.nix b/.../development/libraries/afflib/default.nix → pkgs/unit/af/afflib/pkg-fun.nix
diff --git a/...afio/0001-makefile-fix-installation.patch → ...afio/0001-makefile-fix-installation.patch b/...afio/0001-makefile-fix-installation.patch → ...afio/0001-makefile-fix-installation.patch
diff --git a/pkgs/tools/archivers/afio/default.nix → pkgs/unit/af/afio/pkg-fun.nix b/pkgs/tools/archivers/afio/default.nix → pkgs/unit/af/afio/pkg-fun.nix
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix → pkgs/unit/af/afpfs-ng/pkg-fun.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix → pkgs/unit/af/afpfs-ng/pkg-fun.nix
diff --git a/pkgs/development/libraries/aften/default.nix → pkgs/unit/af/aften/pkg-fun.nix b/pkgs/development/libraries/aften/default.nix → pkgs/unit/af/aften/pkg-fun.nix
diff --git a/...pment/libraries/aften/simd-fallback.patch → pkgs/unit/af/aften/simd-fallback.patch b/...pment/libraries/aften/simd-fallback.patch → pkgs/unit/af/aften/simd-fallback.patch
diff --git a/pkgs/tools/admin/afterburn/default.nix → pkgs/unit/af/afterburn/pkg-fun.nix b/pkgs/tools/admin/afterburn/default.nix → pkgs/unit/af/afterburn/pkg-fun.nix
diff --git a/pkgs/os-specific/linux/afuse/default.nix → pkgs/unit/af/afuse/pkg-fun.nix b/pkgs/os-specific/linux/afuse/default.nix → pkgs/unit/af/afuse/pkg-fun.nix
diff --git a/pkgs/data/fonts/agave/default.nix → pkgs/unit/ag/agave/pkg-fun.nix b/pkgs/data/fonts/agave/default.nix → pkgs/unit/ag/agave/pkg-fun.nix
diff --git a/pkgs/development/tools/agda-pkg/default.nix → pkgs/unit/ag/agda-pkg/pkg-fun.nix b/pkgs/development/tools/agda-pkg/default.nix → pkgs/unit/ag/agda-pkg/pkg-fun.nix
diff --git a/pkgs/tools/security/age/default.nix → pkgs/unit/ag/age/pkg-fun.nix b/pkgs/tools/security/age/default.nix → pkgs/unit/ag/age/pkg-fun.nix
diff --git a/pkgs/tools/security/agebox/default.nix → pkgs/unit/ag/agebox/pkg-fun.nix b/pkgs/tools/security/agebox/default.nix → pkgs/unit/ag/agebox/pkg-fun.nix
diff --git a/pkgs/tools/misc/agedu/default.nix → pkgs/unit/ag/agedu/pkg-fun.nix b/pkgs/tools/misc/agedu/default.nix → pkgs/unit/ag/agedu/pkg-fun.nix
diff --git a/pkgs/applications/office/agenda/default.nix → pkgs/unit/ag/agenda/pkg-fun.nix b/pkgs/applications/office/agenda/default.nix → pkgs/unit/ag/agenda/pkg-fun.nix
diff --git a/pkgs/development/libraries/agg/default.nix → pkgs/unit/ag/agg/pkg-fun.nix b/pkgs/development/libraries/agg/default.nix → pkgs/unit/ag/agg/pkg-fun.nix
diff --git a/pkgs/tools/graphics/agi/default.nix → pkgs/unit/ag/agi/pkg-fun.nix b/pkgs/tools/graphics/agi/default.nix → pkgs/unit/ag/agi/pkg-fun.nix
diff --git a/...shells/zsh/agkozak-zsh-prompt/default.nix → pkgs/unit/ag/agkozak-zsh-prompt/pkg-fun.nix b/...shells/zsh/agkozak-zsh-prompt/default.nix → pkgs/unit/ag/agkozak-zsh-prompt/pkg-fun.nix
diff --git a/.../continuous-integration/agola/default.nix → pkgs/unit/ag/agola/pkg-fun.nix b/.../continuous-integration/agola/default.nix → pkgs/unit/ag/agola/pkg-fun.nix
diff --git a/pkgs/tools/text/agrep/default.nix → pkgs/unit/ag/agrep/pkg-fun.nix b/pkgs/tools/text/agrep/default.nix → pkgs/unit/ag/agrep/pkg-fun.nix
diff --git a/pkgs/tools/text/aha/default.nix → pkgs/unit/ah/aha/pkg-fun.nix b/pkgs/tools/text/aha/default.nix → pkgs/unit/ah/aha/pkg-fun.nix
diff --git a/pkgs/tools/networking/ahcpd/default.nix → pkgs/unit/ah/ahcpd/pkg-fun.nix b/pkgs/tools/networking/ahcpd/default.nix → pkgs/unit/ah/ahcpd/pkg-fun.nix
diff --git a/...plications/graphics/ahoviewer/default.nix → pkgs/unit/ah/ahoviewer/pkg-fun.nix b/...plications/graphics/ahoviewer/default.nix → pkgs/unit/ah/ahoviewer/pkg-fun.nix
diff --git a/pkgs/tools/security/aide/default.nix → pkgs/unit/ai/aide/pkg-fun.nix b/pkgs/tools/security/aide/default.nix → pkgs/unit/ai/aide/pkg-fun.nix
diff --git a/...lications/science/logic/aiger/default.nix → pkgs/unit/ai/aiger/pkg-fun.nix b/...lications/science/logic/aiger/default.nix → pkgs/unit/ai/aiger/pkg-fun.nix
diff --git a/pkgs/data/fonts/aileron/default.nix → pkgs/unit/ai/aileron/pkg-fun.nix b/pkgs/data/fonts/aileron/default.nix → pkgs/unit/ai/aileron/pkg-fun.nix
diff --git a/pkgs/development/tools/air/default.nix → pkgs/unit/ai/air/pkg-fun.nix b/pkgs/development/tools/air/default.nix → pkgs/unit/ai/air/pkg-fun.nix
diff --git a/.../tools/networking/aircrack-ng/default.nix → pkgs/unit/ai/aircrack-ng/pkg-fun.nix b/.../tools/networking/aircrack-ng/default.nix → pkgs/unit/ai/aircrack-ng/pkg-fun.nix
diff --git a/pkgs/tools/networking/airgeddon/default.nix → pkgs/unit/ai/airgeddon/pkg-fun.nix b/pkgs/tools/networking/airgeddon/default.nix → pkgs/unit/ai/airgeddon/pkg-fun.nix
diff --git a/pkgs/games/airshipper/default.nix → pkgs/unit/ai/airshipper/pkg-fun.nix b/pkgs/games/airshipper/default.nix → pkgs/unit/ai/airshipper/pkg-fun.nix
diff --git a/pkgs/servers/misc/airsonic/default.nix → pkgs/unit/ai/airsonic/pkg-fun.nix b/pkgs/servers/misc/airsonic/default.nix → pkgs/unit/ai/airsonic/pkg-fun.nix
diff --git a/pkgs/applications/radio/airspy/default.nix → pkgs/unit/ai/airspy/pkg-fun.nix b/pkgs/applications/radio/airspy/default.nix → pkgs/unit/ai/airspy/pkg-fun.nix
diff --git a/pkgs/applications/radio/airspyhf/default.nix → pkgs/unit/ai/airspyhf/pkg-fun.nix b/pkgs/applications/radio/airspyhf/default.nix → pkgs/unit/ai/airspyhf/pkg-fun.nix
diff --git a/pkgs/games/airstrike/default.nix → pkgs/unit/ai/airstrike/pkg-fun.nix b/pkgs/games/airstrike/default.nix → pkgs/unit/ai/airstrike/pkg-fun.nix
diff --git a/pkgs/applications/audio/airwave/default.nix → pkgs/unit/ai/airwave/pkg-fun.nix b/pkgs/applications/audio/airwave/default.nix → pkgs/unit/ai/airwave/pkg-fun.nix
diff --git a/...ications/audio/airwindows-lv2/default.nix → pkgs/unit/ai/airwindows-lv2/pkg-fun.nix b/...ications/audio/airwindows-lv2/default.nix → pkgs/unit/ai/airwindows-lv2/pkg-fun.nix
diff --git a/.../development/libraries/aixlog/default.nix → pkgs/unit/ai/aixlog/pkg-fun.nix b/.../development/libraries/aixlog/default.nix → pkgs/unit/ai/aixlog/pkg-fun.nix
diff --git a/...pplications/audio/aj-snapshot/default.nix → pkgs/unit/aj/aj-snapshot/pkg-fun.nix b/...pplications/audio/aj-snapshot/default.nix → pkgs/unit/aj/aj-snapshot/pkg-fun.nix
diff --git a/pkgs/applications/graphics/akira/default.nix → pkgs/unit/ak/akira-unstable/pkg-fun.nix b/pkgs/applications/graphics/akira/default.nix → pkgs/unit/ak/akira-unstable/pkg-fun.nix
diff --git a/pkgs/servers/akkoma/mix.nix → pkgs/unit/ak/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix → pkgs/unit/ak/akkoma/mix.nix
diff --git a/pkgs/servers/akkoma/default.nix → pkgs/unit/ak/akkoma/pkg-fun.nix b/pkgs/servers/akkoma/default.nix → pkgs/unit/ak/akkoma/pkg-fun.nix
diff --git a/...ge-management/akku/hardcode-libcurl.patch → pkgs/unit/ak/akku/hardcode-libcurl.patch b/...ge-management/akku/hardcode-libcurl.patch → pkgs/unit/ak/akku/hardcode-libcurl.patch
diff --git a/...tools/package-management/akku/default.nix → pkgs/unit/ak/akku/pkg-fun.nix b/...tools/package-management/akku/default.nix → pkgs/unit/ak/akku/pkg-fun.nix
diff --git a/pkgs/development/compilers/alan/default.nix → pkgs/unit/al/alan/pkg-fun.nix b/pkgs/development/compilers/alan/default.nix → pkgs/unit/al/alan/pkg-fun.nix
diff --git a/pkgs/development/compilers/alan/2.nix → pkgs/unit/al/alan_2/pkg-fun.nix b/pkgs/development/compilers/alan/2.nix → pkgs/unit/al/alan_2/pkg-fun.nix
diff --git a/pkgs/applications/video/alass/default.nix → pkgs/unit/al/alass/pkg-fun.nix b/pkgs/applications/video/alass/default.nix → pkgs/unit/al/alass/pkg-fun.nix
diff --git a/pkgs/data/themes/albatross/default.nix → pkgs/unit/al/albatross/pkg-fun.nix b/pkgs/data/themes/albatross/default.nix → pkgs/unit/al/albatross/pkg-fun.nix
diff --git a/...applications/graphics/alchemy/default.nix → pkgs/unit/al/alchemy/pkg-fun.nix b/...applications/graphics/alchemy/default.nix → pkgs/unit/al/alchemy/pkg-fun.nix
diff --git a/...development/interpreters/alda/default.nix → pkgs/unit/al/alda/pkg-fun.nix b/...development/interpreters/alda/default.nix → pkgs/unit/al/alda/pkg-fun.nix
diff --git a/pkgs/applications/radio/aldo/default.nix → pkgs/unit/al/aldo/pkg-fun.nix b/pkgs/applications/radio/aldo/default.nix → pkgs/unit/al/aldo/pkg-fun.nix
diff --git a/pkgs/data/fonts/alegreya-sans/default.nix → pkgs/unit/al/alegreya-sans/pkg-fun.nix b/pkgs/data/fonts/alegreya-sans/default.nix → pkgs/unit/al/alegreya-sans/pkg-fun.nix
diff --git a/pkgs/data/fonts/alegreya/default.nix → pkgs/unit/al/alegreya/pkg-fun.nix b/pkgs/data/fonts/alegreya/default.nix → pkgs/unit/al/alegreya/pkg-fun.nix
diff --git a/pkgs/tools/nix/alejandra/default.nix → pkgs/unit/al/alejandra/pkg-fun.nix b/pkgs/tools/nix/alejandra/default.nix → pkgs/unit/al/alejandra/pkg-fun.nix
diff --git a/...development/libraries/alembic/default.nix → pkgs/unit/al/alembic/pkg-fun.nix b/...development/libraries/alembic/default.nix → pkgs/unit/al/alembic/pkg-fun.nix
diff --git a/pkgs/games/alephone/durandal/default.nix → pkgs/unit/al/alephone-durandal/pkg-fun.nix b/pkgs/games/alephone/durandal/default.nix → pkgs/unit/al/alephone-durandal/pkg-fun.nix
diff --git a/pkgs/games/alephone/eternal/default.nix → pkgs/unit/al/alephone-eternal/pkg-fun.nix b/pkgs/games/alephone/eternal/default.nix → pkgs/unit/al/alephone-eternal/pkg-fun.nix
diff --git a/pkgs/games/alephone/evil/default.nix → pkgs/unit/al/alephone-evil/pkg-fun.nix b/pkgs/games/alephone/evil/default.nix → pkgs/unit/al/alephone-evil/pkg-fun.nix
diff --git a/pkgs/games/alephone/infinity/default.nix → pkgs/unit/al/alephone-infinity/pkg-fun.nix b/pkgs/games/alephone/infinity/default.nix → pkgs/unit/al/alephone-infinity/pkg-fun.nix
diff --git a/pkgs/games/alephone/marathon/default.nix → pkgs/unit/al/alephone-marathon/pkg-fun.nix b/pkgs/games/alephone/marathon/default.nix → pkgs/unit/al/alephone-marathon/pkg-fun.nix
diff --git a/pkgs/games/alephone/pheonix/default.nix → pkgs/unit/al/alephone-pheonix/pkg-fun.nix b/pkgs/games/alephone/pheonix/default.nix → pkgs/unit/al/alephone-pheonix/pkg-fun.nix
diff --git a/pkgs/games/alephone/red/default.nix → pkgs/unit/al/alephone-red/pkg-fun.nix b/pkgs/games/alephone/red/default.nix → pkgs/unit/al/alephone-red/pkg-fun.nix
diff --git a/pkgs/games/alephone/rubicon-x/default.nix → pkgs/unit/al/alephone-rubicon-x/pkg-fun.nix b/pkgs/games/alephone/rubicon-x/default.nix → pkgs/unit/al/alephone-rubicon-x/pkg-fun.nix
diff --git a/pkgs/games/alephone/default.nix → pkgs/unit/al/alephone/pkg-fun.nix b/pkgs/games/alephone/default.nix → pkgs/unit/al/alephone/pkg-fun.nix
diff --git a/pkgs/servers/monitoring/alerta/default.nix → pkgs/unit/al/alerta-server/pkg-fun.nix b/pkgs/servers/monitoring/alerta/default.nix → pkgs/unit/al/alerta-server/pkg-fun.nix
diff --git a/pkgs/servers/monitoring/alerta/client.nix → pkgs/unit/al/alerta/pkg-fun.nix b/pkgs/servers/monitoring/alerta/client.nix → pkgs/unit/al/alerta/pkg-fun.nix
diff --git a/...s/monitoring/alertmanager-bot/default.nix → pkgs/unit/al/alertmanager-bot/pkg-fun.nix b/...s/monitoring/alertmanager-bot/default.nix → pkgs/unit/al/alertmanager-bot/pkg-fun.nix
diff --git a/...toring/alertmanager-irc-relay/default.nix → ...nit/al/alertmanager-irc-relay/pkg-fun.nix b/...toring/alertmanager-irc-relay/default.nix → ...nit/al/alertmanager-irc-relay/pkg-fun.nix
diff --git a/...g/instant-messengers/alfaview/default.nix → pkgs/unit/al/alfaview/pkg-fun.nix b/...g/instant-messengers/alfaview/default.nix → pkgs/unit/al/alfaview/pkg-fun.nix
diff --git a/...ries/alglib/patch-alglib-CMakeLists.patch → ...t/al/alglib/patch-alglib-CMakeLists.patch b/...ries/alglib/patch-alglib-CMakeLists.patch → ...t/al/alglib/patch-alglib-CMakeLists.patch
diff --git a/.../development/libraries/alglib/default.nix → pkgs/unit/al/alglib/pkg-fun.nix b/.../development/libraries/alglib/default.nix → pkgs/unit/al/alglib/pkg-fun.nix
diff --git a/.../algol68g/0001-plotutils-png-support.diff → .../algol68g/0001-plotutils-png-support.diff b/.../algol68g/0001-plotutils-png-support.diff → .../algol68g/0001-plotutils-png-support.diff
diff --git a/...evelopment/compilers/algol68g/default.nix → pkgs/unit/al/algol68g/pkg-fun.nix b/...evelopment/compilers/algol68g/default.nix → pkgs/unit/al/algol68g/pkg-fun.nix
diff --git a/pkgs/data/fonts/alice/default.nix → pkgs/unit/al/alice/pkg-fun.nix b/pkgs/data/fonts/alice/default.nix → pkgs/unit/al/alice/pkg-fun.nix
diff --git a/pkgs/games/alienarena/default.nix → pkgs/unit/al/alienarena/pkg-fun.nix b/pkgs/games/alienarena/default.nix → pkgs/unit/al/alienarena/pkg-fun.nix
diff --git a/pkgs/tools/text/align/default.nix → pkgs/unit/al/align/pkg-fun.nix b/pkgs/tools/text/align/default.nix → pkgs/unit/al/align/pkg-fun.nix
diff --git a/pkgs/tools/admin/aliyun-cli/default.nix → pkgs/unit/al/aliyun-cli/pkg-fun.nix b/pkgs/tools/admin/aliyun-cli/default.nix → pkgs/unit/al/aliyun-cli/pkg-fun.nix
diff --git a/...ations/science/medicine/aliza/default.nix → pkgs/unit/al/aliza/pkg-fun.nix b/...ations/science/medicine/aliza/default.nix → pkgs/unit/al/aliza/pkg-fun.nix
diff --git a/pkgs/data/fonts/alkalami/default.nix → pkgs/unit/al/alkalami/pkg-fun.nix b/pkgs/data/fonts/alkalami/default.nix → pkgs/unit/al/alkalami/pkg-fun.nix
diff --git a/...elopment/libraries/allegro/encoding.patch → pkgs/unit/al/allegro4/encoding.patch b/...elopment/libraries/allegro/encoding.patch → pkgs/unit/al/allegro4/encoding.patch
diff --git a/...es/allegro/nix-unstable-sandbox-fix.patch → ...l/allegro4/nix-unstable-sandbox-fix.patch b/...es/allegro/nix-unstable-sandbox-fix.patch → ...l/allegro4/nix-unstable-sandbox-fix.patch
diff --git a/...development/libraries/allegro/default.nix → pkgs/unit/al/allegro4/pkg-fun.nix b/...development/libraries/allegro/default.nix → pkgs/unit/al/allegro4/pkg-fun.nix
diff --git a/pkgs/development/libraries/allegro/5.nix → pkgs/unit/al/allegro5/pkg-fun.nix b/pkgs/development/libraries/allegro/5.nix → pkgs/unit/al/allegro5/pkg-fun.nix
diff --git a/.../science/electronics/alliance/default.nix → pkgs/unit/al/alliance/pkg-fun.nix b/.../science/electronics/alliance/default.nix → pkgs/unit/al/alliance/pkg-fun.nix
diff --git a/pkgs/servers/allmark/default.nix → pkgs/unit/al/allmark/pkg-fun.nix b/pkgs/servers/allmark/default.nix → pkgs/unit/al/allmark/pkg-fun.nix
diff --git a/pkgs/development/tools/allure/default.nix → pkgs/unit/al/allure/pkg-fun.nix b/pkgs/development/tools/allure/default.nix → pkgs/unit/al/allure/pkg-fun.nix
diff --git a/pkgs/applications/misc/almanah/default.nix → pkgs/unit/al/almanah/pkg-fun.nix b/pkgs/applications/misc/almanah/default.nix → pkgs/unit/al/almanah/pkg-fun.nix
diff --git a/...ications/science/math/almonds/default.nix → pkgs/unit/al/almonds/pkg-fun.nix b/...ications/science/math/almonds/default.nix → pkgs/unit/al/almonds/pkg-fun.nix
diff --git a/pkgs/misc/screensavers/alock/default.nix → pkgs/unit/al/alock/pkg-fun.nix b/pkgs/misc/screensavers/alock/default.nix → pkgs/unit/al/alock/pkg-fun.nix
diff --git a/...s/networking/mailreaders/alot/default.nix → pkgs/unit/al/alot/pkg-fun.nix b/...s/networking/mailreaders/alot/default.nix → pkgs/unit/al/alot/pkg-fun.nix
diff --git a/...lization/alpine-make-vm-image/default.nix → .../unit/al/alpine-make-vm-image/pkg-fun.nix b/...lization/alpine-make-vm-image/default.nix → .../unit/al/alpine-make-vm-image/pkg-fun.nix
diff --git a/...lications/networking/alpnpass/default.nix → pkgs/unit/al/alpnpass/pkg-fun.nix b/...lications/networking/alpnpass/default.nix → pkgs/unit/al/alpnpass/pkg-fun.nix
diff --git a/pkgs/servers/alps/default.nix → pkgs/unit/al/alps/pkg-fun.nix b/pkgs/servers/alps/default.nix → pkgs/unit/al/alps/pkg-fun.nix
diff --git a/...ux/alsa-project/alsa-firmware/default.nix → pkgs/unit/al/alsa-firmware/pkg-fun.nix b/...ux/alsa-project/alsa-firmware/default.nix → pkgs/unit/al/alsa-firmware/pkg-fun.nix
diff --git a/.../alsa-lib/alsa-plugin-conf-multilib.patch → .../alsa-lib/alsa-plugin-conf-multilib.patch b/.../alsa-lib/alsa-plugin-conf-multilib.patch → .../alsa-lib/alsa-plugin-conf-multilib.patch
diff --git a/...c/linux/alsa-project/alsa-lib/default.nix → pkgs/unit/al/alsa-lib/pkg-fun.nix b/...c/linux/alsa-project/alsa-lib/default.nix → pkgs/unit/al/alsa-lib/pkg-fun.nix
diff --git a/...c/linux/alsa-project/alsa-oss/default.nix → pkgs/unit/al/alsa-oss/pkg-fun.nix b/...c/linux/alsa-project/alsa-oss/default.nix → pkgs/unit/al/alsa-oss/pkg-fun.nix
diff --git a/...nux/alsa-project/alsa-plugins/wrapper.nix → .../unit/al/alsa-plugins-wrapper/pkg-fun.nix b/...nux/alsa-project/alsa-plugins/wrapper.nix → .../unit/al/alsa-plugins-wrapper/pkg-fun.nix
diff --git a/...nux/alsa-project/alsa-plugins/default.nix → pkgs/unit/al/alsa-plugins/pkg-fun.nix b/...nux/alsa-project/alsa-plugins/default.nix → pkgs/unit/al/alsa-plugins/pkg-fun.nix
diff --git a/...tions/audio/alsa-scarlett-gui/default.nix → pkgs/unit/al/alsa-scarlett-gui/pkg-fun.nix b/...tions/audio/alsa-scarlett-gui/default.nix → pkgs/unit/al/alsa-scarlett-gui/pkg-fun.nix
diff --git a/...linux/alsa-project/alsa-tools/default.nix → pkgs/unit/al/alsa-tools/pkg-fun.nix b/...linux/alsa-project/alsa-tools/default.nix → pkgs/unit/al/alsa-tools/pkg-fun.nix
diff --git a/...sa-project/alsa-topology-conf/default.nix → pkgs/unit/al/alsa-topology-conf/pkg-fun.nix b/...sa-project/alsa-topology-conf/default.nix → pkgs/unit/al/alsa-topology-conf/pkg-fun.nix
diff --git a/...ux/alsa-project/alsa-ucm-conf/default.nix → pkgs/unit/al/alsa-ucm-conf/pkg-fun.nix b/...ux/alsa-project/alsa-ucm-conf/default.nix → pkgs/unit/al/alsa-ucm-conf/pkg-fun.nix
diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch → pkgs/unit/al/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch → pkgs/unit/al/alsaequal/caps_9.x.patch
diff --git a/pkgs/tools/audio/alsaequal/false_error.patch → pkgs/unit/al/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch → pkgs/unit/al/alsaequal/false_error.patch
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch → pkgs/unit/al/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch → pkgs/unit/al/alsaequal/makefile.patch
diff --git a/pkgs/tools/audio/alsaequal/default.nix → pkgs/unit/al/alsaequal/pkg-fun.nix b/pkgs/tools/audio/alsaequal/default.nix → pkgs/unit/al/alsaequal/pkg-fun.nix
diff --git a/...ations/science/logic/alt-ergo/default.nix → pkgs/unit/al/alt-ergo/pkg-fun.nix b/...ations/science/logic/alt-ergo/default.nix → pkgs/unit/al/alt-ergo/pkg-fun.nix
diff --git a/...t/tools/altair-graphql-client/default.nix → pkgs/unit/al/altair/pkg-fun.nix b/...t/tools/altair-graphql-client/default.nix → pkgs/unit/al/altair/pkg-fun.nix
diff --git a/pkgs/tools/networking/altermime/default.nix → pkgs/unit/al/altermime/pkg-fun.nix b/pkgs/tools/networking/altermime/default.nix → pkgs/unit/al/altermime/pkg-fun.nix
diff --git a/pkgs/servers/althttpd/default.nix → pkgs/unit/al/althttpd/pkg-fun.nix b/pkgs/servers/althttpd/default.nix → pkgs/unit/al/althttpd/pkg-fun.nix
diff --git a/pkgs/tools/X11/alttab/default.nix → pkgs/unit/al/alttab/pkg-fun.nix b/pkgs/tools/X11/alttab/default.nix → pkgs/unit/al/alttab/pkg-fun.nix
diff --git a/pkgs/tools/games/opentracker/deps.nix → pkgs/unit/al/alttpr-opentracker/deps.nix b/pkgs/tools/games/opentracker/deps.nix → pkgs/unit/al/alttpr-opentracker/deps.nix
diff --git a/pkgs/tools/games/opentracker/default.nix → pkgs/unit/al/alttpr-opentracker/pkg-fun.nix b/pkgs/tools/games/opentracker/default.nix → pkgs/unit/al/alttpr-opentracker/pkg-fun.nix
diff --git a/pkgs/development/libraries/alure/default.nix → pkgs/unit/al/alure/pkg-fun.nix b/pkgs/development/libraries/alure/default.nix → pkgs/unit/al/alure/pkg-fun.nix
diff --git a/.../development/libraries/alure2/default.nix → pkgs/unit/al/alure2/pkg-fun.nix b/.../development/libraries/alure2/default.nix → pkgs/unit/al/alure2/pkg-fun.nix
diff --git a/pkgs/tools/networking/amass/default.nix → pkgs/unit/am/amass/pkg-fun.nix b/pkgs/tools/networking/amass/default.nix → pkgs/unit/am/amass/pkg-fun.nix
diff --git a/.../tools/admin/amazon-ec2-utils/default.nix → pkgs/unit/am/amazon-ec2-utils/pkg-fun.nix b/.../tools/admin/amazon-ec2-utils/default.nix → pkgs/unit/am/amazon-ec2-utils/pkg-fun.nix
diff --git a/.../amazon-ecr-credential-helper/default.nix → .../amazon-ecr-credential-helper/pkg-fun.nix b/.../amazon-ecr-credential-helper/default.nix → .../amazon-ecr-credential-helper/pkg-fun.nix
diff --git a/...virtualization/amazon-ecs-cli/default.nix → pkgs/unit/am/amazon-ecs-cli/pkg-fun.nix b/...virtualization/amazon-ecs-cli/default.nix → pkgs/unit/am/amazon-ecs-cli/pkg-fun.nix
diff --git a/pkgs/data/themes/amber/default.nix → pkgs/unit/am/amber-theme/pkg-fun.nix b/pkgs/data/themes/amber/default.nix → pkgs/unit/am/amber-theme/pkg-fun.nix
diff --git a/pkgs/applications/audio/amberol/default.nix → pkgs/unit/am/amberol/pkg-fun.nix b/pkgs/applications/audio/amberol/default.nix → pkgs/unit/am/amberol/pkg-fun.nix
diff --git a/...braries/science/math/amd-blis/default.nix → pkgs/unit/am/amd-blis/pkg-fun.nix b/...braries/science/math/amd-blis/default.nix → pkgs/unit/am/amd-blis/pkg-fun.nix
diff --git a/...cience/math/amd-libflame/add-lapacke.diff → pkgs/unit/am/amd-libflame/add-lapacke.diff b/...cience/math/amd-libflame/add-lapacke.diff → pkgs/unit/am/amd-libflame/add-lapacke.diff
diff --git a/...ies/science/math/amd-libflame/default.nix → pkgs/unit/am/amd-libflame/pkg-fun.nix b/...ies/science/math/amd-libflame/default.nix → pkgs/unit/am/amd-libflame/pkg-fun.nix
diff --git a/.../development/libraries/amdvlk/default.nix → pkgs/unit/am/amdvlk/pkg-fun.nix b/.../development/libraries/amdvlk/default.nix → pkgs/unit/am/amdvlk/pkg-fun.nix
diff --git a/pkgs/development/libraries/amdvlk/test.nix → pkgs/unit/am/amdvlk/test.nix b/pkgs/development/libraries/amdvlk/test.nix → pkgs/unit/am/amdvlk/test.nix
diff --git a/pkgs/development/tools/ameba/default.nix → pkgs/unit/am/ameba/pkg-fun.nix b/pkgs/development/tools/ameba/default.nix → pkgs/unit/am/ameba/pkg-fun.nix
diff --git a/...ns/networking/browsers/amfora/default.nix → pkgs/unit/am/amfora/pkg-fun.nix b/...ns/networking/browsers/amfora/default.nix → pkgs/unit/am/amfora/pkg-fun.nix
diff --git a/.../tools/games/minecraft/amidst/default.nix → pkgs/unit/am/amidst/pkg-fun.nix b/.../tools/games/minecraft/amidst/default.nix → pkgs/unit/am/amidst/pkg-fun.nix