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.

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

calibre: 4.23.0 -> 5.9.0 #109090

Merged
merged 1 commit into from Jan 12, 2021
Merged

calibre: 4.23.0 -> 5.9.0 #109090

merged 1 commit into from Jan 12, 2021

Conversation

hugolgst
Copy link
Member

Motivation for this change

Updates calibre version to 5.9.0 by pinning the Python version to 3.
Calibre upgraded to Python 3 since the 5.0 release.

Fixes #106256

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Updates calibre version to 5.9.0 by pinning the Python version to 3.
Calibre upgraded to Python 3 since the 5.0 release.
Adds aliases for removed packages.

Fixes NixOS#106256.
@AndersonTorres AndersonTorres merged commit 2900382 into NixOS:master Jan 12, 2021
@hugolgst hugolgst deleted the update/calibre branch January 13, 2021 20:39
@eduardosm
Copy link
Contributor

This is failing to build because it needs sip 5. There is a draft PR that works, but it is currently blocked on another PR.

@hugolgst
Copy link
Member Author

hugolgst commented Jan 13, 2021

I'm sorry for that big mistake, is it failing to build?

@eduardosm
Copy link
Contributor

It is failing: https://hydra.nixos.org/build/135047343

/nix/store/yi9a1fafijn0nf5m8qkmnl955vi2mncm-python3-3.8.6/bin/python3.8 -c import os; os.chdir('/build/calibre-5.9.0/build/pyqt/pictureflow'); from sipbuild.tools.build import main; main(); --verbose --no-make --qmake /nix/store/cz83r6va5cmpmncdn1gmzrx52mz7ndqn-qtbase-5.15.2-dev/bin/qmake
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ModuleNotFoundError: No module named 'sipbuild'

sipbuild is provided by sip 5, which is not currently available in nixpkgs

@hugolgst
Copy link
Member Author

Indeed, very sorry again.
Do you want me to create a revert for that?

@eduardosm
Copy link
Contributor

Not necessary if #108041 gets merged soon. When that happens, I will undraft #106550 to fix the build.

@anna328p
Copy link
Member

This is blocking rebuilds for me.

@hugolgst
Copy link
Member Author

Let's create a revert PR

@cole-h
Copy link
Member

cole-h commented Jan 13, 2021

Reverted in #109322.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

calibre is out-of-date (4.23 vs 5.6)
7 participants