02/04: gnu: linux-libre@4.4: Update to 4.4.75.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 5d7f9c156e61e3789e7b8f051589a84f66909d52
Author: Mark H Weaver 
Date:   Fri Jun 30 00:12:16 2017 -0400

gnu: linux-libre@4.4: Update to 4.4.75.

* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.75.
---
 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 324ade3..83465ed 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -379,8 +379,8 @@ It has been modified to remove all non-free binary blobs.")
 #:configuration-file kernel-config))
 
 (define-public linux-libre-4.4
-  (make-linux-libre "4.4.74"
-"04x2ki3s2jsjkkk6bld0rd9rsk8qqvrfsxawxzfa26mkq6pv87r2"
+  (make-linux-libre "4.4.75"
+"1h687flrdzlcd1ms5n2khm0mxybr8bj2jfnnm7qvy6ha2vsngb5b"
 %intel-compatible-systems
 #:configuration-file kernel-config))
 

branch master updated (79bfa63 -> 588b225)

[Mark H. Weaver]

mhw pushed a change to branch master
in repository guix.

  from  79bfa63   maint: Disk image size is automatically guessed.
   new  5a1b5dc   gnu: linux-libre@4.1: Update to 4.1.42 [mitigates 
CVE-2017-1000364].
   new  5d7f9c1   gnu: linux-libre@4.4: Update to 4.4.75.
   new  426187d   gnu: linux-libre@4.9: Update to 4.9.35.
   new  588b225   gnu: linux-libre: Update to 4.11.8.

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

01/04: gnu: linux-libre@4.1: Update to 4.1.42 [mitigates CVE-2017-1000364].

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 5a1b5dccf0588faff7ab4a71bb45b0b633fcc700
Author: Mark H Weaver 
Date:   Fri Jun 30 00:11:10 2017 -0400

gnu: linux-libre@4.1: Update to 4.1.42 [mitigates CVE-2017-1000364].

* gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.42.
---
 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 641c307..324ade3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -385,8 +385,8 @@ It has been modified to remove all non-free binary blobs.")
 #:configuration-file kernel-config))
 
 (define-public linux-libre-4.1
-  (make-linux-libre "4.1.41"
-"02mqfl899jxvrmxlh8lvcgvm3klwd8wbsdz4rr2gpchbggj4vgb2"
+  (make-linux-libre "4.1.42"
+"1g5jhn7cm6ixn7w8ciqm6qgxv7k1jg50v6k05hsvzvrqfpaxqlbz"
 %intel-compatible-systems
 #:configuration-file kernel-config))
 

03/04: gnu: linux-libre@4.9: Update to 4.9.35.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 426187d27838f4d38ccd25bf9da955bdaab55a1c
Author: Mark H Weaver 
Date:   Fri Jun 30 00:12:55 2017 -0400

gnu: linux-libre@4.9: Update to 4.9.35.

* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.35.
---
 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 83465ed..3aa0159 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -373,8 +373,8 @@ It has been modified to remove all non-free binary blobs.")
 #:configuration-file kernel-config))
 
 (define-public linux-libre-4.9
-  (make-linux-libre "4.9.34"
-"00jm3338kvhfj850lg3mvk680fmfw34mvwaq41lvxgb1z2xqqlz1"
+  (make-linux-libre "4.9.35"
+"0fs90jgb01jybkclngg5asvbs1y70f2abs395qcb3lxpx7zxhy1h"
 %intel-compatible-systems
 #:configuration-file kernel-config))
 

04/04: gnu: linux-libre: Update to 4.11.8.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 588b22575d1ad7eb41dec17e01e03aa1c56f56db
Author: Mark H Weaver 
Date:   Fri Jun 30 00:13:36 2017 -0400

gnu: linux-libre: Update to 4.11.8.

* gnu/packages/linux.scm (%linux-libre-version): Update to 4.11.8.
(%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 3aa0159..f18a23b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -363,8 +363,8 @@ It has been modified to remove all non-free binary blobs.")
 
 (define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
 
-(define %linux-libre-version "4.11.7")
-(define %linux-libre-hash 
"0kliwdz4qqjz13pywhavxg19cy1mf6d1f52f6kgapc331309vad9")
+(define %linux-libre-version "4.11.8")
+(define %linux-libre-hash 
"1z35h6xr8gdzq31xv3dpdz6ddz4q3183fwvkmx8qd7h9bhy13aw6")
 
 (define-public linux-libre
   (make-linux-libre %linux-libre-version

02/06: vm: Fix 'load-in-linux-vm' docstring.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 6efb98ed3cc0ff4b2a35f4a08651d5ad15d1a9cd
Author: Ludovic Courtès 
Date:   Thu Jun 29 23:11:23 2017 +0200

vm: Fix 'load-in-linux-vm' docstring.

* gnu/build/vm.scm (load-in-linux-vm): Change default value of
  #:disk-image-size.  Update docstring to note that DISK-IMAGE-SIZE is
  in bytes.
---
 gnu/build/vm.scm | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 5761976..56ebeae 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 Ludovic Courtès 
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
 ;;; Copyright © 2016 Christopher Allan Webber 
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2017 Mathieu Othacehe 
@@ -71,15 +71,16 @@
output
(qemu (qemu-command)) (memory-size 512)
linux initrd
-   make-disk-image? (disk-image-size 100)
+   make-disk-image?
+   (disk-image-size (* 100 (expt 2 20)))
(disk-image-format "qcow2")
(references-graphs '()))
   "Run BUILDER, a Scheme file, into a VM running LINUX with INITRD, and copy
 the result to OUTPUT.
 
 When MAKE-DISK-IMAGE? is true, OUTPUT will contain a VM image of
-DISK-IMAGE-SIZE MiB resulting from the execution of BUILDER, which may access
-it via /dev/hda.
+DISK-IMAGE-SIZE bytes resulting from the execution of BUILDER, which may
+access it via /dev/hda.
 
 REFERENCES-GRAPHS can specify a list of reference-graph files as produced by
 the #:references-graphs parameter of 'derivation'."

04/06: vm: Estimate the disk size by default.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit a8ac4f081a9a679498ea42ccfe001f218bba3043
Author: Ludovic Courtès 
Date:   Fri Jun 30 00:04:38 2017 +0200

vm: Estimate the disk size by default.

* gnu/build/vm.scm (estimated-partition-size): New procedure.
* gnu/system/vm.scm (expression->derivation-in-linux-vm):
Change #:disk-image-size default to 'guess.
[builder]: When DISK-IMAGE-SIZE is 'guess, use
'estimated-partition-size' and compute and estimate of the image size.
(qemu-image): Likewise.
* guix/build/store-copy.scm (file-size, closure-size): New procedures.
* guix/scripts/system.scm (%default-options): Change 'image-size' to
'guess.
* doc/guix.texi (Building the Installation Image): Remove '--image-size'
flag from example.
(Invoking guix system): Document the image size estimate.
---
 doc/guix.texi | 12 
 gnu/build/vm.scm  |  7 +++
 gnu/system/vm.scm | 44 +++-
 guix/build/store-copy.scm | 35 ++-
 guix/scripts/system.scm   |  2 +-
 5 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 729ec08..d61a5b7 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7877,9 +7877,8 @@ that.
 The installation image described above was built using the @command{guix
 system} command, specifically:
 
-@c FIXME: 1G is too much; see .
 @example
-guix system disk-image --image-size=1G gnu/system/install.scm
+guix system disk-image gnu/system/install.scm
 @end example
 
 Have a look at @file{gnu/system/install.scm} in the source tree,
@@ -16187,8 +16186,9 @@ size of the image.
 @item vm-image
 @itemx disk-image
 Return a virtual machine or disk image of the operating system declared
-in @var{file} that stands alone.  Use the @option{--image-size} option
-to specify the size of the image.
+in @var{file} that stands alone.  By default, @command{guix system}
+estimates the size of the image needed to store the system, but you can
+use the @option{--image-size} option to specify a value.
 
 When using @code{vm-image}, the returned image is in qcow2 format, which
 the QEMU emulator can efficiently use. @xref{Running GuixSD in a VM},
@@ -16251,6 +16251,10 @@ of the given @var{size}.  @var{size} may be a number 
of bytes, or it may
 include a unit as a suffix (@pxref{Block size, size specifications,,
 coreutils, GNU Coreutils}).
 
+When this option is omitted, @command{guix system} computes an estimate
+of the image size as a function of the size of the system declared in
+@var{file}.
+
 @item --root=@var{file}
 @itemx -r @var{file}
 Make @var{file} a symlink to the result, and register it as a garbage
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 7d5e613..d0bc8c3 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -46,6 +46,7 @@
 partition-flags
 partition-initializer
 
+estimated-partition-size
 root-partition-initializer
 initialize-partition-table
 initialize-hard-disk))
@@ -150,6 +151,12 @@ the #:references-graphs parameter of 'derivation'."
   (flags   partition-flags (default '()))
   (initializer partition-initializer (default (const #t
 
+(define (estimated-partition-size graphs)
+  "Return the estimated size of a partition that can store the store items
+given by GRAPHS, a list of file names produced by #:references-graphs."
+  ;; Simply add a 20% overhead.
+  (round (* 1.2 (closure-size graphs
+
 (define (fold2 proc seed1 seed2 lst)  ;TODO: factorize
   "Like `fold', but with a single list and two seeds."
   (let loop ((result1 seed1)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 392737d..7ac8696 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès 
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
 ;;; Copyright © 2016 Christopher Allan Webber 
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2017 Mathieu Othacehe 
@@ -108,8 +108,7 @@
  (references-graphs #f)
  (memory-size 256)
  (disk-image-format "qcow2")
- (disk-image-size
-  (* 100 (expt 2 20
+ (disk-image-size 'guess))
   "Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a
 derivation).  In the virtual machine, EXP has access to all its inputs from the
 store; it should put its output files in the `/xchg' directory, which is
@@ -118,7 +117,8 @@ runs 

branch master updated (95bbaa0 -> 79bfa63)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  95bbaa0   gnu: poppler: Fix CVE-2017-{9775,9776}.
   new  1d97fd8   build: Remove check for broken (srfi srfi-37).
   new  6efb98e   vm: Fix 'load-in-linux-vm' docstring.
   new  a2cf57e   vm: Display the disk and partition sizes.
   new  a8ac4f0   vm: Estimate the disk size by default.
   new  a227892   vm: Use 'fold2' from (guix combinators).
   new  79bfa63   maint: Disk image size is automatically guessed.

The 6 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:
 Makefile.am   |  17 
 configure.ac  |   4 -
 doc/guix.texi |  12 ++-
 gnu/build/vm.scm  |  41 
 gnu/system/vm.scm |  44 +
 guix/build/store-copy.scm |  35 ++-
 guix/scripts/system.scm   |   2 +-
 m4/guix.m4|  19 
 srfi/srfi-37.scm.in   | 233 --
 9 files changed, 94 insertions(+), 313 deletions(-)
 delete mode 100644 srfi/srfi-37.scm.in

03/06: vm: Display the disk and partition sizes.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit a2cf57e79e0c1ca59ff854c12ece178a73fe224d
Author: Ludovic Courtès 
Date:   Thu Jun 29 23:26:35 2017 +0200

vm: Display the disk and partition sizes.

* gnu/build/vm.scm (load-in-linux-vm): Add 'format' call when
MAKE-DISK-IMAGE? is true.
(initialize-partition-table): Show the size of the partitions being
created.
---
 gnu/build/vm.scm | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 56ebeae..7d5e613 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -85,6 +85,9 @@ access it via /dev/hda.
 REFERENCES-GRAPHS can specify a list of reference-graph files as produced by
 the #:references-graphs parameter of 'derivation'."
   (when make-disk-image?
+(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)))
@@ -193,8 +196,15 @@ actual /dev name based on DEVICE."
(cons (partition-options head offset index)
  result))
 
-  (format #t "creating partition table with ~a partitions...\n"
-  (length partitions))
+  (format #t "creating partition table with ~a partitions (~a)...\n"
+  (length partitions)
+  (string-join (map (compose (cut string-append <> " MiB")
+ number->string
+ (lambda (size)
+   (round (/ size (expt 2. 20
+ partition-size)
+partitions)
+   ", "))
   (unless (zero? (apply system* "parted" "--script"
 device "mklabel" label-type
 (options partitions offset)))

05/06: vm: Use 'fold2' from (guix combinators).

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit a2278922fe5158d3caac9d2c3ff5008e084a45d3
Author: Ludovic Courtès 
Date:   Fri Jun 30 00:13:54 2017 +0200

vm: Use 'fold2' from (guix combinators).

* gnu/build/vm.scm: Use (guix combinators).
(fold2): Remove.
---
 gnu/build/vm.scm | 13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index d0bc8c3..8f7fc3c 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu build linux-boot)
   #:use-module (gnu build install)
   #:use-module (guix records)
+  #:use-module ((guix combinators) #:select (fold2))
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
@@ -157,18 +158,6 @@ given by GRAPHS, a list of file names produced by 
#:references-graphs."
   ;; Simply add a 20% overhead.
   (round (* 1.2 (closure-size graphs
 
-(define (fold2 proc seed1 seed2 lst)  ;TODO: factorize
-  "Like `fold', but with a single list and two seeds."
-  (let loop ((result1 seed1)
- (result2 seed2)
- (lst lst))
-(if (null? lst)
-(values result1 result2)
-(call-with-values
-(lambda () (proc (car lst) result1 result2))
-  (lambda (result1 result2)
-(loop result1 result2 (cdr lst)))
-
 (define* (initialize-partition-table device partitions
  #:key
  (label-type "msdos")

01/06: build: Remove check for broken (srfi srfi-37).

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 1d97fd8cb60f0b5f386f834940f859ff0b0bcc71
Author: Ludovic Courtès 
Date:   Thu Jun 29 21:26:36 2017 +0200

build: Remove check for broken (srfi srfi-37).

This was for Guile < 2.0.9 and we've been requiring 2.0.9+ for some time
already.

* configure.ac: Remove 'GUIX_CHECK_SRFI_37' use and 'INSTALL_SRFI_37'
conditional.
* Makefile.am: Remove code in "if INSTALL_SRFI_37".
(EXTRA_DIST): Remove srfi/srfi-37.scm.in.
* srfi/srfi-37.scm.in: Remove.
* m4/guix.m4 (GUIX_CHECK_SRFI_37): Remove.
---
 Makefile.am |  13 ---
 configure.ac|   4 -
 m4/guix.m4  |  19 -
 srfi/srfi-37.scm.in | 233 
 4 files changed, 269 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4dfcd06..8a5aa2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,18 +250,6 @@ nobase_dist_guilemodule_DATA = 
\
 nobase_nodist_guilemodule_DATA = guix/config.scm
 nobase_nodist_guileobject_DATA = $(GOBJECTS)
 
-# Do we need to provide our own non-broken (srfi srfi-37) module?
-if INSTALL_SRFI_37
-
-nobase_nodist_guilemodule_DATA += srfi/srfi-37.scm
-GOBJECTS += srfi/srfi-37.go
-
-srfi/srfi-37.scm: srfi/srfi-37.scm.in
-   $(MKDIR_P) srfi
-   cp "$<" "$@"
-
-endif INSTALL_SRFI_37
-
 # Handy way to remove the .go files without removing all the rest.
 clean-go:
-$(RM) -f $(GOBJECTS)
@@ -441,7 +429,6 @@ EXTRA_DIST =
\
   build-aux/run-system-tests.scm   \
   d3.v3.js \
   graph.js \
-  srfi/srfi-37.scm.in  \
   srfi/srfi-64.scm \
   srfi/srfi-64.upstream.scm\
   tests/test.drv   \
diff --git a/configure.ac b/configure.ac
index c937e94..2b75c90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,10 +111,6 @@ AM_CONDITIONAL([HAVE_GUILE_GIT], [test "x$have_guile_git" 
= "xyes"])
 dnl Make sure we have a full-fledged Guile.
 GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
 
-dnl Check whether (srfi srfi-37) works, and provide our own if it doesn't.
-GUIX_CHECK_SRFI_37
-AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" = xyes])
-
 dnl Decompressors, for use by the substituter and other modules.
 AC_PATH_PROG([GZIP], [gzip])
 AC_PATH_PROG([BZIP2], [bzip2])
diff --git a/m4/guix.m4 b/m4/guix.m4
index e546b8f..add57f5 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -136,25 +136,6 @@ AC_DEFUN([GUIX_ASSERT_GUILE_FEATURES], [
   done
 ])
 
-dnl GUIX_CHECK_SRFI_37
-dnl
-dnl Check whether SRFI-37 suffers from .
-dnl This bug was fixed in Guile 2.0.9.
-AC_DEFUN([GUIX_CHECK_SRFI_37], [
-  AC_CACHE_CHECK([whether (srfi srfi-37) is affected by 
http://bugs.gnu.org/13176],
-[ac_cv_guix_srfi_37_broken],
-[if "$GUILE" -c "(use-modules (srfi srfi-37))  \
-   (sigaction SIGALRM (lambda _ (primitive-exit 1)))   \
-   (alarm 1)   \
-   (define opts (list (option '(#\I) #f #t (lambda _ #t
\
-   (args-fold '(\"-I\") opts (lambda _ (error)) (lambda _ #f) '())"
- then
-   ac_cv_guix_srfi_37_broken=no
- else
-   ac_cv_guix_srfi_37_broken=yes
- fi])
-])
-
 dnl GUIX_CHECK_UNBUFFERED_CBIP
 dnl
 dnl Check whether 'setbvuf' works on custom binary input ports (CBIPs), as is
diff --git a/srfi/srfi-37.scm.in b/srfi/srfi-37.scm.in
deleted file mode 100644
index 3f654af..000
--- a/srfi/srfi-37.scm.in
+++ /dev/null
@@ -1,233 +0,0 @@
-;;; srfi-37.scm --- args-fold
-
-;; Copyright (C) 2007, 2008, 2013 Free Software Foundation, Inc.
-;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 3 of the License, or (at your option) any later version.
-;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
-;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-;;; Commentary:
-;;
-;; To use this module with Guile, use (cdr (program-arguments)) as
-;; the ARGS argument to `args-fold'.  Here is a short example:
-;;
-;;  (args-fold (cdr (program-arguments))
-;; (let ((display-and-exit-proc
-;;(lambda (msg)
-;;  

06/06: maint: Disk image size is automatically guessed.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 79bfa638295af53ed0c6c325c54f01db84f3b213
Author: Ludovic Courtès 
Date:   Fri Jun 30 00:14:48 2017 +0200

maint: Disk image size is automatically guessed.

* Makefile.am (GUIXSD_VM_IMAGE_SIZE): Remove.
(release): Remove --image-size argument from 'guix system disk-image'
command.
---
 Makefile.am | 4 
 1 file changed, 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8a5aa2b..f6059d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -585,9 +585,6 @@ GUIXSD_IMAGE_BASE = guixsd-usb-install-$(PACKAGE_VERSION)
 # Prefix of the GuixSD VM image file name.
 GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION)
 
-# Size of the installation image (for x86_64 typically).
-GUIXSD_INSTALLATION_IMAGE_SIZE ?= 950MiB
-
 # Size of the VM image (for x86_64 typically).
 GUIXSD_VM_IMAGE_SIZE ?= 2GiB
 
@@ -635,7 +632,6 @@ release: dist
  image=`$(top_builddir)/pre-inst-env   
\
guix system disk-image  
\
 --system=$$system  
\
-   --image-size=$(GUIXSD_INSTALLATION_IMAGE_SIZE)  
\
gnu/system/install.scm` ;   
\
  if [ ! -f "$$image" ] ; then  
\
echo "failed to produced GuixSD installation image for $$system" 
>&2 ;  \

branch core-updates updated (503a4df -> 92cb946)

[Leo Famulari]

lfam pushed a change to branch core-updates
in repository guix.

  from  503a4df   gnu: glibc/linux: Add patches for CVE-2017-1000366.
   new  92cb946   gnu: intltool: Fix a compatibility issue with Perl 5.26.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/local.mk   |  1 +
 gnu/packages/glib.scm  |  1 +
 .../patches/intltool-perl-compatibility.patch  | 76 ++
 3 files changed, 78 insertions(+)
 create mode 100644 gnu/packages/patches/intltool-perl-compatibility.patch

01/01: gnu: intltool: Fix a compatibility issue with Perl 5.26.0.

[Leo Famulari]

lfam pushed a commit to branch core-updates
in repository guix.

commit 92cb946bd9d78cb8f6aa8418d505f52da6894ab4
Author: Leo Famulari 
Date:   Wed Jun 14 11:42:38 2017 -0400

gnu: intltool: Fix a compatibility issue with Perl 5.26.0.

* gnu/packages/patches/intltool-perl-compatibility.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/glib.scm (intltool)[source]: Use it.
---
 gnu/local.mk   |  1 +
 gnu/packages/glib.scm  |  1 +
 .../patches/intltool-perl-compatibility.patch  | 76 ++
 3 files changed, 78 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 5328a80..54c099b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -682,6 +682,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch  \
   %D%/packages/patches/ilmbase-fix-tests.patch \
+  %D%/packages/patches/intltool-perl-compatibility.patch   \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch\
   %D%/packages/patches/jbig2dec-ignore-testtest.patch  \
   %D%/packages/patches/jbig2dec-CVE-2016-9601.patch\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fcd1daf..926703e 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -347,6 +347,7 @@ bindings to call into the C library.")
  (uri (string-append "https://launchpad.net/intltool/trunk/;
  version "/+download/intltool-"
  version ".tar.gz"))
+ (patches (search-patches "intltool-perl-compatibility.patch"))
  (sha256
   (base32
"1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"
diff --git a/gnu/packages/patches/intltool-perl-compatibility.patch 
b/gnu/packages/patches/intltool-perl-compatibility.patch
new file mode 100644
index 000..b895ca7
--- /dev/null
+++ b/gnu/packages/patches/intltool-perl-compatibility.patch
@@ -0,0 +1,76 @@
+This patch fixes a regex parsing compatibility issue with Perl 5.26.0.
+It manifests during the configure phase of at-spi2-core like this:
+
+--
+Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in 
m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at 
/gnu/store/...-intltool-0.51.0/bin/intltool-update line 1065.
+--
+
+Copied from Gentoo and MSYS2:
+
+https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/intltool/files/intltool-0.51.0-perl-5.26.patch?id=1105187fc65d8bf643e682fcef39620dcfd9326a
+https://github.com/Alexpux/MSYS2-packages/blob/0d3f442553ae4fc8798e32cbf44c4252fa8f3c07/intltool/perl-5.22-compatibility.patch
+
+#diff -ruN intltool-0.51.0.orig/intltool-update.in 
intltool-0.51.0/intltool-update.in
+#--- intltool-0.51.0.orig/intltool-update.in   2017-06-28 00:47:20.889269294 
+0200
+#+++ intltool-0.51.0/intltool-update.in2017-06-28 00:48:14.592271529 
+0200
+#@@ -1068,7 +1068,7 @@
+#  my $untouched = $1;
+#  my $sub = "";
+# # Ignore recursive definitions of variables
+#-$sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ 
/\${?$2}?/;
+#+$sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ 
/\$\{?$2}?/;
+# 
+#  return SubstituteVariable ("$untouched$sub$rest");
+# }
+--- intltool-0.51.0.orig/intltool-update.in2015-03-09 02:39:54.0 
+0100
 intltool-0.51.0.orig/intltool-update.in2015-06-19 01:52:07.171228154 
+0200
+@@ -1062,7 +1062,7 @@ 
+   }
+ }
+ 
+-if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+ {
+   my $rest = $3;
+   my $untouched = $1;
+@@ -1068,7 +1068,7 @@
+   my $untouched = $1;
+   my $sub = "";
+ # Ignore recursive definitions of variables
+-$sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ 
/\${?$2}?/;
++$sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ 
/\$\{?$2}?/;
+ 
+   return SubstituteVariable ("$untouched$sub$rest");
+ }
+@@ -1190,10 +1190,10 @@ 
+   $name=~ s/\(+$//g;
+   $version =~ s/\(+$//g;
+ 
+-  $varhash{"PACKAGE_NAME"} = $name if (not $name =~ 
/\${?AC_PACKAGE_NAME}?/);
+-  $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-  $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ 
/\${?AC_PACKAGE_VERSION}?/);
+-  $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++  $varhash{"PACKAGE_NAME"} = $name if (not $name =~ 
/\$\{?AC_PACKAGE_NAME}?/);
++  $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++  $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ 
/\$\{?AC_PACKAGE_VERSION}?/);
++  $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+ }
+ 
+ if 

01/01: gnu: poppler: Fix CVE-2017-{9775,9776}.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 95bbaa02aa63bc5eae36f686f1ed9915663aa4cf
Author: Leo Famulari 
Date:   Thu Jun 29 03:10:30 2017 -0400

gnu: poppler: Fix CVE-2017-{9775,9776}.

* gnu/packages/pdf.scm (poppler)[replacement]: New field.
(poppler-0.56.0): New variable.
(poppler-qt4, poppler-qt5): Use 'package/inherit'.
---
 gnu/packages/pdf.scm | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 5ccaa38..dce02a7 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -76,6 +76,7 @@
 (define-public poppler
   (package
(name "poppler")
+   (replacement poppler-0.56.0)
(version "0.52.0")
(source (origin
 (method url-fetch)
@@ -129,15 +130,27 @@
(license license:gpl2+)
(home-page "https://poppler.freedesktop.org/;)))
 
-(define-public poppler-qt4
+(define poppler-0.56.0
   (package (inherit poppler)
+  (version "0.56.0")
+  (source
+(origin
+  (method url-fetch)
+  (uri (string-append "https://poppler.freedesktop.org/poppler-;
+  version ".tar.xz"))
+  (sha256
+   (base32
+"0wviayidfv2ix2ql0d4nl9r1ia6qi5kc1nybd9vjx27dk7gvm7c6"))
+
+(define-public poppler-qt4
+  (package/inherit poppler
(name "poppler-qt4")
(inputs `(("qt-4" ,qt-4)
  ,@(package-inputs poppler)))
(synopsis "Qt4 frontend for the Poppler PDF rendering library")))
 
 (define-public poppler-qt5
-  (package (inherit poppler)
+  (package/inherit poppler
(name "poppler-qt5")
(inputs `(("qtbase" ,qtbase)
  ,@(package-inputs poppler)))

branch master updated (1b6d3b7 -> 95bbaa0)

[Leo Famulari]

lfam pushed a change to branch master
in repository guix.

  from  1b6d3b7   gnu: thermald: Add file-name for source.
   new  95bbaa0   gnu: poppler: Fix CVE-2017-{9775,9776}.

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/pdf.scm | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

01/02: gnu: thermald: Only build on i686 and x86_64.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 86ee76254bbb3c148907c142dc08c006778349bb
Author: Efraim Flashner 
Date:   Thu Jun 29 23:08:02 2017 +0300

gnu: thermald: Only build on i686 and x86_64.

* gnu/packages/admin.scm (thermald)[supported-systems]: New field.
---
 gnu/packages/admin.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2cc5200..5bb9886 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2263,4 +2263,6 @@ make it a perfect utility on modern distros.")
 (synopsis "CPU scaling for thermal management")
 (description "The Linux Thermal Daemon helps monitor and control 
temperature
 on systems running the Linux kernel.")
+;; arm and aarch64 don't have cpuid.h
+(supported-systems '("i686-linux" "x86_64-linux"))
 (license license:gpl2+)))

02/02: gnu: thermald: Add file-name for source.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 1b6d3b7a23d7f0b0dda18f3edeb8c5007ca61cc3
Author: Efraim Flashner 
Date:   Thu Jun 29 23:09:19 2017 +0300

gnu: thermald: Add file-name for source.

* gnu/packages/admin.scm (thermald)[source]: Add file-name field.
---
 gnu/packages/admin.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5bb9886..7012eb6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2224,6 +2224,7 @@ make it a perfect utility on modern distros.")
   (method url-fetch)
   (uri (string-append "https://github.com/01org/thermal_daemon/archive/v;
   version ".tar.gz"))
+  (file-name (string-append name "-" version ".tar.gz"))
   (sha256 (base32
"14klz9fnvi9jdlaqwrp61xa5nh051n8ykrs1fh1wxd7j66qf2fn6"
 (build-system gnu-build-system)

branch master updated (ef2c7fb -> 1b6d3b7)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  ef2c7fb   gnu: libgcrypt: Add mitigation for CVE-2017-7526.
   new  86ee762   gnu: thermald: Only build on i686 and x86_64.
   new  1b6d3b7   gnu: thermald: Add file-name for source.

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

01/01: gnu: glibc/linux: Add patches for CVE-2017-1000366.

[Ludovic Court�s]

civodul pushed a commit to branch core-updates
in repository guix.

commit 503a4df904b8d4b82caebdb17db9c5f76a952418
Author: Ludovic Courtès 
Date:   Thu Jun 29 12:53:14 2017 +0200

gnu: glibc/linux: Add patches for CVE-2017-1000366.

* gnu/packages/patches/glibc-CVE-2017-1000366-pt1.patch,
gnu/packages/patches/glibc-CVE-2017-1000366-pt2.patch,
gnu/packages/patches/glibc-CVE-2017-1000366-pt3.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/base.scm (glibc/linux)[source](patches): Add them.
[replacement]: Remove.
(glibc-2.25-patched): Remove.
(glibc-2.24, glibc-2.23, glibc-2.22, glibc-2.21)
(glibc-locales): Remove 'replacement' field.
---
 gnu/packages/base.scm | 25 -
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e81516d..ecde178 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -514,7 +514,6 @@ store.")
   (package
(name "glibc")
(version "2.25")
-   (replacement glibc-2.25-patched)
(source (origin
 (method url-fetch)
 (uri (string-append "mirror://gnu/glibc/glibc-"
@@ -533,7 +532,10 @@ store.")
 (patches (search-patches "glibc-ldd-x86_64.patch"
  "glibc-versioned-locpath.patch"
  "glibc-o-largefile.patch"
- "glibc-memchr-overflow-i686.patch"
+ "glibc-memchr-overflow-i686.patch"
+ "glibc-CVE-2017-1000366-pt1.patch"
+ "glibc-CVE-2017-1000366-pt2.patch"
+ "glibc-CVE-2017-1000366-pt3.patch"
(build-system gnu-build-system)
 
;; Glibc's  refers to , for instance, so glibc
@@ -769,20 +771,6 @@ GLIBC/HURD for a Hurd host"
 (define-syntax glibc
   (identifier-syntax (glibc-for-target)))
 
-(define glibc-2.25-patched
-  (package
-(inherit glibc)
-(replacement #f)
-(source (origin
-  (inherit (package-source glibc))
-  (patches (search-patches "glibc-ldd-x86_64.patch"
-   "glibc-versioned-locpath.patch"
-   "glibc-o-largefile.patch"
-   "glibc-vectorized-strcspn-guards.patch"
-   "glibc-CVE-2017-1000366-pt1.patch"
-   "glibc-CVE-2017-1000366-pt2.patch"
-   "glibc-CVE-2017-1000366-pt3.patch"))
-
 ;; Below are old libc versions, which we use mostly to build locale data in
 ;; the old format (which the new libc cannot cope with.)
 
@@ -790,7 +778,6 @@ GLIBC/HURD for a Hurd host"
   (package
 (inherit glibc)
 (version "2.24")
-(replacement #f)
 (source (origin
   (inherit (package-source glibc))
   (uri (string-append "mirror://gnu/glibc/glibc-"
@@ -810,7 +797,6 @@ GLIBC/HURD for a Hurd host"
   (package
 (inherit glibc)
 (version "2.23")
-(replacement #f)
 (source (origin
   (inherit (package-source glibc))
   (uri (string-append "mirror://gnu/glibc/glibc-"
@@ -830,7 +816,6 @@ GLIBC/HURD for a Hurd host"
   (package
 (inherit glibc)
 (version "2.22")
-(replacement #f)
 (source (origin
   (inherit (package-source glibc))
   (uri (string-append "mirror://gnu/glibc/glibc-"
@@ -858,7 +843,6 @@ GLIBC/HURD for a Hurd host"
   (package
 (inherit glibc-2.22)
 (version "2.21")
-(replacement #f)
 (source (origin
   (inherit (package-source glibc-2.22))
   (uri (string-append "mirror://gnu/glibc/glibc-"
@@ -871,7 +855,6 @@ GLIBC/HURD for a Hurd host"
   (package
 (inherit glibc)
 (name "glibc-locales")
-(replacement #f)
 (source (origin (inherit (package-source glibc))
 (patches (cons (search-patch "glibc-locales.patch")
(origin-patches (package-source glibc))

branch core-updates updated (60724d6 -> 503a4df)

[Ludovic Court�s]

civodul pushed a change to branch core-updates
in repository guix.

  from  60724d6   gnu: python-pytest: Build with 'bash' instead of 
'bash-final'.
   new  503a4df   gnu: glibc/linux: Add patches for CVE-2017-1000366.

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

branch master updated (604e494 -> ef2c7fb)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  604e494   gnu: mes: Update to 0.8.
   new  ef2c7fb   gnu: libgcrypt: Add mitigation for CVE-2017-7526.

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/gnupg.scm | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

01/01: gnu: libgcrypt: Add mitigation for CVE-2017-7526.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit ef2c7fb5da058030677da4abe9fec177357ee25d
Author: Efraim Flashner 
Date:   Thu Jun 29 21:04:09 2017 +0300

gnu: libgcrypt: Add mitigation for CVE-2017-7526.

* gnu/packages/gnupg.scm (libgcrypt)[replacment]: New field.
(libgcrypt-1.7.8): New variable.
(libgcrypt-1.5)[replacment]: New field.
---
 gnu/packages/gnupg.scm | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 9efd32a..e42afba 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014 Eric Bavier 
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver 
 ;;; Copyright © 2015 Paul van der Walt 
-;;; Copyright © 2015, 2016 Efraim Flashner 
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner 
 ;;; Copyright © 2015, 2016 Ricardo Wurmus 
 ;;; Copyright © 2016 Christopher Allan Webber 
 ;;; Copyright © 2016 ng0 
@@ -82,6 +82,7 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
   (package
 (name "libgcrypt")
+(replacement libgcrypt-1.7.8)
 (version "1.7.6")
 (source (origin
  (method url-fetch)
@@ -115,8 +116,22 @@ generation.")
 (properties '((ftp-server . "ftp.gnupg.org")
   (ftp-directory . "/gcrypt/libgcrypt")
 
+(define libgcrypt-1.7.8
+  (package
+(inherit libgcrypt)
+(replacement #f)
+(version "1.7.8")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
+ version ".tar.bz2"))
+ (sha256
+  (base32
+   "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"))
+
 (define-public libgcrypt-1.5
   (package (inherit libgcrypt)
+(replacement #f)
 (version "1.5.6")
 (source
  (origin

01/01: gnu: mes: Update to 0.8.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch master
in repository guix.

commit 604e494dc025774b095ac8ffe5206b5d0572c9a1
Author: Jan Nieuwenhuizen 
Date:   Sun Jun 25 17:52:57 2017 +0200

gnu: mes: Update to 0.8.

* gnu/packages/mes.scm (mes): Update to 0.8.
---
 gnu/packages/mes.scm | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index f85f230..3fcf5f0 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -54,25 +54,24 @@ extensive examples, including parsers for the Javascript 
and C99 languages.")
 (license (list gpl3+ lgpl3+
 
 (define-public mes
-  (let ((commit "7fdca75d2188b28df806b34ec92627d57aafa9ae")
-(revision "0")
-(triplet "i686-unknown-linux-gnu")
-(version "0.7"))
+  (let ((triplet "i686-unknown-linux-gnu"))
 (package
   (name "mes")
-  (version (string-append version "-" revision "." (string-take commit 7)))
+  (version "0.8")
   (source (origin
-(method git-fetch)
-(uri (git-reference
-  (url "https://gitlab.com/janneke/mes;)
-  (commit commit)))
-(file-name (string-append name "-" version))
+(method url-fetch)
+(uri (string-append "https://gitlab.com/janneke/mes;
+"/repository/archive.tar.gz?ref=v"
+version))
+(file-name (string-append name "-" version ".tar.gz"))
 (sha256
- (base32 
"0fvzr1ai2rmi46zdi5b2bdjb6s8ip78mkmsk02yxl46rajmp2pb1"
+ (base32
+  "1igmrks20ci6l5c0jx2bn4swf0w8jy5inhg61cwld9d7hwanmdnj"
   (build-system gnu-build-system)
   (supported-systems '("i686-linux" "x86_64-linux"))
   (propagated-inputs
-   `(("nyacc" ,nyacc)))
+   `(("mescc-tools" ,mescc-tools)
+ ("nyacc" ,nyacc)))
   (native-inputs
`(("guile" ,guile-2.2)
  ,@(if (string-prefix? "x86_64-linux" (or (%current-target-system)

branch master updated (9ae3fcb -> 604e494)

[Jan Nieuwenhuizen]

janneke pushed a change to branch master
in repository guix.

  from  9ae3fcb   gnu: Add mescc-tools.
   new  604e494   gnu: mes: Update to 0.8.

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/mes.scm | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

01/01: gnu: Add mescc-tools.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch master
in repository guix.

commit 9ae3fcb9e873172b2accc2ed874eb05828db458d
Author: Jan Nieuwenhuizen 
Date:   Sun Jun 25 17:10:55 2017 +0200

gnu: Add mescc-tools.

* gnu/packages/mes.scm (mescc-tools): New variable.
---
 gnu/packages/mes.scm | 29 +
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 3203486..f85f230 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -100,3 +100,32 @@ consists of a mutual self-hosting [close to Guile-] Scheme 
interpreter
 prototype in C and a Nyacc-based C compiler in [Guile] Scheme.")
   (home-page "https://gitlab.com/janneke/mes;)
   (license gpl3+
+
+(define-public mescc-tools
+  (package
+(name "mescc-tools")
+(version "0.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append
+"https://github.com/oriansj/MESCC_Tools/archive/Release_;
+version
+".tar.gz"))
+  (file-name (string-append name "-" version ".tar.gz"))
+  (sha256
+   (base32
+"1lzi9sqv41269isn7in70q2hhh087n4v97zr5i2qzz69j2lkr3xb"
+(build-system gnu-build-system)
+(supported-systems '("i686-linux" "x86_64-linux"))
+(arguments
+ `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+   #:test-target "test"
+   #:phases (modify-phases %standard-phases
+  (delete 'configure
+(synopsis "Tools for the full source bootstrapping process")
+(description
+ "Mescc-tools is a collection of tools for use in a full source
+bootstrapping process.  Currently consists of the M0 macro assembler and the
+hex2 linker.")
+(home-page "https://github.com/oriansj/MESCC_Tools;)
+(license gpl3+)))

branch master updated (c0f5eee -> 9ae3fcb)

[Jan Nieuwenhuizen]

janneke pushed a change to branch master
in repository guix.

  from  c0f5eee   system: Add 'shadow' to %BASE-PACKAGES.
   new  9ae3fcb   gnu: Add mescc-tools.

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


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

branch master updated (b8d3a00 -> c0f5eee)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  b8d3a00   gnu: libxfce4ui: Do not propagate gtk+-2.
   new  c0f5eee   system: Add 'shadow' to %BASE-PACKAGES.

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.scm | 1 +
 1 file changed, 1 insertion(+)

01/01: system: Add 'shadow' to %BASE-PACKAGES.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit c0f5eee4b2cc737be222c4ba331d0c6373d565eb
Author: Ludovic Courtès 
Date:   Thu Jun 29 16:24:43 2017 +0200

system: Add 'shadow' to %BASE-PACKAGES.

Suggested by Göktuğ Kayaalp .

* gnu/system.scm (%base-packages): Add SHADOW.
---
 gnu/system.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/system.scm b/gnu/system.scm
index 5632029..0aec872 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -490,6 +490,7 @@ explicitly appear in OS."
  lsof ;for Guix's 'list-runtime-roots'
  pciutils usbutils
  util-linux inetutils isc-dhcp
+ shadow   ;for 'passwd'
 
  ;; wireless-tools is deprecated in favor of iw, but it's still what
  ;; many people are familiar with, so keep it around.

02/02: gnu: libxfce4ui: Do not propagate gtk+-2.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit b8d3a000efca885180277358caa3c4fe604168a5
Author: Ricardo Wurmus 
Date:   Tue Jun 27 09:31:50 2017 +0200

gnu: libxfce4ui: Do not propagate gtk+-2.

Propagation of both gtk+ and gtk+-2 causes a conflict to be detected,
preventing the installation of xfce.

* gnu/packages/xfce.scm (libxfce4ui)[propagated-inputs]: Move "gtk+-2"...
[inputs]: ...to here.
(garcon)[inputs]: Add "gtk+-2".
(xfce4-appfinder)[inputs]: Add "gtk+-2".
(xfce4-power-manager)[inputs]: Add "gtk+-2".
(ristretto)[inputs]: Add "gtk+-2".
---
 gnu/packages/xfce.scm | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d54b7f6..101909b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -159,13 +159,15 @@ storage system.")
  `(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
 (propagated-inputs
- `(("gtk+-2" ,gtk+-2)  ; required by libxfce4ui-1.pc
-   ("gtk+-3" ,gtk+); required by libxfce4ui-2.pc
+ `(("gtk+-3" ,gtk+); required by libxfce4ui-2.pc
;; libxfce4kbd-private-2.pc refers to all these.
("libxfce4util" ,libxfce4util)
("xfconf" ,xfconf)))
 (inputs `(("libsm" ,libsm)
   ("libice" ,libice)
+  ;; FIXME: required by libxfce4ui-1.pc, so should be propagated,
+  ;; but will lead to a conflict with gtk+.
+  ("gtk+-2" ,gtk+-2)
   ("startup-notification" ,startup-notification)))
 (home-page "http://www.xfce.org/;)
 (synopsis "Widgets library for Xfce")
@@ -221,6 +223,8 @@ development.")
  `(("pkg-config" ,pkg-config)
("intltool" ,intltool)
("glib:bin" ,glib "bin")))
+(inputs
+ `(("gtk+" ,gtk+-2)))
 (propagated-inputs
  `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc
 (home-page "http://www.xfce.org/;)
@@ -452,6 +456,7 @@ per window.")
("intltool" ,intltool)))
 (inputs
  `(("garcon" ,garcon)
+   ("gtk+" ,gtk+-2)
("libxfce4ui" ,libxfce4ui)))
 (home-page "http://www.xfce.org/;)
 (synopsis "Xfce application finder")
@@ -759,6 +764,7 @@ system resources, while still being visually appealing and 
user friendly.")
("intltool" ,intltool)))
 (inputs
  `(("lbxrandr" ,libxrandr)
+   ("gtk+" ,gtk+-2)
("upower" ,upower)
("libnotify" ,libnotify)
("libxfce4ui" ,libxfce4ui)))
@@ -792,6 +798,7 @@ inhibit interface which allows applications to prevent 
automatic sleep.")
("pkg-config" ,pkg-config)))
 (inputs
  `(("desktop-file-utils" ,desktop-file-utils)
+   ("gtk+" ,gtk+-2)
("libexif" ,libexif)
("libxfce4ui" ,libxfce4ui)
("librsvg" ,librsvg)

01/02: gnu: xfce: Build union instead of propagating inputs.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit c860d6ef235b47ec8181fbf390e0b42fbc95dcfe
Author: Ricardo Wurmus 
Date:   Tue Jun 27 09:51:33 2017 +0200

gnu: xfce: Build union instead of propagating inputs.

* gnu/packages/xfce.scm (xfce)[propagated-inputs]: Move all...
[inputs]: ...here.
[arguments]: Build a union.
---
 gnu/packages/xfce.scm | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d7d1372..d54b7f6 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -698,8 +698,17 @@ on your desktop.")
 (version (package-version xfce4-session))
 (source #f)
 (build-system trivial-build-system)
-(arguments '(#:builder (mkdir %output)))
-(propagated-inputs
+(arguments
+ '(#:modules ((guix build union))
+   #:builder
+   (begin
+ (use-modules (ice-9 match)
+  (guix build union))
+ (match %build-inputs
+   (((names . directories) ...)
+(union-build (assoc-ref %outputs "out")
+ directories))
+(inputs
  `(("exo"  ,exo)
("garcon"   ,garcon)
("gnome-icon-theme" ,gnome-icon-theme)

branch master updated (d34970e -> b8d3a00)

[Ricardo Wurmus]

rekado pushed a change to branch master
in repository guix.

  from  d34970e   gnu: clojure: Update "tools-reader-src" to 1.0.0.
   new  c860d6e   gnu: xfce: Build union instead of propagating inputs.
   new  b8d3a00   gnu: libxfce4ui: Do not propagate gtk+-2.

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

04/05: gnu: Add procenv.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit a73e7dd3b029fccec55afbbecf762cc8231dee5d
Author: Dave Love 
Date:   Mon Jun 26 15:28:12 2017 +0100

gnu: Add procenv.

* gnu/packages/linux.scm (procenv): New variable.

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 413f935..641c307 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -26,6 +26,7 @@
 ;;; Copyright © 2017 Clément Lassieur 
 ;;; Copyright © 2017 Rutger Helling 
 ;;; Copyright © 2017 nee 
+;;; Copyright © 2017 Dave Love 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -98,6 +99,8 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages selinux)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
@@ -4140,3 +4143,28 @@ NexGen, Rise, and SiS CPUs.")
 to data over the Media Transfer Protocol (MTP).  Unprivileged users can mount
 the MTP device as a filesystem.")
 (license license:gpl3)))
+
+(define-public procenv
+  (package
+   (name "procenv")
+   (version "0.49")
+   (source
+(origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/jamesodhunt/procenv/archive/;
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+  (base32 "0brzf6185hb76imw107cl21c8lzwiywkxi3jknihrk86bvvicd0d"
+   (build-system gnu-build-system)
+   (arguments `(#:configure-flags '("--disable-silent-rules")))
+   (inputs `(("expat" ,expat) ("libcap" ,libcap) ("check" ,check)
+ ("groff" ,groff)   ; for tests
+ ("libselinux" ,libselinux)))
+   (synopsis "Utility to show process environment")
+   (description "Procenv is a command-line tool that displays as much detail 
about
+itself and its environment as possible.  It can be used as a test
+tool, to understand the type of environment a process runs in, and for
+comparing system environments.")
+   (home-page "http://github.com/jamesodhunt/procenv/;)
+   (license license:gpl3+)))

05/05: gnu: clojure: Update "tools-reader-src" to 1.0.0.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit d34970ee2ba0f65c491d306073c9b3a598516f1d
Author: Alex Vong 
Date:   Sat Jun 24 19:16:33 2017 +0800

gnu: clojure: Update "tools-reader-src" to 1.0.0.

* gnu/packages/java.scm (clojure)[inputs]: Update "tools-reader-src" to
1.0.0.

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

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e81ee40..e074dab 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1839,8 +1839,8 @@ IcedTea build harness.")
   "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0"))
  ("tools-reader-src"
   ,(submodule "tools.reader/archive/tools.reader-"
-  "0.10.0"
-  
"09i3lzbhr608h76mhdjm3932gg9xi8sflscla3c5f0v1nkc28cnr"
+  "1.0.0"
+  
"1lafblmmj4hkg0aqrf19qkdw9wdcsh3qxmn6cbkmnzbhffpyv2lv"
   (home-page "https://clojure.org/;)
   (synopsis "Lisp dialect running on the JVM")
   (description "Clojure is a dynamic, general-purpose programming language,

02/05: gnu: node: Update to 8.1.2.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit aafcfffd93250a2d92f34121c82b54c32797ef35
Author: Jelle Licht 
Date:   Thu Jun 22 15:04:55 2017 +0200

gnu: node: Update to 8.1.2.

* gnu/packages/node.scm (node): Update to 8.1.2.
(node)[arguments]: Disabled more tests.

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

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 69bd928..d4415fc 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -40,14 +40,14 @@
 (define-public node
   (package
 (name "node")
-(version "7.10.0")
+(version "8.1.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "http://nodejs.org/dist/v; version
   "/node-v" version ".tar.gz"))
   (sha256
(base32
-"00vdmb0z8b2sd547bkksgy9dfq5gi5xfd9b3f0rc4ngvpzl3z164"))
+"0l92gar1pivzaiwffiiiz2f2m5k39sl5fphlfnvy0ml9hrjb65yp"))
   ;; https://github.com/nodejs/node/pull/9077
   (patches (search-patches "node-9077.patch"
 (build-system gnu-build-system)
@@ -83,10 +83,18 @@
((" \\$\\(MAKE\\) jslint") "")
((" \\$\\(MAKE\\) cpplint\n") ""))
 
+ ;; FIXME: This test seems to depends on files that are not
+ ;; available in the bundled v8. See
+ ;; https://github.com/nodejs/node/issues/13344
+ (for-each delete-file
+   '("test/addons-napi/test_general/testInstanceOf.js"))
  ;; FIXME: These tests fail in the build container, but they don't
  ;; seem to be indicative of real problems in practice.
  (for-each delete-file
-   '("test/parallel/test-dgram-membership.js"
+   '("test/async-hooks/test-ttywrap.readstream.js"
+ "test/parallel/test-util-inspect.js"
+ "test/parallel/test-v8-serdes.js"
+ "test/parallel/test-dgram-membership.js"
  "test/parallel/test-cluster-master-error.js"
  "test/parallel/test-cluster-master-kill.js"
  "test/parallel/test-npm-install.js"

03/05: gnu: ansible: Apply experimental patch to deal with wrapping of ansible script.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit b786661309ab8194eb5e5a3ebf55d35be2e0bb01
Author: Jelle Licht 
Date:   Thu Jun 22 21:26:49 2017 +0200

gnu: ansible: Apply experimental patch to deal with wrapping of ansible 
script.

See  for 
the
rationale.

* gnu/packages/patches/ansible-wrap-program-hack.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/admin.scm (ansible)[source]: Use it.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk   |  1 +
 gnu/packages/admin.scm |  3 ++-
 .../patches/ansible-wrap-program-hack.patch| 22 ++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index b0690ed..83b0196 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -502,6 +502,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/aegis-test-fixup-1.patch\
   %D%/packages/patches/aegis-test-fixup-2.patch\
   %D%/packages/patches/agg-am_c_prototype.patch\
+  %D%/packages/patches/ansible-wrap-program-hack.patch \
   %D%/packages/patches/antiword-CVE-2014-8123.patch\
   %D%/packages/patches/apr-skip-getservbyname-test.patch   \
   %D%/packages/patches/aspell-default-dict-dir.patch   \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 96ca6a7..2cc5200 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1366,7 +1366,8 @@ of supported upstream metrics systems simultaneously.")
(uri (pypi-uri "ansible" version))
(sha256
 (base32
- "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"
+ "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))
+   (patches (search-patches "ansible-wrap-program-hack.patch"
 (build-system python-build-system)
 (native-inputs
  `(("python2-pycrypto" ,python2-pycrypto)
diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch 
b/gnu/packages/patches/ansible-wrap-program-hack.patch
new file mode 100644
index 000..c2e1028
--- /dev/null
+++ b/gnu/packages/patches/ansible-wrap-program-hack.patch
@@ -0,0 +1,22 @@
+Ansible changes its behaviour depending on the name of the script that it is
+called as. Make it deal with guix' .real wrapper scripts.
+
+FIXME: Remove once wrapping ansible works properly.
+See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html.
+--- ansible-2.3.0.0/bin/ansible2017-04-12 16:08:05.0 +0200
 ansible-2.3.0.0-fixed/bin/ansible  2017-05-21 20:11:18.720872385 +0200
+@@ -75,7 +75,13 @@
+ # sometimes add that
+ target = target[:-1]
+
+-if len(target) > 1:
++if target[-1] == "real" and target[0].startswith('.'):
++target = target[:-1]
++target[0] = target[0][1:]
++if len(target) > 1 and target[1] != "real" :
++sub = target[1]
++myclass = "%sCLI" % sub.capitalize()
++elif len(target) > 2 and target[2] == "real" :
+ sub = target[1]
+ myclass = "%sCLI" % sub.capitalize()
+ elif target[0] == 'ansible':

01/05: gnu: lapack: Install libraries to PREFIX/lib, not PREFIX/lib64.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 3ab869b63fc43c8d13864d711c2dc55fb3691456
Author: Ludovic Courtès 
Date:   Thu Jun 29 14:46:07 2017 +0200

gnu: lapack: Install libraries to PREFIX/lib, not PREFIX/lib64.

This fixes a regression introduced in
ef39a17717a10a7f406730258acfdb07934c7255, which would break
python-scipy ("undefined reference to `zungqr_'").

* gnu/packages/maths.scm (lapack)[arguments]: Add
"-DCMAKE_INSTALL_LIBDIR" to #:configure-flags.
---
 gnu/packages/maths.scm | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 851694b..5e4cd85 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -442,11 +442,18 @@ large scale eigenvalue problems.")
 (inputs `(("fortran" ,gfortran)
   ("python" ,python-2)))
 (arguments
- `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"
-   "-DLAPACKE=ON"
-
-   ;; Build the 'LAPACKE_clatms' functions.
-   "-DLAPACKE_WITH_TMG=ON")
+ `(#:configure-flags (list
+  ;; Install to PREFIX/lib (the default is
+  ;; PREFIX/lib64).
+  (string-append "-DCMAKE_INSTALL_LIBDIR="
+ (assoc-ref %outputs "out")
+ "/lib")
+
+  "-DBUILD_SHARED_LIBS:BOOL=YES"
+  "-DLAPACKE=ON"
+
+  ;; Build the 'LAPACKE_clatms' functions.
+  "-DLAPACKE_WITH_TMG=ON")
#:phases (alist-cons-before
  'check 'patch-python
  (lambda* (#:key inputs #:allow-other-keys)

branch master updated (2eb95ad -> d34970e)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  2eb95ad   gnu: ovmf: Only build 32-bit firmware on i686-linux.
   new  3ab869b   gnu: lapack: Install libraries to PREFIX/lib, not 
PREFIX/lib64.
   new  aafcfff   gnu: node: Update to 8.1.2.
   new  b786661   gnu: ansible: Apply experimental patch to deal with 
wrapping of ansible script.
   new  a73e7dd   gnu: Add procenv.
   new  d34970e   gnu: clojure: Update "tools-reader-src" to 1.0.0.

The 5 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 |  3 ++-
 gnu/packages/java.scm  |  4 ++--
 gnu/packages/linux.scm | 28 ++
 gnu/packages/maths.scm | 17 +
 gnu/packages/node.scm  | 14 ---
 .../patches/ansible-wrap-program-hack.patch| 22 +
 7 files changed, 78 insertions(+), 11 deletions(-)
 create mode 100644 gnu/packages/patches/ansible-wrap-program-hack.patch

01/01: gnu: ovmf: Only build 32-bit firmware on i686-linux.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 2eb95ade8f08bfd418b1470f1093c5b4bf2332ee
Author: Efraim Flashner 
Date:   Thu Jun 29 12:54:54 2017 +0300

gnu: ovmf: Only build 32-bit firmware on i686-linux.

* gnu/packages/firmware.scm (ovmf)[arguments]: Only when the build
machine is x86_64-linux should the 64-bit firmware be built and
installed.
---
 gnu/packages/firmware.scm | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 9106eec..1da2480 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès 
 ;;; Copyright © 2016 Eric Bavier 
 ;;; Copyright © 2017 David Craven 
+;;; Copyright © 2017 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -275,13 +276,15 @@ use of coreboot.")
(("^ACTIVE_PLATFORM[ ]*=.*$")
 "ACTIVE_PLATFORM = OvmfPkg/OvmfPkgIa32.dsc\n"))
  (zero? (system* "build"
- (add-after 'build 'build-x64
-   (lambda _
- (substitute* "Conf/target.txt"
-   (("^TARGET_ARCH[ ]*=.*$") "TARGET_ARCH = X64\n")
-   (("^ACTIVE_PLATFORM[ ]*=.*$")
-"ACTIVE_PLATFORM = OvmfPkg/OvmfPkgX64.dsc\n"))
- (zero? (system* "build"
+ ,@(if (string=? "x86_64-linux" (%current-system))
+ '(add-after 'build 'build-x64
+   (lambda _
+ (substitute* "Conf/target.txt"
+   (("^TARGET_ARCH[ ]*=.*$") "TARGET_ARCH = X64\n")
+   (("^ACTIVE_PLATFORM[ ]*=.*$")
+"ACTIVE_PLATFORM = OvmfPkg/OvmfPkgX64.dsc\n"))
+ (zero? (system* "build"
+ '())
  (delete 'build)
  (replace 'install
(lambda* (#:key outputs #:allow-other-keys)
@@ -290,8 +293,10 @@ use of coreboot.")
(mkdir-p fmw)
(copy-file "Build/OvmfIa32/RELEASE_GCC49/FV/OVMF.fd"
   (string-append fmw "/ovmf_ia32.bin"))
-   (copy-file "Build/OvmfX64/RELEASE_GCC49/FV/OVMF.fd"
-  (string-append fmw "/ovmf_x64.bin")))
+   ,@(if (string=? "x86_64-linux" (%current-system))
+   '((copy-file "Build/OvmfX64/RELEASE_GCC49/FV/OVMF.fd"
+(string-append fmw "/ovmf_x64.bin")))
+   '()))
  #t)
 (supported-systems '("x86_64-linux" "i686-linux"))
 (home-page "http://www.tianocore.org;)

branch master updated (8363a83 -> 2eb95ad)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  8363a83   gnu: openh264: Fix building on armhf and aarch64.
   new  2eb95ad   gnu: ovmf: Only build 32-bit firmware on i686-linux.

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


Summary of changes:
 gnu/packages/firmware.scm | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

branch master updated (fcf4003 -> 8363a83)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  fcf4003   gnu: r-spams: Update to 2.6-2017-03-22.
   new  8363a83   gnu: openh264: Fix building on armhf and aarch64.

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/video.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

01/01: gnu: openh264: Fix building on armhf and aarch64.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 8363a8351728007f8d624f4a49ecd7b47fd166c7
Author: Efraim Flashner 
Date:   Thu Jun 29 11:44:25 2017 +0300

gnu: openh264: Fix building on armhf and aarch64.

* gnu/packages/video.scm (openh264)[arguments]: Add 'CC=gcc' to
the #:make-flags.
---
 gnu/packages/video.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 32f09db..816fb9d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2001,7 +2001,8 @@ of modern, widely supported codecs.")
  `(("nasm" ,nasm)
("python" ,python)))
 (arguments
- '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+  "CC=gcc")
#:test-target "test"
#:phases (modify-phases %standard-phases
   ;; no configure script

01/01: gnu: r-spams: Update to 2.6-2017-03-22.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit fcf40039504c493341977fbed76009c96924633f
Author: Efraim Flashner 
Date:   Thu Jun 29 10:02:32 2017 +0300

gnu: r-spams: Update to 2.6-2017-03-22.

* gnu/packages/statistics.scm (r-spams): Update to 2.6-2017-03-22.
[arguments]: Remove R-3.3 work-around and syntax fixes, add phase to
prevent tuning r-spams to the compiling hardware.
---
 gnu/packages/statistics.scm | 27 ---
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 832b8dc..41c0668 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus 
 ;;; Copyright © 2015 Vicente Vera Parra 
 ;;; Copyright © 2016 Andreas Enge 
-;;; Copyright © 2016 Efraim Flashner 
+;;; Copyright © 2016, 2017 Efraim Flashner 
 ;;; Copyright © 2016 Pjotr Prins 
 ;;; Copyright © 2016 Roel Janssen 
 ;;; Copyright © 2016 Ben Woodcroft 
@@ -3768,37 +3768,26 @@ from within R.")
 (define-public r-spams
   (package
 (name "r-spams")
-(version "2.5-svn2014-07-04")
+(version "2.6-2017-03-22")
 (source
  (origin
(method url-fetch)
-   (uri (string-append "https://gforge.inria.fr/frs/download.php/33815/;
+   (uri (string-append "https://gforge.inria.fr/frs/download.php/36615/;
"spams-R-v" version ".tar.gz"))
(sha256
 (base32
- "1k459jg9a334slkw31w63l4d39xszjzsng7dv5j1mp78zifz7hvx"
+ "13z2293jixf1r9g8dyy856xrhvpjr2ln2n9smn6644126r9hmhkx"
 (build-system r-build-system)
 (arguments
  `(#:phases
(modify-phases %standard-phases
  (add-after 'unpack 'chdir
(lambda _ (chdir "spams") #t))
- ;; Since R 3.3.0 including R headers inside of an extern "C" block
- ;; causes C headers to be included, which results in a lot of
- ;; duplicate definitions.  This can be avoided by defining
- ;; NO_C_HEADERS before including the R headers.
- (add-after 'chdir 'patch-use-of-R-headers
+ ;; Don't tune for the building machine
+ (add-after 'chdir 'no-mtune
(lambda _
- (substitute* "src/spams.cpp"
-   (("#include " line)
-(string-append "#define NO_C_HEADERS\n" line)))
- #t))
- ;; This looks like a syntax error.
- (add-after 'chdir 'patch-isnan
-   (lambda _
- (substitute* '"src/spams/linalg/linalg.h"
-   (("if isnan\\(lambda\\) \\{")
-"if (isnan(lambda)) {"))
+ (substitute* "src/Makevars"
+   (("-mtune=native") ""))
  #t)
 (propagated-inputs
  `(("r-lattice" ,r-lattice)

branch master updated (691ae7f -> fcf4003)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  691ae7f   gnu: wdiff: Remove unused screen input.
   new  fcf4003   gnu: r-spams: Update to 2.6-2017-03-22.

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/statistics.scm | 27 ---
 1 file changed, 8 insertions(+), 19 deletions(-)