From ebb88e2bed889b67ea83893c907ab29e3bc81e8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 9 Nov 2022 13:31:20 +0100 Subject: machine/digital-ocean: Set load path to Guile 3.0 directories. * gnu/machine/digital-ocean.scm (guix-infect, add-static-networking): Set GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH to directories for Guile 3.0 instead of 2.2. --- gnu/machine/digital-ocean.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/machine/digital-ocean.scm b/gnu/machine/digital-ocean.scm index dc89862ca2..e4200f6405 100644 --- a/gnu/machine/digital-ocean.scm +++ b/gnu/machine/digital-ocean.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2022 Matthew James Kraai +;;; Copyright © 2022 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -272,10 +273,10 @@ cat > /etc/bootstrap-config.scm << EOF (simple-service 'guile-load-path-in-global-env session-environment-service-type \\`((\"GUILE_LOAD_PATH\" - . \"/run/current-system/profile/share/guile/site/2.2\") + . \"/run/current-system/profile/share/guile/site/3.0\") (\"GUILE_LOAD_COMPILED_PATH\" - . ,(string-append \"/run/current-system/profile/lib/guile/2.2/site-ccache:\" - \"/run/current-system/profile/share/guile/site/2.2\")))) + . ,(string-append \"/run/current-system/profile/lib/guile/3.0/site-ccache:\" + \"/run/current-system/profile/share/guile/site/3.0\")))) (service openssh-service-type (openssh-configuration (log-level 'debug) @@ -337,10 +338,10 @@ configuration for the public IPv4 network described by the alist NETWORK." (simple-service 'guile-load-path-in-global-env session-environment-service-type `(("GUILE_LOAD_PATH" - . "/run/current-system/profile/share/guile/site/2.2") + . "/run/current-system/profile/share/guile/site/3.0") ("GUILE_LOAD_COMPILED_PATH" - . ,(string-append "/run/current-system/profile/lib/guile/2.2/site-ccache:" - "/run/current-system/profile/share/guile/site/2.2")))) + . ,(string-append "/run/current-system/profile/lib/guile/3.0/site-ccache:" + "/run/current-system/profile/share/guile/site/3.0")))) (operating-system-user-services (machine-operating-system target)))))) -- cgit 1.4.1