Merge pull request #125118 from chkno/wine

wine: gecko 2.47.1 -> 2.47.2 and add tests

authored by Bernardo Meurer and committed by GitHub b3e7ddab bce05e3b

+46 -4
+42
nixos/tests/wine.nix
··· 1 + { system ? builtins.currentSystem, pkgs ? import ../.. { 2 + inherit system; 3 + config = { }; 4 + }, }: 5 + 6 + let 7 + inherit (pkgs.lib) concatMapStrings listToAttrs; 8 + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; 9 + 10 + hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe"; 11 + hello64 = "${pkgs.pkgsCross.mingwW64.hello}/bin/hello.exe"; 12 + 13 + makeWineTest = packageSet: exes: variant: rec { 14 + name = "${packageSet}-${variant}"; 15 + value = makeTest { 16 + inherit name; 17 + meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; }; 18 + 19 + machine = { pkgs, ... }: { 20 + environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ]; 21 + virtualisation.diskSize = "800"; 22 + }; 23 + 24 + testScript = '' 25 + machine.wait_for_unit("multi-user.target") 26 + ${concatMapStrings (exe: '' 27 + greeting = machine.succeed( 28 + "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" 29 + ) 30 + assert 'Hello, world!' in greeting 31 + machine.fail( 32 + "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" 33 + ) 34 + '') exes} 35 + ''; 36 + }; 37 + }; 38 + 39 + variants = [ "base" "full" "minimal" "staging" "unstable" ]; 40 + 41 + in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants 42 + ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants)
+4 -4
pkgs/misc/emulators/wine/sources.nix
··· 19 19 20 20 ## see http://wiki.winehq.org/Gecko 21 21 gecko32 = fetchurl rec { 22 - version = "2.47.1"; 22 + version = "2.47.2"; 23 23 url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; 24 - sha256 = "0ld03pjm65xkpgqkvfsmk6h9krjsqbgxw4b8rvl2fj20j8l0w2zh"; 24 + sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875"; 25 25 }; 26 26 gecko64 = fetchurl rec { 27 - version = "2.47.1"; 27 + version = "2.47.2"; 28 28 url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; 29 - sha256 = "0jj7azmpy07319238g52a8m4nkdwj9g010i355ykxnl8m5wjwcb9"; 29 + sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5"; 30 30 }; 31 31 32 32 ## see http://wiki.winehq.org/Mono