From faf63d15249f7eaed676a8fa097c3e734e61249d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 18 Apr 2016 23:09:06 +0200 Subject: [PATCH] linuxPackages: move klibc to top-level There's no reason for this to be tied to a specific kernel: it is tied to the API headers, not the kernel sources. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 632468903e98..a6ba3e97830c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10421,6 +10421,10 @@ in kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; + klibc = callPackage ../os-specific/linux/klibc { }; + + klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); + linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -10668,10 +10672,6 @@ in kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; - klibc = callPackage ../os-specific/linux/klibc { }; - - klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - jool = callPackage ../os-specific/linux/jool { }; mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };