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

wine: wineStaging -> wine-staging, add wine-development, use full scheme for wine-stable #33596

Merged
merged 2 commits into from
Apr 20, 2018
Merged

wine: wineStaging -> wine-staging, add wine-development, use full scheme for wine-stable #33596

merged 2 commits into from
Apr 20, 2018
+3 −2

Conversation

lukateras
Copy link
Member

Motivation for this change

Build type should not depend on version being used. It is very confusing that e.g. Morrowind doesn't work on wine but works on wineStaging, and that depends on whether it was built with mpg123 or not.

Wine staging is too experimental, and breaks many games, while Wine stable is too old and, for example, not suitable for WineHQ or bug tracker reports. Currently Hydra doesn't seem to build Wine development.

Wine development is the official name for Wine releases other than stable, see: https://www.winehq.org/

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@lukateras
wineStaging: rename to wine-staging

Unverified

This user has not yet uploaded their public signing key.
GPG key ID: C34BF9DCC9DF8210
Learn about vigilant mode
6bf1232
@lukateras
wine: build full instead of base

Unverified

This user has not yet uploaded their public signing key.
GPG key ID: C34BF9DCC9DF8210
Learn about vigilant mode
afaa1ad 
Build type should not depend on version being used. It is very confusing that
e.g. Morrowind doesn't work on wine but works on wineStaging, and that depends
on whether it was built with mpg123 or not.
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 8, 2018
@MP2E
Copy link

MP2E commented Jan 19, 2018 •
edited
Loading

Looks good to me. From what I recall, staging was purposely removed from Hydra builds at some point in 2015. Will follow up with a issue #, the concern had then may be resolved now.

@ikervagyok
Copy link
Contributor

i'm mostly interested in afaa1ad, because i had problems with that too - is there something missing where i could help out, so this can get merged?

@lukateras lukateras force-pushed the 20180108.033429/wine branch from e686534 to afaa1ad Compare April 20, 2018 10:03
@lukateras lukateras merged commit a731dfc into NixOS:master Apr 20, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: wine

Partial log (click to expand)

Cannot nix-instantiate `wine' because:
error: while evaluating the attribute 'full' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:21024:5:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:113:35, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:20999:15:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:72:24, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:117:8:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/misc/emulators/wine/default.nix:9:1, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:74:12:
while evaluating 'wine-build' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/misc/emulators/wine/default.nix:45:25, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/misc/emulators/wine/default.nix:64:3:
callPackage_i686 not supported on system 'x86_64-darwin'

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: wine

Partial log (click to expand)

Cannot nix-instantiate `wine' because:
�[31;1merror:�[0m while evaluating the attribute 'full' at �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/pkgs/top-level/all-packages.nix�[0m:21024:5:
while evaluating 'callPackageWith' at �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/lib/customisation.nix�[0m:113:35, called from �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/pkgs/top-level/all-packages.nix�[0m:20999:15:
while evaluating 'makeOverridable' at �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/lib/customisation.nix�[0m:72:24, called from �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/lib/customisation.nix�[0m:117:8:
while evaluating anonymous function at �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/pkgs/misc/emulators/wine/default.nix�[0m:9:1, called from �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/lib/customisation.nix�[0m:74:12:
while evaluating 'wine-build' at �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/pkgs/misc/emulators/wine/default.nix�[0m:45:25, called from �[1m/var/lib/gc-of-borg/nix-test-rs-22/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-22/pkgs/misc/emulators/wine/default.nix�[0m:64:3:
callPackage_i686 not supported on system 'aarch64-linux'

@lukateras
Copy link
Member Author

@ikervagyok: Merged (without wine-development commit). Thanks for bringing this up!

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wine

Partial log (click to expand)

/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/regsvr32: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/wineboot: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/winecfg: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/wineconsole: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/winedbg: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/winefile: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/winemine: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
/nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0/bin/winepath: interpreter directive changed from "/bin/sh" to "/nix/store/bqjqqq2fibhvfbz3gv3i6wbw0f9cv81d-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/ara9qihzrzn24mal0lhd2rx1y952c2az-wine-3.0...
cannot find section .dynamic

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lukateras @MP2E @ikervagyok @GrahamcOfBorg