diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:24:37 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:27:28 -0400 |
commit | 3c6e220d8100281074c414a43c1efe9a01b53771 (patch) | |
tree | dc5d47fbbac3842d0da893adcd398dea10c1e681 /gnu/packages/guile-xyz.scm | |
parent | 08473753a0ebafef22c0894d846e3b42fd6be2a2 (diff) | |
parent | 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a (diff) | |
download | guix-3c6e220d8100281074c414a43c1efe9a01b53771.tar guix-3c6e220d8100281074c414a43c1efe9a01b53771.tar.gz |
Merge branch 'master' into staging.
With resolved conflicts in:
gnu/local.mk
gnu/packages/crates-io.scm
Diffstat (limited to 'gnu/packages/guile-xyz.scm')
-rw-r--r-- | gnu/packages/guile-xyz.scm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ca0999b622..2e7094cfff 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4951,7 +4951,7 @@ with a FSM is being built (for example, from a Makefile.)") (define-public guile-ini (package (name "guile-ini") - (version "0.5.1") + (version "0.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -4960,21 +4960,12 @@ with a FSM is being built (for example, from a Makefile.)") (file-name (string-append name "-" version)) (sha256 (base32 - "0ky7sffxywc2p84q5kdsphr99q0g5gy45rj0vx7f77hwpfm2093x")))) + "17fbys3gsfyx4f77a2fswirx76dlr57il2z27z77wljaz777jk36")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:phases (modify-phases %standard-phases - (delete 'strip) - (add-before 'build 'generate-fsm-context - ;; Make sure the intermediate FSM context is present - ;; before the build. - (lambda _ - (let ((cwd (getcwd))) - (chdir "modules/ini/") - (invoke "make" "GUILE_AUTO_COMPILE=0" - "fsm-context.scm") - (chdir cwd))))))) + (delete 'strip)))) (native-inputs (list autoconf automake pkg-config texinfo)) (inputs (list bash-minimal guile-3.0 guile-lib)) (propagated-inputs (list guile-smc)) |