[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 04 Mar 2015 06:41:35 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit be9b13fff019a82d09137ddfcb49abd23e0cda02
Merge: da69977 5713809
Author: Mark H Weaver <address@hidden>
Date: Wed Mar 4 01:37:06 2015 -0500
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/version-control.scm
guix/build/ruby-build-system.scm
gnu-system.am | 3 +
gnu/build/activation.scm | 10 +
gnu/packages/bash.scm | 22 ++-
gnu/packages/bioinformatics.scm | 144 ++++++++++++
gnu/packages/certs.scm | 52 +++--
gnu/packages/check.scm | 8 +-
gnu/packages/compression.scm | 6 +-
gnu/packages/enlightenment.scm | 235 ++++++++++++++++++++
gnu/packages/gdb.scm | 5 +-
gnu/packages/gnu-pw-mgr.scm | 5 +-
gnu/packages/gtk.scm | 39 ++++
gnu/packages/guile.scm | 60 ++---
gnu/packages/libevent.scm | 7 +-
gnu/packages/llvm.scm | 31 ++-
gnu/packages/messaging.scm | 8 +-
gnu/packages/mpd.scm | 35 +++-
.../patches/crossmap-allow-system-pysam.patch | 121 ++++++++++
gnu/packages/python.scm | 122 ++++++++++
gnu/packages/rdesktop.scm | 59 +++++
gnu/packages/ruby.scm | 29 +++
gnu/packages/skribilo.scm | 2 +-
gnu/packages/version-control.scm | 114 +++++-----
gnu/packages/video.scm | 4 +-
gnu/packages/xfce.scm | 28 ++-
gnu/packages/xiph.scm | 10 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/xorg.scm | 4 +-
gnu/system.scm | 5 +
guix/build-system/ruby.scm | 32 ++--
guix/build/ruby-build-system.scm | 20 ++-
guix/http-client.scm | 81 ++++----
guix/profiles.scm | 91 +++++++-
32 files changed, 1165 insertions(+), 231 deletions(-)
diff --cc gnu/packages/version-control.scm
index 71b3630,01d9720..7434ed9
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -147,72 -147,73 +147,82 @@@ as well as the classic centralized work
(("/usr/bin/perl") (which "perl"))
(("/usr/bin/python") (which "python"))))
(alist-cons-after
- 'install 'split
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Split the binaries to the various outputs.
- (let* ((out (assoc-ref outputs "out"))
- (svn (assoc-ref outputs "svn"))
- (gui (assoc-ref outputs "gui"))
- (gitk (string-append out "/bin/gitk"))
- (gitk* (string-append gui "/bin/gitk"))
- (git-gui (string-append out "/libexec/git-core/git-gui"))
- (git-gui* (string-append gui "/libexec/git-core/git-gui"))
- (git-cit (string-append out
"/libexec/git-core/git-citool"))
- (git-cit* (string-append gui
"/libexec/git-core/git-citool"))
- (git-svn (string-append out "/libexec/git-core/git-svn"))
- (git-svn* (string-append svn "/libexec/git-core/git-svn"))
- (git-sm (string-append out
-
"/libexec/git-core/git-submodule")))
- (mkdir-p (string-append gui "/bin"))
- (mkdir-p (string-append gui "/libexec/git-core"))
- (mkdir-p (string-append svn "/libexec/git-core"))
+ 'install 'install-shell-completion
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (completions (string-append out "/etc/bash_completion.d")))
+ ;; TODO: Install the tcsh and zsh completions in the right place.
+ (mkdir-p completions)
+ (copy-file "contrib/completion/git-completion.bash"
+ (string-append completions "/git.sh"))
+ #t))
+ (alist-cons-after
+ 'install 'split
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Split the binaries to the various outputs.
+ (let* ((out (assoc-ref outputs "out"))
+ (svn (assoc-ref outputs "svn"))
+ (gui (assoc-ref outputs "gui"))
+ (gitk (string-append out "/bin/gitk"))
+ (gitk* (string-append gui "/bin/gitk"))
+ (git-gui (string-append out "/libexec/git-core/git-gui"))
+ (git-gui* (string-append gui "/libexec/git-core/git-gui"))
+ (git-cit (string-append out
"/libexec/git-core/git-citool"))
+ (git-cit* (string-append gui
"/libexec/git-core/git-citool"))
+ (git-svn (string-append out "/libexec/git-core/git-svn"))
+ (git-svn* (string-append svn "/libexec/git-core/git-svn"))
+ (git-sm (string-append out
+
"/libexec/git-core/git-submodule")))
+ (mkdir-p (string-append gui "/bin"))
+ (mkdir-p (string-append gui "/libexec/git-core"))
+ (mkdir-p (string-append svn "/libexec/git-core"))
- (for-each (lambda (old new)
- (copy-file old new)
- (delete-file old)
- (chmod new #o555))
- (list gitk git-gui git-cit git-svn)
- (list gitk* git-gui* git-cit* git-svn*))
+ (for-each (lambda (old new)
+ (copy-file old new)
+ (delete-file old)
+ (chmod new #o555))
+ (list gitk git-gui git-cit git-svn)
+ (list gitk* git-gui* git-cit* git-svn*))
- ;; Tell 'git-svn' where Subversion is.
- (wrap-program git-svn*
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "subversion")
- "/bin")))
- `("PERL5LIB" ":" prefix
- (,(string-append (assoc-ref inputs "subversion")
- "/lib/perl5/site_perl")))
+ ;; Tell 'git-svn' where Subversion is.
+ (wrap-program git-svn*
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "subversion")
+ "/bin")))
+ `("PERL5LIB" ":" prefix
+ (,(string-append (assoc-ref inputs "subversion")
+ "/lib/perl5/site_perl")))
- ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so
- ;; help it find 'libsvn_client-1.so'.
- `("LD_LIBRARY_PATH" ":" prefix
- (,(string-append (assoc-ref inputs "subversion")
- "/lib"))))
+ ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so
+ ;; help it find 'libsvn_client-1.so'.
+ `("LD_LIBRARY_PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "subversion")
+ "/lib"))))
- ;; Tell 'git-submodule' where Perl is.
- (wrap-program git-sm
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "perl")
- "/bin"))))
+ ;; Tell 'git-submodule' where Perl is.
+ (wrap-program git-sm
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "perl")
+ "/bin"))))
- ;; Tell 'git' to look for core programs in the user's profile.
- ;; This allows user to install other outputs of this package and
- ;; have them transparently taken into account. There's a
- ;; 'GIT_EXEC_PATH' environment variable, but it's supposed to
- ;; specify a single directory, not a search path.
- (wrap-program (string-append out "/bin/git")
- `("PATH" ":" prefix
- ("$HOME/.guix-profile/libexec/git-core")))))
- %standard-phases))))
+ ;; Tell 'git' to look for core programs in the user's profile.
+ ;; This allows user to install other outputs of this package and
+ ;; have them transparently taken into account. There's a
+ ;; 'GIT_EXEC_PATH' environment variable, but it's supposed to
+ ;; specify a single directory, not a search path.
+ (wrap-program (string-append out "/bin/git")
+ `("PATH" ":" prefix
+ ("$HOME/.guix-profile/libexec/git-core")))))
+ %standard-phases)))))
+
+ (native-search-paths
+ ;; For HTTPS access, Git needs a single-file certificate bundle, specified
+ ;; with $GIT_SSL_CAINFO.
+ ;; FIXME: This variable designates a single file; it is not a search path.
+ (list (search-path-specification
+ (variable "GIT_SSL_CAINFO")
+ (files '("etc/ssl/certs/ca-certificates.crt")))))
+
(synopsis "Distributed version control system")
(description
"Git is a free distributed version control system designed to handle
diff --cc guix/build/ruby-build-system.scm
index 40aa974,4221295..d318d53
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@@ -59,14 -66,21 +66,17 @@@ directory.
(setenv "GEM_HOME" gem-home)
(mkdir-p gem-home)
(zero? (system* "gem" "install" "--local"
- (first-matching-file "\\.gem$")))))
+ (first-matching-file "\\.gem$")
+ ;; Executables should go into /bin, not /lib/ruby/gems.
+ "--bindir" (string-append out "/bin")))))
(define %standard-phases
- (alist-cons-after
- 'unpack 'gitify gitify
- (alist-replace
- 'build build
- (alist-replace
- 'install install
- (alist-replace
- 'check check
- (alist-delete
- 'configure gnu:%standard-phases))))))
+ (modify-phases gnu:%standard-phases
+ (delete configure)
+ (replace build build)
+ (replace install install)
- (replace check check)))
++ (replace check check)
++ (add-after unpack gitify gitify))
(define* (ruby-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args)