dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #47601 from teto/mptcp_94

Browse Source 
linux_mptcp: 0.94 -> 0.94.1 [RDY]
This commit is contained in:
Joachim F 2018-10-15 11:23:44 +00:00 committed by GitHub
commit 6c60014759
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/linux-mptcp.nix
View File

@ -1,8 +1,8 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args: { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
buildLinux (rec { buildLinux (rec {
mptcpVersion = "0.94"; mptcpVersion = "0.94.1";
modDirVersion = "4.14.24"; modDirVersion = "4.14.70";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
# autoModules= true; # autoModules= true;
@ -15,7 +15,7 @@ buildLinux (rec {
owner = "multipath-tcp"; owner = "multipath-tcp";
repo = "mptcp"; repo = "mptcp";
rev = "v${mptcpVersion}"; rev = "v${mptcpVersion}";
sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; sha256 = "13mi672jr1x463kzig1hi9cpdi8x6nqdfd4bqlrjn8zca48f4ln4";
}; };
extraConfig = '' extraConfig = ''

4
pkgs/top-level/all-packages.nix
View File

@ -14122,8 +14122,8 @@ with pkgs;
]; ];
}; };
# linux mptcp is based on the 4.4 kernel linux_mptcp = linux_mptcp_94;
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.cpu-cgroup-v2."4.11"