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 |
|