diff options
| author | Simon Tournier <zimon.toutoune@gmail.com> | 2023-02-01 10:36:02 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-02-05 06:56:42 +0100 |
| commit | c3e61c8c1f5ce867408ba7a113882a4b0ad5b2cb (patch) | |
| tree | c98901a6b6ddc92b1c88e5c896ec41048f7f18c7 | |
| parent | 81f8cfcf0b52b9928793e5cf8d93d551d771206a (diff) | |
| download | guix-c3e61c8c1f5ce867408ba7a113882a4b0ad5b2cb.tar.gz | |
gnu: Rename 'guile-3.0/fixed' to 'guile-3.0/pinned'.
* gnu/packages/guile.scm: Rename variable 'guile-3.0/fixed' to 'guile-3.0/pinned', add deprecation. * etc/release-manifest.scm (%packages-to-cross-build): Replace 'guile-3.0/fixed' with 'guile-3.0/pinned'. * gnu/packages/autotools.scm (make-autoconf-wrapper)[inputs]: Likewise. * gnu/packages/commencement.scm (guile-final): Likewise. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
| -rw-r--r-- | etc/release-manifest.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/autotools.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/commencement.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/guile.scm | 6 |
4 files changed, 8 insertions, 4 deletions
diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 3ef3483300..83983c0738 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -82,7 +82,7 @@ TARGET." ;; Packages that must be cross-buildable from x86_64-linux. ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463> ;; is fixed. - (append (list (@ (gnu packages guile) guile-3.0/fixed)) + (append (list (@ (gnu packages guile) guile-3.0/pinned)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" "gawk" "gettext" "gzip" "xz" diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 118f25ba09..006a9e202b 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -209,7 +209,7 @@ files with a system-specific shebang." (inputs `(("guile" ;; XXX: Kludge to hide the circular dependency. ,(module-ref (resolve-interface '(gnu packages guile)) - 'guile-3.0/fixed)) + 'guile-3.0/pinned)) ("autoconf" ,autoconf) ("bash" ,bash-minimal))) (arguments diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b4566b41cc..7335aedec2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3623,7 +3623,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (with-boot4 (hidden-package - (package-with-bootstrap-guile guile-3.0/fixed)))) + (package-with-bootstrap-guile guile-3.0/pinned)))) (define-public glibc-utf8-locales-final ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index edf289e574..2fd9b711ce 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -419,7 +419,11 @@ without requiring the source code to be rewritten.") "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) '()))))))) -(define-public guile-3.0/fixed +;;; The symbol guile-3.0/fixed should be used when guile-3.0 needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias guile-3.0/fixed guile-3.0/pinned) + +(define-public guile-3.0/pinned ;; A package of Guile that's rarely changed. It is the one used in the ;; `base' module, and thus changing it entails a full rebuild. (package |