Merge staging-next into staging

2021-04-02 00:21:46 +00:00
parent e2191cb47d 9eaff3b9be
commit 636e58e31b
37 changed files with 314 additions and 170 deletions
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {

  certdata2pem = fetchurl {
    name = "certdata2pem.py";
-    url = [
+    urls = [
      "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py"
      "https://git.launchpad.net/ubuntu/+source/ca-certificates/plain/mozilla/certdata2pem.py?id=47e49e1e0a8a1ca74deda27f88fe181191562957"
    ];