diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/disarchive-manifest.scm | 21 | ||||
| -rw-r--r-- | etc/news.scm | 33 | ||||
| -rw-r--r-- | etc/system-tests.scm | 3 | ||||
| -rw-r--r-- | etc/teams.scm.in | 9 |
4 files changed, 59 insertions, 7 deletions
diff --git a/etc/disarchive-manifest.scm b/etc/disarchive-manifest.scm index 60edee8eac..93b5039eec 100644 --- a/etc/disarchive-manifest.scm +++ b/etc/disarchive-manifest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,11 +30,12 @@ (match (origin-actual-file-name origin) (#f #f) ((? string? file) - ;; As of version 0.2.1, Disarchive can only deal with raw tarballs and - ;; gzip-compressed tarballs. + ;; As of version 0.4.0, Disarchive can only deal with raw tarballs, + ;; gzip-compressed tarballs, and xz-compressed tarballs. (and (origin-hash origin) (or (string-suffix? ".tar.gz" file) (string-suffix? ".tgz" file) + (string-suffix? ".tar.xz" file) (string-suffix? ".tar" file)))))) (define (origin->disarchive origin) @@ -98,6 +99,20 @@ an empty directory if ORIGIN could not be disassembled." (directory-union "disarchive-collection" (filter-map (lambda (origin) (and (tarball-origin? origin) + + ;; Dismiss origins with (sha256 #f) such + ;; as that of IceCat. + (and=> (origin-hash origin) + content-hash-value) + + ;; FIXME: Exclude the Chromium tarball + ;; because it's huge and "disarchive + ;; disassemble" exceeds the max-silent + ;; timeout. + (not (string-prefix? + "chromium-" + (origin-actual-file-name origin))) + (origin->disarchive origin))) origins) #:copy? #t)) diff --git a/etc/news.scm b/etc/news.scm index 039a3c21ad..493685a476 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -25,6 +25,35 @@ (channel-news (version 0) + (entry (commit "a15542d26df42dabdb5e2f76d150ae200230c3b0") + (title + (en "New @option{--whole-file} option for @command{guix style}") + (de "Neue Option @option{--whole-file} für @command{guix style}") + (fr "Nouvelle option @option{--whole-file} pour @command{guix style}")) + (body + (en "The @command{guix style} command has a new @option{--whole-file} +option: instead of formatting individual package definitions, this option lets +you reformat entire Scheme files. You might want to use it to format your +operating system configuration file, for instance. + +Run @command{info \"(guix) Invoking guix style\"} for more info.") + (de "Der Befehl @command{guix style} verfügt über eine neue +Befehlszeilenoption @option{--whole-file}: Mit ihr werden keine einzelnen +Paketdefinitionen umformatiert, sondern ganze Scheme-Dateien werden in die +richtige Darstellungsform gebracht. Sie können damit zum Beispiel die +Konfigurationsdatei für Ihr Betriebssystem formatieren lassen. + +Führen Sie @command{info \"(guix.de) Aufruf von guix style\"} aus, um mehr +Informationen zu erhalten.") + (fr "La commande @command{guix style} a désormais une nouvelle option +@option{--whole-file} : au lieu de mettre en forme des définitions de paquets, +cette option permet de mettre en forme des fichiers Scheme entiers. Ça peut +s'avérer utile par exemple pour mettre en forme son fichier de configuration +du système d'exploitation. + +Lancer @command{info \"(guix.fr) Invoquer guix style\"} pour plus +d'informations."))) + (entry (commit "2ec7ab2610eb67e26dab52b671eb29e46f64ea0f") (title (en "Linux-libre kernel updated to 5.18") @@ -385,7 +414,7 @@ Bezeichnungen aus Paketeingaben entfernt werden. Wenn Sie {--styling} weglassen, passiert das Gleiche wie wenn Sie @samp{--styling=format} angeben; früher war es das Gleiche wie @samp{--styling=inputs}. -Führen Sie @command{info \"(guix) Invoking guix style\"} aus, um mehr +Führen Sie @command{info \"(guix.de) Aufruf von guix style\"} aus, um mehr Informationen zu erhalten.") (fr "La commande @command{guix style}, récemment introduite, peut désormais être utilisée pour mettre en forme des définitions de paquets @@ -872,7 +901,7 @@ das Löschen, Ersetzen, Hinzufügen von Eingaben. Um den Übergang zum „neuen Stil“ zu erleichtern, steht ein neuer Befehl @command{guix style} zur Verfügung. Führen Sie @command{info -\"(guix) Invoking guix style\"} aus, um mehr Informationen zu +\"(guix.de) Aufruf von guix style\"} aus, um mehr Informationen zu erhalten."))) (entry (commit "82daab42811a2e3c7684ebdf12af75ff0fa67b99") diff --git a/etc/system-tests.scm b/etc/system-tests.scm index cd22b7e6d3..221a63bb7f 100644 --- a/etc/system-tests.scm +++ b/etc/system-tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2018-2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,6 @@ (gnu packages package-management) (guix monads) (guix store) - ((gnu ci) #:select (channel-source->package)) ((guix git-download) #:select (git-predicate)) ((guix utils) #:select (current-source-directory)) (git) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index d8910ac54f..c99d794697 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -181,6 +181,7 @@ and the maven-build-system.")) (define-team mozilla (team 'mozilla #:name "Mozilla" + #:description "Taking care about Icecat and Icedove, built from Mozilla Firefox and Thunderbird.")) @@ -189,6 +190,10 @@ and Thunderbird.")) "bauermann@kolabnow.com") embedded-bootstrap translations) +(define-member (person "Eric Bavier" + "bavier@posteo.net") + science) + (define-member (person "Lars-Dominik Braun" "lars@6xq.net") python haskell) @@ -225,6 +230,10 @@ and Thunderbird.")) "julien@lepiller.eu") java ocaml translations) +(define-member (person "Mathieu Othacehe" + "othacehe@gnu.org") + core installer mentors) + (define-member (person "Florian Pelz" "pelzflorian@pelzflorian.de") translations) |