diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-18 20:36:48 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-18 20:36:48 -0500 |
commit | b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3 (patch) | |
tree | d6eaa4102b8caf97fd924395114f4d9df5d3b4ef /pkgs/misc/emulators | |
parent | a808baa5e50e83c64b00f772d0070e5989f6afb9 (diff) | |
parent | 266315c91d5e4a6d7b8465eb44d4f6af30d90b30 (diff) | |
download | nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.gz nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.bz2 nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.lz nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.xz nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.tar.zst nixlib-b1bbd94bb680dbcb1c7b55128d129d5cdd3f81c3.zip |
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 2fcb38c0a1eb..b8a896d86836 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "3.0.4"; - url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; - sha256 = "037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl"; + version = "4.0"; + url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; + sha256 = "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.7.3"; + version = "4.7.5"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0fkd22v2vm3ml76x1ngg42byvmry24xb92vpl4j84zhw6wbq0jnj"; + sha256 = "0gsb03dc97hqdkw8kpl5ky53bygfnpxkgn2ry5bfzvfdfva6hk8m"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.0-rc5"; - url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "0nx5ahahfnmimd2b7zh2wx36b877vad10i2kr2zib9m9b2w8wyfd"; + version = "4.2"; + url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; + sha256 = "1ysvq2jyvh7r27iwpsrlrwzj672jnrihry91bx3m3fysz3sl3ld1"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0smp6ngs77vk1yg0saavhhn7kmi9ri8y8gc3vcgg837ycwg5i5qb"; + sha256 = "1dhv6y60g64bj3kgfknbfzxfzmy686dh7svxlvi4lfis2faikxmk"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; |