diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
commit | 05e375d7103ac51e2da917965c37246c99f1ae4f (patch) | |
tree | 7ec4e9a2f5b7b1e2dea7c3e059f5b40e1dac1569 /pkgs/misc/emulators | |
parent | 335934a073d6024d54c71bf82d5f8baab13abe75 (diff) | |
parent | c7d7abc51e5f9b9c7481a83c47b37508bf08b05b (diff) | |
download | nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.gz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.bz2 nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.lz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.xz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.zst nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 11 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 928e692df6b4..91fb0da82d8a 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -56,12 +56,9 @@ let wine-build = build: release: }); in if wineRelease == "staging" then - let wineUnstable = wine-build wineBuild "unstable"; in - # wine staging is not yet at 3.0, using unstable - # FIXME update winestaging sources - wineUnstable - # callPackage ./staging.nix { - # inherit libtxc_dxtn_Name wineUnstable; - # } + callPackage ./staging.nix { + inherit libtxc_dxtn_Name; + wineUnstable = wine-build wineBuild "unstable"; + } else wine-build wineBuild wineRelease diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5950310a73f7..d17c0f295e80 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,18 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.3"; + version = "3.4"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505"; + sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - # FIXME update winestaging sources, when 3.3 is released - # FIXME then revert the staging derivation in ./default.nix - sha256 = "0000000000000000000000000000000000000000000000000000000000000000"; + sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; |