Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-25 18:14:01 +00:00
committed by GitHub
91 changed files with 436 additions and 268 deletions
@@ -180,8 +180,8 @@ in {
};
openssl_1_1 = common {
version = "1.1.1j";
sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma";
version = "1.1.1k";
sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9";
patches = [
./1.1/nix-ssl-cert-file.patch