mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: guile: Remove version 2.2.2.
* gnu/packages/guile.scm (guile-2.2.2): Remove. * guix/self.scm (guile-for-build): Remove special case for "2.2.2". (guix-derivation): Likewise. * build-aux/build-self.scm (build): Likewise.
This commit is contained in:
parent
2abd76e8af
commit
8bece84022
3 changed files with 2 additions and 26 deletions
|
@ -297,9 +297,7 @@ (define spin
|
||||||
;; The procedure below is our return value.
|
;; The procedure below is our return value.
|
||||||
(define* (build source
|
(define* (build source
|
||||||
#:key verbose? (version (date-version-string)) system
|
#:key verbose? (version (date-version-string)) system
|
||||||
(guile-version (match ((@ (guile) version))
|
(guile-version (effective-version))
|
||||||
("2.2.2" "2.2.2")
|
|
||||||
(_ (effective-version))))
|
|
||||||
(pull-version 0)
|
(pull-version 0)
|
||||||
#:allow-other-keys
|
#:allow-other-keys
|
||||||
#:rest rest)
|
#:rest rest)
|
||||||
|
|
|
@ -287,21 +287,6 @@ (define-public guile-2.2/fixed
|
||||||
(max-silent-time . 36000))))) ;10 hours (needed on ARM
|
(max-silent-time . 36000))))) ;10 hours (needed on ARM
|
||||||
; when heavily loaded)
|
; when heavily loaded)
|
||||||
|
|
||||||
(define-public guile-2.2.2
|
|
||||||
;; Keep it so that, when 'guix' runs on 2.2.2, 'guix pull' compiles objects
|
|
||||||
;; with 2.2.2, thereby avoiding the ABI incompatibility issues described in
|
|
||||||
;; <https://bugs.gnu.org/29570>.
|
|
||||||
(package
|
|
||||||
(inherit guile-2.2)
|
|
||||||
(version "2.2.2")
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source guile-2.2))
|
|
||||||
(uri (string-append "mirror://gnu/guile/guile-" version
|
|
||||||
".tar.xz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))))))
|
|
||||||
|
|
||||||
(define-public guile-next
|
(define-public guile-next
|
||||||
(deprecated-package "guile-next" guile-2.2))
|
(deprecated-package "guile-next" guile-2.2))
|
||||||
|
|
||||||
|
|
|
@ -890,11 +890,6 @@ (define canonical-package ;soft reference
|
||||||
'canonical-package))
|
'canonical-package))
|
||||||
|
|
||||||
(match version
|
(match version
|
||||||
("2.2.2"
|
|
||||||
;; Gross hack to avoid ABI incompatibilities (see
|
|
||||||
;; <https://bugs.gnu.org/29570>.)
|
|
||||||
(module-ref (resolve-interface '(gnu packages guile))
|
|
||||||
'guile-2.2.2))
|
|
||||||
("2.2"
|
("2.2"
|
||||||
(canonical-package (module-ref (resolve-interface '(gnu packages guile))
|
(canonical-package (module-ref (resolve-interface '(gnu packages guile))
|
||||||
'guile-2.2)))
|
'guile-2.2)))
|
||||||
|
@ -925,9 +920,7 @@ (define guile
|
||||||
#:name (string-append "guix-"
|
#:name (string-append "guix-"
|
||||||
(shorten version))
|
(shorten version))
|
||||||
#:pull-version pull-version
|
#:pull-version pull-version
|
||||||
#:guile-version (match guile-version
|
#:guile-version guile-version
|
||||||
("2.2.2" "2.2")
|
|
||||||
(version version))
|
|
||||||
#:guile-for-build guile)))
|
#:guile-for-build guile)))
|
||||||
(if guix
|
(if guix
|
||||||
(lower-object guix)
|
(lower-object guix)
|
||||||
|
|
Loading…
Reference in a new issue