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
base: 16d7f7edae68
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: cfb4d0dfe329
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 1, 2020

  1. kernel: fix config generation 

    Addresses #71803:
Kernel options are not merged as described, especially the "optional"
aspects. The error silences legitimate warnings.
    @teto
    teto committed Apr 1, 2020
    Copy the full SHA
    b9a4e69 View commit details
    Browse the repository at this point in the history

  2. kernel: fix errors in configuration 

    With the fix in kernel configuration merging, some kernel configuration items
marked as mandatory now correctly trigger an error when unused (while they
previously were unused).
    @teto
    teto committed Apr 1, 2020
    Copy the full SHA
    121b17e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. fixup! kernel: fix errors in configuration

    @teto
    teto committed Apr 11, 2020
    Copy the full SHA
    bc6b37e View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. Merge pull request #84032 from teto/fix_kernel_merge 

    Fix kernel configuration merge
    @flokli
    flokli committed May 22, 2020
    Copy the full SHA
    cfb4d0d View commit details
    Browse the repository at this point in the history