24 files changed, 24 insertions, 23 deletions
diff --git a/pkgs/build-support/skaware/build-skaware-man-pages.nix b/pkgs/development/skaware-packages/build-skaware-man-pages.nix
index 92d8202ae95a8..92d8202ae95a8 100644
--- a/pkgs/build-support/skaware/build-skaware-man-pages.nix
+++ b/pkgs/development/skaware-packages/build-skaware-man-pages.nix
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix
index 3ae9b7ce8aac2..3ae9b7ce8aac2 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/development/skaware-packages/build-skaware-package.nix
diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/development/skaware-packages/clean-packaging.nix
index d51cbec8aeb26..d51cbec8aeb26 100644
--- a/pkgs/build-support/skaware/clean-packaging.nix
+++ b/pkgs/development/skaware-packages/clean-packaging.nix
diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/development/skaware-packages/execline-man-pages/default.nix
index 822bbea1aee51..822bbea1aee51 100644
--- a/pkgs/data/documentation/execline-man-pages/default.nix
+++ b/pkgs/development/skaware-packages/execline-man-pages/default.nix
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index 953a081051677..953a081051677 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
diff --git a/pkgs/tools/misc/execline/execlineb-wrapper.c b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c
index c8e91813b7744..c8e91813b7744 100644
--- a/pkgs/tools/misc/execline/execlineb-wrapper.c
+++ b/pkgs/development/skaware-packages/execline/execlineb-wrapper.c
diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix
index 2a55676fc7675..2a55676fc7675 100644
--- a/pkgs/os-specific/linux/mdevd/default.nix
+++ b/pkgs/development/skaware-packages/mdevd/default.nix
diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix
index e6db2aee60c54..e6db2aee60c54 100644
--- a/pkgs/development/libraries/nsss/default.nix
+++ b/pkgs/development/skaware-packages/nsss/default.nix
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix
index 3c1e984f86c5e..3c1e984f86c5e 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/development/skaware-packages/s6-dns/default.nix
diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index 27773a90e2834..27773a90e2834 100644
--- a/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/development/skaware-packages/s6-linux-utils/default.nix
index 98199516a04e4..98199516a04e4 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-utils/default.nix
diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/development/skaware-packages/s6-man-pages/default.nix
index 44430eacbe08a..44430eacbe08a 100644
--- a/pkgs/data/documentation/s6-man-pages/default.nix
+++ b/pkgs/development/skaware-packages/s6-man-pages/default.nix
diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix
index 99dc9b891f57d..99dc9b891f57d 100644
--- a/pkgs/data/documentation/s6-networking-man-pages/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix
index 6eae406fa22a5..6eae406fa22a5 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking/default.nix
diff --git a/pkgs/data/documentation/s6-portable-utils-man-pages/default.nix b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix
index 6380071d7629e..6380071d7629e 100644
--- a/pkgs/data/documentation/s6-portable-utils-man-pages/default.nix
+++ b/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/development/skaware-packages/s6-portable-utils/default.nix
index 490a38e1031bb..490a38e1031bb 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/development/skaware-packages/s6-portable-utils/default.nix
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix
index 0f2662fd72405..0f2662fd72405 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/development/skaware-packages/s6-rc/default.nix
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix
index 1c3795a3f6afe..1c3795a3f6afe 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/development/skaware-packages/s6/default.nix
diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
index b4b6a7f42a7e4..b4b6a7f42a7e4 100644
--- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
+++ b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
index 3ad3cbc690639..3ad3cbc690639 100644
--- a/pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c
+++ b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
diff --git a/pkgs/development/libraries/skalibs/2_10.nix b/pkgs/development/skaware-packages/skalibs/2_10.nix
index af4c04dab1e7f..af4c04dab1e7f 100644
--- a/pkgs/development/libraries/skalibs/2_10.nix
+++ b/pkgs/development/skaware-packages/skalibs/2_10.nix
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 19c8ea98ec917..19c8ea98ec917 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix
index a7063f198c508..a7063f198c508 100644
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/pkgs/development/skaware-packages/utmps/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2fb6adf18660..dcc9ab64e0bf4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22098,41 +22098,42 @@ with pkgs;
   skjold = callPackage ../development/tools/skjold { };
 
   skawarePackages = recurseIntoAttrs rec {
-    cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { };
-    buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix {
+    buildManPages = callPackage ../development/skaware-packages/build-skaware-man-pages.nix { };
+    buildPackage = callPackage ../development/skaware-packages/build-skaware-package.nix {
       inherit cleanPackaging;
     };
-    buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { };
+    cleanPackaging = callPackage ../development/skaware-packages/clean-packaging.nix { };
 
-    skalibs = callPackage ../development/libraries/skalibs { };
-    skalibs_2_10 = callPackage ../development/libraries/skalibs/2_10.nix { };
-    execline = callPackage ../tools/misc/execline { };
-
-    execline-man-pages = callPackage ../data/documentation/execline-man-pages {
+    execline = callPackage ../development/skaware-packages/execline { };
+    execline-man-pages = callPackage ../development/skaware-packages/execline-man-pages {
       inherit buildManPages;
     };
 
-    s6 = callPackage ../tools/system/s6 { };
-    s6-dns = callPackage ../tools/networking/s6-dns { };
-    s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { };
-    s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
-    s6-networking = callPackage ../tools/networking/s6-networking { };
-    s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
-    s6-rc = callPackage ../tools/system/s6-rc { };
-    s6-man-pages = callPackage ../data/documentation/s6-man-pages {
+    mdevd = callPackage ../development/skaware-packages/mdevd { };
+    nsss = callPackage ../development/skaware-packages/nsss { };
+    sdnotify-wrapper = callPackage ../development/skaware-packages/sdnotify-wrapper { };
+    utmps = callPackage ../development/skaware-packages/utmps { };
+
+    skalibs = callPackage ../development/skaware-packages/skalibs { };
+    skalibs_2_10 = callPackage ../development/skaware-packages/skalibs/2_10.nix { };
+
+    s6 = callPackage ../development/skaware-packages/s6 { };
+    s6-dns = callPackage ../development/skaware-packages/s6-dns { };
+    s6-linux-init = callPackage ../development/skaware-packages/s6-linux-init { };
+    s6-linux-utils = callPackage ../development/skaware-packages/s6-linux-utils { };
+    s6-networking = callPackage ../development/skaware-packages/s6-networking { };
+    s6-portable-utils = callPackage ../development/skaware-packages/s6-portable-utils { };
+    s6-rc = callPackage ../development/skaware-packages/s6-rc { };
+
+    s6-man-pages = callPackage ../development/skaware-packages/s6-man-pages {
       inherit buildManPages;
     };
-    s6-networking-man-pages = callPackage ../data/documentation/s6-networking-man-pages {
+    s6-networking-man-pages = callPackage ../development/skaware-packages/s6-networking-man-pages {
       inherit buildManPages;
     };
-    s6-portable-utils-man-pages = callPackage ../data/documentation/s6-portable-utils-man-pages {
+    s6-portable-utils-man-pages = callPackage ../development/skaware-packages/s6-portable-utils-man-pages {
       inherit buildManPages;
     };
-
-    mdevd = callPackage ../os-specific/linux/mdevd { };
-    nsss = callPackage ../development/libraries/nsss { };
-    utmps = callPackage ../development/libraries/utmps { };
-    sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { };
   };
 
   inherit (skawarePackages)