From a5b2474037d749f42a816c60f0393941ba97444e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 15 Jun 2021 16:31:41 +0000 Subject: gnu: Consolidate duplicate copyright names. * gnu/packages/android.scm: Consolidate copyright lines with the same email address. * gnu/packages/code.scm: Likewise. * gnu/packages/cpp.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/file.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gps.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/services/web.scm: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/services/web.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 6a093cf4e4..bb42eacf83 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -3,11 +3,10 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018 Julien Lepiller -;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2017 nee ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Ricardo Wurmus -- cgit v1.2.3 From 719bbcc15e2216b59bde34f297b92ceb9d349ce0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 25 Sep 2021 09:27:02 +0200 Subject: Update copyright assignments for Liliana Marie Prikler. * doc/guix.texi: Update copyright name for Liliana Marie Prikler. * gnu/packages/build-tools.scm: Update copyright name and email for Liliana Marie Prikler. * gnu/packages/convmv.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/emacs.scm: Likewise. * gnu/packages/esolangs.scm: Likewise. * gnu/packages/game-development.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gnome-xyz.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gstreamer.scm: Likewise. * gnu/packages/guile-xyz.scm: Likewise. * gnu/packages/minetest.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch: Likewise. * gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: Likewise. * gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/unicode.scm: Likewise. * gnu/packages/xorg.scm: Likewise. * gnu/services/sound.scm: Likewise. * guix/build-system/renpy.scm: Likewise. * guix/build/emacs-utils.scm: Likewise. * guix/build/renpy-build-system.scm: Likewise. --- doc/guix.texi | 2 +- gnu/packages/build-tools.scm | 2 +- gnu/packages/convmv.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/esolangs.scm | 2 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/gnome-xyz.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/minetest.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch | 2 +- gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch | 4 ++-- gnu/packages/patches/webkitgtk-bind-all-fonts.patch | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/unicode.scm | 2 +- gnu/packages/xorg.scm | 2 +- gnu/services/sound.scm | 2 +- guix/build-system/renpy.scm | 2 +- guix/build/emacs-utils.scm | 2 +- guix/build/renpy-build-system.scm | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/services') diff --git a/doc/guix.texi b/doc/guix.texi index 9bb91b94fd..4bf14014eb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -70,7 +70,7 @@ Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019, 2020, 2021 Guillaume Le Vaillant@* -Copyright @copyright{} 2020 Leo Prikler@* +Copyright @copyright{} 2020 Liliana Marie Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index d2fb9e05df..7c44d2b80f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Efraim Flashner diff --git a/gnu/packages/convmv.scm b/gnu/packages/convmv.scm index 2a9a4ec68c..9e6f141818 100644 --- a/gnu/packages/convmv.scm +++ b/gnu/packages/convmv.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2754ce7049..e390d87253 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -55,7 +55,7 @@ ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Stephen Webber -;;; Copyright © 2019, 2021 Leo Prikler +;;; Copyright © 2019, 2021 Liliana Marie Prikler ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Robert Smith diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1edbaa463a..6d9950d068 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019 Liliana Marie Prikler ;;; Copyright © 2019 Amin Bandali ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Morgan Smith diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 45feedfa28..753221a5f1 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Hendursaga -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7d185caa0e..039945467b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019, 2020, 2021 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bd1802517b..e59d416905 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Trevor Hass -;;; Copyright © 2020, 2021 Leo Prikler +;;; Copyright © 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández ;;; Copyright © 2021 Olivier Rojon diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index b9f7afcaf8..d4a6772254 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020, 2021 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2019, 2021 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7de12fe525..f81e169abb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019, 2020 Jonathan Brielmaier -;;; Copyright © 2019, 2020, 2021 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 3047773e0f..c734d0c74e 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 457701a436..7188058b42 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2020, 2021 Masaya Tojo ;;; Copyright © 2020 Jesse Gibbons ;;; Copyright © 2020 Mike Rosset -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Xinglu Chen diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index fd1439d4d2..28fa40b410 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Trevor Hass -;;; Copyright © 2020, 2021 Leo Prikler +;;; Copyright © 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2021 Maxime Devos ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ff1330d228..4c77fb7461 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Ryan Prior -;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Bonface Munyoki Kilyungi diff --git a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch index a74034a2c5..41338e6e6f 100644 --- a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch +++ b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch @@ -8,7 +8,7 @@ When it exists, Minetest will look there for mods in addition to ~/.minetest/mods/. Mods can still be installed to ~/.minetest/mods/ with the built-in installer. -With thanks to Leo Prikler. +With thanks to Liliana Marie Prikler. --- builtin/mainmenu/pkgmgr.lua | 7 +++---- doc/menu_lua_api.txt | 8 +++++++- diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch index 155ba35efd..3a5ae1a2cd 100644 --- a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch +++ b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch @@ -1,9 +1,9 @@ From 942730ce7148cd54a30d4a606ce71a2654c8a2e0 Mon Sep 17 00:00:00 2001 -From: Leo Prikler +From: Liliana Marie Prikler Date: Sat, 5 Jun 2021 22:47:00 -0400 Subject: [PATCH] ppsspp: Remove upgrade code and gold support. -Original patch from Leo Prikler. +Original patch from Liliana Marie Prikler. Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by Maxim Cournoyer. --- diff --git a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch index 3fe9704727..e7b06cc650 100644 --- a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch +++ b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch @@ -1,7 +1,7 @@ Add fonts from all XDG_DATA_DIRS, not just XDG_DATA_HOME. See . -Author: Leo Prikler +Author: Liliana Marie Prikler Index: webkitgtk-2.28.2/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp =================================================================== --- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 20502ac255..15a35cda17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -89,7 +89,7 @@ ;;; Copyright © 2020, 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 Diego N. Barbato -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2019 Kristian Trandem ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Morgan Smith diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 2ecfebd379..806fe05fb6 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b335435614..3b10573635 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index bdf819b422..55610f27e0 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Oleg Pykhalov -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 35edc0056d..5ed59bf5a5 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 5f7ba71244..64ef40e25a 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2018, 2020 Maxim Cournoyer -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/build/renpy-build-system.scm b/guix/build/renpy-build-system.scm index 66683971c5..e4a88456be 100644 --- a/guix/build/renpy-build-system.scm +++ b/guix/build/renpy-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 8b5b7478ab474019630551b3c07ef534cf6e2520 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 23:09:38 +0200 Subject: services: knot: Remove obsolete DISABLE-ANY? zone option. It is now silently ignored by knotd. * gnu/services/dns.scm (): Remove DISABLE-ANY? field. Adjust all previous users. * doc/guix.texi (DNS Services): Undocument it. --- doc/guix.texi | 3 --- gnu/services/dns.scm | 4 ---- 2 files changed, 7 deletions(-) (limited to 'gnu/services') diff --git a/doc/guix.texi b/doc/guix.texi index 2a1fea2987..423b26ef64 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26799,9 +26799,6 @@ A list of acl identifiers. @item @code{semantic-checks?} (default: @code{#f}) When set, this adds more semantic checks to the zone. -@item @code{disable-any?} (default: @code{#f}) -When set, this forbids queries of the ANY type. - @item @code{zonefile-sync} (default: @code{0}) The delay between a modification in memory and on disk. 0 means immediate synchronization. diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index aeb2bfdc86..93055eba38 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -185,8 +185,6 @@ (default '())) (semantic-checks? knot-zone-configuration-semantic-checks? (default #f)) - (disable-any? knot-zone-configuration-disable-any? - (default #f)) (zonefile-sync knot-zone-configuration-zonefile-sync (default 0)) (zonefile-load knot-zone-configuration-zonefile-load @@ -509,7 +507,6 @@ (notify (list #$@(knot-zone-configuration-notify zone))) (acl (list #$@(knot-zone-configuration-acl zone))) (semantic-checks? #$(knot-zone-configuration-semantic-checks? zone)) - (disable-any? #$(knot-zone-configuration-disable-any? zone)) (zonefile-sync #$(knot-zone-configuration-zonefile-sync zone)) (zonefile-load '#$(knot-zone-configuration-zonefile-load zone)) (journal-content #$(knot-zone-configuration-journal-content zone)) @@ -541,7 +538,6 @@ #$(format-string-list (knot-zone-configuration-acl zone)))) (format #t " semantic-checks: ~a\n" (if semantic-checks? "on" "off")) - (format #t " disable-any: ~a\n" (if disable-any? "on" "off")) (if zonefile-sync (format #t " zonefile-sync: ~a\n" zonefile-sync)) (if zonefile-load -- cgit v1.2.3 From fee0bced7fec2f9950957976a28f033edd4f877c Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:05:02 +0300 Subject: home: services: configuration: Support file-like objects. * gnu/home/services/configuration.scm (interpose): Operate only with file-like objects. (string-or-gexp?): Delete procedure. (serialize-string-or-gexp): Rename to 'serialize-file-like'. (text-config?): Call 'file-like' intead of 'string-or-gexp?'. * guix/scripts/home/import.scm: (generate-bash-module+configuration): Don't call slurp-file-gexp. * gnu/home/services/configuration.scm: Move content ... * gnu/services/configuration.scm: here. * gnu/home/services/shells.scm: Delete (gnu home services configuration). * gnu/home/services/xdg.scm: Same. * gnu/local.mk: Same. * tests/guix-home.sh: Test home-bash-service-type and extension with home-bash-extension. --- gnu/home/services/configuration.scm | 109 ------------------------------------ gnu/home/services/shells.scm | 1 - gnu/home/services/xdg.scm | 1 - gnu/local.mk | 1 - gnu/services/configuration.scm | 90 ++++++++++++++++++++++++++++- guix/scripts/home/import.scm | 8 +-- tests/guix-home.sh | 27 ++++++++- 7 files changed, 117 insertions(+), 120 deletions(-) delete mode 100644 gnu/home/services/configuration.scm (limited to 'gnu/services') diff --git a/gnu/home/services/configuration.scm b/gnu/home/services/configuration.scm deleted file mode 100644 index 5e7743e7d6..0000000000 --- a/gnu/home/services/configuration.scm +++ /dev/null @@ -1,109 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Andrew Tropin -;;; Copyright © 2021 Xinglu Chen -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu home services configuration) - #:use-module (gnu services configuration) - #:use-module (guix gexp) - #:use-module (srfi srfi-1) - #:use-module (ice-9 curried-definitions) - #:use-module (ice-9 match) - #:use-module (guix i18n) - #:use-module (guix diagnostics) - - #:export (filter-configuration-fields - - interpose - list-of - - list-of-strings? - alist? - string-or-gexp? - serialize-string-or-gexp - text-config? - serialize-text-config - generic-serialize-alist-entry - generic-serialize-alist)) - -(define* (filter-configuration-fields configuration-fields fields - #:optional negate?) - "Retrieve the fields listed in FIELDS from CONFIGURATION-FIELDS. -If NEGATE? is @code{#t}, retrieve all fields except FIELDS." - (filter (lambda (field) - (let ((member? (member (configuration-field-name field) fields))) - (if (not negate?) member? (not member?)))) - configuration-fields)) - - -(define* (interpose ls #:optional (delimiter "\n") (grammar 'infix)) - "Same as @code{string-join}, but without join and string, returns an -DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values." - (when (not (member grammar '(infix suffix))) - (raise - (formatted-message - (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.") - grammar))) - (fold-right (lambda (e acc) - (cons e - (if (and (null? acc) (eq? grammar 'infix)) - acc - (cons delimiter acc)))) - '() ls)) - -(define (list-of pred?) - "Return a procedure that takes a list and check if all the elements of -the list result in @code{#t} when applying PRED? on them." - (lambda (x) - (if (list? x) - (every pred? x) - #f))) - - -(define list-of-strings? - (list-of string?)) - -(define alist? list?) - -(define (string-or-gexp? sg) (or (string? sg) (gexp? sg))) -(define (serialize-string-or-gexp field-name val) "") - -(define (text-config? config) - (and (list? config) (every string-or-gexp? config))) -(define (serialize-text-config field-name val) - #~(string-append #$@(interpose val "\n" 'suffix))) - -(define ((generic-serialize-alist-entry serialize-field) entry) - "Apply the SERIALIZE-FIELD procedure on the field and value of ENTRY." - (match entry - ((field . val) (serialize-field field val)))) - -(define (generic-serialize-alist combine serialize-field fields) - "Generate a configuration from an association list FIELDS. - -SERIALIZE-FIELD is a procedure that takes two arguments, it will be -applied on the fields and values of FIELDS using the -@code{generic-serialize-alist-entry} procedure. - -COMBINE is a procedure that takes one or more arguments and combines -all the alist entries into one value, @code{string-append} or -@code{append} are usually good candidates for this. - -See the @code{serialize-alist} procedure in `@code{(gnu home-services -version-control}' for an example usage.)}" - (apply combine - (map (generic-serialize-alist-entry serialize-field) fields))) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 21b250f35d..1cd17b2c32 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -19,7 +19,6 @@ (define-module (gnu home services shells) #:use-module (gnu services configuration) - #:use-module (gnu home services configuration) #:use-module (gnu home services utils) #:use-module (gnu home services) #:use-module (gnu packages shells) diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm index 453c05ddbf..20fb7f7b40 100644 --- a/gnu/home/services/xdg.scm +++ b/gnu/home/services/xdg.scm @@ -19,7 +19,6 @@ (define-module (gnu home services xdg) #:use-module (gnu services configuration) - #:use-module (gnu home services configuration) #:use-module (gnu home services) #:use-module (gnu packages freedesktop) #:use-module (gnu home services utils) diff --git a/gnu/local.mk b/gnu/local.mk index ff51c500d4..63ef645deb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -77,7 +77,6 @@ GNU_SYSTEM_MODULES = \ %D%/home/services.scm \ %D%/home/services/symlink-manager.scm \ %D%/home/services/fontutils.scm \ - %D%/home/services/configuration.scm \ %D%/home/services/shells.scm \ %D%/home/services/shepherd.scm \ %D%/home/services/mcron.scm \ diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index df3d3b6f9b..e8c55b6e4d 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Andrew Tropin ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +26,12 @@ #:use-module (guix records) #:use-module (guix gexp) #:use-module ((guix utils) #:select (source-properties->location)) - #:use-module ((guix diagnostics) #:select (location-file)) + #:use-module ((guix diagnostics) #:select (formatted-message location-file)) #:use-module ((guix modules) #:select (file-name->module-name)) + #:use-module (guix i18n) #:autoload (texinfo) (texi-fragment->stexi) #:autoload (texinfo serialize) (stexi->texi) + #:use-module (ice-9 curried-definitions) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -56,7 +59,20 @@ generate-documentation configuration->documentation empty-serializer - serialize-package)) + serialize-package + + filter-configuration-fields + + interpose + list-of + + list-of-strings? + alist? + serialize-file-like + text-config? + serialize-text-config + generic-serialize-alist-entry + generic-serialize-alist)) ;;; Commentary: ;;; @@ -323,3 +339,73 @@ Texinfo documentation of its fields." '-fields)))) (display (generate-documentation `((,configuration-symbol ,fields-getter)) configuration-symbol)))) + +(define* (filter-configuration-fields configuration-fields fields + #:optional negate?) + "Retrieve the fields listed in FIELDS from CONFIGURATION-FIELDS. +If NEGATE? is @code{#t}, retrieve all fields except FIELDS." + (filter (lambda (field) + (let ((member? (member (configuration-field-name field) fields))) + (if (not negate?) member? (not member?)))) + configuration-fields)) + + +(define* (interpose ls #:optional (delimiter "\n") (grammar 'infix)) + "Same as @code{string-join}, but without join and string, returns an +DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values." + (when (not (member grammar '(infix suffix))) + (raise + (formatted-message + (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.") + grammar))) + (fold-right (lambda (e acc) + (cons #~(begin + (use-modules (ice-9 rdelim)) + (with-fluids ((%default-port-encoding "UTF-8")) + (with-input-from-file #$e read-string))) + (if (and (null? acc) (eq? grammar 'infix)) + acc + (cons delimiter acc)))) + '() ls)) + +(define (list-of pred?) + "Return a procedure that takes a list and check if all the elements of +the list result in @code{#t} when applying PRED? on them." + (lambda (x) + (if (list? x) + (every pred? x) + #f))) + + +(define list-of-strings? + (list-of string?)) + +(define alist? list?) + +(define serialize-file-like empty-serializer) + +(define (text-config? config) + (list-of file-like?)) +(define (serialize-text-config field-name val) + #~(string-append #$@(interpose val "\n" 'suffix))) + +(define ((generic-serialize-alist-entry serialize-field) entry) + "Apply the SERIALIZE-FIELD procedure on the field and value of ENTRY." + (match entry + ((field . val) (serialize-field field val)))) + +(define (generic-serialize-alist combine serialize-field fields) + "Generate a configuration from an association list FIELDS. + +SERIALIZE-FIELD is a procedure that takes two arguments, it will be +applied on the fields and values of FIELDS using the +@code{generic-serialize-alist-entry} procedure. + +COMBINE is a procedure that takes one or more arguments and combines +all the alist entries into one value, @code{string-append} or +@code{append} are usually good candidates for this. + +See the @code{serialize-alist} procedure in `@code{(gnu home services +version-control}' for an example usage.)}" + (apply combine + (map (generic-serialize-alist-entry serialize-field) fields))) diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm index c977ec3861..611f580e85 100644 --- a/guix/scripts/home/import.scm +++ b/guix/scripts/home/import.scm @@ -46,17 +46,15 @@ (home-bash-configuration ,@(if (file-exists? rc) `((bashrc - (list (slurp-file-gexp (local-file ,rc))))) + (list (local-file ,rc)))) '()) ,@(if (file-exists? profile) `((bash-profile - (list (slurp-file-gexp - (local-file ,profile))))) + (list (local-file ,profile)))) '()) ,@(if (file-exists? logout) `((bash-logout - (list (slurp-file-gexp - (local-file ,logout))))) + (list (local-file ,logout)))) '())))))) diff --git a/tests/guix-home.sh b/tests/guix-home.sh index 0b5deabeb0..e578559c97 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -54,10 +54,13 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT # Test 'guix home reconfigure'. # + printf "# dot-bashrc test file for guix home" > "dot-bashrc" + cat > "home.scm" <<'EOF' (use-modules (guix gexp) (gnu home) (gnu home services) + (gnu home services shells) (gnu services)) (home-environment @@ -68,11 +71,33 @@ trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT (list `("config/test.conf" ,(plain-file "tmp-file.txt" - "the content of ~/.config/test.conf"))))))) + "the content of ~/.config/test.conf")))) + + (service home-bash-service-type + (home-bash-configuration + (guix-defaults? #t) + (bashrc + (list + (local-file (string-append (dirname (current-filename)) + "/dot-bashrc")))))) + + (simple-service 'home-bash-service-extension-test + home-bash-service-type + (home-bash-extension + (bashrc + (list + (plain-file + "bashrc-test-config.sh" + "# the content of bashrc-test-config.sh")))))))) EOF guix home reconfigure "${test_directory}/home.scm" test -d "${HOME}/.guix-home" + test -h "${HOME}/.bash_profile" + test -h "${HOME}/.bashrc" + test "$(tail -n 2 "${HOME}/.bashrc")" == "\ +# dot-bashrc test file for guix home +# the content of bashrc-test-config.sh" grep -q "the content of ~/.config/test.conf" "${HOME}/.config/test.conf" # -- cgit v1.2.3 From fafa127d80d41df8afe96357ab30ec3dc6499122 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Oct 2021 02:33:41 +0200 Subject: services: ganeti: Don't start the metadata daemon automatically. * gnu/services/ganeti.scm (ganeti-metad-service)[auto-start?]: New field. --- gnu/services/ganeti.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/services') diff --git a/gnu/services/ganeti.scm b/gnu/services/ganeti.scm index 0a34ea6a5e..ef22d1a331 100644 --- a/gnu/services/ganeti.scm +++ b/gnu/services/ganeti.scm @@ -612,7 +612,11 @@ provide the collected information through a HTTP interface."))) (documentation "Run the Ganeti metadata daemon.") (provision '(ganeti-metad)) (requirement '(user-processes networking)) + + ;; This service is started on demand. + (auto-start? #f) (respawn? #f) + (start #~(make-forkexec-constructor (list #$(file-append ganeti "/sbin/ganeti-metad") #$(string-append "--port=" (number->string port)) -- cgit v1.2.3