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: 4c571a1e7618
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3b205ad3a7ad
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 9, 2019

  1. boot.kernelPackages: check for conflicts 

    It's currently possible to set conflicting `boot.kernelPackages` several times
which can prove confusing.
This is an attempt to warn for this.
    @teto
    teto committed Aug 9, 2019
    Copy the full SHA
    2da1ad6 View commit details
    Browse the repository at this point in the history

  2. Addressing review

    @teto
    teto committed Aug 9, 2019
    Copy the full SHA
    4e30a28 View commit details
    Browse the repository at this point in the history

  3. Conditionally include nvidia modules

    @teto
    teto committed Aug 9, 2019
    Copy the full SHA
    31c3a53 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2019

  1. Merge pull request #58207 from teto/kernelPackages_check 

    boot.kernelPackages: check for conflicts
It's currently possible to set conflicting `boot.kernelPackages` several times.
Nixos now warns when this is the case instead of just picking one.
    @teto
    teto committed Aug 20, 2019
    Copy the full SHA
    3b205ad View commit details
    Browse the repository at this point in the history