mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates-frozen
This commit is contained in:
commit
d2e102d4e4
48 changed files with 3643 additions and 406 deletions
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015, 2017, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
|
@ -11,6 +11,7 @@
|
|||
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
||||
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -333,6 +334,74 @@ that implements both the msgpack and msgpack-rpc specifications.")
|
|||
(inputs
|
||||
`(("lua" ,lua-5.2)))))
|
||||
|
||||
(define-public libyaml
|
||||
(package
|
||||
(name "libyaml")
|
||||
(version "0.2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://pyyaml.org/download/libyaml/yaml-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x4fcw13r3lqy8ndydr3ili87wicplw2awbcv6r21qgyfndswhn6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static")))
|
||||
(home-page "https://pyyaml.org/wiki/LibYAML")
|
||||
(synopsis "YAML 1.1 parser and emitter written in C")
|
||||
(description
|
||||
"LibYAML is a YAML 1.1 parser and emitter written in C.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public libyaml+static
|
||||
(package
|
||||
(inherit libyaml)
|
||||
(name "libyaml+static")
|
||||
(arguments
|
||||
'(#:configure-flags '("--enable-static")))))
|
||||
|
||||
(define-public libcyaml
|
||||
(package
|
||||
(name "libcyaml")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tlsa/libcyaml")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "libcyaml-libyaml-compat.patch"))
|
||||
(sha256
|
||||
(base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
(string-append "CC=gcc"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(setenv "CC" "gcc")
|
||||
(invoke "make" "test"))))))
|
||||
(inputs
|
||||
`(("libyaml" ,libyaml)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(synopsis "C library for reading and writing YAML")
|
||||
(description
|
||||
"LibCYAML is a C library written in ISO C11 for reading and writing
|
||||
structured YAML documents. The fundamental idea behind CYAML is to allow
|
||||
applications to construct schemas which describe both the permissible
|
||||
structure of the YAML documents to read/write, and the C data structure(s)
|
||||
in which the loaded data is arranged in memory.")
|
||||
(home-page "https://github.com/tlsa/libcyaml")
|
||||
(license license:isc)))
|
||||
|
||||
(define-public yaml-cpp
|
||||
(package
|
||||
(name "yaml-cpp")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue