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

lxd: 5.19 -> 5.20 #273782

Merged
merged 2 commits into from
Dec 13, 2023
Merged

lxd: 5.19 -> 5.20 #273782

merged 2 commits into from
Dec 13, 2023

Conversation

jnsgruk
Copy link
Member

@jnsgruk jnsgruk commented Dec 12, 2023

Description of changes

Bump to latest version of LXD 5.20; update license to AGPLv3

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.

@jnsgruk
Copy link
Member Author

jnsgruk commented Dec 12, 2023

Hmm, not sure I understand the ofborg output, package builds fine locally.

@adamcstephens
Copy link
Contributor

adamcstephens commented Dec 12, 2023

It's failing to eval on something cuda related, not from this PR. I'm not sure exactly who is working on the fix.

@ofborg eval
@ofborg test lxd

@adamcstephens
Copy link
Contributor

adamcstephens commented Dec 13, 2023

This needs a license change, as 5.20 is now agplv3: canonical/lxd#12663

It would have been nice if this was at the top of the release notes, instead of at the bottom of a long unstructured list of changes.

Please rebase off master when updating the license to see if it fixes the eval.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Dec 13, 2023
Copy link
Contributor

@adamcstephens adamcstephens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please relicense to agplv3. Thanks!

@jnsgruk
Copy link
Member Author

jnsgruk commented Dec 13, 2023

Please relicense to agplv3. Thanks!

Done :)

@alerque
Copy link
Contributor

alerque commented Dec 13, 2023

The "relicense" to AGPL3 is not 100% accurate. Canonical employee contributions have been relicensed and future contributions will be under AGPL3 but the current code base includes Apache-2 licensed community contributions (lots of them). That makes the current release some unclear dual license situation with a mix of APL2 and AGPL3. Canonical has not properly called out this situation either at the project level nor in the relevant source files.

@adamcstephens
Copy link
Contributor

adamcstephens commented Dec 13, 2023

Fair enough, then we should probably put both licenses in a list.

@jnsgruk
Copy link
Member Author

jnsgruk commented Dec 13, 2023

@adamcstephens done

@adamcstephens
Copy link
Contributor

Incus exists for those who don't want the headache of this license change. 😉

@adamcstephens adamcstephens merged commit b0e130d into NixOS:master Dec 13, 2023
21 of 22 checks passed
@jnsgruk jnsgruk deleted the lxd-5.20 branch February 28, 2024 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants