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

bottles: 51.15 -> 51.17 #365397

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

bottles: 51.15 -> 51.17 #365397

wants to merge 4 commits into from

Conversation

Gliczy
Copy link
Member

@Gliczy Gliczy commented Dec 15, 2024

51.16: https://github.com/bottlesdevs/Bottles/releases/tag/51.16
51.17: https://github.com/bottlesdevs/Bottles/releases/tag/51.17
Full diff: bottlesdevs/Bottles@51.15...51.17

A check has been added in 51.16 that will make bottles exit if it is not running as a sandboxed flatpak, I added a patch to remove this check.

I added another patch to remove the "Core" tab that was in the preferences.
This tab is not used for quite some time in the official Flatpak and is not functioning anyway.
I opted to patch it out since it will only cause confusion and may lead to unwanted bug report to upstream.

I re-ordered the python3 packages in propagatedBuildInputs so they are in the same order as the official flatpak (to make it easier to review if we are missing dependencies) and added pycairo and charset-normalizer since they are included in the official package.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 15, 2024
@Gliczy
Copy link
Member Author

Gliczy commented Dec 15, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 365397


x86_64-linux

✅ 2 packages built:
  • bottles
  • bottles-unwrapped

aarch64-linux

✅ 2 packages built:
  • bottles
  • bottles-unwrapped

@Gliczy Gliczy marked this pull request as draft December 15, 2024 17:35
@Gliczy
Copy link
Member Author

Gliczy commented Dec 15, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 365397


x86_64-linux

✅ 2 packages built:
  • bottles
  • bottles-unwrapped

aarch64-linux

✅ 2 packages built:
  • bottles
  • bottles-unwrapped

@Gliczy Gliczy marked this pull request as ready for review December 15, 2024 18:58
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 on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant