diff options
author | Matthieu Coudron <mattator@gmail.com> | 2018-05-02 12:29:20 +0900 |
---|---|---|
committer | Matthieu Coudron <mattator@gmail.com> | 2018-05-02 16:09:12 +0900 |
commit | 8585bd87a01a3de0f2ee17bc7f28b84481013c7e (patch) | |
tree | 725d45fc06082e849c7196ab09ee2a3c2a24724d | |
parent | 1b1be29bf827fc177100ae175030b2fda4132e47 (diff) | |
download | nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.tar nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.tar.gz nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.tar.bz2 nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.tar.lz nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.tar.xz nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.tar.zst nixlib-8585bd87a01a3de0f2ee17bc7f28b84481013c7e.zip |
linux_mptcp: 0.93 -> 0.94
As mptcp is still evolving, it's good to keep at least the 2 last versions for regression-testing.
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp-93.nix | 47 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
3 files changed, 63 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix new file mode 100644 index 000000000000..2efe357cbd68 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +buildLinux (rec { + mptcpVersion = "0.93"; + modDirVersion = "4.9.60"; + version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + + extraMeta = { + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; + }; + + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcp"; + rev = "v${mptcpVersion}"; + sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + }; + + extraConfig = '' + IPV6 y + MPTCP y + IP_MULTIPLE_TABLES y + + # Enable advanced path-managers... + MPTCP_PM_ADVANCED y + MPTCP_FULLMESH y + MPTCP_NDIFFPORTS y + # ... but use none by default. + # The default is safer if source policy routing is not setup. + DEFAULT_DUMMY y + DEFAULT_MPTCP_PM default + + # MPTCP scheduler selection. + # Disabled as the only non-default is the useless round-robin. + MPTCP_SCHED_ADVANCED n + DEFAULT_MPTCP_SCHED default + + # Smarter TCP congestion controllers + TCP_CONG_LIA m + TCP_CONG_OLIA m + TCP_CONG_WVEGAS m + TCP_CONG_BALIA m + + '' + (args.extraConfig or ""); +} // args) + diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index c4bade2abeda..0ff0e747bfdc 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, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: buildLinux (rec { - mptcpVersion = "0.93"; - modDirVersion = "4.9.60"; + mptcpVersion = "0.94"; + modDirVersion = "4.14.24"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; # autoModules= true; @@ -15,7 +15,7 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; }; extraConfig = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ba524aa722a..c2546ec3e9a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13341,6 +13341,19 @@ with pkgs; linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + linux_mptcp_93 = callPackage ../os-specific/linux/kernel/linux-mptcp-93.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long |