wineStaging: remove evaluation warning

cc @peti @7c6f434c
NixOS · Jan 26, 2018 · 4e8cd90 · 4e8cd90 · bendlas · Jan 26, 2018
1 parent e3df936
commit 4e8cd90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
@@ -57,7 +57,9 @@ let wine-build = build: release:
 
 in if wineRelease == "staging" then
   let wineUnstable = wine-build wineBuild "unstable"; in
-    builtins.trace "WARNING: wine staging is not yet at 3.0, using unstable" ( wineUnstable )
+    # wine staging is not yet at 3.0, using unstable
+    # FIXME update winestaging sources
+    wineUnstable
     # callPackage ./staging.nix {
     #   inherit libtxc_dxtn_Name wineUnstable;
     # }

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
@@ -46,14 +46,18 @@ in rec {
   };
 
   staging = fetchFromGitHub rec {
+    # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
+    # FIXME update winestaging sources, when 3.0 is released
+    # FIXME then revert the staging derivation in ./default.nix
     sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
+    # https://github.com/Winetricks/winetricks/releases
     version = "20171222";
     sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9";
     owner = "Winetricks";