Merge pull request #31285 from volth/patch-70

opera:	46.0.2597.39	->	48.0.2685.52
This commit is contained in:
Jörg Thalheim 2017-11-07 19:02:11 +00:00 committed by GitHub
commit 82e0fabbe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
version = "46.0.2597.39";
version = "48.0.2685.52";
rpath = stdenv.lib.makeLibraryPath [
@ -87,19 +87,10 @@ in stdenv.mkDerivation {
name = "opera-${version}";
src =
#if stdenv.system == "i686-linux" then
# fetchurl {
# url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
# sha256 = "...";
# }
#else
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
}
else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
src = fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@ -123,6 +114,7 @@ in stdenv.mkDerivation {
meta = {
homepage = http://www.opera.com;
description = "Web browser";
platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.unfree;
};
}