From d88fd61a421564d1d751340ac7036ed971efd557 Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Sun, 13 Jan 2019 19:46:58 +0800 Subject: [PATCH 1/2] pythonPackages.css-parser: init at 1.0.4 --- .../python-modules/css-parser/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/css-parser/default.nix diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix new file mode 100644 index 00000000000..8b2fe0929c7 --- /dev/null +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7eb692c4ab..4232a167782 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1519,6 +1519,8 @@ in { cssutils = callPackage ../development/python-modules/cssutils { }; + css-parser = callPackage ../development/python-modules/css-parser { }; + darcsver = callPackage ../development/python-modules/darcsver { }; dask = callPackage ../development/python-modules/dask { }; From 4e1fb4f3a23e2781a9d3c3702dcd7f82f895998a Mon Sep 17 00:00:00 2001 From: Jethro Kuan Date: Sun, 13 Jan 2019 19:47:18 +0800 Subject: [PATCH 2/2] calibre: fix altered dependency Calibre has changed its dependency from cssutils to css-parser in https://github.com/kovidgoyal/calibre/commit/dd7d8ea3c4f47e315623d882d6b68339da959ab9 --- pkgs/applications/misc/calibre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a9e047170e2..9b1c99c3eed 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (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 regex msgpack # the following are distributed with calibre, but we use upstream instead