Merge branch 'master' into staging

2017-09-03 10:51:11 +02:00
parent 825c08e368 0529e4d908
commit 37242d98de
328 changed files with 22148 additions and 9014 deletions
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    homepage = https://www.gnu.org/software/libgcrypt/;
-    description = "General-pupose cryptographic library";
+    description = "General-purpose cryptographic library";
    license = licenses.lgpl2Plus;
    platforms = platforms.all;
    maintainers = [ maintainers.wkennington maintainers.vrthra ];