summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-07-08 09:39:05 +0300
committerEfraim Flashner <efraim@flashner.co.il>2021-07-08 09:39:05 +0300
commit49e2e75ced01a821c84eb776cf42a36664eaa834 (patch)
treea077a70446fc1070d483a021e97ac59f77dcf7ac
parente48cff0965207c1abe2d6a71bd1277d8cc46e7c7 (diff)
gnu: %guile-3.0-static-stripped: Rename to %guile-static-stripped.
* gnu/packages/make-bootstrap.scm (%guile-3.0-static-stripped): Rename to %guile-static-stripped. (%guile-bootstrap-tarball): Adjust accordingly. * gnu/system/linux-initrd.scm (expression->initrd): Use %guile-static-stripped as default guile. * doc/guix.texi (initial RAM disk)[expression->initrd]: Adjust documentation accordingly.
-rw-r--r--doc/guix.texi2
-rw-r--r--gnu/packages/make-bootstrap.scm6
-rw-r--r--gnu/system/linux-initrd.scm4
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index e11f7adebb..18bc600440 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -32775,7 +32775,7 @@ program. That gives a lot of flexibility. The
program to run in that initrd.
@deffn {Scheme Procedure} expression->initrd @var{exp} @
- [#:guile %guile-3.0-static-stripped] [#:name "guile-initrd"]
+ [#:guile %guile-static-stripped] [#:name "guile-initrd"]
Return as a file-like object a Linux initrd (a gzipped cpio archive)
containing @var{guile} and that evaluates @var{exp}, a G-expression,
upon booting. All the derivations referenced by @var{exp} are
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index d66acc2e70..cdcb1dcaa2 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -55,7 +55,7 @@
%mes-bootstrap-tarball
%bootstrap-tarballs
- %guile-3.0-static-stripped))
+ %guile-static-stripped))
;;; Commentary:
;;;
@@ -798,7 +798,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(outputs '("out"))
(synopsis "Minimal statically-linked and relocatable Guile")))
-(define %guile-3.0-static-stripped
+(define %guile-static-stripped
;; A stripped static Guile 3.0 binary, for use in initrds
;; and during bootstrap.
(make-guile-static-stripped
@@ -863,7 +863,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %guile-bootstrap-tarball
;; A tarball with the statically-linked, relocatable Guile.
- (tarball-package %guile-3.0-static-stripped))
+ (tarball-package %guile-static-stripped))
(define %mescc-tools-bootstrap-tarball
;; A tarball with statically-linked MesCC binary seed.
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index c6ba9bb560..8c245b8445 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -36,7 +36,7 @@
#:use-module ((gnu packages xorg)
#:select (console-setup xkeyboard-config))
#:use-module ((gnu packages make-bootstrap)
- #:select (%guile-3.0-static-stripped))
+ #:select (%guile-static-stripped))
#:use-module (gnu system file-systems)
#:use-module (gnu system mapped-devices)
#:use-module (gnu system keyboard)
@@ -62,7 +62,7 @@
(define* (expression->initrd exp
#:key
- (guile %guile-3.0-static-stripped)
+ (guile %guile-static-stripped)
(gzip gzip)
(name "guile-initrd")
(system (%current-system)))