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: 12441bdf9f09
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 36756e930fb4
Choose a head ref
  • 6 commits
  • 15 files changed
  • 3 contributors

Commits on Oct 17, 2019

  1. pinentry: build with multiple outputs in single drv 

    Co-authored-by: Florian Klink <flokli@flokli.de>
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    @fpletz @flokli @worldofpeace
    3 people committed Oct 17, 2019
    Copy the full SHA
    cb0adc1 View commit details
    Browse the repository at this point in the history

  2. pinentry: change attributes to dashes, alias old ones

    @flokli @worldofpeace
    flokli authored and worldofpeace committed Oct 17, 2019
    Copy the full SHA
    511b182 View commit details
    Browse the repository at this point in the history

  3. nixos/gnupg: add option for setting pinentry flavours 

    Co-authored-by: Florian Klink <flokli@flokli.de>
    @fpletz @flokli @worldofpeace
    2 people authored and worldofpeace committed Oct 17, 2019
    Copy the full SHA
    c257626 View commit details
    Browse the repository at this point in the history

  4. gnupg: disable gui/pinentry support by default 

    This solves the dependency cycle in gcr alternatively so there won't be
two gnupg store paths in a standard NixOS system which has udisks2 enabled
by default.

NixOS users are expected to use the gpg-agent user service to pull in the
appropriate pinentry flavour or install it on their systemPackages and set
it in their local gnupg agent config instead.

Co-authored-by: Florian Klink <flokli@flokli.de>
    @fpletz @flokli @worldofpeace
    2 people authored and worldofpeace committed Oct 17, 2019
    2
    Copy the full SHA
    3d832de View commit details
    Browse the repository at this point in the history

  5. Revert "installer: Disable udisks" 

    This reverts commit 571fb74.

The dependency on gtk2 was removed.

Co-authored-by: Florian Klink <flokli@flokli.de>
    @fpletz @flokli @worldofpeace
    2 people authored and worldofpeace committed Oct 17, 2019
    Copy the full SHA
    ec6224b View commit details
    Browse the repository at this point in the history

  6. udisks2: use tmpfiles instead of activation script to create /var/lib… 

    …/udisks2
    @flokli @worldofpeace
    flokli authored and worldofpeace committed Oct 17, 2019
    Copy the full SHA
    36756e9 View commit details
    Browse the repository at this point in the history