01/01: linux-initrd: Autoload known-module-aliases, again.

2018-03-15 Thread Mark H. Weaver
mhw pushed a commit to branch master
in repository guix.

commit 3e5783e2920dfd78f10e0e3b160fb310c6c810ca
Author: Mark H Weaver 
Date:   Thu Mar 15 23:08:02 2018 -0400

linux-initrd: Autoload known-module-aliases, again.

Fixes a regression introduced in 8ab10c19d72caab7459034a6e72b0117d7c5cec8.

* gnu/system/mapped-devices.scm: Autoload 'known-module-aliases'.
---
 gnu/system/mapped-devices.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index 279d521..a2cca0a 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
 ;;; Copyright © 2016 Andreas Enge 
-;;; Copyright © 2017 Mark H Weaver 
+;;; Copyright © 2017, 2018 Mark H Weaver 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,7 +32,7 @@
   #:use-module (gnu system uuid)
   #:autoload   (gnu build file-systems) (find-partition-by-luks-uuid)
   #:autoload   (gnu build linux-modules)
- (device-module-aliases matching-modules)
+ (device-module-aliases matching-modules known-module-aliases)
   #:autoload   (gnu packages cryptsetup) (cryptsetup-static)
   #:autoload   (gnu packages linux) (mdadm-static)
   #:use-module (srfi srfi-1)



branch master updated (8e4ce40 -> 3e5783e)

2018-03-15 Thread Mark H. Weaver
mhw pushed a change to branch master
in repository guix.

  from  8e4ce40   gnu: linux-libre: Update to 4.15.10.
   new  3e5783e   linux-initrd: Autoload known-module-aliases, again.

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/system/mapped-devices.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



02/02: gnu: linux-libre: Update to 4.15.10.

2018-03-15 Thread Mark H. Weaver
mhw pushed a commit to branch master
in repository guix.

commit 8e4ce402693d6f6fb5bbb26d7907595948669350
Author: Mark H Weaver 
Date:   Thu Mar 15 19:17:22 2018 -0400

gnu: linux-libre: Update to 4.15.10.

* gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.10.
(%linux-libre-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0b609e1..bd6f005 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -383,8 +383,8 @@ It has been modified to remove all non-free binary blobs.")
 ;; supports qemu "virt" machine and possibly a large number of ARM boards.
 ;; See : https://wiki.debian.org/DebianKernel/ARMMP.
 
-(define %linux-libre-version "4.15.9")
-(define %linux-libre-hash 
"13lcard7i6w2c1cf9rfhvmq79xk4qp2p1c1920mfi69l20yvm572")
+(define %linux-libre-version "4.15.10")
+(define %linux-libre-hash 
"10fp8jmy0fxq8l01m1nnagpq1hznl9jmhcwknk8izjmdcb5snq6c")
 
 (define-public linux-libre
   (make-linux-libre %linux-libre-version



01/02: gnu: linux-libre@4.14: Update to 4.14.27.

2018-03-15 Thread Mark H. Weaver
mhw pushed a commit to branch master
in repository guix.

commit 570d79c8df49142a6b0a5bf6fcd120177459563a
Author: Mark H Weaver 
Date:   Thu Mar 15 19:16:25 2018 -0400

gnu: linux-libre@4.14: Update to 4.14.27.

* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.27.
(%linux-libre-4.14-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b81cb55..0b609e1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -392,8 +392,8 @@ It has been modified to remove all non-free binary blobs.")
 %linux-compatible-systems
 #:configuration-file kernel-config))
 
-(define %linux-libre-4.14-version "4.14.26")
-(define %linux-libre-4.14-hash 
"1m2zr17wpasg5riysbaa4g5i492jzr93py2jm088ki818s4a9cm3")
+(define %linux-libre-4.14-version "4.14.27")
+(define %linux-libre-4.14-hash 
"0mgkka9niyd0lj4qliy4v7jjh9lg1a5jwlv60yw7z0s4k7ajyyrp")
 
 (define-public linux-libre-4.14
   (make-linux-libre %linux-libre-4.14-version



branch master updated (8ab10c1 -> 8e4ce40)

2018-03-15 Thread Mark H. Weaver
mhw pushed a change to branch master
in repository guix.

  from  8ab10c1   linux-initrd: Move 'check-device-initrd-modules' 
elsewhere.
   new  570d79c   gnu: linux-libre@4.14: Update to 4.14.27.
   new  8e4ce40   gnu: linux-libre: Update to 4.15.10.

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:
 gnu/packages/linux.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)



06/07: gnu: idris: Provide the right versions of dependencies.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit d661ed521eedf4663c57e5d96e409a32a52113e0
Author: Alex ter Weele 
Date:   Wed Mar 7 18:32:19 2018 -0600

gnu: idris: Provide the right versions of dependencies.

Previously it would fail to build.  See .

* gnu/packages/idris.scm (idris)[inputs]: alphebetize
  ghc-vector-binary-instances and ghc-async. Use ghc-aeson-1.1.2.0,
  ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1. Remove ghc-aeson,
  ghc-cheapskate, ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun,
  ghc-trifecta, and ghc-zlib.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/idris.scm | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index c103055..79f89d6 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Paul van der Walt 
 ;;; Copyright © 2016, 2017 David Craven 
+;;; Copyright © 2018 Alex ter Weele 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -92,15 +93,15 @@
 (inputs
  `(("gmp" ,gmp)
("ncurses" ,ncurses)
-   ("ghc-aeson" ,ghc-aeson)
-   ("ghc-async" ,ghc-async)
+   ("ghc-aeson" ,ghc-aeson-1.1.2.0)
("ghc-annotated-wl-pprint" ,ghc-annotated-wl-pprint)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
+   ("ghc-async" ,ghc-async)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
-   ("ghc-cheapskate" ,ghc-cheapskate)
+   ("ghc-cheapskate" ,ghc-cheapskate-0.1.0.5)
("ghc-code-page" ,ghc-code-page)
("ghc-fingertree" ,ghc-fingertree)
("ghc-fsnotify" ,ghc-fsnotify)
@@ -108,23 +109,18 @@
("ghc-mtl" ,ghc-mtl)
("ghc-network" ,ghc-network)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
-   ("ghc-parsers" ,ghc-parsers)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-safe" ,ghc-safe)
("ghc-split" ,ghc-split)
-   ("ghc-tasty" ,ghc-tasty)
-   ("ghc-tasty-golden" ,ghc-tasty-golden)
-   ("ghc-tasty-rerun" ,ghc-tasty-rerun)
("ghc-terminal-size" ,ghc-terminal-size)
("ghc-text" ,ghc-text)
-   ("ghc-trifecta" ,ghc-trifecta)
+   ("ghc-trifecta" ,ghc-trifecta-1.6.2.1)
("ghc-uniplate" ,ghc-uniplate)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-utf8-string" ,ghc-utf8-string)
-   ("ghc-vector-binary-instances" ,ghc-vector-binary-instances)
("ghc-vector" ,ghc-vector)
-   ("ghc-zip-archive" ,ghc-zip-archive)
-   ("ghc-zlib" ,ghc-zlib)))
+   ("ghc-vector-binary-instances" ,ghc-vector-binary-instances)
+   ("ghc-zip-archive" ,ghc-zip-archive)))
 (arguments
  `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox.
#:configure-flags



03/07: gnu: Add ghc-aeson-1.1.2.0.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 9c7e17fd61826506a06b2bf737ebd8bbcd0ce2b5
Author: Alex ter Weele 
Date:   Wed Mar 7 18:28:24 2018 -0600

gnu: Add ghc-aeson-1.1.2.0.

* gnu/packages/idris.scm (ghc-aeson-1.1.2.0): New variable.

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

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index 6eb940c..ae90676 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -30,6 +30,20 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
+(define ghc-aeson-1.1.2.0
+  (package (inherit ghc-aeson)
+(version "1.1.2.0")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/aeson/aeson-;
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))
+
 (define-public idris
   (package
 (name "idris")



05/07: gnu: Add ghc-cheapskate-0.1.0.5.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 866b19086e7f294261e694b228ff05ffb129296c
Author: Alex ter Weele 
Date:   Wed Mar 7 18:31:22 2018 -0600

gnu: Add ghc-cheapskate-0.1.0.5.

* gnu/packages/idris.scm (ghc-cheapskate-0.1.0.5): New variable.

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

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index b67fcbc..c103055 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -57,6 +57,25 @@
 (base32
  "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))
 
+;; ghc-cheapskate appeared too new. This follows LTS Haskell.
+(define ghc-cheapskate-0.1.0.5
+  (package
+(inherit ghc-cheapskate)
+(version "0.1.0.5")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/cheapskate/cheapskate-;
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "0cpsmfx5z2xykg71sv8j7pl8ga6pzyjnjdb9bxn00vcpqkzvfqvs"
+(arguments
+ ;; LTS Haskell says data-default >=0.5 && <0.8
+ `(#:configure-flags (list "--allow-newer=data-default")
+
 (define-public idris
   (package
 (name "idris")



01/07: vm: Use 'invoke' instead of 'system*'.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit e1d0f2aa87b8045aacb821c2406ecdfa832c7473
Author: Ludovic Courtès 
Date:   Thu Mar 15 16:30:41 2018 +0100

vm: Use 'invoke' instead of 'system*'.

* gnu/build/vm.scm (load-in-linux-vm, initialize-partition-table)
(create-ext-file-system, create-fat-file-system)
(install-efi, make-iso9660-image): Use 'invoke' instead
of (unless (zero? (system* ...)) (error ...)).
---
 gnu/build/vm.scm | 105 +--
 1 file changed, 47 insertions(+), 58 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index fe003ea..7817507 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 

 ;;; Copyright © 2016 Christopher Allan Webber 
 ;;; Copyright © 2016, 2017 Leo Famulari 
 ;;; Copyright © 2017 Mathieu Othacehe 
@@ -121,10 +121,8 @@ the #:references-graphs parameter of 'derivation'."
 (format #t "creating ~a image of ~,2f MiB...~%"
 disk-image-format (/ disk-image-size (expt 2 20)))
 (force-output)
-(unless (zero? (system* "qemu-img" "create" "-f" disk-image-format
-output
-(number->string disk-image-size)))
-  (error "qemu-img failed")))
+(invoke "qemu-img" "create" "-f" disk-image-format output
+ (number->string disk-image-size)))
 
   (mkdir "xchg")
 
@@ -136,31 +134,29 @@ the #:references-graphs parameter of 'derivation'."
   graph-files))
 (_ #f))
 
-  (unless (zero?
-   (apply system* qemu "-nographic" "-no-reboot"
-  "-m" (number->string memory-size)
-  "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng"
-  "-device" "virtio-rng-pci,rng=guixsd-vm-rng"
-  "-virtfs"
-  (string-append "local,id=store_dev,path="
- (%store-directory)
- ",security_model=none,mount_tag=store")
-  "-virtfs"
-  (string-append "local,id=xchg_dev,path=xchg"
- ",security_model=none,mount_tag=xchg")
-  "-kernel" linux
-  "-initrd" initrd
-  "-append" (string-append "console=ttyS0 --load="
-   builder)
-  (append
-   (if make-disk-image?
-   `("-device" "virtio-blk,drive=myhd"
- "-drive" ,(string-append "if=none,file=" output
-  ",format=" disk-image-format
-  ",id=myhd"))
-   '())
-   arch-specific-flags)))
-(error "qemu failed" qemu))
+  (apply invoke qemu "-nographic" "-no-reboot"
+ "-m" (number->string memory-size)
+ "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng"
+ "-device" "virtio-rng-pci,rng=guixsd-vm-rng"
+ "-virtfs"
+ (string-append "local,id=store_dev,path="
+(%store-directory)
+",security_model=none,mount_tag=store")
+ "-virtfs"
+ (string-append "local,id=xchg_dev,path=xchg"
+",security_model=none,mount_tag=xchg")
+ "-kernel" linux
+ "-initrd" initrd
+ "-append" (string-append "console=ttyS0 --load="
+  builder)
+ (append
+  (if make-disk-image?
+  `("-device" "virtio-blk,drive=myhd"
+"-drive" ,(string-append "if=none,file=" output
+ ",format=" disk-image-format
+ ",id=myhd"))
+  '())
+  arch-specific-flags))
 
   ;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already.
   (unless make-disk-image?
@@ -240,10 +236,9 @@ actual /dev name based on DEVICE."
  partition-size)
 partitions)
", "))
-  (unless (zero? (apply system* "parted" "--script"
-device "mklabel" label-type
-(options partitions offset)))
-(error "failed to create partition table"))
+  (apply invoke "parted" "--script"
+ device "mklabel" label-type
+ (options partitions offset))
 
   ;; Set the 'device' field of each partition.
   (reverse
@@ -265,15 +260,14 @@ actual /dev name based on DEVICE."
   "Create an ext-family file system of TYPE on PARTITION.  If LABEL is true,
 use that as the volume name.  

07/07: linux-initrd: Move 'check-device-initrd-modules' elsewhere.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 8ab10c19d72caab7459034a6e72b0117d7c5cec8
Author: Ludovic Courtès 
Date:   Thu Mar 15 23:41:31 2018 +0100

linux-initrd: Move 'check-device-initrd-modules' elsewhere.

This mostly reverts ca23693d280de5c4031058da4d3041d830080484, which
introduced a circular dependency between (gnu system linux-initrd)
and (gnu system mapped-devices).

Reported by Eric Bavier.

* gnu/system/linux-initrd.scm (check-device-initrd-modules): Move to...
* gnu/system/mapped-devices.scm (check-device-initrd-modules): ... here.
* po/guix/POTFILES.in: Adjust accordingly.
---
 gnu/system/linux-initrd.scm   | 46 +---
 gnu/system/mapped-devices.scm | 49 +--
 po/guix/POTFILES.in   |  2 +-
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 4104843..e0cb59c 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -24,7 +24,6 @@
   #:use-module (guix store)
   #:use-module (guix gexp)
   #:use-module (guix utils)
-  #:use-module (guix i18n)
   #:use-module ((guix store)
 #:select (%store-prefix))
   #:use-module ((guix derivations)
@@ -38,22 +37,16 @@
 #:select (%guile-static-stripped))
   #:use-module (gnu system file-systems)
   #:use-module (gnu system mapped-devices)
-  #:autoload   (gnu build linux-modules)
- (device-module-aliases matching-modules known-module-aliases)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 vlist)
-  #:use-module (ice-9 format)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-34)
-  #:use-module (srfi srfi-35)
   #:export (expression->initrd
 %base-initrd-modules
 raw-initrd
 file-system-packages
-base-initrd
-check-device-initrd-modules))
+base-initrd))
 
 
 ;;; Commentary:
@@ -350,41 +343,4 @@ loaded at boot time in the order in which they appear."
   #:volatile-root? volatile-root?
   #:on-error on-error))
 
-(define (check-device-initrd-modules device linux-modules location)
-  "Raise an error if DEVICE needs modules beyond LINUX-MODULES to operate.
-DEVICE must be a \"/dev\" file name."
-  (define aliases
-;; Attempt to load 'modules.alias' from the current kernel, assuming we're
-;; on GuixSD, and assuming that corresponds to the kernel we'll be
-;; installing.  Skip the whole thing if that file cannot be read.
-(catch 'system-error
-  (lambda ()
-(known-module-aliases))
-  (const #f)))
-
-  (when aliases
-(let ((modules (delete-duplicates
-(append-map (cut matching-modules <> aliases)
-(device-module-aliases device)
-  (unless (every (cute member <> linux-modules) modules)
-(raise (condition
-(
- (message (format #f (G_ "you may need these modules \
-in the initrd for ~a:~{ ~a~}")
-  device modules)))
-(
- (hint (format #f (G_ "Try adding them to the
-@code{initrd-modules} field of your @code{operating-system} declaration, along
-these lines:
-
-@example
- (operating-system
-   ;; @dots{}
-   (initrd-modules (append (list~{ ~s~})
-   %base-initrd-modules)))
-@end example\n")
-   modules)))
-(
- (location (source-properties->location location)
-
 ;;; linux-initrd.scm ends here
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index e6ac635..279d521 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -25,13 +25,14 @@
   #:use-module (guix i18n)
   #:use-module ((guix utils)
 #:select (source-properties->location
+  
   ))
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
   #:use-module (gnu system uuid)
-  #:use-module ((gnu system linux-initrd)
-#:select (check-device-initrd-modules))
   #:autoload   (gnu build file-systems) (find-partition-by-luks-uuid)
+  #:autoload   (gnu build linux-modules)
+ (device-module-aliases matching-modules)
   #:autoload   (gnu packages cryptsetup) (cryptsetup-static)
   #:autoload   (gnu packages linux) (mdadm-static)
   #:use-module (srfi srfi-1)
@@ -55,6 +56,8 @@
 device-mapping-service-type
 device-mapping-service
 
+check-device-initrd-modules   ;XXX: needs a better place
+
 luks-device-mapping
 raid-device-mapping))
 
@@ -108,6 +111,48 @@
 
 
 ;;;
+;;; Static checks.
+;;;
+
+(define (check-device-initrd-modules device 

branch master updated (0ab5aa0 -> 8ab10c1)

2018-03-15 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository guix.

  from  0ab5aa0   gnu: dmenu: Update to 4.8.
   new  e1d0f2a   vm: Use 'invoke' instead of 'system*'.
   new  dab03ba   gnu: qtox: Wrap executable and fix misplaced comma 
(unquote).
   new  9c7e17f   gnu: Add ghc-aeson-1.1.2.0.
   new  78dc985   gnu: Add ghc-trifecta-1.6.2.1.
   new  866b190   gnu: Add ghc-cheapskate-0.1.0.5.
   new  d661ed5   gnu: idris: Provide the right versions of dependencies.
   new  8ab10c1   linux-initrd: Move 'check-device-initrd-modules' 
elsewhere.

The 7 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/build/vm.scm  | 105 +++---
 gnu/packages/idris.scm|  64 -
 gnu/packages/messaging.scm|  12 -
 gnu/system/linux-initrd.scm   |  46 +-
 gnu/system/mapped-devices.scm |  49 +++-
 po/guix/POTFILES.in   |   2 +-
 6 files changed, 159 insertions(+), 119 deletions(-)



02/07: gnu: qtox: Wrap executable and fix misplaced comma (unquote).

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit dab03baa0a4d857edf8c5752e5dd8ecaab8862a7
Author: Diego Nicola Barbato 
Date:   Thu Mar 15 02:19:51 2018 +0100

gnu: qtox: Wrap executable and fix misplaced comma (unquote).

* gnu/packages/messaging.scm (qtox)[arguments]: Add phase
"wrap-executable".
[inputs]: Fix misplaced comma (unquote).

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/messaging.scm | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b6323c3..ae489e1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -874,10 +874,18 @@ instant messenger with audio and video chat 
capabilities.")
(("__DATE__") "\"\"")
(("__TIME__") "\"\"")
(("TIMESTAMP") "\"\""))
- #t)
+ #t))
+ ;; Ensure that icons are found at runtime.
+ (add-after 'install 'wrap-executable
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+   (wrap-program (string-append out "/bin/qtox")
+ `("QT_PLUGIN_PATH" prefix
+   ,(list (string-append (assoc-ref inputs "qtsvg")
+ "/lib/qt5/plugins/"))
 (inputs
  `(("ffmpeg" ,ffmpeg)
-   ("filteraudio", filteraudio)
+   ("filteraudio" ,filteraudio)
("glib" ,glib)
("gtk+" ,gtk+-2)
("libsodium" ,libsodium)



04/07: gnu: Add ghc-trifecta-1.6.2.1.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 78dc985bee57eaaa45cb9b38c93c8ac4148e908d
Author: Alex ter Weele 
Date:   Wed Mar 7 18:29:23 2018 -0600

gnu: Add ghc-trifecta-1.6.2.1.

* gnu/packages/idris.scm (ghc-trifecta-1.6.2.1): New variable.

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

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index ae90676..b67fcbc 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -44,6 +44,19 @@
 (base32
  "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))
 
+(define ghc-trifecta-1.6.2.1
+  (package (inherit ghc-trifecta)
+(version "1.6.2.1")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "https://hackage.haskell.org/package/trifecta/;
+ "trifecta-" version ".tar.gz"))
+   (sha256
+(base32
+ "1rgv62dlmm4vkdymx5rw5jg3w8ifpzg1745rvs1m4kzdx16p5cxs"))
+
 (define-public idris
   (package
 (name "idris")



02/16: gnu: perl-lingua-en-inflect-phrase: Update to 0.20.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit cd75b642d983000717e8b73b6402b1f67d1343a6
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 12 04:45:14 2018 +0100

gnu: perl-lingua-en-inflect-phrase: Update to 0.20.

* gnu/packages/language.scm (perl-lingua-en-inflect-phrase): Update to 0.20.
---
 gnu/packages/language.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 237c4bc..36368b59 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -98,7 +98,7 @@ converting a word to singular or plural.")
 (define-public perl-lingua-en-inflect-phrase
   (package
 (name "perl-lingua-en-inflect-phrase")
-(version "0.18")
+(version "0.20")
 (source
  (origin
(method url-fetch)
@@ -106,7 +106,7 @@ converting a word to singular or plural.")
"Lingua-EN-Inflect-Phrase-" version ".tar.gz"))
(sha256
 (base32
- "19prg6pkgnznrc82ymdkdi3l9schg815axjig7adca5yqa7mn2i9"
+ "1a6y1l2pjim2242wcpgz066di4pbzfgsjjdl7vg5a5wzm48qj1am"
 (build-system perl-build-system)
 (native-inputs
  `(("perl-test-nowarnings" ,perl-test-nowarnings)))



07/16: gnu: acpica: Update to 20180313.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 8027f84d8fd43d1165c02758962669f66e2a96f2
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 02:46:54 2018 +0100

gnu: acpica: Update to 20180313.

* gnu/packages/admin.scm (acpica): Update to 20180313.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d6f4a5f..9befa84 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1206,7 +1206,7 @@ module slots, and the list of I/O ports (e.g. serial, 
parallel, USB).")
 (define-public acpica
   (package
 (name "acpica")
-(version "20180209")
+(version "20180313")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -1214,7 +1214,7 @@ module slots, and the list of I/O ports (e.g. serial, 
parallel, USB).")
 version ".tar.gz"))
   (sha256
(base32
-"04hyc5s9iiyiznvspx7q73r6ns98d51wrv8zfvqbqv52gqq8hzdh"
+"16galaadmr37q2pvk2gyxrm8d1xldzk31djfxfq9v1c9yq4i425h"
 (build-system gnu-build-system)
 (native-inputs `(("flex" ,flex)
  ("bison" ,bison)))



03/16: gnu: perl-string-toidentifier-en: Update to 0.12.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 97c794942af813965e1f0113023d1fae234d7c1a
Author: Tobias Geerinckx-Rice 
Date:   Mon Mar 12 04:45:52 2018 +0100

gnu: perl-string-toidentifier-en: Update to 0.12.

* gnu/packages/language.scm (perl-string-toidentifier-en): Update to 0.12.
---
 gnu/packages/language.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 36368b59..cf85c51 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -365,7 +365,7 @@ stemmer at http://snowball.sourceforge.net.;)
 (define-public perl-string-toidentifier-en
   (package
 (name "perl-string-toidentifier-en")
-(version "0.11")
+(version "0.12")
 (source
  (origin
(method url-fetch)
@@ -373,7 +373,7 @@ stemmer at http://snowball.sourceforge.net.;)
"String-ToIdentifier-EN-" version ".tar.gz"))
(sha256
 (base32
- "1bawghkgkkx7j3avnrj5sg3vix1z5564ks6wf9az3jc2knh8s5nh"
+ "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs"
 (build-system perl-build-system)
 (propagated-inputs
  `(("perl-lingua-en-inflect-phrase" ,perl-lingua-en-inflect-phrase)



10/16: gnu: gtksourceview: Update to 3.24.7.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 7b8d3a5e1ee0431c1c9a4e0ac72852502c89d016
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 04:06:44 2018 +0100

gnu: gtksourceview: Update to 3.24.7.

* gnu/packages/gtk.scm (gtksourceview): Update to 3.24.7.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 0e98a7c..f0f49bb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -385,7 +385,7 @@ printing and other features typical of a source code 
editor.")
 (define-public gtksourceview
  (package
(name "gtksourceview")
-   (version "3.24.6")
+   (version "3.24.7")
(source (origin
  (method url-fetch)
  (uri (string-append "mirror://gnome/sources/" name "/"
@@ -393,7 +393,7 @@ printing and other features typical of a source code 
editor.")
  name "-" version ".tar.xz"))
  (sha256
   (base32
-   "1261fwjpwn3qizmvjns9z3k3a264j3ql5anyvmisfwywpkzbv9ks"
+   "1rp8zspwyw3mmdgccsas3pa6v7s0hqjaaglg6n4kcls7ccx0vhm5"
(build-system gnu-build-system)
(arguments
 '(#:phases



12/16: gnu: libisofs: Fix description typos.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 2773c244b1a814b2a80d415744b31f0031fb87ad
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 19:01:10 2018 +0100

gnu: libisofs: Fix description typos.

* gnu/packages/cdrom.scm (libisofs)[description]: Spell ‘file system’ as
‘file system’.
---
 gnu/packages/cdrom.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 6a2f853..e38242f 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -737,11 +737,11 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.")
 (home-page "https://dev.lovelyhq.com/libburnia/libisofs;)
 (synopsis "Library to create ISO 9660 images")
 (description
- "Libisofs creates ISO 9660 (also known as ECMA-119) filesystem images
+ "Libisofs creates ISO 9660 (also known as ECMA-119) file system images
 which can either be written to POSIX file objects or handed over to
 libburn for being written directly to optical media.
 It can read metadata of ISO 9660 filesystems, manipulate them, and use them
-to produce new complete filesystem images or add-on images to be appended
-to the read filesystem image.
+to produce new complete file system images or add-on images to be appended
+to the read file system image.
 Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
 (license gpl2+)))



06/16: gnu: octave: Update to 4.2.2.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 47653b39332977e899e756305d6378c322c0c52c
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 00:17:26 2018 +0100

gnu: octave: Update to 4.2.2.

* gnu/packages/maths.scm (octave): Update to 4.2.2.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b372ad9..64fe13b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1308,7 +1308,7 @@ can solve two kinds of problems:
 (define-public octave
   (package
 (name "octave")
-(version "4.2.1")
+(version "4.2.2")
 (source
  (origin
   (method url-fetch)
@@ -1316,7 +1316,7 @@ can solve two kinds of problems:
   version ".tar.lz"))
   (sha256
(base32
-"09zhhch79jw3ynw39vizx0i2cbd2bjz3sp38pjdzraqrbivpwp92"
+"0pkkz1vazsh7ipffb09q0nc2jgx6q27pkkngygjij6jrpcly5zsp"
 (build-system gnu-build-system)
 (inputs
  `(("lapack" ,lapack)



16/16: gnu: dmenu: Update to 4.8.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 0ab5aa056d4fdfb53de24ad416d978a5220e313d
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 20:13:29 2018 +0100

gnu: dmenu: Update to 4.8.

* gnu/packages/suckless.scm (dmenu): Update to 4.8.
---
 gnu/packages/suckless.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index c343b42..eadc840 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -138,14 +138,14 @@ optimising the environment for the application in use and 
the task performed.")
 (define-public dmenu
   (package
 (name "dmenu")
-(version "4.7")
+(version "4.8")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://dl.suckless.org/tools/dmenu-;
   version ".tar.gz"))
   (sha256
(base32
-"1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7"
+"0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy"
 (build-system gnu-build-system)
 (arguments
  '(#:tests? #f ; no tests



branch master updated (20ecede -> 0ab5aa0)

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a change to branch master
in repository guix.

  from  20ecede   gnu: shadow: Fix CVE-2018-7169.
   new  b9d0200   gnu: bind: Use INVOKE.
   new  cd75b64   gnu: perl-lingua-en-inflect-phrase: Update to 0.20.
   new  97c7949   gnu: perl-string-toidentifier-en: Update to 0.12.
   new  96b4f5a   gnu: autoconf-archive: Update to 2018.03.13.
   new  1a7cc9e   gnu: cifs-utils: Update to 6.8.
   new  47653b3   gnu: octave: Update to 4.2.2.
   new  8027f84   gnu: acpica: Update to 20180313.
   new  5ade82b   gnu: r-scatterplot3d: Update to 0.3-41.
   new  7c9b7c5   gnu: xdg-user-dirs: Update to 0.17.
   new  7b8d3a5   gnu: gtksourceview: Update to 3.24.7.
   new  d87d3f9   gnu: libisofs: Update to 1.4.8.
   new  2773c24   gnu: libisofs: Fix description typos.
   new  896bbb0   gnu: libburn: Update to 1.4.8.
   new  fdae971   gnu: intel-gpu-tools: Update to 1.22.
   new  35edaa2   gnu: you-get: Update to 0.4.1040.
   new  0ab5aa0   gnu: dmenu: Update to 4.8.

The 16 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/admin.scm   | 11 ++-
 gnu/packages/autotools.scm   |  5 +++--
 gnu/packages/cdrom.scm   | 14 +++---
 gnu/packages/cran.scm|  4 ++--
 gnu/packages/dns.scm |  3 ++-
 gnu/packages/freedesktop.scm |  4 ++--
 gnu/packages/gtk.scm |  4 ++--
 gnu/packages/language.scm|  8 
 gnu/packages/maths.scm   |  4 ++--
 gnu/packages/samba.scm   |  4 ++--
 gnu/packages/suckless.scm|  4 ++--
 gnu/packages/video.scm   |  4 ++--
 12 files changed, 36 insertions(+), 33 deletions(-)



04/16: gnu: autoconf-archive: Update to 2018.03.13.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 96b4f5adc2569c708acb48dbdcce0f578f22660d
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 00:01:24 2018 +0100

gnu: autoconf-archive: Update to 2018.03.13.

* gnu/packages/autotools.scm (autoconf-archive): Update to 2018.03.13.
---
 gnu/packages/autotools.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 9394ee0..0f4ecc4 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2016 David Thompson 
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017 Efraim Flashner 
+;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -202,7 +203,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
 (define-public autoconf-archive
   (package
 (name "autoconf-archive")
-(version "2017.09.28")
+(version "2018.03.13")
 (source
  (origin
   (method url-fetch)
@@ -210,7 +211,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
   version ".tar.xz"))
   (sha256
(base32
-"00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw"
+"0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"
 (build-system gnu-build-system)
 (home-page "https://www.gnu.org/software/autoconf-archive/;)
 (synopsis "Collection of freely reusable Autoconf macros")



14/16: gnu: intel-gpu-tools: Update to 1.22.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit fdae9718a1016b02562f38380a903261d1dd39ed
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 19:49:49 2018 +0100

gnu: intel-gpu-tools: Update to 1.22.

* gnu/packages/admin.scm (intel-gpu-tools): Update to 1.22.
[inputs]: Add eudev.
---
 gnu/packages/admin.scm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9befa84..3f13210 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2199,7 +2199,7 @@ buffers.")
 (define-public intel-gpu-tools
   (package
 (name "intel-gpu-tools")
-(version "1.21")
+(version "1.22")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://cgit.freedesktop.org/xorg/app/;
@@ -2207,7 +2207,7 @@ buffers.")
   "intel-gpu-tools-" version ".tar.gz"))
   (sha256
(base32
-"1xfy4cgimyyn5qixlrfkadgnl9qwbk30vw8k80g8vjnrcc4hx986"
+"1jx5w5fr6jp67rcrlp5v79cn8kp9n0wgd5pbfgzamlah5cx6j3yd"
 (build-system gnu-build-system)
 (arguments
  `(#:tests? #f ; many of the tests try to load kernel modules
@@ -2219,7 +2219,8 @@ buffers.")
  (setenv "NOCONFIGURE" "1")
  (invoke "sh" "autogen.sh"))
 (inputs
- `(("util-macros" ,util-macros)
+ `(("eudev" ,eudev)
+   ("util-macros" ,util-macros)
("libdrm" ,libdrm)
("libpciaccess" ,libpciaccess)
("kmod" ,kmod)



13/16: gnu: libburn: Update to 1.4.8.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 896bbb035678e994a602a2ea78b16aa5871e8e59
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 19:11:07 2018 +0100

gnu: libburn: Update to 1.4.8.

* gnu/packages/cdrom.scm (libburn): Update to 1.4.8.
---
 gnu/packages/cdrom.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index e38242f..2e51544 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -698,14 +698,14 @@ laid out on the image.")
 (define-public libburn
   (package
 (name "libburn")
-(version "1.4.6")
+(version "1.4.8")
 (source (origin
  (method url-fetch)
  (uri (string-append "http://files.libburnia-project.org/releases/;
  "libburn-" version ".tar.gz"))
  (sha256
   (base32
-   "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"
+   "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y"
 (build-system gnu-build-system)
 (native-inputs
  `(("pkg-config" ,pkg-config)))



11/16: gnu: libisofs: Update to 1.4.8.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit d87d3f963e604bc5a128adfebc45f208d4cbfb67
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 19:00:27 2018 +0100

gnu: libisofs: Update to 1.4.8.

* gnu/packages/cdrom.scm (libisofs): Update to 1.4.8.
---
 gnu/packages/cdrom.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 672064d..6a2f853 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -720,14 +720,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.")
 (define-public libisofs
   (package
 (name "libisofs")
-(version "1.4.6")
+(version "1.4.8")
 (source (origin
  (method url-fetch)
  (uri (string-append "http://files.libburnia-project.org/releases/;
  "libisofs-" version ".tar.gz"))
  (sha256
   (base32
-   "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"
+   "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"
 (build-system gnu-build-system)
 (inputs
  `(("zlib" ,zlib)



05/16: gnu: cifs-utils: Update to 6.8.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 1a7cc9efcd4fd9485195e511ac6c5974d9ba9682
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 00:08:28 2018 +0100

gnu: cifs-utils: Update to 6.8.

* gnu/packages/samba.scm (cifs-utils): Update to 6.8.
---
 gnu/packages/samba.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index d7ae571..3b1c2d4 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -50,14 +50,14 @@
 (define-public cifs-utils
   (package
 (name "cifs-utils")
-(version "6.7")
+(version "6.8")
 (source
  (origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/linux-cifs/;
name "/" name "-" version ".tar.bz2"))
(sha256 (base32
-"1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj"
+"0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7"
 (build-system gnu-build-system)
 (native-inputs
  `(("autoconf" ,autoconf)



01/16: gnu: bind: Use INVOKE.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit b9d020056d7e5a63d1c0f81c513bfd73c790390e
Author: Tobias Geerinckx-Rice 
Date:   Wed Mar 14 21:35:14 2018 +0100

gnu: bind: Use INVOKE.

* gnu/packages/dns.scm (isc-bind)[arguments]: Substitute INVOKE for
SYSTEM* and end phase with an explicit #t.
---
 gnu/packages/dns.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 08304b0..d093b0d 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -149,7 +149,8 @@ and BOOTP/TFTP for network booting of diskless machines.")
  ;;  (system "bin/tests/system/ifconfig.sh up")))
  (replace 'check
(lambda _
- (zero? (system* "make" "force-test")))
+ (invoke "make" "force-test")
+ #t)
 (synopsis "An implementation of the Domain Name System")
 (description "BIND is an implementation of the @dfn{Domain Name System}
 (DNS) protocols for the Internet.  It is a reference implementation of those



08/16: gnu: r-scatterplot3d: Update to 0.3-41.

2018-03-15 Thread Tobias Geerinckx-Rice
nckx pushed a commit to branch master
in repository guix.

commit 5ade82bbb8c768861d8dc6f12d07b661e6f92f73
Author: Tobias Geerinckx-Rice 
Date:   Thu Mar 15 04:03:27 2018 +0100

gnu: r-scatterplot3d: Update to 0.3-41.

* gnu/packages/cran.scm (r-scatterplot3d): Update to 0.3-41.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b712651..9b045c1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1809,14 +1809,14 @@ statistics, etc.")
 (define-public r-scatterplot3d
   (package
 (name "r-scatterplot3d")
-(version "0.3-40")
+(version "0.3-41")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "scatterplot3d" version))
(sha256
 (base32
- "0ababcj87kx7860mica9y2ydlhskxmgj9n46crx036cila512jc2"
+ "152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"
 (build-system r-build-system)
 (home-page "https://cran.r-project.org/web/packages/scatterplot3d/;)
 (synopsis "3D scatter plot")



01/01: gnu: shadow: Fix CVE-2018-7169.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 20ecede9690cb7f75bc8fee60619a4adf82ba4d5
Author: Leo Famulari 
Date:   Thu Mar 15 11:31:31 2018 -0400

gnu: shadow: Fix CVE-2018-7169.

* gnu/packages/patches/shadow-CVE-2018-7169.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/admin.scm (shadow)[source]: Use it.
---
 gnu/local.mk|   1 +
 gnu/packages/admin.scm  |   1 +
 gnu/packages/patches/shadow-CVE-2018-7169.patch | 191 
 3 files changed, 193 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 165b830..69e4d2b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1082,6 +1082,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/scotch-test-threading.patch \
   %D%/packages/patches/sdl-libx11-1.6.patch\
   %D%/packages/patches/seq24-rename-mutex.patch\
+  %D%/packages/patches/shadow-CVE-2018-7169.patch  \
   %D%/packages/patches/shepherd-close-fds.patch\
   %D%/packages/patches/shepherd-herd-status-sorted.patch   \
   %D%/packages/patches/shishi-fix-libgcrypt-detection.patch\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ad31bc4..d6f4a5f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -360,6 +360,7 @@ hostname.")
   (uri (string-append
 "https://github.com/shadow-maint/shadow/releases/;
 "download/" version "/shadow-" version ".tar.xz"))
+  (patches (search-patches "shadow-CVE-2018-7169.patch"))
   (sha256
(base32
 "0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w"
diff --git a/gnu/packages/patches/shadow-CVE-2018-7169.patch 
b/gnu/packages/patches/shadow-CVE-2018-7169.patch
new file mode 100644
index 000..eeae5b9
--- /dev/null
+++ b/gnu/packages/patches/shadow-CVE-2018-7169.patch
@@ -0,0 +1,191 @@
+Fix CVE-2018-7169:
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7169
+
+Patch copied from upstream source repository:
+
+https://github.com/shadow-maint/shadow/commit/fb28c99b8a66ff2605c5cb96abc0a4d975f92de0
+
+From fb28c99b8a66ff2605c5cb96abc0a4d975f92de0 Mon Sep 17 00:00:00 2001
+From: Aleksa Sarai 
+Date: Thu, 15 Feb 2018 23:49:40 +1100
+Subject: [PATCH] newgidmap: enforce setgroups=deny if self-mapping a group
+
+This is necessary to match the kernel-side policy of "self-mapping in a
+user namespace is fine, but you cannot drop groups" -- a policy that was
+created in order to stop user namespaces from allowing trivial privilege
+escalation by dropping supplementary groups that were "blacklisted" from
+certain paths.
+
+This is the simplest fix for the underlying issue, and effectively makes
+it so that unless a user has a valid mapping set in /etc/subgid (which
+only administrators can modify) -- and they are currently trying to use
+that mapping -- then /proc/$pid/setgroups will be set to deny. This
+workaround is only partial, because ideally it should be possible to set
+an "allow_setgroups" or "deny_setgroups" flag in /etc/subgid to allow
+administrators to further restrict newgidmap(1).
+
+We also don't write anything in the "allow" case because "allow" is the
+default, and users may have already written "deny" even if they
+technically are allowed to use setgroups. And we don't write anything if
+the setgroups policy is already "deny".
+
+Ref: https://bugs.launchpad.net/ubuntu/+source/shadow/+bug/1729357
+Fixes: CVE-2018-7169
+Reported-by: Craig Furman 
+Signed-off-by: Aleksa Sarai 
+---
+ src/newgidmap.c | 89 +++--
+ 1 file changed, 80 insertions(+), 9 deletions(-)
+
+diff --git a/src/newgidmap.c b/src/newgidmap.c
+index b1e33513..59a2e75c 100644
+--- a/src/newgidmap.c
 b/src/newgidmap.c
+@@ -46,32 +46,37 @@
+  */
+ const char *Prog;
+ 
+-static bool verify_range(struct passwd *pw, struct map_range *range)
++
++static bool verify_range(struct passwd *pw, struct map_range *range, bool 
*allow_setgroups)
+ {
+   /* An empty range is invalid */
+   if (range->count == 0)
+   return false;
+ 
+-  /* Test /etc/subgid */
+-  if (have_sub_gids(pw->pw_name, range->lower, range->count))
++  /* Test /etc/subgid. If the mapping is valid then we allow setgroups. */
++  if (have_sub_gids(pw->pw_name, range->lower, range->count)) {
++  *allow_setgroups = true;
+   return true;
++  }
+ 
+-  /* Allow a process to map its own gid */
+-  if ((range->count == 1) && (pw->pw_gid == range->lower))
++  /* Allow a process to map its own gid. */
++  if ((range->count == 1) && (pw->pw_gid == range->lower)) {
++  /* noop -- if setgroups is enabled 

branch master updated (71f9ca5 -> 20ecede)

2018-03-15 Thread Leo Famulari
lfam pushed a change to branch master
in repository guix.

  from  71f9ca5   gnu: certbot: Update to 0.22.0.
   new  20ecede   gnu: shadow: Fix CVE-2018-7169.

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/local.mk|   1 +
 gnu/packages/admin.scm  |   1 +
 gnu/packages/patches/shadow-CVE-2018-7169.patch | 191 
 3 files changed, 193 insertions(+)
 create mode 100644 gnu/packages/patches/shadow-CVE-2018-7169.patch



[shepherd] 03/04: Simplify 'make-shepherd-output-port'.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository shepherd.

commit 634f69673409e90bb879de0495eddbba8d591bab
Author: Ludovic Courtès 
Date:   Tue Mar 6 21:38:59 2018 +0100

Simplify 'make-shepherd-output-port'.

* modules/shepherd/comm.scm (%not-newline): New variable.
(make-shepherd-output-port): Rewrite second method to simplify and make
a single 'display' call per line.
---
 modules/shepherd/comm.scm | 36 
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/modules/shepherd/comm.scm b/modules/shepherd/comm.scm
index 596a258..e686bfa 100644
--- a/modules/shepherd/comm.scm
+++ b/modules/shepherd/comm.scm
@@ -216,6 +216,9 @@ on service '~a':")
   ;; 'strftime' format strings for entries in the log file.
   (make-parameter default-logfile-date-format))
 
+(define %not-newline
+  (char-set-complement (char-set #\newline)))
+
 ;; We provide our own output mechanism, because we have certain
 ;; special needs; most importantly, we want to send output to herd
 ;; sometimes.
@@ -242,26 +245,19 @@ on service '~a':")
 ;; completed line.
 (if (not (string-index str #\newline))
 (set! buffer (cons str buffer))
-(let* ((log (lambda (x)
-  (display x (log-output-port
-   (init-line (lambda ()
-(log (strftime (%current-logfile-date-format)
-   (localtime (current-time)))
-  (init-line)
-  (for-each log (reverse buffer))
-  (let* ((lines (string-split str #\newline))
- (last-line (car (take-right lines 1)))
- (is-first #t))
-(for-each (lambda (line)
-(if is-first
-(set! is-first #f)
-(init-line))
-(log line)
-(log #\newline))
-  (drop-right lines 1))
-(set! buffer (if (string-null? last-line)
- '()
- (list last-line
+(let* ((str   (string-concatenate-reverse (cons str buffer)))
+   (lines (string-tokenize str %not-newline)))
+  (define prefix
+(strftime (%current-logfile-date-format)
+  (localtime (current-time
+
+  ;; Make exactly one 'display' call per line to make sure we
+  ;; don't create several entries for each line.
+  (for-each (lambda (line)
+  (display (string-append prefix line "\n")
+   (log-output-port)))
+lines)
+  (set! buffer '())
 
 ;; Flush output.
 (lambda ()



[shepherd] 02/04: Turn 'log-output-port' into a parameter.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository shepherd.

commit f7925b2227debde91ece17cc91981e4491936b72
Author: Ludovic Courtès 
Date:   Mon Mar 5 22:13:40 2018 +0100

Turn 'log-output-port' into a parameter.

* modules/shepherd/comm.scm (log-output-port): Turn into a parameter and
publish it.
(start-logging, stop-logging): Adjust accordingly and mark as deprecated.
(make-shepherd-output-port): Adjust accordingly.
* modules/shepherd/support.scm (default-logfile): Remove.
(user-default-log-file): New procedure.
(default-logfile-date-format): Remove 'if'.
* modules/shepherd.scm (main): Have LOGFILE default to #f.  Parameterize
'log-output-port' and 'current-output-port'.
---
 modules/shepherd.scm | 209 +++
 modules/shepherd/comm.scm|  19 ++--
 modules/shepherd/support.scm |  19 ++--
 3 files changed, 129 insertions(+), 118 deletions(-)

diff --git a/modules/shepherd.scm b/modules/shepherd.scm
index c869464..39fbe14 100644
--- a/modules/shepherd.scm
+++ b/modules/shepherd.scm
@@ -21,6 +21,7 @@
 
 (define-module (shepherd)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 format)
   #:use-module (ice-9 rdelim)   ;; Line-based I/O.
   #:autoload   (ice-9 readline) (activate-readline) ;for interactive use
   #:use-module (oop goops)  ;; Defining classes and methods.
@@ -77,7 +78,7 @@
(socket-file default-socket-file)
 (pid-file#f)
 (secure  #t)
-(logfile default-logfile))
+(logfile #f))
 ;; Process command line arguments.
 (process-args (program-name) args
  ""
@@ -161,104 +162,116 @@
 ;; We do this early so that we can abort early if necessary.
 (and socket-file
  (verify-dir (dirname socket-file) #:secure? secure))
-;; Enable logging as first action.
-(start-logging logfile)
-
-(when (string=? logfile "/dev/kmsg")
-  ;; By default we'd write both to /dev/kmsg and to stdout.  Redirect
-  ;; stdout to the bitbucket so we don't log twice.
-  (set-current-output-port (%make-void-port "w")))
-
-;; Send output to log and clients.
-(set-current-output-port (make-shepherd-output-port))
-
-;; Start the 'root' service.
-(start root-service)
-
-;; This _must_ succeed.  (We could also put the `catch' around
-;; `main', but it is often useful to get the backtrace, and
-;; `caught-error' does not do this yet.)
-(catch #t
-  (lambda ()
-(load-in-user-module (or config-file (default-config-file
-  (lambda (key . args)
-   (caught-error key args)
-   (quit 1)))
-;; Start what was started last time.
-(and persistency
-(catch 'system-error
-  (lambda ()
-(start-in-order (read (open-input-file
-   persistency-state-file
-  (lambda (key . args)
-(apply format #f (gettext (cadr args)) (caddr args))
-(quit 1
-
-(when (provided? 'threads)
-  ;; XXX: This terrible hack allows us to make sure that signal handlers
-  ;; get a chance to run in a timely fashion.  Without it, after an EINTR,
-  ;; we could restart the accept(2) call below before the corresponding
-  ;; async has been queued.  See the thread at
-  ;; 
.
-  (sigaction SIGALRM (lambda _ (alarm 1)))
-  (alarm 1))
-
-;; Stop everything when we get SIGINT.  When running as PID 1, that means
-;; rebooting; this is what happens when pressing ctrl-alt-del, see
-;; ctrlaltdel(8).
-(sigaction SIGINT
-  (lambda _
-(stop root-service)))
 
-;; Stop everything when we get SIGTERM.
-(sigaction SIGTERM
-  (lambda _
-(stop root-service)))
-
-;; Stop everything when we get SIGHUP.
-(sigaction SIGHUP
-  (lambda _
-(stop root-service)))
-
-;; Ignore SIGPIPE so that we don't die if a client closes the connection
-;; prematurely.
-(sigaction SIGPIPE SIG_IGN)
-
-(if (not socket-file)
-   ;; Get commands from the standard input port.
-(process-textual-commands (current-input-port))
-;; Process the data arriving at a socket.
-(let ((sock   (open-server-socket socket-file))
-
-  ;; With Guile <= 2.0.9, we can get a system-error exception for
-  ;; EINTR, which happens anytime we receive a signal, such as
-  ;; SIGCHLD.  Thus, wrap the 'accept' call.
-  (accept (EINTR-safe accept)))
-
-  ;; Possibly write out our PID, which means we're ready to accept
-  ;; connections.  XXX: What if we daemonized already?
-  (match pid-file
-((? string? file)
- (with-atomic-file-output pid-file
-   (cute display (getpid) <>)))
-(#t (display (getpid)))
-(_  #t))
-
- 

[shepherd] 04/04: Use syslog for logging when running as root.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository shepherd.

commit 968678c04b488a944e5951f710b80af4b6a80607
Author: Ludovic Courtès 
Date:   Tue Mar 6 21:43:07 2018 +0100

Use syslog for logging when running as root.

* modules/shepherd/comm.scm (call-with-syslog-port, syslog-output-port):
New procedures.
* modules/shepherd.scm (main): Set 'log-output-port'
to (syslog-output-port) when running as root.
* doc/shepherd.texi (Invoking shepherd): Adjust accordingly.
---
 doc/shepherd.texi | 18 ++---
 modules/shepherd.scm  |  2 +-
 modules/shepherd/comm.scm | 66 +++
 3 files changed, 81 insertions(+), 5 deletions(-)

diff --git a/doc/shepherd.texi b/doc/shepherd.texi
index 01d8050..7946f8b 100644
--- a/doc/shepherd.texi
+++ b/doc/shepherd.texi
@@ -406,13 +406,23 @@ permissions are not as expected.
 @cindex log file
 Log output into @var{file}.
 
-The default behavior is to write to @file{/dev/kmsg} when running as
-superuser.  This special device is GNU/Linux-specific; when it does not
-exist, write to @file{/var/log/shepherd.log} instead.
-
 For unprivileged users, the default log file is
 @file{$XDG_CONFIG_HOME/shepherd/shepherd.log}.
 
+@cindex syslog
+When running as root, the default behavior is to connect to
+@file{/dev/log}, the @dfn{syslog} socket (@pxref{Overview of Syslog,,,
+libc, The GNU C Library Reference Manual}).  A syslog daemon,
+@command{syslogd}, is expected to read messages from there
+(@pxref{syslogd invocation, syslogd,, libc, GNU Inetutils}).
+
+When @file{/dev/log} is unavailable, for instance because
+@command{syslogd} is not running, as is the case during system startup
+and shutdown, @command{shepherd} falls back to the Linux kernel
+@dfn{ring buffer}, @file{/dev/kmsg}.  If @file{/dev/kmsg} is missing, as
+is the case on other operating systems, it falls back to
+@file{/dev/console}.
+
 @item --pid[=@var{file}]
 When @command{shepherd} is ready to accept connections, write its PID to 
@var{file} or
 to the standard output if @var{file} is omitted.
diff --git a/modules/shepherd.scm b/modules/shepherd.scm
index 39fbe14..fede338 100644
--- a/modules/shepherd.scm
+++ b/modules/shepherd.scm
@@ -168,7 +168,7 @@
 (cond (logfile
(open-file logfile "al"))
   ((zero? (getuid))
-   (open-file "/dev/kmsg" "wl"))
+   (syslog-output-port))
   (else
(open-file (user-default-log-file) "al"
(%current-logfile-date-format
diff --git a/modules/shepherd/comm.scm b/modules/shepherd/comm.scm
index e686bfa..cbd8686 100644
--- a/modules/shepherd/comm.scm
+++ b/modules/shepherd/comm.scm
@@ -50,6 +50,7 @@
 report-command-error
 
 log-output-port
+syslog-output-port
 start-logging
 stop-logging
 make-shepherd-output-port
@@ -216,6 +217,71 @@ on service '~a':")
   ;; 'strftime' format strings for entries in the log file.
   (make-parameter default-logfile-date-format))
 
+(define call-with-syslog-port
+  (let ((port #f));connection to /dev/log
+(lambda (proc)
+  "Call PROC with an open output port.  The output port corresponds to
+/dev/log (aka. syslog) or, if that is unavailable, a degraded logging
+mechanism."
+  (define (call/syslog)
+(catch 'system-error
+  (lambda ()
+(proc port))
+  (lambda args
+(if (memv (system-error-errno args)
+  (list ENOTCONN ECONNREFUSED EPIPE))
+(begin
+  (set! port #f)
+  (call-with-syslog-port proc))
+(apply throw args)
+
+  (or (and port (not (port-closed? port)) (call/syslog))
+  (let ((sock (socket AF_UNIX SOCK_DGRAM 0)))
+(catch 'system-error
+  (lambda ()
+(connect sock AF_UNIX "/dev/log")
+(setvbuf sock _IOLBF)
+(set! port sock)
+(call/syslog))
+  (lambda args
+(close-port sock)
+(if (memv (system-error-errno args)
+  (list ENOENT ECONNREFUSED))
+(catch 'system-error
+  (lambda ()
+(call-with-output-file "/dev/kmsg"
+  (lambda (port)
+(setvbuf port _IOFBF)
+(proc port
+  (lambda args
+(if (memv (system-error-errno args)
+  (list ENOENT EACCES EPERM))
+(call-with-output-file "/dev/console"
+  (lambda (port)
+(setvbuf port _IONBF)
+   

[shepherd] 01/04: nls: Update fr translation.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository shepherd.

commit 84850fa5154b1f98930115b02e84642d8249ddc7
Author: Ludovic Courtès 
Date:   Mon Mar 12 23:57:39 2018 +0100

nls: Update fr translation.
---
 po/fr.po | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 68e9159..bf3315d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: shepherd 0.3.3-pre1\n"
 "Report-Msgid-Bugs-To: guix-de...@gnu.org\n"
 "POT-Creation-Date: 2018-03-01 14:10+0100\n"
-"PO-Revision-Date: 2018-03-05 10:45+0100\n"
+"PO-Revision-Date: 2018-03-05 15:41+0100\n"
 "Last-Translator: Julien Lepiller \n"
 "Language-Team: French \n"
 "Language: fr\n"
@@ -28,35 +28,35 @@ msgstr ""
 #: modules/shepherd/comm.scm:175
 #, scheme-format
 msgid "service '~a' could not be found"
-msgstr "service « ~a » introuvable"
+msgstr "service « ~a » introuvable"
 
 #: modules/shepherd/comm.scm:178
 #, scheme-format
 msgid "service '~a' does not have an action '~a'"
-msgstr "le service « ~a » n’a pas d’action « ~a »"
+msgstr "le service « ~a » n’a pas d’action « ~a »"
 
 #: modules/shepherd/comm.scm:182
 #, scheme-format
 msgid "exception caught while executing '~a' on service '~a':"
-msgstr "exception rattrapée pendant l’exécution de « ~a » sur le service « ~a 
» :"
+msgstr "exception rattrapée pendant l’exécution de « ~a » sur le service « ~a 
» :"
 
 #: modules/shepherd/comm.scm:187
 #, scheme-format
 msgid "something went wrong: ~s"
-msgstr "quelque chose s’est mal passé : ~s"
+msgstr "quelque chose s’est mal passé : ~s"
 
 #: modules/shepherd/scripts/herd.scm:67
 msgid "Started:\n"
-msgstr "Démarrés :\n"
+msgstr "Démarrés :\n"
 
 #: modules/shepherd/scripts/herd.scm:69
 msgid "Stopped:\n"
-msgstr "Arrêtés :\n"
+msgstr "Arrêtés :\n"
 
 #: modules/shepherd/scripts/herd.scm:82
 #, scheme-format
 msgid "Status of ~a:~%"
-msgstr "Statut de ~a :~%"
+msgstr "Statut de ~a :~%"
 
 #: modules/shepherd/scripts/herd.scm:85
 #, scheme-format
@@ -147,7 +147,7 @@ msgstr "envoie des commandes au FICHIER"
 #: modules/shepherd/scripts/herd.scm:204
 #, scheme-format
 msgid "Usage: herd ACTION [SERVICE [OPTIONS...]]~%"
-msgstr "Utilisation : herd ACTION [SERVICE [OPTION…]]~%"
+msgstr "Utilisation : herd ACTION [SERVICE [OPTION…]]~%"
 
 #: modules/shepherd/support.scm:209
 msgid ""
@@ -156,9 +156,9 @@ msgid ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law."
 msgstr ""
-"Copyright (C) 2018 les auteurs de Shepherd\n"
-"Licence GPLv3+: GNU GPL version 3 ou ultérieure 
\n"
-"Ce logiciel est libre : vous êtes libre de le changer et de le 
redistribuer.\n"
+"Copyright (C) 2018 les auteurs du Shepherd\n"
+"Licence GPLv3+ : GNU GPL version 3 ou ultérieure 
\n"
+"Ce logiciel est libre : vous êtes libre de le changer et de le 
redistribuer.\n"
 "AUCUNE GARANTIE n’est donnée dans la limite autorisée par la loi."
 
 #: modules/shepherd/service.scm:336
@@ -190,20 +190,20 @@ msgstr ""
 "Les arguments requis ou facultatifs pour les options longues sont aussi 
requis\n"
 "ou facultatifs pour les options courtes correspondantes.\n"
 "\n"
-"Rapportez les bugs à : ~a.\n"
-"Rapportez les problèmes de traduction à : tra...@traduc.org.\n"
-"Page d’accueil de ~a : <~a>\n"
-"Aide générale pour les logiciels GNU : ~%"
+"Rapportez les bugs à : ~a.\n"
+"Rapportez les problèmes de traduction à : tra...@traduc.org.\n"
+"Page d’accueil de ~a : <~a>\n"
+"Aide générale pour les logiciels GNU : ~%"
 
 #: modules/shepherd/args.scm:246
 #, scheme-format
 msgid "Option `--~a' is ambigous."
-msgstr "L’option « --~a » est ambiguë."
+msgstr "L’option « --~a » est ambiguë."
 
 #: modules/shepherd/args.scm:247
 #, scheme-format
 msgid "Unknown option: `--~a'."
-msgstr "Option inconnue : « --~a »."
+msgstr "Option inconnue : « --~a »."
 
 #: modules/shepherd.scm:68
 msgid "use FILE to load and store state"



[shepherd] branch master updated (6e57aa2 -> 968678c)

2018-03-15 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository shepherd.

  from  6e57aa2   Log to /dev/kmsg when running as root on GNU/Linux.
   new  84850fa   nls: Update fr translation.
   new  f7925b2   Turn 'log-output-port' into a parameter.
   new  634f696   Simplify 'make-shepherd-output-port'.
   new  968678c   Use syslog for logging when running as root.

The 4 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/shepherd.texi|  18 +++-
 modules/shepherd.scm | 209 +++
 modules/shepherd/comm.scm| 119 ++--
 modules/shepherd/support.scm |  19 ++--
 po/fr.po |  36 
 5 files changed, 242 insertions(+), 159 deletions(-)



branch core-updates updated (4403030 -> 5c798ca)

2018-03-15 Thread Marius Bakke
mbakke pushed a change to branch core-updates
in repository guix.

  from  4403030   gnu: acl: Fix build failure.
   new  5c798ca   gnu: python: Update to 3.6.4.

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/patches/python-3-search-paths.patch | 13 +
 gnu/packages/python.scm  | 10 +++---
 2 files changed, 8 insertions(+), 15 deletions(-)



01/01: gnu: python: Update to 3.6.4.

2018-03-15 Thread Marius Bakke
mbakke pushed a commit to branch core-updates
in repository guix.

commit 5c798ca71dcd009896654da7d6a1f8942c6f3c50
Author: Marius Bakke 
Date:   Thu Mar 15 15:26:20 2018 +0100

gnu: python: Update to 3.6.4.

* gnu/packages/patches/python-3-search-paths.patch: Adjust context.
* gnu/packages/python.scm (python): Update to 3.6.4.
[source]: Re-enable test_socket.py.
---
 gnu/packages/patches/python-3-search-paths.patch | 13 +
 gnu/packages/python.scm  | 10 +++---
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/patches/python-3-search-paths.patch 
b/gnu/packages/patches/python-3-search-paths.patch
index 7feddb8..73e3f4c 100644
--- a/gnu/packages/patches/python-3-search-paths.patch
+++ b/gnu/packages/patches/python-3-search-paths.patch
@@ -3,17 +3,14 @@ looking for headers and libraries.
 
 --- setup.py   2015-10-07 23:32:58.891329173 +0200
 +++ setup.py   2015-10-07 23:46:29.653349924 +0200
-@@ -507,11 +507,8 @@ class PyBuildExt(build_ext):
+@@ -575,8 +575,8 @@
  # if a file is found in one of those directories, it can
  # be assumed that no additional -I,-L directives are needed.
  if not cross_compiling:
--lib_dirs = self.compiler.library_dirs + [
--'/lib64', '/usr/lib64',
--'/lib', '/usr/lib',
--]
--inc_dirs = self.compiler.include_dirs + ['/usr/include']
+-lib_dirs = self.compiler.library_dirs + system_lib_dirs
+-inc_dirs = self.compiler.include_dirs + system_include_dirs
 +lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep)
 +inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
  else:
- lib_dirs = self.compiler.library_dirs[:]
- inc_dirs = self.compiler.include_dirs[:]
+ # Add the sysroot paths. 'sysroot' is a compiler option used to
+ # set the logical path of the standard system headers and
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index dbb5ccb..8263993 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -338,7 +338,7 @@ data types.")
 
 (define-public python-3.6
   (package (inherit python-2)
-(version "3.6.3")
+(version "3.6.4")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://www.python.org/ftp/python/;
@@ -351,17 +351,13 @@ data types.")
   (patch-flags '("-p0"))
   (sha256
(base32
-"1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"))
+"1fna7g8jxzl4kd2pqmmqhva5724c5m920x3fsrpsgskaylmr76qm"))
   (snippet
'(begin
   (for-each delete-file
 '("Lib/ctypes/test/test_structures.py" ; fails on 
aarch64
   "Lib/ctypes/test/test_win32.py" ; fails on 
aarch64
-  "Lib/test/test_fcntl.py" ; fails on aarch64
-  ;; This test fails on kernels older than 4.5.
-  ;; It is skipped on these kernels in later
-  ;; versions of Python.
-  "Lib/test/test_socket.py"))
+  "Lib/test/test_fcntl.py")) ; fails on aarch64
   #t
 (arguments
  (substitute-keyword-arguments (package-arguments python-2)



01/01: gnu: certbot: Update to 0.22.0.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 71f9ca53e58de6ecd4d1dcbc7647990ac4685665
Author: Leo Famulari 
Date:   Thu Mar 15 11:45:04 2018 -0400

gnu: certbot: Update to 0.22.0.

* gnu/packages/tls.scm (certbot, python-acme): Update to 0.22.0.
---
 gnu/packages/tls.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 45f5255..bd86b2e 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -512,13 +512,13 @@ netcat implementation that supports TLS.")
   (package
 (name "python-acme")
 ;; Remember to update the hash of certbot when updating python-acme.
-(version "0.21.1")
+(version "0.22.0")
 (source (origin
   (method url-fetch)
   (uri (pypi-uri "acme" version))
   (sha256
(base32
-"02x6f37ddldaxrxzh2wjw8wmzqchxb7gl5i4i4daysas9yzqlvi9"
+"1s2zamyb99zdyga3c75xxgnj0z2hixw8wv24v1l4p49fncnxab2a"
 (build-system python-build-system)
 (arguments
  `(#:phases
@@ -567,7 +567,7 @@ netcat implementation that supports TLS.")
   (uri (pypi-uri name version))
   (sha256
(base32
-"1sn4wqkp6kjj9p8maf4jnjwwvb083hgakm9i10rk9273nnqfkj76"
+"1cyb3lhxrw7ghyhrl2wc95vqhdaxz6n4pai66c573gcly7c7sc7f"
 (build-system python-build-system)
 (arguments
  `(,@(substitute-keyword-arguments (package-arguments python-acme)



branch master updated (8d4f34d -> 71f9ca5)

2018-03-15 Thread Leo Famulari
lfam pushed a change to branch master
in repository guix.

  from  8d4f34d   gnu: Add python-feather-format.
   new  71f9ca5   gnu: certbot: Update to 0.22.0.

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/tls.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



branch rhel6 created (now 4403030)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch rhel6
in repository guix.

at  4403030   gnu: acl: Fix build failure.

No new revisions were added by this update.



branch core-updates updated (058ad04 -> 4403030)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch core-updates
in repository guix.

  from  058ad04   gnu: Remove boost-1.66.
   new  4403030   gnu: acl: Fix build failure.

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/acl.scm | 13 +
 1 file changed, 13 insertions(+)



01/01: gnu: acl: Fix build failure.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit 4403030b7de2485dbeb6ee54c56551a2bd2b5244
Author: Ricardo Wurmus 
Date:   Thu Mar 15 16:41:02 2018 +0100

gnu: acl: Fix build failure.

* gnu/packages/acl.scm (acl)[arguments]: Add phase
"ensure-no-mtimes-pre-1980".
---
 gnu/packages/acl.scm | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index 7880e53..ee17c94 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 Mark H Weaver 
 ;;; Copyright © 2014 Andreas Enge 
 ;;; Copyright © 2017 Efraim Flashner 
+;;; Copyright © 2018 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,8 +48,20 @@
 (build-system gnu-build-system)
 (arguments
  `(#:test-target "tests"
+   #:modules ((ice-9 ftw)
+  ,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
+ ;; XXX After repacking the sources the timestamps are reset to the
+ ;; epoch, which leads to a failure in gzipping the CHANGES file.
+ (add-after 'unpack 'ensure-no-mtimes-pre-1980
+   (lambda _
+ (let ((early-1980 315619200)) ; 1980-01-02 UTC
+   (ftw "." (lambda (file stat flag)
+  (unless (<= early-1980 (stat:mtime stat))
+(utime file early-1980 early-1980))
+  #t))
+   #t)))
  (add-after 'build 'patch-exec-bin-sh
(lambda _
  (substitute* "test/run"



04/16: gnu: Add r-mapproj.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit ebc4bd5b54260082a2897669668144467b856198
Author: Leo Famulari 
Date:   Sat Feb 17 16:24:09 2018 -0500

gnu: Add r-mapproj.

* gnu/packages/geo.scm (r-mapproj): New variable.
---
 gnu/packages/geo.scm | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 3af196b..e58342d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -511,3 +511,25 @@ development.")
 Projection code and larger maps are in separate packages ('mapproj' and
 'mapdata').")
(license license:gpl2)))
+
+(define-public r-mapproj
+  (package
+   (name "r-mapproj")
+   (version "1.2-5")
+   (source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "mapproj" version))
+   (sha256
+(base32
+ "0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"
+   (build-system r-build-system)
+   (propagated-inputs `(("r-maps" ,r-maps)))
+   (home-page "https://cran.r-project.org/web/packages/mapproj;)
+   (synopsis "Map projection in R")
+   (description "This package converts latitude/longitude into projected
+coordinates.")
+   (license (list license:gpl2 ; The R interface
+  (license:non-copyleft ; The C code
+
"https://www.gnu.org/licenses/license-list.en.html#lucent102;
+"Lucent Public License Version 1.02")



12/16: gnu: Add r-feather.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 9f1c0e03ecfe6453f57ba9d9344dcf97c257799b
Author: Leo Famulari 
Date:   Sat Feb 17 17:29:53 2018 -0500

gnu: Add r-feather.

* gnu/packages/serialization.scm (r-feather): New variable.
---
 gnu/packages/serialization.scm | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index fd61462..0c07a63 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -33,17 +33,20 @@
   #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
+  #:use-module (guix build-system r)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages cran)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages perl)
-  #:use-module (guix build-system python))
+  #:use-module (gnu packages statistics))
 
 (define-public cereal
   (package
@@ -437,3 +440,25 @@ to generate and parse.  The two primary functions are 
@code{cbor.loads} and
 C#, C, Go, Java, JavaScript, PHP, and Python.  It was originally created for
 game development and other performance-critical applications.")
 (license license:asl2.0)))
+
+(define-public r-feather
+  (package
+(name "r-feather")
+(version "0.3.1")
+(source
+  (origin
+(method url-fetch)
+(uri (cran-uri "feather" version))
+(sha256
+ (base32
+  "1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi"
+(build-system r-build-system)
+(propagated-inputs
+ `(("r-hms" ,r-hms)
+   ("r-rcpp" ,r-rcpp)
+   ("r-tibble" ,r-tibble)))
+(home-page "https://github.com/wesm/feather;)
+(synopsis "R Bindings to the Feather API")
+(description "Read and write feather files, a lightweight binary columnar
+daa store designed for maximum speed.")
+(license license:asl2.0)))



10/16: gnu: Add r-jpeg.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit da4dde610984c3ddb1baf2a92fe6e838cb0720c6
Author: Leo Famulari 
Date:   Sat Feb 17 17:10:29 2018 -0500

gnu: Add r-jpeg.

* gnu/packages/image.scm (r-jpeg): New variable.
---
 gnu/packages/image.scm | 21 +
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index b576c50..caafb2e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017 Hartmut Goebel 
 ;;; Copyright © 2017 Julien Lepiller 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1293,3 +1294,23 @@ Features:
 @item Upload to Imgur.
 @end itemize\n")
 (license license:gpl3+)))
+
+(define-public r-jpeg
+  (package
+   (name "r-jpeg")
+   (version "0.1-8")
+   (source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "jpeg" version))
+   (sha256
+(base32
+ "05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"
+   (build-system r-build-system)
+   (inputs `(("libjpeg" ,libjpeg)))
+   (home-page "http://www.rforge.net/jpeg/;)
+   (synopsis "Read and write JPEG images with R")
+   (description "This package provides a way to read, write and display bitmap
+images stored in the JPEG format with R.  It can read and write both files and
+in-memory raw vectors.")
+   (license license:gpl2+)))



05/16: gnu: Add Rgooglemaps.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 9ddf42099b398d107467bc42bb495a20f502925f
Author: Leo Famulari 
Date:   Sat Feb 17 16:31:41 2018 -0500

gnu: Add Rgooglemaps.

* gnu/packages/geo.scm (r-rgooglemaps): New variable.
---
 gnu/packages/geo.scm | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index e58342d..b6b185e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -533,3 +533,25 @@ coordinates.")
   (license:non-copyleft ; The C code
 
"https://www.gnu.org/licenses/license-list.en.html#lucent102;
 "Lucent Public License Version 1.02")
+
+(define-public r-rgooglemaps
+  (package
+   (name "r-rgooglemaps")
+   (version "1.4.1")
+   (source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "RgoogleMaps" version))
+   (sha256
+(base32
+ "0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"
+   (properties `((upstream-name . "RgoogleMaps")))
+   (build-system r-build-system)
+   (propagated-inputs `(("r-png" ,r-png)))
+   (home-page "https://cran.r-project.org/web/packages/RgoogleMaps;)
+   (synopsis "Use Google Maps in R")
+   (description "This package serves two purposes: (i) Provide a comfortable R
+interface to query the Google server for static maps, and (ii) Use the map as a
+background image to overlay plots within R.  This requires proper coordinate
+scaling.")
+   (license license:gpl2+)))



09/16: gnu: Add Diversitree.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 32cbbac11a8d8d656ed795865d88a6eeb3877dbe
Author: Leo Famulari 
Date:   Sat Feb 17 17:06:26 2018 -0500

gnu: Add Diversitree.

* gnu/packages/bioinformatics.scm (r-diversitree): New variable.
---
 gnu/packages/bioinformatics.scm | 32 
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 567dd2c..3d754bf 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2016, 2018 Raoul Bonnal 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Arun Isaac 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12855,3 +12856,34 @@ data of bisulfite experiments; it produces reports on 
aggregate methylation
 and coverage and can be used to produce information on differential
 methylation and segmentation.")
 (license license:gpl3+)))
+
+(define-public r-diversitree
+  (package
+(name "r-diversitree")
+(version "0.9-10")
+(source
+  (origin
+(method url-fetch)
+(uri (cran-uri "diversitree" version))
+(sha256
+ (base32
+  "0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7"
+(build-system r-build-system)
+(native-inputs
+ `(("gfortran" ,gfortran)))
+(inputs `(("fftw" ,fftw) ("gsl" ,gsl)))
+(propagated-inputs
+ `(("r-ape" ,r-ape)
+   ("r-desolve" ,r-desolve)
+   ("r-rcpp" ,r-rcpp)
+   ("r-suplex" ,r-subplex)))
+(home-page "https://www.zoology.ubc.ca/prog/diversitree;)
+(synopsis "Comparative 'phylogenetic' analyses of diversification")
+(description "This package contains a number of comparative 
\"phylogenetic\"
+methods, mostly focusing on analysing diversification and character evolution.
+Contains implementations of \"BiSSE\" (Binary State Speciation and Extinction)
+and its unresolved tree extensions, \"MuSSE\" (Multiple State Speciation and
+Extinction), \"QuaSSE\", \"GeoSSE\", and \"BiSSE-ness\" Other included methods
+include Markov models of discrete and continuous trait evolution and constant
+rate speciation and extinction.")
+(license license:gpl2+)))



07/16: gnu: Add r-subplex.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 41835f947e84b99d2b8aa5e32c68db2016c7437a
Author: Leo Famulari 
Date:   Sat Feb 17 16:47:57 2018 -0500

gnu: Add r-subplex.

gnu/packages/maths.scm (r-subplex): New variable.
---
 gnu/packages/maths.scm | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f9e5d2c..5382260 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Dave Love 
 ;;; Copyright © 2018 Jan Nieuwenhuizen 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3754,3 +3755,25 @@ specifications.  Also, state spaces can be manipulated, 
visualised and
 analysed.")
 (home-page "http://mcrl2.org;)
 (license license:boost1.0)))
+
+(define-public r-subplex
+  (package
+(name "r-subplex")
+(version "1.5-2")
+(source
+(origin
+  (method url-fetch)
+  (uri (cran-uri "subplex" version))
+  (sha256
+   (base32
+"1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g"
+(build-system r-build-system)
+(native-inputs
+ `(("gfortran" ,gfortran)))
+(home-page "https://cran.r-project.org/web/packages/subplex;)
+(synopsis "Unconstrained optimization using the subplex algorithm")
+(description "This package implements the Subplex optimization algorithm.
+It solves unconstrained optimization problems using a simplex method on
+subspaces.  The method is well suited for optimizing objective functions that
+are noisy or are discontinuous at the solution.")
+(license license:gpl3+)))



03/16: gnu: Add r-maps.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 3d60f4265e3f89151aaf45bd238ce1c2c89790b5
Author: Leo Famulari 
Date:   Sat Feb 17 16:11:25 2018 -0500

gnu: Add r-maps.

* gnu/packages/geo.scm (r-maps): New variable.
---
 gnu/packages/geo.scm | 21 +
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9014cc3..3af196b 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Ricardo Wurmus 
 ;;; Copyright © 2018 Arun Isaac 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system scons)
+  #:use-module (guix build-system r)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -490,3 +492,22 @@ development.")
  construct common SQL queries, or craft your own SQL queries.")
 (home-page "https://www.gaia-gis.it/fossil/spatialite_gui/index;)
 (license license:gpl3+)))
+
+(define-public r-maps
+  (package
+   (name "r-maps")
+   (version "3.2.0")
+   (source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "maps" version))
+   (sha256
+(base32
+ "0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3"
+   (build-system r-build-system)
+   (home-page "https://cran.r-project.org/web/packages/maps;)
+   (synopsis "Draw geographical maps")
+   (description "This package provies an R module for display of maps.
+Projection code and larger maps are in separate packages ('mapproj' and
+'mapdata').")
+   (license license:gpl2)))



08/16: gnu: Add r-desolve.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 799ad71bfc05f084d595ee11b608745a9c56eb10
Author: Leo Famulari 
Date:   Sat Feb 17 16:55:07 2018 -0500

gnu: Add r-desolve.

* gnu/packages/maths.scm (r-desolve): New variable.
---
 gnu/packages/maths.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5382260..b372ad9 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3777,3 +3777,32 @@ It solves unconstrained optimization problems using a 
simplex method on
 subspaces.  The method is well suited for optimizing objective functions that
 are noisy or are discontinuous at the solution.")
 (license license:gpl3+)))
+
+(define-public r-desolve
+  (package
+(name "r-desolve")
+(version "1.20")
+(source
+  (origin
+(method url-fetch)
+(uri (cran-uri "deSolve" version))
+(sha256
+ (base32
+  "18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan"
+(properties `((upstream-name . "deSolve")))
+(build-system r-build-system)
+(native-inputs
+ `(("gfortran" ,gfortran)))
+(home-page "https://desolve.r-forge.r-project.org/;)
+(synopsis "Solvers for initial value problems of differential equations")
+(description "This package provides functions that solve initial
+value problems of a system of first-order ordinary differential equations 
(ODE),
+of partial differential equations (PDE), of differential algebraic equations
+(DAE), and of delay differential equations.  The functions provide an interface
+to the FORTRAN functions lsoda, lsodar, lsode, lsodes of the ODEPACK 
collection,
+to the FORTRAN functions dvode and daspk and a C-implementation of solvers of
+the Runge-Kutta family with fixed or variable time steps.  The package contains
+routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial
+differential equations (PDE) that have been converted to ODEs by numerical
+differencing.")
+(license license:gpl2+)))



11/16: gnu: Add r-ggmap.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 5b19776e055c7033f72fd7291711294cc276ab1f
Author: Leo Famulari 
Date:   Sat Feb 17 17:23:38 2018 -0500

gnu: Add r-ggmap.

* gnu/packages/geo.scm (r-ggmap): New variable.
---
 gnu/packages/geo.scm | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 29d8265..9c7c071 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -45,6 +45,8 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages statistics)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages wxwidgets)
   #:use-module (gnu packages xml))
@@ -576,3 +578,36 @@ scaling.")
 applications.  That is, compute distances and related measures for angular
 (longitude/latitude) locations.")
(license license:gpl3+)))
+
+(define-public r-ggmap
+  (package
+   (name "r-ggmap")
+   (version "2.6.1")
+   (source
+ (origin
+   (method url-fetch)
+   (uri (cran-uri "ggmap" version))
+   (sha256
+(base32
+ "0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw"
+   (build-system r-build-system)
+   (propagated-inputs
+`(("r-digest" ,r-digest)
+  ("r-geosphere" ,r-geosphere)
+  ("r-ggplot2" ,r-ggplot2)
+  ("r-jpeg" ,r-jpeg)
+  ("r-mapproj" ,r-mapproj)
+  ("r-plyr" ,r-plyr)
+  ("r-png" ,r-png)
+  ("r-proto" ,r-proto)
+  ("r-reshape2" ,r-reshape2)
+  ("r-rgooglemaps" ,r-rgooglemaps)
+  ("r-rjson" ,r-rjson)
+  ("r-scales" ,r-scales)))
+   (home-page "https://github.com/dkahle/ggmap;)
+   (synopsis "Spatial visualization with ggplot2")
+   (description "This package provides a collection of functions to visualize
+spatial data and models on top of static maps from various online sources (e.g
+Google Maps and Stamen Maps).  It includes tools common to those tasks,
+including functions for geolocation and routing.")
+   (license license:gpl2)))



13/16: gnu: Add google-brotli.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 2ed0ef2fb794de28036616c4b29e9617f0ca9425
Author: Leo Famulari 
Date:   Wed Feb 21 12:18:31 2018 -0500

gnu: Add google-brotli.

* gnu/packages/compression.scm (google-brotli): New variable.
---
 gnu/packages/compression.scm | 44 
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 86efe2a..0544202 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2017 Petter 
 ;;; Copyright © 2017 Julien Lepiller 
 ;;; Copyright © 2018 Rutger Helling 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2111,3 +2112,46 @@ single-member files which can't be decompressed in 
parallel.")
(description "innoextract allows extracting Inno Setup installers under
 non-Windows systems without running the actual installer using wine.")
(license license:zlib)))
+
+(define-public google-brotli
+  (package
+(name "google-brotli")
+(version "1.0.2")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/google/brotli/archive/v;
+ version ".tar.gz"))
+ (sha256
+  (base32
+   "08kl9gww2058p1p7j9xqmcmrabcfihhj3fq984d7fi3bchb2mky2"
+(build-system cmake-build-system)
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-after 'install 'rename-static-libraries
+   ;; The build tools put a 'static' suffix on the static libraries, 
but
+   ;; other applications don't know how to find these.
+   (lambda* (#:key outputs #:allow-other-keys)
+ (let ((lib (string-append (assoc-ref %outputs "out") "/lib/")))
+   (rename-file (string-append lib "libbrotlicommon-static.a")
+(string-append lib "libbrotlicommon.a"))
+   (rename-file (string-append lib "libbrotlidec-static.a")
+(string-append lib "libbrotlidec.a"))
+   (rename-file (string-append lib "libbrotlienc-static.a")
+(string-append lib "libbrotlienc.a"))
+   #t
+   #:configure-flags
+   (list ;; Defaults to "lib64" on 64-bit archs.
+ (string-append "-DCMAKE_INSTALL_LIBDIR="
+(assoc-ref %outputs "out") "/lib"
+(home-page "https://github.com/google/brotli;)
+(synopsis "General-purpose lossless compression")
+(description "This package provides the reference implementation of Brotli,
+a generic-purpose lossless compression algorithm that compresses data using a
+combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd
+order context modeling, with a compression ratio comparable to the best
+currently available general-purpose compression methods.  It is similar in 
speed
+with @code{deflate} but offers more dense compression.
+
+The specification of the Brotli Compressed Data Format is defined in RFC 
7932.")
+(license license:expat)))



14/16: gnu: Add apache-arrow.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit dae7661a0da9b5a081fb2097cb5e431ad0b8443c
Author: Leo Famulari 
Date:   Wed Feb 21 12:19:33 2018 -0500

gnu: Add apache-arrow.

* gnu/packages/databases.scm (apache-arrow): New variable.
---
 gnu/packages/databases.scm | 74 ++
 1 file changed, 74 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 87f6540..f2e5622 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2015, 2017 Ricardo Wurmus 
 ;;; Copyright © 2017 Kristofer Buffington 
 ;;; Copyright © 2018 Amirouche Boubekki 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,6 +59,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
@@ -92,6 +94,7 @@
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -2738,3 +2741,74 @@ Replay oplog entries between MongoDB servers
 Monitor read/write activity on a mongo server
 @end table")
 (license license:asl2.0)))
+
+(define-public apache-arrow
+  (package
+(name "apache-arrow")
+(version "0.7.0")
+(source
+  (origin
+(method git-fetch)
+(uri (git-reference
+   (url "https://github.com/apache/arrow;)
+   (commit (string-append "apache-arrow-" version
+(file-name (git-file-name name version))
+(sha256
+  (base32
+"1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3"
+(build-system cmake-build-system)
+(arguments
+ `(#:tests? #f
+   #:phases
+   (modify-phases %standard-phases
+ (add-before 'configure 'enter-source-directory
+   (lambda _ (chdir "cpp") #t))
+ (add-after 'unpack 'set-env
+   (lambda _
+ (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost"))
+ (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli"))
+ (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs 
"flatbuffers"))
+ (setenv "JEMALLOC_HOME" (assoc-ref %build-inputs "jemalloc"))
+ (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson"))
+ #t)))
+   #:configure-flags
+   (list "-DCMAKE_BUILD_TYPE=Release"
+ "-DARROW_PYTHON=ON"
+
+ ;; Install to PREFIX/lib (the default is
+ ;; PREFIX/lib64).
+ (string-append "-DCMAKE_INSTALL_LIBDIR="
+(assoc-ref %outputs "out")
+"/lib")
+
+ ;; XXX These Guix package offer static
+ ;; libraries that are not position independent,
+ ;; and ld fails to link them into the arrow .so
+ "-DARROW_WITH_SNAPPY=OFF"
+ "-DARROW_WITH_ZLIB=OFF"
+ "-DARROW_WITH_ZSTD=OFF"
+ "-DARROW_WITH_LZ4=OFF"
+
+ ;; Building the tests forces on all the
+ ;; optional features and the use of static
+ ;; libraries.
+ "-DARROW_BUILD_TESTS=OFF"
+ "-DARROW_BUILD_STATIC=OFF")))
+(inputs
+ `(("boost" ,boost)
+   ("rapidjson" ,rapidjson)
+   ("brotli" ,google-brotli)
+   ("flatbuffers" ,flatbuffers)
+   ;; Arrow is not yet compatible with jemalloc >= 5:
+   ;; https://issues.apache.org/jira/browse/ARROW-1141
+   ("jemalloc" ,jemalloc-4.5.0)
+   ("python-3" ,python)
+   ("python-numpy" ,python-numpy)))
+(home-page "https://arrow.apache.org/;)
+(synopsis "Columnar in-memory analytics")
+(description "Apache Arrow is a columnar in-memory analytics layer
+designed to accelerate big data. It houses a set of canonical in-memory
+representations of flat and hierarchical data along with multiple
+language-bindings for structure manipulation. It also provides IPC and common
+algorithm implementations.")
+(license license:asl2.0)))



01/16: gnu: Add flatbuffers.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 04953dca414788433f039e1844a6cc1c8f37be5f
Author: Leo Famulari 
Date:   Sat Feb 17 15:44:04 2018 -0500

gnu: Add flatbuffers.

* gnu/packages/serialization.scm (flatbuffers): New variable.
---
 gnu/packages/serialization.scm | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 9bbac3a..fd61462 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2017 Frederick M. Muriithi 
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017 Tobias Geerinckx-Rice 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -411,3 +412,28 @@ JSON's ability, but serializes to a binary format which is 
smaller and faster
 to generate and parse.  The two primary functions are @code{cbor.loads} and
 @code{cbor.dumps}.")
 (license license:asl2.0)))
+
+(define-public flatbuffers
+  (package
+(name "flatbuffers")
+(version "1.8.0")
+(source
+  (origin
+(method url-fetch)
+(uri (string-append "https://github.com/google/flatbuffers/archive/v;
+version ".tar.gz"))
+(sha256
+ (base32
+  "0blc978wc5h91662vai24xj92c3bx56y6hzid90qva7il302jl64"
+(build-system cmake-build-system)
+(arguments
+ '(#:configure-flags
+   (list (string-append "-DCMAKE_INSTALL_LIBDIR="
+(assoc-ref %outputs "out") "/lib")
+ "-DCMAKE_BUILD_TYPE=Release")))
+(home-page "https://google.github.io/flatbuffers/;)
+(synopsis "Memory-efficient serialization library")
+(description "FlatBuffers is a cross platform serialization library for 
C++,
+C#, C, Go, Java, JavaScript, PHP, and Python.  It was originally created for
+game development and other performance-critical applications.")
+(license license:asl2.0)))



branch master updated (bb3062a -> 8d4f34d)

2018-03-15 Thread Leo Famulari
lfam pushed a change to branch master
in repository guix.

  from  bb3062a   services: Add 'virtual-terminal'.
   new  04953dc   gnu: Add flatbuffers.
   new  5f3616d   gnu: Add python-plotly.
   new  3d60f42   gnu: Add r-maps.
   new  ebc4bd5   gnu: Add r-mapproj.
   new  9ddf420   gnu: Add Rgooglemaps.
   new  24fb9a5   gnu: Add r-geosphere.
   new  41835f9   gnu: Add r-subplex.
   new  799ad71   gnu: Add r-desolve.
   new  32cbbac   gnu: Add Diversitree.
   new  da4dde6   gnu: Add r-jpeg.
   new  5b19776   gnu: Add r-ggmap.
   new  9f1c0e0   gnu: Add r-feather.
   new  2ed0ef2   gnu: Add google-brotli.
   new  dae7661   gnu: Add apache-arrow.
   new  5e5ac71   gnu: Add python-pyarrow.
   new  8d4f34d   gnu: Add python-feather-format.

The 16 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 |  32 +++
 gnu/packages/compression.scm|  44 +++
 gnu/packages/databases.scm  | 120 +++
 gnu/packages/geo.scm| 121 
 gnu/packages/graph.scm  |  35 
 gnu/packages/image.scm  |  21 +++
 gnu/packages/maths.scm  |  52 +
 gnu/packages/serialization.scm  |  78 +-
 8 files changed, 502 insertions(+), 1 deletion(-)



16/16: gnu: Add python-feather-format.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 8d4f34d6c9667c82f1dc136f54954fb4ccef81b1
Author: Leo Famulari 
Date:   Wed Feb 21 12:25:17 2018 -0500

gnu: Add python-feather-format.

* gnu/packages/serialization.scm (python-feather-format,
python2-feather-format): New variables.
---
 gnu/packages/serialization.scm | 25 +
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 0c07a63..3dd3a07 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -41,6 +41,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cran)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages pkg-config)
@@ -462,3 +463,27 @@ game development and other performance-critical 
applications.")
 (description "Read and write feather files, a lightweight binary columnar
 daa store designed for maximum speed.")
 (license license:asl2.0)))
+
+(define-public python-feather-format
+  (package
+(name "python-feather-format")
+(version "0.4.0")
+(source
+  (origin
+(method url-fetch)
+(uri (pypi-uri "feather-format" version))
+(sha256
+ (base32
+  "1adivm5w5ji4qv7hq7942vqlk8l2wgw87bdlsia771z14z3zp857"
+(build-system python-build-system)
+(propagated-inputs
+ `(("python-pandas" ,python-pandas)
+   ("python-pyarrow" ,python-pyarrow)))
+(home-page "https://github.com/wesm/feather;)
+(synopsis "Python wrapper to the Feather file format")
+(description "This package provides a Python wrapper library to the
+Apache Arrow-based Feather binary columnar serialization data frame format.")
+(license license:asl2.0)))
+
+(define-public python2-feather-format
+  (package-with-python2 python-feather-format))



02/16: gnu: Add python-plotly.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 5f3616d612273e75334a37c3c94dec490271c7a5
Author: Leo Famulari 
Date:   Sat Feb 17 15:55:24 2018 -0500

gnu: Add python-plotly.

* gnu/packages/graph.scm (python-plotly, python2-plotly): New variables.
---
 gnu/packages/graph.scm | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 19c9b22..6a5e0e7 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018 Ricardo Wurmus 
+;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,7 +34,10 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-web)
   #:use-module (gnu packages statistics)
+  #:use-module (gnu packages time)
   #:use-module (gnu packages xml))
 
 (define-public igraph
@@ -199,3 +203,34 @@ objects from the @code{graph} package.")
 represented by horizontal lines, and edges are represented by vertical
 lines.")
   (license license:expat
+
+(define-public python-plotly
+  (package
+(name "python-plotly")
+(version "2.4.0")
+(source
+  (origin
+(method url-fetch)
+(uri (pypi-uri "plotly" version))
+(sha256
+ (base32
+  "0n18116jz6bl5n9cq23vabv1gcbh1x3yficdnfq55v0z4cwy0zlf"
+(build-system python-build-system)
+(arguments
+ '(#:tests? #f)) ; The tests are not distributed in the release
+(propagated-inputs
+ `(("python-decorator" ,python-decorator)
+   ("python-nbformat" ,python-nbformat)
+   ("python-pytz" ,python-pytz)
+   ("python-requests" ,python-requests)
+   ("python-six" ,python-six)))
+(home-page "https://plot.ly/python/;)
+(synopsis "Interactive plotting library for Python")
+(description "Plotly's Python graphing library makes interactive,
+publication-quality graphs online.  Examples of how to make line plots, scatter
+plots, area charts, bar charts, error bars, box plots, histograms, heatmaps,
+subplots, multiple-axes, polar charts, and bubble charts. ")
+(license license:expat)))
+
+(define-public python2-plotly
+  (package-with-python2 python-plotly))



15/16: gnu: Add python-pyarrow.

2018-03-15 Thread Leo Famulari
lfam pushed a commit to branch master
in repository guix.

commit 5e5ac7102c2d28676ab1b756862ba9c02cd3ba2f
Author: Leo Famulari 
Date:   Wed Feb 21 12:23:03 2018 -0500

gnu: Add python-pyarrow.

* gnu/packages/databases.scm (python-pyarrow, python2-pyarrow): New 
variables.
---
 gnu/packages/databases.scm | 46 ++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f2e5622..ab8729b 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2812,3 +2812,49 @@ representations of flat and hierarchical data along with 
multiple
 language-bindings for structure manipulation. It also provides IPC and common
 algorithm implementations.")
 (license license:asl2.0)))
+
+(define-public python-pyarrow
+  (package
+(name "python-pyarrow")
+(version "0.7.0")
+(source
+  (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/apache/arrow;)
+ (commit (string-append "apache-arrow-" version
+   (file-name (git-file-name name version))
+   (sha256
+ (base32
+   "1x7sdd8lbs3nfqjql1pcgbkjc19bls56zmgjayshkmablvlc4dy3"
+(build-system python-build-system)
+(arguments
+ '(#:tests? #f ; XXX Test failures related to missing libhdfs, libhdfs3,
+   ; and "Unsupported numpy type 22".
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'enter-source-directory
+   (lambda _ (chdir "python") #t))
+ (add-after 'unpack 'set-env
+   (lambda _
+ (setenv "ARROW_HOME" (assoc-ref %build-inputs "apache-arrow"))
+ #t)
+(propagated-inputs
+ `(("apache-arrow" ,apache-arrow)
+   ("python-numpy" ,python-numpy)
+   ("python-pandas" ,python-pandas)
+   ("python-six" ,python-six)))
+(native-inputs
+ `(("cmake" ,cmake)
+   ("python-cython" ,python-cython)
+   ("python-pytest" ,python-pytest)
+   ("python-setuptools-scm" ,python-setuptools-scm)))
+(home-page "https://arrow.apache.org/docs/python/;)
+(synopsis "Python bindings for Apache Arrow")
+(description "This library provides a Pythonic API wrapper for the 
reference
+Arrow C++ implementation, along with tools for interoperability with pandas,
+NumPy, and other traditional Python scientific computing packages.")
+(license license:asl2.0)))
+
+(define-public python2-pyarrow
+  (package-with-python2 python-pyarrow))



branch core-updates updated (7aa37aa -> 058ad04)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch core-updates
in repository guix.

  from  7aa37aa   gnu: cunit: Replace bootstrap phase.
   new  df21684   gnu: boost: Remove bootstrap phase.
   new  058ad04   gnu: Remove boost-1.66.

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:
 gnu/packages/boost.scm   | 16 ++--
 gnu/packages/storage.scm |  2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)



01/02: gnu: boost: Remove bootstrap phase.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit df216847c5138c3e818d043bbe1bd1d60620c85c
Author: Ricardo Wurmus 
Date:   Thu Mar 15 12:52:51 2018 +0100

gnu: boost: Remove bootstrap phase.

* gnu/packages/boost.scm (boost)[arguments]: Remove bootstrap phase.
---
 gnu/packages/boost.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 69fbc27..16b0a68 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2017 Thomas Danckaert 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Arun Isaac 
+;;; Copyright © 2018 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,6 +75,7 @@
'()))
#:phases
(modify-phases %standard-phases
+ (delete 'bootstrap)
  (replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
  (let ((out (assoc-ref outputs "out")))



02/02: gnu: Remove boost-1.66.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit 058ad040d64f873ffb9bb4d72166dae9f970b368
Author: Ricardo Wurmus 
Date:   Thu Mar 15 12:53:17 2018 +0100

gnu: Remove boost-1.66.

* gnu/packages/boost.scm (boost-1.66): Remove variable.
* gnu/packages/storage.scm (ceph)[inputs]: Replace boost-1.66 with boost.
---
 gnu/packages/boost.scm   | 14 --
 gnu/packages/storage.scm |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 16b0a68..ebfe2a8 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -113,20 +113,6 @@ across a broad spectrum of applications.")
 (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt;
 "Some components have other similar 
licences."
 
-(define-public boost-1.66
-  (package
-(inherit boost)
-(version "1.66.0")
-(source (origin
-  (method url-fetch)
-  (uri (string-append
-"mirror://sourceforge/boost/boost/" version "/boost_"
-(string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
-".tar.bz2"))
-  (sha256
-   (base32
-"1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap"))
-
 (define-public mdds
   (package
 (name "mdds")
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 54d91c1..93db218 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -317,7 +317,7 @@
("python2-testtools" ,python2-testtools)
("python2-tox" ,python2-tox)))
 (inputs
- `(("boost" ,boost-1.66)
+ `(("boost" ,boost)
("curl" ,curl)
("cryptsetup" ,cryptsetup)
("expat" ,expat)



01/01: gnu: cunit: Replace bootstrap phase.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit 7aa37aa033f33246f69c9dd8a58506b0977fba61
Author: Ricardo Wurmus 
Date:   Thu Mar 15 12:09:21 2018 +0100

gnu: cunit: Replace bootstrap phase.

* gnu/packages/check.scm (cunit)[arguments]: Replace bootstrap phase.
---
 gnu/packages/check.scm | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 73d3efd..baebcb9 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe 
 ;;; Copyright © 2017 Kei Kebreau 
 ;;; Copyright © 2017 ng0 
-;;; Copyright © 2015, 2017 Ricardo Wurmus 
+;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke 
 ;;; Copyright © 2017 Ludovic Courtès 
 ;;; Copyright © 2018 Fis Trivial 
@@ -104,9 +104,11 @@ source code editors and IDEs.")
 (build-system gnu-build-system)
 (arguments '(#:phases
  (modify-phases %standard-phases
-   (add-before 'configure 'autoconf
- (lambda _
-   (zero? (system* "autoreconf" "-vfi")))
+   ;; XXX: The "bootstrap" phase detects the "bootstrap"
+   ;; script, but fails to execute it, so we bootstrap
+   ;; manually.
+   (replace 'bootstrap
+ (lambda _ (invoke "autoreconf" "-vfi"))
 (native-inputs
  `(("automake" ,automake)
("autoconf" ,autoconf)



branch core-updates updated (2b4e556 -> 7aa37aa)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch core-updates
in repository guix.

  from  2b4e556   gnu: libtool: Add libltdl to native-inputs.
   new  7aa37aa   gnu: cunit: Replace bootstrap phase.

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/check.scm | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)



branch core-updates updated (d57888a -> 2b4e556)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch core-updates
in repository guix.

  from  d57888a   guix: python-build-system: Make bytecode compilation 
deterministic.
   new  2b4e556   gnu: libtool: Add libltdl to native-inputs.

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/autotools.scm | 4 
 1 file changed, 4 insertions(+)



01/01: gnu: libtool: Add libltdl to native-inputs.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit 2b4e5568508a85c47b602580a6b6930f3bf8bdec
Author: Ricardo Wurmus 
Date:   Thu Mar 15 12:02:04 2018 +0100

gnu: libtool: Add libltdl to native-inputs.

* gnu/packages/autotools.scm (libtool)[native-inputs]: Add libltdl to fix 
one
failing test.
---
 gnu/packages/autotools.scm | 4 
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index e02de1a..4a16a12 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017 Efraim Flashner 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -339,6 +340,9 @@ Makefile, simplifying the entire process for the 
developer.")
 (propagated-inputs `(("m4" ,m4)))
 (native-inputs `(("m4" ,m4)
  ("perl" ,perl)
+ ;; XXX: this shouldn't be necessary, but without it test
+ ;; 102 fails because it cannot find ltdl/libltdl.la.
+ ("libltdl" ,libltdl)
  ("help2man" ,help2man) ;because we modify ltmain.sh
  ("automake" ,automake)  ;some tests rely on 'aclocal'
  ("autoconf" ,autoconf-wrapper))) ;others on 'autom4te'



branch master updated (dba52a2 -> bb3062a)

2018-03-15 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository guix.

  from  dba52a2   gnu: bind: Update to 9.12.1.
   new  f8ec8d9   tests: Do not assume the bootstrap guile tarball is 
available locally.
   new  61b1dbb   guix system: Add '--skip-checks'.
   new  88cd7bb   services: 'shepherd-service-type' now accepts a default 
value.
   new  bb3062a   services: Add 'virtual-terminal'.

The 4 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 | 10 +++
 gnu/services/base.scm | 67 ++-
 gnu/services/shepherd.scm | 26 --
 gnu/system/install.scm|  4 ++-
 guix/scripts/system.scm   | 18 ++---
 tests/packages.scm| 19 ++
 6 files changed, 85 insertions(+), 59 deletions(-)



03/04: services: 'shepherd-service-type' now accepts a default value.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 88cd7bbd3dc8ecb6b02435338eff1524ad7154ed
Author: Ludovic Courtès 
Date:   Thu Mar 15 11:34:57 2018 +0100

services: 'shepherd-service-type' now accepts a default value.

* gnu/services/shepherd.scm (shepherd-service-type): Add a second form
with an additional 'default' parameter.
---
 gnu/services/shepherd.scm | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index f7c6983..000e85e 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -104,14 +104,24 @@
   ;;  objects.
   (service shepherd-root-service-type '()))
 
-(define-syntax-rule (shepherd-service-type service-name proc)
-  "Return a  denoting a simple shepherd service--i.e., the type
-for a service that extends SHEPHERD-ROOT-SERVICE-TYPE and nothing else."
-  (service-type
-   (name service-name)
-   (extensions
-(list (service-extension shepherd-root-service-type
- (compose list proc))
+(define-syntax shepherd-service-type
+  (syntax-rules ()
+"Return a  denoting a simple shepherd service--i.e., the type
+for a service that extends SHEPHERD-ROOT-SERVICE-TYPE and nothing else.  When
+DEFAULT is given, use it as the service's default value."
+((_ service-name proc default)
+ (service-type
+  (name service-name)
+  (extensions
+   (list (service-extension shepherd-root-service-type
+(compose list proc
+  (default-value default)))
+((_ service-name proc)
+ (service-type
+  (name service-name)
+  (extensions
+   (list (service-extension shepherd-root-service-type
+(compose list proc
 
 (define %default-imported-modules
   ;; Default set of modules imported for a service's consumption.



04/04: services: Add 'virtual-terminal'.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit bb3062ad6290223ea24144ca8aa1f4cddac8f9be
Author: Ludovic Courtès 
Date:   Thu Mar 15 11:37:18 2018 +0100

services: Add 'virtual-terminal'.

Fixes .
Suggested by Danny Milosavljevic .

* gnu/services/base.scm (unicode-start): Remove.
(virtual-terminal-service-type): New variable.
(console-font-shepherd-services): Remove 'modules'; remove call to
'unicode-start'.  Add 'virtual-terminal' to 'requirement'.
(mingetty-shepherd-service, kmscon-service-type): Likewise.
(%base-services): Add 'virtual-terminal-service-type'.
* gnu/system/install.scm (%installation-services): Likewise.
---
 gnu/services/base.scm  | 67 --
 gnu/system/install.scm |  4 ++-
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 343123a..be1bfce 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -62,6 +62,7 @@
 %default-console-font
 console-font-service-type
 console-font-service
+virtual-terminal-service-type
 
 udev-configuration
 udev-configuration?
@@ -665,22 +666,27 @@ to add @var{device} to the kernel's entropy pool.  The 
service will fail if
   "Return a service that sets the host name to @var{name}."
   (service host-name-service-type name))
 
-(define (unicode-start tty)
-  "Return a gexp to start Unicode support on @var{tty}."
-  (with-imported-modules '((guix build syscalls))
-#~(let* ((fd (open-fdes #$tty O_RDWR))
- (termios (tcgetattr fd)))
-(define (set-utf8-input termios)
-  (set-field termios (termios-input-flags)
- (logior (input-flags IUTF8)
- (termios-input-flags termios
-
-(tcsetattr fd (tcsetattr-action TCSAFLUSH)
-   (set-utf8-input termios))
-
-;; TODO: ioctl(fd, KDSKBMODE, K_UNICODE);
-(close-fdes fd)
-#t)))
+(define virtual-terminal-service-type
+  ;; Ensure that virtual terminals run in UTF-8 mode.  This is the case by
+  ;; default with recent Linux kernels, but this service allows us to ensure
+  ;; this.  This service must start before any 'term-' service so that newly
+  ;; created terminals inherit this property.  See
+  ;;  for a discussion.
+  (shepherd-service-type
+   'virtual-terminal
+   (lambda (utf8?)
+ (shepherd-service
+  (documentation "Set virtual terminals in UTF-8 module.")
+  (provision '(virtual-terminal))
+  (requirement '(root-file-system))
+  (start #~(lambda _
+ (call-with-output-file
+ "/sys/module/vt/parameters/default_utf8"
+   (lambda (port)
+ (display 1 port)))
+ #t))
+  (stop #~(const #f
+   #t))   ;default to UTF-8
 
 (define console-keymap-service-type
   (shepherd-service-type
@@ -719,8 +725,6 @@ to add @var{device} to the kernel's entropy pool.  The 
service will fail if
  (requirement (list (symbol-append 'term-
(string->symbol tty
 
- (modules '((guix build syscalls) ;for 'tcsetattr'
-(srfi srfi-9 gnu)))   ;for 'set-field'
  (start #~(lambda _
 ;; It could be that mingetty is not fully ready yet,
 ;; which we check by calling 'ttyname'.
@@ -732,16 +736,18 @@ to add @var{device} to the kernel's entropy pool.  The 
service will fail if
 (usleep 500)
 (loop (- i 1
 
-(and #$(unicode-start device)
- ;; 'setfont' returns EX_OSERR (71) when an
- ;; KDFONTOP ioctl fails, for example.  Like
- ;; systemd's vconsole support, let's not treat
- ;; this as an error.
- (case (status:exit-val
-(system* #$(file-append kbd "/bin/setfont")
- "-C" #$device #$font))
-   ((0 71) #t)
-   (else #f)
+;; Assume the VT is already in UTF-8 mode, thanks to
+;; the 'virtual-terminal' service.
+;;
+;; 'setfont' returns EX_OSERR (71) when an
+;; KDFONTOP ioctl fails, for example.  Like
+;; systemd's vconsole support, let's not treat
+;; this as an error.
+(case (status:exit-val
+   

02/04: guix system: Add '--skip-checks'.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 61b1dbbdcd87f6b37d6b87715a9a4da4e63485ab
Author: Ludovic Courtès 
Date:   Thu Mar 15 10:28:22 2018 +0100

guix system: Add '--skip-checks'.

Fixes .
Reported by Tomáš Čech .

* guix/scripts/system.scm (perform-action): Add #:skip-safety-checks?
and honor it.
(show-help, %options): Add --skip-checks.
(process-action): Pass #:skip-safety-checks? to 'perform-action'.
* doc/guix.texi (Invoking guix system): Document --skip-checks.
---
 doc/guix.texi   | 10 ++
 guix/scripts/system.scm | 18 +++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index d3a7908..bcea89e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20458,6 +20458,16 @@ of the image size as a function of the size of the 
system declared in
 Make @var{file} a symlink to the result, and register it as a garbage
 collector root.
 
+@item --skip-checks
+Skip pre-installation safety checks.
+
+By default, @command{guix system init} and @command{guix system
+reconfigure} perform safety checks: they make sure the file systems that
+appear in the @code{operating-system} declaration actually exist
+(@pxref{File Systems}), and that any Linux kernel modules that may be
+needed at boot time are listed in @code{initrd-modules} (@pxref{Initial
+RAM Disk}).  Passing this option skips these tests altogether.
+
 @item --on-error=@var{strategy}
 Apply @var{strategy} when an error occurs when reading @var{file}.
 @var{strategy} may be one of the following:
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index acfccce..f0c4a2b 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -733,7 +733,8 @@ and TARGET arguments."
   (#$installer #$bootloader #$device #$target))
 
 (define* (perform-action action os
- #:key install-bootloader?
+ #:key skip-safety-checks?
+ install-bootloader?
  dry-run? derivations-only?
  use-substitutes? bootloader-target target
  image-size file-system-type full-boot?
@@ -750,7 +751,10 @@ When DERIVATIONS-ONLY? is true, print the derivation file 
name(s) without
 building anything.
 
 When GC-ROOT is a path, also make that path an indirect root of the build
-output when building a system derivation, such as a disk image."
+output when building a system derivation, such as a disk image.
+
+When SKIP-SAFETY-CHECKS? is true, skip the file system and initrd module
+static checks."
   (define println
 (cut format #t "~a~%" <>))
 
@@ -760,7 +764,8 @@ output when building a system derivation, such as a disk 
image."
   ;; Check whether the declared file systems exist.  This is better than
   ;; instantiating a broken configuration.  Assume that we can only check if
   ;; running as root.
-  (when (memq action '(init reconfigure))
+  (when (and (not skip-safety-checks?)
+ (memq action '(init reconfigure)))
 (check-mapped-devices os)
 (when (zero? (getuid))
   (check-file-system-availability (operating-system-file-systems os))
@@ -933,6 +938,8 @@ Some ACTIONS support additional ARGS.\n"))
   --expose=SPEC  for 'vm', expose host file system according to SPEC"))
   (display (G_ "
   --full-bootfor 'vm', make a full boot sequence"))
+  (display (G_ "
+  --skip-checks  skip file system and initrd module safety checks"))
   (newline)
   (display (G_ "
   -h, --help display this help and exit"))
@@ -974,6 +981,9 @@ Some ACTIONS support additional ARGS.\n"))
  (option '("full-boot") #f #f
  (lambda (opt name arg result)
(alist-cons 'full-boot? #t result)))
+ (option '("skip-checks") #f #f
+ (lambda (opt name arg result)
+   (alist-cons 'skip-safety-checks? #t result)))
 
  (option '("share") #t #f
  (lambda (opt name arg result)
@@ -1067,6 +1077,8 @@ resulting from command-line parsing."
  #:derivations-only? (assoc-ref opts
 'derivations-only?)
  #:use-substitutes? (assoc-ref opts 'substitutes?)
+ #:skip-safety-checks?
+ (assoc-ref opts 'skip-safety-checks?)
  #:file-system-type (assoc-ref opts 
'file-system-type)
  #:image-size (assoc-ref opts 'image-size)
  #:full-boot? (assoc-ref opts 'full-boot?)



01/04: tests: Do not assume the bootstrap guile tarball is available locally.

2018-03-15 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit f8ec8d96d657f95e71e0798124cdeb2c9217c7fa
Author: Ludovic Courtès 
Date:   Thu Mar 15 10:25:10 2018 +0100

tests: Do not assume the bootstrap guile tarball is available locally.

Fixes .
Reported by Chris Marusich .

* tests/packages.scm ("package-source-derivation, snippet"): Use
'bootstrap-guile-origin' instead of assuming the bootstrap guile tarball
is available locally.
---
 tests/packages.scm | 19 ++-
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/tests/packages.scm b/tests/packages.scm
index b2fa21a..9e19c39 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -377,24 +377,9 @@
 (unless (network-reachable?) (test-skip 1))
 (test-equal "package-source-derivation, snippet"
   "OK"
-  (let* ((file   (search-bootstrap-binary (match (%current-system)
-("armhf-linux"
- "guile-2.0.11.tar.xz")
-("aarch64-linux"
- "guile-2.0.14.tar.xz")
-(_
- "guile-2.0.9.tar.xz"))
-  (%current-system)))
- (sha256 (call-with-input-file file port-sha256))
- (fetch  (lambda* (url hash-algo hash
-   #:optional name #:key system)
-   (pk 'fetch url hash-algo hash name system)
-   (interned-file url)))
- (source (bootstrap-origin
+  (let* ((source (bootstrap-origin
   (origin
-(method fetch)
-(uri file)
-(sha256 sha256)
+(inherit (bootstrap-guile-origin (%current-system)))
 (patch-inputs
  `(("tar" ,%bootstrap-coreutils)
("xz" ,%bootstrap-coreutils)



02/02: guix: python-build-system: Make bytecode compilation deterministic.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit d57888a819dae65ef923cb5c92eb15375a2f3f9f
Author: Ricardo Wurmus 
Date:   Wed Mar 7 10:53:11 2018 +0100

guix: python-build-system: Make bytecode compilation deterministic.

* guix/build/python-build-system.scm (enable-bytecode-determinism): New
procedure.
(%standard-phases): Add "enable-bytecode-determinism" phase.
---
 guix/build/python-build-system.scm | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/guix/build/python-build-system.scm 
b/guix/build/python-build-system.scm
index 0366571..507cc27 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2013 Nikita Karetnikov 
 ;;; Copyright © 2015 Mark H Weaver 
 ;;; Copyright © 2016 Hartmut Goebel 
+;;; Copyright © 2018 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -243,10 +244,20 @@ installed with setuptools."
#t))
 #t))
 
+(define* (enable-bytecode-determinism #:rest _)
+  "Improve determinism of pyc files."
+  ;; Set DETERMINISTIC_BUILD to override the embedded mtime in pyc files.
+  (setenv "DETERMINISTIC_BUILD" "1")
+  ;; Use deterministic hashes for strings, bytes, and datetime objects.
+  (setenv "PYTHONHASHSEED" "0")
+  #t)
+
 (define %standard-phases
   ;; 'configure' phase is not needed.
   (modify-phases gnu:%standard-phases
 (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980)
+(add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+  enable-bytecode-determinism)
 (delete 'bootstrap)
 (delete 'configure)
 (replace 'install install)



branch core-updates updated (f529dfe -> d57888a)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch core-updates
in repository guix.

  from  f529dfe   gnu: python-3.6: Disable failing test.
   new  9b7e389   gnu: python-3.6: Reset timestamps in pyc files.
   new  d57888a   guix: python-build-system: Make bytecode compilation 
deterministic.

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:
 gnu/packages/python.scm| 70 --
 guix/build/python-build-system.scm | 11 ++
 2 files changed, 79 insertions(+), 2 deletions(-)



01/02: gnu: python-3.6: Reset timestamps in pyc files.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit 9b7e389d41b217a12283f5b0a83e8122b088c67a
Author: Ricardo Wurmus 
Date:   Sun Mar 4 20:32:28 2018 +0100

gnu: python-3.6: Reset timestamps in pyc files.

* gnu/packages/python.scm (python-3.6)[arguments]: Add build phases to
patch the bytecode generator to reset the embedded timestamp in pyc
files; add build phase to rebuild the bytecode files.
---
 gnu/packages/python.scm | 70 +++--
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d091157..dbb5ccb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -363,8 +363,74 @@ data types.")
   ;; versions of Python.
   "Lib/test/test_socket.py"))
   #t
-(arguments (substitute-keyword-arguments (package-arguments python-2)
- ((#:tests? _) #t)))
+(arguments
+ (substitute-keyword-arguments (package-arguments python-2)
+   ((#:tests? _) #t)
+   ((#:phases phases)
+`(modify-phases ,phases
+   (add-after 'unpack 'patch-timestamp-for-pyc-files
+ (lambda _
+   ;; We set DETERMINISTIC_BUILD to only override the mtime when
+   ;; building with Guix, lest we break auto-compilation in
+   ;; environments.
+   (setenv "DETERMINISTIC_BUILD" "1")
+   (substitute* "Lib/py_compile.py"
+ (("source_stats\\['mtime'\\]")
+  "(1 if 'DETERMINISTIC_BUILD' in os.environ else 
source_stats['mtime'])"))
+
+   ;; Use deterministic hashes for strings, bytes, and datetime
+   ;; objects.
+   (setenv "PYTHONHASHSEED" "0")
+
+   ;; Reset mtime when validating bytecode header.
+   (substitute* "Lib/importlib/_bootstrap_external.py"
+ (("source_mtime = int\\(source_stats\\['mtime'\\]\\)")
+  "source_mtime = 1"))
+   #t))
+   ;; These tests fail because of our change to the bytecode
+   ;; validation.  They fail because expected exceptions do not get
+   ;; thrown.  This seems to be no problem.
+   (add-after 'unpack 'disable-broken-bytecode-tests
+ (lambda _
+   (substitute* 
"Lib/test/test_importlib/source/test_file_loader.py"
+ (("test_bad_marshal")
+  "disable_test_bad_marshal")
+ (("test_no_marshal")
+  "disable_test_no_marshal")
+ (("test_non_code_marshal")
+  "disable_test_non_code_marshal"))
+   #t))
+   ;; Unset DETERMINISTIC_BUILD to allow for tests that check that
+   ;; stale pyc files are rebuilt.
+   (add-before 'check 'allow-non-deterministic-compilation
+ (lambda _ (unsetenv "DETERMINISTIC_BUILD") #t))
+   ;; We need to rebuild all pyc files for three different
+   ;; optimization levels to replace all files that were not built
+   ;; deterministically.
+
+   ;; FIXME: Without this phase we have close to 2000 files that
+   ;; differ across different builds of this package.  With this phase
+   ;; there are about 500 files left that differ.
+   (add-after 'install 'rebuild-bytecode
+ (lambda* (#:key outputs #:allow-other-keys)
+   (setenv "DETERMINISTIC_BUILD" "1")
+   (let ((out (assoc-ref outputs "out")))
+ (for-each
+  (lambda (opt)
+(format #t "Compiling with optimization level: ~a\n"
+(if (null? opt) "none" (car opt)))
+(for-each (lambda (file)
+(apply invoke
+   `(,(string-append out "/bin/python3")
+ ,@opt
+ "-m" "compileall"
+ "-f" ; force rebuild
+ ;; Don't build lib2to3, because it's 
Python 2 code.
+ ;; Also don't build obviously broken 
test code.
+ "-x" "(lib2to3|test/bad.*)"
+ ,file)))
+  (find-files out "\\.py$")))
+  (list '() '("-O") '("-OO"))
 (native-search-paths
  (list (search-path-specification
 (variable "PYTHONPATH")



branch core-updates updated (60a32a2 -> f529dfe)

2018-03-15 Thread Ricardo Wurmus
rekado pushed a change to branch core-updates
in repository guix.

  from  60a32a2   gnu: pango: Explicitly propagate some inputs.
   new  f529dfe   gnu: python-3.6: Disable failing test.

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/python.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)



01/01: gnu: python-3.6: Disable failing test.

2018-03-15 Thread Ricardo Wurmus
rekado pushed a commit to branch core-updates
in repository guix.

commit f529dfec74c2f5cbfe9cda65f9ee4b02fe12dbf9
Author: Ricardo Wurmus 
Date:   Thu Mar 15 09:21:58 2018 +0100

gnu: python-3.6: Disable failing test.

* gnu/packages/python.scm (python-3.6)[source]: Delete
Lib/test/test_socket.py.
---
 gnu/packages/python.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 106c040..d091157 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -357,7 +357,11 @@ data types.")
   (for-each delete-file
 '("Lib/ctypes/test/test_structures.py" ; fails on 
aarch64
   "Lib/ctypes/test/test_win32.py" ; fails on 
aarch64
-  "Lib/test/test_fcntl.py")) ; fails on aarch64
+  "Lib/test/test_fcntl.py" ; fails on aarch64
+  ;; This test fails on kernels older than 4.5.
+  ;; It is skipped on these kernels in later
+  ;; versions of Python.
+  "Lib/test/test_socket.py"))
   #t
 (arguments (substitute-keyword-arguments (package-arguments python-2)
  ((#:tests? _) #t)))