diff options
| author | Shea Levy <shea@shealevy.com> | 2017-02-20 07:29:47 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-02-20 07:29:47 -0500 |
| commit | b191ac0d8963b7e09b428ed13007f56a16ebfb1a (patch) | |
| tree | 461b325e7e90d0d5b0af918cd451e179b3053176 /pkgs/os-specific | |
| parent | dcba6eae1b596eb4630dbed658b9234eb983a719 (diff) | |
Revert "linux 4.10"
Somehow the tarball was actually linux 4.4.10
This reverts commit fea71f84d0c1c7bc6da80d70a639e1e443ef24a8.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.10.nix | 19 |
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9cc4027903e8..40c49509fd05 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -188,7 +188,7 @@ with stdenv.lib; DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support ''} ${optionalString (versionAtLeast version "4.9") '' - DRM_AMDGPU_SI? y # (experimental) amdgpu support for verde and newer chipsets + DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets ''} @@ -229,7 +229,7 @@ with stdenv.lib; EXT3_FS_POSIX_ACL y EXT3_FS_SECURITY y EXT4_FS_POSIX_ACL y - EXT4_ENCRYPTION? ${if (versionOlder version "4.8") || (versionAtLeast version "4.10") then "m" else "y"} + EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"} EXT4_FS_SECURITY y REISERFS_FS_XATTR? y REISERFS_FS_POSIX_ACL? y diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix deleted file mode 100644 index a556d2dc24d1..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.10"; - extraMeta.branch = "4.10"; - modDirVersion = "4.10.0"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "4ac22e4a619417213cfdab24714413bb9118fbaebe6012c6c89c279cdadef2ce"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) |