forked from NixOS/nixpkgs
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
153 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
{ lib | ||
, fetchurl | ||
, mkDerivation | ||
, kdeApplications | ||
, kinit | ||
, kdelibs4support | ||
, solid | ||
, kxmlgui | ||
, karchive | ||
, kfilemetadata | ||
, khtml | ||
, knewstuff | ||
, libksane | ||
, cmake | ||
, exempi | ||
, extra-cmake-modules | ||
, libcdio | ||
, poppler | ||
, makeWrapper | ||
, kdoctools | ||
}: | ||
|
||
mkDerivation rec { | ||
name = "tellico"; | ||
version = "3.3.0"; | ||
|
||
src = fetchurl { | ||
url = "https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"; | ||
sha256 = "1digkpvzrsbv5znf1cgzs6zkmysfz6lzs12n12mrrpgkcdxc426y"; | ||
}; | ||
|
||
patches = [ | ||
./hex.patch | ||
]; | ||
|
||
nativeBuildInputs = [ | ||
cmake | ||
extra-cmake-modules | ||
kdoctools | ||
makeWrapper | ||
]; | ||
|
||
buildInputs = [ | ||
kdelibs4support | ||
solid | ||
kxmlgui | ||
karchive | ||
kfilemetadata | ||
khtml | ||
knewstuff | ||
libksane | ||
cmake | ||
exempi | ||
extra-cmake-modules | ||
libcdio | ||
kdeApplications.libkcddb | ||
poppler | ||
]; | ||
|
||
meta = { | ||
description = "Collection management software, free and simple"; | ||
homepage = "https://tellico-project.org/"; | ||
maintainers = with lib.maintainers; [ numkem ]; | ||
license = with lib.licenses; [ gpl2 gpl3 ]; | ||
platforms = lib.platforms.linux; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
index 7ea81c7..0c19767 100644 | ||
--- a/src/utils/iso5426converter.cpp | ||
+++ b/src/utils/iso5426converter.cpp | ||
@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) { | ||
return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW | ||
|
||
default: | ||
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) | ||
+ myDebug() << "no match for" << hex << c; | ||
+#else | ||
myDebug() << "no match for" << Qt::hex << c; | ||
+#endif | ||
return QChar(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ lib | ||
, buildPythonPackage | ||
, fetchPypi | ||
, setuptools | ||
, nose | ||
, pyyaml | ||
, pythonOlder | ||
, importlib-metadata | ||
, isPy3k | ||
}: | ||
|
||
buildPythonPackage rec { | ||
pname = "Markdown"; | ||
version = "3.1.1"; | ||
|
||
src = fetchPypi { | ||
inherit pname version; | ||
sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; | ||
}; | ||
|
||
propagatedBuildInputs = [ | ||
setuptools | ||
] ++ lib.optionals (pythonOlder "3.8") [ | ||
importlib-metadata | ||
]; | ||
|
||
checkInputs = [ nose pyyaml ]; | ||
|
||
meta = { | ||
description = "A Python implementation of John Gruber's Markdown with Extension support"; | ||
homepage = "https://github.com/Python-Markdown/markdown"; | ||
license = lib.licenses.bsd3; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters