Merge master into staging-next

2021-02-07 18:16:08 +00:00
parent be6e431001 de88795283
commit 2226996f6c
48 changed files with 721 additions and 663 deletions
@@ -103,7 +103,7 @@ stderr> assert failed
   <title>Ensuring a user provided a possible value</title>
 <programlisting><![CDATA[
 let sslLibrary = "bearssl";
-in lib.asserts.assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ];
+in lib.asserts.assertOneOf "sslLibrary" sslLibrary [ "openssl" "libressl" ];
 => false
 stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl"
        ]]></programlisting>