-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
wine: reorganize packages #26152
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
Conversation
@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. |
pkgs/top-level/all-packages.nix
Outdated
}; | ||
|
||
stable = base.override { wineRelease = "stable"; }; | ||
snstable = base.override { wineRelease = "unstable"; }; |
There was a problem hiding this comment.
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 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also using wineWow
here?
There was a problem hiding this comment.
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".
@Mic92 Fixed. |
Wait, I'm not sure |
generally looks good for me! |
Added WOW64 support to the full version for 64-bit systems and built them. |
}); | ||
wineStable = self.wine.override { wineRelease = "stable"; }; | ||
wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); |
There was a problem hiding this comment.
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
?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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...
Done -- I returned aliases for all old |
It seems that |
Sadly no luck. I've reverted wineStaging to 32-bit only. Merging in few days unless anybody has a better idea. |
2a2a4bf
to
ed3944c
Compare
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.
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
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)wine
still building on my machine;wineStaging
works.