diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 566b9baa67b..30d417ce9fa 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -25,9 +25,12 @@ let machine.wait_for_unit("multi-user.target") ${concatMapStrings (exe: '' greeting = machine.succeed( - 'wine ${exe}' + "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" ) assert 'Hello, world!' in greeting + machine.fail( + "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" + ) '') exes} ''; }; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6103472a7cc..abaa16d2d13 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -19,14 +19,14 @@ in rec { ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.1"; + version = "2.47.2"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "0ld03pjm65xkpgqkvfsmk6h9krjsqbgxw4b8rvl2fj20j8l0w2zh"; + sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875"; }; gecko64 = fetchurl rec { - version = "2.47.1"; + version = "2.47.2"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "0jj7azmpy07319238g52a8m4nkdwj9g010i355ykxnl8m5wjwcb9"; + sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5"; }; ## see http://wiki.winehq.org/Mono