-
Notifications
You must be signed in to change notification settings - Fork 15
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
added zotero, tested with guix shell pure, signed this time #27
Open
johnabs
wants to merge
3
commits into
guix-science:master
Choose a base branch
from
johnabs:master
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| (define-module (guix-science packages zotero) | ||
| #:use-module (guix packages) | ||
| #:use-module ((guix licenses) | ||
| #:prefix license:) | ||
| #:use-module (gnu packages base) | ||
| #:use-module (guix download) | ||
| #:use-module (nonguix build-system binary) | ||
| #:use-module (gnu packages gcc) | ||
| #:use-module (gnu packages gtk) | ||
| #:use-module (gnu packages xorg) | ||
| #:use-module (gnu packages glib) | ||
| #:use-module (ice-9 regex)) | ||
| (define-public zotero | ||
| (package | ||
| (name "zotero") | ||
| (version "6.0.26") | ||
| (source | ||
| (origin | ||
| (method url-fetch) | ||
| (uri (string-append "https://download.zotero.org/client/release/" | ||
| version "/Zotero-" version "_linux-x86_64.tar.bz2")) | ||
| (sha256 | ||
| (base32 "0h1bizcqlk22h7nvhnyp3ppymv2hrk7133hgmp15hl3bvfzz7nh6")))) | ||
| (build-system binary-build-system) | ||
| (arguments | ||
| `(#:patchelf-plan `(("zotero-bin" ("gcc:lib")) | ||
| ("libmozgtk.so" ("gtk+")) | ||
| ("libxul.so" ("libx11" "dbus-glib" "libxt" | ||
| "libgthread"))) | ||
| #:install-plan '(("./" "/opt/zotero/")) | ||
| #:phases (modify-phases %standard-phases | ||
| (add-after 'patch-usr-bin-file 'patch-launcher | ||
| (lambda* (#:key outputs #:allow-other-keys) | ||
| (substitute* "zotero" | ||
| ((,(regexp-quote | ||
| "$(dirname \"$(readlink -f \"$0\")\")")) | ||
| (string-append (assoc-ref outputs "out") | ||
| "/opt/zotero"))))) | ||
| (add-after 'install 'install-bin | ||
| (lambda* (#:key outputs #:allow-other-keys) | ||
| (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) | ||
| (symlink (string-append (assoc-ref outputs "out") | ||
| "/opt/zotero/zotero") | ||
| (string-append (assoc-ref outputs "out") | ||
| "/bin/zotero")) | ||
| (mkdir-p (string-append (assoc-ref outputs "out") | ||
| "/share/applications")) | ||
| (symlink (string-append (assoc-ref outputs "out") | ||
| "/opt/zotero/zotero.desktop") | ||
| (string-append (assoc-ref outputs "out") | ||
| "/share/applications/zotero.desktop"))))))) | ||
| (inputs `(("coreutils" ,coreutils) | ||
| ("gcc:lib" ,gcc "lib") | ||
| ("gtk+" ,gtk+) | ||
| ("libx11" ,libx11) | ||
| ("libgthread" ,glib) | ||
| ("libxt" ,libxt) | ||
| ("dbus-glib" ,dbus-glib))) | ||
| (synopsis "Your personal research assistant.") | ||
| (description | ||
| "Zotero is a free, easy-to-use tool to help you collect, organize, annotate, cite, and share research.") | ||
| (home-page "https://www.zotero.org/") | ||
| (license license:agpl3))) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We cannot depend on nonguix here. The
guix-sciencechannel should not depend on thenonguixchannel.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well since I have to rely on the binary to build it, and guix itself doesn't have a binary build-system, it's all I've got to work with. See the following mailing list archive: https://lists.gnu.org/archive/html/guix-devel/2019-03/msg00496.html
Additionally, this channel is dedicated to providing open source scientific software; which Zotero is. If the issue is with the build-system and the use of the blob, can we just move this to guix-science nonfree which also uses blobs?
Building this from source, while preferable, takes a lot of time (as you're basically just building a modified version of old Firefox with extra features), and since we don't have access to Cuirass to allow for substitutes, it really seems like this is the easiest option for users and packagers, especially since the current alternative for guix users it to just use the tarball anyway.