about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-07-08 20:49:54 -0400
committerGitHub <noreply@github.com>2019-07-08 20:49:54 -0400
commit38c7c5d3229c67a7aaff984eb92e1f0912351ef9 (patch)
tree31fa4103ac07f580a381fc20d5e59eb9a28bda04
parentbf7ab595dc1605b7bc735a8c5df7140e884461f9 (diff)
parent87bc26169b19b6c1bccfeefe41dfe221511bff66 (diff)
downloadnixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.tar
nixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.tar.gz
nixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.tar.bz2
nixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.tar.lz
nixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.tar.xz
nixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.tar.zst
nixlib-38c7c5d3229c67a7aaff984eb92e1f0912351ef9.zip
Merge pull request #64439 from xrelkd/update/opera
opera: 60.0.3255.170 -> 62.0.3331.43
-rw-r--r--pkgs/applications/networking/browsers/opera/default.nix21
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 215bf07d4d52..732e020604a8 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -13,6 +13,7 @@
 , glib
 , gnome2
 , gtk3
+, lib
 , libX11
 , libxcb
 , libXScrnSaver
@@ -39,10 +40,9 @@
 
 let
 
-  mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "60.0.3255.170";
+  mirror = "https://get.geo.opera.com/pub/opera/desktop";
 
-  rpath = stdenv.lib.makeLibraryPath [
+  rpath = lib.makeLibraryPath [
 
     # These provide shared libraries loaded when starting. If one is missing,
     # an error is shown in stderr.
@@ -90,13 +90,14 @@ let
     at-spi2-core
   ];
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
 
-  name = "opera-${version}";
+  pname = "opera";
+  version = "62.0.3331.43";
 
   src = fetchurl {
-    url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-    sha256 = "04bcy9qhrhps3712k229yn58ak2j93wcp613zd6l2zxb8a286991";
+    url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
+    sha256 = "0zylg32zn6blkgy4bwmjzc26i712lwakahvrd24ncpfa8805f7x7";
   };
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@@ -118,10 +119,10 @@ in stdenv.mkDerivation {
       done
   '';
 
-  meta = {
-    homepage = https://www.opera.com;
+  meta = with lib; {
+    homepage = "https://www.opera.com";
     description = "Web browser";
     platforms = [ "x86_64-linux" ];
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
   };
 }