01/01: gnu: linux-libre: Update to 4.9.3.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 692e05e2933975b6926cab7436a971bb12bd0818
Author: Mark H Weaver 
Date:   Fri Jan 13 02:33:55 2017 -0500

gnu: linux-libre: Update to 4.9.3.

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e7905ba..5b6466c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -333,8 +333,8 @@ It has been modified to remove all non-free binary blobs.")
 (define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
 
 (define-public linux-libre
-  (make-linux-libre "4.9.2"
-"08gd5ja5gdhzpwzbjhipwmh4myp0hj13k1wsl1xvplszh3p9b076"
+  (make-linux-libre "4.9.3"
+"1jd2rz58lcha9ac35glr26lc6hfi49fvpiwshgpd6ygf4irrs82w"
 %intel-compatible-systems
 #:configuration-file kernel-config))
 
@@ -351,8 +351,8 @@ It has been modified to remove all non-free binary blobs.")
 #:configuration-file kernel-config))
 
 ;; Avoid rebuilding kernel variants when there is a minor version bump.
-(define %linux-libre-version "4.9.2")
-(define %linux-libre-hash 
"08gd5ja5gdhzpwzbjhipwmh4myp0hj13k1wsl1xvplszh3p9b076")
+(define %linux-libre-version "4.9.3")
+(define %linux-libre-hash 
"1jd2rz58lcha9ac35glr26lc6hfi49fvpiwshgpd6ygf4irrs82w")
 
 (define-public linux-libre-arm-generic
   (make-linux-libre %linux-libre-version

branch master updated (79728b6 -> 692e05e)

[Mark H. Weaver]

mhw pushed a change to branch master
in repository guix.

  from  79728b6   gnu: xfig: Correct typographic error.
   new  692e05e   gnu: linux-libre: Update to 4.9.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/linux.scm |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

01/02: gnu: aqbanking: Update source hash.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 7d3546292386544d07de91e943f92708ad0ff543
Author: John Darrington 
Date:   Fri Jan 13 07:24:50 2017 +0100

gnu: aqbanking: Update source hash.

* gnu/packages/gnucash.scm (aqbanking): Update source hash.  This was
  inadvertently omitted from commit cac19f0df947ef656cc8e276b2538aab7d927367
---
 gnu/packages/gnucash.scm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index f36f753..83096d6 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -165,7 +165,7 @@ applications and libraries.  It is used by AqBanking.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
 (base32
- "1x0isvpk43rq2zlyyb9p0kgjmqv7yq07vgkiprw3f5sjkykvxw6d"
+ "08jbwmiv6f3v8iqdr44x4szna496fqcjfi6mlx04cnbx91m70lh6"
 (build-system gnu-build-system)
 (arguments
  `(;; Parallel building fails because aqhbci is required before it's

02/02: gnu: xfig: Correct typographic error.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 79728b621bb3032984252c244b710993ae1aa984
Author: John Darrington 
Date:   Fri Jan 13 07:26:37 2017 +0100

gnu: xfig: Correct typographic error.

* gnu/packages/xfig.scm (xfig) [arguments]: Fix typo.
---
 gnu/packages/xfig.scm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm
index ad1b432..2e65000 100644
--- a/gnu/packages/xfig.scm
+++ b/gnu/packages/xfig.scm
@@ -66,7 +66,7 @@
   (out   (assoc-ref outputs "out")))
   (substitute* "Imakefile"
 (("XCOMM XAPPLOADDIR = /home/user/xfig *")
- (string-append "XAPPLOADDIR = " out 
%app-defaults-dir))
+ (string-append "XAPPLOADDIR = " out 
,%app-defaults-dir))
 (("XCOMM (BINDIR = )[[:graph:]]*" _ front)
  (string-append front out "/bin"))
 (("(PNGLIBDIR = )[[:graph:]]*" _ front)

branch master updated (f66b3e1 -> 79728b6)

[John Darrington]

jmd pushed a change to branch master
in repository guix.

  from  f66b3e1   gnu: qtxmlpatterns: Skip network tests.
   new  7d35462   gnu: aqbanking: Update source hash.
   new  79728b6   gnu: xfig: Correct typographic error.

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/gnucash.scm |2 +-
 gnu/packages/xfig.scm|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

01/10: gnu: Add qtdeclarative-render2d.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 843bdfb77e711ba229c28d99f657d392eacfeb2c
Author: Efraim Flashner 
Date:   Fri Dec 30 22:57:53 2016 +0200

gnu: Add qtdeclarative-render2d.

* gnu/packages/qt.scm (qtdeclarative-render2d): New variable.
---
 gnu/packages/qt.scm |   23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index df6fe16..3e954e9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge 
 ;;; Copyright © 2015 Sou Bunnbu 
 ;;; Copyright © 2015 Ludovic Courtès 
-;;; Copyright © 2015, 2016 Efraim Flashner 
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner 
 ;;; Copyright © 2016, 2017 ng0 
 ;;; Copyright © 2016 Thomas Danckaert 
 ;;;
@@ -910,6 +910,27 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtdeclarative-render2d
+  (package (inherit qtsvg)
+(name "qtdeclarative-render2d")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"))
+ (modules '((guix build utils)))
+ (snippet
+  '(delete-file-recursively "tools/opengldummy/3rdparty"
+(native-inputs `())
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

02/10: gnu: Add qtserialbus.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit a98ffab5caacc0638dc562e8e82638bdea57dd95
Author: Efraim Flashner 
Date:   Thu Jan 5 20:44:27 2017 +0200

gnu: Add qtserialbus.

* gnu/packages/qt.scm (qtserialbus): New variable.
---
 gnu/packages/qt.scm |   17 +
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3e954e9..9554054 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -781,6 +781,23 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("eudev" ,eudev)
 
+(define-public qtserialbus
+  (package (inherit qtsvg)
+(name "qtserialbus")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtserialport" ,qtserialport)
+
 (define-public qtwebchannel
   (package (inherit qtsvg)
 (name "qtwebchannel")

05/10: gnu: Add qtpurchasing.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit de5e018057e16bd78eb0160da55131143521278f
Author: Efraim Flashner 
Date:   Fri Jan 6 00:24:54 2017 +0200

gnu: Add qtpurchasing.

* gnu/packages/qt.scm (qtpurchasing): New variable.
---
 gnu/packages/qt.scm |   17 +
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b9d8ac1..ffebcd1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -993,6 +993,23 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtpurchasing
+  (package (inherit qtsvg)
+(name "qtpurchasing")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

08/10: gnu: Add qtdatavis3d.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit a69945a78da235faf3a80a12f4b281c9e596caa9
Author: Efraim Flashner 
Date:   Sat Jan 7 17:57:36 2017 +0200

gnu: Add qtdatavis3d.

* gnu/packages/qt.scm (qtdatavis3d): New variable.
---
 gnu/packages/qt.scm |   17 +
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b3fc8f3..803c66f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1048,6 +1048,23 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtdatavis3d
+  (package (inherit qtsvg)
+(name "qtdatavis3d")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

branch master updated (5bb9dbc -> f66b3e1)

[Efraim Flashner]

efraim pushed a change to branch master
in repository guix.

  from  5bb9dbc   gnu: nano: Update to 2.7.4.
   new  843bdfb   gnu: Add qtdeclarative-render2d.
   new  a98ffab   gnu: Add qtserialbus.
   new  51519fd   gnu: Add qtgamepad.
   new  56cd88f   gnu: Add qtscxml.
   new  de5e018   gnu: Add qtpurchasing.
   new  173b54b   gnu: Add qtcanvas3d.
   new  68bbe14   gnu: Add qtcharts.
   new  a69945a   gnu: Add qtdatavis3d.
   new  c195b5b   gnu: qtsvg: Build tests by default.
   new  f66b3e1   gnu: qtxmlpatterns: Skip network tests.

The 10 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/qt.scm |  233 ++-
 1 file changed, 229 insertions(+), 4 deletions(-)

06/10: gnu: Add qtcanvas3d.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 173b54b994bda4639b47979df3dbc92747183511
Author: Efraim Flashner 
Date:   Fri Jan 6 10:00:26 2017 +0200

gnu: Add qtcanvas3d.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ffebcd1..74839a9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1010,6 +1010,27 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtcanvas3d
+  (package (inherit qtsvg)
+(name "qtcanvas3d")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"))
+ (modules '((guix build utils)))
+ (snippet
+  '(delete-file-recursively "examples/canvas3d/3rdparty"
+(native-inputs `())
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

09/10: gnu: qtsvg: Build tests by default.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit c195b5ba9855830bf0826304be17655c627f1788
Author: Efraim Flashner 
Date:   Sat Jan 7 22:14:04 2017 +0200

gnu: qtsvg: Build tests by default.

* gnu/packages/qt.scm (qtsvg)[arguments]: Set QT_BUILD_PARTS in the
custom 'configure phase to include tests. Add custom 'set-display
phase to enable offscreen tests.
(qtx11extras, qtxmlpatterns, qtdeclarative, qtwebsockets, qtlocation,
qttools, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects,
qtcharts, qtdatavis3d)[arguments]: Disable tests.
(qtmultimedia)[source]: Edit snippet to not build 'spectrum' example.
[arguments]: Disable tests.
(qtscxml)[source]: Edit snippet to not build 'scion' test.
(qtcanvas3d)[arguments]: Don't build the test suite, don't run the tests.
---
 gnu/packages/qt.scm |   72 ---
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 803c66f..5189da4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -554,14 +554,22 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
  (let ((out (assoc-ref outputs "out")))
-   (zero? (system* "qmake" (string-append "PREFIX=" out))
+   ;; Valid QT_BUILD_PARTS variables are:
+   ;; libs tools tests examples demos docs translations
+   (zero? (system* "qmake" "QT_BUILD_PARTS = libs tools tests"
+   (string-append "PREFIX=" out))
  (add-before 'install 'fix-Makefiles
(lambda* (#:key inputs outputs #:allow-other-keys)
  (let ((out(assoc-ref outputs "out"))
(qtbase (assoc-ref inputs "qtbase")))
(substitute* (find-files "." "Makefile")
 (((string-append "INSTALL_ROOT)" qtbase))
- (string-append "INSTALL_ROOT)" out)))
+ (string-append "INSTALL_ROOT)" out)))
+   #t)))
+(add-before 'check 'set-display
+  (lambda _
+(setenv "QT_QPA_PLATFORM" "offscreen")
+#t)))
 
 (define-public qtimageformats
   (package (inherit qtsvg)
@@ -603,6 +611,9 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (sha256
   (base32
"09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz"
+(arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+   ((#:tests? _ #f) #f))) ; TODO: Enable the tests
 (native-inputs `(("perl" ,perl)))
 (inputs
  `(("mesa" ,mesa)
@@ -621,6 +632,9 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (sha256
   (base32
"1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8"
+(arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+   ((#:tests? _ #f) #f))) ; TODO: Enable the tests
 (native-inputs `(("perl" ,perl)))
 (inputs `(("qtbase" ,qtbase)
 
@@ -637,6 +651,9 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (sha256
   (base32
"0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx"
+(arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+   ((#:tests? _ #f) #f))) ; TODO: Enable the tests
 (native-inputs
  `(("perl" ,perl)
("pkg-config" ,pkg-config)
@@ -681,6 +698,9 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (sha256
   (base32
"1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw"
+(arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+   ((#:tests? _ #f) #f))) ; TODO: Enable the tests
 (native-inputs
  `(("perl" ,perl)
("qtdeclarative" ,qtdeclarative)))
@@ -721,7 +741,13 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (snippet
   '(begin
  (delete-file-recursively
-   "examples/multimedia/spectrum/3rdparty")
+   "examples/multimedia/spectrum/3rdparty")
+ ;; We also prevent the spectrum example from being built.
+ (substitute* "examples/multimedia/multimedia.pro"
+   (("spectrum") "#"))
+(arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+   ((#:tests? _ #f) #f))) ; TODO: Enable the tests
 (native-inputs
  `(("perl" ,perl)
("pkg-config" ,pkg-config)
@@ -831,6 +857,9 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  (sha256
   (base32

07/10: gnu: Add qtcharts.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 68bbe14b152788344ec184a466c4e99ca743231b
Author: Efraim Flashner 
Date:   Fri Jan 6 14:56:26 2017 +0200

gnu: Add qtcharts.

* gnu/packages/qt.scm (qtcharts): New variable.
---
 gnu/packages/qt.scm |   17 +
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 74839a9..b3fc8f3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1031,6 +1031,23 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtcharts
+  (package (inherit qtsvg)
+(name "qtcharts")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

03/10: gnu: Add qtgamepad.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 51519fd3fc9f4031b0b3a39ea755f55e54f8349f
Author: Efraim Flashner 
Date:   Thu Jan 5 23:01:45 2017 +0200

gnu: Add qtgamepad.

* gnu/packages/qt.scm (qtgamepad): New variable.
---
 gnu/packages/qt.scm |   25 +
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9554054..ca69ed5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -55,6 +55,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -948,6 +949,30 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
  `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtgamepad
+  (package (inherit qtsvg)
+(name "qtgamepad")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"
+(native-inputs
+ `(("perl" ,perl)
+   ("pkg-config" ,pkg-config)))
+(inputs
+ `(("fontconfig" ,fontconfig)
+   ("freetype" ,freetype)
+   ("libxrender" ,libxrender)
+   ("sdl2" ,sdl2)
+   ("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

04/10: gnu: Add qtscxml.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 56cd88fd3c289ef872bf8fad45c56a4158d7017f
Author: Efraim Flashner 
Date:   Thu Jan 5 23:52:40 2017 +0200

gnu: Add qtscxml.

* gnu/packages/qt.scm (qtscxml): New variable.
---
 gnu/packages/qt.scm |   20 
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ca69ed5..b9d8ac1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -973,6 +973,26 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
 
+(define-public qtscxml
+  (package (inherit qtsvg)
+(name "qtscxml")
+(version "5.7.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/;
+ (version-major+minor version) "/" version
+ "/submodules/" name "-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+  (base32
+   "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"))
+ (modules '((guix build utils)))
+ (snippet
+  '(delete-file-recursively "tests/3rdparty"
+(inputs
+ `(("qtbase" ,qtbase)
+   ("qtdeclarative" ,qtdeclarative)
+
 (define-public python-sip
   (package
 (name "python-sip")

10/10: gnu: qtxmlpatterns: Skip network tests.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit f66b3e1523e1c7ee7d78958b2a8526d9100f0809
Author: Efraim Flashner 
Date:   Sun Jan 8 13:35:41 2017 +0200

gnu: qtxmlpatterns: Skip network tests.

* gnu/packages/qt.scm (qtxmlpatterns)[arguments]: Add custom phase to
prevent the building of network tests.
---
 gnu/packages/qt.scm |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5189da4..b2fe6e4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -634,7 +634,13 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
"1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8"
 (arguments
  (substitute-keyword-arguments (package-arguments qtsvg)
-   ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+   ((#:phases phases)
+`(modify-phases ,phases
+   (add-after 'unpack 'disable-network-tests
+ (lambda _ (substitute* "tests/auto/auto.pro"
+ (("qxmlquery") "# qxmlquery")
+ (("xmlpatterns") "# xmlpatterns"))
+   #t))
 (native-inputs `(("perl" ,perl)))
 (inputs `(("qtbase" ,qtbase)
 

branch master updated (4cdff6a -> 5bb9dbc)

[Tobias Geerinckx-Rice]

nckx pushed a change to branch master
in repository guix.

  from  4cdff6a   challenge: Use a warning when substitutes are lacking.
   new  5bb9dbc   gnu: nano: Update to 2.7.4.

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


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

01/01: website: packages: Add reproducibility page.

[Ludovic Court�s]

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

commit d6b53b0399534bd6d93bbd0688b4ff44f250f736
Author: Ludovic Courtès 
Date:   Thu Jan 12 23:37:23 2017 +0100

website: packages: Add reproducibility page.

* website/www/packages.scm (%substitute-servers): New variable.
(local-nar-url, discrepancy->sxml)
(package->reproducibility-sxml, packages->reproducibility-sxml)
(reproducibility-page): New procedures.
---
 website/www/packages.scm |  160 +-
 1 file changed, 157 insertions(+), 3 deletions(-)

diff --git a/website/www/packages.scm b/website/www/packages.scm
index 55d494e..397f953 100644
--- a/website/www/packages.scm
+++ b/website/www/packages.scm
@@ -1,5 +1,5 @@
 ;;; GuixSD website --- GNU's advanced distro website
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès 
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
 ;;; Copyright © 2015 Mathieu Lirzin 
 ;;; Copyright © 2013 Alex Sassmannshausen 
 ;;; Initially written by Luis Felipe López Acevedo 

@@ -27,10 +27,17 @@
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix licenses)
+  #:use-module (guix monads)
+  #:use-module (guix grafts)
   #:use-module (guix gnu-maintenance)
+  #:use-module (guix store)
+  #:use-module (guix derivations)
+  #:use-module (guix base32)
   #:use-module ((guix download) #:select (%mirrors))
   #:use-module ((guix build download) #:select (maybe-expand-mirrors))
   #:use-module (guix scripts lint)
+  #:use-module (guix scripts challenge)
+  #:use-module (guix scripts substitute)
   #:use-module (gnu packages)
   #:use-module (sxml simple)
   #:use-module (sxml fold)
@@ -49,6 +56,7 @@
 package-pages
 paginated-packages-page
 issues-page
+reproducibility-page
 packages->json))
 
 (define lookup-gnu-package
@@ -428,8 +436,8 @@ generated by CHECKERS."
   (p
;; Issue count
,(issue-count->sxml (length issues)) ". "
-   "See " (a (@ (href ,(source-url package))) "package definition ")
-   "in Guix source code.")
+   "See " (a (@ (href ,(source-url package))) "package definition")
+   " in Guix source code.")
 
   ,(issues->sxml package issues
 
@@ -457,6 +465,124 @@ PACKAGES."
 
 
 ;;;
+;;; Reproducibility issues reported by 'challenge'.
+;;;
+
+(define %substitute-servers
+  ;; List of remote substitute servers against which we are comparing.
+  '("https://bayfront.guixsd.org;))
+
+(define (local-nar-url item)
+  (string-append "https://mirror.hydra.gnu.org/nar/;
+ (basename item)))
+
+(define (discrepancy->sxml discrepancy)
+  "Return the HTML for DISCREPANCY."
+  (let ((item (discrepancy-item discrepancy)))
+`(li (tt ,item)
+ (ol
+  (li (a (@ (href ,(local-nar-url item
+  (tt ,(bytevector->base32-string
+(discrepancy-local-sha256 discrepancy
+  ,@(map (lambda (narinfo)
+   `(li (a (@ (href ,(uri->string
+  (narinfo-uri narinfo)
+(tt ,(bytevector->base32-string
+  (narinfo-hash->sha256
+   (narinfo-hash narinfo))
+ (discrepancy-narinfos discrepancy))
+
+(define* (package->reproducibility-sxml package discrepancies
+#:key anchor)
+  "Return an SXML representation of DISCREPANCIES for PACKAGE."
+  (let ((name (string-append (package-name package) " "
+ (package-version package
+`(div
+  (@ (class "issues-list"))
+  (h2
+   (@ (id ,anchor))
+   ,name
+   (a
+(@ (class "anchor-link") (href ,(string-append "#" anchor))
+   (title "Link to this section"))
+"§"))
+  (p
+   ;; Issue count
+   ,@(if discrepancies
+ (list (issue-count->sxml (length discrepancies)) ". ")
+ '("No idea if it's reproducible.  "))
+   "See " (a (@ (href ,(source-url package))) "package definition")
+   " in Guix source code.")
+
+  ,(and discrepancies
+`(div (@ (class "issue"))
+  (ul ,@(map discrepancy->sxml discrepancies)))
+
+(define* (packages->reproducibility-sxml packages
+ #:key (servers %substitute-servers))
+  "Return an SXML tree representing the discrepancies found in the outputs of
+PACKAGES on SERVERS."
+  (define total (length packages))
+
+  (define package-anchor
+(packages->anchors packages))
+
+  (define valid?
+(store-lift valid-path?))
+
+  (define (one-of lst)
+(lambda (discrepancy)
+  (member (discrepancy-item discrepancy) lst)))
+
+  (define (add-package-outputs package mapping)
+   

branch master updated (ca9cac4 -> d6b53b0)

[Ludovic Court�s]

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

  from  ca9cac4   website: Add release announcement for 0.12.0.
   new  d6b53b0   website: packages: Add reproducibility page.

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:
 website/www/packages.scm |  160 +-
 1 file changed, 157 insertions(+), 3 deletions(-)

branch core-updates updated (8ee40f6 -> e9384e3)

[Marius Bakke]

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

  from  8ee40f6   Revert "Revert "gnu: gawk: Don't replace 'sh' reference 
with 'bash'.""
   new  e9384e3   gnu: ed: Update to 1.14.1.

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

branch master updated (08b98ae -> 4cdff6a)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  08b98ae   gnu: linux-libre@4.4: Update to 4.4.42.
   new  4cdff6a   challenge: Use a warning when substitutes are lacking.

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:
 guix/scripts/challenge.scm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

01/01: challenge: Use a warning when substitutes are lacking.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 4cdff6ae37878588a550e5969381d531c728e2fd
Author: Ludovic Courtès 
Date:   Thu Jan 12 23:14:58 2017 +0100

challenge: Use a warning when substitutes are lacking.

* guix/scripts/challenge.scm (discrepancies): Use 'warning' instead of
'leave'.
---
 guix/scripts/challenge.scm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm
index 590d8f1..9ab4fbe 100644
--- a/guix/scripts/challenge.scm
+++ b/guix/scripts/challenge.scm
@@ -118,7 +118,7 @@ taken since we do not import the archives."
   (select-reference item narinfos urls)
   (narinfo-hash->sha256 (narinfo-hash first))
   (()
-   (leave (_ "no substitutes for '~a'~%") item
+   (warning (_ "no substitutes for '~a'; cannot conclude~%") item
 
   (mlet* %store-monad ((local (mapm %store-monad
 query-locally-built-hash items))

branch master updated (60bc300 -> 08b98ae)

[Mark H. Weaver]

mhw pushed a change to branch master
in repository guix.

  from  60bc300   gnu: Add twm.
   new  08b98ae   gnu: linux-libre@4.4: Update to 4.4.42.

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

01/01: gnu: linux-libre@4.4: Update to 4.4.42.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 08b98ae8d3a8a5f74f0c7f77502e8be790487c29
Author: Mark H Weaver 
Date:   Thu Jan 12 16:28:27 2017 -0500

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

* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.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 5b2928a..e7905ba 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -339,8 +339,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.41"
-"1kl1m0riq90xldcf7lvjzdyz57w1wmnm93j0r0v8xz7n66m5nkp8"
+  (make-linux-libre "4.4.42"
+"1jd43yvycizgqdmwp9rpj7gpjy37mah8jlqaiskjb0hivyk495yz"
 %intel-compatible-systems
 #:configuration-file kernel-config))
 

06/20: installer: Ensure that the cursor visibility is updated on each page.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit d70e6a1f6bf8ddb2cecd15427a0e46d2efdbfbd1
Author: John Darrington 
Date:   Sat Jan 7 08:15:48 2017 +0100

installer: Ensure that the cursor visibility is updated on each page.

* gnu/system/installer/page.scm (make-page) : Add new parameter: 
cursor-visibility.
* gnu/system/installer/configure.scm,
gnu/system/installer/dialog.scm,
gnu/system/installer/disks.scm,
gnu/system/installer/file-browser.scm,
gnu/system/installer/filesystems.scm,
gnu/system/installer/guixsd-installer.scm,
gnu/system/installer/hostname.scm,
gnu/system/installer/install.scm,
gnu/system/installer/network.scm,
gnu/system/installer/passphrase.scm,
gnu/system/installer/role.scm,
gnu/system/installer/time-zone.scm,
gnu/system/installer/wireless.scm: Deal with the consequences.
---
 gnu/system/installer/configure.scm|2 ++
 gnu/system/installer/dialog.scm   |4 +++-
 gnu/system/installer/disks.scm|6 --
 gnu/system/installer/file-browser.scm |4 +++-
 gnu/system/installer/filesystems.scm  |4 +++-
 gnu/system/installer/guixsd-installer.scm |3 ++-
 gnu/system/installer/hostname.scm |2 ++
 gnu/system/installer/install.scm  |4 +++-
 gnu/system/installer/mount-point.scm  |3 ++-
 gnu/system/installer/network.scm  |3 +++
 gnu/system/installer/page.scm |   12 
 gnu/system/installer/passphrase.scm   |2 ++
 gnu/system/installer/role.scm |2 ++
 gnu/system/installer/time-zone.scm|4 
 gnu/system/installer/wireless.scm |2 ++
 15 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/gnu/system/installer/configure.scm 
b/gnu/system/installer/configure.scm
index e0594b6..c2a86ee 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -41,6 +41,7 @@
   (let ((page (make-page (page-surface parent)
  title
  configure-page-refresh
+ 0
  configure-page-key-handler)))
 page))
 
@@ -224,6 +225,7 @@
   (generate-guix-config p (getmaxx (inner config-window)))
   (force-output p))
 
+(push-cursor (page-cursor-visibility p))
 (page-set-wwin! p pr)
 (page-set-datum! p 'navigation buttons)
 (buttons-post buttons bwin)
diff --git a/gnu/system/installer/dialog.scm b/gnu/system/installer/dialog.scm
index 785c02c..e6976a1 100644
--- a/gnu/system/installer/dialog.scm
+++ b/gnu/system/installer/dialog.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +31,7 @@
   (let ((page (make-page (page-surface parent)
(gettext "Information")
dialog-page-refresh
+0
dialog-page-key-handler)))
 (page-set-datum! page 'message message)
 (page-set-datum! page 'justify justify)
@@ -89,6 +90,7 @@
  (addstr text-window
  (if (promise? m) (force m) m
 
+  (push-cursor (page-cursor-visibility p))
   (page-set-wwin! p frame)
   (page-set-datum! p 'text-window text-window)
   (page-set-datum! p 'navigation buttons)
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index b53dc0a..ac1007f 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,6 +34,7 @@
   (make-page (page-surface parent)
 title
 disk-page-refresh
+ 0
 disk-page-key-handler))
 
 (define (disk-page-refresh page)
@@ -140,7 +141,8 @@
   (list (truncate-string (disk-vendor d) 
w))
   (number->size (disk-size d))
   (length (disk-partitions d
-
+
+(push-cursor (page-cursor-visibility p))
 (page-set-datum! p 'text-window text-window)
 (page-set-wwin! p frame)
 (page-set-datum! p 'menu menu)
diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/file-browser.scm
index f07b97c..4e7f4f2 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,6 +30,7 @@
   (let ((page 

17/20: installer: Use a cleaner method of detecting wireless capability for ethernet interfaces.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 3ce64524feea9b859f854d0862df9417c880b35b
Author: John Darrington 
Date:   Wed Jan 11 08:06:03 2017 +0100

installer: Use a cleaner method of detecting wireless capability for 
ethernet interfaces.

* gnu/system/installer/network.scm (interfaces) : Avoid one use of system*.
---
 gnu/system/installer/network.scm |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 2209877..04861cf 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -44,8 +44,7 @@
  `((name .  ,ifce)
(class . ,(cond
   ((loopback-network-interface? ifce) 'loopback)
-  ((zero? (system* "iw" "dev" ifce "info"))
-   'wireless)
+  ((string-prefix? ifce "wl") 'wireless)
   (else 'ethernet)
(all-network-interface-names)))
 

07/20: installer: Rename "Back" buttons to "Cancel".

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 28b3724c985cd0f60bef749c4aafa0e259ca8bcf
Author: John Darrington 
Date:   Sat Jan 7 08:27:12 2017 +0100

installer: Rename "Back" buttons to "Cancel".

* gnu/system/installer/configure.scm: Replace "back" with "cancel".
* gnu/system/installer/disks.scm: Replace "back" with "cancel".
* gnu/system/installer/file-browser.scm: Replace "back" with "cancel".
* gnu/system/installer/filesystems.scm: Replace "back" with "cancel".
* gnu/system/installer/hostname.scm: Replace "back" with "cancel".
* gnu/system/installer/install.scm: Replace "back" with "cancel".
* gnu/system/installer/mount-point.scm: Replace "back" with "cancel".
* gnu/system/installer/passphrase.scm: Replace "back" with "cancel".
* gnu/system/installer/ping.scm: Replace "back" with "cancel".
* gnu/system/installer/role.scm: Replace "back" with "cancel".
* gnu/system/installer/time-zone.scm: Replace "back" with "cancel".
* gnu/system/installer/wireless.scm: Replace "back" with "cancel".
---
 gnu/system/installer/configure.scm|4 ++--
 gnu/system/installer/disks.scm|5 ++---
 gnu/system/installer/file-browser.scm |4 ++--
 gnu/system/installer/filesystems.scm  |4 ++--
 gnu/system/installer/hostname.scm |4 ++--
 gnu/system/installer/install.scm  |4 ++--
 gnu/system/installer/mount-point.scm  |6 +-
 gnu/system/installer/passphrase.scm   |4 ++--
 gnu/system/installer/ping.scm |9 ++---
 gnu/system/installer/role.scm |4 ++--
 gnu/system/installer/time-zone.scm|4 ++--
 gnu/system/installer/wireless.scm |4 ++--
 12 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/gnu/system/installer/configure.scm 
b/gnu/system/installer/configure.scm
index c2a86ee..c952983 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -47,7 +47,7 @@
 
 
 (define my-buttons `((save ,(N_ "_Save") #t)
- (back ,(N_ "_Back") #t)))
+ (cancel ,(N_ "Canc_el") #t)))
 
 
 ;; Kludge!  For testing.
@@ -96,7 +96,7 @@
   (buttons-unselect-all nav))
 
  
- ((buttons-key-matches-symbol? nav ch 'back)
+ ((buttons-key-matches-symbol? nav ch 'cancel)
   ;; Close the menu and return 
   (page-leave))
 
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index ac1007f..1f3092b 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -27,8 +27,7 @@
   #:use-module (ice-9 format)
   #:export (make-disk-page))
 
-(define my-buttons `((continue ,(N_ "_Continue") #t)
-(back ,(N_ "Go _Back") #t)))
+(define my-buttons `((continue ,(N_ "_Continue") #t)))
 
 (define (make-disk-page parent  title)
   (make-page (page-surface parent)
@@ -96,7 +95,7 @@
 
  ((buttons-key-matches-symbol? nav ch 'continue)
   (page-leave)))
-
+
 (std-menu-key-handler menu ch))
 
   #f
diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/file-browser.scm
index 4e7f4f2..4cb2580 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -39,7 +39,7 @@
 page))
 
 
-(define my-buttons `((back  ,(N_ "_Back") #t)))
+(define my-buttons `((cancel  ,(N_ "Canc_el") #t)))
 
 (define (file-browser-page-key-handler page ch)
   (let ((nav  (page-datum page 'navigation))
@@ -55,7 +55,7 @@
(else
(buttons-select-next nav
 
- ((buttons-key-matches-symbol? nav ch 'back)
+ ((buttons-key-matches-symbol? nav ch 'cancel)
 
   (page-leave))
 
diff --git a/gnu/system/installer/filesystems.scm 
b/gnu/system/installer/filesystems.scm
index 6dfa3cb..05d8310 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -106,7 +106,7 @@
 
 
 (define my-buttons `((continue ,(N_ "_Continue") #t)
-(back ,(N_ "Go _Back") #t)))
+(cancel ,(N_ "Canc_el") #t)))
 
 
 
@@ -187,7 +187,7 @@
(page-set-datum! next 'device name)
 (page-enter next)))
 
- ((buttons-key-matches-symbol? nav ch 'back)
+ ((buttons-key-matches-symbol? nav ch 'cancel)
   (page-leave))
 
 
diff --git a/gnu/system/installer/hostname.scm 
b/gnu/system/installer/hostname.scm
index 1c561c4..daafa7b 100644
--- a/gnu/system/installer/hostname.scm
+++ b/gnu/system/installer/hostname.scm
@@ -69,7 +69,7 @@
(dev   (page-datum page 'device)))
 
 (cond
- ((buttons-key-matches-symbol? nav ch 'back)
+ ((buttons-key-matches-symbol? nav ch 'cancel)
   (page-leave))
 
  ((select-key? ch)
@@ -109,7 +109,7 @@
   (form-enter form ch)))
 #f))
 
-(define my-buttons `((back ,(N_ "Back") #f)))
+(define my-buttons `((cancel ,(N_ "Cancel") #f)))
 
 (define (host-name-init p)
   (let* ((s (page-surface p))
diff --git a/gnu/system/installer/install.scm 

03/20: installer: Remove pointless calls to delwin.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 63b54ec2ef0d6bd9ef47218d5c2a78c48641e412
Author: John Darrington 
Date:   Fri Jan 6 20:04:57 2017 +0100

installer: Remove pointless calls to delwin.

This gets called anyway when the window is garbage collected.

* gnu/system/installer/configure.scm: Remove delwin call.
* gnu/system/installer/dialog.scm: Remove delwin call.
* gnu/system/installer/disks.scm: Remove delwin call.
* gnu/system/installer/file-browser.scm: Remove delwin call.
* gnu/system/installer/filesystems.scm: Remove delwin call.
* gnu/system/installer/install.scm: Remove delwin call.
* gnu/system/installer/network.scm: Remove delwin call.
* gnu/system/installer/ping.scm: Remove delwin call.
* gnu/system/installer/role.scm: Remove delwin call.
* gnu/system/installer/time-zone.scm: Remove delwin call.
---
 gnu/system/installer/configure.scm|4 
 gnu/system/installer/dialog.scm   |2 --
 gnu/system/installer/disks.scm|1 -
 gnu/system/installer/file-browser.scm |2 --
 gnu/system/installer/filesystems.scm  |3 ---
 gnu/system/installer/install.scm  |2 --
 gnu/system/installer/network.scm  |2 --
 gnu/system/installer/ping.scm |2 --
 gnu/system/installer/role.scm |4 
 gnu/system/installer/time-zone.scm|2 --
 10 files changed, 24 deletions(-)

diff --git a/gnu/system/installer/configure.scm 
b/gnu/system/installer/configure.scm
index f0206a3..d454488 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -97,8 +97,6 @@
  
  ((buttons-key-matches-symbol? nav ch 'back)
   ;; Close the menu and return 
-  (delwin (outer (page-wwin page)))
-  (delwin (inner (page-wwin page)))
   (set! page-stack (cdr page-stack)))
 
 
@@ -113,8 +111,6 @@
 (close-port cfg-port))
 
   ;; Close the menu and return 
-  (delwin (outer (page-wwin page)))
-  (delwin (inner (page-wwin page)))
   (set! page-stack (cdr page-stack)))
  )
 
diff --git a/gnu/system/installer/dialog.scm b/gnu/system/installer/dialog.scm
index 26064eb..2c8f3ed 100644
--- a/gnu/system/installer/dialog.scm
+++ b/gnu/system/installer/dialog.scm
@@ -52,8 +52,6 @@
(buttons-select-next nav
 
  ((buttons-key-matches-symbol? nav ch 'ok)
-  (delwin (outer (page-wwin page)))
-  (delwin (inner (page-wwin page)))
 
   (delwin (page-datum page 'text-window))
   (set! page-stack (cdr page-stack))
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index f0f043a..9a1c8b6 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -94,7 +94,6 @@
 (system* "partprobe")))
 
  ((buttons-key-matches-symbol? nav ch 'continue)
-  (delwin (outer (page-wwin page)))
   (set! page-stack (cdr page-stack))
   ((page-refresh (car page-stack)) (car page-stack
 
diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/file-browser.scm
index 35c54cb..70fcae3 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -55,8 +55,6 @@
(buttons-select-next nav
 
  ((buttons-key-matches-symbol? nav ch 'back)
-  (delwin (outer (page-wwin page)))
-  (delwin (inner (page-wwin page)))
 
   (set! page-stack (cdr page-stack)))
 
diff --git a/gnu/system/installer/filesystems.scm 
b/gnu/system/installer/filesystems.scm
index bde276d..0908f52 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -188,8 +188,6 @@
))
 
  ((buttons-key-matches-symbol? nav ch 'back)
-  (delwin (outer (page-wwin page)))
-  (delwin (inner (page-wwin page)))
   (set! page-stack (cdr page-stack)))
 
 
@@ -200,7 +198,6 @@
   (set! page-stack (cons next page-stack))
   ((page-refresh next) next))
 (begin
-  (delwin (outer (page-wwin page)))
   (set! page-stack (cdr page-stack))
   ((page-refresh (car page-stack)) (car page-stack)))
 
diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm
index 5cfb52e..a08b4f8 100644
--- a/gnu/system/installer/install.scm
+++ b/gnu/system/installer/install.scm
@@ -70,8 +70,6 @@
 
  ((buttons-key-matches-symbol? nav ch 'back)
   ;; Close the menu and return
-  (delwin (outer (page-wwin page)))
-  (delwin (inner (page-wwin page)))
   (set! page-stack (cdr page-stack)))
 
  ((buttons-key-matches-symbol? nav ch 'reboot)
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 45e6981..7eb4807 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -116,8 +116,6 @@
   ;; Cancel the timer
   (setitimer ITIMER_REAL 0 0 0 0)
 
-  (delwin (outer (page-wwin page)))

branch wip-installer updated (9c4d060 -> 3673cd8)

[John Darrington]

jmd pushed a change to branch wip-installer
in repository guix.

  from  9c4d060   installer: Use --fallback when installing.
   new  09e4f87   installer: Correct behaviour of push-cursor and 
pop-cursor procedures.
   new  7565098   installer: Remove explicit calls to curs-set from pages.
   new  63b54ec   installer: Remove pointless calls to delwin.
   new  0103bae   installer: New procedure "page-leave".
   new  0335e73   installer: New procedure: page-enter.
   new  d70e6a1   installer: Ensure that the cursor visibility is updated 
on each page.
   new  28b3724   installer: Rename "Back" buttons to "Cancel".
   new  6e814f7   installer: Ignore case in button accelerators.
   new  187293f   installer: Make all windows with ports scrollable.
   new  7ba37f9   installer: Rename 'file-browser.scm' to 'key-map.scm'.
   new  568b7c3   installer: Add installer source files to the manifest of 
translatables.
   new  6f1bbe1   installer: "Setup" --> "Set up"
   new  a8ab689   installer: Use guix build syscalls module for network 
interrogation.
   new  137c5e6   installer: Use "lspci -mm" instead of "lspci -m".
   new  6a63413   installer: slurp: Ignore blank lines in output.
   new  97373a7   installer: Minor cleanup.
   new  3ce6452   installer: Use a cleaner method of detecting wireless 
capability for ethernet interfaces.
   new  6fd829d   guix: Add IFF_RUNNING to  exported syscall constants.
   new  004ea2e   installer: Make the network menu more reliable.
   new  3673cd8   installer: Enable direct scrolling to top or bottom of 
menus.

The 20 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/system/installer/configure.scm |   14 +-
 gnu/system/installer/dialog.scm|8 +-
 gnu/system/installer/disks.scm |   15 +-
 gnu/system/installer/filesystems.scm   |   23 ++--
 gnu/system/installer/guixsd-installer.scm  |   13 +-
 gnu/system/installer/hostname.scm  |   13 +-
 gnu/system/installer/install.scm   |   15 +-
 .../installer/{file-browser.scm => key-map.scm}|   19 ++-
 gnu/system/installer/mount-point.scm   |   13 +-
 gnu/system/installer/network.scm   |  145 ++--
 gnu/system/installer/page.scm  |   24 +++-
 gnu/system/installer/passphrase.scm|   13 +-
 gnu/system/installer/ping.scm  |   11 +-
 gnu/system/installer/role.scm  |   14 +-
 gnu/system/installer/time-zone.scm |   18 +--
 gnu/system/installer/utils.scm |   21 ++-
 gnu/system/installer/wireless.scm  |   13 +-
 guix/build/syscalls.scm|2 +
 gurses/buttons.scm |5 +-
 gurses/menu.scm|   23 +++-
 po/guix/POTFILES.in|   15 ++
 22 files changed, 239 insertions(+), 200 deletions(-)
 rename gnu/system/installer/{file-browser.scm => key-map.scm} (88%)

15/20: installer: slurp: Ignore blank lines in output.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 6a63413171a8d1250225fed69a00465c37e0c8af
Author: John Darrington 
Date:   Wed Jan 11 07:36:51 2017 +0100

installer: slurp: Ignore blank lines in output.

* gnu/system/installer/utils.scm (slurp): Ignore blank lines in output.
---
 gnu/system/installer/utils.scm |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/system/installer/utils.scm b/gnu/system/installer/utils.scm
index 079c264..6de519b 100644
--- a/gnu/system/installer/utils.scm
+++ b/gnu/system/installer/utils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -193,7 +193,10 @@ which will process each string before returning it."
 (let  ((l (read-line port)))
   (if (eof-object? l)
  (reverse line-list)
- (lp (cons (if proc (proc l) l) line-list))
+ (lp
+   (if (string= l "") ;; Ignore blank lines
+   line-list
+   (cons (if proc (proc l) l) line-list)))
 
 
 

02/20: installer: Remove explicit calls to curs-set from pages.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 7565098ca99ef9b6f2a81ab7e910027af399123a
Author: John Darrington 
Date:   Fri Jan 6 17:52:28 2017 +0100

installer: Remove explicit calls to curs-set from pages.

* gnu/system/installer/hostname.scm: Remove calls to curs-set.
* gnu/system/installer/mount-point.scm: Remove calls to curs-set.
---
 gnu/system/installer/hostname.scm|1 -
 gnu/system/installer/mount-point.scm |1 -
 2 files changed, 2 deletions(-)

diff --git a/gnu/system/installer/hostname.scm 
b/gnu/system/installer/hostname.scm
index be5181f..3939120 100644
--- a/gnu/system/installer/hostname.scm
+++ b/gnu/system/installer/hostname.scm
@@ -107,7 +107,6 @@
(positive? (field-cursor-position (get-current-field form)
 
  (else
-  (curs-set 1)
   (form-enter form ch)))
 #f))
 
diff --git a/gnu/system/installer/mount-point.scm 
b/gnu/system/installer/mount-point.scm
index 61649ac..632b81d 100644
--- a/gnu/system/installer/mount-point.scm
+++ b/gnu/system/installer/mount-point.scm
@@ -111,7 +111,6 @@
   (form-set-enabled! form #t))
  )
 
-(curs-set 1)
 (form-enter form ch))
   #f)
 

04/20: installer: New procedure "page-leave".

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 0103bae9299862a15d75eb33d7d377749265a603
Author: John Darrington 
Date:   Fri Jan 6 20:46:09 2017 +0100

installer: New procedure "page-leave".

* gnu/system/installer/page.scm (page-leave): New procedure.
* gnu/system/installer/configure.scm,
gnu/system/installer/dialog.scm,
gnu/system/installer/disks.scm,
gnu/system/installer/file-browser.scm,
gnu/system/installer/filesystems.scm,
gnu/system/installer/hostname.scm,
gnu/system/installer/install.scm,
gnu/system/installer/mount-point.scm,
gnu/system/installer/network.scm,
gnu/system/installer/passphrase.scm,
gnu/system/installer/ping.scm,
gnu/system/installer/role.scm,
gnu/system/installer/time-zone.scm,
gnu/system/installer/wireless.scm: Use it where appropriate.
---
 gnu/system/installer/configure.scm|4 ++--
 gnu/system/installer/dialog.scm   |2 +-
 gnu/system/installer/disks.scm|3 +--
 gnu/system/installer/file-browser.scm |4 ++--
 gnu/system/installer/filesystems.scm  |5 ++---
 gnu/system/installer/hostname.scm |6 ++
 gnu/system/installer/install.scm  |2 +-
 gnu/system/installer/mount-point.scm  |3 +--
 gnu/system/installer/network.scm  |2 +-
 gnu/system/installer/page.scm |6 +-
 gnu/system/installer/passphrase.scm   |7 ++-
 gnu/system/installer/ping.scm |2 +-
 gnu/system/installer/role.scm |4 ++--
 gnu/system/installer/time-zone.scm|5 ++---
 gnu/system/installer/wireless.scm |3 +--
 15 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/gnu/system/installer/configure.scm 
b/gnu/system/installer/configure.scm
index d454488..e0594b6 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -97,7 +97,7 @@
  
  ((buttons-key-matches-symbol? nav ch 'back)
   ;; Close the menu and return 
-  (set! page-stack (cdr page-stack)))
+  (page-leave))
 
 
 
@@ -111,7 +111,7 @@
 (close-port cfg-port))
 
   ;; Close the menu and return 
-  (set! page-stack (cdr page-stack)))
+  (page-leave))
  )
 
 #f))
diff --git a/gnu/system/installer/dialog.scm b/gnu/system/installer/dialog.scm
index 2c8f3ed..785c02c 100644
--- a/gnu/system/installer/dialog.scm
+++ b/gnu/system/installer/dialog.scm
@@ -54,7 +54,7 @@
  ((buttons-key-matches-symbol? nav ch 'ok)
 
   (delwin (page-datum page 'text-window))
-  (set! page-stack (cdr page-stack))
+  (page-leave)
   ))
 #f))
 
diff --git a/gnu/system/installer/disks.scm b/gnu/system/installer/disks.scm
index 9a1c8b6..b53dc0a 100644
--- a/gnu/system/installer/disks.scm
+++ b/gnu/system/installer/disks.scm
@@ -94,8 +94,7 @@
 (system* "partprobe")))
 
  ((buttons-key-matches-symbol? nav ch 'continue)
-  (set! page-stack (cdr page-stack))
-  ((page-refresh (car page-stack)) (car page-stack
+  (page-leave)))
 
 (std-menu-key-handler menu ch))
 
diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/file-browser.scm
index 70fcae3..e0af0ec 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -56,7 +56,7 @@
 
  ((buttons-key-matches-symbol? nav ch 'back)
 
-  (set! page-stack (cdr page-stack)))
+  (page-leave))
 
  ((and (eqv? ch #\newline)
   (menu-active menu))
@@ -70,7 +70,7 @@
(begin
   (system* "loadkeys" i)
   (set! key-map i)
-  (set! page-stack (page-datum page 'exit-point))
+  (page-leave (page-datum page 'exit-point))
   #f)
 (std-menu-key-handler menu ch)
 #f))
diff --git a/gnu/system/installer/filesystems.scm 
b/gnu/system/installer/filesystems.scm
index 0908f52..9631e7e 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -188,7 +188,7 @@
))
 
  ((buttons-key-matches-symbol? nav ch 'back)
-  (set! page-stack (cdr page-stack)))
+  (page-leave))
 
 
  ((buttons-key-matches-symbol? nav ch 'continue)
@@ -198,8 +198,7 @@
   (set! page-stack (cons next page-stack))
   ((page-refresh next) next))
 (begin
-  (set! page-stack (cdr page-stack))
-  ((page-refresh (car page-stack)) (car page-stack)))
+  (page-leave))
 
 
 (std-menu-key-handler menu ch))
diff --git a/gnu/system/installer/hostname.scm 
b/gnu/system/installer/hostname.scm
index 3939120..66096cb 100644
--- a/gnu/system/installer/hostname.scm
+++ b/gnu/system/installer/hostname.scm
@@ -69,13 +69,11 @@
 
 (cond
  ((buttons-key-matches-symbol? nav ch 'back)
-  (set! page-stack (cdr page-stack))
-  ((page-refresh (car page-stack)) (car page-stack)))
+  (page-leave))
 
  ((select-key? ch)
   (set! 

05/20: installer: New procedure: page-enter.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 0335e73589ef50dbbfdbc5fdcd55edf66e1c3d1b
Author: John Darrington 
Date:   Fri Jan 6 21:17:47 2017 +0100

installer: New procedure: page-enter.

* gnu/system/installer/page.scm (page-enter): New procedure.
* gnu/system/installer/file-browser.scm,
gnu/system/installer/filesystems.scm,
gnu/system/installer/guixsd-installer.scm,
gnu/system/installer/network.scm,
gnu/system/installer/time-zone.scm,
gnu/system/installer/wireless.scm: Use it where appropriate.
---
 gnu/system/installer/file-browser.scm |3 +--
 gnu/system/installer/filesystems.scm  |7 ++-
 gnu/system/installer/guixsd-installer.scm |6 ++
 gnu/system/installer/network.scm  |   11 ---
 gnu/system/installer/page.scm |6 ++
 gnu/system/installer/time-zone.scm|3 +--
 gnu/system/installer/wireless.scm |4 +---
 7 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/file-browser.scm
index e0af0ec..f07b97c 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -65,8 +65,7 @@
(if (eq? 'directory (stat:type (stat new-dir)))
(let ((p (make-file-browser
  page new-dir)))
- (set! page-stack (cons p page-stack))
- ((page-refresh p) p))
+  (page-enter p))
(begin
   (system* "loadkeys" i)
   (set! key-map i)
diff --git a/gnu/system/installer/filesystems.scm 
b/gnu/system/installer/filesystems.scm
index 9631e7e..011c6f3 100644
--- a/gnu/system/installer/filesystems.scm
+++ b/gnu/system/installer/filesystems.scm
@@ -183,9 +183,7 @@
   mount-point-page-key-handler)))
 
(page-set-datum! next 'device name)
-   (set! page-stack (cons next page-stack))
-   ((page-refresh next) next)
-   ))
+(page-enter next)))
 
  ((buttons-key-matches-symbol? nav ch 'back)
   (page-leave))
@@ -195,8 +193,7 @@
   (let ((errstr (filesystem-task-incomplete-reason)))
 (if errstr
 (let ((next (make-dialog page errstr)))
-  (set! page-stack (cons next page-stack))
-  ((page-refresh next) next))
+  (page-enter next))
 (begin
   (page-leave))
 
diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index c1a1cd1..b73839d 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -168,8 +168,7 @@
   (p (make-file-browser
   page keymap-directory
   page-stack)))
- (set! page-stack (cons p page-stack))
- ((page-refresh p) p)))
+ (page-enter p)))
 
 (define (do-task task-name page)
   "Queue the task whose name is TASK-NAME and any dependencies"
@@ -263,8 +262,7 @@
stdscr (gettext "GuixSD Installer")
main-page-refresh main-page-key-handler)))
 
-(set! page-stack (cons page page-stack))
-((page-refresh page) (car page-stack))
+(page-enter page)
 (let loop ((ch (getch stdscr)))
   (let ((current-page (car page-stack)))
 ((page-key-handler current-page) current-page ch)
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index d59bbda..4607a1d 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -92,10 +92,9 @@
(eq? 'wireless (assq-ref (menu-get-current-item menu) 'class)))
 
   (let ((next (make-wireless-page page (N_ "Wireless interface setup")
-   (assq-ref (menu-get-current-item menu) 
'name
-(set! page-stack (cons next page-stack))
-((page-refresh next) next)))
-
+  (assq-ref (menu-get-current-item menu) 
'name
+(page-enter next)))
+ 
  ((select-key? ch)
   (let ((item (menu-get-current-item menu)))
 (when (eq? (assq-ref item 'class) 'ethernet)
@@ -107,9 +106,7 @@
"Ping"
ping-page-refresh
ping-page-key-handler)))
-
-  (set! page-stack (cons next page-stack))
-  ((page-refresh next) next)))
+  (page-enter next)))
 
  ((buttons-key-matches-symbol? nav ch 'continue)
 
diff --git a/gnu/system/installer/page.scm b/gnu/system/installer/page.scm
index 59361d1..aaae044 100644
--- a/gnu/system/installer/page.scm
+++ b/gnu/system/installer/page.scm
@@ -23,6 +23,7 @@
   #:export (page-refresh)
   #:export (page-initialised?)
   #:export (page-set-initialised!)
+  #:export (page-enter)
   #:export (page-leave)
   #:export (page-set-wwin!)

19/20: installer: Make the network menu more reliable.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 004ea2e43f0161c094e7770b4462a4932384a53c
Author: John Darrington 
Date:   Wed Jan 11 14:03:34 2017 +0100

installer: Make the network menu more reliable.

* gnu/system/installer/network.scm (name->description): New procedure,a
and use it in network-page init.
---
 gnu/system/installer/network.scm |   68 ++
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 04861cf..15cdb8b 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu system installer wireless)
   #:use-module (guix build syscalls)
   #:use-module (ice-9 format)
+  #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
   #:use-module (gurses menu)
   #:use-module (gurses buttons)
@@ -48,6 +49,36 @@
   (else 'ethernet)
(all-network-interface-names)))
 
+(define (match->elem m match-number)
+  (let ((elem (match:substring m match-number)))
+(if elem
+(string->number (string-drop elem 1))
+0)))
+
+;; Convert a network device name such as "enp0s25" to
+;; something more descriptive like
+;; "82567LM Gigabit Network Connection"
+(define (name->description name)
+  (if (string=? name "lo")
+  "Loop back interface"
+  (let ((m (string-match 
"^..(P[[:digit:]]+)?(p[[:digit:]]+)(s[[:digit:]]+)(f[[:digit:]]+)?" name)))
+(if (not m)
+name
+(let ((domain  (match->elem m 1))
+  (bus (match->elem m 2))
+  (slot(match->elem m 3))
+  (func(match->elem m 4)))
+  (assoc-ref
+   (slurp
+(format #f "lspci -v -mm -s~x:~x:~x.~x"
+domain bus slot func)
+(lambda (x)
+  (let ((idx (string-index x #\:)))
+(cons (substring x 0 idx)
+  (string-trim
+   (substring x (1+ idx)))
+   "Device"))
+
 (define my-buttons `((continue ,(N_ "_Continue") #t)
 (test ,(N_ "_Test") #t)))
 
@@ -153,35 +184,14 @@
 (interfaces))
#:disp-proc
(lambda (datum row)
-  (match (string-split
-  (car (slurp
-(string-append "ip -o link show "
-   (assq-ref datum 'name))
-#f)) #\space)
-((_ _ flags _ _ _ _ _ state . _)
-
- ;; Convert a network device name such as "enp0s25" to
- ;; something more descriptive like
- ;; "82567LM Gigabit Network Connection"
- (let* ((name (assq-ref datum 'name))
-(addr (string-tokenize name char-set:digit)))
-   (match addr
- ((bus device . func)
-  (format #f "~50a ~6a ~a"
-  (assoc-ref
-   (slurp
-(format #f "lspci -v -mm -s~x:~x.~x"
-(string->number bus 10)
-(string->number device 10)
-(if (null? func) 0
-(string->number func 10)))
-(lambda (x)
-  (let ((idx (string-index x #\:)))
-(cons (substring x 0 idx)
-  (string-trim
-   (substring x (1+ idx)))
-   "Device")
-  state flags))
+ (format #f "~55a ~a"
+ (name->description (assq-ref datum 'name))
+ (if (zero? (logand IFF_RUNNING
+ (network-interface-flags
+  (socket SOCK_STREAM AF_INET 0)
+  (assq-ref datum 'name
+ (gettext "Down")
+ (gettext "Running")))
 
 (addstr*   text-window  (format #f
 (gettext

13/20: installer: Use guix build syscalls module for network interrogation.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit a8ab689900224d107896cdcf001453521fc17579
Author: John Darrington 
Date:   Tue Jan 10 15:59:53 2017 +0100

installer: Use guix build syscalls module for network interrogation.

* gnu/system/installer/network.scm (interfaces): Do some of the
work with the module (guix build syscalls) rather than everything
ourself.
---
 gnu/system/installer/network.scm |   38 +++---
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index bbf60d9..1667abc 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -22,6 +22,7 @@
   #:use-module (gnu system installer misc)
   #:use-module (gnu system installer utils)
   #:use-module (gnu system installer wireless)
+  #:use-module (guix build syscalls)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (gurses menu)
@@ -39,22 +40,14 @@
 network-page-key-handler))
 
 (define (interfaces)
-  "Return a alist of network interfaces. Keys include 'name, 'class and 'state"
-  (slurp "ip -o link"
- (lambda (s)
-   (match (string-split s #\space)
- ((_ interface-name _ _ _ _ _ _
- state _ _ _ _ _ _ _ _ _ class . _)
-  (let ((clean-name (string-trim-right interface-name #\:)))
-  `((name .  ,clean-name)
-(state . ,state)
-(class . ,(cond
-   ((equal? class "link/loopback") 'loopback)
-   ((equal? class "link/ether")
-(if (zero? (system* "iw" "dev" clean-name "info"))
- 'wireless
- 'ethernet))
-   (else 'other))
+  (map (lambda (ifce)
+`((name .  ,ifce)
+  (class . ,(cond
+ ((loopback-network-interface? ifce) 'loopback)
+ ((zero? (system* "iw" "dev" ifce "info"))
+  'wireless)
+ (else 'ethernet)
+   (all-network-interface-names)))
 
 (define my-buttons `((continue ,(N_ "_Continue") #t)
 (test ,(N_ "_Test") #t)))
@@ -155,12 +148,12 @@
   (getmaxy text-window) 0 #:panel #f))
 
 (menu (make-menu
-   (filter (lambda (i) (memq
+   (filter (lambda (i) (memq
  (assq-ref i 'class)
  '(ethernet wireless)))
 (interfaces))
-   #:disp-proc
-   (lambda (datum row)
+   #:disp-proc
+   (lambda (datum row)
 
   (match (string-split
   (car (slurp
@@ -170,9 +163,9 @@
 
 
   ;; Convert a network device name such as "enp0s25" to
- ;; something more descriptive like
- ;; "82567LM Gigabit Network Connection"
- (let* ((name (assq-ref datum 'name))
+ ;; something more descriptive like
+ ;; "82567LM Gigabit Network Connection"
+ (let* ((name (assq-ref datum 'name))
  (addr (string-tokenize name char-set:digit)))
 (match addr
   ((bus device . func)
@@ -195,7 +188,6 @@
  "Device:"))
state flags))
 
-
 (addstr*   text-window  (format #f
  (gettext
   "To install GuixSD a connection to one of ~s must be available.  
The following network devices exist on the system.  Select one to configure or 
\"Continue\" to proceeed.") %default-substitute-urls))

09/20: installer: Make all windows with ports scrollable.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 187293f631f26f0cb86db98f173ca5380a136ffe
Author: John Darrington 
Date:   Sat Jan 7 11:51:10 2017 +0100

installer: Make all windows with ports scrollable.

* gnu/system/installer/install.scm (install-page-init): Remove scrollok #t
* gnu/system/installer/utils.scm (make-window-port): Add scrollok! #t
---
 gnu/system/installer/install.scm |3 ---
 gnu/system/installer/utils.scm   |6 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/system/installer/install.scm b/gnu/system/installer/install.scm
index 2023d7e..3c04869 100644
--- a/gnu/system/installer/install.scm
+++ b/gnu/system/installer/install.scm
@@ -153,9 +153,6 @@
  0))
  )
 
-;; There will be a lot of text sent to this window!
-(scrollok! (inner config-window) #t)
-
 (addstr* text-window
  (gettext
   "Choose \"Continue\" to start installing the system."))
diff --git a/gnu/system/installer/utils.scm b/gnu/system/installer/utils.scm
index 5517710..079c264 100644
--- a/gnu/system/installer/utils.scm
+++ b/gnu/system/installer/utils.scm
@@ -60,6 +60,12 @@
 
 (define (make-window-port win)
   "Return a port which writes to the curses window WIN"
+
+  ;; It is reasonable to assume that windows for which a soft-port
+  ;; exists will have a lot of text sent to them and should therefore
+  ;; be scrollable.
+  (scrollok! win #t)
+
   (make-soft-port
(vector
 (lambda (c) (addch win c))

10/20: installer: Rename 'file-browser.scm' to 'key-map.scm'.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 7ba37f9108e869775edaa956fbf87f7ca4f22444
Author: John Darrington 
Date:   Sat Jan 7 16:03:06 2017 +0100

installer: Rename 'file-browser.scm' to 'key-map.scm'.

* gnu/system/installer/file-browser.scm: Delete file.
* gnu/system/installer/key-map.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Delete/Add it.
* gnu/system/installer/guixsd-installer.scm: Replace "use-module".
---
 gnu/local.mk   |2 +-
 gnu/system/installer/guixsd-installer.scm  |2 +-
 gnu/system/installer/{file-browser.scm => key-map.scm} |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index f3fc421..10c9e71 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -448,7 +448,7 @@ GNU_SYSTEM_MODULES =\
   %D%/system/installer/guixsd-installer.scm \
   %D%/system/installer/disks.scm\
   %D%/system/installer/ping.scm \
-  %D%/system/installer/file-browser.scm \
+  %D%/system/installer/key-map.scm  \
   %D%/system/installer/role.scm \
   %D%/system/installer/utils.scm\
   %D%/system/installer/page.scm \
diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index 20dbb04..2e81af2 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -28,7 +28,7 @@
 (gnu system installer configure)
  (gnu system installer filesystems)
 (gnu system installer hostname)
-(gnu system installer file-browser)
+(gnu system installer key-map)
 (gnu system installer time-zone)
  (gnu system installer role)
 (gnu system installer network)
diff --git a/gnu/system/installer/file-browser.scm 
b/gnu/system/installer/key-map.scm
similarity index 98%
rename from gnu/system/installer/file-browser.scm
rename to gnu/system/installer/key-map.scm
index 4cb2580..c964f68 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/key-map.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see .
 
-(define-module (gnu system installer file-browser)
+(define-module (gnu system installer key-map)
   #:use-module (gnu system installer page)
   #:use-module (gnu system installer utils)
   #:use-module (gnu system installer misc)

12/20: installer: "Setup" --> "Set up"

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 6f1bbe1b3e9c1c9158a8773625de80c63226f2e4
Author: John Darrington 
Date:   Mon Jan 9 08:53:37 2017 +0100

installer: "Setup" --> "Set up"

* gnu/system/installer/guixsd-installer.scm (main-options): Replace "Setup"
with "Set up".
---
 gnu/system/installer/guixsd-installer.scm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index 2e81af2..6da3b89 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -57,7 +57,7 @@
 
 (define partition-menu-title(N_ "Partition the disk(s)"))
 (define filesystem-menu-title   (N_ "Allocate disk partitions"))
-(define network-menu-title  (N_ "Setup the network"))
+(define network-menu-title  (N_ "Set up the network"))
 (define timezone-menu-title (N_ "Set the time zone"))
 (define hostname-menu-title (N_ "Set the host name"))
 (define installation-menu-title (N_ "Install the system"))

08/20: installer: Ignore case in button accelerators.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 6e814f787e3e0cbcf2e0e6f723a16b0c5ef60ec4
Author: John Darrington 
Date:   Sat Jan 7 08:53:07 2017 +0100

installer: Ignore case in button accelerators.

* gurses/buttons.scm (buttons-key-matches-symbol): Check upper and lower 
case matches.
---
 gurses/buttons.scm |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gurses/buttons.scm b/gurses/buttons.scm
index 7b1c666..8be4983 100644
--- a/gurses/buttons.scm
+++ b/gurses/buttons.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -152,7 +152,8 @@
 
 (define (buttons-key-matches-symbol? nav ch symbol)
   (if (char? ch)
-  (or (eq? (buttons-fetch-by-key nav (char-upcase ch)) symbol)
+  (or (eq? (buttons-fetch-by-key nav (char-downcase ch)) symbol)
+  (eq? (buttons-fetch-by-key nav (char-upcase ch)) symbol)
  (and (or (eq? ch #\newline)
   (eq? ch #\space))
   (and=> (buttons-get-current-selection nav)

14/20: installer: Use "lspci -mm" instead of "lspci -m".

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 137c5e6d774f544433ba4068eda507521e2a4c51
Author: John Darrington 
Date:   Tue Jan 10 17:23:41 2017 +0100

installer: Use "lspci -mm" instead of "lspci -m".

* gnu/system/installer/network.scm (network-page-init): Use the new version 
of
lspci and thus avoid a cdr.
---
 gnu/system/installer/network.scm |   21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 1667abc..d07791e 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -171,20 +171,13 @@
   ((bus device . func)
(format #f "~50a ~6a ~a"
(car (assoc-ref
- (cdr
-  ;; It seems that lspci always prints an initial
-  ;; "Device: :. line.  We are
-  ;; not interested in this, and it conflicts with
-  ;; the "real" (descriptive) Device: line which we
-  ;; want.  Hence the above cdr strips the first 
line
-  ;; away.
-  (slurp (format #f "lspci -vm -s~x:~x.~x"
- (string->number bus 10)
- (string->number device 10)
- (if (null? func) 0
- (string->number func 10)))
- (lambda (x)
-   (string-split x #\tab
+ (slurp (format #f "lspci -v -mm -s~x:~x.~x"
+(string->number bus 10)
+(string->number device 10)
+(if (null? func) 0
+(string->number func 10)))
+(lambda (x)
+  (string-split x #\tab)))
  "Device:"))
state flags))
 

01/20: installer: Correct behaviour of push-cursor and pop-cursor procedures.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 09e4f8721460ae91cfacb75048fc8f00a4ba6b9d
Author: John Darrington 
Date:   Fri Jan 6 17:41:01 2017 +0100

installer: Correct behaviour of push-cursor and pop-cursor procedures.

* utils.scm (push-cursor,pop-cursor): Correct thinko.
---
 gnu/system/installer/utils.scm |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/system/installer/utils.scm b/gnu/system/installer/utils.scm
index 25a8390..5517710 100644
--- a/gnu/system/installer/utils.scm
+++ b/gnu/system/installer/utils.scm
@@ -209,13 +209,11 @@ which will process each string before returning it."
 (define cursor-stack '())
 
 (define (push-cursor c)
-  (curs-set c)
-  (set! cursor-stack (cons c cursor-stack)))
+  (set! cursor-stack (cons (curs-set c) cursor-stack)))
 
 (define (pop-cursor)
-  (set! cursor-stack (cdr cursor-stack))
-  (curs-set (car cursor-stack)))
-
+  (curs-set (car cursor-stack))
+  (set! cursor-stack (cdr cursor-stack)))
 
 
 

01/03: gnu: Add xmessage.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit f50fff693bdfbb71fea7ac9ee7dcef0eb9fb77bc
Author: John Darrington 
Date:   Thu Jan 12 20:21:37 2017 +0100

gnu: Add xmessage.

* gnu/packages/xorg.scm (xmessage): New variable.
---
 gnu/packages/xorg.scm |   31 +++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index fe607e2..ac35a8c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5594,6 +5594,37 @@ user-friendly mechanism to start the X server.")
 Intrinsics (Xt) Library.")
 (license license:x11)))
 
+(define-public xmessage
+  (package
+(name "xmessage")
+(version "1.0.4")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "mirror://xorg/individual/app/" name "-"
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "1jmcac1xbwplbxfl75sr6w3zqhx1khpdzlqippjsr31cjp1rjc48"
+(build-system gnu-build-system)
+(arguments
+ `(#:configure-flags
+   (list (string-append "--with-appdefaultdir="
+%output ,%app-defaults-dir
+(inputs
+ `(("libxaw" ,libxaw)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "https://www.x.org/wiki/;)
+(synopsis "Displays a message or query in a window")
+(description
+ "Xmessage displays a message or query in a window.   The user can click
+on a button to dismiss it or can select one of several buttons
+to answer a question.  Xmessage can also exit after a specified time.")
+(license license:x11)))
+
 (define-public xterm
   (package
 (name "xterm")

branch master updated (9a443cf -> 60bc300)

[John Darrington]

jmd pushed a change to branch master
in repository guix.

  from  9a443cf   gnu: xonsh: Update to 0.5.2.
   new  f50fff6   gnu: Add xmessage.
   new  6ea1523   gnu: Add xmag.
   new  60bc300   gnu: Add twm.

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

02/03: gnu: Add xmag.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 6ea1523ac8033c7eb353c51bef654e6934a115ec
Author: John Darrington 
Date:   Thu Jan 12 20:33:46 2017 +0100

gnu: Add xmag.

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

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ac35a8c..fbea707 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5594,6 +5594,35 @@ user-friendly mechanism to start the X server.")
 Intrinsics (Xt) Library.")
 (license license:x11)))
 
+(define-public xmag
+  (package
+(name "xmag")
+(version "1.0.6")
+(source
+ (origin
+   (method url-fetch)
+   (uri (string-append
+ "mirror://xorg/individual/app/" name "-"
+ version
+ ".tar.gz"))
+   (sha256
+(base32
+ "19bsg5ykal458d52v0rvdx49v54vwxwqg8q36fdcsv9p2j8yri87"
+(build-system gnu-build-system)
+(arguments
+ `(#:configure-flags
+   (list (string-append "--with-appdefaultdir="
+%output ,%app-defaults-dir
+(inputs
+ `(("libxaw" ,libxaw)))
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(home-page "https://www.x.org/wiki/;)
+(synopsis "Display or capture a magnified part of a X11 screen")
+(description "Xmag displays and captures a magnified snapshot of a portion
+of an X11 screen.")
+(license license:x11)))
+
 (define-public xmessage
   (package
 (name "xmessage")

01/01: gnu: xonsh: Update to 0.5.2.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 9a443cf90d973dd190acb0077d84d5a5844be65f
Author: Danny Milosavljevic 
Date:   Thu Jan 12 11:50:29 2017 +0100

gnu: xonsh: Update to 0.5.2.

* gnu/packages/shells.scm (xonsh): Update to 0.5.2.

Signed-off-by: Marius Bakke 
---
 gnu/packages/shells.scm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 960cb1f..5237e81 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -299,14 +299,14 @@ ksh, and tcsh.")
 (define-public xonsh
   (package
 (name "xonsh")
-(version "0.5.1")
+(version "0.5.2")
 (source
   (origin
 (method url-fetch)
 (uri (pypi-uri "xonsh" version))
 (sha256
   (base32
-"1a3jkvfh1xc6aw557y8zjn498q89bapyx4dxc3md7qwrmnj9pkv3"))
+"13ndyq9cal2j93qqbjyp2jn3cshiavdxsaj2qjzm6mas0gzywmf0"))
 (modules '((guix build utils)))
 (snippet
  `(begin

branch master updated (97fedab -> d9cf11e)

[Tobias Geerinckx-Rice]

nckx pushed a change to branch master
in repository guix.

  from  97fedab   gnu: xfig: Remove wrapper and clean up implementation.
   new  cd7caa3   gnu: mcelog: Update to 147.
   new  d9cf11e   gnu: miniupnpc: Update to 2.0.20161216.

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


Summary of changes:
 gnu/packages/linux.scm |6 +++---
 gnu/packages/upnp.scm  |   11 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

02/02: gnu: miniupnpc: Update to 2.0.20161216.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit d9cf11e0f00c689f43560ecb893b6cf22c48b2e0
Author: Tobias Geerinckx-Rice 
Date:   Wed Jan 11 21:05:46 2017 +0100

gnu: miniupnpc: Update to 2.0.20161216.

* gnu/packages/upnp.scm (miniupnpc): Update to 2.0.20161216.
[source]: Use HTTPS.
---
 gnu/packages/upnp.scm |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index f680a52..9be9741 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Sree Harsha Totakura 
-;;; Copyright © 2016 Tobias Geerinckx-Rice 
+;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,15 +28,14 @@
 (define-public miniupnpc
   (package
 (name "miniupnpc")
-(version "2.0")
+(version "2.0.20161216")
 (source
  (origin
(method url-fetch)
-   (uri (string-append
- "http://miniupnp.tuxfamily.org/files/miniupnpc-;
- version ".tar.gz"))
+   (uri (string-append "https://miniupnp.tuxfamily.org/files/;
+   name "-" version ".tar.gz"))
(sha256
-(base32 "0fzrc6fs8vzb2yvk01bd3q5jkarysl7gjlyaqncy3yvfk2wcwd6l"
+(base32 "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81"
 (build-system gnu-build-system)
 (native-inputs
  `(("python" ,python-2)))

01/02: gnu: mcelog: Update to 147.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit cd7caa3ee24b9698ebb26077a42bfcbe9288d112
Author: Tobias Geerinckx-Rice 
Date:   Wed Jan 11 20:36:31 2017 +0100

gnu: mcelog: Update to 147.

* gnu/packages/linux.scm (mcelog): Update to 147.
---
 gnu/packages/linux.scm |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index dc0fc07..5b2928a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer 
 ;;; Copyright © 2015, 2016 Efraim Flashner 
 ;;; Copyright © 2016 Christopher Allan Webber 
-;;; Copyright © 2016 Tobias Geerinckx-Rice 
+;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice 
 ;;; Copyright © 2016 Alex Kost 
 ;;; Copyright © 2016 Raymond Nicholson 
 ;;; Copyright © 2016 Mathieu Lirzin 
@@ -3116,14 +3116,14 @@ the default @code{nsswitch} and the experimental 
@code{umich_ldap}.")
 (define-public mcelog
   (package
 (name "mcelog")
-(version "146")
+(version "147")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/;
   "mcelog.git/snapshot/v" version ".tar.gz"))
   (sha256
(base32
-"0jjx4q1mfa380319cqz86nw5wv6jnbpvq2r8n0dyh87mhvrgb4wi"))
+"10xxmqpd348ifbs7w8j0m53agp28r6imv237ha3kmhp632hmyf1d"))
   (file-name (string-append name "-" version ".tar.gz"))
   (modules '((guix build utils)))
   (snippet

05/05: gnu: xfig: Remove wrapper and clean up implementation.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 97fedab17d4acfa05969ddd9faf98a11d27a4743
Author: John Darrington 
Date:   Thu Jan 12 10:19:12 2017 +0100

gnu: xfig: Remove wrapper and clean up implementation.

* gnu/packages/xorg.scm (%app-defaults-dir): Make public.
* gnu/packages/xfig.scm (xfig)[attributes]: Remove wrapper and set
the XAPPLOADDIR in the Imakefile instead.
---
 gnu/packages/xfig.scm |   14 +-
 gnu/packages/xorg.scm |2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm
index 27d9cf9..ad1b432 100644
--- a/gnu/packages/xfig.scm
+++ b/gnu/packages/xfig.scm
@@ -65,6 +65,8 @@
 (let ((imake (assoc-ref inputs "imake"))
   (out   (assoc-ref outputs "out")))
   (substitute* "Imakefile"
+(("XCOMM XAPPLOADDIR = /home/user/xfig *")
+ (string-append "XAPPLOADDIR = " out 
%app-defaults-dir))
 (("XCOMM (BINDIR = )[[:graph:]]*" _ front)
  (string-append front out "/bin"))
 (("(PNGLIBDIR = )[[:graph:]]*" _ front)
@@ -98,7 +100,8 @@
 (("(MANPATH = )[[:graph:]]*" _ front)
  (string-append front out "/share/man"))
 (("(CONFDIR = )([[:graph:]]*)" _ front default)
- (string-append front out default))
+ (string-append front out default
+#t))
  (add-after
   'install 'install/libs
   (lambda _
@@ -118,14 +121,7 @@
   (dump-port in out)
   (close-pipe in)
   (close-port out)))
-  (zero? (system* "make" "install.doc")
- (add-after
-  'install 'wrap-xfig
-  (lambda* (#:key outputs #:allow-other-keys)
-(let ((out (assoc-ref outputs "out")))
-  (wrap-program (string-append out "/bin/xfig")
-`("XAPPLRESDIR" suffix
-  (,(string-append out "/etc/X11/app-defaults"))
+  (zero? (system* "make" "install.doc"
 (home-page "http://xfig.org/;)
 (synopsis "Interactive drawing tool")
 (description
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 45ff4c9..fe607e2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -335,7 +335,7 @@ provided.")
 (license (license:x11-style "file://dri3proto.h"
 "See 'dri3proto.h' in the distribution."
 
-(define %app-defaults-dir "/lib/X11/app-defaults")
+(define-public %app-defaults-dir "/lib/X11/app-defaults")
 
 (define-public editres
   (package

02/05: gnu: editres: Use %app-defaults-dir.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 73ae4e69a1abc9008a6986864021c6584eaf4a21
Author: John Darrington 
Date:   Wed Jan 11 21:12:54 2017 +0100

gnu: editres: Use %app-defaults-dir.

* gnu/packages/xorg.scm (editres): Replace string literal with
%app-defaults-dir.
---
 gnu/packages/xorg.scm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 556b9f4..16eb344 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -355,7 +355,7 @@ provided.")
 (arguments
  `(#:configure-flags
(list (string-append "--with-appdefaultdir="
-%output "/lib/X11/app-defaults"
+%output ,%app-defaults-dir
 (inputs
  `(("libxaw" ,libxaw)
("libxmu" ,libxmu)

01/05: gnu: xfontsel: Simplify definition.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 5dc8dd07b0c966842bfb984482df40892dc1c2ae
Author: John Darrington 
Date:   Wed Jan 11 21:11:00 2017 +0100

gnu: xfontsel: Simplify definition.

* gnu/packages/xorg.scm (%app-defaults-dir): New variable.
(xfontsel): Remove wrapper.
---
 gnu/packages/xorg.scm |   23 +--
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e6ee0c0..556b9f4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2016 ng0 
 ;;; Copyright © 2016 Alex Kost 
 ;;; Copyright © 2016 David Craven 
-;;; Copyright © 2016 John Darrington 
+;;; Copyright © 2016, 2017 John Darrington 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -335,6 +335,7 @@ provided.")
 (license (license:x11-style "file://dri3proto.h"
 "See 'dri3proto.h' in the distribution."
 
+(define %app-defaults-dir "/lib/X11/app-defaults")
 
 (define-public editres
   (package
@@ -3982,23 +3983,9 @@ protocol.")
 "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p"
 (build-system gnu-build-system)
 (arguments
- ;; By default, it tries to install XFontSel file in
- ;; "/gnu/store//share/X11/app-defaults": it defines this
- ;; directory from 'libxt' (using 'pkg-config').  To put this file
- ;; inside output dir and to use it properly, we need to configure
- ;; --with-appdefaultdir and to wrap 'xfontsel' binary.
- (let ((app-defaults-dir "/share/X11/app-defaults"))
-   `(#:configure-flags
- (list (string-append "--with-appdefaultdir="
-  %output ,app-defaults-dir))
- #:phases
- (modify-phases %standard-phases
-   (add-after 'install 'wrap-xfontsel
- (lambda* (#:key outputs #:allow-other-keys)
-   (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/xfontsel")
-   `("XAPPLRESDIR" =
- (,(string-append out ,app-defaults-dir)))
+ `(#:configure-flags
+   (list (string-append "--with-appdefaultdir="
+%output ,%app-defaults-dir
 (inputs
  `(("libx11" ,libx11)
("libxaw" ,libxaw)

03/05: gnu: xfd: Remove wrapper.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 5aae77e44b6a4cc905ad41e32299260458453470
Author: John Darrington 
Date:   Wed Jan 11 21:27:50 2017 +0100

gnu: xfd: Remove wrapper.

* gnu/packages/xorg.scm (xfd): Remove wrapper.
---
 gnu/packages/xorg.scm |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 16eb344..45ff4c9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4015,19 +4015,9 @@ Font Description (XLFD) full name for a font.")
 "0n97iqqap9wyxjan2n520vh4rrf5bc0apsw2k9py94dqzci258y1"
 (build-system gnu-build-system)
 (arguments
- ;; The same 'app-defaults' problem as with 'xfontsel' package.
- (let ((app-defaults-dir "/share/X11/app-defaults"))
`(#:configure-flags
  (list (string-append "--with-appdefaultdir="
-  %output ,app-defaults-dir))
- #:phases
- (modify-phases %standard-phases
-   (add-after 'install 'wrap-xfd
- (lambda* (#:key outputs #:allow-other-keys)
-   (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/xfd")
-   `("XAPPLRESDIR" =
- (,(string-append out ,app-defaults-dir)))
+  %output ,%app-defaults-dir
 (inputs
  `(("fontconfig" ,fontconfig)
("libx11" ,libx11)

04/05: gnu: xfig: Use modify-phases.

[John Darrington]

jmd pushed a commit to branch master
in repository guix.

commit 0eefac0f2f2c7b57471d352abfad7fa306a69df2
Author: John Darrington 
Date:   Wed Jan 11 21:45:20 2017 +0100

gnu: xfig: Use modify-phases.

* gnu/packages/xfig.scm (xfig): Use modify-phases.
---
 gnu/packages/xfig.scm |  159 -
 1 file changed, 79 insertions(+), 80 deletions(-)

diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm
index 6436e52..27d9cf9 100644
--- a/gnu/packages/xfig.scm
+++ b/gnu/packages/xfig.scm
@@ -34,12 +34,12 @@
 (version "3.2.5c")
 (source
  (origin
-  (method url-fetch)
-  (uri (string-append "mirror://sourceforge/mcj/mcj-source/xfig."
-  version ".full.tar.gz"))
-  (sha256
-   (base32
-"1yd1jclvw5w3ja4jjzr1ysbn8iklh88wq84jn9d1gavrbfbqyqpa"
+   (method url-fetch)
+   (uri (string-append "mirror://sourceforge/mcj/mcj-source/xfig."
+   version ".full.tar.gz"))
+   (sha256
+(base32
+ "1yd1jclvw5w3ja4jjzr1ysbn8iklh88wq84jn9d1gavrbfbqyqpa"
 (build-system gnu-build-system)
 (native-inputs
  `(("imake" ,imake)
@@ -59,51 +59,51 @@
 (arguments
  `(#:tests? #f
#:phases
-   (alist-replace
-'configure
-(lambda* (#:key inputs outputs #:allow-other-keys)
-  (let ((imake (assoc-ref inputs "imake"))
-(out   (assoc-ref outputs "out")))
-   (substitute* "Imakefile"
- (("XCOMM (BINDIR = )[[:graph:]]*" _ front)
-  (string-append front out "/bin"))
- (("(PNGLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libpng") "/lib"))
- (("(PNGINC = -I)[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libpng") "/include"))
- (("(JPEGLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libjpeg") "/lib"))
- (("(JPEGINC = -I)[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libjpeg") "/include"))
- (("(ZLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "zlib") "/lib"))
- (("(XPMLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libxpm") "/lib"))
- (("(XPMINC = -I)[[:graph:]]*" _ front)
-  (string-append front (assoc-ref inputs "libxpm") "/include"))
- (("(XFIGLIBDIR = )[[:graph:]]*" _ front)
-  (string-append front out "/lib"))
- (("(XFIGDOCDIR = )[[:graph:]]*" _ front)
-  (string-append front out "/share/doc"))
- (("XCOMM USEINLINE") "USEINLINE"))
-   ;; The -a argument is required in order to pick up the correct paths
-   ;; to several X header files.
-   (zero? (system* "xmkmf" "-a"))
-   ;; Reset some variables that are inherited from imake templates
-   (substitute* "Makefile"
- ;; These imake variables somehow remain undefined
- (("DefaultGcc2[[:graph:]]*Opt") "-O2")
- ;; Reset a few variable defaults that are set in imake templates
- ((imake) out)
- (("(MANPATH = )[[:graph:]]*" _ front)
-  (string-append front out "/share/man"))
- (("(CONFDIR = )([[:graph:]]*)" _ front default)
-  (string-append front out default)
-(alist-cons-after
- 'install 'install/libs
- (lambda _
-   (zero? (system* "make" "install.libs")))
- (alist-cons-after
+   (modify-phases %standard-phases
+ (replace 'configure
+  (lambda* (#:key inputs outputs #:allow-other-keys)
+(let ((imake (assoc-ref inputs "imake"))
+  (out   (assoc-ref outputs "out")))
+  (substitute* "Imakefile"
+(("XCOMM (BINDIR = )[[:graph:]]*" _ front)
+ (string-append front out "/bin"))
+(("(PNGLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libpng") 
"/lib"))
+(("(PNGINC = -I)[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libpng") 
"/include"))
+(("(JPEGLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libjpeg") 
"/lib"))
+(("(JPEGINC = -I)[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "libjpeg") 
"/include"))
+(("(ZLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front (assoc-ref inputs "zlib") 
"/lib"))
+(("(XPMLIBDIR = )[[:graph:]]*" _ front)
+ (string-append front 

04/04: services: Add 'redis-service-type'.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 67cadaca4746f847fbbea5ef69f6cc65d1eb3acc
Author: Christopher Baines 
Date:   Tue Jan 10 07:24:01 2017 +

services: Add 'redis-service-type'.

* gnu/services/database.scm (): New record type.
(%redis-accounts, redis-service-type): New variables.
(default-redis.conf, redis-activation, redis-shepherd-service): New
procedures.
* doc/guix.texi (Database Services): Document the new redis service.

Signed-off-by: Ludovic Courtès 
---
 doc/guix.texi  |   24 +
 gnu/services/databases.scm |   81 +++-
 2 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0868959..c495e39 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10331,6 +10331,30 @@ TCP port on which the database server listens for 
incoming connections.
 @end table
 @end deftp
 
+@defvr {Scheme Variable} redis-service-type
+This is the service type for the @uref{https://redis.io/, Redis}
+key/value store, whose value is a @code{redis-configuration} object.
+@end defvr
+
+@deftp {Data Type} redis-configuration
+Data type representing the configuration of redis.
+
+@table @asis
+@item @code{redis} (default: @code{redis})
+The Redis package to use.
+
+@item @code{bind} (default: @code{"127.0.0.1"})
+Network interface on which to listen.
+
+@item @code{port} (default: @code{6379})
+Port on which to accept connections on, a value of 0 will disable
+listining on a TCP socket.
+
+@item @code{working-directory} (default: @code{"/var/lib/redis"})
+Directory in which to store the database and related files.
+@end table
+@end deftp
+
 @node Mail Services
 @subsubsection Mail Services
 
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index d88c839..3ecc8af 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 David Thompson 
 ;;; Copyright © 2015, 2016 Ludovic Courtès 
 ;;; Copyright © 2016 Leo Famulari 
+;;; Copyright © 2017 Christopher Baines 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,7 +36,11 @@
 mysql-service
 mysql-service-type
 mysql-configuration
-mysql-configuration?))
+mysql-configuration?
+
+redis-configuration
+redis-configuration?
+redis-service-type))
 
 ;;; Commentary:
 ;;;
@@ -287,3 +292,77 @@ database server.
 The optional @var{config} argument specifies the configuration for
 @command{mysqld}, which should be a @code{} object."
   (service mysql-service-type config))
+
+
+;;;
+;;; Redis
+;;;
+
+(define-record-type* 
+  redis-configuration make-redis-configuration
+  redis-configuration?
+  (redis redis-configuration-redis ;
+ (default redis))
+  (bind  redis-configuration-bind
+ (default "127.0.0.1"))
+  (port  redis-configuration-port
+ (default 6379))
+  (working-directory redis-configuration-working-directory
+ (default "/var/lib/redis"))
+  (config-file   redis-configuration-config-file
+ (default #f)))
+
+(define (default-redis.conf bind port working-directory)
+  (mixed-text-file "redis.conf"
+   "bind " bind "\n"
+   "port " (number->string port) "\n"
+   "dir " working-directory "\n"
+   "daemonize no\n"))
+
+(define %redis-accounts
+  (list (user-group (name "redis") (system? #t))
+(user-account
+ (name "redis")
+ (group "redis")
+ (system? #t)
+ (comment "Redis server user")
+ (home-directory "/var/empty")
+ (shell (file-append shadow "/sbin/nologin")
+
+(define redis-activation
+  (match-lambda
+(($  redis bind port working-directory config-file)
+ #~(begin
+ (use-modules (guix build utils)
+  (ice-9 match))
+
+ (let ((user (getpwnam "redis")))
+   (mkdir-p #$working-directory)
+   (chown #$working-directory (passwd:uid user) (passwd:gid user)))
+
+(define redis-shepherd-service
+  (match-lambda
+(($  redis bind port working-directory config-file)
+ (let ((config-file
+(or config-file
+(default-redis.conf bind port working-directory
+   (list (shepherd-service
+  (provision '(redis))
+  (documentation "Run the Redis daemon.")
+  (requirement '(user-processes syslogd))
+  (start #~(make-forkexec-constructor
+'(#$(file-append redis "/bin/redis-server")
+  #$config-file)
+#:user "redis"
+#:group "redis"))
+  (stop 

03/04: gnu: ghc-semigroups: Update to 0.18.2.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 35c99a1fa087afd05a1014fa5939e05cbb56dfc3
Author: Danny Milosavljevic 
Date:   Tue Jan 10 02:30:23 2017 +0100

gnu: ghc-semigroups: Update to 0.18.2.

* gnu/packages/haskell.scm (ghc-semigroups): Update to 0.18.2.

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

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index b64486b..b26234d 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -4573,7 +4573,7 @@ just a @code{Semigroup} are added.")
 (define-public ghc-semigroups
   (package
 (name "ghc-semigroups")
-(version "0.17.0.1")
+(version "0.18.2")
 (source
  (origin
(method url-fetch)
@@ -4583,7 +4583,7 @@ just a @code{Semigroup} are added.")
  ".tar.gz"))
(sha256
 (base32
- "0gvpfi7s6ys4qha3y9a1zl1a15gf9cgg33wjb94ghg82ivcxnc3r"
+ "1r6hsn3am3dpf4rprrj4m04d9318v9iq02bin0pl29dg4a3gzjax"
 (build-system haskell-build-system)
 (inputs
  `(("ghc-nats" ,ghc-nats)

branch master updated (ac1f1e4 -> 67cadac)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  ac1f1e4   gnu: Add r-ggthemes.
   new  ff26453   gnu: ghc-quickcheck: Update to 2.8.2.
   new  9076281   gnu: Add ghc-wave.
   new  35c99a1   gnu: ghc-semigroups: Update to 0.18.2.
   new  67cadac   services: Add 'redis-service-type'.

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


Summary of changes:
 doc/guix.texi  |   24 +
 gnu/packages/haskell.scm   |   37 +---
 gnu/services/databases.scm |   81 +++-
 3 files changed, 137 insertions(+), 5 deletions(-)

01/04: gnu: ghc-quickcheck: Update to 2.8.2.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit ff264536019bb2ffa10e10997a4b89e964d25298
Author: Danny Milosavljevic 
Date:   Tue Jan 10 02:17:06 2017 +0100

gnu: ghc-quickcheck: Update to 2.8.2.

* gnu/packages/haskell.scm (ghc-quickcheck): Update to 2.8.2.

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

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 8f8e2f5..e0202c8 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -3052,7 +3052,7 @@ use HUnit assertions as QuickCheck properties.")
 (define-public ghc-quickcheck
   (package
 (name "ghc-quickcheck")
-(version "2.8.1")
+(version "2.8.2")
 (outputs '("out" "doc"))
 (source
  (origin
@@ -3063,7 +3063,7 @@ use HUnit assertions as QuickCheck properties.")
  ".tar.gz"))
(sha256
 (base32
- "0fvnfl30fxmj5q920l13641ar896d53z0z6z66m7c1366lvalwvh"
+ "1ai6k5v0bibaxq8xffcblc6rwmmk6gf8vjyd9p2h3y6vwbhlvilq"
 (build-system haskell-build-system)
 (arguments
  `(#:tests? #f  ; FIXME: currently missing libraries used for tests.

branch master updated (409c573 -> ac1f1e4)

[Roel Janssen]

roelj pushed a change to branch master
in repository guix.

  from  409c573   build: Remove reference to 'doc/emacs.texi'.
   new  ac1f1e4   gnu: Add r-ggthemes.

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 |   25 +
 1 file changed, 25 insertions(+)

01/02: etc: Add 'indent-package.el' script.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 7bb2b10cd01a076d7d5e964ed433e62846042859
Author: Ludovic Courtès 
Date:   Thu Jan 12 14:56:52 2017 +0100

etc: Add 'indent-package.el' script.

* configure.ac: Check for 'emacs', substitute 'EMACS', and emit
'etc/indent-package.el'.
* etc/indent-package.el.in: New file.
* doc/contributing.texi (Formatting Code): Mention
'etc/indent-package.el'.
(Submitting Patches): Likewise, and link to the above node.

Co-authored-by: Alex Kost 
---
 .gitignore   |1 +
 configure.ac |5 +
 doc/contributing.texi|   23 ++--
 etc/indent-package.el.in |   53 ++
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b64f5ef..5bcc734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,4 @@ stamp-h[0-9]
 tmp
 /doc/os-config-lightweight-desktop.texi
 /nix/scripts/download
+/etc/indent-package.el
diff --git a/configure.ac b/configure.ac
index 676f600..f628fa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,10 @@ AM_MISSING_PROG([DOT], [dot])
 dnl Manual pages.
 AM_MISSING_PROG([HELP2MAN], [help2man])
 
+dnl Emacs (optional), for 'etc/indent-package.el'.
+AC_PATH_PROG([EMACS], [emacs], [/usr/bin/emacs])
+AC_SUBST([EMACS])
+
 AC_CONFIG_FILES([Makefile
  po/guix/Makefile.in
  po/packages/Makefile.in
@@ -241,5 +245,6 @@ AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
 AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
 AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
   [chmod +x pre-inst-env])
+AC_CONFIG_FILES([etc/indent-package.el], [chmod +x etc/indent-package.el])
 
 AC_OUTPUT
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 24db9a8..9fc1eb5 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -237,6 +237,8 @@ especially when matching lists.
 @node Formatting Code
 @subsection Formatting Code
 
+@cindex formatting code
+@cindex coding style
 When writing Scheme code, we follow common wisdom among Scheme
 programmers.  In general, we follow the
 @url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp
@@ -246,8 +248,20 @@ please do read it.
 
 Some special forms introduced in Guix, such as the @code{substitute*}
 macro, have special indentation rules.  These are defined in the
-@file{.dir-locals.el} file, which Emacs automatically uses.  If you do
-not use Emacs, please make sure to let your editor know the rules.
+@file{.dir-locals.el} file, which Emacs automatically uses.
+
+@cindex indentation, of code
+@cindex formatting, of code
+If you do not use Emacs, please make sure to let your editor knows these
+rules.  To automatically indent a package definition, you can also run:
+
+@example
+./etc/indent-package.el gnu/packages/@var{file}.scm @var{package}
+@end example
+
+@noindent
+This automatically indents the definition of @var{package} in
+@file{gnu/packages/@var{file}.scm} by running Emacs in batch mode.
 
 We require all top-level procedures to carry a docstring.  This
 requirement can be relaxed for simple private procedures in the
@@ -358,6 +372,11 @@ Bundling unrelated changes together makes reviewing harder 
and slower.
 Examples of unrelated changes include the addition of several packages,
 or a package update along with fixes to that package.
 
+@item
+Please follow our code formatting rules, possibly running the
+@command{etc/indent-package.el} script to do that automatically for you
+(@pxref{Formatting Code}).
+
 @end enumerate
 
 When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
diff --git a/etc/indent-package.el.in b/etc/indent-package.el.in
new file mode 100755
index 000..3188809
--- /dev/null
+++ b/etc/indent-package.el.in
@@ -0,0 +1,53 @@
+#!@EMACS@ --script
+;;; indent-package.el --- Run Emacs to indent a package definition.
+
+;; Copyright © 2017 Alex Kost 
+
+;; This file is part of GNU Guix.
+
+;; GNU Guix is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Guix 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 General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; This scripts indents the given package definition in the specified file
+;; using Emacs.
+
+;;; Code:
+
+;; Load Scheme indentation rules from the current directory.
+(with-temp-buffer
+  (scheme-mode)
+  (let 

branch master updated (a917406 -> 409c573)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  a917406   gnu: guix: Update development snapshot.
   new  7bb2b10   etc: Add 'indent-package.el' script.
   new  409c573   build: Remove reference to 'doc/emacs.texi'.

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:
 .gitignore   |1 +
 configure.ac |5 +
 doc/contributing.texi|   23 ++--
 doc/local.mk |3 +--
 etc/indent-package.el.in |   53 ++
 5 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100755 etc/indent-package.el.in

02/02: build: Remove reference to 'doc/emacs.texi'.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit 409c5733224f714096d0e2a665b85d64c96c7088
Author: Ludovic Courtès 
Date:   Thu Jan 12 14:59:36 2017 +0100

build: Remove reference to 'doc/emacs.texi'.

This is a followup to deb6276dda81a69da38e842d269c5370a28fa5cf.

* doc/local.mk (EXTRA_DIST): Remove 'emacs.texi'.
---
 doc/local.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/local.mk b/doc/local.mk
index 64bd2a5..dc48fc2 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,6 +1,6 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2016 Eric Bavier 
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès 
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
 # Copyright © 2013 Andreas Enge 
 # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer 
 # Copyright © 2016 Mathieu Lirzin 
@@ -37,7 +37,6 @@ DOT_VECTOR_GRAPHICS = \
 EXTRA_DIST +=  \
   %D%/htmlxref.cnf \
   %D%/contributing.texi\
-  %D%/emacs.texi   \
   %D%/fdl-1.3.texi \
   $(DOT_FILES) \
   $(DOT_VECTOR_GRAPHICS)   \

02/02: gnu: guix: Update development snapshot.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit a91740655c8d18cd1b266d4d5719146cfeaf400d
Author: Ludovic Courtès 
Date:   Thu Jan 12 10:12:07 2017 +0100

gnu: guix: Update development snapshot.

* gnu/packages/package-management.scm (guix-devel): Update to eefd042.
---
 gnu/packages/package-management.scm |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 23f34cd..673e5f0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.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 © 2015, 2017 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -224,9 +224,9 @@ the Nix package manager.")
   ;;
   ;; Note: use a very short commit id; with a longer one, the limit on
   ;; hash-bang lines would be exceeded while running the tests.
-  (let ((commit "b291b3271a025dfe41e1a7fdfadd393373b0128d"))
+  (let ((commit "eefd042e60d9fc1d092b44bf80ecbfe65b291e46"))
 (package (inherit guix-0.12.0)
-  (version (string-append "0.12.0-2." (string-take commit 4)))
+  (version (string-append "0.12.0-3." (string-take commit 4)))
   (source (origin
 (method git-fetch)
 (uri (git-reference
@@ -236,7 +236,7 @@ the Nix package manager.")
   (commit commit)))
 (sha256
  (base32
-  "1hris387xn2wk4lcl20x1zyhiz96060w34xs1x13b4vmvkkvcpg4"))
+  "1g0042x80q73pb9y39aqbkajl4bacls5c0im9aljmjnsb80fsh8d"))
 (file-name (string-append "guix-" version "-checkout"
   (arguments
(substitute-keyword-arguments (package-arguments guix-0.12.0)

01/02: gnu: eudev: Add 'eudev-with-hwdb' variant that contains 'hwdb.bin'.

[Ludovic Court�s]

civodul pushed a commit to branch master
in repository guix.

commit e5d861f30568ec0265565af551289fc2033743c7
Author: Ludovic Courtès 
Date:   Thu Jan 12 10:10:02 2017 +0100

gnu: eudev: Add 'eudev-with-hwdb' variant that contains 'hwdb.bin'.

* gnu/packages/linux.scm (eudev-with-hwdb): New variable.
(usbutils)[inputs]: Use it instead of EUDEV.
---
 gnu/packages/linux.scm |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 716845d..dc0fc07 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -597,7 +597,7 @@ slabtop, and skill.")
 (build-system gnu-build-system)
 (inputs
  `(("libusb" ,libusb)
-   ("eudev" ,eudev)))
+   ("eudev" ,eudev-with-hwdb)))
 (native-inputs
  `(("pkg-config" ,pkg-config)))
 (home-page "http://www.linux-usb.org/;)
@@ -1740,6 +1740,21 @@ device nodes from /dev/, handles hotplug events and 
loads drivers at boot
 time.")
 (license license:gpl2+)))
 
+(define-public eudev-with-hwdb
+  ;; TODO: Merge with 'eudev'.
+  (package
+(inherit eudev)
+(name "eudev-with-hwdb")
+(arguments
+ '(#:phases (modify-phases %standard-phases
+  (add-after 'install 'build-hwdb
+(lambda* (#:key outputs #:allow-other-keys)
+  ;; Build OUT/etc/udev/hwdb.bin.  This allows 'lsusb' and
+  ;; similar tools to display product names.
+  (let ((out (assoc-ref outputs "out")))
+(zero? (system* (string-append out "/bin/udevadm")
+"hwdb" "--update"))
+
 (define-public lvm2
   (package
 (name "lvm2")

branch master updated (c5173d7 -> a917406)

[Ludovic Court�s]

civodul pushed a change to branch master
in repository guix.

  from  c5173d7   gnu: Add r-txdb-mmusculus-ucsc-mm10-knowngene.
   new  e5d861f   gnu: eudev: Add 'eudev-with-hwdb' variant that contains 
'hwdb.bin'.
   new  a917406   gnu: guix: Update development snapshot.

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


Summary of changes:
 gnu/packages/linux.scm  |   17 -
 gnu/packages/package-management.scm |8 
 2 files changed, 20 insertions(+), 5 deletions(-)

01/01: gnu: Add r-txdb-mmusculus-ucsc-mm10-knowngene.

[Roel Janssen]

roelj pushed a commit to branch master
in repository guix.

commit c5173d74d67b786c36dd53930c5d4fe4805cf3e9
Author: Roel Janssen 
Date:   Thu Jan 12 10:02:57 2017 +0100

gnu: Add r-txdb-mmusculus-ucsc-mm10-knowngene.

* gnu/packages/bioinformatics.scm (r-txdb-mmusculus-ucsc-mm10-knowngene): 
New variable.
---
 gnu/packages/bioinformatics.scm |   35 +++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 14daf59..d82b6c0 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7100,6 +7100,41 @@ musculus (Mouse) as provided by UCSC (mm10, December 
2011) and stored
 in Biostrings objects.")
 (license license:artistic2.0)))
 
+(define-public r-txdb-mmusculus-ucsc-mm10-knowngene
+  (package
+(name "r-txdb-mmusculus-ucsc-mm10-knowngene")
+(version "3.4.0")
+(source (origin
+  (method url-fetch)
+  ;; We cannot use bioconductor-uri here because this tarball is
+  ;; located under "data/annotation/" instead of "bioc/".
+  (uri (string-append "http://www.bioconductor.org/packages/;
+  "release/data/annotation/src/contrib/"
+  "TxDb.Mmusculus.UCSC.mm10.knownGene_"
+  version ".tar.gz"))
+  (sha256
+   (base32
+"08gava9wsvpcqz51k2sni3pj03n5155v32d9riqbf305nbirqbkb"
+(properties
+ `((upstream-name . "TxDb.Mmusculus.UCSC.mm10.knownGene")))
+(build-system r-build-system)
+;; As this package provides little more than a very large data file it
+;; doesn't make sense to build substitutes.
+(arguments `(#:substitutable? #f))
+(propagated-inputs
+ `(("r-bsgenome" ,r-bsgenome)
+   ("r-genomicfeatures" ,r-genomicfeatures)
+   ("r-annotationdbi" ,r-annotationdbi)))
+(home-page
+ "http://bioconductor.org/packages/TxDb.Mmusculus.UCSC.mm10.knownGene/;)
+(synopsis "Annotation package for TxDb knownGene object(s) for Mouse")
+(description
+ "This package loads a TxDb object, which is an R interface to
+prefabricated databases contained in this package.  This package provides
+the TxDb object of Mouse data as provided by UCSC (mm10, December 2011)
+based on the knownGene track.")
+(license license:artistic2.0)))
+
 (define-public r-bsgenome-celegans-ucsc-ce6
   (package
 (name "r-bsgenome-celegans-ucsc-ce6")

branch master updated (eefd042 -> c5173d7)

[Roel Janssen]

roelj pushed a change to branch master
in repository guix.

  from  eefd042   gnu: bind: Update to 9.10.4-P5 [fixes 
CVE-2016-{9131,9147,9444}].
   new  c5173d7   gnu: Add r-txdb-mmusculus-ucsc-mm10-knowngene.

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


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