diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 02:50:48 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 02:50:48 +0200 |
| commit | 0f1c4558d362a34cddea207acafff4596058af0b (patch) | |
| tree | 1d6d8c4f8a53de539d6d2f284fdbe6cea053f8fe /pkgs/misc/emulators | |
| parent | 8fce6f76254543f8faf7900590a998d95cbc917f (diff) | |
| parent | 9839cda8dc0eae5fd2af4ffc970c95ebaa59b92c (diff) | |
| download | nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.gz nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.bz2 nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.lz nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.xz nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.tar.zst nixpkgs-0f1c4558d362a34cddea207acafff4596058af0b.zip | |
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 7f02ead3e02..0fe4e4da92d 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,10 +44,17 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.5"; + version = "6.7"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c="; - inherit (stable) mono gecko32 gecko64; + sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ="; + inherit (stable) gecko32 gecko64; + + ## see http://wiki.winehq.org/Mono + mono = fetchurl rec { + version = "6.1.1"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s="; + }; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -58,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc="; + sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; |