diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /etc | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.zip | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/news.scm | 16 | ||||
| -rw-r--r-- | etc/snippets/tempel/scheme-mode | 8 | ||||
| -rw-r--r-- | etc/teams.scm.in | 14 |
3 files changed, 33 insertions, 5 deletions
diff --git a/etc/news.scm b/etc/news.scm index 924c2b35b4..55d1218df5 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -26,6 +26,22 @@ (channel-news (version 0) + (entry (commit "0e18c5e5bcb9204c278cfc75493d3b02b746d5c3") + (title + (en "Linux-libre kernel updated to 6.2") + (de "Linux-libre-Kernel wird auf 6.2 aktualisiert") + (fr "Le noyau linux-libre est mis à jour vers la 6.2") + (pt "Kernel linux-libre atualizado para 6.2")) + (body + (en "The default version of the linux-libre kernel has been updated to + the 6.2 release series.") + (de "Der standardmäßig verwendete @code{linux-libre}-Kernel basiert + jetzt auf der 6.2-Versionsreihe.") + (fr "La version par défaut du noyau linux-libre est mise à jour + vers la série des 6.2.") + (pt "A versão padrão do kernel linux-libre foi atualizada para a + série do kernel 6.2."))) + (entry (commit "598f4c509bbfec2b983a8ee246cce0a0fe45ec7f") (title (de "Neues Format @samp{rpm} für den Befehl @command{guix pack}") diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index 54cb8e40a9..ef73a1e595 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -56,12 +56,12 @@ scheme-mode (git-reference... "(git-reference" n> "(url \"" p "\")" - n> "(commit \"" p "\"))") + n> "(commit " (p "commit") "))") (svn-reference... "(svn-reference" n> "(url \"" p "\")" - n> "(revision \"" p "\"))") + n> "(revision " (p "revision") "))") (cvs-reference... "(cvs-reference" @@ -72,12 +72,12 @@ scheme-mode (hg-reference... "(hg-reference" n> "(url \"" p "\")" - n> "(changeset \"" p "\"))") + n> "(changeset " (p "changeset") "))") (bzr-reference... "(bzr-reference" n> "(url \"" p "\")" - n> "(revision \"" p "\"))") + n> "(revision " (p "revision") "))") (:phases\ "#:phases (modify-phases %standard-phases" n> p ")") diff --git a/etc/teams.scm.in b/etc/teams.scm.in index ff913673e8..e582993450 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -436,6 +436,18 @@ importer." "Reproducible Builds tooling and issues that affect any guix packages." #:scope (list "gnu/packages/diffoscope.scm"))) +(define-team xfce + (team 'xfce + #:name "Xfce team" + #:description "Xfce desktop environment." + #:scope (list "gnu/packages/xfce.scm"))) + +(define-team lxqt + (team 'lxqt + #:name "LXQt team" + #:description "LXQt desktop environment." + #:scope (list "gnu/packages/lxqt.scm"))) + (define-member (person "Eric Bavier" "bavier@posteo.net") @@ -535,7 +547,7 @@ importer." (define-member (person "宋文武" "iyzsong@envs.net") - games localization) + games localization lxqt xfce) (define-member (person "Vagrant Cascadian" "vagrant@reproducible-builds.org") |