about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@speartail.com>2016-10-06 13:11:26 +0800
committerPeter Hoeg <peter@speartail.com>2016-10-06 13:11:26 +0800
commit127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd (patch)
tree1f406df6e92942a9882ee31643d5cd478a9ec2e5
parentadfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b (diff)
downloadnixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.tar
nixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.tar.gz
nixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.tar.bz2
nixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.tar.lz
nixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.tar.xz
nixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.tar.zst
nixlib-127a04f4eeeaf7ad32ae9b6cfabd5ff42e8c8dbd.zip
zeal: 0.2.1 -> 0.3.0
This new version fixes #8008 which despite the issue being closed was
still a problem.

We now compile it with the default qt5 which as of today is 5.6.1
instead of forcing 5.5.
-rw-r--r--pkgs/data/documentation/zeal/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 89e5d83df614..a4ecc24d3a65 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -2,14 +2,14 @@
 , qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.1";
+  version = "0.3.0";
   name = "zeal-${version}";
 
   src = fetchFromGitHub {
     owner = "zealdocs";
     repo = "zeal";
     rev = "v${version}";
-    sha256 = "1j1nfvkwkb2xdh289q5gdb526miwwqmqjyd6fz9qm5dg467wmwa3";
+    sha256 = "1f0nsnily2lsrraj1f8j34lqhiskiyq22clkci7w4h2zfv35j1s0";
   };
 
   buildInputs = [
@@ -34,4 +34,3 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 592b52df4dee..7e722680bf09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12475,7 +12475,7 @@ in
 
   xlsx2csv = pythonPackages.xlsx2csv;
 
-  zeal = qt55.callPackage ../data/documentation/zeal { };
+  zeal = qt5.callPackage ../data/documentation/zeal { };
 
 
   ### APPLICATIONS