me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guile-for-guile-emacs: Update to 2.1.2-1.15ca784.

Browse source 
* gnu/packages/guile.scm (guile-for-guile-emacs): Update to 2.1.2-1.15ca784.
[source]: Fetch from Guile upstream repository.
[arguments]: Enable tests; replace 'bootstrap phase; disable only broken
tests.
[native-search-paths]: Inherit from guile-2.2.
This commit is contained in:
Ricardo Wurmus 2020-04-04 19:12:30 +02:00
parent 1d2e270e3e
commit a71d335832
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 45 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
gnu/packages/guile.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -393,40 +393,50 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
(guile-variant-package-name "guile3.0"))) (guile-variant-package-name "guile3.0")))
(define-public guile-for-guile-emacs (define-public guile-for-guile-emacs
(package (inherit guile-2.2) (let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d")
(name "guile-for-guile-emacs") (revision "1"))
(version "20150510.d8d9a8d") (package (inherit guile-2.2)
(source (origin (name "guile-for-guile-emacs")
(method git-fetch) (version (git-version "2.1.2" revision commit))
(uri (git-reference (source (origin
(url "git://git.hcoop.net/git/bpt/guile.git") (method git-fetch)
(commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17"))) (uri (git-reference
(file-name (string-append name "-" version "-checkout")) (url "git://git.savannah.gnu.org/guile.git")
(sha256 (commit commit)))
(base32 (file-name (git-file-name name version))
"00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0")))) (sha256
(arguments (base32
`(;; Tests aren't passing for now. "1l7ik4q4zk7vq4m3gnwizc0b64b1mdr31hxqlzxs94xaf2lvi7s2"))))
;; Obviously we should re-enable this! (arguments
#:tests? #f (substitute-keyword-arguments (package-arguments guile-2.2)
,@(package-arguments guile-2.2))) ((#:phases phases '%standard-phases)
(native-inputs `(modify-phases ,phases
`(("autoconf" ,autoconf) (replace 'bootstrap
("automake" ,automake) (lambda _
("libtool" ,libtool) ;; Disable broken tests.
("flex" ,flex) ;; TODO: Fix them!
("texinfo" ,texinfo) (substitute* "test-suite/tests/gc.test"
("gettext" ,gettext-minimal) (("\\(pass-if \"after-gc-hook gets called\"" m)
,@(package-native-inputs guile-2.2))) (string-append "#;" m)))
;; Same as in guile-2.0 (substitute* "test-suite/tests/version.test"
(native-search-paths (("\\(pass-if \"version reporting works\"" m)
(list (search-path-specification (string-append "#;" m)))
(variable "GUILE_LOAD_PATH") ;; Warning: Unwind-only `out-of-memory' exception; skipping pre-unwind handler.
(files '("share/guile/site/2.0"))) ;; FAIL: test-out-of-memory
(search-path-specification (substitute* "test-suite/standalone/Makefile.am"
(variable "GUILE_LOAD_COMPILED_PATH") (("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") ""))
(files '("lib/guile/2.0/site-ccache"
"share/guile/site/2.0"))))))) (patch-shebang "build-aux/git-version-gen")
(invoke "sh" "autogen.sh")
#t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("flex" ,flex)
("texinfo" ,texinfo)
("gettext" ,gettext-minimal)
,@(package-native-inputs guile-2.2))))))
;;; ;;;