Merge branch 'master' into staging-next

Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
parent ae2cf7c008 6755ab8b34
commit 153a19df05
187 changed files with 3389 additions and 1528 deletions
@@ -109,11 +109,12 @@ let
      fi
    '';

-    meta = {
+    meta = with stdenv.lib; {
      homepage = https://www.openssl.org/;
      description = "A cryptographic library that implements the SSL and TLS protocols";
-      platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.peti ];
+      license = licenses.openssl;
+      platforms = platforms.all;
+      maintainers = [ maintainers.peti ];
      priority = 10; # resolves collision with ‘man-pages’
    };
  };