branch master updated (2c4acf6 -> 846f1d1)

2019-01-01 Thread Ricardo Wurmus
rekado pushed a change to branch master
in repository maintenance.

  from  2c4acf6   hydra: Add script to remotely configure berlin build 
nodes.
   new  846f1d1   hydra: Add ntp-service for berlin build nodes.

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:
 hydra/modules/sysadmin/build-machines.scm | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)



01/01: hydra: Add ntp-service for berlin build nodes.

2019-01-01 Thread Ricardo Wurmus
rekado pushed a commit to branch master
in repository maintenance.

commit 846f1d103c54c9b9b779c8bf5f23734996fa083b
Author: Ricardo Wurmus 
Date:   Tue Jan 1 12:17:28 2019 +0100

hydra: Add ntp-service for berlin build nodes.

* hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os):
Add ntp-service.
---
 hydra/modules/sysadmin/build-machines.scm | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hydra/modules/sysadmin/build-machines.scm 
b/hydra/modules/sysadmin/build-machines.scm
index e450977..2fc10a7 100644
--- a/hydra/modules/sysadmin/build-machines.scm
+++ b/hydra/modules/sysadmin/build-machines.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix system administration tools.
 ;;;
 ;;; Copyright © 2016, 2017 Ludovic Courtès 
-;;; Copyright © 2017, 2018 Ricardo Wurmus 
+;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus 
 ;;;
 ;;; This program is free software: you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -149,6 +149,9 @@ AUTHORIZED-GUIX-KEYS."
  (service qemu-binfmt-service-type
   (qemu-binfmt-configuration
(platforms (lookup-qemu-platforms "arm" 
"aarch64"
+ (service ntp-service-type
+  (ntp-configuration
+   (allow-large-adjustment? #t)))
  (service sysadmin-service-type sysadmins)
  (service openssh-service-type)
  (modify-services %base-services



01/02: gnu: allegro@4: Fix building with newer mesa.

2019-01-01 Thread guix-commits
efraim pushed a commit to branch staging
in repository guix.

commit d5c60e0aff8c71d66e598e2c7787a9f7c875fd0c
Author: Efraim Flashner 
Date:   Tue Jan 1 10:20:18 2019 +0200

gnu: allegro@4: Fix building with newer mesa.

* gnu/packages/game-development.scm (allegro@4)[source]: Add patch.
* gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk   |  1 +
 gnu/packages/game-development.scm  |  4 ++-
 .../patches/allegro4-mesa-18.2.5-and-later.patch   | 41 ++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 050d174..64f2bf9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -577,6 +577,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/aegisub-icu59-include-unistr.patch  \
   %D%/packages/patches/aegisub-boost68.patch\
   %D%/packages/patches/agg-am_c_prototype.patch\
+  %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch\
   %D%/packages/patches/amule-crypto-6.patch\
   %D%/packages/patches/antiword-CVE-2014-8123.patch\
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch  \
diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 8a29297..efca985 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015, 2018 Ludovic Courtès 
 ;;; Copyright © 2015, 2018 Alex Kost 
 ;;; Copyright © 2015, 2016, 2017 David Thompson 
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2016, 2017 Kei Kebreau 
 ;;; Copyright © 2016, 2018 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017, 2018 Julian Graham 
@@ -613,6 +613,8 @@ programming language.")
   (uri (string-append "https://github.com/liballeg/allegro5/;
   "releases/download/" version "/allegro-"
   version ".tar.gz"))
+  (patches (search-patches
+"allegro4-mesa-18.2.5-and-later.patch"))
   (sha256
(base32
 "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"
diff --git a/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch 
b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch
new file mode 100644
index 000..a494482
--- /dev/null
+++ b/gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch
@@ -0,0 +1,41 @@
+Fixes compilation with Mesa >= 18.2.5.
+
+Modified from upstream to work on allegro4:
+
+https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47
+
+diff --git a/addons/allegrogl/include/alleggl.h 
b/addons/allegrogl/include/alleggl.h
+index 0f86a6768..652dd024e 100644
+--- a/addons/allegrogl/include/alleggl.h
 b/addons/allegrogl/include/alleggl.h
+@@ -103,10 +103,14 @@
+
+ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
+ #define __glext_h_
++#define __gl_glext_h_
+ #define __glxext_h_
++#define __glx_glxext_h_
+ #include 
+ #undef  __glext_h_
++#undef  __gl_glext_h_
+ #undef  __glxext_h_
++#undef  __glx_glxext_h_
+
+ #endif /* ALLEGRO_MACOSX */
+
+diff --git a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h 
b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
+index 49c502091..fba8aea5d 100644
+--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
 b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
+@@ -1,7 +1,9 @@
+ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
+ #define __glxext_h_
++#define __glx_glxext_h_
+ #include 
+ #undef __glxext_h_
++#undef __glx_glxext_h_
+
+ #ifndef GLX_VERSION_1_3
+ #define _ALLEGRO_GLX_VERSION_1_3
+--
+2.20.0



02/02: gnu: allegro@5.0: Fix building with newer mesa.

2019-01-01 Thread guix-commits
efraim pushed a commit to branch staging
in repository guix.

commit 0109b89c5834b5374f248dc3681702180013f41f
Author: Efraim Flashner 
Date:   Tue Jan 1 10:22:34 2019 +0200

gnu: allegro@5.0: Fix building with newer mesa.

* gnu/packages/game-development.scm (allegro@5.0)[source]: Add patch.
(allegro)[patch]: Rename patch file.
* gnu/packages/patches/allegro-fix-compiliation-mesa-18.2.5-and-later.patch:
Rename to gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk  | 1 +
 gnu/packages/game-development.scm | 4 +++-
 ...esa-18.2.5-and-later.patch => allegro-mesa-18.2.5-and-later.patch} | 0
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 64f2bf9..4d8813a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -577,6 +577,7 @@ dist_patch_DATA =   
\
   %D%/packages/patches/aegisub-icu59-include-unistr.patch  \
   %D%/packages/patches/aegisub-boost68.patch\
   %D%/packages/patches/agg-am_c_prototype.patch\
+  %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
   %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch\
   %D%/packages/patches/amule-crypto-6.patch\
   %D%/packages/patches/antiword-CVE-2014-8123.patch\
diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index efca985..9a77cdc 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -655,7 +655,7 @@ etc.")
   "/download/" version "/allegro-"
   version ".tar.gz"))
   (patches (search-patches
-"allegro-fix-compilation-mesa-18.2.5-and-later.patch"))
+"allegro-mesa-18.2.5-and-later.patch"))
   (sha256
(base32
 "1w9a5yqi5q03b2qvmx5ff90paz0xbr9cy7i7f0xiqa65ava66q9l"
@@ -700,6 +700,8 @@ etc.")
 (string-drop-right version 2)
 version)
   ".tar.gz"))
+  (patches (search-patches
+"allegro-mesa-18.2.5-and-later.patch"))
   (sha256
(base32
 "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9"))
diff --git 
a/gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch 
b/gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch
similarity index 100%
rename from 
gnu/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch
rename to gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch



branch staging updated (47970cf -> 0109b89)

2019-01-01 Thread guix-commits
efraim pushed a change to branch staging
in repository guix.

  from  47970cf   gnu: wesnoth: Fix building with newer boost.
   new  d5c60e0   gnu: allegro@4: Fix building with newer mesa.
   new  0109b89   gnu: allegro@5.0: Fix building with newer mesa.

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/local.mk   |  2 ++
 gnu/packages/game-development.scm  |  8 ++--
 ...and-later.patch => allegro-mesa-18.2.5-and-later.patch} |  0
 ...nd-later.patch => allegro4-mesa-18.2.5-and-later.patch} | 14 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)
 copy gnu/packages/patches/{allegro-fix-compilation-mesa-18.2.5-and-later.patch 
=> allegro-mesa-18.2.5-and-later.patch} (100%)
 rename 
gnu/packages/patches/{allegro-fix-compilation-mesa-18.2.5-and-later.patch => 
allegro4-mesa-18.2.5-and-later.patch} (63%)



branch master updated (9db5746 -> 2c4acf6)

2019-01-01 Thread Ricardo Wurmus
rekado pushed a change to branch master
in repository maintenance.

  from  9db5746   hydra: sysadmin: Add qemu-binfmt-service-type.
   new  2c4acf6   hydra: Add script to remotely configure berlin build 
nodes.

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:
 hydra/install-berlin.scm | 181 +++
 1 file changed, 181 insertions(+)
 create mode 100644 hydra/install-berlin.scm



01/01: hydra: Add script to remotely configure berlin build nodes.

2019-01-01 Thread Ricardo Wurmus
rekado pushed a commit to branch master
in repository maintenance.

commit 2c4acf60667267a10054f2c5861301d4d1676ad9
Author: Ricardo Wurmus 
Date:   Tue Jan 1 10:33:32 2019 +0100

hydra: Add script to remotely configure berlin build nodes.

* hydra/install-berlin.scm: New file.
---
 hydra/install-berlin.scm | 181 +++
 1 file changed, 181 insertions(+)

diff --git a/hydra/install-berlin.scm b/hydra/install-berlin.scm
new file mode 100644
index 000..8e3a9f6
--- /dev/null
+++ b/hydra/install-berlin.scm
@@ -0,0 +1,181 @@
+;; Run this script as:
+;; GUILE_LOAD_COMPILED_PATH= guile --no-auto-compile install-berlin.scm 1 2 3
+
+(define %hydra-modules "/root/maintenance/hydra/modules")
+(set! %load-path
+  (cons* "/root/.config/guix/current/share/guile/site/2.2"
+ %hydra-modules %load-path))
+;; Without this the info-dir.drv will be miscompiled!
+(set! %load-compiled-path
+  (cons* "/root/.config/guix/current/lib/guile/2.2/site-ccache"
+ %load-compiled-path))
+
+(use-modules (sysadmin build-machines)
+ (sysadmin people)
+ (ssh auth)
+ (ssh session)
+ (ssh popen); remote pipes
+ (ssh channel)  ; channel-set-pty-size!
+ (guix derivations)
+ (guix inferior)
+ (guix ssh)
+ (guix gexp)
+ (guix grafts)
+ (guix store)
+ (guix packages)
+ (gnu system)
+ ((gnu packages package-management) #:select (guix))
+ (srfi srfi-1)
+ (srfi srfi-11) ; let-values
+ (srfi srfi-41) ; streams
+ (ice-9 match))
+
+
+(define (open-remote-input-pipe/pty session command . args)
+  "Open remote input pipe with PTY, run a COMMAND with ARGS."
+  (define OPEN_PTY_READ (string-append OPEN_PTY OPEN_BOTH))
+  (let ((p (open-remote-pipe session command OPEN_PTY_READ)))
+(channel-set-pty-size! p 80 40)
+p))
+
+(define (pipe->stream p)
+  "Convert a pipe P to a SRFI-41 stream."
+  (stream-let loop ((c (read-char p)))
+  (if (eof-object? c)
+  (begin
+(close-input-port p)
+stream-null)
+  (stream-cons c (loop (read-char p))
+
+(define (remote-inferior* session guix-directory)
+  "Return a remote inferior for the given SESSION."
+  (let ((pipe (open-remote-pipe* session OPEN_BOTH
+ (string-append guix-directory "/bin/guix")
+ "repl" "-t" "machine")))
+(port->inferior pipe)))
+
+(define (inferior-remote-eval* exp session guix-directory)
+  "Evaluate EXP in a new inferior running in SESSION, and close the inferior
+right away."
+  (let ((inferior (remote-inferior* session guix-directory)))
+(dynamic-wind
+  (const #t)
+  (lambda ()
+(inferior-eval exp inferior))
+  (lambda ()
+;; Close INFERIOR right away to prevent finalization from happening in
+;; another thread at the wrong time (see
+;; .)
+(close-inferior inferior)
+
+(define (host-for-id id)
+  "Return a host IP address for the given ID."
+  (format #f "141.80.167.~d" (+ id 131)))
+
+
+(define (build-os id)
+  "Build Guix and then use it to build the operating system
+configuration for the target host with the given ID.  Return the
+derivations and store file names as the first value and the directory
+of Guix as the second value."
+  (let ((host (host-for-id id)))
+(format #t "building operating system for ~a...~%" host)
+(with-store local
+  (let* ((guixdrv (run-with-store local (package->derivation guix)))
+ (guixdir (and (build-derivations local (list guixdrv))
+   (derivation->output-path guixdrv)))
+ (inferior-local (open-inferior guixdir))
+ (osdrv (and=> (inferior-eval-with-store
+inferior-local local
+`(lambda (store)
+   (add-to-load-path ,%hydra-modules)
+   (use-modules (sysadmin build-machines) (guix 
grafts))
+   (parameterize ((%graft? #f))
+ (let* ((host ,host)
+(os (berlin-build-machine-os ,id))
+(osdrv (run-with-store store 
(operating-system-derivation os
+   (and (build-derivations store (list osdrv))
+(derivation-file-name osdrv))
+   read-derivation-from-file)))
+(close-inferior inferior-local)
+(values
+ (append (map derivation->output-path (list osdrv guixdrv))
+ (map derivation-file-name (list osdrv guixdrv)))
+

01/01: gnu: breeze-icons: Fix failing tests.

2019-01-01 Thread guix-commits
htgoebel pushed a commit to branch master
in repository guix.

commit 059954fa018584ac0d3b2fda35b0b283c4c77098
Author: Hartmut Goebel 
Date:   Tue Jan 1 22:58:28 2019 +0100

gnu: breeze-icons: Fix failing tests.

* gnu/packages/kde-frameworks.scm(breeze-icons)[arguments]<#phases>:
  Remove outdated 'disable-failing-test, add 'add-symlinks.
---
 gnu/packages/kde-frameworks.scm | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 988bf44..6c18543 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -335,13 +335,17 @@ Bluetooth stack.  It is used by the KDE Bluetooth stack, 
BlueDevil.")
 (arguments
  `(#:phases
(modify-phases %standard-phases
- (add-before 'check 'disable-failing-test
+ (add-after 'unpack 'add-symlinks
+   ;; Fix "ScalableTest" - FIXME: Remove for > 5.49.0
(lambda _
- ;; Blacklist a test-function (failing at build.kde.org, too).
- ;; FIXME: recheck
- (with-output-to-file "autotests/BLACKLIST"
-   (lambda _
- (display "[test_duplicates]\n*\n")))
+ (symlink "../22/plasma-browser-integration.svg"
+  "icons-dark/apps/48/plasma-browser-integration.svg")
+ (symlink "../22/plasma-browser-integration.svg"
+  "icons-dark/apps/64/plasma-browser-integration.svg")
+ (symlink "../22/plasma-browser-integration.svg"
+  "icons/apps/48/plasma-browser-integration.svg")
+ (symlink "../22/plasma-browser-integration.svg"
+  "icons/apps/64/plasma-browser-integration.svg")
  #t)
 (native-inputs
  `(("extra-cmake-modules" ,extra-cmake-modules)



branch master updated (2288c73 -> 059954f)

2019-01-01 Thread guix-commits
htgoebel pushed a change to branch master
in repository guix.

  from  2288c73   gnu: Syncthing: Update to 1.0.0.
   new  059954f   gnu: breeze-icons: Fix failing tests.

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



branch kernel-updates deleted (was 03775b9)

2019-01-01 Thread guix-commits
mhw pushed a change to branch kernel-updates
in repository guix.

   was  03775b9   gnu: linux-libre: Update to 4.20, while retaining 4.19 
LTS.

This change permanently discards the following revisions:

  discards  03775b9   gnu: linux-libre: Update to 4.20, while retaining 4.19 
LTS.



01/01: installer: parted: Do not call BLKRRPART on loop devices.

2019-01-01 Thread guix-commits
mothacehe pushed a commit to branch wip-newt-installer
in repository guix.

commit 335b06e9558a901261e1fde2536271970cc7dda0
Author: Mathieu Othacehe 
Date:   Tue Jan 1 19:23:21 2019 +0100

installer: parted: Do not call BLKRRPART on loop devices.

* gnu/installer/parted.scm (with-delay-device-in-use?): Return immediately 
if
the file-name passed as argument designates a loop device.
---
 gnu/installer/parted.scm | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index ea62d6a..40054c0 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Mathieu Othacehe 
+;;; Copyright © 2018, 2019 Mathieu Othacehe 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +31,7 @@
   #:use-module (guix i18n)
   #:use-module (parted)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
   #:use-module (rnrs io ports)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
@@ -339,12 +340,14 @@ PARTED-OBJECT field equals PARTITION, return #f if not 
found."
 (define (with-delay-device-in-use? file-name)
   "Call DEVICE-IN-USE? with a few retries, as the first re-read will often
 fail. See rereadpt function in wipefs.c of util-linux for an explanation."
-  (let loop ((try 4))
-(usleep 25)
-(let ((in-use? (device-in-use? file-name)))
-  (if (and in-use? (> try 0))
-  (loop (- try 1))
-  in-use?
+  ;; Kernel always return EINVAL for BLKRRPART on loopdevices.
+  (and (not (string-match "/dev/loop*" file-name))
+   (let loop ((try 4))
+ (usleep 25)
+ (let ((in-use? (device-in-use? file-name)))
+   (if (and in-use? (> try 0))
+   (loop (- try 1))
+   in-use?)
 
 (define* (force-device-sync device)
   "Force a flushing of the given DEVICE."



branch wip-newt-installer updated (9461f24 -> 335b06e)

2019-01-01 Thread guix-commits
mothacehe pushed a change to branch wip-newt-installer
in repository guix.

  from  9461f24   installer: Various renamins follow-up.
   new  335b06e   installer: parted: Do not call BLKRRPART on loop devices.

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/installer/parted.scm | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)



branch master updated (9c9c4fe -> 2288c73)

2019-01-01 Thread guix-commits
lfam pushed a change to branch master
in repository guix.

  from  9c9c4fe   gnu: emacs-org-contrib: Update to 9.2.
   new  2288c73   gnu: Syncthing: Update to 1.0.0.

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


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



01/01: gnu: Syncthing: Update to 1.0.0.

2019-01-01 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit 2288c7393601057b3559494c3d7ca38341ef3ca2
Author: Leo Famulari 
Date:   Tue Jan 1 15:18:08 2019 -0500

gnu: Syncthing: Update to 1.0.0.

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

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 5222354..0df4e09 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -30,7 +30,7 @@
 (define-public syncthing
   (package
 (name "syncthing")
-(version "0.14.54")
+(version "1.0.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://github.com/syncthing/syncthing;
@@ -38,7 +38,7 @@
   "/syncthing-source-v" version ".tar.gz"))
   (sha256
(base32
-"1pfjckwsrhy8lbmy42fawgh1gcfmjbh3dfxx05w5yjxnpd1g2z6r"))
+"0992nsdiw374pbh1dywg7c2jijzy4xmsv0b7q5p76xn2yyg5yhr7"))
   ;; Since the update to Go 1.11, Go programs have been keeping
   ;; spurious references to all their dependencies:
   ;; .



branch master updated (897f303 -> d25a487)

2019-01-01 Thread guix-commits
efraim pushed a change to branch master
in repository guix.

  from  897f303   gnu: libphidget: Update to 2.1.8.20180607.
   new  fc1ed8c   gnu: amule: Don't run 'bootstrap phase.
   new  d25a487   gnu: amule: Use 'git-fetch'.

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



02/02: gnu: amule: Use 'git-fetch'.

2019-01-01 Thread guix-commits
efraim pushed a commit to branch master
in repository guix.

commit d25a48768d18ee66be8acd453b9468bfae34158a
Author: Efraim Flashner 
Date:   Tue Jan 1 12:54:20 2019 +0200

gnu: amule: Use 'git-fetch'.

* gnu/packages/networking.scm (amule)[source]: Use 'git-fetch'.
---
 gnu/packages/networking.scm | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 0fe854c..f7b0b15 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1860,14 +1860,14 @@ file for more details.")
 (name "amule")
 (version "2.3.2")
 (source (origin
-  (method url-fetch)
-  (uri (string-append
-"https://github.com/amule-project/amule/archive/;
-version ".tar.gz"))
-  (file-name (string-append name "-" version ".tar.gz"))
+  (method git-fetch)
+  (uri (git-reference
+ (url "https://github.com/amule-project/amule;)
+ (commit version)))
+  (file-name (git-file-name name version))
   (sha256
(base32
-"1wvcj0n9xz03xz5c2xwp6dwfp7sqjhhwbki3m0lwikskpn9lkzk2"))
+"010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn"))
   ;; Patch for adopting crypto++ >= 6.0.
   (patches (search-patches "amule-crypto-6.patch"
 (build-system gnu-build-system)



01/02: gnu: amule: Don't run 'bootstrap phase.

2019-01-01 Thread guix-commits
efraim pushed a commit to branch master
in repository guix.

commit fc1ed8c1a7808d74103483c4a353114077014794
Author: Efraim Flashner 
Date:   Tue Jan 1 12:49:52 2019 +0200

gnu: amule: Don't run 'bootstrap phase.

* gnu/packages/networking.scm (amule)[arguments]: Delete 'bootstrap
phase.
---
 gnu/packages/networking.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 84bfe47..0fe854c 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2016, 2017 Pjotr Prins 
 ;;; Copyright © 2017 Mathieu Othacehe 
 ;;; Copyright © 2017 Leo Famulari 
-;;; Copyright © 2017, 2018 Efraim Flashner 
+;;; Copyright © 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2017, 2018 Rutger Helling 
 ;;; Copyright © 2017 Gábor Boskovits 
 ;;; Copyright © 2017 Thomas Danckaert 
@@ -1874,6 +1874,7 @@ file for more details.")
 (arguments
  `(#:phases
(modify-phases %standard-phases
+ (delete 'bootstrap) ; bootstrap phase runs too early.
  (add-after 'patch-source-shebangs 'autogen
(lambda _
  (invoke "sh" "autogen.sh")



02/03: gnu: org: Update to 9.2.

2019-01-01 Thread guix-commits
ngz pushed a commit to branch master
in repository guix.

commit e609114fde69175d0f2efbbce8223b88625e122d
Author: Nicolas Goaziou 
Date:   Tue Jan 1 18:22:46 2019 +0100

gnu: org: Update to 9.2.

* gnu/packages/emacs.scm (emacs-org): Update to 9.2.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index bfd9971..6bc1d60 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5503,14 +5503,14 @@ passive voice.")
 (name "emacs-org")
 ;; emacs-org-contrib inherits from this package.  Please update its sha256
 ;; checksum as well.
-(version "9.1.14")
+(version "9.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "http://elpa.gnu.org/packages/org-;
   version ".tar"))
   (sha256
(base32
-"17vd9hig26rqv90l6y92hc2i0x29g44lsdsp0xd4m53s8r3zdikz"
+"14ydwh2r360fpi6v2g9rgf0zazy2ddq1pcdxvzn73h65glnnclz9"
 (build-system emacs-build-system)
 (home-page "https://orgmode.org/;)
 (synopsis "Outline-based notes management and organizer")



branch master updated (8b6c91b -> ff148ea)

2019-01-01 Thread guix-commits
mhw pushed a change to branch master
in repository guix.

  from  8b6c91b   gnu: php-with-bcmath: Deprecate in favour of 'php'.
   new  3fb7b61   gnu: linux-libre: Minor cleanups.
   new  ce899af   gnu: linux-libre: Build with GCC-7 on all systems.
   new  ff148ea   gnu: linux-libre: Update to 4.20, while retaining 4.19 
LTS.

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


Summary of changes:
 Makefile.am|   4 +
 .../linux-libre/{4.19-arm.conf => 4.20-arm.conf}   | 117 +++--
 .../{4.19-arm64.conf => 4.20-arm64.conf}   | 141 -
 .../linux-libre/{4.19-i686.conf => 4.20-i686.conf} | 128 ++-
 .../{4.19-x86_64.conf => 4.20-x86_64.conf} | 134 ++--
 gnu/packages/linux.scm |  93 +-
 6 files changed, 443 insertions(+), 174 deletions(-)
 copy gnu/packages/aux-files/linux-libre/{4.19-arm.conf => 4.20-arm.conf} (98%)
 copy gnu/packages/aux-files/linux-libre/{4.19-arm64.conf => 4.20-arm64.conf} 
(98%)
 copy gnu/packages/aux-files/linux-libre/{4.19-i686.conf => 4.20-i686.conf} 
(98%)
 copy gnu/packages/aux-files/linux-libre/{4.19-x86_64.conf => 4.20-x86_64.conf} 
(98%)



02/03: gnu: linux-libre: Build with GCC-7 on all systems.

2019-01-01 Thread guix-commits
mhw pushed a commit to branch master
in repository guix.

commit ce899af10901bf9ed06fe0528b8c4f628ebba4fd
Author: Mark H Weaver 
Date:   Mon Dec 31 22:33:33 2018 -0500

gnu: linux-libre: Build with GCC-7 on all systems.

* gnu/packages/linux.scm (make-linux-libre)[native-inputs]: Include GCC-7
unconditionally.  Previously it was included only on Intel systems.
Add GMP, MPFR, and MPC.
[arguments]: Add 'work-around-gcc-7-include-path-issue' phase.
---
 gnu/packages/linux.scm | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 177752b..982fbe5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -306,14 +306,16 @@ for ARCH and optionally VARIANT, or #f if there is no 
such configuration."
("elfutils" ,elfutils)  ; Needed to enable CONFIG_STACK_VALIDATION
("flex" ,flex)
("bison" ,bison)
-   ;; On x86, build with GCC-7 for full retpoline support.
+
+   ;; Build with GCC-7 for full retpoline support.
;; FIXME: Remove this when our default compiler has retpoline support.
-   ,@(match (system->linux-architecture
- (or (%current-target-system) (%current-system)))
-   ((or "x86_64" "i386")
-`(("gcc" ,gcc-7)))
-   (_
-'()))
+   ("gcc" ,gcc-7)
+
+   ;; These are needed to compile the GCC plugins.
+   ("gmp" ,gmp)
+   ("mpfr" ,mpfr)
+   ("mpc" ,mpc)
+
,@(match (and configuration-file
  (configuration-file
   (system->linux-architecture
@@ -335,6 +337,11 @@ for ARCH and optionally VARIANT, or #f if there is no such 
configuration."
  (substitute* (find-files "." "^Makefile(\\.include)?$")
(("/bin/pwd") "pwd"))
  #t))
+ (add-before 'configure 'work-around-gcc-7-include-path-issue
+   (lambda _
+ (unsetenv "C_INCLUDE_PATH")
+ (unsetenv "CPLUS_INCLUDE_PATH")
+ #t))
  (replace 'configure
(lambda* (#:key inputs native-inputs target #:allow-other-keys)
  ;; Avoid introducing timestamps



01/03: gnu: linux-libre: Minor cleanups.

2019-01-01 Thread guix-commits
mhw pushed a commit to branch master
in repository guix.

commit 3fb7b61250dde547204f17a0cd6c3bad12038e40
Author: Mark H Weaver 
Date:   Mon Dec 31 22:24:06 2018 -0500

gnu: linux-libre: Minor cleanups.

* gnu/packages/linux.scm: Remove comment about armhf-linux kernel 
configuration.
(%intel-compatible-systems, %linux-compatible-systems): Remove these
variables, inlining their values into the few places where they are used.
(%linux-libre-arm-export-__sync_icache_dcache-patch): New variable.
(%linux-libre-4.19-patches): Use the above variable.
---
 gnu/packages/linux.scm | 36 
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bcaeef9..177752b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -231,6 +231,18 @@ defconfig.  Return the appropriate make target if 
applicable, otherwise return
  (base32
   "1hk9swxxc80bmn2zd2qr5ccrjrk28xkypwhl4z0qx4hbivj7qm06"
 
+(define %linux-libre-arm-export-__sync_icache_dcache-patch
+  (origin
+(method url-fetch)
+(uri (string-append
+  "https://salsa.debian.org/kernel-team/linux;
+  "/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0"
+  "/debian/patches/bugfix/arm/"
+  "arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch"))
+(file-name "linux-libre-4.19-arm-export-__sync_icache_dcache.patch")
+(sha256
+ (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f"
+
 (define* (kernel-config arch #:key variant)
   "Return the absolute file name of the Linux-Libre build configuration file
 for ARCH and optionally VARIANT, or #f if there is no such configuration."
@@ -393,33 +405,17 @@ for ARCH and optionally VARIANT, or #f if there is no 
such configuration."
 It has been modified to remove all non-free binary blobs.")
 (license license:gpl2)))
 
-(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
-(define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux" 
"aarch64-linux"))
-
-;; linux-libre configuration for armhf-linux is derived from Debian armmp.  It
-;; supports qemu "virt" machine and possibly a large number of ARM boards.
-;; See : https://wiki.debian.org/DebianKernel/ARMMP.
-
 (define %linux-libre-version "4.19.13")
 (define %linux-libre-hash 
"0ac0ywy542fiwdiab2z12rbjn9zw8vjbzkbpmpk9nfic2mcyrg8r")
 
 (define %linux-libre-4.19-patches
   (list %boot-logo-patch
-(origin
-  (method url-fetch)
-  (uri (string-append
-"https://salsa.debian.org/kernel-team/linux;
-"/raw/34a7d9011fcfcfa38b68282fd2b1a8797e6834f0"
-"/debian/patches/bugfix/arm/"
-"arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch"))
-  (file-name "linux-libre-4.19-arm-export-__sync_icache_dcache.patch")
-  (sha256
-   (base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")
+%linux-libre-arm-export-__sync_icache_dcache-patch))
 
 (define-public linux-libre
   (make-linux-libre %linux-libre-version
 %linux-libre-hash
-%linux-compatible-systems
+'("x86_64-linux" "i686-linux" "armhf-linux" 
"aarch64-linux")
 #:patches %linux-libre-4.19-patches
 #:configuration-file kernel-config))
 
@@ -435,13 +431,13 @@ It has been modified to remove all non-free binary 
blobs.")
 (define-public linux-libre-4.9
   (make-linux-libre "4.9.148"
 "0yrjgvdzbcp750j4fhlxi4ia1v0fqh0y3p99wnbpfvg17j01lbjl"
-%intel-compatible-systems
+'("x86_64-linux" "i686-linux")
 #:configuration-file kernel-config))
 
 (define-public linux-libre-4.4
   (make-linux-libre "4.4.169"
 "1snjdih9iv3fg7f9h2r1gldcqmvzj1w398aysws4fialj488x1p4"
-%intel-compatible-systems
+'("x86_64-linux" "i686-linux")
 #:configuration-file kernel-config))
 
 (define-public linux-libre-arm-generic



01/01: gnu: ruby-pg: Update to 1.1.3.

2019-01-01 Thread guix-commits
cbaines pushed a commit to branch master
in repository guix.

commit 4db80f8b118c28b7adfe7bd6fca7ebadff701bb9
Author: Vasile Dumitrascu 
Date:   Sun Dec 30 19:40:19 2018 +

gnu: ruby-pg: Update to 1.1.3.

* gnu/packages/ruby.scm (ruby-pg): Update to 1.1.3.

Signed-off-by: Christopher Baines 
---
 gnu/packages/ruby.scm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 52832ee..343e0e8 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017, 2018 Efraim Flashner 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Clément Lassieur 
+;;; Copyright © 2018 Vasile Dumitrascu 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3327,14 +3328,14 @@ alternative to Marshal for Object serialization. ")
 (define-public ruby-pg
   (package
 (name "ruby-pg")
-(version "0.21.0")
+(version "1.1.3")
 (source
  (origin
(method url-fetch)
(uri (rubygems-uri "pg" version))
(sha256
 (base32
- "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh"
+ "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"
 (build-system ruby-build-system)
 (arguments
  '(#:test-target "spec"))
@@ -3346,7 +3347,7 @@ alternative to Marshal for Object serialization. ")
  `(("postgresql" ,postgresql-9.6)))
 (synopsis "Ruby interface to PostgreSQL")
 (description "Pg is the Ruby interface to the PostgreSQL RDBMS.  It works
-with PostgreSQL 8.4 and later.")
+with PostgreSQL 9.0 and later.")
 (home-page "https://bitbucket.org/ged/ruby-pg;)
 (license license:ruby)))
 



branch master updated (d25a487 -> 4db80f8)

2019-01-01 Thread guix-commits
cbaines pushed a change to branch master
in repository guix.

  from  d25a487   gnu: amule: Use 'git-fetch'.
   new  4db80f8   gnu: ruby-pg: Update to 1.1.3.

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



branch master updated (4db80f8 -> 8b6c91b)

2019-01-01 Thread guix-commits
wigust pushed a change to branch master
in repository guix.

  from  4db80f8   gnu: ruby-pg: Update to 1.1.3.
   new  8b6c91b   gnu: php-with-bcmath: Deprecate in favour of 'php'.

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/php.scm | 9 ++---
 gnu/tests/monitoring.scm | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)



01/01: gnu: php-with-bcmath: Deprecate in favour of 'php'.

2019-01-01 Thread guix-commits
wigust pushed a commit to branch master
in repository guix.

commit 8b6c91ba538f87d519ffa1d5d3fc3324fdaac85f
Author: Oleg Pykhalov 
Date:   Tue Jan 1 16:53:25 2019 +0300

gnu: php-with-bcmath: Deprecate in favour of 'php'.

This is a follow-up to 4629d26755aa06344fb8f515fb0202776e70c429.

* gnu/packages/php.scm (php-with-bcmath): Deprecate in favour of 'php'.
* gnu/tests/monitoring.scm (%zabbix-os): Use this.
---
 gnu/packages/php.scm | 9 ++---
 gnu/tests/monitoring.scm | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 1d33b17..a96f1c2 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Marius Bakke 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Ricardo Wurmus 
+;;; Copyright © 2019 Oleg Pykhalov 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -353,10 +354,4 @@ systems, web content management systems and web 
frameworks." )
   license:expat ; ext/date/lib
 
 (define-public php-with-bcmath
-  (package
-(inherit php)
-(name "php-with-bcmath")
-(arguments
- (substitute-keyword-arguments (package-arguments php)
-   ((#:configure-flags flags)
-`(cons "--enable-bcmath" ,flags))
+  (deprecated-package "php-with-bcmath" php))
diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm
index ab72682..14d989d 100644
--- a/gnu/tests/monitoring.scm
+++ b/gnu/tests/monitoring.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Gábor Boskovits  
-;;; Copyright © 2018 Oleg Pykhalov 
+;;; Copyright © 2018, 2019 Oleg Pykhalov 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -307,8 +307,7 @@ zabbix||{}
 
   (service php-fpm-service-type
(php-fpm-configuration
-(timezone "Europe/Paris")
-(php php-with-bcmath)))
+(timezone "Europe/Paris")))
 
   (service zabbix-server-service-type
(zabbix-server-configuration



01/01: gnu: emacs-w3m: Fix build.

2019-01-01 Thread guix-commits
apteryx pushed a commit to branch master
in repository guix.

commit e68bfcfda1386b0e48ba002253375778d3a48730
Author: Maxim Cournoyer 
Date:   Tue Jan 1 11:21:19 2019 -0500

gnu: emacs-w3m: Fix build.

The previously (unofficial) Git repository mirror is no longer available, so
we fallback to using the official CVS repository.

Fixes issue 33938 (see: https://issues.guix.info/issue/33938).

* gnu/packages/emacs.scm (emacs-w3m)[origin]: Fetch the sources from the
  official CVS repository.
---
 gnu/packages/emacs.scm | 171 +
 1 file changed, 86 insertions(+), 85 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a0df4da..8b87f7e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -61,6 +61,7 @@
 (define-module (gnu packages emacs)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix cvs-download)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
@@ -843,91 +844,91 @@ index is considered the key).")
 ;;;
 
 (define-public emacs-w3m
-  ;; Emacs-w3m follows a "rolling release" model from its CVS repo.  We could
-  ;; use CVS, sure, but instead we choose to use this Git mirror described on
-  ;; the home page as an "unofficial" mirror.
-  (let ((commit "0dd5691f46d314a84da63f3a7277d721815811a2"))
-(package
-  (name "emacs-w3m")
-  (version (git-version "1.5" "0" commit))
-  (source (origin
-(method git-fetch)
-(uri (git-reference
-  (url "https://github.com/ecbrown/emacs-w3m;)
-  (commit commit)))
-(sha256
- (base32
-  "02xalyxbrkgl4n8nj7xxkmsbm6lshhwdc8bzs2l4wz3hkpgkj7x4"
-  (build-system gnu-build-system)
-  (native-inputs `(("autoconf" ,autoconf)
-   ("texinfo" ,texinfo)
-   ("emacs" ,emacs-minimal)))
-  (inputs `(("w3m" ,w3m)
-("imagemagick" ,imagemagick)))
-  (arguments
-   `(#:modules ((guix build gnu-build-system)
-(guix build utils)
-(guix build emacs-utils))
- #:imported-modules (,@%gnu-build-system-modules
- (guix build emacs-utils))
- #:configure-flags
- (let ((out (assoc-ref %outputs "out")))
-   (list (string-append "--with-lispdir="
-out "/share/emacs/site-lisp")
- (string-append "--with-icondir="
-out "/share/images/emacs-w3m")
- ;; Leave .el files uncompressed, otherwise GC can't
- ;; identify run-time dependencies.  See
- ;; 

- "--without-compress-install"))
- #:tests? #f  ; no check target
- #:phases
- (modify-phases %standard-phases
-   (add-after 'unpack 'autoconf
- (lambda _
-   (invoke "autoconf")))
-   (add-before 'configure 'support-emacs!
- (lambda _
-   ;; For some reason 'AC_PATH_EMACS' thinks that 'Emacs 26' is
-   ;; unsupported.
-   (substitute* "configure"
- (("EMACS_FLAVOR=unsupported")
-  "EMACS_FLAVOR=emacs"))
-   #t))
-   (add-before 'build 'patch-exec-paths
- (lambda* (#:key inputs outputs #:allow-other-keys)
-   (let ((out (assoc-ref outputs "out"))
- (w3m (assoc-ref inputs "w3m"))
- (imagemagick (assoc-ref inputs "imagemagick"))
- (coreutils (assoc-ref inputs "coreutils")))
- (make-file-writable "w3m.el")
- (emacs-substitute-variables "w3m.el"
-   ("w3m-command" (string-append w3m "/bin/w3m"))
-   ("w3m-touch-command"
-(string-append coreutils "/bin/touch"))
-   ("w3m-icon-directory"
-(string-append out "/share/images/emacs-w3m")))
- (make-file-writable "w3m-image.el")
- (emacs-substitute-variables "w3m-image.el"
-   ("w3m-imagick-convert-program"
-(string-append imagemagick "/bin/convert"))
-   ("w3m-imagick-identify-program"
-(string-append imagemagick "/bin/identify")))
- #t)))
-   (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
-   (invoke "make" "install" "install-icons")
-   (with-directory-excursion
-   (string-append (assoc-ref outputs "out")
-  "/share/emacs/site-lisp")
- (for-each delete-file 

branch master updated (ff148ea -> e68bfcf)

2019-01-01 Thread guix-commits
apteryx pushed a change to branch master
in repository guix.

  from  ff148ea   gnu: linux-libre: Update to 4.20, while retaining 4.19 
LTS.
   new  e68bfcf   gnu: emacs-w3m: 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/emacs.scm | 171 +
 1 file changed, 86 insertions(+), 85 deletions(-)



branch master updated (e68bfcf -> 9c9c4fe)

2019-01-01 Thread guix-commits
ngz pushed a change to branch master
in repository guix.

  from  e68bfcf   gnu: emacs-w3m: Fix build.
   new  15de7c5   gnu: Add emacs-arduino-mode.
   new  e609114   gnu: org: Update to 9.2.
   new  9c9c4fe   gnu: emacs-org-contrib: Update to 9.2.

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


Summary of changes:
 gnu/packages/emacs.scm | 38 ++
 1 file changed, 30 insertions(+), 8 deletions(-)



03/03: gnu: emacs-org-contrib: Update to 9.2.

2019-01-01 Thread guix-commits
ngz pushed a commit to branch master
in repository guix.

commit 9c9c4fea1b8423643a49489d9ca7dae039f13a74
Author: Nicolas Goaziou 
Date:   Tue Jan 1 18:23:15 2019 +0100

gnu: emacs-org-contrib: Update to 9.2.

* gnu/packages/emacs.scm (emacs-org-contrib): Update to 9.2.
[propagated-inputs]: Add missing inputs.
---
 gnu/packages/emacs.scm | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6bc1d60..ffb5a15 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5524,14 +5524,14 @@ programming and reproducible research.")
   (package
 (inherit emacs-org)
 (name "emacs-org-contrib")
-(version "20180507")
+(version "20181230")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-;
   version ".tar"))
   (sha256
(base32
-"190iwjpdjrhg7gl2d4bri2y0y679vlrwd841r6dvhza0yy338d2d"
+"0gibwcjlardjwq19bh0zzszv0dxxlml0rh5iikkcdynbgndk1aa1"
 (arguments
  `(#:modules ((guix build emacs-build-system)
   (guix build utils)
@@ -5543,7 +5543,7 @@ programming and reproducible research.")
  (add-after 'install 'delete-org-files
(lambda* (#:key inputs outputs #:allow-other-keys)
  (let* ((out (assoc-ref outputs "out"))
-(org (assoc-ref inputs "emacs-org"))
+(org (assoc-ref inputs "org"))
 (contrib-files
  (map basename (find-files out)))
 (org+contrib-files
@@ -5556,8 +5556,10 @@ programming and reproducible research.")
  (for-each delete-file duplicates))
#t))
 (propagated-inputs
- `(("emacs-org" ,emacs-org)
-   ("emacs-scel" ,emacs-scel)))
+ `(("arduino-mode" ,emacs-arduino-mode)
+   ("cider" ,emacs-cider)
+   ("org" ,emacs-org)
+   ("scel" ,emacs-scel)))
 (synopsis "Contributed packages to Org mode")
 (description "Org is an Emacs mode for keeping notes, maintaining TODO
 lists, and project planning with a fast and effective plain-text system.



01/03: gnu: Add emacs-arduino-mode.

2019-01-01 Thread guix-commits
ngz pushed a commit to branch master
in repository guix.

commit 15de7c58a5b74f1c5b405651a9c14ad32af141db
Author: Nicolas Goaziou 
Date:   Tue Jan 1 18:10:29 2019 +0100

gnu: Add emacs-arduino-mode.

* gnu/packages/emacs.scm (emacs-arduino-mode): New variable.
---
 gnu/packages/emacs.scm | 22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8b87f7e..bfd9971 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2016, 2017 Roel Janssen 
 ;;; Copyright © 2016, 2017 Nils Gillmann 
 ;;; Copyright © 2016 Alex Griffin 
-;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou 
+;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou 
 ;;; Copyright © 2016, 2017, 2018 Alex Vong 
 ;;; Copyright © 2016, 2017, 2018 Arun Isaac 
 ;;; Copyright © 2017 Christopher Baines 
@@ -12939,3 +12939,23 @@ filename or directory, etc, with custom frame/X-window 
titles, icons, and
 other frame parameters.")
 (home-page "https://github.com/alphapapa/frame-purpose.el;)
 (license license:gpl3+)))
+
+(define-public emacs-arduino-mode
+  (let ((commit "3e2bad4569ad26e929e6db2cbcff0d6d36812698")) ;no release yet
+(package
+  (name "emacs-arduino-mode")
+  (version (git-version "0" "0" commit))
+  (source (origin
+(method git-fetch)
+(uri (git-reference
+  (url "https://github.com/bookest/arduino-mode.git;)
+  (commit commit)))
+(sha256
+ (base32
+  "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c"))
+(file-name (git-file-name name version
+  (build-system emacs-build-system)
+  (synopsis "Emacs major mode for editing Arduino sketches")
+  (description "Emacs major mode for editing Arduino sketches.")
+  (home-page "https://github.com/bookest/arduino-mode;)
+  (license license:gpl3+



01/01: gnu: ruby: Remove versions 1.8, 2.1 and 2.2.

2019-01-01 Thread guix-commits
alexvong1995 pushed a commit to branch master
in repository guix.

commit 8ef06557473e4394c2d0d9d54b45c43456419b66
Author: Alex Vong 
Date:   Sat Dec 22 07:30:41 2018 +0800

gnu: ruby: Remove versions 1.8, 2.1 and 2.2.

Remove ruby versions which have reached EOL.

See .

* gnu/packages/ruby.scm (ruby-1.8, ruby-2.1, ruby-2.2): Remove variables.
---
 gnu/packages/ruby.scm | 69 +--
 1 file changed, 1 insertion(+), 68 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 343e0e8..3a17cd2 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Clément Lassieur 
 ;;; Copyright © 2018 Vasile Dumitrascu 
+;;; Copyright © 2018 Alex Vong 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -127,74 +128,6 @@ a focus on simplicity and productivity.")
(delete-file-recursively "ext/fiddle/libffi-3.2.1")
#t))
 
-(define-public ruby-2.2
-  (package (inherit ruby)
-(version "2.2.10")
-(source
- (origin
-   (method url-fetch)
-   (uri (string-append "http://cache.ruby-lang.org/pub/ruby/;
-   (version-major+minor version)
-   "/ruby-" version ".tar.xz"))
-   (sha256
-(base32
- "0l5nk9mc0q4769d2i9d9y1izk0pk0lms2bl8s3lclv36wsvvqxxz"))
-
-(define-public ruby-2.1
-  (package (inherit ruby)
-(version "2.1.10")
-(source
- (origin
-   (method url-fetch)
-   (uri (string-append "http://cache.ruby-lang.org/pub/ruby/;
-   (version-major+minor version)
-   "/ruby-" version ".tar.bz2"))
-   (sha256
-(base32
- "1wglbd599mlwxfcb2xgqcxi2shr363pjn5dpbv11m04si9bpaim7"
-(arguments
- `(#:test-target "test"
-   #:parallel-tests? #f
-   #:phases
-   (modify-phases %standard-phases
- (add-before 'configure 'replace-bin-sh
-   (lambda _
- (substitute* '("Makefile.in"
-"ext/pty/pty.c"
-"io.c"
-"lib/mkmf.rb"
-"process.c")
-   (("/bin/sh") (which "sh")))
- #t)))
-
-(define-public ruby-1.8
-  (package (inherit ruby)
-(version "1.8.7-p374")
-(source
- (origin
-   (method url-fetch)
-   (uri (string-append "http://cache.ruby-lang.org/pub/ruby/;
-   (version-major+minor version)
-   "/ruby-" version ".tar.bz2"))
-   (sha256
-(base32
- "1qq7khilwkayrhwmzlxk83scrmiqfi7lgsn4c63znyvz2c1lgqxl"
-(native-search-paths '())
-(arguments
- `(#:test-target "test"
-   #:parallel-tests? #f
-   #:phases
-   (modify-phases %standard-phases
- (add-before 'configure 'replace-bin-sh
-   (lambda _
- (substitute* '("Makefile.in"
-"ext/pty/pty.c"
-"io.c"
-"lib/mkmf.rb"
-"process.c")
-   (("/bin/sh") (which "sh")))
- #t)))
-
 (define-public ruby-highline
   (package
 (name "ruby-highline")



branch master updated (059954f -> 8ef0655)

2019-01-01 Thread guix-commits
alexvong1995 pushed a change to branch master
in repository guix.

  from  059954f   gnu: breeze-icons: Fix failing tests.
   new  8ef0655   gnu: ruby: Remove versions 1.8, 2.1 and 2.2.

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/ruby.scm | 69 +--
 1 file changed, 1 insertion(+), 68 deletions(-)