futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: guile-next: Add '.tarball-version' file to get correct version.

Browse Source 
So far, "guile --version" and 'guile-3.0.pc' would use "UNKNOWN" as the
version string, making the package unsuitable as a drop-in replacement
for the 'guile-3.0' package.

* gnu/packages/guile.scm (guile-next)[arguments]: Add 'set-version'
phase.
This commit is contained in:
Ludovic Courtès 2023-01-18 11:55:51 +01:00
parent 26bb41d6d5
commit 75b7082bdf
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/guile.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -453,6 +453,16 @@ without requiring the source code to be rewritten.")
(substitute-keyword-arguments (package-arguments guile-3.0) (substitute-keyword-arguments (package-arguments guile-3.0)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'bootstrap 'set-version
(lambda _
;; Tell 'git-version-gen' what version this is, or it will
;; just pick "UNKNOWN", making it unusable as a replacement
;; for 'guile-3.0'. XXX: This is inaccurate when using
;; '--with-branch' but using (package-version this-package)
;; wouldn't give us a valid version string.
(call-with-output-file ".tarball-version"
(lambda (port)
(display ,version port)))))
(add-before 'check 'skip-failing-tests (add-before 'check 'skip-failing-tests
(lambda _ (lambda _
(substitute* "test-suite/standalone/test-out-of-memory" (substitute* "test-suite/standalone/test-out-of-memory"