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: reorganize packages #26152

Merged
merged 2 commits into from Jun 3, 2017
Merged

wine: reorganize packages #26152

merged 2 commits into from Jun 3, 2017

Conversation

abbradar
Copy link
Member

@abbradar abbradar commented May 27, 2017

Move most of wine configurations to winePackages which are not built on Hydra.
Leave two top-level packages:

wine: stable release with an "office" configuration;
wineStaging: staging release with a "full" configuration.

Motivation for this change

Fixes #26041.

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
    • Linux
  • 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.

wine still building on my machine; wineStaging works.

@mention-bot
Copy link

@abbradar, thanks for your PR! By analyzing the history of the files in this pull request, we identified @michalrus and @joachifm to be potential reviewers.

};

stable = base.override { wineRelease = "stable"; };
snstable = base.override { wineRelease = "unstable"; };
Copy link
Member

Choose a reason for hiding this comment

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

typo

xmlSupport = true;
};

full = base.override {
Copy link
Member

Choose a reason for hiding this comment

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

Also using wineWow here?

Copy link
Member Author

Choose a reason for hiding this comment

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

@Mic92 Hm, why not indeed since it's "full".

@abbradar
Copy link
Member Author

@Mic92 Fixed.

@abbradar
Copy link
Member Author

Wait, I'm not sure wineWow would work as is -- maybe this should be made conditional on arch. I'll check after I get home.

@avnik
Copy link
Contributor

avnik commented May 27, 2017

generally looks good for me!

@abbradar
Copy link
Member Author

Added WOW64 support to the full version for 64-bit systems and built them. airwave doesn't build but seems because of package's own issues.

});
wineStable = self.wine.override { wineRelease = "stable"; };
wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });
Copy link
Member

Choose a reason for hiding this comment

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

Maybe worth adding wineUnstable to pkgs/top-level/aliases.nix?

Copy link
Member Author

Choose a reason for hiding this comment

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

@Mic92 Won't it then be built on Hydra? Since we want to stop building most of Wine packages now is the good time to do breaking changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, I think we can achieve the same without dropping top-level aliases -- let me check something...

@abbradar
Copy link
Member Author

Done -- I returned aliases for all old wine packages but now we don't build aliases on Hydra (which shouldn't affect any packages apart from wine ones).

@abbradar
Copy link
Member Author

It seems that wineWow is more unstable than we have thought -- for example 32-bit wine in wineWow doesn't support GTK for some reason. I'll try to fix this a bit and revert to having wine32 by default for now if get no luck.

@abbradar
Copy link
Member Author

Sadly no luck. I've reverted wineStaging to 32-bit only. Merging in few days unless anybody has a better idea.

@abbradar abbradar force-pushed the wine-reorder branch 2 times, most recently from 2a2a4bf to ed3944c Compare June 3, 2017 21:57
Move most of wine configurations to winePackages which is not built on Hydra.
Leave two top-level packages:

wine: stable release with an "office" configuration;
wineStaging: staging release with a "full" configuration.
@abbradar abbradar merged commit 0011f90 into NixOS:master Jun 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants