diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/disarchive-manifest.scm | 4 | ||||
| -rw-r--r-- | etc/git/gitconfig | 1 | ||||
| -rw-r--r-- | etc/guix-daemon.service.in | 4 | ||||
| -rw-r--r-- | etc/guix-publish.service.in | 4 | ||||
| -rw-r--r-- | etc/news.scm | 216 | ||||
| -rwxr-xr-x | etc/teams.scm | 53 | ||||
| -rw-r--r-- | etc/teams/qt/common.scm | 4 | ||||
| -rw-r--r-- | etc/teams/qt/qt-manifest.scm | 4 | ||||
| -rw-r--r-- | etc/teams/qt/qt5-manifest.scm | 4 | ||||
| -rw-r--r-- | etc/time-travel-manifest.scm | 24 |
10 files changed, 277 insertions, 41 deletions
diff --git a/etc/disarchive-manifest.scm b/etc/disarchive-manifest.scm index 41f64eae4f..3dbfa356df 100644 --- a/etc/disarchive-manifest.scm +++ b/etc/disarchive-manifest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2021-2024 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +35,8 @@ (and (origin-hash origin) (or (string-suffix? ".tar.gz" file) (string-suffix? ".tgz" file) + (string-suffix? ".tar.bz2" file) + (string-suffix? ".tbz2" file) (string-suffix? ".tar.xz" file) (string-suffix? ".tar" file)))))) diff --git a/etc/git/gitconfig b/etc/git/gitconfig index 654a630b18..9c7827ced2 100644 --- a/etc/git/gitconfig +++ b/etc/git/gitconfig @@ -20,6 +20,7 @@ [b4] attestation-check-dkim = off attestation-policy = off + shazam-am-flags = --signoff --3way linkmask = https://yhetil.org/guix/%s linktrailermask = https://yhetil.org/guix/%s midmask = https://yhetil.org/guix/%s diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 9dbc3b5678..5e75379b5e 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in @@ -9,8 +9,8 @@ Description=Build daemon for GNU Guix ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ --build-users-group=guixbuild --discover=no Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 -StandardOutput=syslog -StandardError=syslog +StandardOutput=journal +StandardError=journal # Work around a nasty systemd ‘feature’ that kills the entire process tree # (including the daemon!) if any child, such as cc1plus, runs out of memory. diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in index b8fd3b4c03..0d82e73d94 100644 --- a/etc/guix-publish.service.in +++ b/etc/guix-publish.service.in @@ -11,8 +11,8 @@ After=guix-daemon.service [Service] ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 -StandardOutput=syslog -StandardError=syslog +StandardOutput=journal +StandardError=journal # Despite the name, this is rate-limited: a broken daemon will eventually fail. Restart=always diff --git a/etc/news.scm b/etc/news.scm index 848873d675..9443475455 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,6 @@ ;; GNU Guix news, for use by 'guix pull'. ;; -;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org> +;; Copyright © 2019-2024 Ludovic Courtès <ludo@gnu.org> ;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com> ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> @@ -18,6 +18,11 @@ ;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;; Copyright © 2021, 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com> +;; Copyright © 2024 Oleg Pykhalov <go.wigust@gmail.com> +;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> +;; Copyright © 2024 Hilton Chain <hako@ultrarare.space> +;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com> +;; Copyright © 2024 Vivien Kraus <vivien@planete-kraus.eu> ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -26,6 +31,215 @@ (channel-news (version 0) + (entry (commit "523f3def65ab061a87f4fc9e6f9008e6a78fafb5") + (title + (en "GNOME updated to version 44 with a more modular desktop service") + (de "GNOME auf Version 44 aktualisiert mit modularem Dienst") + (fr "Mise à jour de GNOME en version 44 avec un service plus modulaire") + (zh "GNOME 44 更新，帶來更加模塊化的桌面服務")) + (body + (en "The @code{gnome-desktop-service-type} now differentiates between +shell, utilities, and extra-packages among other fields to bring more structure +in its configuration. + +With the update to GNOME 44, some shell extensions have been deprecated and +others removed. If any @code{gnome-shell-extension-@dots{}} package causes +an error while running your usual update routine, make sure to remove it from +your profile.") + (de "Der Dienst @code{gnome-desktop-service-type} unterscheidet nun +unter anderem zwischen den Feldern shell, utilities und extra-packages, und +bringt so etwas mehr Struktur in die Konfiguration. + +Mit dem Update zu GNOME 44 wurden einige Erweiterungen als obsolet deklariert +und andere entfernt. Falls ein Paket, dessen Name mit +@code{gnome-shell-extension-} beginnt, zu einem Fehler während Ihrer +Update-Routine führt, entfernen Sie es von Ihrem Profil.") + (fr "Le service @code{gnome-desktop-service-type} sépare +maintenant les champs @code{shell}, @code{utilities} et @code{extra- +packages} (entre autres) pour donner plus de structure à sa +configuration. + +Pendant la mise à jour vers GNOME 44, certaines extensions du shell ont +été dépréciées et d’autres supprimées. Si un paquet nommé +@code{gnome-shell-extension-@dots{}} émet une erreur quand vous +effectuez la mise à jour, vous devriez l’enlever de votre profil.") + (zh "@code{gnome-desktop-service-type} 設置新增 @code{shell}、 +@code{utilities}、@code{extra-packages} 等字段，使得 GNOME 桌面配置更加模塊化。 + +隨着 GNOME 44 更新，一些 GNOME Shell 拓展已被棄用或刪除。更新中若有關於 +@code{gnome-shell-extension-@dots{}} 軟件包的錯誤，請將對應軟件包從 profile 中 +刪除。"))) + + (entry (commit "06d01c610e3bee61e38a177aecda5982d5b338ae") + (title + (en "The GNOME Display Manager uses Wayland by default") + (de "GNOME Display Manager nutzt nun Wayland als Vorgabe") + (fr "GDM utilise Wayland par défaut") + (zh "GNOME 顯示管理器（GDM）服務默認啓用 Wayland 支持")) + (body + (en "The @code{gdm-service-type} is configured to use Wayland instead +of Xorg by default.") + (de "Der Dienst @code{gdm-service-type} verwendet nun Wayland +als Vorgabe anstelle von Xorg.") + (fr "Le service @code{gdm-service-type} est configuré par défaut pour +utiliser Wayland au lieu de Xorg.") + (zh "@code{gdm-service-type} 預設已由 Xorg 改爲 Wayland。"))) + + (entry (commit "498db4de1f09414adf68a3a383f0178434035179") + (title + (en "The udev service also manages hardware configuration files") + (de "Udev verwaltet nun auch Hardwarekonfigurationen") + (fr "Le service udev gère maintenant les configurations de matériel") + (zh "udev 服務現可管理硬件配置文件")) + (body + (en "The @code{udev-service-type} can now be configured and extended +with eudev hardware configuration files (named @dfn{hwdb} by the eudev +project).") + (de "Der Udev-Dienst kann nun mit Hardwaredatenbanken (auch als +@dfn{hwdb} bekannt) konfiguriert und erweitert werden.") + (fr "Le type de service @code{udev-service-type} peut maintenant être +configuré et étendu avec des fichiers de configuration de matériel (appelés +@dfn{hwdb} par le projet eudev).") + (zh "現可使用 eudev 的硬件配置文件（@dfn{hwdb}）設置及拓展 +@code{udev-service-type}。"))) + + (entry (commit "ff1251de0bc327ec478fc66a562430fbf35aef42") + (title + (en "Daemon vulnerability allowing store corruption has been fixed") + (de "Schwachstelle im Daemon behoben, durch die der Store verfälscht werden konnte") + (fr "Une faille du démon permettant de corrompre le dépôt a été corrigée")) + (body + (en "A vulnerability in the build daemon, @command{guix-daemon}, was +identified and fixed. The vulnerability would allow unprivileged users to +corrupt the result of @dfn{fixed-output derivations} such as source code +tarballs and Git checkouts, which in turn could lead to local privilege +escalation. + +This bug is fixed and Guix System users are advised to upgrade their system, +with a command along the lines of: + +@example +sudo guix system reconfigure /run/current-system/configuration.scm +sudo herd restart guix-daemon +@end example + +If you are using Guix on another distro, run @command{info \"(guix) Upgrading +Guix\"} or visit +@uref{https://guix.gnu.org/manual/devel/en/html_node/Upgrading-Guix.html} to +learn how to upgrade Guix. + +See @uref{https://issues.guix.gnu.org/69728} for more information on this +issue.") + (de "Eine Sicherheitslücke im Erstellungs-Daemon, +@command{guix-daemon}, wurde gefunden und geschlossen. Sie hatte es +unprivilegierten Nutzern ermöglicht, das Ergebnis einer @dfn{Ableitung mit +fester Ausgabe}, wie Quellcode-Tarballs und Git-Checkouts, zu manipulieren. +So war eine lokale Rechteausweitung möglich. + +Der Fehler ist behoben und wir raten Nutzern von Guix System, ihr System zu +aktualisieren mit einem Befehl wie: + +@example +sudo guix system reconfigure /run/current-system/configuration.scm +sudo herd restart guix-daemon +@end example + +Wenn Sie Guix auf einer anderen Distribution verwenden, erfahren Sie mit dem +Befehl @command{info \"(guix.de) Aktualisieren von Guix\"} oder auf +@uref{https://guix.gnu.org/manual/devel/de/html_node/Aktualisieren-von-Guix.html}, +wie Sie Guix aktualisieren. + +Siehe @uref{https://issues.guix.gnu.org/69728} für mehr Informationen zu dem +Fehler.") + (fr "Une faille de sécurité du démon de compilation, +@command{guix-daemon}, a été identifiée et corrigée. La faille permettait à +un·e utilisateur·rice sans privilège de corrompre le résultat d'une +@dfn{dérivation à sortie fixe} telle qu'une archive ou un @i{checkout} Git, ce +qui peut ensuite permettre une élévation locale de privilèges. + +Ce problème est corrigé et les utilisateur·rices de Guix System sont invité·es +à mettre à jour leur système avec une commande telle que : + +@example +sudo guix system reconfigure /run/current-system/configuration.scm +sudo herd restart guix-daemon +@end example + +Pour voir comment mettre à jour Guix sur une autre distribution, lancer +@command{info \"(guix.fr) Mettre à niveau Guix\"} ou visiter +@uref{https://guix.gnu.org/manual/devel/fr/html_node/Mettre-a-niveau-Guix.html}. + +Voir @uref{https://issues.guix.gnu.org/69728} pour plus d'informations sur +cette anomalie."))) + + (entry (commit "10a193596368443f441077525ebbddf787d91e4b") + (title + (en "Linux-libre 4.14 removed due to end of upstream support") + (de "Linux-libre 4.14 wurde entfernt")) + (body + (en "The linux-libre 4.14 kernel series has reached the end of + its life, and is no longer supported upstream. For this + reason, it has been removed from GNU Guix.") + (de "Die @code{linux-libre} 4.14-Versionsreihe hat ihr +Supportende erreicht und wird nicht mehr unterstützt („end of life“). Daher ist die +Versionsreihe aus GNU Guix entfernt worden."))) + + (entry (commit "519e1e3eb88ec532fc83ebb742d9919269b57c87") + (title + (de "Neue Option @samp{--max-layers=N} für den Befehl @command{guix pack}") + (en "New @samp{--max-layers=N} option for the @command{guix pack} command") + (ru "Новая опция @samp{--max-layers=N} для @command{guix pack} команды")) + (body + (de "Sie können jetzt auch mehrschichtige Docker-Abbilder mit dem Befehl +@command{guix pack --format=docker --max-layers=N} erzeugen. Damit bekommen Sie ein +Docker-Abbild, bei dem Store-Pfade auf getrennten Schichten („Layer“) +untergebracht sind, die sich mehrere Abbilder teilen können. Das Abbild wird +im Store als gzip-komprimierter Tarball erzeugt. Hier ist ein einfaches +Beispiel, wo ein mehrschichtiges Docker-Abbild für das Paket @code{hello} +angelegt wird: + +@example +guix pack --format=docker --max-layers=N --symlink=/usr/bin/hello=bin/hello hello +@end example + +@command{guix system image} kann jetzt geschichtete Docker-Abbilder erzeugen, +indem Sie @code{--max-layers=N} übergeben. + +Siehe @command{info \"(guix.de) Aufruf von guix pack\"} und +@command{info \"(guix.de) Systemabbilder\"} für weitere Informationen.") + (en "Docker layered images can now be produced via the @command{guix +pack --format=docker --max-layers=N} command, providing a Docker image with +many of the store paths being on their own layer to improve sharing between +images. The image is realized into the GNU store as a gzipped tarball. Here +is a simple example that generates a layered Docker image for the @code{hello} +package: + +@example +guix pack --format=docker --max-layers=N --symlink=/usr/bin/hello=bin/hello hello +@end example + +The @command{guix system image} can now produce layered Docker image by passing +@code{--max-layers=N}. + +See @command{info \"(guix) Invoking guix pack\"} and +@command{info \"(guix) System Images\"} for more information.") + (ru "Появилась команда создания многослойных Docker образов с помощью +@command{guix pack --format=docker --max-layers=N}, которая соберет Docker образ с +путями в store расположенными на отдельных слоях, ускоряя таким образом +передачу образов. Образ будет создан в GNU store в качестве gzipped tarball. + +Пример создания Docker layered образ с @code{hello} пакетом: +@example +guix pack --format=docker --max-layers=N --symlink=/usr/bin/hello=bin/hello hello +@end example + +@command{guix system image} теперь может создавать layered Docker образ путем +указания опции @option{--max-layers=N}. + +Смотрите @command{info \"(guix) Invoking guix pack\"} и +@command{info \"(guix) System Images\"} для получения более детальных +сведений."))) + (entry (commit "953c65ffdd43c02c934518fb7a1c68542584b223") (title (en "Declarative offloading on Guix System and childhurds") diff --git a/etc/teams.scm b/etc/teams.scm index 98f51c13e1..570793b539 100755 --- a/etc/teams.scm +++ b/etc/teams.scm @@ -8,7 +8,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@" !# ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2022-2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com> @@ -176,6 +176,13 @@ and the r-build-system." "guix/scripts/import/cran.scm" "tests/cran.scm"))) +(define-team sugar + (team 'sugar + #:name "Sugar team" + #:description + "Everything related to the Sugar Desktop and learning environment." + #:scope (list "gnu/packages/sugar.scm"))) + (define-team telephony (team 'telephony #:name "Telephony team" @@ -299,10 +306,12 @@ asdf-build-system." (define-team go (team 'go #:name "Go team" - #:scope (list "gnu/packages/golang.scm" - "gnu/packages/golang-check.scm" - "guix/build/go-build-system.scm" + #:scope (list "gnu/packages/configuration-management.scm" + "gnu/packages/golang(-.+|)\\.scm$" + "gnu/packages/syncthing.scm" + "gnu/packages/terraform.scm" "guix/build-system/go.scm" + "guix/build/go-build-system.scm" "guix/import/go.scm" "guix/scripts/import/go.scm" "tests/go.scm"))) @@ -495,7 +504,8 @@ asdf-build-system." and Thunderbird." #:scope (list "gnu/build/icecat-extension.scm" "gnu/packages/browser-extensions.scm" - "gnu/packages/gnuzilla.scm"))) + "gnu/packages/gnuzilla.scm" + "gnu/packages/tor-browsers.scm"))) (define-team racket (team 'racket @@ -539,8 +549,7 @@ GLib/GIO, GTK, GStreamer and Webkit." (team 'lxqt #:name "LXQt team" #:description "LXQt desktop environment." - #:scope (list "gnu/packages/lxqt.scm" - "gnu/packages/qt.scm"))) + #:scope (list "gnu/packages/lxqt.scm"))) (define-team audio (team 'audio @@ -578,6 +587,10 @@ GLib/GIO, GTK, GStreamer and Webkit." "andreas@enge.fr") lxqt science tex) +(define-member (person "Tanguy Le Carrour" + "tanguy@bioneland.org") + python home) + (define-member (person "Tobias Geerinckx-Rice" "me@tobias.gr") core kernel mentors) @@ -592,7 +605,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) (define-member (person "jgart" "jgart@dismail.de") @@ -624,7 +637,7 @@ GLib/GIO, GTK, GStreamer and Webkit." (define-member (person "Ricardo Wurmus" "rekado@elephly.net") - r core mentors tex) + core mentors r sugar tex) (define-member (person "Christopher Baines" "guix@cbaines.net") @@ -656,7 +669,7 @@ GLib/GIO, GTK, GStreamer and Webkit." (define-member (person "宋文武" "iyzsong@envs.net") - games localization lxqt xfce) + games localization lxqt qt xfce) (define-member (person "Vagrant Cascadian" "vagrant@debian.org") @@ -698,6 +711,26 @@ GLib/GIO, GTK, GStreamer and Webkit." "clement@lassieur.org") mozilla) +(define-member (person "Sharlatan Hellseher" + "sharlatanus@gmail.com") + go lisp python science) + +(define-member (person "Vivien Kraus" + "vivien@planete-kraus.eu") + gnome) + +(define-member (person "Wilko Meyer" + "w@wmeyer.eu") + kernel) + +(define-member (person "Mark H Weaver" + "mhw@netris.org") + mozilla) + +(define-member (person "Adam Faiz" + "adam.faiz@disroot.org") + games) + (define (find-team name) (or (hash-ref %teams (string->symbol name)) diff --git a/etc/teams/qt/common.scm b/etc/teams/qt/common.scm index 8e11ac220b..4735b408d0 100644 --- a/etc/teams/qt/common.scm +++ b/etc/teams/qt/common.scm @@ -16,10 +16,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest of packages related to linux-libre. -;;; Simplistically, it selects packages whose names begin with "linux-libre". -;;; It is used to assist continuous integration of the kernel packages. - (use-modules (guix packages) (guix profiles) (guix utils) diff --git a/etc/teams/qt/qt-manifest.scm b/etc/teams/qt/qt-manifest.scm index 0d8fa95bfe..22078530a7 100644 --- a/etc/teams/qt/qt-manifest.scm +++ b/etc/teams/qt/qt-manifest.scm @@ -16,10 +16,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest of packages related to linux-libre. -;;; Simplistically, it selects packages whose names begin with "linux-libre". -;;; It is used to assist continuous integration of the kernel packages. - (load "common.scm") ;;; Commentary: diff --git a/etc/teams/qt/qt5-manifest.scm b/etc/teams/qt/qt5-manifest.scm index 34fdf479bf..2b25888d4b 100644 --- a/etc/teams/qt/qt5-manifest.scm +++ b/etc/teams/qt/qt5-manifest.scm @@ -16,10 +16,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest of packages related to linux-libre. -;;; Simplistically, it selects packages whose names begin with "linux-libre". -;;; It is used to assist continuous integration of the kernel packages. - (load "common.scm") ;;; Commentary: diff --git a/etc/time-travel-manifest.scm b/etc/time-travel-manifest.scm index 80c4c7c346..039ca89889 100644 --- a/etc/time-travel-manifest.scm +++ b/etc/time-travel-manifest.scm @@ -66,21 +66,19 @@ (define %release-commits ;; Release commits: the list of version/commit pairs. + ;; + ;; Note: To merely compute the derivation of these revisions, we need to be + ;; able to build their dependencies. Some of them no longer build from + ;; source due to time traps like <https://issues.guix.gnu.org/58650>; those + ;; need to be built beforehand in a virtual build machine running "in the + ;; past". '(("1.4.0" . "8e2f32cee982d42a79e53fc1e9aa7b8ff0514714") ("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff") - - ;; FIXME: To merely compute the derivation of these revisions, we need to - ;; be able to build their dependencies. However, pre-built binaries are - ;; currently missing and some of these no longer build from source due to - ;; time bombs like <https://issues.guix.gnu.org/58650>. Thus, comment - ;; them output until we have substitutes for these old things. - - ;; ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") - ;; ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2") - ;; ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") - ;; ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") - ;; ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") - )) + ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") + ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2") + ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") + ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") + ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c"))) (manifest (map (match-lambda |