diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-01-14 19:22:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 19:22:06 +0000 |
| commit | 983cd52d2f3b923761a2c766fb9e1f8df835f11b (patch) | |
| tree | c55cef70be255b97778275f76bde2f9dc629206f | |
| parent | 257170ca27ab78422a45d1270c150fe912b2884e (diff) | |
| parent | dfe26d0d34752a7c077d0dea7ef3cdab91c3bf03 (diff) | |
Merge pull request #108225 from avnik/wine-update
Wine update
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index afa172823853..3a5abe18d754 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,32 +44,24 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.22"; - url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; + version = "6.0-rc4"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; inherit (stable) mono gecko32 gecko64; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch - - # Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163 - (pkgs.fetchpatch { - url = "https://bugs.winehq.org/attachment.cgi?id=68680"; - sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo="; - }) ]; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk="; + sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; owner = "wine-staging"; repo = "wine-staging"; - #rev = "v${version}"; # revert back to this statement on next release - # Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162 - rev = "f257f37b92041fc718de04aa83ec3139b748ffa2"; + rev = "v${version}"; # Just keep list empty, if current release haven't broken patchsets disabledPatchsets = [ ]; |