Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/misc: Fix nixpkgs.config merge function #66450

Merged
merged 1 commit into from Aug 10, 2019

Conversation

infinisil
Copy link
Member

Motivation for this change

Previously nested attrsets would override each other

With this module:

{ lib, ... }: {

  nixpkgs.config = lib.mkMerge [
    { foo.bar = true; }
    { foo.baz = true; }
  ];

}

Before it would evaluate to

{ foo = { baz = true; }; }

Now it evaluates to

{ foo = { bar = true; baz = true; }; }

Fixes a problem #66448 tries to workaround

Previously nested attrsets would override each other
Copy link
Contributor

@bkchr bkchr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can confirm that this works :)

@infinisil infinisil merged commit 5c7afdd into NixOS:master Aug 10, 2019
@infinisil infinisil deleted the fix-nixpkgs.config-type branch August 10, 2019 19:01
@infinisil
Copy link
Member Author

Backported to 19.03 in 68dd778 as well

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants