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{unstable,staging}: 7.2 -> 7.4,vkd3d: 1.2 -> 1.3 #164621

Merged
merged 1 commit into from
Mar 20, 2022

Conversation

bhankas
Copy link
Contributor

@bhankas bhankas commented Mar 17, 2022

Description of changes

Wine updates since 7.2:
https://www.winehq.org/announce/7.4
https://www.winehq.org/announce/7.3
https://www.winehq.org/announce/7.2 (also contains announcement for wine-mono 7.1.1)

vkd3d:
https://www.winehq.org/news/2022030201

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 17, 2022

nixpkgs-review build is taking quite a while on my machine, so if someone has enough firepower, please try to have a go.

With this PR wine-staging will now be behind wine-stable, but my cursory check on how that can be updated went unfruitful as there is no tag/tar as we are currently querying. I got it wrong. 7.4 is still the development version according to announcement.

Also the number of wine packages is staggering in Nixpkgs, so I have chosen to conservatively update what I could reason about.

After nearly 2 years, I still consider myself a noob at Nix and Nixpkgs, so corrections welcome.

@bhankas bhankas requested a review from SFrijters March 17, 2022 18:24
@bhankas bhankas changed the title wineStable: 7.0 -> 7.4, wine-mono: 7.0.0 -> 7.1.1, vkd3d: 1.2 -> 1.3 wine{unstable,staging}: 7.0 -> 7.4, wine-mono: 7.0.0 -> 7.1.1, vkd3d: 1.2 -> 1.3 Mar 17, 2022
@bhankas bhankas marked this pull request as draft March 18, 2022 05:17
@bhankas bhankas changed the title wine{unstable,staging}: 7.0 -> 7.4, wine-mono: 7.0.0 -> 7.1.1, vkd3d: 1.2 -> 1.3 wine{unstable,staging}: 7.2 -> 7.4, wine-mono: 7.0.0 -> 7.1.1, vkd3d: 1.2 -> 1.3 Mar 18, 2022
@bhankas
Copy link
Contributor Author

bhankas commented Mar 18, 2022

staging package builds are failing with this error:

Applying /build/wine-7.4/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
patching configure.ac
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
[PATCH] ERR: Textual patch did not apply, aborting.
ERROR: Failed to apply patch, aborting!

I have tried looking more into it, but since this is my first day compiling wine or looking at its nixpkgs derivations, I am not able to make much sense on how to proceed on this. nixpkgs-review is still running, so I will let it finish before trying any further.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 18, 2022

I had to stop nixpkgs-review after 5 hours due to other reasons. If someone wants to try building this PR, or even build on top of this, please go ahead.

@SFrijters
Copy link
Member

Not at a PC so I can't check this but some remarks:

  • You need to update the hash for staging as well; in the current state of the PR it will probably use cached 7.2 staging patches against 7.4 unstable wine.
  • The mono version was already updated to 7.1.1 for unstable/staging, the mono version for stable should probably be kept as-is.

@bhankas bhankas changed the title wine{unstable,staging}: 7.2 -> 7.4, wine-mono: 7.0.0 -> 7.1.1, vkd3d: 1.2 -> 1.3 wine{unstable,staging}: 7.2 -> 7.4,vkd3d: 1.2 -> 1.3 Mar 19, 2022
@bhankas
Copy link
Contributor Author

bhankas commented Mar 19, 2022

Thanks for taking a look @SFrijters. Changed according to your suggestions. Trying to build one more time on my machine, but not hoping for miracle.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 19, 2022

nixpkgs-review is still going on my system, but there are no more patch related failures, so I am hopeful. I also rebased on last successful unstable evaluation according to hydra, hoping that requires building less stuff transitively (it is still building webkitgtk and its 5k C/C++ files so not sure if that attempt was successful)

I looks like airwave build will fail due to unrelated reason, however:

error: builder for '/nix/store/yhv15i75zp39qyfzrf4c03fg8h82h1cr-vstsdk368_08_11_2017_build_121.zip.drv' failed with exit code 1;
       last 10 log lines:
       > ***
       > Unfortunately, we cannot download file vstsdk368_08_11_2017_build_121.zip automatically.
       > Please go to http://www.steinberg.net/en/company/developers.html to download it yourself, and add it to the Nix store
       > using either
       >   nix-store --add-fixed sha256 vstsdk368_08_11_2017_build_121.zip
       > or
       >   nix-prefetch-url --type sha256 file:///path/to/vstsdk368_08_11_2017_build_121.zip
       >
       > ***
       >
       For full logs, run 'nix log /nix/store/yhv15i75zp39qyfzrf4c03fg8h82h1cr-vstsdk368_08_11_2017_build_121.zip.drv'.
error: 1 dependencies of derivation '/nix/store/mvywln4rzk6kvzaidd9i58x0nv8hyyyj-vstsdk368_08_11_2017_build_121.drv' failed to build

@SFrijters
Copy link
Member

SFrijters commented Mar 19, 2022

Yeah, airwave the vst-sdk is nonfree and the required source zip is no longer available last I checked.
But I think it uses stable so if you don't bump mono nothing should change?

Well I guess the vkd3d change might trigger a rebuild for stable (didn't check the dependencies myself), but I think we can assume that wouldn't actually affect an audio application anyway.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 20, 2022

Thanks. After 8+ hours this thing is still not finished and will take a while more (I need a new machine, don't I?). I'm gonna let it finish now, sunk cost and all. But have no idea how to actually use it in a flake based config to override just wine and steam-run.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 20, 2022

After measly 12+ hours of compilation, this PR is now ready for review. @SFrijters kindly do the honors.

Packages built:

  • grapejuice
  • lutris
  • lutris-free
  • lutris-unwrapped
  • pipelight
  • playonlinux
  • q4wine
  • winbox
  • wine
  • wine-staging
  • wineWayland
  • wine64
  • wine64Packages.staging
  • wine64Packages.stagingFull
  • wine64Packages.unstable
  • wine64Packages.unstableFull
  • wine64Packages.waylandFull
  • winePackages.staging
  • winePackages.unstable
  • winePackages.unstableFull
  • wineWowPackages.full
  • wineWowPackages.staging
  • wineWowPackages.stagingFull
  • wineWowPackages.unstable
  • wineWowPackages.unstableFull
  • wineWowPackages.waylandFull
  • yabridge
  • yabridgectl

airwave failed to built as predicted due to previously stated reason.

@bhankas bhankas marked this pull request as ready for review March 20, 2022 13:37
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/783

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

4 participants