Merge branch 'master' into gnome-team

5 files changed, 114 insertions, 30 deletions

diff --git a/etc/git/gitconfig b/etc/git/gitconfig
index 831fbce6e7..907ad01804 100644
--- a/etc/git/gitconfig
+++ b/etc/git/gitconfig
@@ -1,6 +1,3 @@
-[commit]
-        gpgsign = true
-
 [diff "scheme"]
 	xfuncname = "^(\\(define.*)$"
 
diff --git a/etc/guix-daemon.cil.in b/etc/guix-daemon.cil.in
index f55ef226c1..b221e31094 100644
--- a/etc/guix-daemon.cil.in
+++ b/etc/guix-daemon.cil.in
@@ -176,6 +176,11 @@
                 execute_no_trans read write open entrypoint map
                 getattr link unlink)))
 
+  ;; Remounting /gnu/store read-write.
+  (allow guix_daemon_t
+         fs_t
+         (filesystem (remount)))
+
   ;; TODO: unknown
   (allow guix_daemon_t
          root_t
@@ -223,6 +228,9 @@
   (allow guix_daemon_t
          tmpfs_t
          (file (create open read unlink write)))
+  (allow guix_daemon_t                          ;same as above, but with tmp_t
+         tmp_t
+         (file (create open read unlink write)))
   (allow guix_daemon_t
          tmpfs_t
          (dir (getattr add_name remove_name write)))
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index e81da7ae71..5012db55dd 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -606,6 +606,19 @@ fi
     _msg "${PAS}Bash shell prompt successfully customized for Guix"
 }
 
+sys_maybe_setup_selinux()
+{
+    if [ -f /sys/fs/selinux/policy ]
+    then
+	prompt_yes_no "Install SELinux policy required to run guix-daemon?" \
+	    || return
+
+	local var_guix=/var/guix/profiles/per-user/root/current-guix
+	semodule -i "${var_guix}/share/selinux/guix-daemon.cil"
+	restorecon -R /gnu /var/guix
+    fi
+}
+
 welcome()
 {
     local char
@@ -681,6 +694,7 @@ main()
 
     sys_create_store "${GUIX_BINARY_FILE_NAME}" "${tmp_path}"
     sys_create_build_user
+    sys_maybe_setup_selinux
     sys_enable_guix_daemon
     sys_authorize_build_farms
     sys_create_init_profile
diff --git a/etc/news.scm b/etc/news.scm
index f5dc3ca0d5..314f0ab352 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -26,6 +26,50 @@
 (channel-news
  (version 0)
 
+ (entry (commit "ba5da5125a81307500982517e2f458d57b024668")
+        (title
+         (en "New @code{arguments} rule for @command{guix style}")
+         (de "Neue Stilregel @code{arguments} für @command{guix style}")
+         (fr "Nouvelle règle @code{arguments} pour @command{guix style}"))
+        (body
+         (en "The @command{guix style} command has a new @dfn{styling rule}
+for package definitions.  Package writers may now run the following command:
+
+@example
+guix style -L /path/to/channel -S arguments @var{package}
+@end example
+
+This command rewrites the @code{arguments} field of @var{package} so that it
+uses G-expressions instead of classical quasiquotation.
+
+Run @command{info \"(guix) Invoking guix style\"} for more info.")
+         (de "Der Befehl @command{guix style} verfügt über eine neue @dfn{Stilregel}
+für Paketdefinitionen.  Paketautoren können jetzt folgenden Befehl benutzen:
+
+@example
+guix style -L /pfad/zum/kanal -S arguments @var{Paket}
+@end example
+
+Dadurch wird das Feld @code{arguments} in @var{Paket} so umgeschrieben, dass
+G-Ausdrücke (gexps) anstelle von klassischer Quasiquotierung verwendet
+werden.
+
+Führen Sie @command{info \"(guix.de) Aufruf von guix style\"} aus, um
+mehr Informationen zu erhalten.")
+         (fr "La commande @command{guix style} a une nouvelle @dfn{règle de
+style} pour les définitions de paquets.  Les auteurices de paquets peuvent
+maintenant lancer la commande suivante :
+
+@example
+guix style -L /chemin/vers/canal -S arguments @var{paquet}
+@end example
+
+Cette commande réécrit le champ @code{arguments} de @var{paquet} pour qu'il
+utilise des G-expressions plutôt que des quasicitations classiques.
+
+Lancer @command{info \"(guix.fr) Invoquer guix style\"} pour plus
+d'informations.")))
+
  (entry (commit "ae11fcb84ac478dfa56d322ef08890645183a087")
         (title
          (en "New @option{--with-configure-flag} transformation option")
@@ -39,7 +83,7 @@ the build system of the @code{lapack} package:
 
 @example
 guix build lapack \\
-  --with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
+  --with-configure-flag=lapack=-DBUILD_SHARED_LIBS=OFF
 @end example
 
 Run @command{info \"(guix) Package Transformation Options\"} for more info.")
@@ -50,7 +94,7 @@ Befehlszeilenoption für configure mitzugeben.  Zum Beispiel können Sie dem
 
 @example
 guix build lapack \\
-  --with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
+  --with-configure-flag=lapack=-DBUILD_SHARED_LIBS=OFF
 @end example
 
 Führen Sie für mehr Informationen @command{info \"(guix.de)
@@ -63,7 +107,7 @@ un drapeau à @command{cmake}, le système de construction du logiciel
 
 @example
 guix build lapack \\
-  --with-configure-flag=lapack=-DBUILD_COMPLEX=OFF
+  --with-configure-flag=lapack=-DBUILD_SHARED_LIBS=OFF
 @end example
 
 Voir @command{info \"(guix.fr) Options de transformation de paquets\"} pour
diff --git a/etc/teams.scm.in b/etc/teams.scm.in
index d21f1ff67b..1e8ea95966 100644
--- a/etc/teams.scm.in
+++ b/etc/teams.scm.in
@@ -208,7 +208,7 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
         #:scope (list "gnu/packages/algebra.scm"
                       "gnu/packages/astronomy.scm"
                       "gnu/packages/geo.scm"
-                      "gnu/packages/chemestry.scm"
+                      "gnu/packages/chemistry.scm"
                       "gnu/packages/maths.scm")))
 
 (define-team emacs
@@ -255,9 +255,16 @@ asdf-build-system."
                       "guix/scripts/import/go.scm"
                       "tests/go.scm")))
 
-(define-team embedded-bootstrap
-  (team 'embedded-bootstrap
-        #:name "Embedded / Bootstrap"))
+(define-team bootstrap
+  (team 'bootstrap
+        #:name "Bootstrap"
+        #:scope (list "gnu/packages/mes.scm")))
+
+(define-team embedded
+  (team 'embedded
+        #:name "Embedded"
+        #:scope (list "gnu/packages/bootloaders.scm"
+                      "gnu/packages/firmware.scm")))
 
 (define-team rust
   (team 'rust
@@ -480,7 +487,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
 
 (define-member (person "Ludovic Courtès"
                        "ludo@gnu.org")
-  core home embedded-bootstrap mentors)
+  core home embedded bootstrap mentors)
 
 (define-member (person "Andreas Enge"
                        "andreas@enge.fr")
@@ -500,7 +507,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
 
 (define-member (person "Efraim Flashner"
                        "efraim@flashner.co.il")
-  embedded-bootstrap julia rust science)
+  embedded bootstrap julia rust science)
 
 (define-member (person "jgart"
                        "jgart@dismail.de")
@@ -567,6 +574,10 @@ GLib/GIO, GTK, GStreamer and Webkit."
   games localization lxqt xfce)
 
 (define-member (person "Vagrant Cascadian"
+                       "vagrant@debian.org")
+  embedded)
+
+(define-member (person "Vagrant Cascadian"
                        "vagrant@reproducible-builds.org")
   reproduciblebuilds)
 
@@ -605,24 +616,32 @@ of file names as string."
 (define (cc . teams)
   "Return arguments for `git send-email' to notify the members of the given
 TEAMS when a patch is received by Debbugs."
-  (format #true
-          "~{--add-header=\"X-Debbugs-Cc: ~a\"~^ ~}"
-          (map person-email
-               (delete-duplicates (append-map team-members teams) equal?))))
+  (let ((members (append-map team-members teams)))
+    (unless (null? members)
+      (format #true "--add-header=\"X-Debbugs-Cc: ~{~a~^, ~}\""
+              (map person-email (sort-members members))))))
+
+(define (sort-members members)
+  "Deduplicate and sort MEMBERS alphabetically by their name."
+  (sort (delete-duplicates members equal?)
+        (lambda (m1 m2)
+          (string<? (person-name m1) (person-name m2)))))
+
+(define (member->string member)
+  "Return the 'email <name>' string representation of MEMBER."
+  (let* ((name (person-name member))
+         (quoted-name/maybe (if (string-contains name ",")
+                                (string-append "\"" name "\"")
+                                name)))
+    (format #false "~a <~a>" quoted-name/maybe (person-email member))))
 
 (define* (list-members team #:optional port (prefix ""))
   "Print the members of the given TEAM."
   (define port* (or port (current-output-port)))
   (for-each
    (lambda (member)
-     (format port*
-             "~a~a <~a>~%"
-             prefix
-             (person-name member)
-             (person-email member)))
-   (sort
-    (team-members team)
-    (lambda (m1 m2) (string<? (person-name m1) (person-name m2))))))
+     (format port* "~a~a~%" prefix (member->string member)))
+   (sort-members (team-members team))))
 
 (define (list-teams)
   "Print all teams, their scope and their members."
@@ -716,13 +735,15 @@ and REV-END, two git revision strings."
      (apply cc (find-team-by-scope
                 (diff-revisions rev-start rev-end))))
     (("cc-members-header-cmd" patch-file)
-     (for-each (lambda (team-name)
-                 (list-members (find-team team-name) (current-output-port)
-                               "X-Debbugs-Cc: "))
-               (patch->teams patch-file)))
+     (let* ((teams (map find-team (patch->teams patch-file)))
+            (members (sort-members (append-map team-members teams))))
+       (unless (null? members)
+         (format #true "X-Debbugs-Cc: ~{~a~^, ~}"
+                 (map member->string members)))))
     (("cc-mentors-header-cmd" patch-file)
-     (list-members (find-team "mentors") (current-output-port)
-                   "X-Debbugs-Cc: "))
+     (format #true "X-Debbugs-Cc: ~{~a~^, ~}"
+             (map member->string
+                  (sort-members (team-members (find-team "mentors"))))))
     (("get-maintainer" patch-file)
      (apply main "list-members" (patch->teams patch-file)))
     (("list-teams" . args)