diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-24 15:39:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-24 15:39:34 +0000 |
| commit | 1a60dd2adc7bc997efabc11274fc2d8f772731ae (patch) | |
| tree | 604b7796977b9dc0a3b9ed7f29ede0bbee0a277b /lib/licenses.nix | |
| parent | c0398d7617c0dee8fc7fde2101f3b3c8cef4e1c2 (diff) | |
| parent | 2f14e11f3a545130409c520909a64b86e92f737d (diff) | |
| download | nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.tar nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.tar.gz nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.tar.bz2 nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.tar.lz nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.tar.xz nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.tar.zst nixlib-1a60dd2adc7bc997efabc11274fc2d8f772731ae.zip | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/python-modules/cupy/default.nix pkgs/development/python-modules/staticjinja/default.nix
Diffstat (limited to 'lib/licenses.nix')
| -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 84e2a10bf320..aa3fa7c6e56f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -67,6 +67,11 @@ in mkLicense lset) ({ free = false; }; + aom = { + fullName = "Alliance for Open Media Patent License 1.0"; + url = "https://aomedia.org/license/patent-license/"; + }; + apsl20 = { spdxId = "APSL-2.0"; fullName = "Apple Public Source License 2.0"; |