Browse Source

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.
gn-latest-20200725
Ludovic Courtès 3 years ago
parent
commit
8bece84022
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
3 changed files with 2 additions and 26 deletions
  1. +1
    -3
      build-aux/build-self.scm
  2. +0
    -15
      gnu/packages/guile.scm
  3. +1
    -8
      guix/self.scm

+ 1
- 3
build-aux/build-self.scm View File

@ -297,9 +297,7 @@ person's version identifier."
;; The procedure below is our return value.
(define* (build source
#:key verbose? (version (date-version-string)) system
(guile-version (match ((@ (guile) version))
("2.2.2" "2.2.2")
(_ (effective-version))))
(guile-version (effective-version))
(pull-version 0)
#:allow-other-keys
#:rest rest)


+ 0
- 15
gnu/packages/guile.scm View File

@ -287,21 +287,6 @@ without requiring the source code to be rewritten.")
(max-silent-time . 36000))))) ;10 hours (needed on ARM
; 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
(deprecated-package "guile-next" guile-2.2))


+ 1
- 8
guix/self.scm View File

@ -890,11 +890,6 @@ running Guile."
'canonical-package))
(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"
(canonical-package (module-ref (resolve-interface '(gnu packages guile))
'guile-2.2)))
@ -925,9 +920,7 @@ is not supported."
#:name (string-append "guix-"
(shorten version))
#:pull-version pull-version
#:guile-version (match guile-version
("2.2.2" "2.2")
(version version))
#:guile-version guile-version
#:guile-for-build guile)))
(if guix
(lower-object guix)


Loading…
Cancel
Save