From def321e81155c7055aa05806ac6802dda042de25 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 12 May 2015 08:51:55 -0500 Subject: [PATCH 1/2] add grantlee-5.0.0 --- pkgs/development/libraries/grantlee/5.x.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/grantlee/5.x.nix diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix new file mode 100644 index 00000000000..4127280fb9a --- /dev/null +++ b/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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 534bf6e7c4b..d9dd2cdce96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6103,6 +6103,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 { }; From 50c0b00592183e73ab586a83be988d8fac561140 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 12 May 2015 09:47:54 -0500 Subject: [PATCH 2/2] kdeApps_15_04.rocs: add missing dependencies rocs depends on grantlee5 and kdelibs4support, although the latter is undeclared. --- pkgs/applications/kde-apps-15.04/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 798d6d977b0..9de2f7a9fe1 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/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 // {