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

wineStable: 5.0.0 -> 5.0.2, wine{Unstable,Staging}: 5.16 -> 5.18, wine.vkd3d: 1.1 -> 1.2 #98999

Merged
merged 4 commits into from Oct 4, 2020

Conversation

@SFrijters
Copy link
Member

@SFrijters SFrijters commented Sep 28, 2020

Motivation for this change

Upstream has seen some updates. Commits are in the order of those upstream updates as reported on https://www.winehq.org/news/.

There was a previous PR that updated multiple wine components at the same time so I followed that example, but if this PR needs to be split up please let me know.

Things done
  • I've tested the 5.18 staging version with the programs I normally use, and checked that the main binaries for the intermediate version 5.17 and the new stable version start without problems. I've also built wine with vkd3d enabled to test that update.
  • 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.
@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Sep 28, 2020

Hm, I'm running nix-shell -p nixpkgs-review --run "nixpkgs-review wip" locally and I get a failed build for webkitgtk (which seems to be a dependency for lutris), but I don't see how this would have anything to do with my changes?

error: --- Error --- nix-daemon
builder for '/nix/store/cd9napir1g28rx44zimyxjwch6k52wca-webkitgtk-2.28.4.drv' failed with exit code 1; last 10 log lines:
  In file included from DerivedSources/WebCore/unified-sources/UnifiedSource-44a97133-1.cpp:4:
  ../Source/WebCore/crypto/SubtleCrypto.cpp: In member function 'void WebCore::SubtleCrypto::deriveKey(JSC::JSGlobalObject&, WebCore::SubtleCrypto::AlgorithmIdentifier&&, WebCore::CryptoKey&, WebCore::SubtleCrypto::AlgorithmIdentifier&&, bool, WTF::Vector<WebCore::CryptoKeyUsage>&&, WTF::Ref<WebCore::DeferredPromise>&&)':
  ../Source/WebCore/crypto/SubtleCrypto.cpp:769:6: internal compiler error: Segmentation fault
    769 | void SubtleCrypto::deriveKey(JSC::JSGlobalObject& state, AlgorithmIdentifier&& algorithmIdentifier, CryptoKey& baseKey, AlgorithmIdentifier&& derivedKeyType, bool extractable, Vector<CryptoKeyUsage>&& keyUsages, Ref<DeferredPromise>&& promise)
        |      ^~~~~~~~~~~~
  Please submit a full bug report,
  with preprocessed source if appropriate.
  See <https://gcc.gnu.org/bugs/> for instructions.
  [3747/4503] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-2f84417a-12.cpp.o
  ninja: build stopped: subcommand failed.

Similarly

error: --- Error --- nix-daemon
builder for '/nix/store/mrdiyznpbsnxwypwrlxw54rk5aqasxv4-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
  
  ***

Final result, because of the errors shown above:

4 package failed to build:
airwave lutris lutris-free lutris-unwrapped

16 package built:
pipelight playonlinux protontricks wine wineStaging wineMinimal wineStable winePackages.fonts winePackages.staging wineUnstable wineWowPackages.base wineWowPackages.full wineWowPackages.minimal wineWowPackages.staging wineWowPackages.unstable winetricks
@avnik
Copy link
Contributor

@avnik avnik commented Sep 28, 2020

LGTM! 👍
And ty for splitting 5.17 and 5.18 to own commits, I always to myself this way.

@avnik
avnik approved these changes Sep 28, 2020
Copy link
Contributor

@avnik avnik left a comment

All looks good for me.

SFrijters added 4 commits Sep 28, 2020
@SFrijters SFrijters force-pushed the SFrijters:wine-5.18 branch from cae39b9 to 6ce4359 Sep 30, 2020
@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Sep 30, 2020

Trivially rebased because I was doing maintenance on my fork.

@avnik
avnik approved these changes Sep 30, 2020
Copy link
Contributor

@avnik avnik left a comment

I have local build which I tested, with same source hashes (for staging) and it works. So I feel it all good.

@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Oct 3, 2020

@veprbl Since you merged previous wine updates as well, do you agree with this one?

@veprbl
veprbl approved these changes Oct 4, 2020
Copy link
Member

@veprbl veprbl left a comment

LGTM

@veprbl veprbl merged commit 76b0854 into NixOS:master Oct 4, 2020
17 checks passed
17 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6ce4359"; rev="6ce4359385036e02e25143fae4e61d544769b09f"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@SFrijters SFrijters deleted the SFrijters:wine-5.18 branch Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.