admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #18265 from Homebrew/spdx-license-expr-docs

Browse Source
This commit is contained in:
Carlo Cabrera 2024-09-06 19:57:13 +08:00 committed by GitHub
commit 9feb56b8db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/formula.rb
View File

@ -3356,7 +3356,7 @@ class Formula
#
# @!attribute [w] license
# @see https://docs.brew.sh/License-Guidelines Homebrew License Guidelines
# @see https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/ SPDX license expression guide
# @see https://spdx.github.io/spdx-spec/latest/annexes/spdx-license-expressions/ SPDX license expression guide
# @api public
def license(args = nil)
if args.nil?

2
docs/License-Guidelines.md
View File

@ -26,7 +26,7 @@ license :cannot_represent
## Complex SPDX License Expressions
Some formulae have multiple licenses that need to be combined in different ways. In these cases, a more complex license expression can be used. These expressions are based on the [SPDX License Expression Guidelines](https://spdx.github.io/spdx-spec/latest/SPDX-license-expressions/).
Some formulae have multiple licenses that need to be combined in different ways. In these cases, a more complex license expression can be used. These expressions are based on the [SPDX License Expression Guidelines](https://spdx.github.io/spdx-spec/latest/annexes/spdx-license-expressions/).
Add a `+` to indicate that the user can choose a later version of the same license: