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

treewide: rename lib.licenses.apsl{10,20} -> lib.licenses.apple-psl{10,20} #301930

Merged
merged 4 commits into from
Apr 8, 2024

Conversation

iliana
Copy link
Contributor

@iliana iliana commented Apr 5, 2024

Description of changes

The easy half of #301908. (The harder second half will probably be in several days.)

This renames the two versions of the Apple Public Source License seen in nixpkgs; apsl20 was often confused as being for the widely-used Apache License 2.0. apsl10 is renamed for consistency.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release 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.

Add a 👍 reaction to pull requests you find important.

@alyssais
Copy link
Member

alyssais commented Apr 8, 2024

Please squash the commits switching packages to the new name into the commit where it was renamed, and move the commits changing to asl20 so that they happen before the rename, so we don't cause bisection annoyances.

@alyssais alyssais merged commit e42705c into NixOS:master Apr 8, 2024
22 of 25 checks passed
@alyssais
Copy link
Member

alyssais commented Apr 8, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants