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

polar-bookshelf: 1.0.11 -> 1.0.13 #50238

Merged
merged 2 commits into from Nov 17, 2018
Merged

polar-bookshelf: 1.0.11 -> 1.0.13 #50238

merged 2 commits into from Nov 17, 2018

Conversation

fx-chun
Copy link
Member

@fx-chun fx-chun commented Nov 11, 2018

Motivation for this change

https://github.com/burtonator/polar-bookshelf/releases/tag/v1.0.13

Changelog:

# 1.0.13

 - point release to fix auto-updates in release process and upgrade 
   electron-builder and electron-updater

 - migration from typescript 3.0.3 to 3.1.6 due to incompatibility to with new 
   electron-builder

# 1.0.12

- Reduced the minimum mouse click duration required for bringing up the annotation 
  bar. 

- Fixed bug with Electron generating an error window on exit due to a conversion 
  of the wrong type to an integer.  This was/is an Electron bug.  This may not
  be fixed in all situations but it's much better than it was before.

- Feature: drag and drop for bulk PDF import works. 

- Upgrade to Electron 3.0.8

- Fixed analytics around number of documents in the repository

- Feature: The "Delete" text is now danger red.

- Feature: Implemented a confirm prompt when deleteing flashcards, comments, and
  annotations.
 
- Feature: Implemented Cancel when creating flashcards and comments 

- Feature: Reworked anki sync to run from the doc repository.

- Feature: Renamed "Copy URL" to "Copy Original URL"
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Your pr title is an acceptable commit msg according to the Contribution Guidelines.

While Bump version from 1.0.11 to 1.0.13 is not.

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build polar-bookshelf

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: polar-bookshelf

Partial log (click to expand)

shrinking /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13/share/polar-bookshelf/polar-bookshelf
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13/lib  /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13/bin
patching script interpreter paths in /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13
checking for references to /build in /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13...
automatically fixing dependencies for ELF files
searching for dependencies of /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13/lib/libffmpeg.so
searching for dependencies of /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13/lib/libnode.so
searching for dependencies of /nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13/share/polar-bookshelf/polar-bookshelf
/nix/store/qf1aa14bjp8wxrd8skb3v5lxsljnb86y-polar-bookshelf-1.0.13

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: polar-bookshelf

Partial log (click to expand)

  libnspr4.so -> found: /nix/store/3j1yjclv1j79zclna88cq0iyggwak82r-nspr-4.20/lib/libnspr4.so
  libffmpeg.so -> found: /nix/store/ay4hklfn2pzg67y7vijfwjx3ngxci24s-polar-bookshelf-1.0.13/lib/libffmpeg.so
  libasound.so.2 -> found: /nix/store/2fr0lj7chmfxw4xga178h0fknvfzmkw3-alsa-lib-1.1.6/lib/libasound.so.2
  libcups.so.2 -> found: /nix/store/l1vcyaqk31i479y2zcnjyvxh4kc3lq7p-cups-2.2.6-lib/lib/libcups.so.2
  libfontconfig.so.1 -> found: /nix/store/c394zcr40gx8x97iwyc4xng6glbk02by-fontconfig-2.12.6-lib/lib/libfontconfig.so.1
  libexpat.so.1 -> found: /nix/store/gfp4576pwlypwkwbbww5zlllfmf24ik2-expat-2.2.6/lib/libexpat.so.1
setting RPATH to: /nix/store/ay4hklfn2pzg67y7vijfwjx3ngxci24s-polar-bookshelf-1.0.13/lib:/nix/store/p4b0avnpcvvj6b108zba9j61fgir5b2k-gtk+3-3.22.30/lib:/nix/store/p4b0avnpcvvj6b108zba9j61fgir5b2k-gtk+3-3.22.30/lib:/nix/store/7k0zifnxasrzmkzdvvmbyqnni2dh8v74-pango-1.42.4/lib:/nix/store/7k0zifnxasrzmkzdvvmbyqnni2dh8v74-pango-1.42.4/lib:/nix/store/6hpvb6h5r728qc43nlqs8y934g7gxw55-atk-2.28.1/lib:/nix/store/17kwlq1vzy2fpaz6hhf8fr8njyimpqqk-cairo-1.15.14/lib:/nix/store/ar0k6fpylx2skacpj5ki45r6ni3q97vj-gdk-pixbuf-2.36.12/lib:/nix/store/njs4pvn9gs1zhikh0cdn7zw4aplpmbqm-glib-2.56.0/lib:/nix/store/njs4pvn9gs1zhikh0cdn7zw4aplpmbqm-glib-2.56.0/lib:/nix/store/jglz63ny49xcjjkd9240di4p0z05mspc-at-spi2-atk-2.26.2/lib:/nix/store/sa30r4wdh94qxy9bczw34pr59yxl84rk-dbus-1.12.10-lib/lib:/nix/store/gwayzrjd4klba13pn9jy0msgmsi9k5d0-libX11-1.6.6/lib:/nix/store/pplw91zq99lzj9x7qprngp6qcxlb0vcp-libxcb-1.13.1/lib:/nix/store/gbnbhlgwqyswwb463p0g6lah9kx0n0qd-libXi-1.7.9/lib:/nix/store/kcmvad4lh8iqh0gx6qy9dhs1c1b1jycq-libXcursor-1.1.15/lib:/nix/store/i2i7v250nrmdm1c2p2v7bw7p0nj5phvg-libXdamage-1.1.4/lib:/nix/store/k57h41rn09ji572pw9f9qan3ccc0faip-libXrandr-1.5.1/lib:/nix/store/lnfyv7ymygsb2w8wd837irlrsv7wbgm4-libXcomposite-0.4.4/lib:/nix/store/rib7ylnzqjnamm4n80v179x3hj4q01qr-libXext-1.3.3/lib:/nix/store/wrhg53l2dnzff4vi5yzfgbznky56vv67-libXfixes-5.0.3/lib:/nix/store/s3k9s8k2766d5dw50l5j5v6la46zmigi-libXrender-0.9.10/lib:/nix/store/gwayzrjd4klba13pn9jy0msgmsi9k5d0-libX11-1.6.6/lib:/nix/store/ikwg1kb6fxhi4vrznyrb2yics6ff9kvg-libXtst-1.2.3/lib:/nix/store/ca4p1ic6j63s20qjhqaq07k5w16017sx-libXScrnSaver-1.2.2/lib:/nix/store/njs4pvn9gs1zhikh0cdn7zw4aplpmbqm-glib-2.56.0/lib:/nix/store/6kmwmhx59d6ka5n0rzn36czgm4v6qfxm-nss-3.39/lib:/nix/store/6kmwmhx59d6ka5n0rzn36czgm4v6qfxm-nss-3.39/lib:/nix/store/6kmwmhx59d6ka5n0rzn36czgm4v6qfxm-nss-3.39/lib:/nix/store/3j1yjclv1j79zclna88cq0iyggwak82r-nspr-4.20/lib:/nix/store/ay4hklfn2pzg67y7vijfwjx3ngxci24s-polar-bookshelf-1.0.13/lib:/nix/store/2fr0lj7chmfxw4xga178h0fknvfzmkw3-alsa-lib-1.1.6/lib:/nix/store/l1vcyaqk31i479y2zcnjyvxh4kc3lq7p-cups-2.2.6-lib/lib:/nix/store/c394zcr40gx8x97iwyc4xng6glbk02by-fontconfig-2.12.6-lib/lib:/nix/store/gfp4576pwlypwkwbbww5zlllfmf24ik2-expat-2.2.6/lib
searching for dependencies of /nix/store/ay4hklfn2pzg67y7vijfwjx3ngxci24s-polar-bookshelf-1.0.13/lib/libffmpeg.so
searching for dependencies of /nix/store/ay4hklfn2pzg67y7vijfwjx3ngxci24s-polar-bookshelf-1.0.13/lib/libnode.so
/nix/store/ay4hklfn2pzg67y7vijfwjx3ngxci24s-polar-bookshelf-1.0.13

@worldofpeace
Copy link
Contributor

worldofpeace commented Nov 12, 2018

@noneucat

Currently the desktop files Exec is

 Exec="/opt/Polar Bookshelf/polar-bookshelf" %U

Which is a non-existent path.

This can be patched easily within the installPhase thusly:

diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 445dd84c707..cf5dd679f68 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -70,6 +70,10 @@ stdenv.mkDerivation rec {
     mv usr/share/* $out/share/
 
     ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf
+
+    # Correct desktop file `Exec`
+    substituteInPlace $out/share/applications/polar-bookshelf.desktop \
+      --replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf"
   '';
 
   preFixup = ''

Other than that the binary executes properly.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 17, 2018

@GrahamcOfBorg build polar-bookshelf

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: polar-bookshelf

Partial log (click to expand)

shrinking /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13/share/polar-bookshelf/polar-bookshelf
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13/lib  /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13/bin
patching script interpreter paths in /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13
checking for references to /build in /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13...
automatically fixing dependencies for ELF files
searching for dependencies of /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13/lib/libffmpeg.so
searching for dependencies of /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13/lib/libnode.so
searching for dependencies of /nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13/share/polar-bookshelf/polar-bookshelf
/nix/store/j3dqq83mpx3v5v1x4rpj8l90ra1gcnhw-polar-bookshelf-1.0.13

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: polar-bookshelf

Partial log (click to expand)

  libnspr4.so -> found: /nix/store/3j1yjclv1j79zclna88cq0iyggwak82r-nspr-4.20/lib/libnspr4.so
  libffmpeg.so -> found: /nix/store/a6lx4mfwlq4idi4hc2bfwif3graps06z-polar-bookshelf-1.0.13/lib/libffmpeg.so
  libasound.so.2 -> found: /nix/store/2fr0lj7chmfxw4xga178h0fknvfzmkw3-alsa-lib-1.1.6/lib/libasound.so.2
  libcups.so.2 -> found: /nix/store/l1vcyaqk31i479y2zcnjyvxh4kc3lq7p-cups-2.2.6-lib/lib/libcups.so.2
  libfontconfig.so.1 -> found: /nix/store/c394zcr40gx8x97iwyc4xng6glbk02by-fontconfig-2.12.6-lib/lib/libfontconfig.so.1
  libexpat.so.1 -> found: /nix/store/gfp4576pwlypwkwbbww5zlllfmf24ik2-expat-2.2.6/lib/libexpat.so.1
setting RPATH to: /nix/store/a6lx4mfwlq4idi4hc2bfwif3graps06z-polar-bookshelf-1.0.13/lib:/nix/store/p4b0avnpcvvj6b108zba9j61fgir5b2k-gtk+3-3.22.30/lib:/nix/store/p4b0avnpcvvj6b108zba9j61fgir5b2k-gtk+3-3.22.30/lib:/nix/store/7k0zifnxasrzmkzdvvmbyqnni2dh8v74-pango-1.42.4/lib:/nix/store/7k0zifnxasrzmkzdvvmbyqnni2dh8v74-pango-1.42.4/lib:/nix/store/6hpvb6h5r728qc43nlqs8y934g7gxw55-atk-2.28.1/lib:/nix/store/17kwlq1vzy2fpaz6hhf8fr8njyimpqqk-cairo-1.15.14/lib:/nix/store/ar0k6fpylx2skacpj5ki45r6ni3q97vj-gdk-pixbuf-2.36.12/lib:/nix/store/njs4pvn9gs1zhikh0cdn7zw4aplpmbqm-glib-2.56.0/lib:/nix/store/njs4pvn9gs1zhikh0cdn7zw4aplpmbqm-glib-2.56.0/lib:/nix/store/jglz63ny49xcjjkd9240di4p0z05mspc-at-spi2-atk-2.26.2/lib:/nix/store/sa30r4wdh94qxy9bczw34pr59yxl84rk-dbus-1.12.10-lib/lib:/nix/store/gwayzrjd4klba13pn9jy0msgmsi9k5d0-libX11-1.6.6/lib:/nix/store/pplw91zq99lzj9x7qprngp6qcxlb0vcp-libxcb-1.13.1/lib:/nix/store/gbnbhlgwqyswwb463p0g6lah9kx0n0qd-libXi-1.7.9/lib:/nix/store/kcmvad4lh8iqh0gx6qy9dhs1c1b1jycq-libXcursor-1.1.15/lib:/nix/store/i2i7v250nrmdm1c2p2v7bw7p0nj5phvg-libXdamage-1.1.4/lib:/nix/store/k57h41rn09ji572pw9f9qan3ccc0faip-libXrandr-1.5.1/lib:/nix/store/lnfyv7ymygsb2w8wd837irlrsv7wbgm4-libXcomposite-0.4.4/lib:/nix/store/rib7ylnzqjnamm4n80v179x3hj4q01qr-libXext-1.3.3/lib:/nix/store/wrhg53l2dnzff4vi5yzfgbznky56vv67-libXfixes-5.0.3/lib:/nix/store/s3k9s8k2766d5dw50l5j5v6la46zmigi-libXrender-0.9.10/lib:/nix/store/gwayzrjd4klba13pn9jy0msgmsi9k5d0-libX11-1.6.6/lib:/nix/store/ikwg1kb6fxhi4vrznyrb2yics6ff9kvg-libXtst-1.2.3/lib:/nix/store/ca4p1ic6j63s20qjhqaq07k5w16017sx-libXScrnSaver-1.2.2/lib:/nix/store/njs4pvn9gs1zhikh0cdn7zw4aplpmbqm-glib-2.56.0/lib:/nix/store/6kmwmhx59d6ka5n0rzn36czgm4v6qfxm-nss-3.39/lib:/nix/store/6kmwmhx59d6ka5n0rzn36czgm4v6qfxm-nss-3.39/lib:/nix/store/6kmwmhx59d6ka5n0rzn36czgm4v6qfxm-nss-3.39/lib:/nix/store/3j1yjclv1j79zclna88cq0iyggwak82r-nspr-4.20/lib:/nix/store/a6lx4mfwlq4idi4hc2bfwif3graps06z-polar-bookshelf-1.0.13/lib:/nix/store/2fr0lj7chmfxw4xga178h0fknvfzmkw3-alsa-lib-1.1.6/lib:/nix/store/l1vcyaqk31i479y2zcnjyvxh4kc3lq7p-cups-2.2.6-lib/lib:/nix/store/c394zcr40gx8x97iwyc4xng6glbk02by-fontconfig-2.12.6-lib/lib:/nix/store/gfp4576pwlypwkwbbww5zlllfmf24ik2-expat-2.2.6/lib
searching for dependencies of /nix/store/a6lx4mfwlq4idi4hc2bfwif3graps06z-polar-bookshelf-1.0.13/lib/libffmpeg.so
searching for dependencies of /nix/store/a6lx4mfwlq4idi4hc2bfwif3graps06z-polar-bookshelf-1.0.13/lib/libnode.so
/nix/store/a6lx4mfwlq4idi4hc2bfwif3graps06z-polar-bookshelf-1.0.13

@c0bw3b c0bw3b merged commit 6d8953b into NixOS:master Nov 17, 2018
@Mic92
Copy link
Member

Mic92 commented Nov 17, 2018

Does the desktop file require a backport?

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 17, 2018

@Mic92 no polar-bookshelf has been added in master only recently and is not part of the 18.09 release

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.

None yet

6 participants