diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-07-09 20:11:10 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-07-09 20:11:10 -0400 |
| commit | 9371f6ad37accdb843958fe4aee54d9eec10e027 (patch) | |
| tree | 461ea054badb5deeb2e5df50693a3305c05c6f89 /pkgs/os-specific/linux | |
| parent | ed98822350926bd757d2e8ed89faf1bf1cf51473 (diff) | |
| download | nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.tar nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.tar.gz nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.tar.bz2 nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.tar.lz nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.tar.xz nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.tar.zst nixlib-9371f6ad37accdb843958fe4aee54d9eec10e027.zip | |
linux: 4.18-rc3 -> 4.18-rc4
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 100ac73d8812..548c66e87e63 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -230,7 +230,7 @@ let }; usb = { - USB_DEBUG = option no; + USB_DEBUG = option (whenOlder "4.18" no); USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling }; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4af7647a1a5c..cc82e146abd1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc3"; - modDirVersion = "4.18.0-rc3"; + version = "4.18-rc4"; + modDirVersion = "4.18.0-rc4"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1kr9bhvcdp792micjmhl2hwhs5iid1srb4ia8hm4cpy1lnzdgrih"; + sha256 = "1nhl82ygz7sm6njnb9qg9k4jp0gr1cv2wxpayrpc4ab21xb6b5mj"; }; # Should the testing kernels ever be built on Hydra? |