diff options
| author | Shea Levy <shea@shealevy.com> | 2014-01-21 20:05:55 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-01-21 20:05:55 -0500 |
| commit | d18bc25b95eace4e090771d3e99834157aa32bb2 (patch) | |
| tree | 77157a5ad9e335eda85fb213d93dc6cfeb69d074 /pkgs/top-level | |
| parent | c373a49b10c8f854adcbf895916a9b53d33b8db7 (diff) | |
| download | nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.tar nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.tar.gz nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.tar.bz2 nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.tar.lz nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.tar.xz nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.tar.zst nixlib-d18bc25b95eace4e090771d3e99834157aa32bb2.zip | |
Rename linuxManualConfig to buildLinux
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1ab8ef3f9d7..9f7de5e46735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6550,7 +6550,7 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 ]; @@ -6599,7 +6599,7 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -6617,11 +6617,11 @@ let }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; }; linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6642,7 +6642,7 @@ let }); linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6654,7 +6654,7 @@ let }; linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6666,7 +6666,7 @@ let }; linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { - inherit fetchurl stdenv perl linuxManualConfig; + inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6775,7 +6775,8 @@ let linuxPackages = linuxPackages_3_10; # A function to build a manually-configured kernel - linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { + linuxManualConfig = builtins.trace "linuxManualConfig is now called buildLinux" pkgs.buildLinux; + buildLinux = import ../os-specific/linux/kernel/manual-config.nix { inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser; }; |