branch master updated (33d1c97 -> b3cea86)

[guix-commits]

mhw pushed a change to branch master
in repository guix.

  from  33d1c97   install: Pass 'local-file' literal strings for proper 
resolution.
   new  eac9ddf   gnu: linux-libre@4.14: Update to 4.14.157.
   new  b3cea86   gnu: linux-libre@4.19: Update to 4.19.87.

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


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

02/02: gnu: linux-libre@4.19: Update to 4.19.87.

[guix-commits]

mhw pushed a commit to branch master
in repository guix.

commit b3cea86ac853c509f0c42e5ae88d03ba06dae5f3
Author: Mark H Weaver 
Date:   Sun Dec 1 20:50:28 2019 -0500

gnu: linux-libre@4.19: Update to 4.19.87.

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e92039f..3c3f577 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -360,10 +360,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the 
given DEBLOB-SCRIPTS."
 (%upstream-linux-source version hash)
 deblob-scripts-5.3)))
 
-(define-public linux-libre-4.19-version "4.19.86")
+(define-public linux-libre-4.19-version "4.19.87")
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-(hash (base32 "1xmzcxsiydym574y7k313qd8s4c3mdahpb3nx3cingfl36ivnb5z")))
+(hash (base32 "07fsds2k0hxqgny86winzl46d79g6mb9s28bp7nwlvwf67l22wm5")))
 (make-linux-libre-source version
  (%upstream-linux-source version hash)
  deblob-scripts-4.19)))

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

[guix-commits]

mhw pushed a commit to branch master
in repository guix.

commit eac9ddfaf37c392a003ce35d8a6955764bcf147a
Author: Mark H Weaver 
Date:   Sun Dec 1 20:49:20 2019 -0500

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

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a895fa7..e92039f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -368,10 +368,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the 
given DEBLOB-SCRIPTS."
  (%upstream-linux-source version hash)
  deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.156")
+(define-public linux-libre-4.14-version "4.14.157")
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-(hash (base32 "1h47fxfbq0d5ry7j3jxz45v5c4103qncgm2vydpz6zdx1kmrz27q")))
+(hash (base32 "0cvpagbjwpj63lpybfq1rnwdnxcjw49z0b5prah39krf0nd7dylh")))
 (make-linux-libre-source version
  (%upstream-linux-source version hash)
  deblob-scripts-4.14)))

04/09: website: nls: Add German translation.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit d58487b43bfcbde63de5949a607f3c049c39ccb3
Author: Florian Pelz 
Date:   Wed Oct 30 13:15:34 2019 +

website: nls: Add German translation.
---
 website/apps/base/data.scm |6 +-
 website/po/LINGUAS |1 +
 website/po/de.po   | 2094 
 website/po/ietf-tags.scm   |3 +-
 4 files changed, 2098 insertions(+), 6 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index ea9b01c..e40d6eb 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -76,11 +76,7 @@ though we also accept other languages."))
  (string=? (cadar to-delete) (cadr b))
  ;; but language code is different
  (not (string=? (cadddr to-delete) (car b))
- `(("de"
-"Melden Sie sich bei der „Help“-Mailingliste an, um per E-Mail
-gemeinschaftlichen Rat zu GuixSD und Guix zu bekommen.  Sie können
-Nachrichten auch auf deutsch verfassen.")
-   ("eo"
+ `(("eo"
 "Subskribu al la retmesaĝolisto \"Help\" por demandi helpon pri
 GNU Guix al la grupo.  Vi povas skribi esperantlingve.")
("es"
diff --git a/website/po/LINGUAS b/website/po/LINGUAS
index d4dd759..dc8e711 100644
--- a/website/po/LINGUAS
+++ b/website/po/LINGUAS
@@ -1,3 +1,4 @@
 # Translation with sexp-xgettext requires the full LL_CC locale name
 # to be specified.
+de_DE
 en_US
diff --git a/website/po/de.po b/website/po/de.po
new file mode 100644
index 000..c3103ba
--- /dev/null
+++ b/website/po/de.po
@@ -0,0 +1,2094 @@
+# German translations for guix-website package.
+# Copyright (C) 2019 Ludovic Courtès
+# This file is distributed under the same license as the guix-website package.
+# Florian Pelz , 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: guix-website\n"
+"Report-Msgid-Bugs-To: l...@gnu.org\n"
+"POT-Creation-Date: 2019-10-31 10:39+0100\n"
+"PO-Revision-Date: 2019-10-31 10:58+0100\n"
+"Last-Translator: Florian Pelz \n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANSLATORS: The locale’s display name; please include a country
+#. code like in English (US) *only* if there are multiple
+#. Translation Project teams for the same language.
+#: apps/base/utils.scm:68
+msgid "English (US)"
+msgstr "Deutsch"
+
+#: apps/base/templates/home.scm:19
+msgctxt "webpage title"
+msgid "GNU's advanced distro and transactional package manager"
+msgstr "GNUs fortgeschrittene Distribution und transaktionelle Paketverwaltung"
+
+#: apps/base/templates/home.scm:21 apps/base/templates/about.scm:19
+msgid ""
+"Guix is an advanced distribution of the GNU operating system.\n"
+"   Guix is technology that respects the freedom of computer users.\n"
+"   You are free to run the system for any purpose, study how it\n"
+"   works, improve it, and share it with the whole world."
+msgstr ""
+"Guix ist eine fortgeschrittene Distribution des GNU-Betriebssystems.\n"
+"   Guix ist eine Technologie, die die Freiheit der Benutzer von "
+"Rechengeräten respektiert.\n"
+"   Es steht Ihnen frei, das System zu jedem Zweck auszuführen, seine "
+"Funktionsweise zu studieren,\n"
+"   es zu verbessern und es mit der ganzen Welt zu teilen."
+
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#: apps/base/templates/home.scm:27 apps/base/templates/menu.scm:20
+#: apps/blog/templates/post-list.scm:29 apps/blog/templates/tag.scm:33
+#: apps/media/templates/screenshot.scm:24
+#: apps/media/templates/screenshots-overview.scm:21
+#: apps/packages/templates/detailed-index.scm:27
+#: apps/packages/templates/detailed-package-list.scm:30
+#: apps/packages/templates/index.scm:27
+#: apps/packages/templates/package-list.scm:30
+#: apps/packages/templates/package.scm:32
+msgid ""
+"GNU|Linux|Unix|Free software|Libre software|Operating system|GNU Hurd|GNU "
+"Guix package manager|GNU Guile|Guile Scheme|Transactional upgrades|"
+"Functional package management|Reproducibility"
+msgstr ""
+"GNU|Linux|Unix|Freie Software|Libre-Software|Betriebssystem|GNU Hurd|GNU-"
+"Guix-Paketverwaltung|GNU Guile|Guile Scheme|Transaktionelle Aktualisierungen|"
+"Funktionale Paketverwaltung|Reproduzierbarkeit"
+

07/09: website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a slash.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 0ff8befa9bff463cb639785655163d3f602dee1d
Author: Florian Pelz 
Date:   Wed Oct 30 19:43:16 2019 +

website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a slash.

* website/apps/base/utils.scm (guix-root-url-path): Add check in setter.
---
 website/apps/base/utils.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index 508abcd..ebb4000 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -51,7 +51,11 @@
 
 (define guix-root-url-path
   ;; Path to GNU Guix site at guix.gnu.org.
-  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")))
+  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
+  (lambda (path)
+(if (string-suffix? "/" path)
+path
+(string-append path "/")
 
 (define latest-guix-version
   (make-parameter "1.0.1"))

01/09: website: Add custom xgettext to extract from nested sexps for i18n.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 77675f1778bbc8602e16f6b52ce66524cc892710
Author: Florian Pelz 
Date:   Wed Oct 30 08:22:47 2019 +

website: Add custom xgettext to extract from nested sexps for i18n.

* website/po/POTFILES: New file.  List apps files here.
* website/po/LINGUAS: New file.  List en_US lingua.
* website/po/ietf-tags.scm: New file.  Add association for en_US lingua.
* website/scripts/sexp-xgettext.scm: New file for generating a POT file.
(, , ): New record types.
(combine-duplicate-po-entries, complex-keyword-spec?, parse-scheme-file,
po-equal?, write-po-entry, update-ecomments-string!, update-file-name!,
update-old-line-number!, update-line-number!, incr-line-number!,
incr-line-number-for-each-nl!, current-ref, make-simple-po-entry,
matching-keyword, nth-exp, more-than-one-exp?, token->string-symbol-or-keyw,
complex-marked-list->po-entries, construct-po-entries, tag,
construct-msgid-and-po-entries, scheme-file->po-entries): New procedures.
(%keyword-specs, %options, %comments-line, %ecomments-string, %file-name,
%old-line-number, %line-number, %files-from-port, %source-files,
%output-po-entries, %output-port): New variables.
* website/sexp-xgettext.scm: New file with module for looking up
translations.
(%complex-keywords, %simple-keywords, %plural-numbers, %linguas):
New variables.
(, ): New record types.
(set-complex-keywords!, set-simple-keywords!, gettext-keyword?, tag,
sexp->msgid, deconstruct): New procedures.
(sgettext, spgettext, sngettext, snpgettext): New macro helpers.
* website/apps/i18n.scm: New file.
(G_, N_, C_, NC_, ietf-tags-file-contents): New syntax to use for i18n.
(%current-ietf-tag, %current-lang, %current-lingua): New variables.
(builder->localized-builder, builders->localized-builders,
localized-root-path, first-value): New utility procedures.
(, ): New imports from Haunt.
* website/haunt.scm: Wrap each builder to build the locale set in LC_ALL.
* website/.guix.scm: Make Haunt build directory writable so Haunt can
overwrite duplicate assets.  Convert PO files to MO files and build for
each lingua.
* website/README: Adapt build instructions for i18n.
* website/i18n-howto: New file with usage instructions.
---
 website/.guix.scm |  80 +++-
 website/README|   8 +-
 website/apps/i18n.scm | 132 ++
 website/haunt.scm |  19 +-
 website/i18n-howto.txt|  86 
 website/po/LINGUAS|   3 +
 website/po/POTFILES   |  36 ++
 website/po/ietf-tags.scm  |   9 +
 website/scripts/sexp-xgettext.scm | 830 ++
 website/sexp-xgettext.scm | 530 
 10 files changed, 1707 insertions(+), 26 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index 8f44c90..9510779 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix web site
 ;;; Copyright © 2017, 2019 Ludovic Courtès 
+;;; Copyright © 2019 Florian Pelz 
 ;;;
 ;;; This file is part of the GNU Guix web site.
 ;;;
@@ -18,16 +19,27 @@
 
 ;; Run 'guix build -f .guix.scm' to build the web site.
 
+(define this-directory
+  (dirname (current-filename)))
+
+;; Make sure po/LINGUAS will be found in the current working
+;; directory.
+(chdir this-directory)
+
+;; We need %linguas from the (sexp-xgettext) module.
+;; Therefore, we add its path to the load path.
+(set! %load-path (cons this-directory %load-path))
+
 (use-modules (guix) (gnu)
  (guix modules)
  (guix git-download)
  (guix gexp)
  (guix channels)
  (srfi srfi-9)
- (ice-9 match))
-
-(define this-directory
-  (dirname (current-filename)))
+ (ice-9 match)
+ (ice-9 rdelim)
+ (ice-9 regex)
+ (sexp-xgettext))
 
 (define source
   (local-file this-directory "guix-web-site"
@@ -73,9 +85,7 @@
 
   (setvbuf (current-output-port) 'line)
   (setvbuf (current-error-port) 'line)
-
   (copy-recursively #$source ".")
-
   ;; Set 'GUILE_LOAD_PATH' so that Haunt find the Guix modules and
   ;; its dependencies.  To find out the load path of Guix and its
   ;; dependencies, fetch its value over 'guix repl'.
@@ -96,24 +106,62 @@
 ":"
 (close-pipe pipe))
 
+  ;; Make the copy writable so Haunt can overwrite duplicate assets.
+  (invoke #+(file-append (specification->package "coreutils")
+ "/bin/chmod")
+  "--recursive" "u+w" ".")
+
+  ;; For translations, create MO files from PO files.
+  (for-each
+   (lambda (lingua)
+ (let* ((msgfmt #+(file-append
+  

06/09: website: Add language selection dropdown to navbar.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit ed78bab2d18c73410c8b7d07c65b14812ef15d58
Author: Florian Pelz 
Date:   Wed Oct 30 12:12:23 2019 +

website: Add language selection dropdown to navbar.

* website/apps/base/templates/components.scm (navbar): Add it.
(horizontal-skip): New procedure.
* website/static/base/css/navbar.css: Add CSS for horizontal-skip.
Increase size at which website switches to mobile mode.
---
 website/apps/base/templates/components.scm | 30 +++---
 website/static/base/css/navbar.css |  6 +-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index f39f3fd..beaa13a 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -23,6 +23,7 @@
contact->shtml
 horizontal-line
horizontal-separator
+horizontal-skip
link-more
link-subtle
link-yellow
@@ -180,6 +181,10 @@
`(src ,(guix-url "static/base/img/h-separator-dark.png")))
(alt ""
 
+(define (horizontal-skip)
+  "Return SHTML for a small horizontal space."
+  `(span (@ (class "hskip"
+
 (define (horizontal-line)
   "Return SHTML for a visible separator to be used in a dropdown menu
 like a menu item."
@@ -408,13 +413,32 @@ manual.
  (C_ "website menu" (menu-item #:label "Contact" #:active-item 
active-item #:url (guix-url "contact/")))
  (C_ "website menu" (menu-item #:label "Contribute" #:active-item 
active-item #:url (guix-url "contribute/")))
  (C_ "website menu" (menu-item #:label "Security" #:active-item 
active-item #:url (guix-url "security/")))
- (C_ "website menu" (menu-item #:label "Graphics" #:active-item 
active-item #:url (guix-url "graphics/")))
+ (C_ "website menu" (menu-item #:label "Graphics" #:active-item 
active-item #:url (guix-url "graphics/")
+  ,(horizontal-skip)
+  ;; Languages dropdown.
+  ,(menu-dropdown #:label (locale-display-name) #:active-item active-item
+#:items
+(map-in-order
+ (lambda (ietf-info)
+   (let ((lingua (car ietf-info))
+ (code (cdr ietf-info)))
+ (setlocale LC_ALL (string-append lingua ".utf8"))
+ (let ((out (menu-item #:label (locale-display-name)
+   #:active-item active-item
+   #:url (guix-url (string-append code "/")
+   #:localize #f
+   (setlocale LC_ALL "")
+   out)))
+ (sort (delete %current-lingua
+   ietf-tags-file-contents
+   (lambda (a b) (string=? a (car b
+   (lambda (a b) string

03/09: website: media: Do not localize video page URLs.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit b206d9a0335425a22412142c62921196a87d0530
Author: Florian Pelz 
Date:   Fri Nov 1 11:07:24 2019 +0100

website: media: Do not localize video page URLs.

* website/apps/media/types.scm (, video):
Add new field for the page URL subpath.
* website/apps/media/data.scm (playlists): Use it.
* website/apps/media/utils.scm (video->url): Compute page URL from it.
---
 website/apps/media/data.scm  |  7 +++
 website/apps/media/types.scm | 16 
 website/apps/media/utils.scm |  5 +
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/website/apps/media/data.scm b/website/apps/media/data.scm
index 4cadaf5..8ceadcc 100644
--- a/website/apps/media/data.scm
+++ b/website/apps/media/data.scm
@@ -23,6 +23,7 @@
(list
 (video
  #:title (C_ "video title" "Installation from Script")
+ #:page-subpath "installation-from-script"
  #:description
  (G_ '(p "Explains how to install Guix on distributions not
 running GNU Guix."))
@@ -32,6 +33,7 @@ running GNU Guix."))
(list
 (video
  #:title (C_ "video title" "Everyday use of GNU Guix, Part One")
+ #:page-subpath "everyday-use-of-gnu-guix,-part-one"
  #:description
  (G_ '(p "How to install packages and how to manage software
 package generations."))
@@ -40,6 +42,7 @@ package generations."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Everyday use of GNU Guix, Part Two")
+ #:page-subpath "everyday-use-of-gnu-guix,-part-two"
  #:description
  (G_ '(p "How to upgrade software and how to reclaim storage
 space."))
@@ -49,6 +52,7 @@ space."))
(list
 (video
  #:title (C_ "video title" "Asking for help")
+ #:page-subpath "asking-for-help"
  #:description
  (G_ '(p "How to get help from the Guix community."))
  #:url "https://archive.org/download/guix-videos/03-help-new-version.webm;
@@ -57,6 +61,7 @@ space."))
(list
 (video
  #:title (C_ "video title" "Packaging, Part One")
+ #:page-subpath "packaging,-part-one"
  #:description
  (G_ '(p "How to set up a development environment for GNU Guix."))
  #:url 
"https://archive.org/download/guix-videos/04-packaging-part-one.webm;
@@ -64,6 +69,7 @@ space."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Packaging, Part Two")
+ #:page-subpath "packaging,-part-two"
  #:description
  (G_ '(p "How to create a package recipe for not yet packaged software."))
  #:url 
"https://archive.org/download/guix-videos/04-packaging-part-two.webm;
@@ -71,6 +77,7 @@ space."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Packaging, Part Three")
+ #:page-subpath "packaging,-part-three"
  #:description
  (G_ '(p "How to submit a package for inclusion in the GNU Guix
 distribution."))
diff --git a/website/apps/media/types.scm b/website/apps/media/types.scm
index 7ad988f..50c0989 100644
--- a/website/apps/media/types.scm
+++ b/website/apps/media/types.scm
@@ -22,6 +22,7 @@
 video?
 video-description
 video-last-updated
+video-page-subpath
 video-poster
 video-title
 video-url))
@@ -144,6 +145,12 @@
 ;;; url (string)
 ;;;   A URL to the video file.
 ;;;
+;;; page-subpath (string)
+;;;   The subpath to the webpage for this video.  It should correspond
+;;;   to the English video title converted to lower case with spaces
+;;;   replaced by hyphens.  For example:
+;;;   'everyday-use-of-gnu-guix,-part-one'.
+;;;
 ;;; poster (string)
 ;;;   A URL to a representative preview image for the video.
 ;;;
@@ -157,18 +164,19 @@
 ;;;   possibly become outdated over time such as documentation videos.
 ;;;
 (define-record-type 
-  (make-video title description url poster tracks last-updated)
+  (make-video title description url page-subpath poster tracks last-updated)
   video?
   (title video-title)
   (description video-description)
   (url video-url)
+  (page-subpath video-page-subpath)
   (poster video-poster)
   (tracks video-tracks)
   (last-updated video-last-updated))
 
 ;;; Helper procedures.
 
-(define* (video #:key (title "") (description "")
-(url "") (poster "") (tracks '()) (last-updated #f))
+(define* (video #:key (title "") (description "") (url #f) (page-subpath #f)
+(poster "") (tracks '()) (last-updated #f))
   "Return a  object with the given attributes."
-  (make-video title description url poster tracks last-updated))
+  (make-video title description url page-subpath poster tracks last-updated))
diff --git a/website/apps/media/utils.scm b/website/apps/media/utils.scm
index 129b085..1c909a5 100644
--- a/website/apps/media/utils.scm
+++ 

branch wip-i18n created (now c3c5ee0)

[Florian Pelz]

pelzflorian pushed a change to branch wip-i18n
in repository guix-artwork.

at  c3c5ee0   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

This branch includes the following new commits:

   new  77675f1   website: Add custom xgettext to extract from nested sexps 
for i18n.
   new  a00d40c   website: apps: Mark all files for translation.
   new  b206d9a   website: media: Do not localize video page URLs.
   new  d58487b   website: nls: Add German translation.
   new  49a065c   website: navbar: Make dropdowns accessible to keyboard 
and touch input.
   new  ed78bab   website: Add language selection dropdown to navbar.
   new  0ff8bef   website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a 
slash.
   new  73cb001   website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
   new  c3c5ee0   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

The 9 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.

05/09: website: navbar: Make dropdowns accessible to keyboard and touch input.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 49a065c9192fe2cf35c7d24b32ee8d281275a783
Author: Florian Pelz 
Date:   Sun Dec 1 23:15:16 2019 +

website: navbar: Make dropdowns accessible to keyboard and touch input.

* website/apps/base/templates/components.scm (horizontal-line): New 
procedure.
(navbar, menu-dropdown): Adapt to use CSS for accessibility.
* website/static/base/css/navbar.css: Adapt CSS to new dropdowns.
(menu-item-active): Make visible when appropriate.
(menu-item): Make visible when appropriate.  Change margin.
(dropdown-btn): Make visible when appropriate.  Add margin.  Change padding.
(submenu): Make visible when appropriate.
(menu-hidden-input): Hide HTML radio buttons not meant for display.
(hline): Hide in small browser window.
(navbar): With mouse cursor, signify dropdown labels are clickable.
Highlight pressed down labels.
---
 website/apps/base/templates/components.scm | 78 --
 website/static/base/css/navbar.css | 75 +---
 2 files changed, 121 insertions(+), 32 deletions(-)

diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index 8c80a85..f39f3fd 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -21,6 +21,7 @@
button-little
contact-preview
contact->shtml
+horizontal-line
horizontal-separator
link-more
link-subtle
@@ -179,6 +180,13 @@
`(src ,(guix-url "static/base/img/h-separator-dark.png")))
(alt ""
 
+(define (horizontal-line)
+  "Return SHTML for a visible separator to be used in a dropdown menu
+like a menu item."
+  `(img (@ (class "hline")
+   (src ,(guix-url "static/base/img/h-separator.png"))
+   (alt ""
+
 
 (define* (link-more #:key (label "More") (url "#") (light #false))
   "Return an SHTML a element that looks like a 'more →' link.
@@ -285,19 +293,53 @@ manual.
ITEMS (list of menu items)
  A list of menu items as returned by the menu-item procedure in this
  same module. If not provided, the value defaults to an empty list."
-  `(li
-(@ (class "dropdown"))
-(a
- (@ (class
-,(if (string=? (string-downcase label) (string-downcase active-item))
- "menu-item menu-item-active dropdown-btn"
- "menu-item dropdown-btn"))
-   (href ,url))
- ,label)
-(div
- (@ (class "submenu"))
- (div (@ (class "submenu-triangle")) " ")
- (ul ,@items
+  (let ((label-hash (number->string (string-hash label
+`(li
+  (@ (class ,(if (string=? (string-downcase label)
+   (string-downcase active-item))
+ "menu-item menu-item-active dropdown dropdown-btn"
+ "menu-item dropdown dropdown-btn")))
+  ,@(let ((id (string-append "visible-dropdown-" label-hash)))
+  `(;; show dropdown when button is checked:
+(style ,(string-append "#" id ":checked ~ #submenu-" label-hash "
+{
+min-width: 150px;
+/* reset to initial values: */
+width: auto;
+height: auto;
+overflow: visible;
+}"))
+;; show uncheck version of button iff button is checked
+(style ,(string-append "#" id ":checked \
+~ label[for=all-dropdowns-hidden]
+{
+display: inline;
+}"))
+(style "label[for=all-dropdowns-hidden]
+{
+display: none;
+}")
+;; show check version of button iff button is unchecked
+(style ,(string-append "#" id ":checked ~ label[for=" id "]
+{
+display: none;
+}"))
+(input (@ (class "menu-hidden-input")
+  (type "radio")
+  (name "dropdown")
+  (id ,id)))
+(label
+ (@ (for ,id))
+ ,label)
+(label
+ (@ (for "all-dropdowns-hidden"))
+ ,label)))
+  (div
+   (@ (class "submenu")
+  (id ,(string-append "submenu-" label-hash)))
+   (div (@ (class "submenu-triangle"))
+" ")
+   (ul ,@items)
 
 
 (define* (menu-item #:key (label "Item") (active-item "") (url "#"))
@@ -338,7 +380,11 @@ manual.
 
 ;; Menu.
 (nav (@ (class "menu"))
- ,(G_ `(h2 (@ (class "a11y-offset")) "website menu:"))
+ ,(G_ `(h2 (@ (class "a11y-offset")) "website menu:"))
+ (input (@ (class "menu-hidden-input")
+   (type "radio")
+   (name "dropdown")
+   (id "all-dropdowns-hidden")))
  (ul
   ,(C_ "website menu" (menu-item #:label "Overview" #:active-item 
active-item #:url (guix-url)))
   ,(C_ "website menu" (menu-item #:label "Download" #:active-item 
active-item #:url (guix-url "download/")))
@@ -354,9 +400,11 @@ manual.
   ,(C_ "website menu" 

09/09: website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit c3c5ee0df9755c9a5bd8accf38f3579b83343bf2
Author: Florian Pelz 
Date:   Thu Oct 31 14:52:29 2019 +0100

website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

* website/apps/base/utils.scm (guix-url): Always use guix-root-url-path.
(guix-root-url-path): Move here the logic that computes which root path to 
use.
---
 website/apps/base/utils.scm | 27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index ebb4000..8f73ee6 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -51,11 +51,17 @@
 
 (define guix-root-url-path
   ;; Path to GNU Guix site at guix.gnu.org.
-  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
-  (lambda (path)
-(if (string-suffix? "/" path)
-path
-(string-append path "/")
+  (let ((path (cond
+   ;; If we are trying out the website locally, use "/" as the 
root.
+   ((getenv "GUIX_WEB_SITE_LOCAL") "/")
+   (else (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
+(make-parameter
+ path
+ ;; When setting guix-root-url-path, make it end in a slash.
+ (lambda (path)
+   (if (string-suffix? "/" path)
+   path
+   (string-append path "/"))
 
 (define latest-guix-version
   (make-parameter "1.0.1"))
@@ -108,16 +114,13 @@
  For example: 'packages/icecat-XYZ/'.
 
LOCALIZE (boolean)
- Whether to call localize-url on the URL path.
+ Whether to prepend the result of 'localized-root-path' to the URL path.
 
RETURN VALUE (string)
  A URL path. For example: /software/guix/packages/icecat-XYZ/."
-  ((if localize localize-url identity)
-   ;; If we are trying out the website locally, use "/" as the root.
-   ;; Otherwise use guix-root-url-path for deployment to gnu.org.
-   (if (getenv "GUIX_WEB_SITE_LOCAL")
-   (string-append "/" subpath)
-   (string-append (guix-root-url-path) subpath
+  (string-append (guix-root-url-path)
+ (if localize (localized-root-path subpath) "")
+ subpath))
 
 
 (define* (manual-url #:optional (subpath "")

08/09: website: Fix building with GUIX_WEB_SITE_ROOT_PATH.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 73cb0012bb7bbefb5d65b118223ddf3bd532f798
Author: Florian Pelz 
Date:   Wed Oct 30 21:45:45 2019 +

website: Fix building with GUIX_WEB_SITE_ROOT_PATH.

* website/.guix.scm: Retain GUIX_WEB_SITE_ROOT_PATH in the build expression.
---
 website/.guix.scm | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/website/.guix.scm b/website/.guix.scm
index 9510779..a48621c 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -46,6 +46,9 @@
   #:recursive? #t
   #:select? (git-predicate this-directory)))
 
+(define root-path
+  (getenv "GUIX_WEB_SITE_ROOT_PATH"))
+
 (define (package+propagated-inputs package)
   (match (package-transitive-propagated-inputs package)
 (((labels packages) ...)
@@ -143,6 +146,10 @@
   ;; Use a sane default.
   (setenv "XDG_CACHE_HOME" "/tmp/.cache")
 
+  ;; Use GUIX_WEB_SITE_ROOT_PATH from the environment in which
+  ;; this script was run.
+  (setenv "GUIX_WEB_SITE_ROOT_PATH" #$root-path)
+
   ;; Build the website for each translation.
   (for-each
(lambda (lingua)

branch wip-i18n deleted (was 04f102a)

[Florian Pelz]

pelzflorian pushed a change to branch wip-i18n
in repository guix-artwork.

   was  04f102a   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

This change permanently discards the following revisions:

  discards  04f102a   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.
  discards  acf6ca9   website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
  discards  94d5e73   website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a 
slash.
  discards  bbc93e8   website: Add language selection dropdown to navbar.
  discards  0fa6b58   website: navbar: Make dropdowns accessible to keyboard 
and touch input.
  discards  d58487b   website: nls: Add German translation.
  discards  b206d9a   website: media: Do not localize video page URLs.
  discards  a00d40c   website: apps: Mark all files for translation.
  discards  77675f1   website: Add custom xgettext to extract from nested sexps 
for i18n.

branch master updated (6177b14 -> 33d1c97)

[guix-commits]

civodul pushed a change to branch master
in repository guix.

  from  6177b14   gnu: scummvm: Update to 2.1.0.
   new  33d1c97   install: Pass 'local-file' literal strings for proper 
resolution.

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


Summary of changes:
 gnu/system/install.scm | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

01/01: install: Pass 'local-file' literal strings for proper resolution.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 33d1c970c323971da8d70a662748c7b1b520d6b6
Author: Ludovic Courtès 
Date:   Sun Dec 1 23:31:50 2019 +0100

install: Pass 'local-file' literal strings for proper resolution.

This is a followup to 99c45877a984dd0148151b2e304afef6fb04f1a5, which
introduced a regression: "guix system build gnu/system/install.scm"
would fail to find the .tmpl files.

* gnu/system/install.scm (/etc/configuration-files)[file]: Remove.
[directory]: Use 'local-file' with a literal string.
---
 gnu/system/install.scm | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index bdf114c..4d1612ac 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -242,9 +242,6 @@ the user's target storage device rather than on the RAM 
disk."
 (define (/etc/configuration-files _)
   "Return a list of tuples representing configuration templates to add to
 /etc."
-  (define (file f)
-(local-file (string-append "examples/" f)))
-
   (define directory
 (computed-file "configuration-templates"
(with-imported-modules '((guix build utils))
@@ -254,10 +251,10 @@ the user's target storage device rather than on the RAM 
disk."
  (copy-file file
 (string-append #$output "/"
target)))
-   '(#$(file "bare-bones.tmpl")
- #$(file "beaglebone-black.tmpl")
- #$(file "desktop.tmpl")
- #$(file "lightweight-desktop.tmpl"))
+   '(#$(local-file "examples/bare-bones.tmpl")
+ #$(local-file 
"examples/beaglebone-black.tmpl")
+ #$(local-file "examples/desktop.tmpl")
+ #$(local-file 
"examples/lightweight-desktop.tmpl"))
'("bare-bones.scm"
  "beaglebone-black.scm"
  "desktop.scm"

branch staging updated (cff1e09 -> d733a46)

[guix-commits]

htgoebel pushed a change to branch staging
in repository guix.

  from  cff1e09   gnu: java: Remove precompiled classes.
   new  d733a46   gnu: Remove dependency on Python 2 for some Qt packages.

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


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

01/01: gnu: Remove dependency on Python 2 for some Qt packages.

[guix-commits]

htgoebel pushed a commit to branch staging
in repository guix.

commit d733a469d74f74734825f1ce777956fb4cac5534
Author: Hartmut Goebel 
Date:   Tue Nov 26 19:33:15 2019 +0100

gnu: Remove dependency on Python 2 for some Qt packages.

* gnu/packages/qt.scm (qtbase, qtmultimedia) [native-inputs]: Replace
  python-2 by python.
  (qtdeclarative)[native-inputs]: Replace python-2 by python, add
  python-wrapper.
---
 gnu/packages/qt.scm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 86685a3..c0d652a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -401,7 +401,7 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
("gperf" ,gperf)
("perl" ,perl)
("pkg-config" ,pkg-config)
-   ("python" ,python-2)
+   ("python" ,python)
("vulkan-headers" ,vulkan-headers)
("ruby" ,ruby)))
 (arguments
@@ -756,7 +756,8 @@ xmlpatternsvalidator.")))
 (native-inputs
  `(("perl" ,perl)
("pkg-config" ,pkg-config)
-   ("python" ,python-2)
+   ("python" ,python)
+   ("python-wrapper" ,python-wrapper)
("qtsvg" ,qtsvg)
("qtxmlpatterns" ,qtxmlpatterns)))
 (inputs
@@ -889,7 +890,7 @@ recognition API for devices.")))
 (native-inputs
  `(("perl" ,perl)
("pkg-config" ,pkg-config)
-   ("python" ,python-2)
+   ("python" ,python)
("qtdeclarative" ,qtdeclarative)))
 (inputs
  `(("alsa-lib" ,alsa-lib)

01/01: gnu: scummvm: Update to 2.1.0.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit 6177b14bcf93fdb8a9af930cdaed131036591b80
Author: Nicolas Goaziou 
Date:   Sun Dec 1 22:04:52 2019 +0100

gnu: scummvm: Update to 2.1.0.

* gnu/packages/emulators.scm (scummvm): Update to 2.1.0.
---
 gnu/packages/emulators.scm | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index c25fb76..0ab6ee7 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1147,7 +1147,7 @@ multi-system game/emulator system.")
 (define-public scummvm
   (package
 (name "scummvm")
-(version "2.0.0")
+(version "2.1.0")
 (source
  (origin
(method url-fetch)
@@ -1155,10 +1155,10 @@ multi-system game/emulator system.")
"/scummvm-" version ".tar.xz"))
(sha256
 (base32
- "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"
+ "09zp2mxmida6sz5vrr5bzyv8c3yjvq2xqmpmcllbadhmd9cwcl3b"
 (build-system gnu-build-system)
 (arguments
- `(#:tests? #f  ;require "git"
+ `(#:tests? #f ;require "git"
#:configure-flags (list "--enable-release") ;for optimizations
#:phases
(modify-phases %standard-phases
@@ -1180,6 +1180,7 @@ multi-system game/emulator system.")
("faad2" ,faad2)
("fluidsynth" ,fluidsynth)
("freetype" ,freetype)
+   ("liba52" ,liba52)
("libflac" ,flac)
("libjpeg-turbo" ,libjpeg-turbo)
("libmad" ,libmad)
@@ -1189,7 +1190,7 @@ multi-system game/emulator system.")
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("nasm" ,nasm)
-   ("sdl2" ,sdl2)
+   ("sdl2" ,(sdl-union (list sdl2 sdl2-net)))
("zlib" ,zlib)))
 (home-page "https://www.scummvm.org/;)
 (synopsis "Engine for several graphical adventure games")

branch master updated (6610b04 -> 6177b14)

[guix-commits]

ngz pushed a change to branch master
in repository guix.

  from  6610b04   gnu: snap: Update to 5.3.8.
   new  6177b14   gnu: scummvm: Update to 2.1.0.

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


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

branch master updated (8ab624f -> 6610b04)

[guix-commits]

ngz pushed a change to branch master
in repository guix.

  from  8ab624f   gnu: mame: Update to 0.216.
   new  6610b04   gnu: snap: Update to 5.3.8.

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


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

01/01: gnu: snap: Update to 5.3.8.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit 6610b04998b848593473d4a661c63d90a7e28ac8
Author: Nicolas Goaziou 
Date:   Sun Dec 1 21:40:48 2019 +0100

gnu: snap: Update to 5.3.8.

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

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 274b14d..9139578 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -254,7 +254,7 @@ easy.")
 (define-public snap
   (package
 (name "snap")
-(version "5.2.5")
+(version "5.3.8")
 (source
  (origin
(method git-fetch)
@@ -264,7 +264,7 @@ easy.")
(file-name (git-file-name name version))
(sha256
 (base32
- "0smlqxd8gqy26dlsal197848lhynv74m8myxs6fdlnzgva1f3zzw"
+ "1lm5vvykdzgn667kvnsv0ab5bl0kjsr05kvcd18a7pn0g8sykfpc"
 (build-system trivial-build-system)
 (arguments
  `(#:modules ((guix build utils))

branch master updated (b4cb5d7 -> 8ab624f)

[guix-commits]

ngz pushed a change to branch master
in repository guix.

  from  b4cb5d7   gnu: WireGuard: Update to 0.0.20191127.
   new  8ab624f   gnu: mame: Update to 0.216.

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

01/01: gnu: mame: Update to 0.216.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit 8ab624f991d73010619f3d6bde91664c24b46c77
Author: Nicolas Goaziou 
Date:   Sun Dec 1 21:35:22 2019 +0100

gnu: mame: Update to 0.216.

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

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index e622d2d..c25fb76 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1203,7 +1203,7 @@ play them on systems for which they were never designed!")
 (define-public mame
   (package
 (name "mame")
-(version "0.215")
+(version "0.216")
 (source
  (origin
(method git-fetch)
@@ -1213,7 +1213,7 @@ play them on systems for which they were never designed!")
(file-name (git-file-name name version))
(sha256
 (base32
- "1fj2qahi0fpn41zxph06wdgjashy6vsgj0gqfly8hvcmv99r3d65"))
+ "1q3mrlinkg3hxry7ssl5713lclz3k243q30933flxh99fnzgajwc"))
(modules '((guix build utils)))
(snippet
 ;; Remove bundled libraries.

branch master updated (c114e35 -> b4cb5d7)

[guix-commits]

lfam pushed a change to branch master
in repository guix.

  from  c114e35   gnu: giac: Update to 1.5.0-75.
   new  b4cb5d7   gnu: WireGuard: Update to 0.0.20191127.

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

01/01: gnu: WireGuard: Update to 0.0.20191127.

[guix-commits]

lfam pushed a commit to branch master
in repository guix.

commit b4cb5d7a48803164a57c66a641f38d32b6221dc8
Author: Leo Famulari 
Date:   Sun Dec 1 00:09:12 2019 -0500

gnu: WireGuard: Update to 0.0.20191127.

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

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 364d0a2..1fd313c 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -452,14 +452,14 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) 
network between the peers
 (define-public wireguard
   (package
 (name "wireguard")
-(version "0.0.20191012")
+(version "0.0.20191127")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/;
   "WireGuard-" version ".tar.xz"))
   (sha256
(base32
-"13psxk61d60sas0ksfk0gakrv8wc8anjj5zb67g2zhn1r69k2mwk"
+"01ixdhbvx5yiq07msd60f98685wdksss4pfhdn1d8r25z2k80kkx"
 (build-system gnu-build-system)
 (outputs '("out" ; The WireGuard userspace tools
"kernel-patch")) ; A patch to build Linux with WireGuard support

branch master updated (363359f -> c114e35)

[guix-commits]

ngz pushed a change to branch master
in repository guix.

  from  363359f   gnu: grammalecte: Update to 1.6.0.
   new  c114e35   gnu: giac: Update to 1.5.0-75.

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


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

01/01: gnu: grammalecte: Update to 1.6.0.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit 363359f8de2b0f7c0c50bc742e3e0ea778b2fc5b
Author: Nicolas Goaziou 
Date:   Sun Dec 1 21:23:46 2019 +0100

gnu: grammalecte: Update to 1.6.0.

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

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 320ffb1..1aa54d9 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -219,7 +219,7 @@ It comes with a German-English dictionary with 
approximately 270,000 entries.")
 (define-public grammalecte
   (package
 (name "grammalecte")
-(version "1.5.0")
+(version "1.6.0")
 (source
  (origin
(method url-fetch/zipbomb)
@@ -227,7 +227,7 @@ It comes with a German-English dictionary with 
approximately 270,000 entries.")
"Grammalecte-fr-v" version ".zip"))
(sha256
 (base32
- "0byh578apbyq2jdpgmbaw01izlkyw2h5nsr28az44rvaqrsndy0z"
+ "0kz13gx2hd23xd6bfr4z73lh18slj3vbvs2xcb7qvhramxjqzqcn"
 (build-system python-build-system)
 (home-page "https://grammalecte.net;)
 (synopsis "French spelling and grammar checker")

01/01: gnu: giac: Update to 1.5.0-75.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit c114e35024119f701de9368f4884b5910ff49a11
Author: Nicolas Goaziou 
Date:   Sun Dec 1 21:24:20 2019 +0100

gnu: giac: Update to 1.5.0-75.

* gnu/packages/algebra.scm (giac): Update to 1.5.0-75.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index f626c0d..6afd559 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -345,7 +345,7 @@ precision.")
 (define-public giac
   (package
 (name "giac")
-(version "1.5.0-69")
+(version "1.5.0-75")
 (source (origin
   (method url-fetch)
   ;; "~parisse/giac" is not used because the maintainer regularly
@@ -357,7 +357,7 @@ precision.")
   "source/giac_" version ".tar.gz"))
   (sha256
(base32
-"05l1qa2kfmvsbp0iqjmg3ixkcqa3h9ry1mjpcps52bxw05s3k1z9"
+"1k94xl6hvy9xqwc3ccgnhpdqgq3lkjbgpgq0njizmlg514dh2jhq"
 (build-system gnu-build-system)
 (arguments
  `(#:modules ((ice-9 ftw)

branch master updated (faaffb9 -> 363359f)

[guix-commits]

ngz pushed a change to branch master
in repository guix.

  from  faaffb9   gnu: fet: Update to 5.41.0.
   new  363359f   gnu: grammalecte: Update to 1.6.0.

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


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

02/02: gnu: fet: Update to 5.41.0.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit faaffb902d32cdca0c89aa0a837c7c2559d20801
Author: Nicolas Goaziou 
Date:   Sun Dec 1 21:18:19 2019 +0100

gnu: fet: Update to 5.41.0.

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

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index fa48f90..274b14d 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -488,14 +488,14 @@ letters of the alphabet, spelling, eye-hand coordination, 
etc.")
 (define-public fet
   (package
 (name "fet")
-(version "5.40.2")
+(version "5.41.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://www.lalescu.ro/liviu/fet/download/;
   "fet-" version ".tar.bz2"))
   (sha256
(base32
-"068zdvb3rys7vvkq33i2jh89c7svvdaqp0548k99jmhbd24xnhgh"
+"0ppa5h1p0y0z8x4xpn45b0x3nl1khyh56m22v6xysk3znxlak4q7"
 (build-system gnu-build-system)
 (arguments
  `(#:phases

01/02: gnu: asymptote: Update to 2.61.

[guix-commits]

ngz pushed a commit to branch master
in repository guix.

commit d7d23c86f8a3aece840695150794dfe03bfd1caf
Author: Nicolas Goaziou 
Date:   Sun Dec 1 21:17:37 2019 +0100

gnu: asymptote: Update to 2.61.

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

diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 56f7d54..df9821b 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -180,14 +180,14 @@ colors, styles, options and details.")
 (define-public asymptote
   (package
 (name "asymptote")
-(version "2.59")
+(version "2.61")
 (source (origin
   (method url-fetch)
   (uri (string-append "mirror://sourceforge/asymptote/"
   version "/asymptote-" version ".src.tgz"))
   (sha256
(base32
-"15riihmfmlh8skdssqkl0yv06hc6sw6pbr6jzsfvhcwdmlbsvh33"
+"0gcd75yixn67lpiky70yhaa0ylr8g1cn65bpr9zx78h2vrpsmk7k"
 (build-system gnu-build-system)
 ;; Note: The 'asy' binary retains a reference to docdir for use with its
 ;; "help" command in interactive mode, so adding a "doc" output is not

branch master updated (34e3161 -> faaffb9)

[guix-commits]

ngz pushed a change to branch master
in repository guix.

  from  34e3161   gnu: quaternion: Use qt-build-system.
   new  d7d23c8   gnu: asymptote: Update to 2.61.
   new  faaffb9   gnu: fet: Update to 5.41.0.

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

04/05: gnu: kdeconnect: Use qt-build-system.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit e185e900e59c32dfdf773b4782950700ab7db709
Author: Hartmut Goebel 
Date:   Sat Nov 30 22:43:23 2019 +0100

gnu: kdeconnect: Use qt-build-system.

* gnu/packages/display-managers.scm (kdeconnect): Use qt-build-sytem.
  [arguments]: Remove. : Base
  on phases from qt-build-system. {wrap-executable}: Remove.
---
 gnu/packages/kde.scm | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 483eeeb..014bca0 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -24,6 +24,7 @@
 
 (define-module (gnu packages kde)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system qt)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -541,28 +542,15 @@ different notification systems.")
 (sha256
  (base32
   "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"
-(build-system cmake-build-system)
+(build-system qt-build-system)
 (arguments
  `(#:configure-flags '("-DBUILD_TESTING=ON")
#:tests? #f ; tests fail hard in our build environment
-   #:modules ((guix build cmake-build-system)
-  (guix build qt-utils)
-  (guix build utils))
-   #:imported-modules (,@%cmake-build-system-modules
-(guix build qt-utils))
#:phases
-   (modify-phases %standard-phases
+   (modify-phases (@ (guix build qt-build-system) %standard-phases)
  (add-before 'check 'check-setup
(lambda _
  (setenv "QT_QPA_PLATFORM" "offscreen")
- #t))
- (add-after 'install 'wrap-executable
-   (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
-   (wrap-qt-program out "../lib/libexec/kdeconnectd")
-   (wrap-qt-program out "kdeconnect-cli")
-   (wrap-qt-program out "kdeconnect-handler")
-   (wrap-qt-program out "kdeconnect-indicator"))
  #t)
 (native-inputs
  `(("extra-cmake-modules" ,extra-cmake-modules)

05/05: gnu: quaternion: Use qt-build-system.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit 34e31612e22f0a9174eeb7abc94d9096b41fa542
Author: Hartmut Goebel 
Date:   Sat Nov 30 22:46:48 2019 +0100

gnu: quaternion: Use qt-build-system.

* gnu/packages/display-managers.scm (quaternion): Use qt-build-sytem.
  [arguments]: Remove.
---
 gnu/packages/messaging.scm | 17 +++--
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 031c357..67a39ab 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -100,6 +100,7 @@
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -1789,7 +1790,7 @@ QMatrixClient project.")
(file-name (git-file-name name version))
(sha256
 (base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4"
-(build-system cmake-build-system)
+(build-system qt-build-system)
 (inputs
  `(("libqmatrixclient" ,libqmatrixclient)
("qtbase" ,qtbase)
@@ -1800,19 +1801,7 @@ QMatrixClient project.")
("qtsvg" ,qtsvg)
("qttools" ,qttools)))
 (arguments
- `(#:tests? #f  ; no tests
-   #:modules ((guix build cmake-build-system)
-  (guix build qt-utils)
-  (guix build utils))
-   #:imported-modules (,@%cmake-build-system-modules
-   (guix build qt-utils))
-   #:phases
-   (modify-phases %standard-phases
- (add-after 'install 'wrap-program
-   (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
-   (wrap-qt-program out "quaternion")
-   #t))
+ `(#:tests? #f)); no tests
 (home-page "https://matrix.org/docs/projects/client/quaternion.html;)
 (synopsis "Graphical client for the Matrix instant messaging protocol")
 (description "Quaternion is a Qt5 desktop client for the Matrix instant

02/05: gnu: sddm: Use qt-build-system.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit 2f57e34bf37a4920dd3c9a0d0bf6d06dda3d57eb
Author: Hartmut Goebel 
Date:   Sat Nov 30 22:34:40 2019 +0100

gnu: sddm: Use qt-build-system.

* gnu/packages/display-managers.scm (sddm): Use qt-build-sytem.
  [arguments]: Remove. : Base
  on phases from qt-build-system. {wrap-programs}: Remove.
---
 gnu/packages/display-managers.scm | 18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 21afc0e..75eab48 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -27,6 +27,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -62,7 +63,7 @@
   (sha256
(base32
 "0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh"
-(build-system cmake-build-system)
+(build-system qt-build-system)
 (native-inputs
  `(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)
@@ -105,24 +106,13 @@
(assoc-ref %outputs "out") "/lib/qt5/qml")
 (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
(assoc-ref %outputs "out") "/etc"))
-   #:modules ((guix build cmake-build-system)
-  (guix build qt-utils)
-  (guix build utils))
-   #:imported-modules (,@%cmake-build-system-modules
-   (guix build qt-utils))
#:phases
-   (modify-phases %standard-phases
+   (modify-phases (@ (guix build qt-build-system) %standard-phases)
  (add-after 'unpack 'embed-loginctl-reference
(lambda _
  (substitute* "CMakeLists.txt"
(("/usr/bin/loginctl") (which "loginctl")))
- #t))
- (add-after 'install 'wrap-programs
-   (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
-   (wrap-qt-program out "sddm")
-   (wrap-qt-program out "sddm-greeter")
-   #t))
+   #t)
 (synopsis "QML based X11 and Wayland display manager")
 (description "SDDM is a display manager for X11 and Wayland aiming to be
 fast, simple and beautiful.  SDDM is themeable and puts no restrictions on the

branch master updated (c6d1306 -> 34e3161)

[guix-commits]

htgoebel pushed a change to branch master
in repository guix.

  from  c6d1306   build: vm: Fix qemu-command procedure.
   new  b6d852c   guix: Add the 'qt' build system.
   new  2f57e34   gnu: sddm: Use qt-build-system.
   new  7d796d8   gnu: ktouch: Use qt-build-system.
   new  e185e90   gnu: kdeconnect: Use qt-build-system.
   new  34e3161   gnu: quaternion: Use qt-build-system.

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


Summary of changes:
 Makefile.am |   2 +
 doc/guix.texi   |  21 +-
 gnu/packages/display-managers.scm   |  18 ++
 gnu/packages/education.scm  |  17 ++---
 gnu/packages/kde.scm|  18 +-
 gnu/packages/messaging.scm  |  17 +
 guix/build-system/{cmake.scm => qt.scm} |  63 +++---
 guix/build/qt-build-system.scm  | 109 
 8 files changed, 185 insertions(+), 80 deletions(-)
 copy guix/build-system/{cmake.scm => qt.scm} (85%)
 create mode 100644 guix/build/qt-build-system.scm

01/05: guix: Add the 'qt' build system.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit b6d852ce6d0b5662706c32ec4b4fd853ec829395
Author: Hartmut Goebel 
Date:   Sun Nov 24 14:56:48 2019 +0100

guix: Add the 'qt' build system.

* guix/build-system/qt.scm, guix/build/qt-build-system.scm: New files.
* Makefile.am (MODULES): Add them.
* doc/guix.texi (Buiild systems): Add the new build system.
---
 Makefile.am|   2 +
 doc/guix.texi  |  21 ++-
 guix/build-system/qt.scm   | 295 +
 guix/build/qt-build-system.scm | 109 +++
 4 files changed, 426 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index b3f03d4..97f1ff5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,6 +132,7 @@ MODULES =   \
   guix/build-system/perl.scm   \
   guix/build-system/python.scm \
   guix/build-system/ocaml.scm  \
+  guix/build-system/qt.scm \
   guix/build-system/waf.scm\
   guix/build-system/r.scm  \
   guix/build-system/rakudo.scm \
@@ -178,6 +179,7 @@ MODULES =   \
   guix/build/perl-build-system.scm \
   guix/build/python-build-system.scm   \
   guix/build/ocaml-build-system.scm\
+  guix/build/qt-build-system.scm   \
   guix/build/r-build-system.scm\
   guix/build/rakudo-build-system.scm   \
   guix/build/ruby-build-system.scm \
diff --git a/doc/guix.texi b/doc/guix.texi
index 0a7713e..2da1ecd 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -47,7 +47,7 @@ Copyright @copyright{} 2017 Thomas Danckaert@*
 Copyright @copyright{} 2017 humanitiesNerd@*
 Copyright @copyright{} 2017 Christopher Allan Webber@*
 Copyright @copyright{} 2017, 2018 Marius Bakke@*
-Copyright @copyright{} 2017 Hartmut Goebel@*
+Copyright @copyright{} 2017, 2019 Hartmut Goebel@*
 Copyright @copyright{} 2017, 2019 Maxim Cournoyer@*
 Copyright @copyright{} 2017, 2018, 2019 Tobias Geerinckx-Rice@*
 Copyright @copyright{} 2017 George Clemmer@*
@@ -6410,6 +6410,25 @@ passes flags specified by the @code{#:make-maker-flags} 
or
 Which Perl package is used can be specified with @code{#:perl}.
 @end defvr
 
+@defvr {Scheme Variable} qt-build-system
+This variable is exported by @code{(guix build-system qt)}.  It
+is intended for use with applications using Qt or KDE.
+
+This build system adds the phase @code{qt-wrap} to the ones defined by
+@var{cmake-build-system}, after the @code{install} phase.
+
+This phase searches for Qt5 plugin paths, QML paths and some XDG in the inputs
+and output.  In case some path is found, all programs in the output's
+@file{bin/}, @file{sbin/}, @file{libexec/} and @file{lib/libexec/} directories
+are wrapped in scripts defining the necessary environment variables.
+
+It is possible to exclude specific package outputs from that wrapping process
+by listing their names in the @code{#:qt-wrap-excluded-outputs} parameter.
+This is useful when an output is known not to contain any Qt binaries, and
+where wrapping would gratuitously add a dependency of that output on Qt, KDE,
+or such.
+@end defvr
+
 @defvr {Scheme Variable} r-build-system
 This variable is exported by @code{(guix build-system r)}.  It
 implements the build procedure used by @uref{https://r-project.org, R}
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
new file mode 100644
index 000..b776845
--- /dev/null
+++ b/guix/build-system/qt.scm
@@ -0,0 +1,295 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès 
+;;; Copyright © 2013 Cyril Roelandt 
+;;; Copyright © 2017 Ricardo Wurmus 
+;;; Copyright © 2019 Hartmut Goebel 
+;;;
+;;; 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 GNU Guix.  If not, see .
+
+(define-module (guix build-system qt)
+  #:use-module (guix store)
+  #:use-module (guix utils)
+  #:use-module (guix derivations)
+  #:use-module (guix search-paths)
+  #:use-module (guix build-system)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix packages)
+  #:use-module (ice-9 match)
+  #:export (%qt-build-system-modules
+qt-build
+

03/05: gnu: ktouch: Use qt-build-system.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit 7d796d8068e25595905e30e3e220feb79946d25e
Author: Hartmut Goebel 
Date:   Sat Nov 30 22:39:55 2019 +0100

gnu: ktouch: Use qt-build-system.

* gnu/packages/display-managers.scm (ktouch): Use qt-build-sytem.
  [arguments]: Remove. : Base
  on phases from qt-build-system. {wrap-executables}: Remove.
---
 gnu/packages/education.scm | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 46262fd..fa48f90 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -58,6 +58,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
   #:use-module (srfi srfi-1))
 
@@ -563,15 +564,10 @@ language and very flexible regarding to new or unknown 
keyboard layouts.")
 (sha256
  (base32
   "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr"
-(build-system cmake-build-system)
+(build-system qt-build-system)
 (arguments
- `(#:modules ((guix build cmake-build-system)
-  (guix build qt-utils)
-  (guix build utils))
-   #:imported-modules (,@%cmake-build-system-modules
-(guix build qt-utils))
-   #:phases
-   (modify-phases %standard-phases
+ `(#:phases
+   (modify-phases (@ (guix build qt-build-system) %standard-phases)
  (add-after 'configure 'patch-makefiles
(lambda* (#:key inputs #:allow-other-keys)
  (let ((qtdec (assoc-ref inputs "qtdeclarative")))
@@ -579,11 +575,6 @@ language and very flexible regarding to new or unknown 
keyboard layouts.")
   "src/CMakeFiles/ktouch.dir/build.make")
  (("/gnu/store/.*qmlcachegen")
   (string-append qtdec "/bin/qmlcachegen"
- #t))
- (add-after 'install 'wrap-executable
-   (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
-   (wrap-qt-program out "ktouch"))
  #t)
 (native-inputs
  `(("extra-cmake-modules" ,extra-cmake-modules)

07/09: website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a slash.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 94d5e7376ccaeb9ef4ae18fcc92599e9089164c2
Author: Florian Pelz 
Date:   Wed Oct 30 19:43:16 2019 +

website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a slash.

* website/apps/base/utils.scm (guix-root-url-path): Add check in setter.
---
 website/apps/base/utils.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index 508abcd..ebb4000 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -51,7 +51,11 @@
 
 (define guix-root-url-path
   ;; Path to GNU Guix site at guix.gnu.org.
-  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")))
+  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
+  (lambda (path)
+(if (string-suffix? "/" path)
+path
+(string-append path "/")
 
 (define latest-guix-version
   (make-parameter "1.0.1"))

09/09: website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 04f102a4e315409855e4ec59d47063ee62097c3f
Author: Florian Pelz 
Date:   Thu Oct 31 14:52:29 2019 +0100

website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

* website/apps/base/utils.scm (guix-url): Always use guix-root-url-path.
(guix-root-url-path): Move here the logic that computes which root path to 
use.
---
 website/apps/base/utils.scm | 27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index ebb4000..8f73ee6 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -51,11 +51,17 @@
 
 (define guix-root-url-path
   ;; Path to GNU Guix site at guix.gnu.org.
-  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
-  (lambda (path)
-(if (string-suffix? "/" path)
-path
-(string-append path "/")
+  (let ((path (cond
+   ;; If we are trying out the website locally, use "/" as the 
root.
+   ((getenv "GUIX_WEB_SITE_LOCAL") "/")
+   (else (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
+(make-parameter
+ path
+ ;; When setting guix-root-url-path, make it end in a slash.
+ (lambda (path)
+   (if (string-suffix? "/" path)
+   path
+   (string-append path "/"))
 
 (define latest-guix-version
   (make-parameter "1.0.1"))
@@ -108,16 +114,13 @@
  For example: 'packages/icecat-XYZ/'.
 
LOCALIZE (boolean)
- Whether to call localize-url on the URL path.
+ Whether to prepend the result of 'localized-root-path' to the URL path.
 
RETURN VALUE (string)
  A URL path. For example: /software/guix/packages/icecat-XYZ/."
-  ((if localize localize-url identity)
-   ;; If we are trying out the website locally, use "/" as the root.
-   ;; Otherwise use guix-root-url-path for deployment to gnu.org.
-   (if (getenv "GUIX_WEB_SITE_LOCAL")
-   (string-append "/" subpath)
-   (string-append (guix-root-url-path) subpath
+  (string-append (guix-root-url-path)
+ (if localize (localized-root-path subpath) "")
+ subpath))
 
 
 (define* (manual-url #:optional (subpath "")

06/09: website: Add language selection dropdown to navbar.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit bbc93e8bfa18b10b18ca028ddc1b5e4895d98491
Author: Florian Pelz 
Date:   Wed Oct 30 12:12:23 2019 +

website: Add language selection dropdown to navbar.

* website/apps/base/templates/components.scm (navbar): Add it.
(horizontal-skip): New procedure.
* website/static/base/css/navbar.css: Add CSS for horizontal-skip.
Increase size at which website switches to mobile mode.
---
 website/apps/base/templates/components.scm | 30 +++---
 website/static/base/css/navbar.css |  6 +-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index f39f3fd..beaa13a 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -23,6 +23,7 @@
contact->shtml
 horizontal-line
horizontal-separator
+horizontal-skip
link-more
link-subtle
link-yellow
@@ -180,6 +181,10 @@
`(src ,(guix-url "static/base/img/h-separator-dark.png")))
(alt ""
 
+(define (horizontal-skip)
+  "Return SHTML for a small horizontal space."
+  `(span (@ (class "hskip"
+
 (define (horizontal-line)
   "Return SHTML for a visible separator to be used in a dropdown menu
 like a menu item."
@@ -408,13 +413,32 @@ manual.
  (C_ "website menu" (menu-item #:label "Contact" #:active-item 
active-item #:url (guix-url "contact/")))
  (C_ "website menu" (menu-item #:label "Contribute" #:active-item 
active-item #:url (guix-url "contribute/")))
  (C_ "website menu" (menu-item #:label "Security" #:active-item 
active-item #:url (guix-url "security/")))
- (C_ "website menu" (menu-item #:label "Graphics" #:active-item 
active-item #:url (guix-url "graphics/")))
+ (C_ "website menu" (menu-item #:label "Graphics" #:active-item 
active-item #:url (guix-url "graphics/")
+  ,(horizontal-skip)
+  ;; Languages dropdown.
+  ,(menu-dropdown #:label (locale-display-name) #:active-item active-item
+#:items
+(map-in-order
+ (lambda (ietf-info)
+   (let ((lingua (car ietf-info))
+ (code (cdr ietf-info)))
+ (setlocale LC_ALL (string-append lingua ".utf8"))
+ (let ((out (menu-item #:label (locale-display-name)
+   #:active-item active-item
+   #:url (guix-url (string-append code "/")
+   #:localize #f
+   (setlocale LC_ALL "")
+   out)))
+ (sort (delete %current-lingua
+   ietf-tags-file-contents
+   (lambda (a b) (string=? a (car b
+   (lambda (a b) string

03/09: website: media: Do not localize video page URLs.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit b206d9a0335425a22412142c62921196a87d0530
Author: Florian Pelz 
Date:   Fri Nov 1 11:07:24 2019 +0100

website: media: Do not localize video page URLs.

* website/apps/media/types.scm (, video):
Add new field for the page URL subpath.
* website/apps/media/data.scm (playlists): Use it.
* website/apps/media/utils.scm (video->url): Compute page URL from it.
---
 website/apps/media/data.scm  |  7 +++
 website/apps/media/types.scm | 16 
 website/apps/media/utils.scm |  5 +
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/website/apps/media/data.scm b/website/apps/media/data.scm
index 4cadaf5..8ceadcc 100644
--- a/website/apps/media/data.scm
+++ b/website/apps/media/data.scm
@@ -23,6 +23,7 @@
(list
 (video
  #:title (C_ "video title" "Installation from Script")
+ #:page-subpath "installation-from-script"
  #:description
  (G_ '(p "Explains how to install Guix on distributions not
 running GNU Guix."))
@@ -32,6 +33,7 @@ running GNU Guix."))
(list
 (video
  #:title (C_ "video title" "Everyday use of GNU Guix, Part One")
+ #:page-subpath "everyday-use-of-gnu-guix,-part-one"
  #:description
  (G_ '(p "How to install packages and how to manage software
 package generations."))
@@ -40,6 +42,7 @@ package generations."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Everyday use of GNU Guix, Part Two")
+ #:page-subpath "everyday-use-of-gnu-guix,-part-two"
  #:description
  (G_ '(p "How to upgrade software and how to reclaim storage
 space."))
@@ -49,6 +52,7 @@ space."))
(list
 (video
  #:title (C_ "video title" "Asking for help")
+ #:page-subpath "asking-for-help"
  #:description
  (G_ '(p "How to get help from the Guix community."))
  #:url "https://archive.org/download/guix-videos/03-help-new-version.webm;
@@ -57,6 +61,7 @@ space."))
(list
 (video
  #:title (C_ "video title" "Packaging, Part One")
+ #:page-subpath "packaging,-part-one"
  #:description
  (G_ '(p "How to set up a development environment for GNU Guix."))
  #:url 
"https://archive.org/download/guix-videos/04-packaging-part-one.webm;
@@ -64,6 +69,7 @@ space."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Packaging, Part Two")
+ #:page-subpath "packaging,-part-two"
  #:description
  (G_ '(p "How to create a package recipe for not yet packaged software."))
  #:url 
"https://archive.org/download/guix-videos/04-packaging-part-two.webm;
@@ -71,6 +77,7 @@ space."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Packaging, Part Three")
+ #:page-subpath "packaging,-part-three"
  #:description
  (G_ '(p "How to submit a package for inclusion in the GNU Guix
 distribution."))
diff --git a/website/apps/media/types.scm b/website/apps/media/types.scm
index 7ad988f..50c0989 100644
--- a/website/apps/media/types.scm
+++ b/website/apps/media/types.scm
@@ -22,6 +22,7 @@
 video?
 video-description
 video-last-updated
+video-page-subpath
 video-poster
 video-title
 video-url))
@@ -144,6 +145,12 @@
 ;;; url (string)
 ;;;   A URL to the video file.
 ;;;
+;;; page-subpath (string)
+;;;   The subpath to the webpage for this video.  It should correspond
+;;;   to the English video title converted to lower case with spaces
+;;;   replaced by hyphens.  For example:
+;;;   'everyday-use-of-gnu-guix,-part-one'.
+;;;
 ;;; poster (string)
 ;;;   A URL to a representative preview image for the video.
 ;;;
@@ -157,18 +164,19 @@
 ;;;   possibly become outdated over time such as documentation videos.
 ;;;
 (define-record-type 
-  (make-video title description url poster tracks last-updated)
+  (make-video title description url page-subpath poster tracks last-updated)
   video?
   (title video-title)
   (description video-description)
   (url video-url)
+  (page-subpath video-page-subpath)
   (poster video-poster)
   (tracks video-tracks)
   (last-updated video-last-updated))
 
 ;;; Helper procedures.
 
-(define* (video #:key (title "") (description "")
-(url "") (poster "") (tracks '()) (last-updated #f))
+(define* (video #:key (title "") (description "") (url #f) (page-subpath #f)
+(poster "") (tracks '()) (last-updated #f))
   "Return a  object with the given attributes."
-  (make-video title description url poster tracks last-updated))
+  (make-video title description url page-subpath poster tracks last-updated))
diff --git a/website/apps/media/utils.scm b/website/apps/media/utils.scm
index 129b085..1c909a5 100644
--- a/website/apps/media/utils.scm
+++ 

branch wip-i18n created (now 04f102a)

[Florian Pelz]

pelzflorian pushed a change to branch wip-i18n
in repository guix-artwork.

at  04f102a   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

This branch includes the following new commits:

   new  77675f1   website: Add custom xgettext to extract from nested sexps 
for i18n.
   new  a00d40c   website: apps: Mark all files for translation.
   new  b206d9a   website: media: Do not localize video page URLs.
   new  d58487b   website: nls: Add German translation.
   new  0fa6b58   website: navbar: Make dropdowns accessible to keyboard 
and touch input.
   new  bbc93e8   website: Add language selection dropdown to navbar.
   new  94d5e73   website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a 
slash.
   new  acf6ca9   website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
   new  04f102a   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

The 9 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.

01/09: website: Add custom xgettext to extract from nested sexps for i18n.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 77675f1778bbc8602e16f6b52ce66524cc892710
Author: Florian Pelz 
Date:   Wed Oct 30 08:22:47 2019 +

website: Add custom xgettext to extract from nested sexps for i18n.

* website/po/POTFILES: New file.  List apps files here.
* website/po/LINGUAS: New file.  List en_US lingua.
* website/po/ietf-tags.scm: New file.  Add association for en_US lingua.
* website/scripts/sexp-xgettext.scm: New file for generating a POT file.
(, , ): New record types.
(combine-duplicate-po-entries, complex-keyword-spec?, parse-scheme-file,
po-equal?, write-po-entry, update-ecomments-string!, update-file-name!,
update-old-line-number!, update-line-number!, incr-line-number!,
incr-line-number-for-each-nl!, current-ref, make-simple-po-entry,
matching-keyword, nth-exp, more-than-one-exp?, token->string-symbol-or-keyw,
complex-marked-list->po-entries, construct-po-entries, tag,
construct-msgid-and-po-entries, scheme-file->po-entries): New procedures.
(%keyword-specs, %options, %comments-line, %ecomments-string, %file-name,
%old-line-number, %line-number, %files-from-port, %source-files,
%output-po-entries, %output-port): New variables.
* website/sexp-xgettext.scm: New file with module for looking up
translations.
(%complex-keywords, %simple-keywords, %plural-numbers, %linguas):
New variables.
(, ): New record types.
(set-complex-keywords!, set-simple-keywords!, gettext-keyword?, tag,
sexp->msgid, deconstruct): New procedures.
(sgettext, spgettext, sngettext, snpgettext): New macro helpers.
* website/apps/i18n.scm: New file.
(G_, N_, C_, NC_, ietf-tags-file-contents): New syntax to use for i18n.
(%current-ietf-tag, %current-lang, %current-lingua): New variables.
(builder->localized-builder, builders->localized-builders,
localized-root-path, first-value): New utility procedures.
(, ): New imports from Haunt.
* website/haunt.scm: Wrap each builder to build the locale set in LC_ALL.
* website/.guix.scm: Make Haunt build directory writable so Haunt can
overwrite duplicate assets.  Convert PO files to MO files and build for
each lingua.
* website/README: Adapt build instructions for i18n.
* website/i18n-howto: New file with usage instructions.
---
 website/.guix.scm |  80 +++-
 website/README|   8 +-
 website/apps/i18n.scm | 132 ++
 website/haunt.scm |  19 +-
 website/i18n-howto.txt|  86 
 website/po/LINGUAS|   3 +
 website/po/POTFILES   |  36 ++
 website/po/ietf-tags.scm  |   9 +
 website/scripts/sexp-xgettext.scm | 830 ++
 website/sexp-xgettext.scm | 530 
 10 files changed, 1707 insertions(+), 26 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index 8f44c90..9510779 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix web site
 ;;; Copyright © 2017, 2019 Ludovic Courtès 
+;;; Copyright © 2019 Florian Pelz 
 ;;;
 ;;; This file is part of the GNU Guix web site.
 ;;;
@@ -18,16 +19,27 @@
 
 ;; Run 'guix build -f .guix.scm' to build the web site.
 
+(define this-directory
+  (dirname (current-filename)))
+
+;; Make sure po/LINGUAS will be found in the current working
+;; directory.
+(chdir this-directory)
+
+;; We need %linguas from the (sexp-xgettext) module.
+;; Therefore, we add its path to the load path.
+(set! %load-path (cons this-directory %load-path))
+
 (use-modules (guix) (gnu)
  (guix modules)
  (guix git-download)
  (guix gexp)
  (guix channels)
  (srfi srfi-9)
- (ice-9 match))
-
-(define this-directory
-  (dirname (current-filename)))
+ (ice-9 match)
+ (ice-9 rdelim)
+ (ice-9 regex)
+ (sexp-xgettext))
 
 (define source
   (local-file this-directory "guix-web-site"
@@ -73,9 +85,7 @@
 
   (setvbuf (current-output-port) 'line)
   (setvbuf (current-error-port) 'line)
-
   (copy-recursively #$source ".")
-
   ;; Set 'GUILE_LOAD_PATH' so that Haunt find the Guix modules and
   ;; its dependencies.  To find out the load path of Guix and its
   ;; dependencies, fetch its value over 'guix repl'.
@@ -96,24 +106,62 @@
 ":"
 (close-pipe pipe))
 
+  ;; Make the copy writable so Haunt can overwrite duplicate assets.
+  (invoke #+(file-append (specification->package "coreutils")
+ "/bin/chmod")
+  "--recursive" "u+w" ".")
+
+  ;; For translations, create MO files from PO files.
+  (for-each
+   (lambda (lingua)
+ (let* ((msgfmt #+(file-append
+  

04/09: website: nls: Add German translation.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit d58487b43bfcbde63de5949a607f3c049c39ccb3
Author: Florian Pelz 
Date:   Wed Oct 30 13:15:34 2019 +

website: nls: Add German translation.
---
 website/apps/base/data.scm |6 +-
 website/po/LINGUAS |1 +
 website/po/de.po   | 2094 
 website/po/ietf-tags.scm   |3 +-
 4 files changed, 2098 insertions(+), 6 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index ea9b01c..e40d6eb 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -76,11 +76,7 @@ though we also accept other languages."))
  (string=? (cadar to-delete) (cadr b))
  ;; but language code is different
  (not (string=? (cadddr to-delete) (car b))
- `(("de"
-"Melden Sie sich bei der „Help“-Mailingliste an, um per E-Mail
-gemeinschaftlichen Rat zu GuixSD und Guix zu bekommen.  Sie können
-Nachrichten auch auf deutsch verfassen.")
-   ("eo"
+ `(("eo"
 "Subskribu al la retmesaĝolisto \"Help\" por demandi helpon pri
 GNU Guix al la grupo.  Vi povas skribi esperantlingve.")
("es"
diff --git a/website/po/LINGUAS b/website/po/LINGUAS
index d4dd759..dc8e711 100644
--- a/website/po/LINGUAS
+++ b/website/po/LINGUAS
@@ -1,3 +1,4 @@
 # Translation with sexp-xgettext requires the full LL_CC locale name
 # to be specified.
+de_DE
 en_US
diff --git a/website/po/de.po b/website/po/de.po
new file mode 100644
index 000..c3103ba
--- /dev/null
+++ b/website/po/de.po
@@ -0,0 +1,2094 @@
+# German translations for guix-website package.
+# Copyright (C) 2019 Ludovic Courtès
+# This file is distributed under the same license as the guix-website package.
+# Florian Pelz , 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: guix-website\n"
+"Report-Msgid-Bugs-To: l...@gnu.org\n"
+"POT-Creation-Date: 2019-10-31 10:39+0100\n"
+"PO-Revision-Date: 2019-10-31 10:58+0100\n"
+"Last-Translator: Florian Pelz \n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANSLATORS: The locale’s display name; please include a country
+#. code like in English (US) *only* if there are multiple
+#. Translation Project teams for the same language.
+#: apps/base/utils.scm:68
+msgid "English (US)"
+msgstr "Deutsch"
+
+#: apps/base/templates/home.scm:19
+msgctxt "webpage title"
+msgid "GNU's advanced distro and transactional package manager"
+msgstr "GNUs fortgeschrittene Distribution und transaktionelle Paketverwaltung"
+
+#: apps/base/templates/home.scm:21 apps/base/templates/about.scm:19
+msgid ""
+"Guix is an advanced distribution of the GNU operating system.\n"
+"   Guix is technology that respects the freedom of computer users.\n"
+"   You are free to run the system for any purpose, study how it\n"
+"   works, improve it, and share it with the whole world."
+msgstr ""
+"Guix ist eine fortgeschrittene Distribution des GNU-Betriebssystems.\n"
+"   Guix ist eine Technologie, die die Freiheit der Benutzer von "
+"Rechengeräten respektiert.\n"
+"   Es steht Ihnen frei, das System zu jedem Zweck auszuführen, seine "
+"Funktionsweise zu studieren,\n"
+"   es zu verbessern und es mit der ganzen Welt zu teilen."
+
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#: apps/base/templates/home.scm:27 apps/base/templates/menu.scm:20
+#: apps/blog/templates/post-list.scm:29 apps/blog/templates/tag.scm:33
+#: apps/media/templates/screenshot.scm:24
+#: apps/media/templates/screenshots-overview.scm:21
+#: apps/packages/templates/detailed-index.scm:27
+#: apps/packages/templates/detailed-package-list.scm:30
+#: apps/packages/templates/index.scm:27
+#: apps/packages/templates/package-list.scm:30
+#: apps/packages/templates/package.scm:32
+msgid ""
+"GNU|Linux|Unix|Free software|Libre software|Operating system|GNU Hurd|GNU "
+"Guix package manager|GNU Guile|Guile Scheme|Transactional upgrades|"
+"Functional package management|Reproducibility"
+msgstr ""
+"GNU|Linux|Unix|Freie Software|Libre-Software|Betriebssystem|GNU Hurd|GNU-"
+"Guix-Paketverwaltung|GNU Guile|Guile Scheme|Transaktionelle Aktualisierungen|"
+"Funktionale Paketverwaltung|Reproduzierbarkeit"
+

branch wip-i18n deleted (was 547f29b)

[Florian Pelz]

pelzflorian pushed a change to branch wip-i18n
in repository guix-artwork.

   was  547f29b   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

This change permanently discards the following revisions:

  discards  547f29b   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.
  discards  5f98454   website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
  discards  03d424b   website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a 
slash.
  discards  026ba23   website: Add language selection dropdown to navbar.
  discards  206d569   website: navbar: Make dropdowns accessible to keyboard 
and touch input.
  discards  d58487b   website: nls: Add German translation.
  discards  b206d9a   website: media: Do not localize video page URLs.
  discards  a00d40c   website: apps: Mark all files for translation.
  discards  77675f1   website: Add custom xgettext to extract from nested sexps 
for i18n.

05/09: website: navbar: Make dropdowns accessible to keyboard and touch input.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 0fa6b58057e9763dcc93603dd75808295f11f3af
Author: Florian Pelz 
Date:   Sun Dec 1 18:42:09 2019 +

website: navbar: Make dropdowns accessible to keyboard and touch input.

* website/apps/base/templates/components.scm (horizontal-line): New 
procedure.
(navbar, menu-dropdown): Adapt to use CSS for accessibility.
* website/static/base/css/navbar.css: Adapt CSS to new dropdowns.
(menu-item-active): Make CSS apply when appropriate.
(menu-item): Make CSS apply when appropriate.  Change margin.
(dropdown-btn): Make CSS apply when appropriate.  Add margin.  Change 
padding.
(menu-hidden-input): Hide HTML radio buttons not meant for display.
(hline): Hide in small browser window.
(submenu): Make CSS apply when appropriate.
(navbar): Signify dropdown labels are clickable in mouse cursor.
Highlight pressed down labels.
---
 website/apps/base/templates/components.scm | 78 --
 website/static/base/css/navbar.css | 67 ++---
 2 files changed, 112 insertions(+), 33 deletions(-)

diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index 8c80a85..f39f3fd 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -21,6 +21,7 @@
button-little
contact-preview
contact->shtml
+horizontal-line
horizontal-separator
link-more
link-subtle
@@ -179,6 +180,13 @@
`(src ,(guix-url "static/base/img/h-separator-dark.png")))
(alt ""
 
+(define (horizontal-line)
+  "Return SHTML for a visible separator to be used in a dropdown menu
+like a menu item."
+  `(img (@ (class "hline")
+   (src ,(guix-url "static/base/img/h-separator.png"))
+   (alt ""
+
 
 (define* (link-more #:key (label "More") (url "#") (light #false))
   "Return an SHTML a element that looks like a 'more →' link.
@@ -285,19 +293,53 @@ manual.
ITEMS (list of menu items)
  A list of menu items as returned by the menu-item procedure in this
  same module. If not provided, the value defaults to an empty list."
-  `(li
-(@ (class "dropdown"))
-(a
- (@ (class
-,(if (string=? (string-downcase label) (string-downcase active-item))
- "menu-item menu-item-active dropdown-btn"
- "menu-item dropdown-btn"))
-   (href ,url))
- ,label)
-(div
- (@ (class "submenu"))
- (div (@ (class "submenu-triangle")) " ")
- (ul ,@items
+  (let ((label-hash (number->string (string-hash label
+`(li
+  (@ (class ,(if (string=? (string-downcase label)
+   (string-downcase active-item))
+ "menu-item menu-item-active dropdown dropdown-btn"
+ "menu-item dropdown dropdown-btn")))
+  ,@(let ((id (string-append "visible-dropdown-" label-hash)))
+  `(;; show dropdown when button is checked:
+(style ,(string-append "#" id ":checked ~ #submenu-" label-hash "
+{
+min-width: 150px;
+/* reset to initial values: */
+width: auto;
+height: auto;
+overflow: visible;
+}"))
+;; show uncheck version of button iff button is checked
+(style ,(string-append "#" id ":checked \
+~ label[for=all-dropdowns-hidden]
+{
+display: inline;
+}"))
+(style "label[for=all-dropdowns-hidden]
+{
+display: none;
+}")
+;; show check version of button iff button is unchecked
+(style ,(string-append "#" id ":checked ~ label[for=" id "]
+{
+display: none;
+}"))
+(input (@ (class "menu-hidden-input")
+  (type "radio")
+  (name "dropdown")
+  (id ,id)))
+(label
+ (@ (for ,id))
+ ,label)
+(label
+ (@ (for "all-dropdowns-hidden"))
+ ,label)))
+  (div
+   (@ (class "submenu")
+  (id ,(string-append "submenu-" label-hash)))
+   (div (@ (class "submenu-triangle"))
+" ")
+   (ul ,@items)
 
 
 (define* (menu-item #:key (label "Item") (active-item "") (url "#"))
@@ -338,7 +380,11 @@ manual.
 
 ;; Menu.
 (nav (@ (class "menu"))
- ,(G_ `(h2 (@ (class "a11y-offset")) "website menu:"))
+ ,(G_ `(h2 (@ (class "a11y-offset")) "website menu:"))
+ (input (@ (class "menu-hidden-input")
+   (type "radio")
+   (name "dropdown")
+   (id "all-dropdowns-hidden")))
  (ul
   ,(C_ "website menu" (menu-item #:label "Overview" #:active-item 
active-item #:url (guix-url)))
   ,(C_ "website menu" (menu-item #:label "Download" #:active-item 
active-item #:url (guix-url "download/")))
@@ -354,9 +400,11 @@ manual.
   ,(C_ "website menu" 

08/09: website: Fix building with GUIX_WEB_SITE_ROOT_PATH.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit acf6ca997c0fd9e82d9fce1ee407aa2ff2c1f2b4
Author: Florian Pelz 
Date:   Wed Oct 30 21:45:45 2019 +

website: Fix building with GUIX_WEB_SITE_ROOT_PATH.

* website/.guix.scm: Retain GUIX_WEB_SITE_ROOT_PATH in the build expression.
---
 website/.guix.scm | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/website/.guix.scm b/website/.guix.scm
index 9510779..a48621c 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -46,6 +46,9 @@
   #:recursive? #t
   #:select? (git-predicate this-directory)))
 
+(define root-path
+  (getenv "GUIX_WEB_SITE_ROOT_PATH"))
+
 (define (package+propagated-inputs package)
   (match (package-transitive-propagated-inputs package)
 (((labels packages) ...)
@@ -143,6 +146,10 @@
   ;; Use a sane default.
   (setenv "XDG_CACHE_HOME" "/tmp/.cache")
 
+  ;; Use GUIX_WEB_SITE_ROOT_PATH from the environment in which
+  ;; this script was run.
+  (setenv "GUIX_WEB_SITE_ROOT_PATH" #$root-path)
+
   ;; Build the website for each translation.
   (for-each
(lambda (lingua)

09/09: website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 547f29bdcf7faf5c6cb12591720bfc39b87db0ba
Author: Florian Pelz 
Date:   Thu Oct 31 14:52:29 2019 +0100

website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

* website/apps/base/utils.scm (guix-url): Always use guix-root-url-path.
(guix-root-url-path): Move here the logic that computes which root path to 
use.
---
 website/apps/base/utils.scm | 27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index ebb4000..8f73ee6 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -51,11 +51,17 @@
 
 (define guix-root-url-path
   ;; Path to GNU Guix site at guix.gnu.org.
-  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
-  (lambda (path)
-(if (string-suffix? "/" path)
-path
-(string-append path "/")
+  (let ((path (cond
+   ;; If we are trying out the website locally, use "/" as the 
root.
+   ((getenv "GUIX_WEB_SITE_LOCAL") "/")
+   (else (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
+(make-parameter
+ path
+ ;; When setting guix-root-url-path, make it end in a slash.
+ (lambda (path)
+   (if (string-suffix? "/" path)
+   path
+   (string-append path "/"))
 
 (define latest-guix-version
   (make-parameter "1.0.1"))
@@ -108,16 +114,13 @@
  For example: 'packages/icecat-XYZ/'.
 
LOCALIZE (boolean)
- Whether to call localize-url on the URL path.
+ Whether to prepend the result of 'localized-root-path' to the URL path.
 
RETURN VALUE (string)
  A URL path. For example: /software/guix/packages/icecat-XYZ/."
-  ((if localize localize-url identity)
-   ;; If we are trying out the website locally, use "/" as the root.
-   ;; Otherwise use guix-root-url-path for deployment to gnu.org.
-   (if (getenv "GUIX_WEB_SITE_LOCAL")
-   (string-append "/" subpath)
-   (string-append (guix-root-url-path) subpath
+  (string-append (guix-root-url-path)
+ (if localize (localized-root-path subpath) "")
+ subpath))
 
 
 (define* (manual-url #:optional (subpath "")

04/09: website: nls: Add German translation.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit d58487b43bfcbde63de5949a607f3c049c39ccb3
Author: Florian Pelz 
Date:   Wed Oct 30 13:15:34 2019 +

website: nls: Add German translation.
---
 website/apps/base/data.scm |6 +-
 website/po/LINGUAS |1 +
 website/po/de.po   | 2094 
 website/po/ietf-tags.scm   |3 +-
 4 files changed, 2098 insertions(+), 6 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index ea9b01c..e40d6eb 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -76,11 +76,7 @@ though we also accept other languages."))
  (string=? (cadar to-delete) (cadr b))
  ;; but language code is different
  (not (string=? (cadddr to-delete) (car b))
- `(("de"
-"Melden Sie sich bei der „Help“-Mailingliste an, um per E-Mail
-gemeinschaftlichen Rat zu GuixSD und Guix zu bekommen.  Sie können
-Nachrichten auch auf deutsch verfassen.")
-   ("eo"
+ `(("eo"
 "Subskribu al la retmesaĝolisto \"Help\" por demandi helpon pri
 GNU Guix al la grupo.  Vi povas skribi esperantlingve.")
("es"
diff --git a/website/po/LINGUAS b/website/po/LINGUAS
index d4dd759..dc8e711 100644
--- a/website/po/LINGUAS
+++ b/website/po/LINGUAS
@@ -1,3 +1,4 @@
 # Translation with sexp-xgettext requires the full LL_CC locale name
 # to be specified.
+de_DE
 en_US
diff --git a/website/po/de.po b/website/po/de.po
new file mode 100644
index 000..c3103ba
--- /dev/null
+++ b/website/po/de.po
@@ -0,0 +1,2094 @@
+# German translations for guix-website package.
+# Copyright (C) 2019 Ludovic Courtès
+# This file is distributed under the same license as the guix-website package.
+# Florian Pelz , 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: guix-website\n"
+"Report-Msgid-Bugs-To: l...@gnu.org\n"
+"POT-Creation-Date: 2019-10-31 10:39+0100\n"
+"PO-Revision-Date: 2019-10-31 10:58+0100\n"
+"Last-Translator: Florian Pelz \n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANSLATORS: The locale’s display name; please include a country
+#. code like in English (US) *only* if there are multiple
+#. Translation Project teams for the same language.
+#: apps/base/utils.scm:68
+msgid "English (US)"
+msgstr "Deutsch"
+
+#: apps/base/templates/home.scm:19
+msgctxt "webpage title"
+msgid "GNU's advanced distro and transactional package manager"
+msgstr "GNUs fortgeschrittene Distribution und transaktionelle Paketverwaltung"
+
+#: apps/base/templates/home.scm:21 apps/base/templates/about.scm:19
+msgid ""
+"Guix is an advanced distribution of the GNU operating system.\n"
+"   Guix is technology that respects the freedom of computer users.\n"
+"   You are free to run the system for any purpose, study how it\n"
+"   works, improve it, and share it with the whole world."
+msgstr ""
+"Guix ist eine fortgeschrittene Distribution des GNU-Betriebssystems.\n"
+"   Guix ist eine Technologie, die die Freiheit der Benutzer von "
+"Rechengeräten respektiert.\n"
+"   Es steht Ihnen frei, das System zu jedem Zweck auszuführen, seine "
+"Funktionsweise zu studieren,\n"
+"   es zu verbessern und es mit der ganzen Welt zu teilen."
+
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#. TRANSLATORS: |-separated list of webpage keywords
+#: apps/base/templates/home.scm:27 apps/base/templates/menu.scm:20
+#: apps/blog/templates/post-list.scm:29 apps/blog/templates/tag.scm:33
+#: apps/media/templates/screenshot.scm:24
+#: apps/media/templates/screenshots-overview.scm:21
+#: apps/packages/templates/detailed-index.scm:27
+#: apps/packages/templates/detailed-package-list.scm:30
+#: apps/packages/templates/index.scm:27
+#: apps/packages/templates/package-list.scm:30
+#: apps/packages/templates/package.scm:32
+msgid ""
+"GNU|Linux|Unix|Free software|Libre software|Operating system|GNU Hurd|GNU "
+"Guix package manager|GNU Guile|Guile Scheme|Transactional upgrades|"
+"Functional package management|Reproducibility"
+msgstr ""
+"GNU|Linux|Unix|Freie Software|Libre-Software|Betriebssystem|GNU Hurd|GNU-"
+"Guix-Paketverwaltung|GNU Guile|Guile Scheme|Transaktionelle Aktualisierungen|"
+"Funktionale Paketverwaltung|Reproduzierbarkeit"
+

branch wip-i18n deleted (was 597a7b4)

[Florian Pelz]

pelzflorian pushed a change to branch wip-i18n
in repository guix-artwork.

   was  597a7b4   website: navbar: Fix CSS padding in accessible navbar.

This change permanently discards the following revisions:

  discards  597a7b4   website: navbar: Fix CSS padding in accessible navbar.
  discards  7d4674b   website: navbar: Fix CSS margins in accessible navbar.
  discards  1318ea9   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.
  discards  07e90bf   website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
  discards  e96533b   website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a 
slash.
  discards  b9e8b30   website: Add language selection dropdown to navbar.
  discards  7754ba4   website: navbar: Make dropdowns accessible to keyboard 
and touch input.
  discards  5100b7a   website: nls: Add German translation.
  discards  2b03703   website: media: Do not localize video page URLs.
  discards  5317f41   website: apps: Mark all files for translation.
  discards  7fbe99d   website: Add custom xgettext to extract from nested sexps 
for i18n.

03/09: website: media: Do not localize video page URLs.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit b206d9a0335425a22412142c62921196a87d0530
Author: Florian Pelz 
Date:   Fri Nov 1 11:07:24 2019 +0100

website: media: Do not localize video page URLs.

* website/apps/media/types.scm (, video):
Add new field for the page URL subpath.
* website/apps/media/data.scm (playlists): Use it.
* website/apps/media/utils.scm (video->url): Compute page URL from it.
---
 website/apps/media/data.scm  |  7 +++
 website/apps/media/types.scm | 16 
 website/apps/media/utils.scm |  5 +
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/website/apps/media/data.scm b/website/apps/media/data.scm
index 4cadaf5..8ceadcc 100644
--- a/website/apps/media/data.scm
+++ b/website/apps/media/data.scm
@@ -23,6 +23,7 @@
(list
 (video
  #:title (C_ "video title" "Installation from Script")
+ #:page-subpath "installation-from-script"
  #:description
  (G_ '(p "Explains how to install Guix on distributions not
 running GNU Guix."))
@@ -32,6 +33,7 @@ running GNU Guix."))
(list
 (video
  #:title (C_ "video title" "Everyday use of GNU Guix, Part One")
+ #:page-subpath "everyday-use-of-gnu-guix,-part-one"
  #:description
  (G_ '(p "How to install packages and how to manage software
 package generations."))
@@ -40,6 +42,7 @@ package generations."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Everyday use of GNU Guix, Part Two")
+ #:page-subpath "everyday-use-of-gnu-guix,-part-two"
  #:description
  (G_ '(p "How to upgrade software and how to reclaim storage
 space."))
@@ -49,6 +52,7 @@ space."))
(list
 (video
  #:title (C_ "video title" "Asking for help")
+ #:page-subpath "asking-for-help"
  #:description
  (G_ '(p "How to get help from the Guix community."))
  #:url "https://archive.org/download/guix-videos/03-help-new-version.webm;
@@ -57,6 +61,7 @@ space."))
(list
 (video
  #:title (C_ "video title" "Packaging, Part One")
+ #:page-subpath "packaging,-part-one"
  #:description
  (G_ '(p "How to set up a development environment for GNU Guix."))
  #:url 
"https://archive.org/download/guix-videos/04-packaging-part-one.webm;
@@ -64,6 +69,7 @@ space."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Packaging, Part Two")
+ #:page-subpath "packaging,-part-two"
  #:description
  (G_ '(p "How to create a package recipe for not yet packaged software."))
  #:url 
"https://archive.org/download/guix-videos/04-packaging-part-two.webm;
@@ -71,6 +77,7 @@ space."))
  #:last-updated (string->date "2019-10-25T20:00:00" "~Y-~m-~dT~H:~M:~S"))
 (video
  #:title (C_ "video title" "Packaging, Part Three")
+ #:page-subpath "packaging,-part-three"
  #:description
  (G_ '(p "How to submit a package for inclusion in the GNU Guix
 distribution."))
diff --git a/website/apps/media/types.scm b/website/apps/media/types.scm
index 7ad988f..50c0989 100644
--- a/website/apps/media/types.scm
+++ b/website/apps/media/types.scm
@@ -22,6 +22,7 @@
 video?
 video-description
 video-last-updated
+video-page-subpath
 video-poster
 video-title
 video-url))
@@ -144,6 +145,12 @@
 ;;; url (string)
 ;;;   A URL to the video file.
 ;;;
+;;; page-subpath (string)
+;;;   The subpath to the webpage for this video.  It should correspond
+;;;   to the English video title converted to lower case with spaces
+;;;   replaced by hyphens.  For example:
+;;;   'everyday-use-of-gnu-guix,-part-one'.
+;;;
 ;;; poster (string)
 ;;;   A URL to a representative preview image for the video.
 ;;;
@@ -157,18 +164,19 @@
 ;;;   possibly become outdated over time such as documentation videos.
 ;;;
 (define-record-type 
-  (make-video title description url poster tracks last-updated)
+  (make-video title description url page-subpath poster tracks last-updated)
   video?
   (title video-title)
   (description video-description)
   (url video-url)
+  (page-subpath video-page-subpath)
   (poster video-poster)
   (tracks video-tracks)
   (last-updated video-last-updated))
 
 ;;; Helper procedures.
 
-(define* (video #:key (title "") (description "")
-(url "") (poster "") (tracks '()) (last-updated #f))
+(define* (video #:key (title "") (description "") (url #f) (page-subpath #f)
+(poster "") (tracks '()) (last-updated #f))
   "Return a  object with the given attributes."
-  (make-video title description url poster tracks last-updated))
+  (make-video title description url page-subpath poster tracks last-updated))
diff --git a/website/apps/media/utils.scm b/website/apps/media/utils.scm
index 129b085..1c909a5 100644
--- a/website/apps/media/utils.scm
+++ 

06/09: website: Add language selection dropdown to navbar.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 026ba2361742926e0d5fc03e8d001aac4eb788f6
Author: Florian Pelz 
Date:   Wed Oct 30 12:12:23 2019 +

website: Add language selection dropdown to navbar.

* website/apps/base/templates/components.scm (navbar): Add it.
(horizontal-skip): New procedure.
* website/static/base/css/navbar.css: Add CSS for horizontal-skip.
Increase size at which website switches to mobile mode.
---
 website/apps/base/templates/components.scm | 30 +++---
 website/static/base/css/navbar.css |  6 +-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index 14794c0..9bef32e 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -23,6 +23,7 @@
contact->shtml
 horizontal-line
horizontal-separator
+horizontal-skip
link-more
link-subtle
link-yellow
@@ -180,6 +181,10 @@
`(src ,(guix-url "static/base/img/h-separator-dark.png")))
(alt ""
 
+(define (horizontal-skip)
+  "Return SHTML for a small horizontal space."
+  `(span (@ (class "hskip"
+
 (define (horizontal-line)
   "Return SHTML for a visible separator to be used in a dropdown menu
 like a menu item."
@@ -407,13 +412,32 @@ manual.
  (C_ "website menu" (menu-item #:label "Contact" #:active-item 
active-item #:url (guix-url "contact/")))
  (C_ "website menu" (menu-item #:label "Contribute" #:active-item 
active-item #:url (guix-url "contribute/")))
  (C_ "website menu" (menu-item #:label "Security" #:active-item 
active-item #:url (guix-url "security/")))
- (C_ "website menu" (menu-item #:label "Graphics" #:active-item 
active-item #:url (guix-url "graphics/")))
+ (C_ "website menu" (menu-item #:label "Graphics" #:active-item 
active-item #:url (guix-url "graphics/")
+  ,(horizontal-skip)
+  ;; Languages dropdown.
+  ,(menu-dropdown #:label (locale-display-name) #:active-item active-item
+#:items
+(map-in-order
+ (lambda (ietf-info)
+   (let ((lingua (car ietf-info))
+ (code (cdr ietf-info)))
+ (setlocale LC_ALL (string-append lingua ".utf8"))
+ (let ((out (menu-item #:label (locale-display-name)
+   #:active-item active-item
+   #:url (guix-url (string-append code "/")
+   #:localize #f
+   (setlocale LC_ALL "")
+   out)))
+ (sort (delete %current-lingua
+   ietf-tags-file-contents
+   (lambda (a b) (string=? a (car b
+   (lambda (a b) string

branch wip-i18n created (now 547f29b)

[Florian Pelz]

pelzflorian pushed a change to branch wip-i18n
in repository guix-artwork.

at  547f29b   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

This branch includes the following new commits:

   new  77675f1   website: Add custom xgettext to extract from nested sexps 
for i18n.
   new  a00d40c   website: apps: Mark all files for translation.
   new  b206d9a   website: media: Do not localize video page URLs.
   new  d58487b   website: nls: Add German translation.
   new  206d569   website: navbar: Make dropdowns accessible to keyboard 
and touch input.
   new  026ba23   website: Add language selection dropdown to navbar.
   new  03d424b   website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a 
slash.
   new  5f98454   website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
   new  547f29b   website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

The 9 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.

07/09: website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a slash.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 03d424b6ae94d46a2d76326de95d6af982d33b70
Author: Florian Pelz 
Date:   Wed Oct 30 19:43:16 2019 +

website: Handle GUIX_WEB_SITE_ROOT_PATH not ending in a slash.

* website/apps/base/utils.scm (guix-root-url-path): Add check in setter.
---
 website/apps/base/utils.scm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index 508abcd..ebb4000 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -51,7 +51,11 @@
 
 (define guix-root-url-path
   ;; Path to GNU Guix site at guix.gnu.org.
-  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")))
+  (make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
+  (lambda (path)
+(if (string-suffix? "/" path)
+path
+(string-append path "/")
 
 (define latest-guix-version
   (make-parameter "1.0.1"))

05/09: website: navbar: Make dropdowns accessible to keyboard and touch input.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 206d569106225ac25f6e3bcbdc5480f09a7fd882
Author: Florian Pelz 
Date:   Sun Dec 1 16:24:33 2019 +

website: navbar: Make dropdowns accessible to keyboard and touch input.

* website/apps/base/templates/components.scm (horizontal-line): New 
procedure.
(navbar, menu-dropdown): Adapt to use CSS for accessibility.
* website/static/base/css/navbar.css: Adapt CSS to new dropdowns.
(menu-item-active): Make CSS apply when appropriate.
(menu-item): Make CSS apply when appropriate.  Change margin.
(dropdown-btn): Make CSS apply when appropriate.  Add margin.  Change 
padding.
(menu-hidden-input): Hide HTML radio buttons not meant for display.
(hline): Hide in small browser window.
(submenu): Make CSS apply when appropriate.
(navbar): Signify dropdown labels are clickable in mouse cursor.
Highlight pressed down labels.
---
 website/apps/base/templates/components.scm | 77 --
 website/static/base/css/navbar.css | 67 +++---
 2 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/website/apps/base/templates/components.scm 
b/website/apps/base/templates/components.scm
index 8c80a85..14794c0 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -21,6 +21,7 @@
button-little
contact-preview
contact->shtml
+horizontal-line
horizontal-separator
link-more
link-subtle
@@ -179,6 +180,13 @@
`(src ,(guix-url "static/base/img/h-separator-dark.png")))
(alt ""
 
+(define (horizontal-line)
+  "Return SHTML for a visible separator to be used in a dropdown menu
+like a menu item."
+  `(img (@ (class "hline")
+   (src ,(guix-url "static/base/img/h-separator.png"))
+   (alt ""
+
 
 (define* (link-more #:key (label "More") (url "#") (light #false))
   "Return an SHTML a element that looks like a 'more →' link.
@@ -285,19 +293,52 @@ manual.
ITEMS (list of menu items)
  A list of menu items as returned by the menu-item procedure in this
  same module. If not provided, the value defaults to an empty list."
-  `(li
-(@ (class "dropdown"))
-(a
- (@ (class
-,(if (string=? (string-downcase label) (string-downcase active-item))
- "menu-item menu-item-active dropdown-btn"
- "menu-item dropdown-btn"))
-   (href ,url))
- ,label)
-(div
- (@ (class "submenu"))
- (div (@ (class "submenu-triangle")) " ")
- (ul ,@items
+  (let ((label-hash (number->string (string-hash label
+`(li
+  (@ (class ,(if (string=? (string-downcase label)
+   (string-downcase active-item))
+ "menu-item menu-item-active dropdown dropdown-btn"
+ "menu-item dropdown dropdown-btn")))
+  ,@(let ((id (string-append "visible-dropdown-" label-hash)))
+  `(;; show dropdown when button is checked:
+(style ,(string-append "#" id ":checked ~ #submenu-" label-hash "
+{
+width: initial;
+height: initial;
+min-width: 150px;
+overflow: initial;
+}"))
+;; show uncheck version of button iff button is checked
+(style ,(string-append "#" id ":checked \
+~ label[for=all-dropdowns-hidden]
+{
+display: initial;
+}"))
+(style "label[for=all-dropdowns-hidden]
+{
+display: none;
+}")
+;; show check version of button iff button is unchecked
+(style ,(string-append "#" id ":checked ~ label[for=" id "]
+{
+display: none;
+}"))
+(input (@ (class "menu-hidden-input")
+  (type "radio")
+  (name "dropdown")
+  (id ,id)))
+(label
+ (@ (for ,id))
+ ,label)
+(label
+ (@ (for "all-dropdowns-hidden"))
+ ,label)))
+  (div
+   (@ (class "submenu")
+  (id ,(string-append "submenu-" label-hash)))
+   (div (@ (class "submenu-triangle"))
+" ")
+   (ul ,@items)
 
 
 (define* (menu-item #:key (label "Item") (active-item "") (url "#"))
@@ -338,7 +379,11 @@ manual.
 
 ;; Menu.
 (nav (@ (class "menu"))
- ,(G_ `(h2 (@ (class "a11y-offset")) "website menu:"))
+ ,(G_ `(h2 (@ (class "a11y-offset")) "website menu:"))
+ (input (@ (class "menu-hidden-input")
+   (type "radio")
+   (name "dropdown")
+   (id "all-dropdowns-hidden")))
  (ul
   ,(C_ "website menu" (menu-item #:label "Overview" #:active-item 
active-item #:url (guix-url)))
   ,(C_ "website menu" (menu-item #:label "Download" #:active-item 
active-item #:url (guix-url "download/")))
@@ -354,9 +399,11 @@ manual.
   ,(C_ "website menu" (menu-item #:label "Help" 

01/09: website: Add custom xgettext to extract from nested sexps for i18n.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 77675f1778bbc8602e16f6b52ce66524cc892710
Author: Florian Pelz 
Date:   Wed Oct 30 08:22:47 2019 +

website: Add custom xgettext to extract from nested sexps for i18n.

* website/po/POTFILES: New file.  List apps files here.
* website/po/LINGUAS: New file.  List en_US lingua.
* website/po/ietf-tags.scm: New file.  Add association for en_US lingua.
* website/scripts/sexp-xgettext.scm: New file for generating a POT file.
(, , ): New record types.
(combine-duplicate-po-entries, complex-keyword-spec?, parse-scheme-file,
po-equal?, write-po-entry, update-ecomments-string!, update-file-name!,
update-old-line-number!, update-line-number!, incr-line-number!,
incr-line-number-for-each-nl!, current-ref, make-simple-po-entry,
matching-keyword, nth-exp, more-than-one-exp?, token->string-symbol-or-keyw,
complex-marked-list->po-entries, construct-po-entries, tag,
construct-msgid-and-po-entries, scheme-file->po-entries): New procedures.
(%keyword-specs, %options, %comments-line, %ecomments-string, %file-name,
%old-line-number, %line-number, %files-from-port, %source-files,
%output-po-entries, %output-port): New variables.
* website/sexp-xgettext.scm: New file with module for looking up
translations.
(%complex-keywords, %simple-keywords, %plural-numbers, %linguas):
New variables.
(, ): New record types.
(set-complex-keywords!, set-simple-keywords!, gettext-keyword?, tag,
sexp->msgid, deconstruct): New procedures.
(sgettext, spgettext, sngettext, snpgettext): New macro helpers.
* website/apps/i18n.scm: New file.
(G_, N_, C_, NC_, ietf-tags-file-contents): New syntax to use for i18n.
(%current-ietf-tag, %current-lang, %current-lingua): New variables.
(builder->localized-builder, builders->localized-builders,
localized-root-path, first-value): New utility procedures.
(, ): New imports from Haunt.
* website/haunt.scm: Wrap each builder to build the locale set in LC_ALL.
* website/.guix.scm: Make Haunt build directory writable so Haunt can
overwrite duplicate assets.  Convert PO files to MO files and build for
each lingua.
* website/README: Adapt build instructions for i18n.
* website/i18n-howto: New file with usage instructions.
---
 website/.guix.scm |  80 +++-
 website/README|   8 +-
 website/apps/i18n.scm | 132 ++
 website/haunt.scm |  19 +-
 website/i18n-howto.txt|  86 
 website/po/LINGUAS|   3 +
 website/po/POTFILES   |  36 ++
 website/po/ietf-tags.scm  |   9 +
 website/scripts/sexp-xgettext.scm | 830 ++
 website/sexp-xgettext.scm | 530 
 10 files changed, 1707 insertions(+), 26 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index 8f44c90..9510779 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix web site
 ;;; Copyright © 2017, 2019 Ludovic Courtès 
+;;; Copyright © 2019 Florian Pelz 
 ;;;
 ;;; This file is part of the GNU Guix web site.
 ;;;
@@ -18,16 +19,27 @@
 
 ;; Run 'guix build -f .guix.scm' to build the web site.
 
+(define this-directory
+  (dirname (current-filename)))
+
+;; Make sure po/LINGUAS will be found in the current working
+;; directory.
+(chdir this-directory)
+
+;; We need %linguas from the (sexp-xgettext) module.
+;; Therefore, we add its path to the load path.
+(set! %load-path (cons this-directory %load-path))
+
 (use-modules (guix) (gnu)
  (guix modules)
  (guix git-download)
  (guix gexp)
  (guix channels)
  (srfi srfi-9)
- (ice-9 match))
-
-(define this-directory
-  (dirname (current-filename)))
+ (ice-9 match)
+ (ice-9 rdelim)
+ (ice-9 regex)
+ (sexp-xgettext))
 
 (define source
   (local-file this-directory "guix-web-site"
@@ -73,9 +85,7 @@
 
   (setvbuf (current-output-port) 'line)
   (setvbuf (current-error-port) 'line)
-
   (copy-recursively #$source ".")
-
   ;; Set 'GUILE_LOAD_PATH' so that Haunt find the Guix modules and
   ;; its dependencies.  To find out the load path of Guix and its
   ;; dependencies, fetch its value over 'guix repl'.
@@ -96,24 +106,62 @@
 ":"
 (close-pipe pipe))
 
+  ;; Make the copy writable so Haunt can overwrite duplicate assets.
+  (invoke #+(file-append (specification->package "coreutils")
+ "/bin/chmod")
+  "--recursive" "u+w" ".")
+
+  ;; For translations, create MO files from PO files.
+  (for-each
+   (lambda (lingua)
+ (let* ((msgfmt #+(file-append
+  

08/09: website: Fix building with GUIX_WEB_SITE_ROOT_PATH.

[Florian Pelz]

pelzflorian pushed a commit to branch wip-i18n
in repository guix-artwork.

commit 5f98454780f4e781200fceea29a7596f7da256e8
Author: Florian Pelz 
Date:   Wed Oct 30 21:45:45 2019 +

website: Fix building with GUIX_WEB_SITE_ROOT_PATH.

* website/.guix.scm: Retain GUIX_WEB_SITE_ROOT_PATH in the build expression.
---
 website/.guix.scm | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/website/.guix.scm b/website/.guix.scm
index 9510779..a48621c 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -46,6 +46,9 @@
   #:recursive? #t
   #:select? (git-predicate this-directory)))
 
+(define root-path
+  (getenv "GUIX_WEB_SITE_ROOT_PATH"))
+
 (define (package+propagated-inputs package)
   (match (package-transitive-propagated-inputs package)
 (((labels packages) ...)
@@ -143,6 +146,10 @@
   ;; Use a sane default.
   (setenv "XDG_CACHE_HOME" "/tmp/.cache")
 
+  ;; Use GUIX_WEB_SITE_ROOT_PATH from the environment in which
+  ;; this script was run.
+  (setenv "GUIX_WEB_SITE_ROOT_PATH" #$root-path)
+
   ;; Build the website for each translation.
   (for-each
(lambda (lingua)

branch master updated (2c5dd47 -> c6d1306)

[guix-commits]

mothacehe pushed a change to branch master
in repository guix.

  from  2c5dd47   tests: lzlib: Do not fail if lzlib in not available.
   new  c6d1306   build: vm: Fix qemu-command procedure.

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

branch master updated (39c746f -> 2c5dd47)

[guix-commits]

mothacehe pushed a change to branch master
in repository guix.

  from  39c746f   gnu: bs1770gain: Update to 0.6.5.
   new  d4ddf22   system: vm: Support cross-compilation.
   new  fcc4c6a   scripts: system: Add --target option.
   new  2c5dd47   tests: lzlib: Do not fail if lzlib in not available.

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/system.scm  | 15 ---
 gnu/system/vm.scm   | 18 +-
 guix/scripts/system.scm | 15 ---
 tests/lzlib.scm |  2 +-
 4 files changed, 34 insertions(+), 16 deletions(-)

02/03: scripts: system: Add --target option.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit fcc4c6ae603c5734104f3efe13ee94341b47c5c2
Author: Mathieu Othacehe 
Date:   Sun Aug 18 13:09:05 2019 +0200

scripts: system: Add --target option.

* guix/scripts/system.scm (%options): Add target option,
(%default-options): ditto,
(process-action): Rename existing target variable to target-file and pass 
new
target variable to run-with-store procedure.
---
 guix/scripts/system.scm | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index e49c9d3..5f0dce2 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 

 ;;; Copyright © 2016 Alex Kost 
 ;;; Copyright © 2016, 2017, 2018 Chris Marusich 
-;;; Copyright © 2017 Mathieu Othacehe 
+;;; Copyright © 2017, 2019 Mathieu Othacehe 
 ;;; Copyright © 2018 Ricardo Wurmus 
 ;;; Copyright © 2019 Christopher Baines 
 ;;;
@@ -932,6 +932,8 @@ Some ACTIONS support additional ARGS.\n"))
   (display (G_ "
   --skip-checks  skip file system and initrd module safety checks"))
   (display (G_ "
+  --target=TRIPLET   cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
+  (display (G_ "
   -v, --verbosity=LEVEL  use the given verbosity LEVEL"))
   (newline)
   (display (G_ "
@@ -1004,6 +1006,10 @@ Some ACTIONS support additional ARGS.\n"))
  (lambda (opt name arg result)
(alist-cons 'system arg
(alist-delete 'system result eq?
+ (option '("target") #t #f
+ (lambda (opt name arg result)
+   (alist-cons 'target arg
+   (alist-delete 'target result eq?
  (option '(#\r "root") #t #f
  (lambda (opt name arg result)
(alist-cons 'gc-root arg result)))
@@ -1012,6 +1018,7 @@ Some ACTIONS support additional ARGS.\n"))
 (define %default-options
   ;; Alist of default option values.
   `((system . ,(%current-system))
+(target . #f)
 (substitutes? . #t)
 (offload? . #t)
 (print-build-trace? . #t)
@@ -1045,6 +1052,7 @@ resulting from command-line parsing."
 ((x . _) x)))
  (expr(assoc-ref opts 'expression))
  (system  (assoc-ref opts 'system))
+ (target  (assoc-ref opts 'target))
  (os  (ensure-operating-system
(or file expr)
(cond
@@ -1061,7 +1069,7 @@ resulting from command-line parsing."
 
  (dry?(assoc-ref opts 'dry-run?))
  (bootloader? (assoc-ref opts 'install-bootloader?))
- (target  (match args
+ (target-file (match args
 ((first second) second)
 (_ #f)))
  (bootloader-target
@@ -1103,9 +,10 @@ resulting from command-line parsing."
   (_ #f))
 opts)
  #:install-bootloader? bootloader?
- #:target target
+ #:target target-file
  #:bootloader-target bootloader-target
  #:gc-root (assoc-ref opts 'gc-root)
+#:target target
 #:system system))
 (warn-about-disk-space)))
 

01/03: system: vm: Support cross-compilation.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit d4ddf22d54f9374715c651aaebda2315e9f89272
Author: Mathieu Othacehe 
Date:   Wed Aug 21 09:19:58 2019 +0200

system: vm: Support cross-compilation.

* gnu/system.scm (system-linux-image-file-name): Add support for cross-built
systems. Remove system argument that was ignored,
(operating-system-kernel-file): adapt by removing ignored os argument.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Add target
argument and turn inputs into native-inputs. Pass target to qemu-command
and gexp->derivation calls.
(iso9660-image): Add target argument and pass it to
expression->derivation-in-linux-vm. Remove qemu from inputs as it
is not necessary.
(qemu-image): Add target argument, also remove qemu from inputs. Pass
target argument to expression->derivation-in-linux-vm call.
---
 gnu/system.scm| 15 ---
 gnu/system/vm.scm | 18 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index a353b1a..96c2b5a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -447,20 +447,21 @@ from the initrd."
   "Return the list of swap services for OS."
   (map swap-service (operating-system-swap-devices os)))
 
-(define* (system-linux-image-file-name #:optional (system (%current-system)))
+(define* (system-linux-image-file-name)
   "Return the basename of the kernel image file for SYSTEM."
   ;; FIXME: Evaluate the conditional based on the actual current system.
-  (cond
-   ((string-prefix? "arm" (%current-system)) "zImage")
-   ((string-prefix? "mips" (%current-system)) "vmlinuz")
-   ((string-prefix? "aarch64" (%current-system)) "Image")
-   (else "bzImage")))
+  (let ((target (or (%current-target-system) (%current-system
+(cond
+ ((string-prefix? "arm" target) "zImage")
+ ((string-prefix? "mips" target) "vmlinuz")
+ ((string-prefix? "aarch64" target) "Image")
+ (else "bzImage"
 
 (define (operating-system-kernel-file os)
   "Return an object representing the absolute file name of the kernel image of
 OS."
   (file-append (operating-system-kernel os)
-   "/" (system-linux-image-file-name os)))
+   "/" (system-linux-image-file-name)))
 
 (define* (operating-system-directory-base-entries os)
   "Return the basic entries of the 'system' directory of OS for use as the
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 9d4ed10..8609bd2 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -143,7 +143,7 @@
 
 (define* (expression->derivation-in-linux-vm name exp
  #:key
- (system (%current-system))
+ (system (%current-system)) target
  (linux linux-libre)
  initrd
  (qemu qemu-minimal)
@@ -214,7 +214,8 @@ made available under the /xchg CIFS share."
   (use-modules (guix build utils)
(gnu build vm))
 
-  (let* ((inputs  '#$(list qemu (canonical-package coreutils)))
+  (let* ((native-inputs
+  '#+(list qemu (canonical-package coreutils)))
  (linux   (string-append #$linux "/"
  #$(system-linux-image-file-name)))
  (initrd  #$initrd)
@@ -222,16 +223,18 @@ made available under the /xchg CIFS share."
  (graphs  '#$(match references-graphs
(((graph-files . _) ...) graph-files)
(_ #f)))
+ (target  #$(or (%current-target-system) 
(%current-system)))
  (size#$(if (eq? 'guess disk-image-size)
 #~(+ (* 70 (expt 2 20)) ;ESP
  (estimated-partition-size graphs))
 disk-image-size)))
 
-(set-path-environment-variable "PATH" '("bin") inputs)
+(set-path-environment-variable "PATH" '("bin") native-inputs)
 
 (load-in-linux-vm loader
   #:output #$output
   #:linux linux #:initrd initrd
+  #:qemu (qemu-command target)
   #:memory-size #$memory-size
   #:make-disk-image? #$make-disk-image?
   #:single-file-output? #$single-file-output?
@@ -248,6 +251,7 @@ made available under the /xchg CIFS share."
 (gexp->derivation name builder
   ;; TODO: Require the "kvm" feature.
   #:system system
+  #:target target
   

01/01: build: vm: Fix qemu-command procedure.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit c6d130630a85709fc5a5488cfd6715ec13e72399
Author: Mathieu Othacehe 
Date:   Sun Dec 1 16:46:00 2019 +0100

build: vm: Fix qemu-command procedure.

* gnu/build/vm.scm (qemu-command): When system is "armhf-linux", use "arm" 
as
qemu cpu prefix.
---
 gnu/build/vm.scm | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 6f920ae..89d685b 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -70,9 +70,10 @@
   (let ((cpu (substring system 0
 (string-index system #\-
 (string-append "qemu-system-"
-   (if (string-match "^i[3456]86$" cpu)
-   "i386"
-   cpu
+   (cond
+((string-match "^i[3456]86$" cpu) "i386")
+((string-match "armhf" cpu) "arm")
+(else cpu)
 
 (define* (load-in-linux-vm builder
#:key

03/03: tests: lzlib: Do not fail if lzlib in not available.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit 2c5dd47ceffd61d155e64dcb1764ffaea0ffd546
Author: Mathieu Othacehe 
Date:   Tue Nov 26 08:31:43 2019 +0100

tests: lzlib: Do not fail if lzlib in not available.

* tests/lzlib.scm: Use test-assert* for all test cases, so that there are no
failures if lzlib is unavailable.
---
 tests/lzlib.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lzlib.scm b/tests/lzlib.scm
index 543622b..d8d0e6e 100644
--- a/tests/lzlib.scm
+++ b/tests/lzlib.scm
@@ -108,7 +108,7 @@
 (test-assert* "Bytevector of size relative to Lzip internal buffers (1MiB+1)"
   (compress-and-decompress (random-bytevector (1+ (* 1024 1024)
 
-(test-assert "make-lzip-input-port/compressed"
+(test-assert* "make-lzip-input-port/compressed"
   (let* ((len(pk 'len (+ 10 (random 4000 %seed
  (data   (random-bytevector len))
  (compressed (make-lzip-input-port/compressed

branch master updated (5b02898 -> 39c746f)

[guix-commits]

nckx pushed a change to branch master
in repository guix.

  from  5b02898   gnu: jami: Fix wrapper.
   new  39c746f   gnu: bs1770gain: Update to 0.6.5.

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

01/01: gnu: bs1770gain: Update to 0.6.5.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 39c746f08148d5f7e84d00c8cda98ad310baa4ca
Author: Tobias Geerinckx-Rice 
Date:   Sun Dec 1 15:57:07 2019 +0100

gnu: bs1770gain: Update to 0.6.5.

* gnu/packages/audio.scm (bs1770gain): Update to 0.6.5.
[source]: Adjust snippet for upstream BS gain.
---
 gnu/packages/audio.scm | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index a84bba5..890f21f 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3195,21 +3195,23 @@ with support for HD extensions.")
 (define-public bs1770gain
   (package
 (name "bs1770gain")
-(version "0.6.0")
+(version "0.6.5")
 (source
  (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/"
version "/bs1770gain-" version ".tar.gz"))
(sha256
-(base32 "0nnqixvw3x7i22nsr54n4bgm35z9nh3d9qj5s75cfd3ajjsjndyh"))
+(base32 "15nvlh9bg0a52cpg2mii17mlzmxszwivjjalbb4np1v5nj8l5fk6"))
(modules '((guix build utils)))
(snippet
 '(begin
;; XXX
+   (substitute* (find-files "." "\\.[ch]$")
+ (("^ \\* N..o.*") ""))
(substitute* "libbg/bgx.c"
- (("#define BS.* ") "#define BS ")
- (("BS.*NO?.*N.*S.*E.*N.*SE?") "NO")
+ (("#define BG.* ") "#define BS ")
+ (("BG.*NO?.*N.*S.*E.*N.*SE?") "NO")
  (("\"( #|N).*\"") "\"\""))
(substitute* (list "config.h"
   "configure.ac"

04/09: gnu: opendht: Update to 2.0.0beta2.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 4fe8a9f2d1b0e39079ce7e885e8254bba422a52f
Author: Jan Wielkiewicz 
Date:   Sat Oct 26 01:35:09 2019 +0200

gnu: opendht: Update to 2.0.0beta2.

* gnu/packages/networking.scm (opendht): Update to 2.0.0beta2.
---
 gnu/packages/networking.scm | 28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 96fbefb..1b31314 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2574,7 +2574,7 @@ and targeted primarily for asynchronous processing of 
HTTP-requests.")
 (define-public opendht
   (package
 (name "opendht")
-(version "1.8.1")
+(version "2.0.0beta2")
 (source (origin
   (method git-fetch)
   (uri (git-reference
@@ -2583,26 +2583,36 @@ and targeted primarily for asynchronous processing of 
HTTP-requests.")
   (file-name (git-file-name name version))
   (sha256
(base32
-"0vninb5mak27wigajslyvr05vq7wbrwqhbr4wzl2nmqcb20wmlq2"
-(build-system gnu-build-system)
+"02ix0rvvyhq22gd5djcq84qz08ji7ln93faf23b27zjzni2klzv5"
+;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream 
bug?
+(build-system cmake-build-system)
 (inputs
  `(("gnutls" ,gnutls)
("nettle" ,nettle)
("readline" ,readline)
("jsoncpp" ,jsoncpp)
-   ("restbed" ,restbed)))
+   ("openssl" ,openssl)
+   ("fmt" ,fmt-restinio)))
 (propagated-inputs
- `(("argon2" ,argon2)   ; TODO: Needed for the pkg-config .pc 
file to work?
+ `(("argon2" ,argon2)  ; TODO: Needed for the pkg-config .pc file to work?
("msgpack" ,msgpack)))   ;included in several installed headers
 (native-inputs
  `(("autoconf" ,autoconf)
("pkg-config" ,pkg-config)
+   ("restinio" ,restinio)
("automake" ,automake)
-   ("libtool" ,libtool)))
+   ("libtool" ,libtool)
+   ("cppunit" ,cppunit)))
 (arguments
- `(#:configure-flags '("--disable-tools"
-   "--disable-python"
-   "--with-argon2")))
+ `(#:tests? #f  ; Tests require network connection.
+   #:configure-flags
+   '(;; "-DOPENDHT_TESTS=on"
+ "-DOPENDHT_TOOLS=off"
+ "-DOPENDHT_PYTHON=off"
+ "-DOPENDHT_PROXY_SERVER=on"
+ "-DOPENDHT_PUSH_NOTIFICATIONS=on"
+ "-DOPENDHT_PROXY_SERVER_IDENTITY=on"
+ "-DOPENDHT_PROXY_CLIENT=on")))
 (home-page "https://github.com/savoirfairelinux/opendht/;)
 (synopsis "Distributed Hash Table (DHT) library")
 (description "OpenDHT is a Distributed Hash Table (DHT) library.  It may

09/09: gnu: jami: Fix wrapper.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 5b0289870a76e18a42a236053183d57258a48826
Author: Pierre Neidhardt 
Date:   Thu Nov 14 17:57:48 2019 +0100

gnu: jami: Fix wrapper.

* gnu/packages/telephony.scm (jami)[arguments]: Wrap around jami-gnome 
instead
  of gnome-ring.
  [synopsis]: Make it more sensible.
---
 gnu/packages/telephony.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index a3bc18f..5b6c578 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -897,7 +897,7 @@ This package provides a library common to all Jami 
clients.")
("glib:bin" ,glib "bin")
("doxygen" ,doxygen)))
 (propagated-inputs
- `(("libring" ,libring) ; Contains `dring', the daemon, which 
is automatically by d-bus.
+ `(("libring" ,libring) ; Contains `dring', the daemon, which is 
automatically by d-bus.
("adwaita-icon-theme" ,adwaita-icon-theme)
("evolution-data-server" ,evolution-data-server)))
 (arguments
@@ -912,10 +912,10 @@ This package provides a library common to all Jami 
clients.")
(lambda* (#:key inputs outputs #:allow-other-keys)
  (let* ((out (assoc-ref outputs "out"))
 (path (string-append (assoc-ref inputs "sqlite") "/lib")))
-   (wrap-program (string-append out "/bin/gnome-ring")
+   (wrap-program (string-append out "/bin/jami-gnome")
  `("LD_LIBRARY_PATH" ":" prefix (,path
  #t)
-(synopsis "Distributed multimedia communications platform")
+(synopsis "Distributed, privacy-respecting communication program")
 (description "Jami (formerly GNU Ring) is a secure and distributed voice,
 video and chat communication platform that requires no centralized server and
 leaves the power of privacy in the hands of the user.  It supports the SIP and

02/09: gnu: Add sobjectizer.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 27bcdfcd65c0333abd2cd7cb412053b78eaaa70c
Author: Jan Wielkiewicz 
Date:   Tue Nov 5 15:15:31 2019 +0100

gnu: Add sobjectizer.

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

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 779b6e0..edcbf70 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2018 Ludovic Courtès 
 ;;; Copyright © 2019 Mathieu Othacehe 
 ;;; Copyright © 2019 Pierre Neidhardt 
+;;; Copyright © 2019 Jan Wielkiewicz 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -375,3 +376,34 @@ for style issues following Google’s C++ style guide.  
While Google maintains
 it's own version of the tool, this is a fork that aims to be more responsive
 and make @code{cpplint} usable in wider contexts.")
 (license license:bsd-3)))
+
+(define-public sobjectizer
+  (package
+(name "sobjectizer")
+(version "5.6.1")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/Stiffstream/sobjectizer.git;)
+ (commit (string-append "v." version
+   (sha256
+(base32 "0jfai7sqxnnjkms38krm7mssj5l79nb3pllkbyj4j581a7l5j6l5"))
+   (file-name (git-file-name name version
+(build-system cmake-build-system)
+(arguments
+ `(#:tests? #f
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'change-directory
+   (lambda _
+ (chdir "dev")
+ #t)
+(home-page "https://stiffstream.com/en/products/sobjectizer.html;)
+(synopsis "Cross-platform actor framework for C++")
+(description
+ "SObjectizer is a cross-platform \"actor frameworks\" for C++.
+SObjectizer supports not only the Actor Model but also the Publish-Subscribe
+Model and CSP-like channels.  The goal of SObjectizer is to simplify
+development of concurrent and multithreaded applications in C++.")
+(license license:bsd-3)))

06/09: gnu: jami: Update to 20191101.3.67671e7.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit de65f3f1bb5ac6c46f47f4724cd0d087511e81ac
Author: Pierre Neidhardt 
Date:   Thu Nov 14 18:03:44 2019 +0100

gnu: jami: Update to 20191101.3.67671e7.

* gnu/packages/telephony.scm (jami): Update to 20191101.3.67671e7.
---
 gnu/packages/telephony.scm | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index ce65648..e6d52bc 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -636,12 +636,12 @@ calls and messages")
 Initiation Protocol (SIP) and a multimedia framework.")
 (license license:gpl2+)))
 
-(define %jami-version "20190319.4.a16a99f")
+(define %jami-version "20191101.3.67671e7")
 
 (define* (jami-source #:key without-daemon)
   (origin
 (method url-fetch)
-(uri (string-append "http://dl.jami.net/ring-release/tarballs/ring_;
+(uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_;
 %jami-version
 ".tar.gz"))
 (modules '((guix build utils)))
@@ -652,7 +652,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
#f))
 (sha256
  (base32
-  "1c6n6sm7skw83v25g33g4jzbragz9j4przbzaz7asxw54jy33dwl"
+  "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0"
 
 (define-public pjproject-jami
   (package
@@ -699,7 +699,6 @@ Initiation Protocol (SIP) and a multimedia framework.")
;; Comes from
;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
;; WARNING: These amount for huge changes in pjproject.
-   ;; Particularly, they add support for GnuTLS.
(savoir-faire-linux-patches
 '("gnutls"
   "rfc2466"

07/09: gnu: pjproject-jami: Update to 2.9

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit fbcd60dd15a6522eadf9765b931c8058c4a09d14
Author: Pierre Neidhardt 
Date:   Thu Nov 14 18:05:43 2019 +0100

gnu: pjproject-jami: Update to 2.9

* gnu/packages/telephony.scm (pjproject-jami)[arguments]: Fix flags, make
  files writable, update patch set.
---
 gnu/packages/telephony.scm | 36 ++--
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index e6d52bc..2d6e5b2 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2018 Jovany Leandro G.C 
 ;;; Copyright © 2018 Tim Gesthuizen 
 ;;; Copyright © 2019 Pierre Neidhardt 
+;;; Copyright © 2019 Jan Wielkiewicz 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -685,14 +686,20 @@ Initiation Protocol (SIP) and a multimedia framework.")
  "--disable-openh264"
  "--disable-resample"
  "--disable-libwebrtc"
- ;; "-fPIC" is required for libring.  Bug?
- "CFLAGS=-fPIC -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 
-DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 
-DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32"
- "CXXFLAGS=-fPIC -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 
-DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 
-DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32"
- ;; Now deviating from the rules.mak file.
- "--enable-ssl=gnutls"
- "--with-external-srtp")
+ "--with-gnutls"
+ "--with-external-srtp"
+ ;; We need -fPIC or else we get the following error when linking
+ ;; against pjproject-jami:
+ ;;   relocation R_X86_64_32S against `.rodata' can not be used 
when
+ ;;   making a shared object;
+ "CFLAGS=-fPIC"
+ "CXXFLAGS=-fPIC")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+   (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
  (add-after 'unpack 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
  (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux 
patches")
@@ -700,19 +707,28 @@ Initiation Protocol (SIP) and a multimedia framework.")
;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
;; WARNING: These amount for huge changes in pjproject.
(savoir-faire-linux-patches
-'("gnutls"
+'("fix_turn_alloc_failure"
   "rfc2466"
   "ipv6"
-  "ice_config"
   "multiple_listeners"
   "pj_ice_sess"
   "fix_turn_fallback"
   "fix_ioqueue_ipv6_sendto"
   "add_dtls_transport"
-  "rfc6062")))
+  "rfc6544"
+  "ice_config"
+  "sip_config"
+  "fix_first_packet_turn_tcp"
+  "fix_ebusy_turn"
+  "ignore_ipv6_on_transport_check"
+  "fix_turn_connection_failure"
+  ;; "uwp_vs" ; for windows
+  "disable_local_resolution")))
(mkdir-p savoir-faire-linux-patches-directory)
(invoke "tar" "-xvf" (assoc-ref inputs 
"savoir-faire-linux-patches")
-   "-C" savoir-faire-linux-patches-directory 
"--strip-components=5" "ring-project/daemon/contrib/src/pjproject")
+   "-C" savoir-faire-linux-patches-directory
+   "--strip-components=5"
+   "ring-project/daemon/contrib/src/pjproject")
(for-each
 (lambda (file)
   (invoke "patch" "--force" "-p1" "-i"

05/09: gnu: pjproject: Update to 2.9.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 5dc8cad52c73c54c0669dd84b547baeac2874afc
Author: Pierre Neidhardt 
Date:   Thu Nov 14 18:03:12 2019 +0100

gnu: pjproject: Update to 2.9.

* gnu/packages/telephony.scm (pjproject): Update to 2.9.
---
 gnu/packages/telephony.scm | 35 ---
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index abb68f6..ce65648 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -553,29 +553,32 @@ calls and messages")
 (define-public pjproject
   (package
 (name "pjproject")
-(version "2.7.2")
+(version "2.9")
 (source
  (origin
-   (method url-fetch)
-   (uri (string-append
- "http://www.pjsip.org/release/; ;
- version "/" name "-" version ".tar.bz2"))
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://github.com/pjsip/pjproject.git;)
+ (commit "5dfa75be7d69047387f9b0436dd9492bbbf03fe4")))
(modules '((guix build utils)))
(snippet
 '(begin
(let ((third-party-directories
-  (list "BaseClasses" "bdsound" "bin" "g7221" "gsm"
-"ilbc" "lib" "milenage" "mp3" "speex" "srtp"
-"resample"
+  ;; Things we don't need:
+  ;; BaseClasses - contains libraries from Windows SDK
+  ;; we don't need it, at least not now.
+  (list "BaseClasses" "g7221" "ilbc" "milenage"
+"speex" "threademulation" "yuv" "bdsound"
+"gsm" "mp3" "resample" "srtp" "webrtc"
 ;; Keep only resample, build and README.txt.
 "build/baseclasses" "build/g7221" "build/gsm"
-"build/ilbc" "build/milenage" "build/samplerate"
-"build/speex" "build/srtp"
-"build/resample" "build/yuv")))
+"build/ilbc" "build/milenage" "build/resample"
+"build/samplerate" "build/speex" "build/srtp"
+"build/webrtc" "build/yuv")))
  ;; Keep only Makefiles related to resample.
- (for-each (lambda (file)
+ (for-each (lambda (directory)
  (delete-file-recursively
-  (string-append "third_party/" file)))
+  (string-append "third_party/" directory)))
third-party-directories)
  #t)
(let ((third-party-dirs
@@ -586,9 +589,10 @@ calls and messages")
 (substitute* "third_party/build/os-linux.mak"
   (((string-append "DIRS += " dirs)) "")))
   third-party-dirs
+   (file-name (git-file-name name version))
(sha256
 (base32
- "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w"
+ "1ayj6n7zd5wvd1nzj2k9s57fb4ckc2fv92k5sjvhd87yg69k3393"
 (build-system gnu-build-system)
 (inputs
  `(("portaudio" ,portaudio)))
@@ -598,6 +602,7 @@ calls and messages")
  `(("speex" ,speex)
("libsrtp" ,libsrtp)
("gnutls" ,gnutls)
+   ("resample", resample)
("util-linux" ,util-linux)))
 (native-inputs
  `(("autoconf" ,autoconf)
@@ -615,7 +620,7 @@ calls and messages")
(lambda _ (invoke "make" "dep")))
  (add-before 'patch-source-shebangs 'autoconf
(lambda _
- (invoke "autoconf" "-vfi" "-o"
+ (invoke "autoconf" "-v" "-f" "-i" "-o"
  "aconfigure" "aconfigure.ac")))
  (add-before 'autoconf 'disable-some-tests
;; Three of the six test programs fail due to missing network

01/09: gnu: Add resample.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit d83bb7973b8909add67238c1764b7ffb85afd048
Author: Jan Wielkiewicz 
Date:   Sun Oct 27 14:26:08 2019 +0100

gnu: Add resample.

* gnu/packages/audio.scm (resample): New variable.
---
 gnu/packages/audio.scm | 30 +++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index a67df12..a84bba5 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe 
 ;;; Copyright © 2019 Alexandros Theodotou 
 ;;; Copyright © 2019 Christopher Lemmer Webber 
+;;; Copyright © 2019 Jan Wielkiewicz 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2300,6 +2301,29 @@ aimed at audio/musical applications.")
  (base32
   "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr")))
 
+(define-public resample
+  (package
+(name "resample")
+(version "1.8.1")
+(source (origin
+  (method url-fetch)
+  (uri (string-append 
"https://ccrma.stanford.edu/~jos/gz/resample-;
+  version
+  ".tar.gz"))
+  (sha256 (base32
+   
"074zj8ydp05yy1hjcglfv3hkvj4cm50f9nralka1992pm6yf8yvy"
+(build-system gnu-build-system)
+(native-inputs
+ `(("autoconf" ,autoconf)
+   ("automake" ,automake)
+   ("pkg-config" ,pkg-config)
+   ("libtool" ,libtool)))
+(synopsis "Real-time library for sampling rate conversion")
+(description "The @command{resample} software package contains free
+sampling-rate conversion and filter design utilities.")
+(home-page 
"https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html;)
+(license license:lgpl2.1+)))
+
 (define-public rubberband
   (package
 (name "rubberband")
@@ -3906,8 +3930,8 @@ outputs and effect algorithms. Effects and audio objects 
can be combined in
 various ways, and their parameters can be controlled by operator objects like
 oscillators and MIDI-CCs. A versatile console mode user-interface is included
 in the package.")
-;; As an exception to the above, the C, C++ and python implementations 
-;; of the Ecasound Control Interface (ECI) are licensed under the LGPL 
-;; (see the file 'COPYING.LGPL'). This allows writing ECI applications 
+;; As an exception to the above, the C, C++ and python implementations
+;; of the Ecasound Control Interface (ECI) are licensed under the LGPL
+;; (see the file 'COPYING.LGPL'). This allows writing ECI applications
 ;; that are not licensed under GPL.
 (license (list license:gpl2 license:lgpl2.1

branch master updated (f71b0a0 -> 5b02898)

[guix-commits]

ambrevar pushed a change to branch master
in repository guix.

  from  f71b0a0   ci: Make sure the Guix checkout is the one providing 
Cuirass proc.
   new  d83bb79   gnu: Add resample.
   new  27bcdfc   gnu: Add sobjectizer.
   new  13d79b6   gnu: Add restinio.
   new  4fe8a9f   gnu: opendht: Update to 2.0.0beta2.
   new  5dc8cad   gnu: pjproject: Update to 2.9.
   new  de65f3f   gnu: jami: Update to 20191101.3.67671e7.
   new  fbcd60d   gnu: pjproject-jami: Update to 2.9
   new  a83855f   gnu: libring: Update to 20191101.
   new  5b02898   gnu: jami: Fix wrapper.

The 9 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/audio.scm  | 30 ++--
 gnu/packages/cpp.scm| 32 +
 gnu/packages/networking.scm | 79 +++-
 gnu/packages/telephony.scm  | 87 -
 4 files changed, 183 insertions(+), 45 deletions(-)

03/09: gnu: Add restinio.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit 13d79b64719a6dc76129b62a98d62eb86a422d20
Author: Pierre Neidhardt 
Date:   Thu Nov 14 18:23:00 2019 +0100

gnu: Add restinio.

* gnu/packages/networking.scm (restinio): New variable.
---
 gnu/packages/networking.scm | 51 +
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3ab5e71..96fbefb 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2019 Brice Waegeneire 
 ;;; Copyright © 2019 Tonton 
 ;;; Copyright © 2019 Alex Griffin 
+;;; Copyright © 2019 Jan Wielkiewicz 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -72,6 +73,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages dejagnu)
@@ -95,6 +97,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
@@ -2520,6 +2523,54 @@ communication over HTTP.")
   (home-page "https://github.com/Corvusoft/restbed;)
   (license license:agpl3+
 
+(define fmt-restinio
+  (package
+(inherit fmt)
+(arguments
+ '(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fPIC")
+
+(define-public restinio
+  (package
+(name "restinio")
+(version "0.6.0.1")
+(source (origin
+  (method git-fetch)
+  (uri (git-reference
+(url "https://github.com/Stiffstream/restinio.git;)
+(commit (string-append "v." version
+  (file-name (git-file-name name version))
+  (sha256
+   (base32
+"1c25kpx652nng8m1sqf5an2c3c4g3k6zj85mkkaxzk88iwfzq1s8"
+(build-system cmake-build-system)
+(inputs ; TODO: Need to force-keep references 
on some inputs, e.g. boost.
+ `(("zlib" ,zlib)
+   ("catch2" ,catch-framework2)
+   ("openssl" ,openssl)
+   ("boost" ,boost)
+   ("pcre" ,pcre)
+   ("pcre2" ,pcre2)
+   ("sobjectizer" ,sobjectizer)))
+(propagated-inputs
+ `(("asio", asio)
+   ("fmt" ,fmt-restinio)
+   ("http-parser", http-parser)))
+(arguments
+ `(#:configure-flags '("-DRESTINIO_INSTALL=on")
+   #:tests? #f ; TODO: The tests are called from the root CMakelist, need 
RESTINIO_TEST=on.
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'change-directory
+   (lambda _
+ (chdir "dev/restinio")
+ #t)
+(home-page "https://stiffstream.com/en/products/restinio.html;)
+(synopsis "C++14 library that gives you an embedded HTTP/Websocket server")
+(description "RESTinio is a header-only C++14 library that gives you an 
embedded
+HTTP/Websocket server.  It is based on standalone version of ASIO
+and targeted primarily for asynchronous processing of HTTP-requests.")
+(license license:bsd-3)))
+
 (define-public opendht
   (package
 (name "opendht")

08/09: gnu: libring: Update to 20191101.

[guix-commits]

ambrevar pushed a commit to branch master
in repository guix.

commit a83855ffad4421d5220af0b20ea0c5f71fa44f8d
Author: Pierre Neidhardt 
Date:   Thu Nov 14 18:14:25 2019 +0100

gnu: libring: Update to 20191101.

* gnu/packages/telephony.scm (libring)[inputs]: Replace restbed with 
restinio,
  add asio.
---
 gnu/packages/telephony.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 2d6e5b2..a3bc18f 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -792,8 +792,9 @@ Initiation Protocol (SIP) and a multimedia framework.")
("libsecp256k1" ,libsecp256k1)
("python" ,python)
("python-wrapper" ,python-wrapper)
-   ("restbed" ,restbed)
+   ("restinio" ,restinio)
("libx11" ,libx11)
+   ("asio" ,asio)
;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) 
version.
;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24.
("pjproject" ,pjproject-jami)))

branch master updated (db1106e -> f71b0a0)

[guix-commits]

snape pushed a change to branch master
in repository guix.

  from  db1106e   gnu: r-catools: Update to 1.17.1.3.
   new  f71b0a0   ci: Make sure the Guix checkout is the one providing 
Cuirass proc.

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:
 build-aux/hydra/gnu-system.scm | 36 ++--
 gnu/ci.scm | 22 ++
 2 files changed, 36 insertions(+), 22 deletions(-)

01/01: ci: Make sure the Guix checkout is the one providing Cuirass proc.

[guix-commits]

snape pushed a commit to branch master
in repository guix.

commit f71b0a0012d46bd30ead1a14ed58fd59647415e2
Author: Clément Lassieur 
Date:   Sun Nov 17 13:29:19 2019 +0100

ci: Make sure the Guix checkout is the one providing Cuirass proc.

Fixes .
Reported by Reza Alizadeh Majd .

* build-aux/hydra/gnu-system.scm (find-current-checkout): New procedure.
(hydra-jobs): Use FIND-CURRENT-CHECKOUT to define CHECKOUT.  Pass it to the
inferior Guix as an extra argument whose key is 'superior-guix-checkout'.
* gnu/ci.scm (find-current-checkout): New procedure.
(hydra-jobs): Use FIND-CURRENT-CHECKOUT to define CHECKOUT.  This will 
return
'#f' if the current Guix is an inferior.  In that case, use the
'superior-guix-checkout' argument provided by the superior Guix.
---
 build-aux/hydra/gnu-system.scm | 36 ++--
 gnu/ci.scm | 22 ++
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 775bbd9..f54302c 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 

 ;;; Copyright © 2017 Jan Nieuwenhuizen 
-;;; Copyright © 2018 Clément Lassieur 
+;;; Copyright © 2018, 2019 Clément Lassieur 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,16 +34,22 @@
 (setvbuf (current-error-port) _IOLBF)
 (set-current-output-port (current-error-port))
 
+(define (find-current-checkout arguments)
+  "Find the first checkout of ARGUMENTS that provided the current file.
+Return #f if no such checkout is found."
+  (let ((current-root
+ (canonicalize-path
+  (string-append (dirname (current-filename)) "/../.."
+(find (lambda (argument)
+(and=> (assq-ref argument 'file-name)
+   (lambda (name)
+ (string=? name current-root arguments)))
+
 (define (hydra-jobs store arguments)
   "Return a list of jobs where each job is a NAME/THUNK pair."
+
   (define checkout
-;; Extract metadata about the 'guix' checkout.  Its key in ARGUMENTS may
-;; vary, so pick up the first one that's neither 'subset' nor 'systems'.
-(any (match-lambda
-   ((key . value)
-(and (not (memq key '(systems subset)))
- value)))
- arguments))
+(find-current-checkout arguments))
 
   (define commit
 (assq-ref checkout 'revision))
@@ -70,9 +76,11 @@
((name . fields)
 ;; Hydra expects a thunk, so here it is.
 (cons name (lambda () fields
- (inferior-eval-with-store inferior store
-   `(lambda (store)
-  (map (match-lambda
- ((name . thunk)
-  (cons name (thunk
-   (hydra-jobs store ',arguments)))
+ (inferior-eval-with-store
+  inferior store
+  `(lambda (store)
+ (map (match-lambda
+((name . thunk)
+ (cons name (thunk
+  (hydra-jobs store '((superior-guix-checkout . ,checkout)
+  ,@arguments
diff --git a/gnu/ci.scm b/gnu/ci.scm
index f24049e..d6eb2d0 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 

 ;;; Copyright © 2017 Jan Nieuwenhuizen 
-;;; Copyright © 2018 Clément Lassieur 
+;;; Copyright © 2018, 2019 Clément Lassieur 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -374,6 +374,17 @@ valid."
  load-manifest)
 manifests
 
+(define (find-current-checkout arguments)
+  "Find the first checkout of ARGUMENTS that provided the current file.
+Return #f if no such checkout is found."
+  (let ((current-root
+ (canonicalize-path
+  (string-append (dirname (current-filename)) "/.."
+(find (lambda (argument)
+(and=> (assq-ref argument 'file-name)
+   (lambda (name)
+ (string=? name current-root arguments)))
+
 
 ;;;
 ;;; Hydra entry point.
@@ -396,13 +407,8 @@ valid."
   ((? string? str) (call-with-input-string str read
 
   (define checkout
-;; Extract metadata about the 'guix' checkout.  Its key in ARGUMENTS may
-;; vary, so pick up the first one that's neither 'subset' nor 'systems'.
-(any (match-lambda
-   ((key . value)
-(and (not (memq key '(systems subset)))
- value)))
- arguments))
+(or (find-current-checkout arguments)
+

02/07: gnu: r-vioplot: Update to 0.3.4.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 2899a9d439afe7d1d9d4b93a179f7d2bde30b39a
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:30:31 2019 +0100

gnu: r-vioplot: Update to 0.3.4.

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

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 4b256f3..0d587c3 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3466,14 +3466,14 @@ structure.")
 (define-public r-vioplot
   (package
 (name "r-vioplot")
-(version "0.3.3")
+(version "0.3.4")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "vioplot" version))
(sha256
 (base32
- "1jjrsds7p1jnnr4970h43526b9cdv3azizjbalbfzjjylc53lrca"
+ "1fsklymilspzz5fzlj7666x09aglaw0v4x0yfjjzy4vr5qpjc529"
 (build-system r-build-system)
 (propagated-inputs
  `(("r-sm" ,r-sm)

06/07: gnu: r-rvcheck: Update to 0.1.7.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 5378a1ae493737be430a29bba846784cc3336bdb
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:57:35 2019 +0100

gnu: r-rvcheck: Update to 0.1.7.

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

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0dee8a6..80040e7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9703,13 +9703,13 @@ manipulate tree data.")
 (define-public r-rvcheck
   (package
 (name "r-rvcheck")
-(version "0.1.6")
+(version "0.1.7")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "rvcheck" version))
(sha256
-(base32 "11n3qxapxcqsa0771s9q8n95kxmfyflya1d6wz4mm0lz0i6q55ia"
+(base32 "1a3xlzi4n1rqiapfa180aif7n7nws8pbg8k3nk7ccaczvmni38aw"
 (build-system r-build-system)
 (propagated-inputs
  `(("r-biocmanager" ,r-biocmanager)

branch master updated (353fb48 -> db1106e)

[guix-commits]

rekado pushed a change to branch master
in repository guix.

  from  353fb48   gnu: guile-ffi-fftw: Update to 0-2.294ad9e.
   new  7055c62   gnu: r-extremes: Update to 2.0-11.
   new  2899a9d   gnu: r-vioplot: Update to 0.3.4.
   new  670a010   gnu: r-sdmtools: Update to 1.1-221.2.
   new  3e3fd3b   gnu: r-algdesign: Update to 1.2.0.
   new  a346c93   gnu: r-insight: Update to 0.7.1.
   new  5378a1a   gnu: r-rvcheck: Update to 0.1.7.
   new  db1106e   gnu: r-catools: Update to 1.17.1.3.

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


Summary of changes:
 gnu/packages/cran.scm   | 24 
 gnu/packages/statistics.scm |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

01/07: gnu: r-extremes: Update to 2.0-11.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 7055c62ddee891c894486cf41a8818acbafed360
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:30:18 2019 +0100

gnu: r-extremes: Update to 2.0-11.

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

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7761135..4b256f3 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2246,14 +2246,14 @@ SpatialVx.")
 (define-public r-extremes
   (package
 (name "r-extremes")
-(version "2.0-10")
+(version "2.0-11")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "extRemes" version))
(sha256
 (base32
- "08fj72gpq2d6695hbm3cgwgal64z009ykrirby7g6r0akfcsx5ic"
+ "0hmgynxhzswqnhwb2sxrkczgam8c17s3vpxqc5bcz0bwczpxxyvm"
 (properties `((upstream-name . "extRemes")))
 (build-system r-build-system)
 (propagated-inputs

07/07: gnu: r-catools: Update to 1.17.1.3.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit db1106e2b5693aff5063b74d4a78eef3c0a4d900
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:57:44 2019 +0100

gnu: r-catools: Update to 1.17.1.3.

* gnu/packages/statistics.scm (r-catools): Update to 1.17.1.3.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a2ab913..b84b380 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2615,13 +2615,13 @@ vectors.")
 (define-public r-catools
   (package
 (name "r-catools")
-(version "1.17.1.2")
+(version "1.17.1.3")
 (source (origin
   (method url-fetch)
   (uri (cran-uri "caTools" version))
   (sha256
(base32
-"0svj31y7h8vimvliygmmbl7pk850qk80k1vn38mlcxsnmcpm9k39"
+"04m7vbydxb1nipday97w29p2miykyzxw572j9lda6jxmmp2kb1yp"
 (properties `((upstream-name . "caTools")))
 (build-system r-build-system)
 (propagated-inputs

05/07: gnu: r-insight: Update to 0.7.1.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit a346c93665c89d779f7f7dcfffc351e958751096
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:35:59 2019 +0100

gnu: r-insight: Update to 0.7.1.

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

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d9c676c..0dee8a6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6275,14 +6275,14 @@ other add-on packages.")
 (define-public r-insight
   (package
 (name "r-insight")
-(version "0.7.0")
+(version "0.7.1")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "insight" version))
(sha256
 (base32
- "1alxc483r3d1ydp983m2872mxd4nj3j25qv47zzgj10nbi4y32sq"
+ "0scjmr8qvwaswb9wfq2lxp1v5fl72way8cid9agrf0z1agp0adad"
 (build-system r-build-system)
 (home-page "https://easystats.github.io/insight/;)
 (synopsis "Easy access to model information for various model objects")

03/07: gnu: r-sdmtools: Update to 1.1-221.2.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 670a010161f0ac71534854e330de40cff8a7ac5b
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:30:38 2019 +0100

gnu: r-sdmtools: Update to 1.1-221.2.

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

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0d587c3..91d4f86 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3656,14 +3656,14 @@ normalizations, minimum variance matching, and so on.")
 (define-public r-sdmtools
   (package
 (name "r-sdmtools")
-(version "1.1-221.1")
+(version "1.1-221.2")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "SDMTools" version))
(sha256
 (base32
- "1fsgnlc7glawimzijp11j53g5bnfp1mdq9wb0754idmxcdi8a99q"
+ "1xvcd97ikqsfdpk2fddy3k0z1ajqga7nv9bgac9c1wnjk1gqrpgh"
 (properties `((upstream-name . "SDMTools")))
 (build-system r-build-system)
 (propagated-inputs `(("r-r-utils" ,r-r-utils)))

04/07: gnu: r-algdesign: Update to 1.2.0.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 3e3fd3b0f29f410660b778f39e50a06bf6daf35d
Author: Ricardo Wurmus 
Date:   Sun Dec 1 10:30:46 2019 +0100

gnu: r-algdesign: Update to 1.2.0.

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

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 91d4f86..d9c676c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4913,13 +4913,13 @@ the application.")
 (define-public r-algdesign
   (package
 (name "r-algdesign")
-(version "1.1-7.3.1")
+(version "1.2.0")
 (source
  (origin
(method url-fetch)
(uri (cran-uri "AlgDesign" version))
(sha256
-(base32 "1s69yx0wxi9kqj9kyib0yvd363d7g4zrz0cvz1hn97ladr8656bz"
+(base32 "0ammlg148gk0p24fh700116nd66636np0jb1wwh0axq5jphwk1pz"
 (properties `((upstream-name . "AlgDesign")))
 (build-system r-build-system)
 (home-page "https://github.com/jvbraun/AlgDesign;)

01/01: gnu: guile-ffi-fftw: Update to 0-2.294ad9e.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 353fb48f4bc5a2021120e49f0c94f7915775ca87
Author: Ricardo Wurmus 
Date:   Thu Nov 28 21:51:27 2019 +0100

gnu: guile-ffi-fftw: Update to 0-2.294ad9e.

* gnu/packages/guile-xyz.scm (guile-ffi-fftw): Update to 0-2.294ad9e.
[license]: Switch to LGPLv3+.
---
 gnu/packages/guile-xyz.scm | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e2eee47..4b18bd4 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2629,8 +2629,8 @@ clean and easy to use high level API.")
 (license license:gpl3+)))
 
 (define-public guile-ffi-fftw
-  (let ((commit "95d7ffb55860f3163c5283ecec1ef43bc3d174dd")
-(revision "1"))
+  (let ((commit "294ad9e7491dcb40026d2fec9be2af05263be1c0")
+(revision "2"))
 (package
   (name "guile-ffi-fftw")
   (version (git-version "0" revision commit))
@@ -2642,7 +2642,7 @@ clean and easy to use high level API.")
 (file-name (git-file-name "guile-ffi-fftw" version))
 (sha256
  (base32
-  "0v9vk9cr4x9gn36lihi9gfkxyiqak0i598v5li6qw8bg95004p49"
+  "08j40a5p6a8pgvhffmzb5rfdnrav2mksy3gfjkdqy93jfj1z5afg"
   (build-system guile-build-system)
   (arguments
`(#:source-directory "mod"
@@ -2668,9 +2668,7 @@ library's ‘guru interface’.  It provides two functions: 
@code{fftw-dft! rank
 sign in out} and @code{fftw-dft rank sign in}.  These bindings being minimal,
 there is no support for computing & reusing plans, or split r/i transforms, or
 anything other than straight complex DFTs.")
-  ;; TODO: This might actually be LGPLv3+
-  ;; See https://github.com/lloda/guile-ffi-fftw/issues/1
-  (license license:gpl3+
+  (license license:lgpl3+
 
 (define-public srfi-64-driver
   (package

branch master updated (7366214 -> 353fb48)

[guix-commits]

rekado pushed a change to branch master
in repository guix.

  from  7366214   gnu: perl-xml-rss: Update to 1.61.
   new  353fb48   gnu: guile-ffi-fftw: Update to 0-2.294ad9e.

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

01/02: gnu: swig: Clean up inputs.

[guix-commits]

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

commit 7ed91f8c8de0de7df992c1534a1c86219ab5ba84
Author: Efraim Flashner 
Date:   Sun Dec 1 10:31:28 2019 +0200

gnu: swig: Clean up inputs.

* gnu/packages/swig.scm (swig)[inputs]: Move perl, guile-2.0 ...
[inputs]: ... to here.
---
 gnu/packages/swig.scm | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index 90d698a..e10e30b 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès 
 ;;; Copyright © 2015 Mark H Weaver 
 ;;; Copyright © 2018 Marius Bakke 
+;;; Copyright © 2019 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,18 +61,12 @@
(("-isystem ") "-I"))
  #t)
 (native-inputs `(("boost" ,boost)
- ("pcre" ,pcre "bin")))   ;for 'pcre-config'
-(inputs `(;; Provide these to run the corresponding tests.
-  ("pcre" ,pcre)
-  ("guile" ,guile-2.0)
-  ("perl" ,perl)))
-  ;; FIXME: reactivate input python as soon as the test failures
-  ;;   fatal error: Python.h: No such file or directory
-  ;;   # include 
-  ;; are fixed.
-  ;; The python part probably never worked and does not seem to
-  ;; be needed for currently dependent packages.
-;;   ("python" ,python-wrapper)))
+ ("pcre" ,pcre "bin")   ;for 'pcre-config'
+ ;; The following are for tests and examples:
+ ("guile" ,guile-2.0)
+ ("perl" ,perl)))
+ ;;("python" ,python-wrapper)
+(inputs `(("pcre" ,pcre)))
 (home-page "http://swig.org/;)
 (synopsis
  "Interface compiler that connects C/C++ code to higher-level languages")

02/02: gnu: swig.scm: Sort module inputs alphabetically.

[guix-commits]

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

commit 60bd56c6d8368c23dcd97b26501771c82316fc8c
Author: Efraim Flashner 
Date:   Sun Dec 1 10:35:09 2019 +0200

gnu: swig.scm: Sort module inputs alphabetically.

* gnu/packages/swig.scm: Sort module inputs alphabetically.
---
 gnu/packages/swig.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index e10e30b..655c1a1 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -25,11 +25,11 @@
   #:use-module (guix licenses)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
-  #:use-module (gnu packages pcre)
-  #:use-module (gnu packages guile)
   #:use-module (gnu packages boost)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python))
 
 (define-public swig
   (package

branch core-updates updated (b7fd304 -> 60bd56c)

[guix-commits]

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

  from  b7fd304   gnu: Remove static-bash-for-bootstrap.
   new  7ed91f8   gnu: swig: Clean up inputs.
   new  60bd56c   gnu: swig.scm: Sort module inputs alphabetically.

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/swig.scm | 27 +++
 1 file changed, 11 insertions(+), 16 deletions(-)