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

Commits on Aug 15, 2018

  1. lib/recursiveUpdateUntil: fix code to match documentation 

    $ nix repl lib
Welcome to Nix version 2.0.2. Type :? for help.

Loading 'lib'...
Added 350 variables.

-- this is the exact example from the function's documentation:
nix-repl> recursiveUpdateUntil (path: l: r: path == ["foo"]) {
                   # first attribute set
                   foo.bar = 1;
                   foo.baz = 2;
                   bar = 3;
                 } {
                   #second attribute set
                   foo.bar = 1;
                   foo.quz = 2;
                   baz = 4;
                 }
{ bar = 3; baz = 4; foo = { bar = 1; baz = 2; quz = 2; }; }

-- although the documentation says:
{
    foo.bar = 1; # 'foo.*' from the second set
    foo.quz = 2; #
    bar = 3;     # 'bar' from the first set
    baz = 4;     # 'baz' from the second set
}
    @bluescreen303 @Profpatsch
    bluescreen303 authored and Profpatsch committed Aug 15, 2018
    Copy the full SHA
    b63ec64 View commit details
    Browse the repository at this point in the history

  2. lib/recursiveUpdateUntil: add a test & release note for fix

    @Profpatsch
    Profpatsch committed Aug 15, 2018
    Copy the full SHA
    d817452 View commit details
    Browse the repository at this point in the history