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

[24.05] linux_xanmod: backport small refactor to allow clean backports #348702

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Oct 15, 2024

988bf19 (among other things) refactored this expression a little. This made backports no longer apply cleanly, requiring manual backports which are tedious.

This commit backports only the part that refactors the version declaration in order to make automated backports work again.

(The variant variable was unused.)

This is technically a refactor which shouldn't typically be backported but the change is very minor and trivial to verify to be correct.

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.11 Release Notes (or backporting 23.11 and 24.05 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.

988bf19 (among other things) refactored this
expression a little. This made backports no longer apply cleanly, requiring
manual backports which are tedious.

This commit backports only the part that refactors the version declaration in
order to make automated backports work again.

(The `variant` variable was unused.)

This is technically a refactor which shouldn't typically be backported but the
change is very minor and trivial to verify to be correct.
@Atemu Atemu changed the title linux_xanmod: backport small refactor to allow clean backports [24.05] linux_xanmod: backport small refactor to allow clean backports Oct 15, 2024
@NickCao NickCao merged commit b2bccce into NixOS:release-24.05 Oct 15, 2024
29 of 32 checks passed
@Atemu Atemu deleted the backport/xanmod-version-declaration-refactor branch October 16, 2024 10:32
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.

3 participants