gnu: guile-libyaml: Update to 0-2.2bdacb7.
* gnu/packages/guile-xyz.scm (guile-libyaml): Update to 0-2.2bdacb7. [arguments]: Do not attempt to delete non-existent files. Use (system ffi-help-rt) from nyacc package. Do not return #t from custom phases. [native-inputs]: Move nyacc to ... [propagated-inputs]: ... here.
This commit is contained in:
parent
29b594fa16
commit
4fd6aabeaa
|
@ -4589,8 +4589,8 @@ (define-public guile-drmaa
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public guile-libyaml
|
(define-public guile-libyaml
|
||||||
(let ((commit "f5d33a6880e96571d3cb079ed7755ffc156cac46")
|
(let ((commit "2bdacb72a65ab63264b2edc9dac9692df7ec9b3e")
|
||||||
(revision "1"))
|
(revision "2"))
|
||||||
(package
|
(package
|
||||||
(name "guile-libyaml")
|
(name "guile-libyaml")
|
||||||
(version (git-version "0" revision commit))
|
(version (git-version "0" revision commit))
|
||||||
|
@ -4603,7 +4603,7 @@ (define-public guile-libyaml
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"12x91983fh1j39zy7kbk19acc1rqdh8515ddx1mh7l26j04k9wgq"))))
|
"1bssby1ri1vjll2rvi8b33xr2ghwjyxsd4yc15najj3h8n2ss87i"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules (((guix build guile-build-system)
|
`(#:modules (((guix build guile-build-system)
|
||||||
|
@ -4617,28 +4617,16 @@ (define-public guile-libyaml
|
||||||
(delete 'configure)
|
(delete 'configure)
|
||||||
(add-after 'unpack 'remove-unused-files
|
(add-after 'unpack 'remove-unused-files
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(for-each delete-file
|
(for-each delete-file '("guix.scm" "demo1.yml" "demo1.scm"))))
|
||||||
'("guix.scm" "demo1.yml" "demo1.scm"
|
|
||||||
"yaml/libyaml.scm"
|
|
||||||
;; This file is mismatched with the generated FFI code.
|
|
||||||
"yaml/ffi-help-rt.scm"))
|
|
||||||
(copy-file (string-append (assoc-ref inputs "nyacc")
|
|
||||||
"/share/guile/site/3.0/system/ffi-help-rt.scm")
|
|
||||||
"yaml/ffi-help-rt.scm")
|
|
||||||
(substitute* "yaml/ffi-help-rt.scm"
|
|
||||||
(("system ffi-help-rt") "yaml ffi-help-rt"))
|
|
||||||
#true))
|
|
||||||
(add-before 'build 'build-ffi
|
(add-before 'build 'build-ffi
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(invoke "guild" "compile-ffi"
|
(invoke "guild" "compile-ffi"
|
||||||
"--no-exec" ; allow us to patch the generated file
|
"--no-exec" ; allow us to patch the generated file
|
||||||
"yaml/libyaml.ffi")
|
"yaml/libyaml.ffi")
|
||||||
(substitute* "yaml/libyaml.scm"
|
(substitute* "yaml/libyaml.scm"
|
||||||
(("system ffi-help-rt") "yaml ffi-help-rt")
|
|
||||||
(("dynamic-link \"libyaml\"")
|
(("dynamic-link \"libyaml\"")
|
||||||
(format #false "dynamic-link \"~a/lib/libyaml\""
|
(format #false "dynamic-link \"~a/lib/libyaml\""
|
||||||
(assoc-ref inputs "libyaml"))))
|
(assoc-ref inputs "libyaml"))))))
|
||||||
#true))
|
|
||||||
(replace 'build
|
(replace 'build
|
||||||
(assoc-ref guile:%standard-phases 'build))
|
(assoc-ref guile:%standard-phases 'build))
|
||||||
(delete 'install))))
|
(delete 'install))))
|
||||||
|
@ -4646,9 +4634,8 @@ (define-public guile-libyaml
|
||||||
`(("guile" ,guile-3.0)
|
`(("guile" ,guile-3.0)
|
||||||
("libyaml" ,libyaml)))
|
("libyaml" ,libyaml)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("guile-bytestructures" ,guile-bytestructures)))
|
`(("guile-bytestructures" ,guile-bytestructures)
|
||||||
(native-inputs
|
("nyacc" ,nyacc)))
|
||||||
`(("nyacc" ,nyacc)))
|
|
||||||
(home-page "https://github.com/mwette/guile-libyaml")
|
(home-page "https://github.com/mwette/guile-libyaml")
|
||||||
(synopsis "Guile wrapper for libyaml")
|
(synopsis "Guile wrapper for libyaml")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in a new issue