Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 50386055fe6c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c2f097e92fc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 3, 2019

  1. calibre: add markdown to inputs 

    fixes #72724

(cherry picked from commit c4aff4c)
    @bennyandresen @worldofpeace
    bennyandresen authored and worldofpeace committed Nov 3, 2019
    Copy the full SHA
    6c2f097 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/misc/calibre/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/misc/calibre/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ mkDerivation rec {
poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with python2Packages; [
apsw cssselect css-parser dateutil dnspython html5-parser lxml mechanize netifaces pillow
apsw cssselect css-parser dateutil dnspython html5-parser lxml markdown mechanize netifaces pillow
python pyqt5_with_qtwebkit sip
regex msgpack beautifulsoup4
# the following are distributed with calibre, but we use upstream instead