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: 1b46c4b2a463
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d1a2853933b4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 11, 2018

  1. nixos/no-x-libs: Switch to using nixpkgs.overlays 

    The usage of nixpkgs.config.packageOverrides is deprecated and we do
have overlays since quite a while.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
    @aszlig
    aszlig committed Jun 11, 2018
    Copy the full SHA
    fb2c132 View commit details
    Browse the repository at this point in the history

  2. pinentry: Fix .override for pinentry_* 

    When you evaluate nixos/tests/simple.nix, you'll run into an infinite
recursion since 41b140c.

The reason is that udisks2 now pulls in gnupg because it now depends on
libblockdev, which in turn depends on volume_key and that depends on
gnupg.

Nevertheless, it's not the real reason, because this only means, that
since gnupg is now pulled into the closure of a basic nixos
configuration the real problem becomes visible:

In nixos/modules/config/no-x-libs.nix there is an overlay which does
something like this:

  nixpkgs.overlays = singleton (const (super: {
    pinentry = super.pinentry_ncurses;
  }));

Now since pinentry_ncurses is already using pinentry.override we get an
infinite recursion because now the pinentry attribute refers to
pinentry_ncurses, which by itself is again referring to pinentry.

This is solved by using the self.pinentry.override instead, so that the
override used by pinentry_ncurses doesn't use the attribute from the
overlay.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
Signed-off-by: aszlig <aszlig@nix.build>
    @aszlig
    aszlig committed Jun 11, 2018
    Copy the full SHA
    d1a2853 View commit details
    Browse the repository at this point in the history