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: 8d0d41da0905
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b8ffd2459d63
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 11, 2018

  1. Copy the full SHA
    c0c43e9 View commit details
    Browse the repository at this point in the history
  2. lib: fix and simplify doRename

    Before this change `mkRenamedOptionModule` would override option defaults
    even when the old option name is left unused. For instance
    
    ```nix
    {
      optios = {
        services.name.new = mkOption {
          default = { one = {}; };
        };
      };
      imports = [
        (mkRenamedOptionModule [ "services" "name" "old" ] [ "services" "name" "new" "two" ])
      ];
      config = {};
    }
    ```
    
    would evaluate to
    
    `{ config.services.name.new = { two = {}; }; }`
    
    when you'd expect it to evaluate to
    
    `{ config.services.name.new = { one = {}; }; }`.
    oxij committed Jun 11, 2018
    Copy the full SHA
    449d43f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. Merge pull request #40418 from oxij/lib/fix-module-aliases

    lib, nixos: fix module aliases in presence of defaults
    7c6f434c committed Jun 27, 2018
    Copy the full SHA
    b8ffd24 View commit details
    Browse the repository at this point in the history