From 3b9619e8042bdb18eb2881dbe905ac1520b2faf0 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 17 Dec 2015 14:04:37 +0100
Subject: [PATCH 1/3] wine: 1.8-rc3 -> 1.8-rc4

---
 pkgs/misc/emulators/wine/versions.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index bfdbd0177da..971baee0fec 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.8-rc3";
-    wineSha256  = "0j65v0jr1z56p9g16c0412ssx44zif8gfna7a6m865wz8gs1fnm6";
+    wineVersion = "1.8-rc4";
+    wineSha256  = "0c4mb49ad11jd880wdl4gs1478q2rkdjw2qxjzskr08bdlcq7h5f";
     geckoVersion = "2.40";
     geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
     gecko64Version = "2.40";
@@ -20,8 +20,8 @@
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   staging = {
-    version = "1.8-rc3";
-    sha256 = "1jp91w4sn10ycd21rwqsgxmpr425r4in4d2g085dhiw6g57ixfnj";
+    version = "1.8-rc4";
+    sha256 = "11kd4id0zyqqjz1006d27ahmhy3gzai7h0wir9lkxnv3pdld0dxn";
   };
   winetricks = {
     version = "20151116";

From 7a0dd2c82c7dc39cdfd507ed78393647313bd62b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 19 Dec 2015 23:28:16 +0100
Subject: [PATCH 2/3] wine stable: 1.6.2 -> 1.8

restructure versions file for clarity and brevity
---
 pkgs/misc/emulators/wine/versions.nix | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 971baee0fec..c308dd3c87f 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,26 +1,26 @@
-{
-  unstable = {
-    wineVersion = "1.8-rc4";
-    wineSha256  = "0c4mb49ad11jd880wdl4gs1478q2rkdjw2qxjzskr08bdlcq7h5f";
+rec {
+  stable = {
+    wineVersion = "1.8";
+    wineSha256  = "1x66lzpk7v8qx57clmcq5ag7yh3mqplf1plypwghgchjh70lafzk";
+    ## see http://wiki.winehq.org/Gecko
     geckoVersion = "2.40";
     geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
     gecko64Version = "2.40";
     gecko64Sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
+    ## see http://wiki.winehq.org/Mono
     monoVersion = "4.5.6";
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
-  stable = {
-    wineVersion = "1.6.2";
-    wineSha256  = "1gmc0ljgfz3qy50mdxcwwjcr2yrpz54jcs2hdszsrk50wpnrxazh";
-    geckoVersion = "2.21";
-    geckoSha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
-    gecko64Version = "2.21";
-    gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
-    monoVersion = "4.5.6";
-    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+  unstable = {
+    wineVersion = "1.8-rc4"; ## wait for staging 1.8
+    wineSha256  = "0c4mb49ad11jd880wdl4gs1478q2rkdjw2qxjzskr08bdlcq7h5f";
+    inherit (stable)
+      geckoVersion geckoSha256
+      gecko64Version gecko64Sha256
+      monoVersion monoSha256;
   };
   staging = {
-    version = "1.8-rc4";
+    version = unstable.wineVersion;
     sha256 = "11kd4id0zyqqjz1006d27ahmhy3gzai7h0wir9lkxnv3pdld0dxn";
   };
   winetricks = {

From 8519b89f7684586189696deb3c9f7784d0d0c959 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 22 Dec 2015 14:49:44 +0100
Subject: [PATCH 3/3] wine unstable, staging: 1.8-rc4 -> 1.8

---
 pkgs/misc/emulators/wine/versions.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index c308dd3c87f..057f5214aa2 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -12,16 +12,15 @@ rec {
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   unstable = {
-    wineVersion = "1.8-rc4"; ## wait for staging 1.8
-    wineSha256  = "0c4mb49ad11jd880wdl4gs1478q2rkdjw2qxjzskr08bdlcq7h5f";
     inherit (stable)
+      wineVersion wineSha256
       geckoVersion geckoSha256
       gecko64Version gecko64Sha256
       monoVersion monoSha256;
   };
   staging = {
     version = unstable.wineVersion;
-    sha256 = "11kd4id0zyqqjz1006d27ahmhy3gzai7h0wir9lkxnv3pdld0dxn";
+    sha256 = "1mi2nk5cjgfrkv8g082d4klniz1dprmvvida8c30qf2j4jykn3vb";
   };
   winetricks = {
     version = "20151116";