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

Commits on Jan 4, 2019

  1. Copy the full SHA
    da00ec4 View commit details
    Browse the repository at this point in the history
  2. lib/modules: Add a function to create an option alias that respects t…

    …he priority
    
    This commit adds a function `mkAliasOptionModuleWithPriority`.  This
    function will make an alias to an existing option and copy over the
    priority.
    
    This functionality is needed for PRs like #53041.  In that case
    `nixos-generate-config` added an option to `hardware-configuration.nix`
    with `mkDefault`.  That option was then changed and an alias created for
    the old name.
    
    The end user should be able to set the non-alias option in their
    `configuration.nix` and have everything work correctly.  Without this
    function, the priority for the option won't be copied over correctly
    and the end-user will get a message saying they have the same option
    set to two different values.
    cdepillabout committed Jan 4, 2019
    Copy the full SHA
    b81b3ad View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2019

  1. Copy the full SHA
    f24e2d0 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7314d88 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2019

  1. Merge pull request #53397 from cdepillabout/aliasoptionmodule-set-pri…

    …ority
    
    lib/modules: Add function to create option alias that respects priority
    nbp committed Jan 14, 2019
    Copy the full SHA
    a3beabf View commit details
    Browse the repository at this point in the history