Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-04-13 18:50:35 +02:00
9807 changed files with 28240 additions and 18640 deletions
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = https://www.openssl.org/;
homepage = "https://www.openssl.org/";
description = "A cryptographic library that implements the SSL and TLS protocols";
platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.cstrahan ];
@@ -129,7 +129,7 @@ let
'';
meta = with stdenv.lib; {
homepage = https://www.openssl.org/;
homepage = "https://www.openssl.org/";
description = "A cryptographic library that implements the SSL and TLS protocols";
license = licenses.openssl;
platforms = platforms.all;