Wine update: 3.20 -> 4.0-rc2 #51341
Wine update: 3.20 -> 4.0-rc2 #51341
Conversation
|
@GrahamcOfBorg build wine-staging |
|
@worldofpeace done |
|
@worldofpeace @yegortimoshenko updated to friday's 4.0-rc1, and rebased on fresh master. |
|
@avnik maybe you could change the title of this pr as well, so people see that 4.0-rc1 is ready ;) |
|
@ikervagyok correct, was updated. @worldofpeace I can't mark your review as resolved by some reasons (probably because I force-update branch) |
|
@GrahamcOfBorg build wine-staging |
|
Ahh forgot unstable. |
|
Looks good. @yegortimoshenko Can you check give this a look again so I can merge? |
|
On Tue, Dec 18, 2018 at 05:24:05PM +0000, worldofpeace wrote:
Looks good.
@yegortimoshenko Can you check give this a look again so I can merge?
Or I can drop-in 4.0-rc2 ;)
|
Sure 👍 |
|
On Tue, Dec 18, 2018 at 09:38:00AM -0800, worldofpeace wrote:
> On Tue, Dec 18, 2018 at 05:24:05PM +0000, worldofpeace wrote: Looks good. @yegortimoshenko Can you check give this a look again so I can merge?
> Or I can drop-in 4.0-rc2 ;)
Sure 👍
btw folks, what suggestions for upcomming 4.0...
Put it to "stable" or put it to both?
I want to have wineStaging to evaluate to latest released
version+staging even in rare cases, when stable in one step forward than
unstable.
|
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -7,10 +7,15 @@ | |||
|
|
|||
| with import ./util.nix { inherit lib; }; | |||
|
|
|||
| let configureFlags' = configureFlags ++ [ "--disable-tests" ]; | |||
| in | |||
There was a problem hiding this comment.
I think @avnik said that it saved a larger percentage of build time, which I did notice when having ofborg build this.
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -7,10 +7,15 @@ | |||
|
|
|||
| with import ./util.nix { inherit lib; }; | |||
|
|
|||
| let configureFlags' = configureFlags ++ [ "--disable-tests" ]; | |||
| in | |||
|
|
|||
| stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { | |||
| builder = buildScript; | |||
| }) // rec { | |||
There was a problem hiding this comment.
It would be cleaner to remove rec here and set configureFlags = [ "--disable-tests" ] ++ configureFlags.
I think the last time (3.0) they actually made development build point to the same one as stable, at the very least on this page: https://web.archive.org/web/20180201114619/https://www.winehq.org/ |
|
On Tue, Dec 18, 2018 at 10:02:44AM -0800, Yegor Timoshenko wrote:
yegortimoshenko commented on this pull request.
> @@ -7,10 +7,15 @@
with import ./util.nix { inherit lib; };
+let configureFlags' = configureFlags ++ [ "--disable-tests" ];
+in
Can we fix the tests?
Do we need 10-20 mb of tests in final derivation and extra 20min of
build? Personally I prefer to split them to own output, optional and
make off by default.
> @@ -7,10 +7,15 @@
with import ./util.nix { inherit lib; };
+let configureFlags' = configureFlags ++ [ "--disable-tests" ];
+in
+
stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
builder = buildScript;
}) // rec {
It would be cleaner to remove `rec` here and set `configureFlags = [ "--disable-tests" ] ++ configureFlags`.
Agreed, will do.
But anyway, I'd like to postpone this specific commit, until further
investigation -- how tests builds/installed and if we can run them
non-interactively during build time, or not.
|
|
On Tue, Dec 18, 2018 at 06:50:43PM +0000, Yegor Timoshenko wrote:
> btw folks, what suggestions for upcomming 4.0... Put it to "stable" or put it to both?
I think the last time (3.0) they actually made development build point to the same one as stable, at the very least on this page: https://web.archive.org/web/20180201114619/https://www.winehq.org/
So just following whatever's on that page should work.
Updated with -rc2 and reverted commit.
|
Disabling the build of regression tests was proposed in NixOS#51341 but this change has been postponed until we reach a concensus.
worldofpeace
force-pushed
the
wine-update
branch
from
31d8fea
to
7f4e71c
Compare
worldofpeace
changed the title
|
Lets merge this before there's another rc 🤣 |
Motivation for this change
Only 32bit tested (although wine-wow is builds as well)
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)