From f3206ed7db795170d0bb605cdc7770e012834eb7 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 5 Dec 2020 23:17:52 +0200 Subject: [PATCH 1/4] wineUnstable: 5.22 -> 6.0-rc1 --- pkgs/misc/emulators/wine/sources.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index afa17282385..a18d37bfd62 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,32 +44,25 @@ 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-rc1"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-eN3JSPlGxmJ3m9WUPZGBJ0BIACG8lRy8resQLDi1O8g="; 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-wAvH2BV/j3PbrLYoALVj5YG0VO15ySRodSs2w70YcIs="; 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}"; # revert back to this statement after stable release + rev = "v6.0rc1"; # Just keep list empty, if current release haven't broken patchsets disabledPatchsets = [ ]; From 809c04b37aecad16f8b63f3f4b8c38d36afee6f6 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 14 Dec 2020 15:34:54 +0200 Subject: [PATCH 2/4] wineUnstable: 6.0-rc1 -> 6.0-rc2 Staging updated as well --- pkgs/misc/emulators/wine/sources.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index a18d37bfd62..773355934f6 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc1"; + version = "6.0-rc2"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-eN3JSPlGxmJ3m9WUPZGBJ0BIACG8lRy8resQLDi1O8g="; + sha256 = "sha256-8giHy+YsxCU5sh9YI9ZP3DEAGLFTPr8ELagZJ/OSDXY="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,11 +58,10 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-wAvH2BV/j3PbrLYoALVj5YG0VO15ySRodSs2w70YcIs="; + sha256 = "sha256-o5oXY2P/mT323paPifFz5kn/t56MAdlXaxcQlZDGUTI="; owner = "wine-staging"; repo = "wine-staging"; - # rev = "v${version}"; # revert back to this statement after stable release - rev = "v6.0rc1"; + rev = "v${version}"; # Just keep list empty, if current release haven't broken patchsets disabledPatchsets = [ ]; From 36a6002f9675d7150b82f6d9fe25cc3732a3e108 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 1 Jan 2021 16:36:02 +0200 Subject: [PATCH 3/4] wineUnstable: 6.0-rc2 -> 6.0-rc3 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 773355934f6..760870413bf 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc2"; + version = "6.0-rc3"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-8giHy+YsxCU5sh9YI9ZP3DEAGLFTPr8ELagZJ/OSDXY="; + sha256 = "sha256-cD1rp4T1wrhIIbTGzbYhCzrE4PUxCM0HoWmvgMnZQz4="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-o5oXY2P/mT323paPifFz5kn/t56MAdlXaxcQlZDGUTI="; + sha256 = "sha256-/m4U6kBb89FGXTF6XglUhE+MrIuWQpxsY5SdrEJ5MSY="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From dfe26d0d34752a7c077d0dea7ef3cdab91c3bf03 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 2 Jan 2021 16:41:13 +0200 Subject: [PATCH 4/4] wineUnstable: 6.0-rc3 -> 6.0-rc4 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 760870413bf..3a5abe18d75 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc3"; + version = "6.0-rc4"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-cD1rp4T1wrhIIbTGzbYhCzrE4PUxCM0HoWmvgMnZQz4="; + sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-/m4U6kBb89FGXTF6XglUhE+MrIuWQpxsY5SdrEJ5MSY="; + sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}";