From 4fec62d01d98af1f66cf09a844bc1ec503eb32b7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 25 Jan 2018 23:13:00 +0100
Subject: [PATCH] wineUnstable: 2.21 -> 3.0

wineStaging redirects to wineUnstable, for now
---
 pkgs/misc/emulators/wine/default.nix | 9 +++++----
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 91fb0da82d8..ae3617aedf0 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -56,9 +56,10 @@ let wine-build = build: release:
       });
 
 in if wineRelease == "staging" then
-  callPackage ./staging.nix {
-    inherit libtxc_dxtn_Name;
-    wineUnstable = wine-build wineBuild "unstable";
-  }
+  let wineUnstable = wine-build wineBuild "unstable"; in
+    builtins.trace "WARNING: wine staging is not yet at 3.0, using unstable" ( wineUnstable )
+    # callPackage ./staging.nix {
+    #   inherit libtxc_dxtn_Name wineUnstable;
+    # }
 else
   wine-build wineBuild wineRelease
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index f978030d347..ca7c760dc5c 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,9 +39,9 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.21";
-    url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1vxbnikdpsmca3nx064mqrm83xpjsfshy25mdfxmyg5vrzl09yms";
+    version = "3.0";
+    url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
+    sha256 = "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil";
     inherit (stable) mono gecko32 gecko64;
   };