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

paperwork: add missing dependency #72640

Merged
merged 1 commit into from Nov 4, 2019
Merged

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 2, 2019

Motivation for this change

noticed it didn't work while reviewing #72638

before:

[nix-shell:/home/jon/.cache/nix-review/pr-72638-1]$ ./results/paperwork/bin/paperwork --help
/nix/store/2cj2np0bkyjpqgvjwdx1dhwdi37agml6-paperwork-1.2.4/lib/python3.7/site-packages/paperwork/paperwork.py:27: PyGIWarning: Notify was imported without specifying a version first. Use gi.require_version('Notify', '0.7') before import to ensure that the right version gets loaded.
  from gi.repository import Notify  # noqa: E402
Traceback (most recent call last):
  File "/nix/store/2cj2np0bkyjpqgvjwdx1dhwdi37agml6-paperwork-1.2.4/bin/.paperwork-wrapped", line 6, in <module>
    from paperwork.paperwork import main
  File "/nix/store/2cj2np0bkyjpqgvjwdx1dhwdi37agml6-paperwork-1.2.4/lib/python3.7/site-packages/paperwork/paperwork.py", line 33, in <module>
    import pyinsane2  # noqa: E402
  File "/nix/store/cv5wbnlb925snbgj3idw0cnzzmlidmh4-python3.7-pyinsane2-2.0.13/lib/python3.7/site-packages/pyinsane2/__init__.py", line 15, in <module>
    from .sane.abstract_proc import *  # noqa
  File "/nix/store/cv5wbnlb925snbgj3idw0cnzzmlidmh4-python3.7-pyinsane2-2.0.13/lib/python3.7/site-packages/pyinsane2/sane/abstract_proc.py", line 9, in <module>
    import PIL.Image
  File "/nix/store/0nwifhd9n01pwg858rbr7xnqgh93r4hv-python3.8-Pillow-6.2.1/lib/python3.8/site-packages/PIL/Image.py", line 90, in <module>
    from . import _imaging as core
ImportError: cannot import name '_imaging' from 'PIL' (/nix/store/0nwifhd9n01pwg858rbr7xnqgh93r4hv-python3.8-Pillow-6.2.1/lib/python3.8/site-packages/PIL/__init__.py)

after:

[16:44:20] jon@jon-desktop /home/jon/projects/nixpkgs (master)
$ ./result/bin/paperless

Type 'manage.py help <subcommand>' for help on a specific subcommand.

Available subcommands:
...
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 nix-review --run "nix-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.
Notify maintainers

cc @

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build paperless

@worldofpeace
Copy link
Contributor

I guess we should backport this.

@jonringer jonringer changed the title paperless: add missing dependency paperwork: add missing dependency Nov 3, 2019
@jonringer jonringer added the 9.needs: port to stable A PR needs a backport to the stable release. label Nov 3, 2019
@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build paperwork

guess I titled it incorrectly the first time xD

@jonringer
Copy link
Contributor Author

[2 built, 18 copied (176.2 MiB), 61.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/72640
1 package were build:
paperwork

@jonringer jonringer merged commit 062a4d4 into NixOS:master Nov 4, 2019
@jonringer jonringer deleted the fix-paperless branch November 4, 2019 09:54
@jonringer jonringer restored the fix-paperless branch November 4, 2019 09:57
@jonringer
Copy link
Contributor Author

not as trivial to backport, may have bring over a few other commits....

@symphorien
Copy link
Member

pandas is actually a dependency of pyinsane2 which is gone with the next update of paperwork (#74732) so no need to backport.

@jonringer jonringer deleted the fix-paperless branch November 30, 2019 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants