about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-07-03 11:57:40 -0400
committerTim Steinbach <tim@nequissimus.com>2017-07-03 11:57:40 -0400
commitf130e0027e6f7630c27a90293fa204f5da0fd061 (patch)
tree3b4427757a7aaf896d649e1d1536edf781fb984d /pkgs/os-specific
parent6685b7a3d8ef5ab9cd1fd896bcbcd89d76643c86 (diff)
downloadnixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.tar
nixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.tar.gz
nixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.tar.bz2
nixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.tar.lz
nixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.tar.xz
nixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.tar.zst
nixlib-f130e0027e6f7630c27a90293fa204f5da0fd061.zip
linux: Add 4.12
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.12.nix19
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c46ee1b9331b..912fb8dcee49 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -499,7 +499,7 @@ with stdenv.lib;
     KVM_APIC_ARCHITECTURE y
   ''}
   KVM_ASYNC_PF y
-  ${optionalString (versionAtLeast version "4.0") ''
+  ${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) ''
     KVM_COMPAT? y
   ''}
   ${optionalString (versionOlder version "4.12") ''
diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
new file mode 100644
index 000000000000..d4861e1de555
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -0,0 +1,19 @@
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.12";
+  modDirVersion = "4.12.0";
+  extraMeta.branch = "4.12";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "1asq73lq0f81qwv21agcrpc3694fs14sja26q48y936hskn3np54";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))