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

Commits on Oct 6, 2018

  1. gnupg20: set version variable to fix gnupg1compat 

    Presently, gnupg1compat only works with gnupg22. Without this change, the error

```
error: attribute 'version' missing, at .../nixpkgs/pkgs/tools/security/gnupg/1compat.nix:4:26
```

is emitted when evaluating

```
pkgs.gnupg1compat.override { gnupg = pkgs.gnupg20; }'
```
    @charles-dyfis-net
    charles-dyfis-net committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    f7cd362 View commit details
    Browse the repository at this point in the history

  2. gnupg1compat: reintroduce symlinks, only when actually needed

    @charles-dyfis-net
    charles-dyfis-net committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    1e23714 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. Merge pull request #47977 from charles-dyfis-net/gnupg20-1compat-fix 

    gnupg1compat: fix compatibility with gnupg20
    @lsix
    lsix committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    20249ca View commit details
    Browse the repository at this point in the history