Skip to content
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

Jump to bottom

Restore linuxManualConfig as linux/kernel/manual-config.nix #35094

Merged
merged 1 commit into from Feb 20, 2018
Merged

Restore linuxManualConfig as linux/kernel/manual-config.nix #35094

merged 1 commit into from Feb 20, 2018

Conversation

thefloweringash
Copy link
Member

Motivation for this change

In a recent pull request (#34351) the definition of buildLinux changed from linux/kernel/manual-config.nix to linux/kernel/generic.nix. Since linuxManualConfig is an alias of buildLinux, this means that linuxManualConfig now points to linux/kernel/generic.nix.

I haven't examined the details of the work in this area, but it reads like a simple oversight. The documentation also doesn't seem to have a section on how to build a manually configured kernel. Is linuxManualConfig the intended way?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@thefloweringash thefloweringash mentioned this pull request Feb 19, 2018
Closed
@cstrahan
Copy link
Contributor

Indeed - otherwise the existing linuxPackages_custom no longer works:

nixpkgs/pkgs/top-level/all-packages.nix

Lines 13292 to 13296 in bd7d5b3

linuxPackages_custom = { version, src, configfile }:
recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
inherit version src configfile stdenv;
allowImportFromDerivation = true;
}));

Note that it expects to be able to pass configfile directly, which is only possible with linux/kernel/manual-config.nix.

I'll merge this, as it does appear to be a minor oversight.

@cstrahan cstrahan merged commit e0af429 into NixOS:master Feb 20, 2018
@teto
Copy link
Member

teto commented Feb 20, 2018

sorry for the inconvenience. I plan to write some doc once #34672 gets merged. I will mention linuxManualConfig which can be handy.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thefloweringash @cstrahan @teto @GrahamcOfBorg