diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01275b02866..c66d0f34e13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1514,8 +1514,6 @@ in crip = callPackage ../applications/audio/crip { }; - crosvm = callPackage ../applications/virtualization/crosvm { }; - crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -5072,6 +5070,8 @@ in mkrand = callPackage ../tools/security/mkrand { }; + mktuntap = callPackage ../tools/networking/mktuntap { }; + mktemp = callPackage ../tools/security/mktemp { }; mktorrent = callPackage ../tools/misc/mktorrent { }; @@ -6239,6 +6239,8 @@ in s6-dns = skawarePackages.s6-dns; + s6-linux-init = skawarePackages.s6-linux-init; + s6-linux-utils = skawarePackages.s6-linux-utils; s6-networking = skawarePackages.s6-networking; @@ -11084,6 +11086,11 @@ in chromaprint = callPackage ../development/libraries/chromaprint { }; + chromiumOSPackages = recurseIntoAttrs + (callPackage ../os-specific/linux/chromium-os { }); + + inherit (chromiumOSPackages) crosvm sommelier; + cl = callPackage ../development/libraries/cl { }; classads = callPackage ../development/libraries/classads { }; @@ -14198,6 +14205,7 @@ in 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 { }; @@ -16339,7 +16347,9 @@ in lkl = callPackage ../applications/virtualization/lkl { }; inherit (callPackages ../os-specific/linux/kernel-headers { }) - linuxHeaders; + linuxHeaders + linuxHeadersPatches + makeLinuxHeaders; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -16347,6 +16357,8 @@ in klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); + linux_cros = chromiumOSPackages.linux; + linux_mptcp = linux_mptcp_95; linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix { @@ -16658,6 +16670,7 @@ in linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. + linuxPackages_cros = linuxPackagesFor pkgs.linux_cros; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; |