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.

Sign up for GitHub

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

Jump to bottom

lib.licenses: cleanup, consistency and redistributable attribute #130862

Merged
merged 4 commits into from
Aug 11, 2021
Merged

lib.licenses: cleanup, consistency and redistributable attribute #130862

merged 4 commits into from
Aug 11, 2021

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Jul 20, 2021

Motivation for this change

Future work: Make hydra look for redistributable instead of free.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Relase notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

cc @mkg20001

@Atemu Atemu requested a review from alyssais as a code owner July 20, 2021 20:23
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 20, 2021
@Atemu
Copy link
Member Author

Atemu commented Aug 9, 2021

/marvin opt-in
/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2 label Aug 9, 2021
@marvin-mk2
Copy link

marvin-mk2 bot commented Aug 9, 2021

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@marvin-mk2 marvin-mk2 bot added the needs_reviewer (old Marvin label, do not use) label Aug 9, 2021
@marvin-mk2 marvin-mk2 bot requested a review from kevincox August 9, 2021 12:21
@marvin-mk2 marvin-mk2 bot added awaiting_reviewer (old Marvin label, do not use) and removed needs_reviewer (old Marvin label, do not use) labels Aug 9, 2021
kevincox
kevincox reviewed Aug 9, 2021
View reviewed changes
lib/licenses.nix Show resolved Hide resolved
lib/licenses.nix Outdated Show resolved Hide resolved
Atemu added 4 commits August 11, 2021 19:06
@Atemu
lib.licenses: refactor common attribute application
65c605a 
This is cleaner and makes common attribute application more expandable
@Atemu
lib.licenses: make all licenses have free and deprecated attrs
48797d7 
This makes them consistent which eases more complex operations on licenses such
as filtering etc.
@Atemu
lib.licenses: introduce redistributable attribute
16fb392 
Allows for distinction of licenses that are unfree overall but do grant the
right to redistribute. Defaults to the freeness of the license.

Note: Many unfree but are redistributable licenses aren't marked as such.
I expect that to be fixed in a distributed manner over time.

Closes NixOS#97789
@Atemu
lib.licenses: mark a few unfree redistributable licenses as such
5e2c05a 
I'm sure there are more but it's not feasible for a single person to check all
of them
@Atemu Atemu force-pushed the licenses-redistributable-attr branch from 9344b8b to 5e2c05a Compare August 11, 2021 17:10
@Atemu Atemu requested a review from kevincox August 11, 2021 17:10
@kevincox kevincox merged commit 5059cda into NixOS:master Aug 11, 2021
@Atemu
Copy link
Member Author

Atemu commented Aug 11, 2021

Thanks!

@Atemu Atemu deleted the licenses-redistributable-attr branch August 11, 2021 20:42
@Atemu Atemu mentioned this pull request Feb 24, 2022
Closed
10 tasks
@ShamrockLee ShamrockLee mentioned this pull request Nov 26, 2022
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkg20001 mkg20001 mkg20001 left review comments

@alyssais alyssais Awaiting requested review from alyssais

@kevincox kevincox Awaiting requested review from kevincox

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux awaiting_reviewer (old Marvin label, do not use) marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Atemu @kevincox @mkg20001