diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/lib | |
parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/lib')
-rw-r--r-- | nixpkgs/lib/licenses.nix | 5 | ||||
-rw-r--r-- | nixpkgs/lib/modules.nix | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix index 47b7005c561d..39d8272f7573 100644 --- a/nixpkgs/lib/licenses.nix +++ b/nixpkgs/lib/licenses.nix @@ -854,6 +854,11 @@ in mkLicense lset) ({ fullName = "Mozilla Public License 2.0"; }; + mplus = { + spdxId = "mplus"; + fullName = "M+ Font License"; + }; + mspl = { spdxId = "MS-PL"; fullName = "Microsoft Public License"; diff --git a/nixpkgs/lib/modules.nix b/nixpkgs/lib/modules.nix index 0c484fa684aa..c51999c2e332 100644 --- a/nixpkgs/lib/modules.nix +++ b/nixpkgs/lib/modules.nix @@ -81,9 +81,9 @@ let , # `class`: # A nominal type for modules. When set and non-null, this adds a check to # make sure that only compatible modules are imported. - # This would be remove in the future, Prefer _module.args option instead. class ? null - , args ? {} + , # This would be remove in the future, Prefer _module.args option instead. + args ? {} , # This would be remove in the future, Prefer _module.check option instead. check ? true }: |