grantlee: migrate to pkgs/by-name (#526075)

This commit is contained in:
Matteo Pacini
2026-05-30 21:10:12 +00:00
committed by GitHub
7 changed files with 11 additions and 49 deletions
@@ -1,13 +1,12 @@
{
mkDerivation,
lib,
stdenv,
fetchFromGitHub,
qtbase,
qtscript,
qt5,
cmake,
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "grantlee";
version = "5.3.1";
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
@@ -20,10 +19,13 @@ mkDerivation rec {
};
buildInputs = [
qtbase
qtscript
qt5.qtbase
qt5.qtscript
];
nativeBuildInputs = [
cmake
qt5.wrapQtAppsHook
];
nativeBuildInputs = [ cmake ];
patches = [
./grantlee-nix-profiles.patch
@@ -63,6 +65,6 @@ mkDerivation rec {
homepage = "https://github.com/steveire/grantlee";
maintainers = [ lib.maintainers.ttuegel ];
license = lib.licenses.lgpl21;
inherit (qtbase.meta) platforms;
inherit (qt5.qtbase.meta) platforms;
};
}
@@ -1,38 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
qtbase,
cmake,
wrapQtAppsHook,
}:
stdenv.mkDerivation rec {
pname = "grantlee";
version = "5.3.1";
src = fetchFromGitHub {
owner = "steveire";
repo = "grantlee";
rev = "v${version}";
hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [ qtbase ];
meta = {
description = "Libraries for text templating with Qt";
longDescription = ''
Grantlee is a set of Free Software libraries written using the Qt framework. Currently two libraries are shipped with Grantlee: Grantlee Templates and Grantlee TextDocument.
The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code.
The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.
'';
homepage = "https://github.com/steveire/grantlee";
license = lib.licenses.lgpl21Plus;
};
}
-2
View File
@@ -6202,8 +6202,6 @@ with pkgs;
gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { });
grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;
# Not moved to aliases while we decide if we should split the package again.
+1 -1
View File
@@ -74,7 +74,7 @@ makeScopeWithSplicing' {
qgpgme = callPackage ../development/libraries/qgpgme { };
grantlee = callPackage ../development/libraries/grantlee/5 { };
grantlee = pkgs.grantlee;
herqq = callPackage ../by-name/he/herqq/package.nix { };