From c8d207ed5a86e19b9685a253ceff10296bd952b4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 12:14:16 +0100 Subject: wine{Unstable,Staging}: 6.0-rc4 -> 6.0-rc5 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 3a5abe18d754..063b4f96d4fe 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-rc4"; + version = "6.0-rc5"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; + sha256 = "sha256-8fEKCu9NzJz07Gfwgo/B9/Nk4ujnwvAnwlPI4gBL9FE="; 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-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; + sha256 = "sha256-xC8W87nvIzVk2pLJnf4JzBrrpwS1Opm4qqwOmF5NIeo"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; -- cgit 1.4.1 From da97c80fd78f0b5b6a9c27fb98888d6e3d82aace Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 12:35:28 +0100 Subject: wine{Unstable,Staging}: 6.0-rc5 -> 6.0-rc6 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 063b4f96d4fe..60d138355d6c 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-rc5"; + version = "6.0-rc6"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-8fEKCu9NzJz07Gfwgo/B9/Nk4ujnwvAnwlPI4gBL9FE="; + sha256 = "sha256-5nqX8ZjJazpiS2N5Ar45vmjG3FVA1VlFEweM+JeA5sE="; 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-xC8W87nvIzVk2pLJnf4JzBrrpwS1Opm4qqwOmF5NIeo"; + sha256 = "sha256-46OtcjbMjzEdMpCSswF3LU3SybySLQrsAH9npOgWca8="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; -- cgit 1.4.1 From c93866be97d434fb27b677b348ccead134c1d9b2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 13:46:40 +0100 Subject: wineStaging: 5.0.3 -> 6.0 --- pkgs/misc/emulators/wine/cert-path-stable.patch | 24 ------------------------ pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/cert-path-stable.patch (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/cert-path-stable.patch b/pkgs/misc/emulators/wine/cert-path-stable.patch deleted file mode 100644 index da01a4778102..000000000000 --- a/pkgs/misc/emulators/wine/cert-path-stable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include - #include -+#include /* getenv */ - #include - #ifdef HAVE_SYS_STAT_H - #include -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) - - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 60d138355d6c..49444463ebc9 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0.3"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; + version = "6.0"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -38,7 +38,7 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-stable.patch + ./cert-path.patch ]; }; -- cgit 1.4.1 From 0ec2ea8c17edc8d218dd9f3cf4bb3d9327026825 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 5 Feb 2021 13:47:29 +0100 Subject: wine{Unstable,Staging}: 6.0-rc6 -> 6.1 --- pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 49444463ebc9..15e2f80aa4ea 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-rc6"; - url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-5nqX8ZjJazpiS2N5Ar45vmjG3FVA1VlFEweM+JeA5sE="; + version = "6.1"; + url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; + sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk="; 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-46OtcjbMjzEdMpCSswF3LU3SybySLQrsAH9npOgWca8="; + sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; -- cgit 1.4.1