ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20236 from layus/update-mptcp

Browse Source 
linux_mptcp: 0.91 -> 0.91.2
This commit is contained in:
Franz Pletz 2016-11-08 02:13:34 +01:00 committed by GitHub
commit ee5af3fb66
2 changed files with 3 additions and 4 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, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
mptcpVersion = "0.91"; mptcpVersion = "0.91.2";
modDirVersion = "4.1.26"; modDirVersion = "4.1.35";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
extraMeta = { extraMeta = {
@ -12,7 +12,7 @@ import ./generic.nix (args // rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3"; sha256 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk";
}; };
kernelPatches = args.kernelPatches; kernelPatches = args.kernelPatches;

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

@ -10829,7 +10829,6 @@ in
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.hiddev_CVE_2016_5829
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu