linux_mptcp: 0.92.1 -> 0.93

This commit is contained in:
Franz Pletz 2017-11-05 14:56:06 +01:00
parent 91de9958c0
commit b032b3544f
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 10 additions and 7 deletions

View File

@ -1,8 +1,8 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
mptcpVersion = "0.92.1"; mptcpVersion = "0.93";
modDirVersion = "4.4.83"; modDirVersion = "4.9.60";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
extraMeta = { extraMeta = {
@ -10,9 +10,11 @@ import ./generic.nix (args // rec {
maintainers = with stdenv.lib.maintainers; [ teto layus ]; maintainers = with stdenv.lib.maintainers; [ teto layus ];
}; };
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; owner = "multipath-tcp";
sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz"; repo = "mptcp";
rev = "v${mptcpVersion}";
sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys";
}; };
extraConfig = '' extraConfig = ''

View File

@ -12410,7 +12410,8 @@ with pkgs;
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.modinst_arg_list_too_long
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu