diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-11-07 19:02:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-07 19:02:11 +0000 |
commit | 82e0fabbe2147681c60a7adb76c950fe25067b4f (patch) | |
tree | f5e96359098fa1bcf86eaf31ba612d465d23cfdb /pkgs/applications/networking/browsers | |
parent | 34f3ef2c4d590a85ccebddf9537a5315abd9c137 (diff) | |
parent | aee015dbcf229a441883660aa48201b215e946a2 (diff) | |
download | nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.tar nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.tar.gz nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.tar.bz2 nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.tar.lz nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.tar.xz nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.tar.zst nixlib-82e0fabbe2147681c60a7adb76c950fe25067b4f.zip |
Merge pull request #31285 from volth/patch-70
opera: 46.0.2597.39 -> 48.0.2685.52
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/opera/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 52a2ce9164c9..0852b5c9d434 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -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; }; } |