From 32404757a1214bce9d4bc60f4caeb6e5bf7ec98a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 13 Feb 2023 10:17:28 +0100 Subject: etc: Add TeX team. * etc/teams.scm.in (tex): New team; add Ricardo to the team. --- etc/teams.scm.in | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 77c0127bb2..ff913673e8 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -3,7 +3,7 @@ !# ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Ricardo Wurmus +;;; Copyright © 2022, 2023 Ricardo Wurmus ;;; Copyright © 2022 Mathieu Othacehe ;;; Copyright © 2022 Maxim Cournoyer ;;; @@ -142,6 +142,19 @@ (define-team r "guix/scripts/import/cran.scm" "tests/cran.scm"))) +(define-team tex + (team 'tex + #:name "TeX team" + #:description + "TeX, LaTeX, XeLaTeX, LuaTeX, TeXLive, the texlive-build-system, and +the \"texlive\" importer." + #:scope (list "gnu/packages/tex.scm" + "guix/build/texlive-build-system.scm" + "guix/build-system/texlive.scm" + "guix/import/texlive.scm" + "guix/scripts/import/texlive.scm" + "tests/texlive.scm"))) + (define-team julia (team 'julia #:name "Julia team" @@ -490,7 +503,7 @@ (define-member (person "Liliana Marie Prikler" (define-member (person "Ricardo Wurmus" "rekado@elephly.net") - r core mentors) + r core mentors tex) (define-member (person "Christopher Baines" "mail@cbaines.net") -- cgit v1.2.3 From 23d56ba150ddeaa58e96b3ecf9df251fbd05ed00 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 14 Dec 2022 10:31:52 -0500 Subject: guix-install.sh: Add GUIX_ALLOW_OVERWRITE environment variable. The need for this use case appeared when attempting to install Guix on a truly minimal image made with Buildroot, which lacked enough GNU components that I had to extract a guix pack to /gnu before attempting installation, which would then refuse to proceed because of the existing /gnu. * etc/guix-install.sh: Document environment variables. (sys_create_store) [GUIX_ALLOW_OVERWRITE]: Skip pre-existing installation checks and output a warning. Extract the tarball directly to /. --- etc/guix-install.sh | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 3ce9affc06..ea10f35250 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -29,6 +29,22 @@ # We require Bash but for portability we'd rather not use /bin/bash or # /usr/bin/env in the shebang, hence this hack. + +# Environment variables +# +# GUIX_BINARY_FILE_NAME +# +# Can be used to override the automatic download mechanism and point +# to a local Guix binary archive filename like +# "/tmp/guix-binary-1.4.0rc2.armhf-linux.tar.xz" +# +# GUIX_ALLOW_OVERWRITE +# +# Instead of aborting to avoid overwriting a previous installations, +# allow copying over /var/guix or /gnu. This can be useful when the +# installation required the user to extract Guix packs under /gnu to +# satisfy its dependencies. + if [ "x$BASH_VERSION" = "x" ] then exec bash "$0" "$@" @@ -336,16 +352,15 @@ sys_create_store() _debug "--- [ ${FUNCNAME[0]} ] ---" - if [[ -e "/var/guix" || -e "/gnu" ]]; then + if [[ -z $GUIX_ALLOW_OVERWRITE && (-e /var/guix || -e /gnu) ]]; then die "A previous Guix installation was found. Refusing to overwrite." + else + _msg "${WAR}Overwriting existing installation!" fi cd "$tmp_path" - tar --extract --file "$pkg" && _msg "${PAS}unpacked archive" - _msg "${INF}Installing /var/guix and /gnu..." - mv "${tmp_path}/var/guix" /var/ - mv "${tmp_path}/gnu" / + tar --extract --file "$pkg" -C / _msg "${INF}Linking the root user's profile" mkdir -p ~root/.config/guix -- cgit v1.2.3 From 633ead4afc78cfe65d9c8e629a4af4a80d969eb4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 02:10:58 +0100 Subject: etc: Add a news entry snippet. * etc/snippets/yas/scheme-mode/guix-news-entry: New file. --- etc/snippets/yas/scheme-mode/guix-news-entry | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 etc/snippets/yas/scheme-mode/guix-news-entry (limited to 'etc') diff --git a/etc/snippets/yas/scheme-mode/guix-news-entry b/etc/snippets/yas/scheme-mode/guix-news-entry new file mode 100644 index 0000000000..7f5bb21c50 --- /dev/null +++ b/etc/snippets/yas/scheme-mode/guix-news-entry @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: guix-news-entry +# key: entry... +# -- +(entry (commit "$1") + (title + (en "$2")) + (body + (en "$3"))) -- cgit v1.2.3 From cc0cdf51f71c5455d781cd25842587731a83e414 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Feb 2023 02:15:32 +0100 Subject: news: Add entry for the new 'rpm' guix pack format. * etc/news.scm: Add entry. --- etc/news.scm | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/news.scm b/etc/news.scm index 211a176170..459f3ef352 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -4,12 +4,12 @@ ;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas ;; Copyright © 2019, 2020 Konrad Hinsen -;; Copyright © 2019, 2020, 2021 Julien Lepiller +;; Copyright © 2019, 2020, 2021, 2023 Julien Lepiller ;; Copyright © 2019–2023 Florian Pelz ;; Copyright © 2020, 2022 Marius Bakke ;; Copyright © 2020, 2021 Mathieu Othacehe ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen -;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;; Copyright © 2021 Leo Famulari ;; Copyright © 2021 Zhu Zihao ;; Copyright © 2021 Chris Marusich @@ -26,6 +26,47 @@ (channel-news (version 0) + (entry (commit "63622d2a234b707be5df07d8290a81b3247947e7") + (title + (de "Neues Format @samp{rpm} für den Befehl @command{guix pack}") + (en "New @samp{rpm} format for the @command{guix pack} command") + (fr "Nouveau format @samp{rpm} pour la commande @command{guix pack}")) + (body + (de "Sie können jetzt auch RPM-Archive (mit der Dateinamenserweiterung +.rpm) erzeugen mit dem Befehl @command{guix pack --format=rpm}. Damit +haben Sie einen alternativen Distributionsweg für mit Guix erstellte +Software. Hier sehen Sie ein einfaches Beispiel, wie Sie ein +RPM-Archiv für das Paket @code{hello} erzeugen: + +@example +guix pack --format=rpm --symlink=/usr/bin/hello=bin/hello hello +@end example + +Siehe @command{info \"(guix.de) Aufruf von guix pack\"} für mehr +Informationen.") + (en "RPM archives (with the .rpm file extension) can now be produced +via the @command{guix pack --format=rpm} command, providing an alternative +distribution path for software built with Guix. Here is a simple example that +generates an RPM archive for the @code{hello} package: + +@example +guix pack --format=rpm --symlink=/usr/bin/hello=bin/hello hello +@end example + +See @command{info \"(guix) Invoking guix pack\"} for more information.") + (fr "Vous pouvez désormais produire une archive RPM (avec l'extension +.rpm) avec la commande @command{guix pack --format=rpm} qui propose +donc une nouvelle manière de distribuer les logiciels construits avec +Guix. Voici un exemple permettant de générer une archive RPM pour le +paquet @code{hello} : + +@example +guix pack --format=rpm --symlink=/usr/bin/hello=bin/hello hello +@end example + +Consultez @command{info \"(guix.fr) Invoquer guix pack\"} pour plus +d'informations."))) + (entry (commit "137b91f03bbb7f1df71cf10c4f79ae57fbcea400") (title (en "New @option{--with-version} package transformation option") -- cgit v1.2.3 From 53e27f8abf1163e29fb5fc17af38b90a67a18138 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Feb 2023 21:56:08 -0500 Subject: news: Fix commit for the guix pack new RPM format news. * etc/news.scm: Adjust latest news commit. --- etc/news.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/news.scm b/etc/news.scm index 459f3ef352..924c2b35b4 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -26,7 +26,7 @@ (channel-news (version 0) - (entry (commit "63622d2a234b707be5df07d8290a81b3247947e7") + (entry (commit "598f4c509bbfec2b983a8ee246cce0a0fe45ec7f") (title (de "Neues Format @samp{rpm} für den Befehl @command{guix pack}") (en "New @samp{rpm} format for the @command{guix pack} command") -- cgit v1.2.3 From d92ec2f2812c76b23aab778e26708cf353542ae9 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 26 Feb 2023 21:56:33 +0100 Subject: etc: Default to variables in tempel's git-reference... et al. Since we encourage using variables rather than magic hashes in the commit fields, e.g. (commit version) and (commit commit), the default for tempel to use quoted strings is rather off. Thus, let the placeholder reflect actual usage. * etc/snippets/tempel/scheme-mode (git-reference...)[commit]: Use field name as placeholder and don't quote value. (svn-reference..., bzr-reference...)[revision]: Likewise. (hg-reference...)[changeset]: Likewise. --- etc/snippets/tempel/scheme-mode | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'etc') 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 ")") -- cgit v1.2.3 From 962277fd4313f20c0e0333effbd88352c0a7d461 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 11 Mar 2023 11:37:59 -0500 Subject: news: Add entry for the linux-libre 6.2 update. * etc/news.scm: Add entry. --- etc/news.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'etc') 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}") -- cgit v1.2.3 From aef9b68ea4ba3a7bf1bd7615ec6978981a0fcb30 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 2 Mar 2023 14:55:30 +0800 Subject: teams: Add Xfce and LXQt teams. * etc/teams.scm.in (xfce, lxqt): New teams. --- etc/teams.scm.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'etc') diff --git a/etc/teams.scm.in b/etc/teams.scm.in index ff913673e8..abe084af63 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -436,6 +436,18 @@ (define-team reproduciblebuilds "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") -- cgit v1.2.3 From 302680dbce784a53bfddb4ce5e6a9505cd0c477a Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 2 Mar 2023 14:57:09 +0800 Subject: teams: Add 宋文武 to xfce and lxqt teams. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/teams.scm.in ("宋文武"): Add xfce and lxqt. --- etc/teams.scm.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/teams.scm.in b/etc/teams.scm.in index abe084af63..e582993450 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -547,7 +547,7 @@ (define-member (person "Raghav Gururajan" (define-member (person "宋文武" "iyzsong@envs.net") - games localization) + games localization lxqt xfce) (define-member (person "Vagrant Cascadian" "vagrant@reproducible-builds.org") -- cgit v1.2.3