diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-09-19 20:12:35 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-10-01 16:09:07 +0900 |
| commit | a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce (patch) | |
| tree | bc2ce5e42b3d5267d53f9cfa3da365bf2612e00a | |
| parent | afa0e02d64b15707262f13a348b33dad735bd80f (diff) | |
| download | nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.tar nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.tar.gz nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.tar.bz2 nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.tar.lz nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.tar.xz nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.tar.zst nixlib-a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce.zip | |
lib.kernel: scoped whenXXX helpers
whenAtLeast/whenBetween are made available in lib/kernel.nix but are now scoped under whenXXX.
| -rw-r--r-- | lib/kernel.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened-config.nix | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/lib/kernel.nix b/lib/kernel.nix index bfadf148be25..2ce19f8cb68c 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -13,4 +13,14 @@ with lib; module = { tristate = "m"; }; freeform = x: { freeform = x; }; + /* + Common patterns/legacy used in common-config/hardened-config.nix + */ + whenHelpers = version: { + whenAtLeast = ver: mkIf (versionAtLeast version ver); + whenOlder = ver: mkIf (versionOlder version ver); + # range is (inclusive, exclusive) + whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh); + }; + } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d414a0842624..126e534520ce 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -17,13 +17,9 @@ with stdenv.lib; with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); let - # Common patterns/legacy - whenAtLeast = ver: mkIf (versionAtLeast version ver); - whenOlder = ver: mkIf (versionOlder version ver); - # range is (inclusive, exclusive) - whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh); # configuration items have to be part of a subattrs diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index b72994d6dd6e..b28ce770f7a9 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -12,6 +12,8 @@ with stdenv.lib; with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); + assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { |