From faf63d15249f7eaed676a8fa097c3e734e61249d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 18 Apr 2016 23:09:06 +0200 Subject: 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(-) (limited to 'pkgs/top-level') 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 { }; -- cgit 1.4.1 From 1414f902708ecd979f2cf7f6fe46c3f4b650b594 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 18 Apr 2016 23:09:21 +0200 Subject: linuxPackages: remove kernelHeaders User-space programs should not be using headers extracted from random kernels, but should in fact use the headers that were used to build libc; see e.g., this LKML posting by Linus Torvalds on the subject of Linux API headers at [1]. What is more, the Linux API headers are supposed to be backwards compatible[2], so there's really no good reason to have more than one such package, namely the latest one required by a package in our tree. That is, `kernelHeaders` is not only incorrect but serves no real purpose: out-of-tree modules use the sources provided by `kernel.dev`; user space should use `stdenv.cc.libc.linuxHeaders` or the top-level `linuxHeaders` attribute. Apart from klibc, nothing in nixpkgs used `linuxPackages.kernelHeaders`, so the impact of this change is minimal. [1]: http://lkml.iu.edu/hypermail/linux/kernel/0007.3/0587.html [2]: https://www.kernel.org/doc/Documentation/kbuild/headers_install.txt --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6ba3e97830c..264c67cf0b39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10670,8 +10670,6 @@ in facetimehd = callPackage ../os-specific/linux/facetimehd { }; - kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; - jool = callPackage ../os-specific/linux/jool { }; mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; -- cgit 1.4.1