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

[Backport release-24.05] floorp: 11.17.5 -> 11.18.1 #344739

Merged

Conversation

christoph-heiss
Copy link
Contributor

@christoph-heiss christoph-heiss commented Sep 26, 2024

Description of changes

Pretty minor backports, important nonetheless. Also (smoke-)tested my usual things, seems fine.

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.

Release notes: https://blog.ablaze.one/4464/2024-08-01/
Git changelog: Floorp-Projects/Floorp@v11.17.5...v11.17.7

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit a694040)
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit 028458a)
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit 8336f9d)
@christoph-heiss
Copy link
Contributor Author

The cherry-pick CI workflow fails, but IMO can be ignored in this case. It fails (or rather, spits out a warning as it says itself in the log) since the cherry-picked commits do not match 1:1 due to indentation differences.

These are simply a result from the nixfmting which has been done on master, but I'd rather not backport formatting commits.

@marcusramberg marcusramberg merged commit 073a340 into NixOS:release-24.05 Sep 27, 2024
34 of 37 checks passed
@christoph-heiss christoph-heiss deleted the backport-floorp-24.05 branch September 27, 2024 18:31
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