pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #170943 from SFrijters/wine-7.7

wine{Unstable,Staging}: 7.4 -> 7.8; winetricks: 20210825 -> 20220411

authored by 7c6f434c and committed by GitHub 561813c4 ddfb7879

+10 -8
unified split
+3 -1
pkgs/applications/emulators/wine/base.nix
··· 175 done 176 ''; 177 178 - enableParallelBuilding = true; 179 180 # https://bugs.winehq.org/show_bug.cgi?id=43530 181 # https://github.com/NixOS/nixpkgs/issues/31989
··· 175 done 176 ''; 177 178 + # Until https://github.com/NixOS/nixpkgs/pull/172617 is applied, 179 + # parallel builds do not always work because of a bug in dlltool. 180 + enableParallelBuilding = false; 181 182 # https://bugs.winehq.org/show_bug.cgi?id=43530 183 # https://github.com/NixOS/nixpkgs/issues/31989
+7 -7
pkgs/applications/emulators/wine/sources.nix
··· 46 47 unstable = fetchurl rec { 48 # NOTE: Don't forget to change the SHA256 for staging as well. 49 - version = "7.4"; 50 url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; 51 - sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY="; 52 inherit (stable) gecko32 gecko64 patches; 53 54 mono = fetchurl rec { 55 - version = "7.1.1"; 56 url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; 57 - sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo="; 58 }; 59 }; 60 61 staging = fetchFromGitHub rec { 62 # https://github.com/wine-staging/wine-staging/releases 63 inherit (unstable) version; 64 - sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q"; 65 owner = "wine-staging"; 66 repo = "wine-staging"; 67 rev = "v${version}"; ··· 84 85 winetricks = fetchFromGitHub rec { 86 # https://github.com/Winetricks/winetricks/releases 87 - version = "20210825"; 88 - sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8="; 89 owner = "Winetricks"; 90 repo = "winetricks"; 91 rev = version;
··· 46 47 unstable = fetchurl rec { 48 # NOTE: Don't forget to change the SHA256 for staging as well. 49 + version = "7.8"; 50 url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; 51 + sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg="; 52 inherit (stable) gecko32 gecko64 patches; 53 54 mono = fetchurl rec { 55 + version = "7.2.0"; 56 url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; 57 + sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM="; 58 }; 59 }; 60 61 staging = fetchFromGitHub rec { 62 # https://github.com/wine-staging/wine-staging/releases 63 inherit (unstable) version; 64 + sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws="; 65 owner = "wine-staging"; 66 repo = "wine-staging"; 67 rev = "v${version}"; ··· 84 85 winetricks = fetchFromGitHub rec { 86 # https://github.com/Winetricks/winetricks/releases 87 + version = "20220411"; 88 + sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; 89 owner = "Winetricks"; 90 repo = "winetricks"; 91 rev = version;