diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 19:24:39 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 19:24:39 +0100 |
| commit | 2445e9a681c8450736514e331d99bfefe4648e0f (patch) | |
| tree | 78460963e17e78acef9d302ddcce3994460026e7 /lib | |
| parent | 0136206b12cdcee87d34ccdfd1864c0bb6541aec (diff) | |
| parent | 94bcca22ff7ac36df47b591fa8398eeb71d04b3d (diff) | |
| download | nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.tar nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.tar.gz nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.tar.bz2 nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.tar.lz nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.tar.xz nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.tar.zst nixpkgs-2445e9a681c8450736514e331d99bfefe4648e0f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/licenses.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index 993783db3ed..46ac0443a03 100644 --- 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"; |