summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMatej Cotman <cotman.matej@gmail.com>2014-11-26 21:11:34 +0100
committerMatej Cotman <cotman.matej@gmail.com>2014-11-26 22:11:50 +0100
commitd6201245e5f06dd6c12034fdc93a95b4ae9e68e3 (patch)
tree1918f6373d0a578f63806b8d2b69faad1ea1a1c9 /pkgs
parent9047f389bf0e646cdedf6c5c569e61d5a0e24669 (diff)
downloadnixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.tar
nixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.tar.gz
nixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.tar.bz2
nixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.tar.lz
nixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.tar.xz
nixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.tar.zst
nixpkgs-d6201245e5f06dd6c12034fdc93a95b4ae9e68e3.zip
rekonq: update to rekonq-2.4.2 and add wrapper
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/rekonq/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
index 3deabd42e01..ce36e26d6fc 100644
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@@ -3,11 +3,11 @@
 assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
 
 stdenv.mkDerivation rec {
-  name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0
+  name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
 
   src = fetchurl {
-    url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
-    sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g";
+    url = "mirror://sourceforge/rekonq/${name}.tar.xz";
+    sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
   };
 
   buildInputs = [ kde4.kdelibs qca2 qoauth ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99c5caa1649..951866d129f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12693,6 +12693,10 @@ let
     { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
     };
 
+  rekonqWrapper = wrapFirefox {
+    browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq";
+  };
+
   vimb = callPackage ../applications/networking/browsers/vimb {
     webkit = webkitgtk2;
   };