1 files changed, 18 insertions, 21 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e9ee8797ff1..0285a8a3b78f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2511,8 +2511,6 @@ with pkgs;
     stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv;
   };
 
-  execline = skawarePackages.execline;
-
   exif = callPackage ../tools/graphics/exif { };
 
   exiftags = callPackage ../tools/graphics/exiftags { };
@@ -5225,14 +5223,6 @@ with pkgs;
 
   s3gof3r = callPackage ../tools/networking/s3gof3r { };
 
-  s6-dns = skawarePackages.s6-dns;
-
-  s6-linux-utils = skawarePackages.s6-linux-utils;
-
-  s6-networking = skawarePackages.s6-networking;
-
-  s6-portable-utils = skawarePackages.s6-portable-utils;
-
   sablotron = callPackage ../tools/text/xml/sablotron { };
 
   safecopy = callPackage ../tools/system/safecopy { };
@@ -11546,8 +11536,6 @@ with pkgs;
 
   nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
 
-  nsss = skawarePackages.nsss;
-
   ntbtls = callPackage ../development/libraries/ntbtls { };
 
   ntk = callPackage ../development/libraries/audio/ntk { };
@@ -12242,8 +12230,6 @@ with pkgs;
 
   skaffold = callPackage ../development/tools/skaffold { };
 
-  skalibs = skawarePackages.skalibs;
-
   skawarePackages = recurseIntoAttrs {
     buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { };
 
@@ -12252,16 +12238,31 @@ with pkgs;
 
     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 { };
 
+    mdevd = callPackage ../os-specific/linux/mdevd { };
     nsss = callPackage ../development/libraries/nsss { };
     utmps = callPackage ../development/libraries/utmps { };
-
   };
 
+  inherit (skawarePackages)
+    execline
+    mdevd
+    nsss
+    s6
+    s6-dns
+    s6-linux-init
+    s6-linux-utils
+    s6-networking
+    s6-portable-utils
+    s6-rc
+    skalibs
+    utmps;
+
   skydive = callPackage ../tools/networking/skydive { };
 
   slang = callPackage ../development/libraries/slang { };
@@ -12575,8 +12576,6 @@ with pkgs;
 
   uthash = callPackage ../development/libraries/uthash { };
 
-  utmps = skawarePackages.utmps;
-
   ucommon = ucommon_openssl;
 
   ucommon_openssl = callPackage ../development/libraries/ucommon {
@@ -13728,10 +13727,6 @@ with pkgs;
     boost = boost159;
   };
 
-  s6 = skawarePackages.s6;
-
-  s6-rc = skawarePackages.s6-rc;
-
   supervise = callPackage ../tools/system/supervise { };
 
   spamassassin = callPackage ../servers/mail/spamassassin {
@@ -14067,6 +14062,8 @@ with pkgs;
 
   dstat = callPackage ../os-specific/linux/dstat { };
 
+  elogind = callPackage ../os-specific/linux/elogind { };
+
   # unstable until the first 1.x release
   fscrypt-experimental = callPackage ../os-specific/linux/fscrypt {
     buildGoPackage = buildGo110Package;