aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rwxr-xr-xetc/guix-install.sh10
-rw-r--r--etc/news.scm56
-rwxr-xr-xetc/teams.scm19
3 files changed, 79 insertions, 6 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 72b456ee7a..82accfd5d5 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -14,6 +14,7 @@
# Copyright © 2023 Andrew Tropin <andrew@trop.in>
# Copyright © 2020 David A. Redick <david.a.redick@gmail.com>
# Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2024 Tomas Volf <~@wolfsden.cz>
#
# This file is part of GNU Guix.
#
@@ -613,6 +614,7 @@ sys_create_init_profile()
cat <<"EOF" > /etc/profile.d/zzz-guix.sh
# Explicitly initialize XDG base directory variables to ease compatibility
# with Guix System: see <https://issues.guix.gnu.org/56050#3>.
+export XCURSOR_PATH="${XCURSOR_PATH:-/usr/local/share/icons:/usr/share/icons}"
export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
@@ -633,13 +635,13 @@ export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
# GUIX_PROFILE: User's default profile and home profile
GUIX_PROFILE="$HOME/.guix-profile"
[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
-[ -L "$GUIX_PROFILE" ] || \
-GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
+[ -L "$GUIX_PROFILE" ] && \
+GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
GUIX_PROFILE="$HOME/.guix-home/profile"
[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
-[ -L "$GUIX_PROFILE" ] || \
-GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
+[ -L "$GUIX_PROFILE" ] && \
+GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH"
export GUIX_LOCPATH
diff --git a/etc/news.scm b/etc/news.scm
index 0be432f872..a511b7ffbc 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -31,6 +31,62 @@
(channel-news
(version 0)
+ (entry (commit "8d1d98a3aa3448b9d983e4bd64243a938b96e8ab")
+ (title
+ (en "@command{guix git authenticate} usage simplified")
+ (de "@command{guix git authenticate} ist leichter nutzbar")
+ (fr "@command{guix git authenticate} simplifiée"))
+ (body
+ (en "Usage of the @command{guix git authenticate} command has been
+simplified. The command is useful to channel authors and to developers
+willing to validate the provenance of their code.
+
+On your first use, @command{guix git authenticate} will now record the commit
+and signer (the @dfn{introduction}) in the @file{.git/config} file of your
+repository so that you don't have to pass them on the command line in
+subsequent runs. It will also install pre-push and post-merge hooks,
+unless preexisting hooks are found.
+
+Run @command{info \"(guix) Invoking guix authenticate\"} for more info.")
+ (de "Der Befehl @command{guix git authenticate} kann jetzt einfacher
+benutzt werden. Mit dem Befehl können Kanalautoren und Entwickler die
+Provenienz ihres Codes überprüfen.
+
+Beim ersten Gebrauch speichert @command{guix git authenticate} Commit und
+Unterzeichner (wie in der @dfn{Kanaleinführung}) in der Datei
+@file{.git/config} Ihres Repositorys, so dass Sie sie bei späteren
+Ausführungen nicht mehr auf der Befehlszeile angeben müssen. Auch werden
+Git-Hooks für pre-push und post-merge installiert, wenn es bisher keine
+Hooks dieser Art gibt.
+
+Führen Sie @command{info \"(guix.de) Aufruf von guix git authenticate\"}
+aus, wenn Sie mehr wissen wollen.")
+ (fr "L'utilisation de la commande @command{guix git authenticate} a
+été simplifiée. Cette commande est utile aux auteur·rices de canaux et aux
+développeur·euses souhaitant pouvoir valider l'origine de leur code.
+
+À la première utilisation, @command{guix git authenticate} enregistre
+désormais le commit et signataire (l'@dfn{introduction}) dans le fichier
+@file{.git/config} du dépôt, ce qui permet de ne pas avoir à les spécifier sur
+la ligne de commande les fois suivantes. La commande installe aussi des
+crochets « pre-push » et « post-merge », sauf si des crochets préexistants
+sont trouvés.
+
+Lancer @command{info \"(guix.fr) Invoquer guix git authenticate\"} pour en
+savoir plus.")))
+
+ (entry (commit "238a74c7dfd1469af064b445abcee38fd7408d5b")
+ (title
+ (en "Linux-libre 6.7 removed due to end of upstream support")
+ (de "Linux-libre 6.7 wurde entfernt"))
+ (body
+ (en "The linux-libre 6.7 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} 6.7-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 "67a3a83170c038d2eb084d3f53a7ea7b033aea74")
(title
(en "@code{nss-certs} is now included in @code{%base-packages}")
diff --git a/etc/teams.scm b/etc/teams.scm
index d537e83efc..6cf29b74cc 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -434,6 +434,16 @@ asdf-build-system."
(make-regexp* "^guix/scripts/")
(make-regexp* "^guix/store/"))))
+(define-team documentation
+ (team 'documentation
+ #:name "Documentation"
+ #:description "Documentation: the manual and cookbook."
+ #:scope (list (make-regexp* "\\.texi$")
+ "doc/build.scm"
+ "gnu/system/examples/bare-bones.tmpl"
+ "gnu/system/examples/lightweight-desktop.tmpl"
+ "gnu/system/examples/desktop.tmpl")))
+
(define-team core-packages
(team 'core-packages
#:name "Core packages"
@@ -581,7 +591,8 @@ GLib/GIO, GTK, GStreamer and Webkit."
(define-member (person "Ludovic Courtès"
"ludo@gnu.org")
- core home bootstrap core-packages installer mentors)
+ core home bootstrap core-packages installer
+ documentation mentors)
(define-member (person "Andreas Enge"
"andreas@enge.fr")
@@ -625,7 +636,7 @@ GLib/GIO, GTK, GStreamer and Webkit."
(define-member (person "Florian Pelz"
"pelzflorian@pelzflorian.de")
- translations)
+ documentation translations)
(define-member (person "Liliana Marie Prikler"
"liliana.prikler@gmail.com")
@@ -723,6 +734,10 @@ GLib/GIO, GTK, GStreamer and Webkit."
"adam.faiz@disroot.org")
games)
+(define-member (person "Matthew Trzcinski"
+ "matt@excalamus.com")
+ documentation)
+
(define (find-team name)
(or (hash-ref %teams (string->symbol name))
generated by cgit v1.2.3 (git 2.25.4) at 2024-05-15 11:39:24 +0000