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

okular: add support for CHM, ZIP and markdown files #36324

Merged
merged 2 commits into from Mar 9, 2018
Merged

okular: add support for CHM, ZIP and markdown files #36324

merged 2 commits into from Mar 9, 2018

Conversation

peterhoeg
Copy link
Member

Motivation for this change

I wanted to open a .chm file and noticed we're missing out on ZIP and MD files as well.

Apologies for the slightly messy diff - all that happens is the addition of chmlib, libzip and discount.

Cc: @ttuegel

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@peterhoeg peterhoeg requested a review from ttuegel as a code owner March 5, 2018 05:35
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘chmlib-0.40’ in /var/lib/gc-of-borg/nix-test-rs-13/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-13/pkgs/development/libraries/chmlib/default.nix:14 is not supported on ‘aarch64-linux’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_epub.so
shrinking /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_tiff.so
shrinking /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_kimgio.so
gzipping man pages under /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2/lib  /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2/bin 
patching script interpreter paths in /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2
checking for references to /tmp/nix-build-okular-17.12.2.drv-0 in /nix/store/n4hfcrxnkn4xhx5f3ax21pvq08v0kwxy-okular-17.12.2...
postPatchMkspecs
postPatchMkspecs

@ttuegel
Copy link
Member

ttuegel commented Mar 6, 2018

Could we make chmlib optional on aarch64-linux?

@peterhoeg
Copy link
Member Author

Done @ttuegel

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘chmlib-0.40’ in /var/lib/gc-of-borg/nix-test-rs-5/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-5/pkgs/development/libraries/chmlib/default.nix:14 is not supported on ‘aarch64-linux’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_fb.so
shrinking /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_ooo.so
shrinking /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib/qt-5.10/qml/org/kde/okular/libokularplugin.so
gzipping man pages under /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib  /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/bin 
patching script interpreter paths in /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2
checking for references to /tmp/nix-build-okular-17.12.2.drv-0 in /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2...
postPatchMkspecs
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_plucker.so
shrinking /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib/qt-5.10/qml/org/kde/okular/libokularplugin.so
shrinking /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib/libOkular5Core.so.8.0.0
gzipping man pages under /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/lib  /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2/bin 
patching script interpreter paths in /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2
checking for references to /tmp/nix-build-okular-17.12.2.drv-0 in /nix/store/8ps6smfrk541z9bprckh47cq58inrndw-okular-17.12.2...
postPatchMkspecs
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2/lib/qt-5.10/plugins/okular/generators/okularGenerator_poppler.so
shrinking /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2/lib/qt-5.10/plugins/okularpart.so
shrinking /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2/lib/libOkular5Core.so.8.0.0
gzipping man pages under /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2/lib  /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2/bin
patching script interpreter paths in /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2
checking for references to /build in /nix/store/9q9gmli46cy55a0bsdy26cd3mafff7k0-okular-17.12.2...
postPatchMkspecs
postPatchMkspecs

@peterhoeg peterhoeg merged commit 341dd2a into NixOS:master Mar 9, 2018
@peterhoeg peterhoeg deleted the f/okular branch March 9, 2018 00:46
@peterhoeg peterhoeg restored the f/okular branch March 9, 2018 01:31
@peterhoeg peterhoeg deleted the f/okular branch March 18, 2018 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@peterhoeg @GrahamcOfBorg @ttuegel