Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b552d72a9a48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de56d6bfe662
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Jun 24, 2019

  1. linux_mptcp_94: 0.94.4 -> 0.94.6 

    Also move to a pkgs/os-specific/linux/kernel/linux-mptcp-94.nix. makes
updates easier.
Added a structured config pkgs/os-specific/linux/kernel/mptcp-config.nix
that can be shared between the different kernels.
    @teto
    teto committed Jun 24, 2019
    Copy the full SHA
    ea8a4fc View commit details

  2. linux_mptcp_95: init at 0.95 

    also removes 0.93, we want to maintain only the 2 latest upstream mptcp
kernels.
    @teto
    teto committed Jun 24, 2019
    Copy the full SHA
    1e0f5ff View commit details

Commits on Jun 25, 2019

  1. Merge pull request #63713 from teto/mptcp 

    Mptcp kernel updates
    @teto
    teto authored Jun 25, 2019
    Copy the full SHA
    de56d6b View commit details
47 changes: 0 additions & 47 deletions pkgs/os-specific/linux/kernel/linux-mptcp-93.nix
View file

This file was deleted.

26 changes: 26 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
let
mptcpVersion = "0.94.6";
modDirVersion = "4.14.127";
in
buildLinux ({
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
inherit modDirVersion;

extraMeta = {
branch = "4.4";
maintainers = with stdenv.lib.maintainers; [ teto layus ];
};

src = fetchFromGitHub {
owner = "multipath-tcp";
repo = "mptcp";
rev = "v${mptcpVersion}";
sha256 = "071cx9205wpzhi5gc2da79w2abs3czd60jg0xml7j1szc5wl4yfn";
};

structuredExtraConfig = stdenv.lib.mkMerge [
(import ./mptcp-config.nix { inherit stdenv; })
structuredExtraConfig
];
} // args)
27 changes: 27 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
let
mptcpVersion = "0.95";
modDirVersion = "4.19.55";
in
buildLinux ({
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
inherit modDirVersion;

extraMeta = {
branch = "4.19";
maintainers = with stdenv.lib.maintainers; [ teto layus ];
};

src = fetchFromGitHub {
owner = "multipath-tcp";
repo = "mptcp";
rev = "v${mptcpVersion}";
sha256 = "04a66iq5vsiz8mkpszfxmqknz7y4w3lsckrcz6q1syjpk0pdyiyw";
};

structuredExtraConfig = stdenv.lib.mkMerge [
(import ./mptcp-config.nix { inherit stdenv; })
structuredExtraConfig
];

} // args)
49 changes: 0 additions & 49 deletions pkgs/os-specific/linux/kernel/linux-mptcp.nix
View file

This file was deleted.

28 changes: 28 additions & 0 deletions pkgs/os-specific/linux/kernel/mptcp-config.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv }:
with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; };
{
# DRM_AMDGPU = yes;

IPV6 = yes;
MPTCP = yes;
IP_MULTIPLE_TABLES = yes;

# Enable advanced path-managers...
MPTCP_PM_ADVANCED = yes;
MPTCP_FULLMESH = yes;
MPTCP_NDIFFPORTS = yes;
# ... but use none by default.
# The default is safer if source policy routing is not setup.
DEFAULT_DUMMY = yes;
DEFAULT_MPTCP_PM.freeform = "default";

# MPTCP scheduler selection.
MPTCP_SCHED_ADVANCED = yes;
DEFAULT_MPTCP_SCHED.freeform = "default";

# Smarter TCP congestion controllers
TCP_CONG_LIA = module;
TCP_CONG_OLIA = module;
TCP_CONG_WVEGAS = module;
TCP_CONG_BALIA = module;
}
14 changes: 5 additions & 9 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -15294,8 +15294,9 @@ in

klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });

linux_mptcp = linux_mptcp_94;
linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
linux_mptcp = linux_mptcp_95;

linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.11"
@@ -15308,13 +15309,8 @@ in
];
};

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
];
linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix {
kernelPatches = linux_4_19.kernelPatches;
};

linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {