me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Simon Tournier 2023-02-01 10:36:02 +01:00 committed by Liliana Marie Prikler
parent 81f8cfcf0b
commit c3e61c8c1f
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/release-manifest.scm
View File

@ -82,7 +82,7 @@ TARGET."
;; Packages that must be cross-buildable from x86_64-linux. ;; Packages that must be cross-buildable from x86_64-linux.
;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463> ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463>
;; is fixed. ;; is fixed.
(append (list (@ (gnu packages guile) guile-3.0/fixed)) (append (list (@ (gnu packages guile) guile-3.0/pinned))
(map specification->package (map specification->package
'("coreutils" "grep" "sed" "findutils" "diffutils" "patch" '("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
"gawk" "gettext" "gzip" "xz" "gawk" "gettext" "gzip" "xz"

2
gnu/packages/autotools.scm
View File

@ -209,7 +209,7 @@ files with a system-specific shebang."
(inputs `(("guile" (inputs `(("guile"
;; XXX: Kludge to hide the circular dependency. ;; XXX: Kludge to hide the circular dependency.
,(module-ref (resolve-interface '(gnu packages guile)) ,(module-ref (resolve-interface '(gnu packages guile))
'guile-3.0/fixed)) 'guile-3.0/pinned))
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("bash" ,bash-minimal))) ("bash" ,bash-minimal)))
(arguments (arguments

2
gnu/packages/commencement.scm
View File

@ -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, ;; This package must be public because other modules refer to it. However,
;; mark it as hidden so that 'fold-packages' ignores it. ;; mark it as hidden so that 'fold-packages' ignores it.
(with-boot4 (hidden-package (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 (define-public glibc-utf8-locales-final
;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed

6
gnu/packages/guile.scm
View File

@ -419,7 +419,11 @@ without requiring the source code to be rewritten.")
"GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) "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 ;; 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. ;; `base' module, and thus changing it entails a full rebuild.
(package (package