diff options
| -rw-r--r-- | build-aux/build-self.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/guile.scm | 15 | ||||
| -rw-r--r-- | guix/self.scm | 9 |
3 files changed, 2 insertions, 26 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 3ecdc931a5..d8f3ff9bb0 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -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) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 59f09375ad..a6de4467d3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -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)) diff --git a/guix/self.scm b/guix/self.scm index 21b85eb253..c800c452e6 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -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) |