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

Wine update: 5.11 -> 5.12 #92295

Merged
merged 4 commits into from Jul 14, 2020
Merged

Wine update: 5.11 -> 5.12 #92295

merged 4 commits into from Jul 14, 2020

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Jul 4, 2020

Motivation for this change

Keep wine unstable/staging up to date.
Also allows to disable specific patchsets from staging

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

avnik added 3 commits July 5, 2020 00:08
Motivation: it works faster, and don't issue suspicious errors like
`sed: couldn't flush stdout: Broken pipe` during applying patches.
@avnik avnik changed the title Wine update Wine update: 5.11 -> 5.12 Jul 4, 2020
@veprbl veprbl requested a review from SFrijters July 4, 2020 22:53
@veprbl veprbl mentioned this pull request Jul 4, 2020
@veprbl veprbl requested a review from ikervagyok July 4, 2020 22:55
Copy link
Member

@SFrijters SFrijters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the user point of view it looks good to me: built it and used it to run the Windows applications I normally use with Wine and they work (as well as before). One of them is foobar2000 so this also tests the faudio update to some extent.

From a style point of view I'm not the best person to ask, but I have one suggestion.

@@ -1,4 +1,4 @@
{ stdenv, callPackage, wineUnstable }:
{ lib, stdenv, callPackage, wineUnstable }:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other lib in this file are used as stdenv.lib, so do we want it as an extra argument for concatMapStringsSep?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, will use stdenv.lib as well

Due repeatable issues with xactengine-initial patchset.
Later, `disablePatchsets` can be extended to be overridable argument
of wineStaging.
@veprbl veprbl merged commit a4c7c2a into NixOS:master Jul 14, 2020
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

3 participants