Commit Graph

14 Commits

Author SHA1 Message Date
Arda Xi
7c17302848 Make gpgkey2ssh use absolute path to gpg2, fixes #11912 2015-12-27 20:57:55 +01:00
William A. Kennington III
abb8fc3fdd gnupg: 2.0.28 -> 2.0.29 2015-09-08 16:28:49 -07:00
Luca Bruno
60d19b3adc Revert "gnupg: fix build on darwin"
This reverts commit db3602b5d6a928a69cc00d837d513817bdabe1c4.

Fixed libusb build by 82d2960f15942bdf8594a400d70ca907e5b23647
2015-07-16 10:36:29 +02:00
Jason "Don" O'Conal
db3602b5d6 gnupg: fix build on darwin 2015-07-10 10:18:29 +10:00
William A. Kennington III
9eae9dd811 gnupg: 2.0.27 -> 2.0.28 2015-07-06 17:14:01 -07:00
Jan Malakhovski
6b9bb72319 gnupg: add x11Support option 2015-03-29 23:26:13 +00:00
Eric Seidel
fd60b5f496 gnupg: dont demand pcsclite on darwin 2015-03-17 17:26:01 -07:00
William A. Kennington III
e1703a836e gnupg: 2.0.26 -> 2.0.27 2015-03-09 15:22:59 -07:00
William A. Kennington III
9631f5a718 gnupg: Fix default path to pcsclite 2015-03-09 15:22:59 -07:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
John Wiegley
a00a8d0711 gnupg: correct a typo in their source code 2015-01-03 07:53:09 -05:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
William A. Kennington III
850da1803f gnupg: Add gnupg 2.1 as default
Additionally, move all gnupg expressions into the gnupg folder.
2014-11-06 11:44:12 -08:00