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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 054ed6abc377
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cb57304de3d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 6, 2017

  1. pinentry-mac: no ‘fill plist’ stuff 

    fixes #26774
    @matthewbauer
    matthewbauer committed Sep 6, 2017
    Copy the full SHA
    7f86024 View commit details

  2. Merge pull request #29045 from matthewbauer/pinentry-no-fill-plist 

    pinentry-mac: no ‘fill plist’ stuff
    @LnL7
    LnL7 authored Sep 6, 2017
    Copy the full SHA
    3cb5730 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/security/pinentry-mac/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/security/pinentry-mac/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "matthewbauer";
repo = "pinentry-mac";
rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4";
sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq";
rev = "6dfef256c8ea32d642fea847f27d800f024cf51e";
sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83";
};

buildInputs = [ xcbuild libiconv Cocoa ncurses ];