branch master updated (39b40f1 -> 2676628)

[Danny Milosavljevic]

dannym pushed a change to branch master
in repository guix.

  from  39b40f1   gnu: mrustc: Update to 0.0.0-2.ee65f12.
   new  2676628   gnu: Add u-boot-tools.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/bootloaders.scm | 41 +
 1 file changed, 41 insertions(+)

01/01: gnu: Add u-boot-tools.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 2676628ffba9ef9cacbb0a15e6fd730a73e51f1f
Author: Danny Milosavljevic 
Date:   Fri May 18 02:40:55 2018 +0200

gnu: Add u-boot-tools.

* gnu/packages/bootloaders.scm (u-boot-tools): New variable.
---
 gnu/packages/bootloaders.scm | 41 +
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index af5d972..333f30e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -359,6 +359,47 @@ tree binary files.  These are board description files used 
by Linux and BSD.")
 also initializes the boards (RAM etc).")
 (license license:gpl2+)))
 
+(define-public u-boot-tools
+  (package
+(inherit u-boot)
+(name "u-boot-tools")
+(arguments
+ `(#:make-flags '("HOSTCC=gcc" "NO_SDL=1")
+   #:test-target "test"
+   #:phases
+   (modify-phases %standard-phases
+ (replace 'configure
+   (lambda* (#:key make-flags #:allow-other-keys)
+ (call-with-output-file "configs/tools_defconfig"
+   (lambda (port)
+ (display "CONFIG_SYS_TEXT_BASE=0\n" port)))
+ (apply invoke "make" "tools_defconfig" make-flags)))
+ (replace 'build
+   (lambda* (#:key inputs make-flags #:allow-other-keys)
+ (apply invoke "make" "tools-only" make-flags)
+ (apply invoke "make" "envtools" make-flags)))
+ (replace 'install
+   (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(bin (string-append out "/bin")))
+   (for-each (lambda (name)
+   (install-file name bin))
+ '("tools/netconsole"
+   "tools/jtagconsole"
+   "tools/gen_eth_addr"
+   "tools/gen_ethaddr_crc"
+   "tools/img2srec"
+   "tools/mkenvimage"
+   "tools/dumpimage"
+   "tools/mkimage"
+   "tools/proftool"
+   "tools/fdtgrep"
+   "tools/env/fw_printenv"))
+   #t))
+(description "U-Boot is a bootloader used mostly for ARM boards.  It
+also initializes the boards (RAM etc).  This package provides its
+board-independent tools.")))
+
 (define (make-u-boot-package board triplet)
   "Returns a u-boot package for BOARD cross-compiled for TRIPLET."
   (let ((same-arch? (if (string-prefix? (%current-system)

01/01: gnu: mrustc: Update to 0.0.0-2.ee65f12.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 39b40f16f2dfd074d6709a34c9e91321295f67da
Author: Danny Milosavljevic 
Date:   Fri May 18 01:55:29 2018 +0200

gnu: mrustc: Update to 0.0.0-2.ee65f12.

* gnu/packages/rust.scm (mrustc): Update to 0.0.0-2.ee65f12.
[arguments]<#:phases>[configure]: New phase.
---
 gnu/packages/rust.scm | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index bf50cdd..6c6e91a 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -272,8 +272,8 @@ safety and thread safety guarantees.")
(package-native-inputs base-rust))
 
 (define-public mrustc
-  (let ((commit "4f98e4322ef7aabd3bbef8cd93c0980cd6d1")
-(revision "1")
+  (let ((commit "ee65f12f4aeb27238c8a2fc07fbe84eceafdde26")
+(revision "2")
 (rustc-version "1.19.0"))
 (package
   (name "mrustc")
@@ -286,7 +286,7 @@ safety and thread safety guarantees.")
 (file-name (git-file-name name version))
 (sha256
  (base32
-  "1hk1x2iv64il5g2n3z06d6h219hnxg1w84lj7vi1lydqa65qk92p"
+  "0rdjzxfwhrpzf44afpm0i7b8fiqvriccn93z22sys8pxw22pkp0d"
   (outputs '("out" "cargo"))
   (build-system gnu-build-system)
   (inputs
@@ -320,7 +320,10 @@ safety and thread safety guarantees.")
(invoke "patch" "-p0" "../rust_src.patch")
(chdir "..")
#t))
-   (delete 'configure)
+   (replace 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+   (setenv "CC" (string-append (assoc-ref inputs "gcc") 
"/bin/gcc"))
+   #t))
(add-after 'build 'build-minicargo
  (lambda _
(for-each (lambda (target)

branch master updated (4ca9581 -> 39b40f1)

[Danny Milosavljevic]

dannym pushed a change to branch master
in repository guix.

  from  4ca9581   gnu: multiqc: Fix build.
   new  39b40f1   gnu: mrustc: Update to 0.0.0-2.ee65f12.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/rust.scm | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

01/01: gnu: multiqc: Fix build.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 4ca958111908eda0452c47c8cb467a1bd0c9bc87
Author: Tobias Geerinckx-Rice 
Date:   Thu May 17 23:07:00 2018 +0200

gnu: multiqc: Fix build.

* gnu/packages/bioinformatics.scm (multiqc)[arguments]: Add a
‘relax-requirements’ phase to fix building with python-matplotlib@2.2.
---
 gnu/packages/bioinformatics.scm | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 7a12155..8bfe01f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9085,6 +9085,19 @@ replacement for strverscmp.")
("python-numpy" ,python-numpy)
;; MultQC checks for the presence of nose at runtime.
("python-nose" ,python-nose)))
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+   (lambda _
+ (substitute* "setup.py"
+   ;; MultiQC 1.5 ‘requires’ a version of python-matplotlib older
+   ;; than the one in Guix, but should work fine with 2.2.2.
+   ;; See  and
+   ;;  for details.
+   (("['\"]matplotlib.*?['\"]")
+"'matplotlib'"))
+ #t)
 (home-page "http://multiqc.info;)
 (synopsis "Aggregate bioinformatics analysis reports")
 (description

branch master updated (162825f -> 4ca9581)

[Tobias Geerinckx-Rice]

nckx pushed a change to branch master
in repository guix.

  from  162825f   daemon: Allow building for armhf-linux on aarch64-linux.
   new  4ca9581   gnu: multiqc: Fix build.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/bioinformatics.scm | 13 +
 1 file changed, 13 insertions(+)

01/01: daemon: Allow building for armhf-linux on aarch64-linux.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 162825f9653f1ba050e40f0ca96d1eb3491a9207
Author: Efraim Flashner 
Date:   Wed May 16 15:05:49 2018 +0300

daemon: Allow building for armhf-linux on aarch64-linux.

* nix/libstore/build.cc (canBuildLocally): Allow building armhf-linux
builds on aarch64-linux.
(DerivationGoal::runChild) Throw error if attempting to build for
armhf-linux on an unsupported platform.
* doc/guix.texi (Invoking guix build): Document how to build natively
for armhf-linux on aarch64-linux.  Add note that on some aarch64
machines this is unsupported.
---
 doc/guix.texi | 9 -
 nix/libstore/build.cc | 8 
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a12210d..005c059 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5855,9 +5855,16 @@ information on cross-compilation.
 
 An example use of this is on Linux-based systems, which can emulate
 different personalities.  For instance, passing
-@code{--system=i686-linux} on an @code{x86_64-linux} system allows you
+@code{--system=i686-linux} on an @code{x86_64-linux} system or
+@code{--system=armhf-linux} on an @code{aarch64-linux} system allows you
 to build packages in a complete 32-bit environment.
 
+@quotation Note
+Building for an @code{armhf-linux} system is unconditionally enabled on
+@code{aarch64-linux} machines, although certain aarch64 chipsets do not
+allow for this functionality, notably the ThunderX.
+@end quotation
+
 Similarly, when transparent emulation with QEMU and @code{binfmt_misc}
 is enabled (@pxref{Virtualization Services,
 @code{qemu-binfmt-service-type}}), you can build for any system for
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 34647e6..c7f3249 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -1244,6 +1244,7 @@ static bool canBuildLocally(const string & platform)
 return platform == settings.thisSystem
 #if __linux__
 || (platform == "i686-linux" && settings.thisSystem == "x86_64-linux")
+|| (platform == "armhf-linux" && settings.thisSystem == 
"aarch64-linux")
 #endif
 ;
 }
@@ -2220,6 +2221,13 @@ void DerivationGoal::runChild()
 throw SysError("cannot set i686-linux personality");
 }
 
+if (drv.platform == "armhf-linux" &&
+(settings.thisSystem == "aarch64-linux" ||
+ (!strcmp(utsbuf.sysname, "Linux") && !strcmp(utsbuf.machine, 
"aarch64" {
+if (personality(PER_LINUX32) == -1)
+throw SysError("cannot set armhf-linux personality");
+}
+
 /* Impersonate a Linux 2.6 machine to get some determinism in
builds that depend on the kernel version. */
 if ((drv.platform == "i686-linux" || drv.platform == "x86_64-linux") 
&& settings.impersonateLinux26) {

branch master updated (17aca5c -> 162825f)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  17aca5c   Revert "gnu: Add ghc-array." and "gnu: Add 
ghc-containers."
   new  162825f   daemon: Allow building for armhf-linux on aarch64-linux.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/guix.texi | 9 -
 nix/libstore/build.cc | 8 
 2 files changed, 16 insertions(+), 1 deletion(-)

01/01: Revert "gnu: Add ghc-array." and "gnu: Add ghc-containers."

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 17aca5c4d273c1f514f8623e555660b99ed90fee
Author: Ludovic Courtès 
Date:   Thu May 17 16:14:49 2018 +0200

Revert "gnu: Add ghc-array." and "gnu: Add ghc-containers."

This reverts commits e5d92c1ce197ec6da891f69565fe550f502f8e7c
and 7d4e377ff5dfb0b708255e30741f2d26407f1677.

These two packages are part of GHC proper.  See the discussion at
.
---
 gnu/packages/haskell.scm | 55 
 1 file changed, 55 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 39c0c0a..9b26ff5 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -13,7 +13,6 @@
 ;;; Copyright © 2017, 2018 Alex Vong 
 ;;; Copyright © 2017 rsiddharth 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
-;;; Copyright © 2018 Tonton 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -9467,58 +9466,4 @@ system dependencies.")
 address string against RFC 5322.")
 (license license:bsd-3)))
 
-(define-public ghc-array
-  (package
-   (name "ghc-array")
-   (version "0.5.2.0")
-   (source
-(origin
- (method url-fetch)
- (uri
-  (string-append "https://hackage.haskell.org/package/array-0.5.2.0/array-;
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
-  (base32
-   "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"
-   (build-system haskell-build-system)
-   (synopsis "Haskell @code{Data.Array} module")
-   (description "In addition to providing the @code{Data.Array} module as
-specified in the Haskell 2010 Language Report, this package defines the
-classes @code{IArray} of immutable arrays and @code{MArray} of arrays mutable
-within appropriate monads, as well as some instances of these classes.")
-   (home-page "https://hackage.haskell.org/package/array;)
-   (license license:bsd-3)))
-
-(define-public ghc-containers
-  (package
-   (name "ghc-containers")
-   (version "0.5.11.0")
-   (source
-(origin
- (method url-fetch)
- (uri
-  (string-append 
"https://hackage.haskell.org/package/containers-0.5.11.0/containers-;
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
-  (base32
-   "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq"
-   (build-system haskell-build-system)
-   (inputs `(("ghc-array" ,ghc-array)
- ("ghc-deepseq" ,ghc-deepseq-generics)
- ("ghc-hunit" ,ghc-hunit)
- ("ghc-chasingbottoms" ,ghc-chasingbottoms)
- ("ghc-test-framework" ,ghc-test-framework)
- ("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
- ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
- ("ghc-quickcheck" ,ghc-quickcheck)
- ("ghc-ghc-prim" ,ghc-primitive)))
-   (synopsis "Haskell containers: Assorted concrete container types")
-   (description "This Haskell module provides efficient general-purpose
-implementations of various immutable container types including sets, maps,
-sequences, trees, and graphs.")
-   (home-page "https://hackage.haskell.org/package/containers;)
-   (license license:bsd-3)))
-
 ;;; haskell.scm ends here

branch master updated (17b59aa -> 17aca5c)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  17b59aa   gnu: jupyter: Add search path.
   new  17aca5c   Revert "gnu: Add ghc-array." and "gnu: Add 
ghc-containers."

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/haskell.scm | 55 
 1 file changed, 55 deletions(-)

01/02: website: pigx: Add the "Reproducible builds" tag.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix-artwork.

commit 1d56c88c4fb4428d4d90c6b78b606c7490bd5258
Author: Ludovic Courtès 
Date:   Wed May 16 14:59:25 2018 +0200

website: pigx: Add the "Reproducible builds" tag.

* website/posts/pigx.md: Add the "Reproducible builds" tag.
---
 website/posts/pigx.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/posts/pigx.md b/website/posts/pigx.md
index a7807b7..76bcdae 100644
--- a/website/posts/pigx.md
+++ b/website/posts/pigx.md
@@ -1,7 +1,7 @@
 title: Paper on reproducible bioinformatics pipelines with Guix
 date: 2018-05-09 12:00
 author: Ricardo Wurmus
-tags: High-performance computing, Research, Reproducibility, Bioinformatics
+tags: High-performance computing, Research, Reproducibility, Bioinformatics, 
Reproducible builds
 ---
 I’m happy to announce that the bioinformatics group at the [Max
 Delbrück Center](https://www.mdc-berlin.de/) that I’m working with has

02/02: website: contribute: Add paragraph on code of conduct.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix-artwork.

commit 4dbe780543a960c4b7b881b4788750093953adac
Author: Tonton 
Date:   Thu May 17 01:41:21 2018 +0200

website: contribute: Add paragraph on code of conduct.

 * website/apps/base/templates/contribute.scm: Add paragraph on
   code of conduct.

Co-authored-by: Ludovic Courtès 
---
 website/apps/base/templates/contribute.scm | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/website/apps/base/templates/contribute.scm 
b/website/apps/base/templates/contribute.scm
index 274938a..2cf9e8b 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -44,6 +44,16 @@
" in IRC Freenode. Tell us how would you like to help, and we
will do our best to guide you. ")
 
+  (p
+   "We want to provide a warm, friendly, and harassment-free environment,
+   so that anyone can contribute to the best of their abilities.  To this
+   end our project uses a “Contributor Covenant”, which was adapted from "
+   (a (@ (href "https://contributor-covenant.org/;))
+  "https://contributor-covenant.org/;)
+   ".  You can find the full pledge in the "
+   (a (@ (href 
"//git.savannah.gnu.org/cgit/guix.git/tree/CODE-OF-CONDUCT"))
+  (tt "CODE-OF-CONDUCT")) " file.")
+
   (div
(@ (class "centered-text"))
 

branch master updated (fe3bca0 -> 4dbe780)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix-artwork.

  from  fe3bca0   website: Add post about 'guix pack -R'.
   new  1d56c88   website: pigx: Add the "Reproducible builds" tag.
   new  4dbe780   website: contribute: Add paragraph on code of conduct.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 website/apps/base/templates/contribute.scm | 10 ++
 website/posts/pigx.md  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

branch master updated (7376ba4 -> 17b59aa)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  7376ba4   gnu: libreoffice: Update to 5.4.7.2.
   new  827c565   union: Do not warn about harmless collisions.
   new  fa6a3bb   gnu: Add jupyter-guile-kernel.
   new  17b59aa   gnu: jupyter: Add search path.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/guile.scm  | 129 
 gnu/packages/python.scm |   6 +++
 guix/build/union.scm|  17 +--
 3 files changed, 148 insertions(+), 4 deletions(-)

01/03: union: Do not warn about harmless collisions.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 827c56515e06d21aaa23d60ed05b0c45d1d49901
Author: Ludovic Courtès 
Date:   Tue May 15 09:40:23 2018 +0200

union: Do not warn about harmless collisions.

Until now we'd get pointless messages like:

  warning: collision encountered:
/gnu/store/…-gtk-icon-themes/share/icons/hicolor/icon-theme.cache
/gnu/store/…-inkscape-0.92.3/share/icons/hicolor/icon-theme.cache
  warning: choosing 
/gnu/store/…-gtk-icon-themes/share/icons/hicolor/icon-theme.cache

* guix/build/union.scm (%harmless-collisions): New variable.
(warn-about-collision): Honor it.
---
 guix/build/union.scm | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/guix/build/union.scm b/guix/build/union.scm
index 24b366a..fff795c 100644
--- a/guix/build/union.scm
+++ b/guix/build/union.scm
@@ -81,14 +81,23 @@ identical, #f otherwise."
(or (eof-object? n1)
(loop))
 
+(define %harmless-collisions
+  ;; This is a list of files that are known to collide, but for which emitting
+  ;; a warning doesn't make sense.  For example, "icon-theme.cache" is
+  ;; regenerated by a profile hook which shadows the file provided by
+  ;; individual packages, and "gschemas.compiled" is made available to
+  ;; applications via 'glib-or-gtk-build-system'.
+  '("icon-theme.cache" "gschemas.compiled"))
+
 (define (warn-about-collision files)
   "Handle the collision among FILES by emitting a warning and choosing the
 first one of THEM."
-  (format (current-error-port)
-  "~%warning: collision encountered:~%~{  ~a~%~}"
-  files)
   (let ((file (first files)))
-(format (current-error-port) "warning: choosing ~a~%" file)
+(unless (member (basename file) %harmless-collisions)
+  (format (current-error-port)
+  "~%warning: collision encountered:~%~{  ~a~%~}"
+  files)
+  (format (current-error-port) "warning: choosing ~a~%" file))
 file))
 
 (define* (union-build output inputs

02/03: gnu: Add jupyter-guile-kernel.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit fa6a3bb74f8f273358034606d8decc35fb401950
Author: Rouby Pierre-Antoine 
Date:   Tue May 15 13:33:15 2018 +0200

gnu: Add jupyter-guile-kernel.

* gnu/package/guile.scm (jupyter-guile-kernel): New variable.

Co-authored-by: Ludovic Courtès 
---
 gnu/packages/guile.scm | 129 +
 1 file changed, 129 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 9e24e90..84f46d1 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -61,6 +61,7 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages maths)
@@ -2207,4 +2208,132 @@ It has a nice, simple s-expression based syntax.")
 messaging library.")
   (license license:gpl3+
 
+(define-public jupyter-guile-kernel
+  (let ((commit "a5c5f3ea3215b65e770bcb62f71117b0ec4575ed")
+(revision "0"))
+(package
+  (name "jupyter-guile-kernel")
+  (version (git-version "0.0.0" revision commit))
+  (source
+   (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/jerry40/guile-kernel;)
+   (commit commit)))
+ (sha256
+  (base32
+   "0y5jr0f0dyskvsawqbf6n0bpg8jirw4mhqbarf2a6p9lxhqha9s9"
+  (build-system trivial-build-system)
+  (arguments
+   `(#:modules ((guix build utils))
+ #:builder
+ (begin
+   (use-modules (guix build utils)
+(srfi srfi-26)
+(ice-9 match)
+(ice-9 popen)
+(ice-9 rdelim))
+
+   (let* ((out (assoc-ref %outputs "out"))
+  (guile (assoc-ref %build-inputs "guile"))
+  (effective (read-line
+  (open-pipe* OPEN_READ
+  (string-append guile "/bin/guile")
+  "-c" "(display 
(effective-version))")))
+  (module-dir (string-append out "/share/guile/site/"
+ effective))
+  (kernel-dir (string-append out 
"/share/jupyter/kernels/guile"))
+  (go-dir (string-append out "/lib/guile/"
+ effective
+ "/site-ccache"))
+  (source (string-append (assoc-ref %build-inputs "source")
+ "/src"))
+  (scm-files '("hmac.scm"
+   "tools.scm"
+   "guile-jupyter-kernel.scm"))
+  (kernel-file "kernel.json")
+  (guild  (string-append (assoc-ref %build-inputs "guile")
+ "/bin/guild"))
+  (g-szmq (assoc-ref %build-inputs "guile-simple-zmq"))
+  (json   (assoc-ref %build-inputs "guile-json"))
+  (deps   (list g-szmq json))
+  (path   (string-join
+   (map (cut string-append <>
+ "/share/guile/site/"
+ effective)
+deps)
+   ":"))
+  (gopath (string-join
+   (map (cut string-append <>
+ "/lib/guile/" effective
+ "/site-ccache/")
+deps)
+   ":")))
+
+ ;; Make installation directories.
+ (mkdir-p module-dir)
+ (mkdir-p kernel-dir)
+ (mkdir-p go-dir)
+
+ ;; Make a writable copy of SOURCE.
+ (copy-recursively source ".")
+
+ ;; Record the absolute file name of the 'openssl' command.
+ (substitute* "hmac.scm"
+   (("openssl")
+(string-append (assoc-ref %build-inputs "openssl")
+   "/bin/openssl")))
+
+ ;; Compile .scm files and install.
+ (setenv "GUILE_AUTO_COMPILE" "0")
+ (setenv "GUILE_LOAD_PATH" path)
+ (setenv "GUILE_LOAD_COMPILED_PATH" gopath)
+
+ (for-each (lambda (file)
+ (let* ((dest-file (string-append module-dir "/"
+  file))
+(go-file (match (string-split file #\.)
+   ((base _)
+(string-append go-dir "/"
+

03/03: gnu: jupyter: Add search path.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 17b59aa0195f156bb65d0ce0ae62551e91a72c77
Author: Rouby Pierre-Antoine 
Date:   Mon May 14 11:10:50 2018 +0200

gnu: jupyter: Add search path.

* gnu/package/python.scm (jupyter)[native-search-paths]: Add it.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python.scm | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d8d615e..5e2625e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6881,6 +6881,12 @@ Jupyter kernels such as IJulia and IRKernel.")
("python-jupyter-console" ,python-jupyter-console)
("python-nbconvert" ,python-nbconvert)
("python-notebook" ,python-notebook)))
+
+(native-search-paths
+ (list (search-path-specification
+(variable "JUPYTER_PATH")
+(files '("share/jupyter")
+
 (home-page "http://jupyter.org;)
 (synopsis "Web application for interactive documents")
 (description