branch master updated (b61cb24 -> ede121d)

2018-05-08 Thread Chris Marusich
marusich pushed a change to branch master
in repository guix.

  from  b61cb24   telephony: add twinkle
   new  ede121d   guix: Separate the package name and version with "@", not 
"-".

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:
 NEWS  |  5 +
 gnu/packages/commencement.scm |  2 +-
 guix/packages.go.134WZR   |  0
 guix/packages.scm | 13 +
 tests/graph.scm   |  2 +-
 tests/profiles.scm| 11 +--
 6 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 guix/packages.go.134WZR



01/01: guix: Separate the package name and version with "@", not "-".

2018-05-08 Thread Chris Marusich
marusich pushed a commit to branch master
in repository guix.

commit ede121de426f9c56820852888a0b370f0ccbce49
Author: Chris Marusich 
Date:   Sun Apr 8 16:51:42 2018 -0700

guix: Separate the package name and version with "@", not "-".

* guix/packages.scm (package-full-name): By default, use "@" to separate
  the package name and package version.  Add an optional delimiter
  argument so that there is still a way to explicitly use a different
  delimiter.
* gnu/packages/commencement.scm (gcc-boot0) : Adjust
  accordingly.
* tests/graph.scm: Adjust accordingly.
* tests/profiles.scm: Adjust accordingly.
* NEWS: Mention the change.

Fixes: .
Reported by Pierre Neidhardt .
---
 NEWS  |  5 +
 gnu/packages/commencement.scm |  2 +-
 guix/packages.go.134WZR   |  0
 guix/packages.scm | 13 +
 tests/graph.scm   |  2 +-
 tests/profiles.scm| 11 +--
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index 2c898e6..ca57f5d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,11 @@ Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 

 
 Please send Guix bug reports to bug-g...@gnu.org.
 
+* Changes in 0.15.0 (since 0.14.0)
+** Programming interfaces
+
+*** package-full-name (guix packages) now uses "@" as its delimiter.
+()
 * Changes in 0.14.0 (since 0.13.0)
 
 ** Package management
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1026ee8..2791409 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -282,7 +282,7 @@
 ;; Drop trailing letters, as gmp-6.0.0a unpacks
 ;; into gmp-6.0.0.
 `(symlink ,(string-trim-right
-(package-full-name lib)
+(package-full-name lib "-")
 char-set:letter)
   ,(package-name lib)))
   (list gmp-6.0 mpfr mpc
diff --git a/guix/packages.go.134WZR b/guix/packages.go.134WZR
new file mode 100644
index 000..e69de29
diff --git a/guix/packages.scm b/guix/packages.scm
index b5c0b60..e0ab720 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -388,10 +388,11 @@ object."
 (define-condition-type  
   package-cross-build-system-error?)
 
-
-(define (package-full-name package)
-  "Return the full name of PACKAGE--i.e., `NAME-VERSION'."
-  (string-append (package-name package) "-" (package-version package)))
+(define* (package-full-name package #:optional (delimiter "@"))
+  "Return the full name of PACKAGE--i.e., `NAME@VERSION'.  By specifying
+DELIMITER (a string), you can customize what will appear between the name and
+the version.  By default, DELIMITER is \"@\"."
+  (string-append (package-name package) delimiter (package-version package)))
 
 (define (%standard-patch-inputs)
   (let* ((canonical (module-ref (resolve-interface '(gnu packages base))
@@ -935,6 +936,10 @@ and return it."
   (($  name version source build-system
 args inputs propagated-inputs native-inputs
 self-native-input? outputs)
+   ;; Even though we prefer to use "@" to separate the package
+   ;; name from the package version in various user-facing parts
+   ;; of Guix, checkStoreName (in nix/libstore/store-api.cc)
+   ;; prohibits the use of "@", so use "-" instead.
(or (make-bag build-system (string-append name "-" version)
  #:system system
  #:target target
diff --git a/tests/graph.scm b/tests/graph.scm
index 5faa192..b86ae4a 100644
--- a/tests/graph.scm
+++ b/tests/graph.scm
@@ -134,7 +134,7 @@ edges."
  (map (lambda (destination)
 (list "p-0.drv"
   (string-append
-   (package-full-name destination)
+   (package-full-name destination "-")
".drv")))
   implicit)))
 
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 92eb08c..8d3cfe9 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -242,8 +242,8 @@
 #:hooks '()
 #:locales? #t
 #:target target)))
-(define (find-input name)
-  (let ((name (string-append name ".drv")))
+(define (find-input package)
+  (let ((name (string-append (package-full-name package "-") ".drv")))
 (any (lambda (input)
(let 

branch master updated (f1f6f22 -> b61cb24)

2018-05-08 Thread Eric Bavier
bavier pushed a change to branch master
in repository guix.

  from  f1f6f22   gnu: emacs-helm-shell-history: Fix byte compilation.
   new  b61cb24   telephony: add twinkle

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



01/01: telephony: add twinkle

2018-05-08 Thread Eric Bavier
bavier pushed a commit to branch master
in repository guix.

commit b61cb24492c150b5eebb5227f2a7c32e4d42e1d4
Author: Jovany Leandro G.C 
Date:   Mon May 7 17:35:23 2018 -0500

telephony: add twinkle

From 1a2504b36e0775443587faf43e3a2d9467769866 Mon Sep 17 00:00:00 2001
From: "Jovany Leandro G.C" 
Date: Mon, 7 May 2018 17:32:57 -0500
Subject: [PATCH] telephony: add twinkle

Signed-off-by: Eric Bavier 
---
 gnu/packages/telephony.scm | 68 ++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 5210e73..40e5705 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2016, 2017 Nils Gillmann 
 ;;; Copyright © 2017 Ricardo Wurmus 
 ;;; Copyright © 2017 Tobias Geerinckx-Rice 
+;;; Copyright © 2018 Jovany Leandro G.C 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,6 +31,7 @@
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
@@ -42,9 +44,15 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages flex)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu))
 
 (define-public commoncpp
@@ -482,3 +490,63 @@ Mumble consists of two applications for separate usage:
 (license (list license:bsd-3
;; The bundled celt is bsd-2. Remove after 1.3.0.
license:bsd-2
+
+(define-public twinkle
+  (let ((commit "02e1d1538af3337134bd7381dcd95f8d7775b30f")
+(revision "1"))
+  (package
+   (name "twinkle")
+   (version (git-version "1.10.1" revision commit))
+   (source (origin
+ (method git-fetch)
+ (uri (git-reference
+   (url "https://github.com/LubosD/twinkle;)
+   (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+  (base32
+   "0ds4rp4vr1wagn4m4m7ldqbsx5vgmgbfcqqgyhn1wf6s1dm0020z"
+   (build-system cmake-build-system)
+   (arguments
+`(#:tests? #f ; no test target
+  #:phases
+  (modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+   (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+   (wrap-program (string-append out "/bin/twinkle")
+ `("QT_PLUGIN_PATH" ":" prefix
+   ,(map (lambda (label)
+   (string-append (assoc-ref inputs label)
+  "/lib/qt5/plugins"))
+ '("qtbase" "qtdeclarative")))
+ `("QML2_IMPORT_PATH" ":" prefix
+   ,(map (lambda (label)
+   (string-append (assoc-ref inputs label)
+  "/lib/qt5/qml"))
+ '("qtdeclarative" "qtquickcontrols"
+   #t))
+   (native-inputs
+`(("bison" ,bison)
+  ("flex" ,flex)
+  ("readline" ,readline)
+  ("file" ,file)
+  ("ucommon" ,ucommon)
+  ("ccrtp" ,ccrtp)
+  ("libxml2" ,libxml2)
+  ("speex" ,speex)
+  ("speexdsp" ,speexdsp)
+  ("libsndfile" ,libsndfile)
+  ("alsa-lib" ,alsa-lib)
+  ("qttools" ,qttools)))
+   (inputs
+`(("qtbase" ,qtbase)
+  ("qtdeclarative" ,qtdeclarative)
+  ("qtquickcontrols" ,qtquickcontrols)))
+   (home-page "http://twinkle.dolezel.info/;)
+   (synopsis "Softphone for voice over IP and instant messaging")
+   (description "Twinkle is a softphone for your voice over IP and instant
+messaging communcations using the SIP protocol.  You can use it for direct IP
+phone to IP phone communication or in a network using a SIP proxy to route your
+calls and messages")
+   (license license:gpl2+



01/01: gnu: gjs: Fix build.

2018-05-08 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates
in repository guix.

commit 903874328ed5e5ab766e36cee1b1a0989e8b24a9
Author: Mark H Weaver 
Date:   Thu Mar 29 21:32:50 2018 -0400

gnu: gjs: Fix build.

* gnu/packages/gnome.scm (gjs)[native-inputs]: Add gcc-7.
[arguments]: Add 'work-around-gcc-7-include-path-issue' phase.
---
 gnu/packages/gnome.scm | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6d0ec58..8c694c7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -80,6 +80,7 @@
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages game-development)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
@@ -4618,6 +4619,14 @@ configuration program to choose applications starting on 
login.")
 (arguments
  '(#:phases
(modify-phases %standard-phases
+ (add-after 'set-paths 'work-around-gcc-7-include-path-issue
+   ;; FIXME: Work around a problem with gcc-7 includes (see
+   ;; ).  Note that we use gcc-7
+   ;; to work around an internal compiler error in gcc-5.
+   (lambda _
+ (unsetenv "C_INCLUDE_PATH")
+ (unsetenv "CPLUS_INCLUDE_PATH")
+ #t))
  (add-before
   'check 'pre-check
   (lambda _
@@ -4635,7 +4644,11 @@ configuration program to choose applications starting on 
login.")
   ((".*expect\\(datestr\\).*") ""))
 #t)
 (native-inputs
- `(("glib:bin" ,glib "bin")   ; for glib-compile-resources
+ `(("gcc" ,gcc-7) ; FIXME: Work around an internal compiler error in
+  ; gcc-5.  Try removing this when our default compiler is
+  ; no longer gcc-5.5.0, and also remove the
+  ; 'work-around-gcc-7-include-path-issue' phase above.
+   ("glib:bin" ,glib "bin")   ; for glib-compile-resources
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)
;; For testing



branch core-updates updated (aedc6e9 -> 9038743)

2018-05-08 Thread Mark H. Weaver
mhw pushed a change to branch core-updates
in repository guix.

  from  aedc6e9   Merge branch 'master' into core-updates
   new  9038743   gnu: gjs: Fix build.

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


Summary of changes:
 gnu/packages/gnome.scm | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)



01/01: Merge branch 'master' into core-updates

2018-05-08 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates
in repository guix.

commit aedc6e9fc952665e666f2febfc0b37235ad850ff
Merge: 69d5909 f1f6f22
Author: Mark H Weaver 
Date:   Tue May 8 18:45:39 2018 -0400

Merge branch 'master' into core-updates

 doc/guix.texi  |   4 +-
 gnu/local.mk   |   2 +
 gnu/packages/admin.scm | 121 -
 gnu/packages/emacs.scm |  43 ++--
 gnu/packages/fonts.scm |   2 +-
 gnu/packages/game-development.scm  |   3 +-
 gnu/packages/games.scm |  39 ++-
 gnu/packages/gcc.scm   |  12 +-
 gnu/packages/gnome.scm |   4 +-
 gnu/packages/linux.scm |   1 +
 gnu/packages/mail.scm  |   2 +-
 gnu/packages/man.scm   |  11 +-
 gnu/packages/messaging.scm |  47 
 gnu/packages/mpd.scm   |   4 +-
 gnu/packages/networking.scm|  11 +-
 gnu/packages/patches/strace-kernel-4.16.patch  |  92 
 .../patches/wesnoth-fix-std-bad-cast.patch |  67 
 gnu/packages/upnp.scm  |   4 +-
 gnu/packages/webkit.scm|   4 +-
 gnu/packages/wget.scm  |   4 +-
 guix/scripts/pack.scm  |  72 ++--
 guix/self.scm  |  27 -
 tests/guix-pack.sh |  20 +++-
 23 files changed, 464 insertions(+), 132 deletions(-)

diff --cc gnu/packages/fonts.scm
index 7e15537,19597f0..031df7f
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@@ -137,9 -137,8 +137,9 @@@ TrueType (TTF) files."
 (lambda* (#:key outputs #:allow-other-keys)
   (let ((conf-dir (string-append (assoc-ref outputs "out")
  "/share/fontconfig/conf.avail")))
 -   (copy-recursively "fontconfig" conf-dir)))
 +   (copy-recursively "fontconfig" conf-dir)
 +   #t))
- (home-page "http://dejavu-fonts.org/;)
+ (home-page "https://dejavu-fonts.github.io/;)
  (synopsis "Vera font family derivate with additional characters")
  (description "DejaVu provides an expanded version of the Vera font family
  aiming for quality and broader Unicode coverage while retaining the original
diff --cc gnu/packages/gcc.scm
index 741cfab,ba2fce6..5012d9a
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -474,18 -467,26 +474,28 @@@ Go.  It also includes runtime support l
;; This can be removed when gcc-6.5.0 is released.
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
(snippet
 -   '(for-each
 -  (lambda (dir)
 -(substitute* (string-append "libgcc/config/"
 -dir "/linux-unwind.h")
 -  (("struct ucontext") "ucontext_t")))
 -  '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
 -"pa" "sh" "tilepro" "xtensa")
 +   '(begin
 +  (for-each
 +   (lambda (dir)
 + (substitute* (string-append "libgcc/config/"
 + dir "/linux-unwind.h")
 +   (("struct ucontext") "ucontext_t")))
 +   '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
 + "pa" "sh" "tilepro" "xtensa"))
 +  #t
  (inputs
   `(("isl" ,isl)
-,@(package-inputs gcc-4.7)
+,@(package-inputs gcc-4.7)))
+ 
+ (native-search-paths
+  ;; We have to use 'CPATH' for GCC > 5, not 'C_INCLUDE_PATH' & co., due to
+  ;; .
+  (list (search-path-specification
+ (variable "CPATH")
+ (files '("include")))
+(search-path-specification
+ (variable "LIBRARY_PATH")
+ (files '("lib" "lib64")))
  
  (define-public gcc-7
(package
diff --cc gnu/packages/man.scm
index 046b0e3,ca6fd35..58e26d8
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@@ -80,9 -79,8 +79,9 @@@ a flexible and convenient way."
   (("#! /bin/sh")
(string-append "#!" (which "sh")
   (remove file-is-directory?
 - (find-files "src/tests" ".*"))
 + (find-files "src/tests" ".*")))
 +   #t)))
-  (add-after 'unpack 'patch-absolute-paths
+  (add-after 'unpack 'patch-iconv-path
 

branch core-updates updated (69d5909 -> aedc6e9)

2018-05-08 Thread Mark H. Weaver
mhw pushed a change to branch core-updates
in repository guix.

  from  69d5909   gnu: fftw: Fix configure flags for armhf, aarch64, and 
mips.
  adds  0b7bef7   gnu: wireshark: Update to 2.6.0.
  adds  6e7be7d   gnu: strace: Fix build failure on Linux-Libre 4.16.
  adds  021469b   gnu: mpd-mpc: Update to 0.30.
  adds  ccb15b3   Revert "gnu: man-db: Embed absolute reference to 
'preconv'."
  adds  effd8df   gnu: wget: Update to 1.19.5 [fixes CVE-2018-0494].
  adds  f2e   self: Add "guix-packages-base" derivation.
  adds  16e7afb   pack: Do not autoload (gnu packages base).
  adds  df6f86a   pack: Adjust test to cope with GC'd profiles.
  adds  aad16cc   pack: Honor package transformation options.
  adds  31060bf   gnu: bitlbee: Install development headers.
  adds  b992bfe   gnu: Add bitlbee-discord.
  adds  91a56b4   gnu: gcc > 5: Use 'CPATH' instead of 'C_INCLUDE_PATH' & 
co.
  adds  d26727a   pack: Fix handling of '-e'.
  adds  8c58640   Revert "gnu: Add emacs-dumb-jump."
  adds  0a540b7   gnu: libsoup: Update to 2.62.2.
  adds  3274db4   gnu: webkitgtk: Update to 2.20.2 [fixes CVE-2018-4200].
  adds  9b10786   gnu: miniupnpc: Update to 2.1.
  adds  5e5bcc8   gnu: emacs-rsw-elisp: Improve description.
  adds  7017d87   doc: Fix typo.
  adds  db369e9   gnu: DejaVu fonts: Update the home-page.
  adds  f6cd858   gnu: isync / mbsync: Fix typos in description.
  adds  9b557be   doc: Fix typo.
  adds  e554d43   gnu: wesnoth: Update to 1.14.0.
  adds  a288ab1   gnu: love: Remove unnecessary (guix build utils) module.
  adds  bbc94ed   gnu: Add inxi.
  adds  9e2529e   gnu: emacs-helm-eww: Fix byte compilation.
  adds  0715a9e   gnu: emacs-helm-firefox: Fix byte compilation.
  adds  d848f55   gnu: emacs-helm-gtags: Fix byte compilation.
  adds  ec6f4bd   gnu: emacs-magit-org-todos-el: Fix byte compilation.
  adds  f1f6f22   gnu: emacs-helm-shell-history: Fix byte compilation.
   new  aedc6e9   Merge branch 'master' into core-updates

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


Summary of changes:
 doc/guix.texi  |   4 +-
 gnu/local.mk   |   2 +
 gnu/packages/admin.scm | 121 -
 gnu/packages/emacs.scm |  43 ++--
 gnu/packages/fonts.scm |   2 +-
 gnu/packages/game-development.scm  |   3 +-
 gnu/packages/games.scm |  39 ++-
 gnu/packages/gcc.scm   |  12 +-
 gnu/packages/gnome.scm |   4 +-
 gnu/packages/linux.scm |   1 +
 gnu/packages/mail.scm  |   2 +-
 gnu/packages/man.scm   |  11 +-
 gnu/packages/messaging.scm |  47 
 gnu/packages/mpd.scm   |   4 +-
 gnu/packages/networking.scm|  11 +-
 gnu/packages/patches/strace-kernel-4.16.patch  |  92 
 .../patches/wesnoth-fix-std-bad-cast.patch |  67 
 gnu/packages/upnp.scm  |   4 +-
 gnu/packages/webkit.scm|   4 +-
 gnu/packages/wget.scm  |   4 +-
 guix/scripts/pack.scm  |  72 ++--
 guix/self.scm  |  27 -
 tests/guix-pack.sh |  20 +++-
 23 files changed, 464 insertions(+), 132 deletions(-)
 create mode 100644 gnu/packages/patches/strace-kernel-4.16.patch
 create mode 100644 gnu/packages/patches/wesnoth-fix-std-bad-cast.patch



01/01: gnu: fftw: Fix configure flags for armhf, aarch64, and mips.

2018-05-08 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates
in repository guix.

commit 69d5909e032e2fba57814ea9db52389d384d9341
Author: Mark H Weaver 
Date:   Tue May 8 18:28:38 2018 -0400

gnu: fftw: Fix configure flags for armhf, aarch64, and mips.

This is a followup to commit 65bb22796f854cbc3eae053a80b1d64365dad376.

* gnu/packages/algebra.scm (fftw)[arguments]: In the configure-flags, avoid
two-layer quasiquotation by changing the inner quasiquote to a normal quote.
Remove "--enable-armv7a-cntvct" on 32-bit ARM, and 
"--enable-armv8-cntvct-el0"
on 64-bit ARM, since these generate instructions that are not normally
available from user mode.  Remove "--enable-mips-zbus-timer" on MIPS, since
the needed hardware support may not be available.  Add a default case to the
conditional to support unrecognized targets.
(fftwf)[arguments]: Restore the "--enable-single" flag, which was present
prior to commit 65bb22796.
---
 gnu/packages/algebra.scm | 48 ++--
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 7cf086c..a794c4c 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Andreas Enge 

 ;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès 
 ;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou 
-;;; Copyright © 2014 Mark H Weaver 
+;;; Copyright © 2014, 2018 Mark H Weaver 
 ;;; Copyright © 2016, 2018 Ricardo Wurmus 
 ;;; Copyright © 2017 Efraim Flashner 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
@@ -532,22 +532,22 @@ a C program.")
 (build-system gnu-build-system)
 (arguments
  `(#:configure-flags
-   `("--enable-shared" "--enable-openmp" "--enable-threads"
- ,,@(let ((system (or (%current-target-system) (%current-system
-  ;; Enable SIMD extensions for codelets.  See details at:
-  ;; .
-  (cond
-   ((string-prefix? "x86_64" system)
-'("--enable-sse2" "--enable-avx" "--enable-avx2"
-  "--enable-avx512" "--enable-avx-128-fma"))
-   ((string-prefix? "i686" system)
-'("--enable-sse2"))
-   ((string-prefix? "aarch64" system)
-'("--enable-neon" "--enable-armv8-cntvct-el0"))
-   ((string-prefix? "arm" system) ;neon only for single-precision
-'("--enable-armv7a-cntvct"))  ;on 32-bit arm
-   ((string-prefix? "mips" system)
-'("--enable-mips-zbus-timer"
+   '("--enable-shared" "--enable-openmp" "--enable-threads"
+ ,@(let ((system (or (%current-target-system) (%current-system
+ ;; Enable SIMD extensions for codelets.  See details at:
+ ;; .
+ (cond
+  ((string-prefix? "x86_64" system)
+   '("--enable-sse2" "--enable-avx" "--enable-avx2"
+ "--enable-avx512" "--enable-avx-128-fma"))
+  ((string-prefix? "i686" system)
+   '("--enable-sse2"))
+  ((string-prefix? "aarch64" system)
+   ;; Note that fftw supports NEON on 32-bit ARM only when
+   ;; compiled for single-precision.
+   '("--enable-neon"))
+  (else
+   '(
  ;; By default '-mtune=native' is used.  However, that may cause the
  ;; use of ISA extensions (e.g. AVX) that are not necessarily
  ;; available on the user's machine when that package is built on a
@@ -568,11 +568,15 @@ cosine/ sine transforms or DCT/DST).")
 (name "fftwf")
 (arguments
  (substitute-keyword-arguments (package-arguments fftw)
-   ((#:configure-flags cf)
-(if (string-prefix? "arm" (or (%current-target-system)
-  (%current-system)))
-`(cons "--enable-neon" ,cf)
-cf
+   ((#:configure-flags fftw-configure-flags)
+`(cons* "--enable-single"
+,@(if (string-prefix? "arm" (or (%current-target-system)
+(%current-system)))
+  ;; fftw supports NEON on 32-bit ARM only when compiled
+  ;; for single-precision, so add it here.
+  '("--enable-neon")
+  '())
+,fftw-configure-flags
 (description
  (string-append (package-description fftw)
 "  Single-precision version."



branch core-updates updated (d6ac4d4 -> 69d5909)

2018-05-08 Thread Mark H. Weaver
mhw pushed a change to branch core-updates
in repository guix.

  from  d6ac4d4   guix: ant-build-system: End "configure" phase with #t.
   new  69d5909   gnu: fftw: Fix configure flags for armhf, aarch64, and 
mips.

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/algebra.scm | 48 ++--
 1 file changed, 26 insertions(+), 22 deletions(-)



01/05: gnu: emacs-helm-eww: Fix byte compilation.

2018-05-08 Thread Oleg Pykhalov
wigust pushed a commit to branch master
in repository guix.

commit 9e2529e112e5d060706436dcca05487017b71a1f
Author: Oleg Pykhalov 
Date:   Tue May 8 23:28:46 2018 +0300

gnu: emacs-helm-eww: Fix byte compilation.

* gnu/packages/emacs.scm (emacs-helm-eww)[propagated-inputs]: Add
  'emacs-helm'.
---
 gnu/packages/emacs.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9b6ccf5..ff0a1c9 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10001,6 +10001,8 @@ keep Parens and Indentation inline with one another.")
 (sha256
  (base32
   "1x442ylrr7cx587s4rvfh187h3qbkr79qp95qr57a4igxkkw6183"
+  (propagated-inputs
+   `(("emacs-helm" ,emacs-helm)))
   (build-system emacs-build-system)
   (home-page "https://github.com/emacs-helm/helm-eww/;)
   (synopsis "Helm interface to EWW")



02/05: gnu: emacs-helm-firefox: Fix byte compilation.

2018-05-08 Thread Oleg Pykhalov
wigust pushed a commit to branch master
in repository guix.

commit 0715a9e65d3d7e2b6ec6c80388353d13d28d51f0
Author: Oleg Pykhalov 
Date:   Tue May 8 23:31:05 2018 +0300

gnu: emacs-helm-firefox: Fix byte compilation.

* gnu/packages/emacs.scm (emacs-helm-firefox)[propagated-inputs]: Add
  'emacs-helm'.
---
 gnu/packages/emacs.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ff0a1c9..f5d4ff3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -9894,6 +9894,8 @@ compilation/grep buffers.  Works with @code{wgrep}, 
@code{ack}, @code{ag},
  (sha256
   (base32
"08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"
+  (propagated-inputs
+   `(("emacs-helm" ,emacs-helm)))
   (build-system emacs-build-system)
   (home-page "https://github.com/emacs-helm/helm-firefox;)
   (synopsis "Display firefox bookmarks with Emacs Helm interface")



05/05: gnu: emacs-helm-shell-history: Fix byte compilation.

2018-05-08 Thread Oleg Pykhalov
wigust pushed a commit to branch master
in repository guix.

commit f1f6f227264999bb362a95e6ec74badcb7de34db
Author: Oleg Pykhalov 
Date:   Tue May 8 23:52:24 2018 +0300

gnu: emacs-helm-shell-history: Fix byte compilation.

* gnu/packages/emacs.scm (emacs-helm-shell-history)[propagated-inputs]: Add
  'emacs-helm'.
---
 gnu/packages/emacs.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6d46506..4ad5155 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -9187,6 +9187,8 @@ CSS, JavaScript, JSON.")
("(defvar helm-shell-history-file"
 `(expand-file-name "~/.bash_history"
#t)
+  (propagated-inputs
+   `(("emacs-helm" ,emacs-helm)))
   (home-page "https://github.com/yuutayamada/helm-shell-history;)
   (synopsis "Find shell history with Emacs Helm")
   (description "This package provides an Emacs Helm interface to search



04/05: gnu: emacs-magit-org-todos-el: Fix byte compilation.

2018-05-08 Thread Oleg Pykhalov
wigust pushed a commit to branch master
in repository guix.

commit ec6f4bdabe341d03b10600a39069dcfd33ca046a
Author: Oleg Pykhalov 
Date:   Tue May 8 23:45:32 2018 +0300

gnu: emacs-magit-org-todos-el: Fix byte compilation.

* gnu/packages/emacs.scm (emacs-magit-org-todos-el)[propagated-inputs]: Add
  'magit'.
---
 gnu/packages/emacs.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0823aae..6d46506 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -9552,6 +9552,8 @@ functions for defining emms simple players of mpv.")
  (sha256
   (base32
"0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn"
+  (propagated-inputs
+   `(("magit" ,magit)))
   (build-system emacs-build-system)
   (home-page "https://github.com/danielma/magit-org-todos.el;)
   (synopsis "Get todo.org into Emacs Magit status")



branch master updated (bbc94ed -> f1f6f22)

2018-05-08 Thread Oleg Pykhalov
wigust pushed a change to branch master
in repository guix.

  from  bbc94ed   gnu: Add inxi.
   new  9e2529e   gnu: emacs-helm-eww: Fix byte compilation.
   new  0715a9e   gnu: emacs-helm-firefox: Fix byte compilation.
   new  d848f55   gnu: emacs-helm-gtags: Fix byte compilation.
   new  ec6f4bd   gnu: emacs-magit-org-todos-el: Fix byte compilation.
   new  f1f6f22   gnu: emacs-helm-shell-history: Fix byte compilation.

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/packages/emacs.scm | 10 ++
 1 file changed, 10 insertions(+)



03/05: gnu: emacs-helm-gtags: Fix byte compilation.

2018-05-08 Thread Oleg Pykhalov
wigust pushed a commit to branch master
in repository guix.

commit d848f55e5c2d473a3e7d0b3a3c0ce1ead7d6eaa7
Author: Oleg Pykhalov 
Date:   Tue May 8 23:31:59 2018 +0300

gnu: emacs-helm-gtags: Fix byte compilation.

* gnu/packages/emacs.scm (emacs-helm-gtags)[propagated-inputs]: Add
  'emacs-helm'.
---
 gnu/packages/emacs.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index f5d4ff3..0823aae 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -8385,6 +8385,8 @@ arXiv, Google Scholar, Library of Congress, etc.
(base32
 "1a10snhg6nnnan6w9a7mcziy26vxbsr3c35i0gcarnkdp2yqng36"
 (build-system emacs-build-system)
+(propagated-inputs
+ `(("emacs-helm" ,emacs-helm)))
 (home-page "https://github.com/syohex/emacs-helm-gtags;)
 (synopsis "Emacs Helm interface to GNU Global")
 (description



branch master updated (a288ab1 -> bbc94ed)

2018-05-08 Thread Oleg Pykhalov
wigust pushed a change to branch master
in repository guix.

  from  a288ab1   gnu: love: Remove unnecessary (guix build utils) module.
   new  bbc94ed   gnu: Add inxi.

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



01/01: gnu: Add inxi.

2018-05-08 Thread Oleg Pykhalov
wigust pushed a commit to branch master
in repository guix.

commit bbc94ed03a219c10740921f64eea2f630458f538
Author: Pierre Neidhardt 
Date:   Mon Apr 16 18:08:30 2018 +0530

gnu: Add inxi.

* gnu/packages/admin.scm (inxi): New variable.

Signed-off-by: Oleg Pykhalov 
---
 gnu/packages/admin.scm | 121 -
 1 file changed, 120 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 4a2fe14..3d9ada8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -50,8 +50,11 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages dns)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages linux)
@@ -70,6 +73,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages mcrypt)
@@ -97,7 +101,8 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages elf)
-  #:use-module (gnu packages mpi))
+  #:use-module (gnu packages mpi)
+  #:use-module (gnu packages web))
 
 (define-public aide
   (package
@@ -2652,3 +2657,117 @@ Python loading in HPC environments.")
 ;; This package supports x86_64 and PowerPC64
 (supported-systems '("x86_64-linux"))
 (license license:lgpl2.1)))
+
+(define-public inxi-minimal
+  (let ((real-name "inxi"))
+(package
+  (name "inxi-minimal")
+  (version "3.0.04-1")
+  (source
+   (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/smxi/inxi;
+ "/archive/" version "/inxi.tar.gz"))
+ (file-name (string-append real-name "-" version ".tar.gz"))
+ (sha256
+  (base32
+   "14zxdsjgh9dbijmpp0hhvg2yiqqfwnqgcc6x8dpl1v15z1h1r7pc"
+  (build-system trivial-build-system)
+  (inputs
+   `(("bash" ,bash)
+ ("perl" ,perl)))
+  (native-inputs
+   `(("gzip" ,gzip)
+ ("tar" ,tar)))
+  (arguments
+   `(#:modules
+ ((guix build utils)
+  (ice-9 match)
+  (srfi srfi-26))
+ #:builder
+ (begin
+   (use-modules (guix build utils)
+(ice-9 match)
+(srfi srfi-26))
+   (setenv "PATH" (string-append
+   (assoc-ref %build-inputs "bash") "/bin" ":"
+   (assoc-ref %build-inputs "gzip") "/bin" ":"
+   (assoc-ref %build-inputs "perl") "/bin" ":"
+   (assoc-ref %build-inputs "tar") "/bin" ":"))
+   (invoke "tar" "xvf" (assoc-ref %build-inputs "source"))
+   (with-directory-excursion ,(string-append real-name "-" version)
+ (with-fluids ((%default-port-encoding #f))
+   (substitute* "inxi" (("/usr/bin/env perl") (which "perl"
+ (let ((bin (string-append %output "/bin")))
+   (install-file "inxi" bin)
+   (wrap-program (string-append bin "/inxi")
+ `("PATH" ":" =
+   ("$PATH"
+,@(map (lambda (input)
+ (match input
+   ((name . store)
+(let ((store-append
+   (cut string-append store <>)))
+  (cond
+   ((member name '("util-linux"))
+(string-append (store-append "/bin") ":"
+   (store-append "/sbin")))
+   ((member name '("dmidecode" "iproute2"))
+(store-append "/sbin"))
+   (else (store-append "/bin")))
+   %build-inputs)))
+ `("PERL5LIB" ":" =
+   ,(delete
+ ""
+ (map (match-lambda
+(((? (cut string-prefix? "perl-" <>) name) . dir)
+ (string-append dir "/lib/perl5/site_perl"))
+(_ ""))
+  %build-inputs)
+ (invoke "gzip" "inxi.1")
+ (install-file "inxi.1.gz"
+   (string-append %output "/share/doc/man/man1")))
+   #t)))
+  (home-page "https://smxi.org/docs/inxi.htm;)
+  (synopsis "Full featured system information script")
+ 

01/01: gnu: love: Remove unnecessary (guix build utils) module.

2018-05-08 Thread Efraim Flashner
efraim pushed a commit to branch master
in repository guix.

commit a288ab1f39354dffc60af2ee2117a51345f4aa50
Author: Efraim Flashner 
Date:   Tue May 8 13:44:35 2018 +0300

gnu: love: Remove unnecessary (guix build utils) module.

* gnu/packages/game-development.scm (love)[source]: Remove included
(guix build utils) module.
---
 gnu/packages/game-development.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index a195b41..bdbfda0 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -557,8 +557,7 @@ archive on a per-file basis.")
  "love-" version "-linux-src.tar.gz"))
  (sha256
   (base32
-   "1pkwiszmjs0xrwk0wqbc5cp9108b1y8gwsid0gqk1s0x09q9lpmw"))
- (modules '((guix build utils)
+   "1pkwiszmjs0xrwk0wqbc5cp9108b1y8gwsid0gqk1s0x09q9lpmw"
 (build-system gnu-build-system)
 (native-inputs
  `(("pkg-config" ,pkg-config)))



branch master updated (e554d43 -> a288ab1)

2018-05-08 Thread Efraim Flashner
efraim pushed a change to branch master
in repository guix.

  from  e554d43   gnu: wesnoth: Update to 1.14.0.
   new  a288ab1   gnu: love: Remove unnecessary (guix build utils) module.

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/game-development.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)



01/01: gnu: wesnoth: Update to 1.14.0.

2018-05-08 Thread Arun Isaac
arunisaac pushed a commit to branch master
in repository guix.

commit e554d43dfcd4f9a3e34fc2d0ebca47b06f99b2fe
Author: Arun Isaac 
Date:   Mon May 7 02:06:25 2018 +0530

gnu: wesnoth: Update to 1.14.0.

* gnu/packages/patches/wesnoth-fix-std-bad-cast.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/games.scm (wesnoth): Update to 1.14.0.
[source]: Add wesnoth-fix-std-bad-cast.patch to patches.
[arguments]: Remove "-DENABLE_STRICT_COMPILATION=OFF" configure flag.
[inputs]: Remove sdl-image, sdl-mixer, sdl-net and sdl-ttf. Add openssl and
sdl-union of sdl2, sdl2-image, sdl2-mixer and sdl2-ttf.
[home-page]: Use HTTPS URI.
(wesnoth-server)[inputs]: Remove sdl-net. Add icu4c, openssl and sdl2.
[arguments]: Remove delete-data phase. Since wesnoth 1.14.0, configure flag
"-DENABLE_GAME=OFF" disables installation of game assets.
---
 gnu/local.mk   |  1 +
 gnu/packages/games.scm | 39 -
 .../patches/wesnoth-fix-std-bad-cast.patch | 67 ++
 3 files changed, 80 insertions(+), 27 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index bd99883..6d6663f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1158,6 +1158,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/wavpack-CVE-2018-7253.patch \
   %D%/packages/patches/wavpack-CVE-2018-7254.patch \
   %D%/packages/patches/weechat-python.patch\
+  %D%/packages/patches/wesnoth-fix-std-bad-cast.patch  \
   %D%/packages/patches/wicd-bitrate-none-fix.patch \
   %D%/packages/patches/wicd-get-selected-profile-fix.patch \
   %D%/packages/patches/wicd-urwid-1.3.patch\
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e4f87a6..b2d106e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1809,7 +1809,7 @@ falling, themeable graphics and sounds, and replays.")
 (define-public wesnoth
   (package
 (name "wesnoth")
-(version "1.12.6")
+(version "1.14.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@@ -1818,17 +1818,11 @@ falling, themeable graphics and sounds, and replays.")
   name "-" version ".tar.bz2"))
   (sha256
(base32
-"0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5"
+"09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"))
+  (patches (search-patches "wesnoth-fix-std-bad-cast.patch"
 (build-system cmake-build-system)
 (arguments
- '(#:tests? #f ; no check target
-   #:configure-flags
-   ;; XXX: Failed to compile with '-Werror=old-style-cast'.
-   ;;   boost/mpl/assert.hpp:313:58: error:
-   ;; use of old-style cast [-Werror=old-style-cast]
-   ;;   [...]
-   ;;   cc1plus: all warnings being treated as errors
-   '("-DENABLE_STRICT_COMPILATION=OFF")))
+ `(#:tests? #f)) ; no check target
 (native-inputs
  `(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
@@ -1837,12 +1831,10 @@ falling, themeable graphics and sounds, and replays.")
("dbus" ,dbus)
("fribidi" ,fribidi)
("libvorbis" ,libvorbis)
+   ("openssl" ,openssl)
("pango" ,pango)
-   ("sdl-image" ,sdl-image)
-   ("sdl-mixer" ,sdl-mixer)
-   ("sdl-net" ,sdl-net)
-   ("sdl-ttf" ,sdl-ttf)))
-(home-page "http://www.wesnoth.org/;)
+   ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)
+(home-page "https://www.wesnoth.org/;)
 (synopsis "Turn-based strategy game")
 (description
  "The Battle for Wesnoth is a fantasy, turn based tactical strategy game,
@@ -1861,19 +1853,12 @@ next campaign.")
 (name "wesnoth-server")
 (inputs
  `(("boost" ,boost)
-   ("sdl-net" ,sdl-net)))
+   ("icu4c" ,icu4c)
+   ("openssl" ,openssl)
+   ("sdl2" ,sdl2)))
 (arguments
- (append
-  (substitute-keyword-arguments (package-arguments wesnoth)
-((#:configure-flags configure-flags)
- `(append ,configure-flags (list "-DENABLE_GAME=OFF"
-  `(#:phases
-(modify-phases %standard-phases
-  ;; Delete game assets not required by the server.
-  (add-after 'install 'delete-data
-(lambda* (#:key outputs #:allow-other-keys)
-  (delete-file-recursively (string-append (assoc-ref outputs "out")
-  "/share/wesnoth"
+ `(#:configure-flags '("-DENABLE_GAME=OFF")
+   ,@(package-arguments wesnoth)))
 (synopsis "Dedicated @emph{Battle for Wesnoth} server")
 (description "This package contains a dedicated server for @emph{The
 Battle for 

branch master updated (9b557be -> e554d43)

2018-05-08 Thread Arun Isaac
arunisaac pushed a change to branch master
in repository guix.

  from  9b557be   doc: Fix typo.
   new  e554d43   gnu: wesnoth: Update to 1.14.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/games.scm | 39 -
 .../patches/wesnoth-fix-std-bad-cast.patch | 67 ++
 3 files changed, 80 insertions(+), 27 deletions(-)
 create mode 100644 gnu/packages/patches/wesnoth-fix-std-bad-cast.patch