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.

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

linux: clearer origin for settings configuration #67192

Merged
merged 1 commit into from Sep 4, 2019

Conversation

@teto
Copy link
Contributor

commented Aug 21, 2019

Motivation for this change

I am looking into improving kernel configuration composition (if we could move all kernelPatches to use extraConfigStructured instead of extraConfig, that would help) but I guess I won't have time to finish a PR before a few months. This just adds a _file entry so that when kernel configurations clash, we can actually see where the conflict comes from.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@teto teto force-pushed the teto:kernelconfig_file branch from 816e3f9 to edd7e2c Aug 21, 2019
@teto teto changed the title kernel: clearer origin for settings configuration linux: clearer origin for settings configuration Aug 21, 2019
@ofborg ofborg bot requested a review from thoughtpolice Aug 21, 2019
@teto teto changed the base branch from master to staging Aug 29, 2019
adds _file so that nix may have a chance to display what file the conflictings settings come
from.
@teto teto force-pushed the teto:kernelconfig_file branch from edd7e2c to 8d12716 Aug 29, 2019
@teto

This comment has been minimized.

Copy link
Contributor Author

commented Aug 30, 2019

@sphalerite @dtzWill any comment ? it's quite a simple change

@teto teto merged commit 2207378 into NixOS:staging Sep 4, 2019
14 of 16 checks passed
14 of 16 checks passed
linux on x86_64-darwin No attempt
Details
linux on x86_64-linux Timed out, unknown build status
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
linux on aarch64-linux Success
Details
@teto teto deleted the teto:kernelconfig_file branch Sep 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.