From 9a1056948092ed90e394b674a3ba37b8bd34c689 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 9 Sep 2016 00:32:34 +0200
Subject: [PATCH] wine: 1.8.3 -> 1.8.4; 1.9.16 -> 1.9.18

- update mono and gecko versions
- update winetricks
- replace sourceforge download urls
---
 pkgs/misc/emulators/wine/sources.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index ed766e54bac7..72fd3c82a510 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -7,42 +7,42 @@ in rec {
 
   stable = fetchurl rec {
     version = "1.8.4";
-    url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
+    url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2";
     sha256 = "0yahh1n3s3y0bp1a1sr3zpna56749jdgr85hwmpq393pjx1i0pai";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
       version = "2.40";
-      url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi";
+      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi";
       sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
     };
     gecko64 = fetchurl rec {
       version = "2.40";
-      url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi";
+      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi";
       sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
     };
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "4.5.6";
-      url = "mirror://sourceforge/wine/wine-mono-${version}.msi";
-      sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+      version = "4.6.3";
+      url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
+      sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq";
     };
   };
 
   unstable = fetchurl rec {
     version = "1.9.18";
-    url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
+    url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2";
     sha256 = "1n38697v707j489ljd6b2k1yvrarflc0yn847jas1ida1nm4nq96";
     inherit (stable) mono;
     gecko32 = fetchurl rec {
-      version = "2.44";
+      version = "2.47";
       url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi";
-      sha256 = "0fbd8pxkihhfxs5mcx8n0rcygdx43qdrp2x8hq1s1cvifp8lm9kp";
+      sha256 = "0fk4fwb4ym8xn0i5jv5r5y198jbpka24xmxgr8hjv5b3blgkd2iv";
     };
     gecko64 = fetchurl rec {
-      version = "2.44";
+      version = "2.47";
       url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi";
-      sha256 = "0qb6zx4ycj37q26y2zn73w49bxifdvh9n4riy39cn1kl7c6mm3k2";
+      sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5";
     };
   };
 
@@ -55,8 +55,8 @@ in rec {
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20160622";
-    sha256 = "0xh7mc5xby0zxx2g3q1ky18s20y6s7wp3vzvgxydwzhhwf32189q";
+    version = "20160724";
+    sha256 = "0nl8gnmsqwwrc8773q8py64kv3r5836xjxsnxjv91n4hhmvgyrzs";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;