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: 4052aa377e4b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e9c16ec186b2
Choose a head ref
  • 5 commits
  • 10 files changed
  • 1 contributor

Commits on Jan 9, 2020

  1. lib/modules: Recursive disabledModules 

    With this change, disabledModules applies recursively, meaning if you
have a module "foo.nix" with

    imports = [ ./bar.nix ];

then setting

  disabledModules = [ "foo.nix" ];

will disable both "foo.nix" and "bar.nix", whereas previously only
"foo.nix" would be disabled.

This change along with #61570 allows
modules to be fully disabled even when they have some `mkRenamedOption`
imports.
    @infinisil
    infinisil committed Jan 9, 2020
    Copy the full SHA
    de5f73d View commit details
    Browse the repository at this point in the history

  2. nixos/documentation: Fix disabledModules being rendered 

    Previously disabledModules would not be disabled for the manual
    @infinisil
    infinisil committed Jan 9, 2020
    Copy the full SHA
    7167985 View commit details
    Browse the repository at this point in the history

  3. lib/tests: Add tests for recursive disabledModules

    @infinisil
    infinisil committed Jan 9, 2020
    Copy the full SHA
    b89b23b View commit details
    Browse the repository at this point in the history

  4. nixos/doc: Extend disabledModules docs to indicate recursive disabling

    @infinisil
    infinisil committed Jan 9, 2020
    Copy the full SHA
    a6462a4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #76857 from Infinisil/recursive-disableModules 

    Apply `disabledModules` recursively
    @infinisil
    infinisil committed Jan 9, 2020
    Copy the full SHA
    e9c16ec View commit details
    Browse the repository at this point in the history