Merge remote-tracking branch 'upstream/master' into HEAD

2 files changed, 6 insertions, 8 deletions

diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index 23252d0c48073..c5429b6c8510b 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -7,6 +7,7 @@ bundlerEnv {
   gemdir = ./.;
 
   meta = {
+    broken = true; # needs ruby 2.0
     description = "A modern and powerful project management tool";
     homepage    = http://taskjuggler.org/;
     license     = lib.licenses.gpl2;
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 2d2c2e2bff257..c783985d505df 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,15 +1,13 @@
 { mkDerivation, lib, fetchurl, pkgconfig, which
 , libtool, openssl, qtbase, qttools }:
 
-with lib;
-
 mkDerivation rec {
   name = "xca-${version}";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/xca/${name}.tar.gz";
-    sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84";
+    sha256 = "1gygj6kljj3r1y0pg67mks36vfcz4vizjsqnqdvrk6zlgqjbzm7z";
   };
 
   enableParallelBuilding = true;
@@ -22,10 +20,9 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Interface for managing asymetric keys like RSA or DSA";
-    homepage = http://xca.sourceforge.net/;
-    platforms = platforms.all;
-    license = licenses.bsd3;
+    homepage    = http://xca.sourceforge.net/;
+    license     = licenses.bsd3;
     maintainers = with maintainers; [ offline peterhoeg ];
-    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
+    platforms   = platforms.all;
   };
 }