Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly state our license in the README, use OR in Cargo.toml #1226

Merged
merged 2 commits into from
Jan 10, 2018

Conversation

sgrif
Copy link
Contributor

@sgrif sgrif commented Jan 9, 2018

Fixes #1225

@jtgeibel
Copy link
Member

I checked and package.json already contains (MIT OR Apache-2.0). The license_exprs crate we use doesn't seem to handle parenthesis, but I confirmed that it accepts the expression as modified in this PR.

Would you update src/s3/Cargo.toml as well?

@jtgeibel
Copy link
Member

bors: r+

bors-voyager bot added a commit that referenced this pull request Jan 10, 2018
1226: Explicitly state our license in the README, use `OR` in Cargo.toml r=jtgeibel

Fixes #1225
@bors-voyager
Copy link
Contributor

bors-voyager bot commented Jan 10, 2018

Build succeeded

@bors-voyager bors-voyager bot merged commit a2be65f into rust-lang:master Jan 10, 2018
wking added a commit to wking/license-exprs that referenced this pull request Jan 11, 2018
Catch up with the recommendations from rust-lang/cargo@7dee65fe
(src/doc/manifest: Pin 'license' to SPDX 2.1 expressions and the 2.4
list, 2018-01-04, rust-lang/cargo#4898), which deprecated '/' in favor
of vanilla SPDX license expressions.

I've gone with the disjunctive OR, and most contributors have signed
off on that change:

* Without Boats wanted to match the crates.io licensing [1], and they
  meant OR [2].
* Rodolphe Breard [3] and Laurence Tratt [4] intended OR.

We haven't heard back from Kai NODA, but ed9fe0b (README.md: update
the reference to SPDX, 2017-07-14, ehuss#8) is probably too small to be
copyrightable.

[1]: ehuss#14 (comment)
[2]: rust-lang/crates.io#1226
[3]: ehuss#14 (comment)
[4]: ehuss#14 (comment)
wking added a commit to wking/license-exprs that referenced this pull request Jan 11, 2018
Catch up with the recommendations from rust-lang/cargo@7dee65fe
(src/doc/manifest: Pin 'license' to SPDX 2.1 expressions and the 2.4
list, 2018-01-04, rust-lang/cargo#4898), which deprecated '/' in favor
of vanilla SPDX license expressions.

I've gone with the disjunctive OR, and most contributors have signed
off on that change:

* Without Boats wanted to match the crates.io licensing [1], and they
  meant OR [2].
* Rodolphe Breard [3], Laurence Tratt [4], and Kai NODA [5] intended
  OR.

[1]: ehuss#14 (comment)
[2]: rust-lang/crates.io#1226
[3]: ehuss#14 (comment)
[4]: ehuss#14 (comment)
[5]: ehuss#14 (comment)
@sgrif sgrif deleted the sg-license branch January 18, 2018 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants