Merge branch 'master' into staging-next

2021-03-18 19:24:39 +01:00
parent 0136206b12 94bcca22ff
commit 2445e9a681
91 changed files with 982 additions and 256 deletions
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -603,6 +603,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
    free = false;
  };

+  odbl = spdx {
+    spdxId = "ODbL-1.0";
+    fullName = "Open Data Commons Open Database License v1.0";
+  };
+
  ofl = spdx {
    spdxId = "OFL-1.1";
    fullName = "SIL Open Font License 1.1";