Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

calibre: 3.3.0 -> 3.5.0 #27707

Closed
wants to merge 3 commits into from
Closed

calibre: 3.3.0 -> 3.5.0 #27707

wants to merge 3 commits into from

Conversation

jfrankenau
Copy link
Member

Motivation for this change

Update.

Calibre now uses the new html5-parser package instead of html5lib. I have also removed some unused dependencies and installed the man pages.

Things done

Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @viric @domenkozar @pSub @AndersonTorres

@mention-bot
Copy link

@jfrankenau, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh, @dezgeg and @layus to be potential reviewers.

FRidh
FRidh requested changes Jul 28, 2017
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. The expression needs to be moved and then the impact of the lxml bump would have to be tested.

pkgs/top-level/python-packages.nix Outdated
@@ -2352,6 +2352,28 @@ in {
};
};

html5-parser = buildPythonPackage rec {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the header of this file. Please move to a separate expression.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

pkgs/applications/misc/calibre/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {

# Remove unneeded files and libs
rm -rf resources/calibre-portable.* \
src/{chardet,cherrypy,html5lib,odf,routes}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these not vendored any more that you remove these items?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, these are not bundled with Calibre anymore.

@FRidh FRidh self-assigned this Jul 28, 2017
@FRidh
Copy link
Member

FRidh commented Jul 30, 2017

Is the lxml bump necessary?

@jfrankenau
Copy link
Member Author

Yes, it is. I've been playing around with nox-review to test the version bump of lxml but it seems to fail due to something else. Still need some time evaluating it.

@vcunat
Copy link
Member

vcunat commented Aug 13, 2017

@FRidh: ping? (you self-assigned this)

@FRidh
Copy link
Member

FRidh commented Aug 13, 2017

Testing the Python packages that need to be rebuild at https://headcounter.org/hydra/eval/369772. Other rebuilds I cannot really test.

@FRidh
Copy link
Member

FRidh commented Aug 14, 2017

I've pushed these commits to staging.

@FRidh FRidh closed this Aug 14, 2017
@jfrankenau jfrankenau deleted the update-calibre branch September 1, 2017 08:53
@whitfieldts whitfieldts mentioned this pull request Jan 16, 2024
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh requested changes

Assignees

@FRidh FRidh

Labels
1.severity: mass-rebuild
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jfrankenau @mention-bot @FRidh @vcunat