diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-03-12 23:53:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 23:53:42 +0100 |
| commit | eff447b32175669bb574fcfe4b9505b3f098f563 (patch) | |
| tree | ce0094116b9a4486e58400671a92f3b4214dbee2 /pkgs/os-specific/linux/kernel | |
| parent | ce78f3ac701017008aa7f1db387b871b7ae65e01 (diff) | |
| parent | a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce (diff) | |
| download | nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.tar nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.tar.gz nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.tar.bz2 nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.tar.lz nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.tar.xz nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.tar.zst nixpkgs-eff447b32175669bb574fcfe4b9505b3f098f563.zip | |
Merge pull request #70157 from teto/lib_kernel
Add lib.kernel
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened-config.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/mptcp-config.nix | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e925068421d..2c8b8de65b3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -16,11 +16,12 @@ }: with stdenv.lib; - - with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; }; +with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); let + # configuration items have to be part of a subattrs flattenKConf = nested: mapAttrs (_: head) (zipAttrs (attrValues nested)); diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 156a4cf4423..b28ce770f7a 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -11,7 +11,8 @@ { stdenv, version }: with stdenv.lib; -with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; }; +with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix index e5e3ee283ff..9752e63d9f9 100644 --- a/pkgs/os-specific/linux/kernel/mptcp-config.nix +++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix @@ -1,5 +1,5 @@ { stdenv }: -with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; }; +with stdenv.lib.kernel; { # DRM_AMDGPU = yes; |