about summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-04-09 15:12:32 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-04-09 15:12:32 +0200
commit0aa59a08d65461149552f68c638655ed2b474510 (patch)
tree95b176cf0459529707be2f16d6b87eb96fd4e01a /pkgs/misc/emulators
parent2cf343fc96b82772b9ab3700fe43eb142d100179 (diff)
parent2ab846211c52e3d7bb26b0888c9777598e921591 (diff)
downloadnixlib-0aa59a08d65461149552f68c638655ed2b474510.tar
nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.gz
nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2
nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.lz
nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.xz
nixlib-0aa59a08d65461149552f68c638655ed2b474510.tar.zst
nixlib-0aa59a08d65461149552f68c638655ed2b474510.zip
Merge master into staging
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/wine/sources.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index d17c0f295e80..663da1eb1141 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.4";
+    version = "3.5";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4";
+    sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2";
+    sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";