There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
Built and tested locally.
From the changelog:
```
Firefox 45/46 compatibility
* [Zotero Standalone] Save PDFs directly from browsers via the Save to
Zotero button
* Requires Chrome connector version 4.0.29; updated Safari connector
coming soon
* To convert a standalone PDF attachment to a full item, right-click
the item and choose “Retrieve Metadata for PDF” or “Create Parent
Item”.
* [Zotero for Firefox] Don't show Firefox open/save dialog when
showing style installation prompt
* Retry additional file sync failures automatically
* Fixed potential crash when dragging in files on some systems
* Fixed potential crash when dragging collections to another library
* Miscellaneous bibliographic output and word processor integration
fixes
* Updated citeproc-js to version 1.1.71
* Fixed spacing of toolbar icons on Windows/Linux in Firefox 43+
* Use larger text field for Book Title
* Make highlight color of selected items list rows on Linux more
distinct when items pane doesn't have focus
* [Zotero for Firefox] Improved error message on Firefox login manager
failure
* Improved error message when trying to use a later database version
```
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
Zotero breaks every time firefox is updated (about every six weeks). It
is always fixed with the next zotero update, but that can take weeks.
Sometimes, upstream even skips firefox releases. This will stop zotero
breaking every time.
