me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ricardo Wurmus 2022-11-09 13:31:20 +01:00
parent e8dcd008a0
commit ebb88e2bed
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/machine/digital-ocean.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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 (simple-service 'guile-load-path-in-global-env
session-environment-service-type session-environment-service-type
\\`((\"GUILE_LOAD_PATH\" \\`((\"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\" (\"GUILE_LOAD_COMPILED_PATH\"
. ,(string-append \"/run/current-system/profile/lib/guile/2.2/site-ccache:\" . ,(string-append \"/run/current-system/profile/lib/guile/3.0/site-ccache:\"
\"/run/current-system/profile/share/guile/site/2.2\")))) \"/run/current-system/profile/share/guile/site/3.0\"))))
(service openssh-service-type (service openssh-service-type
(openssh-configuration (openssh-configuration
(log-level 'debug) (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 (simple-service 'guile-load-path-in-global-env
session-environment-service-type session-environment-service-type
`(("GUILE_LOAD_PATH" `(("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" ("GUILE_LOAD_COMPILED_PATH"
. ,(string-append "/run/current-system/profile/lib/guile/2.2/site-ccache:" . ,(string-append "/run/current-system/profile/lib/guile/3.0/site-ccache:"
"/run/current-system/profile/share/guile/site/2.2")))) "/run/current-system/profile/share/guile/site/3.0"))))
(operating-system-user-services (operating-system-user-services
(machine-operating-system target)))))) (machine-operating-system target))))))