Merge branch 'kde5'

pkgs/applications/kde-apps-15.04/default.nix

@@ -90,6 +90,7 @@ let
         Gpgme = gpgme;
         Gphoto2 = libgphoto2;
         Grantlee = grantlee;
+        Grantlee5 = grantlee5;
         GSL = gsl;
         HUNSPELL = hunspell;
         HUpnp = herqq;
@@ -350,6 +351,10 @@ let
         '';
       };
 
+      rocs = super.rocs // {
+        buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
+      };
+
       signon-kwallet-extension =
         let signon = pkgs.signon.override { inherit qt5; };
         in super.signon-kwallet-extension // {

pkgs/development/libraries/grantlee/5.x.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, qt5, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "grantlee-5.0.0";
+
+# Upstream download server has country code firewall, so I made a mirror.
+  src = fetchurl {
+    urls = [
+      "http://downloads.grantlee.org/${name}.tar.gz"
+      "http://www.loegria.net/grantlee/${name}.tar.gz"
+    ];
+    sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa";
+  };
+
+  buildInputs = [ cmake qt5.base qt5.script ];
+
+  meta = {
+    description = "Qt5 port of Django template system";
+    longDescription = ''
+      Grantlee is a plugin based String Template system written using the Qt
+      framework. The goals of the project are to make it easier for application
+      developers to separate the structure of documents from the data they
+      contain, opening the door for theming.
+
+      The syntax is intended to follow the syntax of the Django template system,
+      and the design of Django is reused in Grantlee.'';
+
+    homepage = http://gitorious.org/grantlee;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (qt5.base.meta) platforms;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -6099,6 +6099,8 @@ let
 
   grantlee = callPackage ../development/libraries/grantlee { };
 
+  grantlee5 = callPackage ../development/libraries/grantlee/5.x.nix { };
+
   gsasl = callPackage ../development/libraries/gsasl { };
 
   gsl = callPackage ../development/libraries/gsl { };