diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2018-10-02 00:34:42 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2018-10-03 00:28:21 +0900 |
| commit | 3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0 (patch) | |
| tree | 071704bc3b046065bcbf4f889fea2e55cec7d2ec | |
| parent | 609f9198f218ab19f02bfc53f544635656a65b52 (diff) | |
| download | nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.tar nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.tar.gz nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.tar.bz2 nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.tar.lz nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.tar.xz nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.tar.zst nixlib-3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0.zip | |
linux_mptcp: 0.94 -> 0.94.1
Also introduce linux_mptcp_94 alias to prevent from overriding the wrong kernel when switching across branches. test
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 8014cb565267..7375daf61da5 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args: buildLinux (rec { - mptcpVersion = "0.94"; - modDirVersion = "4.14.24"; + mptcpVersion = "0.94.1"; + modDirVersion = "4.14.70"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; # autoModules= true; @@ -15,7 +15,7 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; + sha256 = "13mi672jr1x463kzig1hi9cpdi8x6nqdfd4bqlrjn8zca48f4ln4"; }; extraConfig = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b152a2e019ff..a76f5576de02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14067,8 +14067,8 @@ with pkgs; ]; }; - # linux mptcp is based on the 4.4 kernel - linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { + linux_mptcp = linux_mptcp_94; + linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.11" |