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

[23.11] liquidctl: fix test for pillow ≥ 10.2.0 #288100

Merged
merged 1 commit into from
Feb 12, 2024

Conversation

evils
Copy link
Member

@evils evils commented Feb 11, 2024

issue described upstream in
liquidctl/liquidctl#661

Description of changes

added patch linked in upstream issue
(liquidctl/liquidctl@c50afa4)

Things done

manual backport of #288085
verified this does not break liquidctl before #284251 gets to 23.11

  • 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
    nixpkgs-review failed to automatically merge ¯\_(ツ)_/¯
  • 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.

issue described upstream in
  liquidctl/liquidctl#661

manually backported for 23.11 where there's still
  SETUPTOOLS_SCM_PRETEND_VERSION
    which was removed as redundant on master shortly after 23.11
@evils
Copy link
Member Author

evils commented Feb 12, 2024

@Kranzes why did you close this?
this is a manual backport for the soon to be affected 23.11 branch
(manual as the main PR's changes cannot be applied to the 23.11 branch directly)

@Kranzes
Copy link
Member

Kranzes commented Feb 12, 2024

Oh I thought It was a duplicate of the other branch. I guess that's why you should follow CONTRIBUTING.md properly and name your PR accordingly. If you ever want to backport a PR just add the backport label to it and a GitHub Action will handle creating the backport PR.

@evils
Copy link
Member Author

evils commented Feb 12, 2024

i knew about the github action, that's not applicable here as the commits in the other PR don't apply cleanly to the 23.11 branch

i did read the relevant section in CONTRIBUTING.md, but apparently stopped reading when it clarified what branch to target after saying i should use the regular PR rules to create the backport (which i assumed included the unabridged rules about titling)

@evils evils changed the title liquidctl: fix test for pillow ≥ 10.2.0 [23.11] liquidctl: fix test for pillow ≥ 10.2.0 Feb 12, 2024
@evils evils reopened this Feb 12, 2024
@Kranzes Kranzes changed the title [23.11] liquidctl: fix test for pillow ≥ 10.2.0 [Backport release-23.11] liquidctl: fix test for pillow ≥ 10.2.0 Feb 12, 2024
@evils evils changed the title [Backport release-23.11] liquidctl: fix test for pillow ≥ 10.2.0 [23.11] liquidctl: fix test for pillow ≥ 10.2.0 Feb 12, 2024
@evils
Copy link
Member Author

evils commented Feb 12, 2024

please read CONTRIBUTING.md before changing my title

@Kranzes
Copy link
Member

Kranzes commented Feb 12, 2024

please read CONTRIBUTING.md before changing my title

You're right, my bad. There seems to be some inconsistencies between the Github Action and the CONTRIBUTING.md.

@Kranzes Kranzes merged commit 1d10392 into NixOS:release-23.11 Feb 12, 2024
28 checks passed
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.

None yet

2 participants