Skip to content

linux_mptcp: makes linux_mptcp.override works #31596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
globin merged 1 commit into from
Nov 13, 2017
Merged

linux_mptcp: makes linux_mptcp.override works #31596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-mptcp.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
import ./generic.nix (rec {
mptcpVersion = "0.93";
modDirVersion = "4.9.60";
version = "${modDirVersion}-mptcp_v${mptcpVersion}";
Expand Down Expand Up @@ -43,4 +43,4 @@ import ./generic.nix (args // rec {
TCP_CONG_BALIA m

'' + (args.extraConfig or "");
} // (args.argsOverride or {}))
} // args // (args.argsOverride or {}))
Copy link
Member

@layus layus Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this code was designed to use argsOverride to do what you are doing, not args directly.
In this case, your override should look like

  pkg.override ({
    argsOverride = {
      modDirVersion="4.9.60+";
      src=pkgs.lib.cleanSource /home/teto/mptcp;
    };
  })

Now, this may not be the most obvious way to do it. However, I would prefer to keep this consistent with the other kernel implementations.

Copy link
Member Author

@teto teto Nov 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw the args.argsOverride afterwards. Any technical reason for args.argsOverride or is it legacy ? seeing that there is no specific documentation for kernels, people are bound to look at the nix code either way or use override out of habit.
Btw I would be interested in your opinon over #31463 :)

Copy link
Member

@layus layus Nov 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really no idea... You could get more info by blame'ing on original kernels.

Copy link
Member Author

@teto teto Nov 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well so far it works but I had lots of trouble compiling the kernel for many reasons; i'll try to send some doc for the manual.