Skip to content

Commit 42565a8

Browse files
authored
wine64Packages.{unstable,staging}: 10.0 -> 10.2 (NixOS#384537)
2 parents e867865 + 2df9bf3 commit 42565a8

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

nixos/tests/wine.nix

+9
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,14 @@ listToAttrs (
7575
# This wayland combination times out after spending many hours.
7676
# https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux
7777
(pkgs.lib.remove "wayland" variants)
78+
++
79+
map
80+
(makeWineTest "wineWow64Packages" [
81+
hello32
82+
hello64
83+
])
84+
# This wayland combination times out after spending many hours.
85+
# https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux
86+
(pkgs.lib.remove "wayland" variants)
7887
)
7988
)

pkgs/applications/emulators/wine/sources.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ in rec {
6969

7070
unstable = fetchurl rec {
7171
# NOTE: Don't forget to change the hash for staging as well.
72-
version = "10.0";
73-
url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
74-
hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";
72+
version = "10.2";
73+
url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
74+
hash = "sha256-nZDfts8QuBCntHifAGdxK0cw0+oqiLkfG+Jzsq0EJD8=";
7575
inherit (stable) patches;
7676

7777
## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
117117
staging = fetchFromGitLab rec {
118118
# https://gitlab.winehq.org/wine/wine-staging
119119
inherit (unstable) version;
120-
hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4=";
120+
hash = "sha256-qWje1nJ5LIVFj5PmB6RRITYOWGovXzCLEVFTazmp30o=";
121121
domain = "gitlab.winehq.org";
122122
owner = "wine";
123123
repo = "wine-staging";

0 commit comments

Comments
 (0)