public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53865 from jethrokuan/fix/calibre

Browse Source 
calibre: cssutils -> css-parser
This commit is contained in:
Robert Schütz 2019-01-15 00:48:52 +01:00 committed by GitHub
commit 05fda1f94d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/calibre/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [ ] ++ (with python2Packages; [
apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow
python pyqt5_with_qtwebkit sip python pyqt5_with_qtwebkit sip
regex msgpack regex msgpack
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead

22
pkgs/development/python-modules/css-parser/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "css-parser";
version = "1.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "c7ab355512ae51334ba6791a7e4d553f87bef17ba2026f1cc9bf3b17a7779d44";
};
# Test suite not included in tarball yet
# See https://github.com/ebook-utils/css-parser/pull/2
doCheck = false;
meta = with lib; {
description = "A CSS Cascading Style Sheets library for Python";
homepage = https://github.com/ebook-utils/css-parser;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jethro ];
};
}

2
pkgs/top-level/python-packages.nix
View File

@ -1523,6 +1523,8 @@ in {
cssutils = callPackage ../development/python-modules/cssutils { }; cssutils = callPackage ../development/python-modules/cssutils { };
css-parser = callPackage ../development/python-modules/css-parser { };
darcsver = callPackage ../development/python-modules/darcsver { }; darcsver = callPackage ../development/python-modules/darcsver { };
dask = callPackage ../development/python-modules/dask { }; dask = callPackage ../development/python-modules/dask { };