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.

Sign up for GitHub

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

Jump to bottom

vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 #289265

Merged
merged 5 commits into from
Feb 25, 2024
Merged

vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 #289265

merged 5 commits into from
Feb 25, 2024

Conversation

ardishko
Copy link
Contributor

Description of changes

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.

@ardishko
Copy link
Contributor Author

Oops, the PR is targeting unstable. My bad. I'll change the target and add the patch file in a second.

@ardishko ardishko changed the base branch from nixos-unstable to master February 16, 2024 12:16
@ofborg ofborg bot requested a review from nyabinary February 16, 2024 13:26
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Feb 16, 2024
@ardishko
vinegar: switched Wine version to wine64Packages.staging, added
93f6cd5 
segregrevert patch, added mouselock patch, added
wine-loader-prefer-winedllpath.patch, bumped vinegar version from 1.6.1
--> 1.7.3 and removed patches folder
@ardishko ardishko changed the title vinegar: add regregrevert patch for wine 9.0 (stable) vinegar: added segregrevert, mouselock, loader-prefer-winedllpath.patch for wine 9.2 (staging) Feb 16, 2024
@ardishko ardishko changed the title vinegar: added segregrevert, mouselock, loader-prefer-winedllpath.patch for wine 9.2 (staging) vinegar: added segregrevert, mouselock, loader-prefer-winedllpath.patch for wine 9.2 (staging) and bumped version from 1.6.1 -> 1.7.3 Feb 16, 2024
@ardishko ardishko changed the title vinegar: added segregrevert, mouselock, loader-prefer-winedllpath.patch for wine 9.2 (staging) and bumped version from 1.6.1 -> 1.7.3 vinegar: added segregrevert, mouselock, loader-prefer-winedllpath.patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 Feb 16, 2024
@nyabinary nyabinary mentioned this pull request Feb 16, 2024
Closed
13 tasks
@ardishko
Copy link
Contributor Author

I've removed the wine-dll-prefer-winedll.patch as it was mentioned that this patch is a flatpak-specific patch only needed for the flatpak for vinegar thus not really being necessary. My testing also confirms that It's not necessary to any core functionality of this program.

@ardishko ardishko changed the title vinegar: added segregrevert, mouselock, loader-prefer-winedllpath.patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 vinegar: added segregrevert, mouselock, for wine 9.2; vinegar 1.6.1 -> 1.7.3 Feb 17, 2024
@ardishko ardishko changed the title vinegar: added segregrevert, mouselock, for wine 9.2; vinegar 1.6.1 -> 1.7.3 vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 Feb 17, 2024
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 19, 2024
@ofborg ofborg bot requested a review from nyabinary February 19, 2024 17:07
@nyabinary
Copy link
Contributor

1.7.4 is out.

@ardishko
Copy link
Contributor Author

1.7.4 is out.

Updating the PR ASAP, thanks for the heads up

@ardishko ardishko requested a review from kirillrdy February 25, 2024 12:31
@kirillrdy kirillrdy changed the title vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.4 Feb 25, 2024
@kirillrdy kirillrdy merged commit b3b5399 into NixOS:master Feb 25, 2024
26 checks passed
@kirillrdy kirillrdy mentioned this pull request Feb 25, 2024
Closed
@nyabinary
Copy link
Contributor

@kirillrdy I don't think vinegar got updated to 1.7.4 here.

@kirillrdy kirillrdy changed the title vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.4 vinegar: added segregrevert, mouselock patch for wine 9.2; vinegar 1.6.1 -> 1.7.3 Feb 25, 2024
@kirillrdy
Copy link
Member

my bad, thanks for pointer @nyabinary !

@ardishko ardishko deleted the patch-9 branch February 26, 2024 10:38
@sochotnicky sochotnicky mentioned this pull request Feb 27, 2024
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SystematicError SystematicError SystematicError left review comments

@nyabinary nyabinary nyabinary approved these changes

@kirillrdy kirillrdy Awaiting requested review from kirillrdy

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ardishko @nyabinary @kirillrdy @SystematicError @delroth