Merge remote-tracking branch 'upstream/master' into staging

Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix

1 files changed, 19 insertions, 19 deletions

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index c8931811548f..107de6784251 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -10,25 +10,25 @@
 }:
 
 let
-  archUrl = name: arch: "https://vivaldi.com/download/stable/${name}_${arch}.deb";
-in
-stdenv.mkDerivation rec {
-  version    = "1.0";
-  debversion = "stable_1.0.435.40-1";
+  version = "1.1";
+  build = "453.47-1";
+  fullVersion = "stable_${version}.${build}";
+
+  info = if stdenv.is64bit then {
+      arch = "amd64";
+      sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq";
+    } else {
+      arch = "i386";
+      sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
+    };
+in stdenv.mkDerivation rec {
   product    = "vivaldi";
   name       = "${product}-${version}";
 
-  src = if stdenv.system == "x86_64-linux"
-    then fetchurl {
-      url    = archUrl "vivaldi-${debversion}" "amd64";
-      sha256 = "12c051a40258a95f9594eed2f73fa5f591482ac2a41d5cf643811b1ea2a1efbf";
-    }
-    else if stdenv.system == "i686-linux"
-    then fetchurl {
-      url    = archUrl "vivaldi-${debversion}" "i386";
-      sha256 = "6e0b84fba38211bab9a71bc10e97398fca77c0acd82791923c1d432b20846f0f";
-    }
-    else throw "Vivaldi is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
+  src = fetchurl {
+    inherit (info) sha256;
+    url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb";
+  };
 
   unpackPhase = ''
     ar vx ${src}
@@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
       libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
       atk alsaLib dbus_libs cups gtk gdk_pixbuf libexif ffmpeg libudev
       freetype fontconfig libXrender libuuid expat glib nss nspr
-      gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf 
+      gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf
       patchelf
     ];
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
-    + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    + stdenv.lib.optionalString (stdenv.is64bit)
       (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
 
   buildPhase = ''
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     description = "A Browser for our Friends, powerful and personal";
     homepage    = "https://vivaldi.com";
     license     = licenses.unfree;
-    maintainers = with maintainers; [ otwieracz ];
+    maintainers = with maintainers; [ otwieracz nequissimus ];
     platforms   = platforms.linux;
   };
 }