diff --git a/pkgs/development/libraries/grantlee/5.x-old.nix b/pkgs/development/libraries/grantlee/5.x-old.nix deleted file mode 100644 index 4127280fb9a2..000000000000 --- a/pkgs/development/libraries/grantlee/5.x-old.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ 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 342f35a55813..4faf28518ebd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6638,8 +6638,6 @@ let grantlee = callPackage ../development/libraries/grantlee { }; - grantlee5 = callPackage ../development/libraries/grantlee/5.x-old.nix { }; - gsasl = callPackage ../development/libraries/gsasl { }; gsl = callPackage ../development/libraries/gsl { }; @@ -15815,6 +15813,7 @@ aliases = with self; rec { exfat-utils = exfat; # 2015-09-11 firefoxWrapper = firefox-wrapper; fuse_exfat = exfat; # 2015-09-11 + grantlee5 = qt5.grantlee; # added 2015-12-19 htmlTidy = html-tidy; # added 2014-12-06 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools;