summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-07-29 15:34:46 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-07-29 22:03:33 -0400
commite81228166e2349ded3d31d00642408ddb8a8d54e (patch)
treec3c2ac9bd177925d02c0b9a11e94086e378e7491 /gnu
parent84fa28234f452985237f94b6ca7349fb2edfb426 (diff)
gnu: web: Move libyaml and libcyaml to (gnu packages serialization).
Files to be adjusted were searched with the following command: $ git ls-files | xargs grep -l -E ',libc?yaml' | \ xargs grep -L '(gnu packages serialization)' * gnu/packages/web.scm (libyaml, libyaml+static, libcyaml): Move to... * gnu/packages/serialization.scm: ... here.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/bootloaders.scm2
-rw-r--r--gnu/packages/code.scm1
-rw-r--r--gnu/packages/disk.scm1
-rw-r--r--gnu/packages/emacs-xyz.scm1
-rw-r--r--gnu/packages/freedesktop.scm1
-rw-r--r--gnu/packages/guile-xyz.scm2
-rw-r--r--gnu/packages/haskell-xyz.scm2
-rw-r--r--gnu/packages/language.scm1
-rw-r--r--gnu/packages/music.scm1
-rw-r--r--gnu/packages/python-xyz.scm3
-rw-r--r--gnu/packages/serialization.scm71
-rw-r--r--gnu/packages/web.scm70
12 files changed, 82 insertions, 74 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 742992a119b..3faf7297270 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -59,11 +59,11 @@
59 #:use-module (gnu packages texinfo) 59 #:use-module (gnu packages texinfo)
60 #:use-module (gnu packages tls) 60 #:use-module (gnu packages tls)
61 #:use-module (gnu packages sdl) 61 #:use-module (gnu packages sdl)
62 #:use-module (gnu packages serialization)
62 #:use-module (gnu packages swig) 63 #:use-module (gnu packages swig)
63 #:use-module (gnu packages valgrind) 64 #:use-module (gnu packages valgrind)
64 #:use-module (gnu packages virtualization) 65 #:use-module (gnu packages virtualization)
65 #:use-module (gnu packages xorg) 66 #:use-module (gnu packages xorg)
66 #:use-module (gnu packages web)
67 #:use-module (guix build-system gnu) 67 #:use-module (guix build-system gnu)
68 #:use-module (guix download) 68 #:use-module (guix download)
69 #:use-module (guix git-download) 69 #:use-module (guix git-download)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 9a4e1511ed8..a414cde3dee 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -64,6 +64,7 @@
64 #:use-module (gnu packages perl-compression) 64 #:use-module (gnu packages perl-compression)
65 #:use-module (gnu packages pkg-config) 65 #:use-module (gnu packages pkg-config)
66 #:use-module (gnu packages python) 66 #:use-module (gnu packages python)
67 #:use-module (gnu packages serialization)
67 #:use-module (gnu packages sqlite) 68 #:use-module (gnu packages sqlite)
68 #:use-module (gnu packages texinfo) 69 #:use-module (gnu packages texinfo)
69 #:use-module (gnu packages web) 70 #:use-module (gnu packages web)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 2a4dbee748f..0495be3a36e 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -71,6 +71,7 @@
71 #:use-module (gnu packages python-xyz) 71 #:use-module (gnu packages python-xyz)
72 #:use-module (gnu packages readline) 72 #:use-module (gnu packages readline)
73 #:use-module (gnu packages samba) 73 #:use-module (gnu packages samba)
74 #:use-module (gnu packages serialization)
74 #:use-module (gnu packages sphinx) 75 #:use-module (gnu packages sphinx)
75 #:use-module (gnu packages sqlite) 76 #:use-module (gnu packages sqlite)
76 #:use-module (gnu packages swig) 77 #:use-module (gnu packages swig)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d468abd8e26..76a53dcebf5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -196,6 +196,7 @@
196 #:use-module (gnu packages ruby) 196 #:use-module (gnu packages ruby)
197 #:use-module (gnu packages rust-apps) 197 #:use-module (gnu packages rust-apps)
198 #:use-module (gnu packages scheme) 198 #:use-module (gnu packages scheme)
199 #:use-module (gnu packages serialization)
199 #:use-module (gnu packages speech) 200 #:use-module (gnu packages speech)
200 #:use-module (gnu packages xiph) 201 #:use-module (gnu packages xiph)
201 #:use-module (gnu packages mp3) 202 #:use-module (gnu packages mp3)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ce7ae8b7d50..693a79c7384 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -99,6 +99,7 @@
99 #:use-module (gnu packages python-xyz) 99 #:use-module (gnu packages python-xyz)
100 #:use-module (gnu packages rdesktop) 100 #:use-module (gnu packages rdesktop)
101 #:use-module (gnu packages samba) 101 #:use-module (gnu packages samba)
102 #:use-module (gnu packages serialization)
102 #:use-module (gnu packages sqlite) 103 #:use-module (gnu packages sqlite)
103 #:use-module (gnu packages valgrind) 104 #:use-module (gnu packages valgrind)
104 #:use-module (gnu packages video) 105 #:use-module (gnu packages video)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 40b08168dff..954121c57bf 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -101,6 +101,7 @@
101 #:use-module (gnu packages readline) 101 #:use-module (gnu packages readline)
102 #:use-module (gnu packages sdl) 102 #:use-module (gnu packages sdl)
103 #:use-module (gnu packages search) 103 #:use-module (gnu packages search)
104 #:use-module (gnu packages serialization)
104 #:use-module (gnu packages slang) 105 #:use-module (gnu packages slang)
105 #:use-module (gnu packages sqlite) 106 #:use-module (gnu packages sqlite)
106 #:use-module (gnu packages swig) 107 #:use-module (gnu packages swig)
@@ -108,7 +109,6 @@
108 #:use-module (gnu packages texinfo) 109 #:use-module (gnu packages texinfo)
109 #:use-module (gnu packages tls) 110 #:use-module (gnu packages tls)
110 #:use-module (gnu packages version-control) 111 #:use-module (gnu packages version-control)
111 #:use-module (gnu packages web)
112 #:use-module (gnu packages webkit) 112 #:use-module (gnu packages webkit)
113 #:use-module (gnu packages xdisorg) 113 #:use-module (gnu packages xdisorg)
114 #:use-module (gnu packages xorg) 114 #:use-module (gnu packages xorg)
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 7ed0db6c663..bb594767953 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -66,7 +66,7 @@
66 #:use-module (gnu packages pcre) 66 #:use-module (gnu packages pcre)
67 #:use-module (gnu packages pkg-config) 67 #:use-module (gnu packages pkg-config)
68 #:use-module (gnu packages sdl) 68 #:use-module (gnu packages sdl)
69 #:use-module (gnu packages web) 69 #:use-module (gnu packages serialization)
70 #:use-module (gnu packages xml) 70 #:use-module (gnu packages xml)
71 #:use-module (gnu packages xorg) 71 #:use-module (gnu packages xorg)
72 #:use-module (guix build-system haskell) 72 #:use-module (guix build-system haskell)
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 861a92505f2..89298826973 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -48,6 +48,7 @@
48 #:use-module (gnu packages perl-check) 48 #:use-module (gnu packages perl-check)
49 #:use-module (gnu packages qt) 49 #:use-module (gnu packages qt)
50 #:use-module (gnu packages sqlite) 50 #:use-module (gnu packages sqlite)
51 #:use-module (gnu packages serialization)
51 #:use-module (gnu packages swig) 52 #:use-module (gnu packages swig)
52 #:use-module (gnu packages texinfo) 53 #:use-module (gnu packages texinfo)
53 #:use-module (gnu packages web) 54 #:use-module (gnu packages web)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index dee17acacb1..139ae69bf4b 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -150,6 +150,7 @@
150 #:use-module (gnu packages readline) 150 #:use-module (gnu packages readline)
151 #:use-module (gnu packages rsync) 151 #:use-module (gnu packages rsync)
152 #:use-module (gnu packages sdl) 152 #:use-module (gnu packages sdl)
153 #:use-module (gnu packages serialization)
153 #:use-module (gnu packages sphinx) 154 #:use-module (gnu packages sphinx)
154 #:use-module (gnu packages sqlite) 155 #:use-module (gnu packages sqlite)
155 #:use-module (gnu packages stb) 156 #:use-module (gnu packages stb)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4b2ed029028..59cd7107bf1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -190,8 +190,9 @@
190 #:use-module (gnu packages readline) 190 #:use-module (gnu packages readline)
191 #:use-module (gnu packages regex) 191 #:use-module (gnu packages regex)
192 #:use-module (gnu packages sdl) 192 #:use-module (gnu packages sdl)
193 #:use-module (gnu packages search)
194 #:use-module (gnu packages scanner) 193 #:use-module (gnu packages scanner)
194 #:use-module (gnu packages search)
195 #:use-module (gnu packages serialization)
195 #:use-module (gnu packages shells) 196 #:use-module (gnu packages shells)
196 #:use-module (gnu packages sphinx) 197 #:use-module (gnu packages sphinx)
197 #:use-module (gnu packages ssh) 198 #:use-module (gnu packages ssh)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 8f292ae4084..19fbafa3380 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2015, 2017, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> 2;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
3;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> 3;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
4;;; Copyright © 2016 David Craven <david@craven.ch> 4;;; Copyright © 2016 David Craven <david@craven.ch>
5;;; Copyright © 2016, 2019, 2020 Marius Bakke <mbakke@fastmail.com> 5;;; Copyright © 2016, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -10,6 +10,7 @@
10;;; Copyright © 2017 Nikita <nikita@n0.is> 10;;; Copyright © 2017 Nikita <nikita@n0.is>
11;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> 11;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
12;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> 12;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
13;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
13;;; 14;;;
14;;; This file is part of GNU Guix. 15;;; This file is part of GNU Guix.
15;;; 16;;;
@@ -333,6 +334,74 @@ that implements both the msgpack and msgpack-rpc specifications.")
333 (inputs 334 (inputs
334 `(("lua" ,lua-5.2))))) 335 `(("lua" ,lua-5.2)))))
335 336
337(define-public libyaml
338 (package
339 (name "libyaml")
340 (version "0.2.5")
341 (source
342 (origin
343 (method url-fetch)
344 (uri (string-append "https://pyyaml.org/download/libyaml/yaml-"
345 version ".tar.gz"))
346 (sha256
347 (base32
348 "1x4fcw13r3lqy8ndydr3ili87wicplw2awbcv6r21qgyfndswhn6"))))
349 (build-system gnu-build-system)
350 (arguments
351 '(#:configure-flags '("--disable-static")))
352 (home-page "https://pyyaml.org/wiki/LibYAML")
353 (synopsis "YAML 1.1 parser and emitter written in C")
354 (description
355 "LibYAML is a YAML 1.1 parser and emitter written in C.")
356 (license license:expat)))
357
358(define-public libyaml+static
359 (package
360 (inherit libyaml)
361 (name "libyaml+static")
362 (arguments
363 '(#:configure-flags '("--enable-static")))))
364
365(define-public libcyaml
366 (package
367 (name "libcyaml")
368 (version "1.1.0")
369 (source
370 (origin
371 (method git-fetch)
372 (uri (git-reference
373 (url "https://github.com/tlsa/libcyaml")
374 (commit (string-append "v" version))))
375 (file-name (git-file-name name version))
376 (patches (search-patches "libcyaml-libyaml-compat.patch"))
377 (sha256
378 (base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"))))
379 (build-system gnu-build-system)
380 (arguments
381 `(#:make-flags
382 (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
383 (string-append "CC=gcc"))
384 #:phases
385 (modify-phases %standard-phases
386 (delete 'configure) ; no configure script
387 (replace 'check
388 (lambda _
389 (setenv "CC" "gcc")
390 (invoke "make" "test"))))))
391 (inputs
392 `(("libyaml" ,libyaml)))
393 (native-inputs
394 `(("pkg-config" ,pkg-config)))
395 (synopsis "C library for reading and writing YAML")
396 (description
397 "LibCYAML is a C library written in ISO C11 for reading and writing
398structured YAML documents. The fundamental idea behind CYAML is to allow
399applications to construct schemas which describe both the permissible
400structure of the YAML documents to read/write, and the C data structure(s)
401in which the loaded data is arranged in memory.")
402 (home-page "https://github.com/tlsa/libcyaml")
403 (license license:isc)))
404
336(define-public yaml-cpp 405(define-public yaml-cpp
337 (package 406 (package
338 (name "yaml-cpp") 407 (name "yaml-cpp")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 42827bc2016..432ed3c445e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -39,7 +39,6 @@
39;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> 39;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
40;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de> 40;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de>
41;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> 41;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
42;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
43;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> 42;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
44;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> 43;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
45;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> 44;;; Copyright © 2018, 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
@@ -166,6 +165,7 @@
166 #:use-module (gnu packages re2c) 165 #:use-module (gnu packages re2c)
167 #:use-module (gnu packages readline) 166 #:use-module (gnu packages readline)
168 #:use-module (gnu packages search) 167 #:use-module (gnu packages search)
168 #:use-module (gnu packages serialization)
169 #:use-module (gnu packages sphinx) 169 #:use-module (gnu packages sphinx)
170 #:use-module (gnu packages texinfo) 170 #:use-module (gnu packages texinfo)
171 #:use-module (gnu packages textutils) 171 #:use-module (gnu packages textutils)
@@ -1854,34 +1854,6 @@ hash/signatures.")
1854 ;; Source code may be distributed under either license. 1854 ;; Source code may be distributed under either license.
1855 (license (list license:expat license:gpl2+)))) 1855 (license (list license:expat license:gpl2+))))
1856 1856
1857(define-public libyaml
1858 (package
1859 (name "libyaml")
1860 (version "0.2.5")
1861 (source
1862 (origin
1863 (method url-fetch)
1864 (uri (string-append "https://pyyaml.org/download/libyaml/yaml-"
1865 version ".tar.gz"))
1866 (sha256
1867 (base32
1868 "1x4fcw13r3lqy8ndydr3ili87wicplw2awbcv6r21qgyfndswhn6"))))
1869 (build-system gnu-build-system)
1870 (arguments
1871 '(#:configure-flags '("--disable-static")))
1872 (home-page "https://pyyaml.org/wiki/LibYAML")
1873 (synopsis "YAML 1.1 parser and emitter written in C")
1874 (description
1875 "LibYAML is a YAML 1.1 parser and emitter written in C.")
1876 (license license:expat)))
1877
1878(define-public libyaml+static
1879 (package
1880 (inherit libyaml)
1881 (name "libyaml+static")
1882 (arguments
1883 '(#:configure-flags '("--enable-static")))))
1884
1885(define-public libquvi-scripts 1857(define-public libquvi-scripts
1886 (package 1858 (package
1887 (name "libquvi-scripts") 1859 (name "libquvi-scripts")
@@ -5433,46 +5405,6 @@ developed as part of the Netsurf project.")
5433written in C. It is developed as part of the NetSurf project.") 5405written in C. It is developed as part of the NetSurf project.")
5434 (license license:expat))) 5406 (license license:expat)))
5435 5407
5436(define-public libcyaml
5437 (package
5438 (name "libcyaml")
5439 (version "1.1.0")
5440 (source
5441 (origin
5442 (method git-fetch)
5443 (uri (git-reference
5444 (url "https://github.com/tlsa/libcyaml")
5445 (commit (string-append "v" version))))
5446 (file-name (git-file-name name version))
5447 (patches (search-patches "libcyaml-libyaml-compat.patch"))
5448 (sha256
5449 (base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"))))
5450 (build-system gnu-build-system)
5451 (arguments
5452 `(#:make-flags
5453 (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
5454 (string-append "CC=gcc"))
5455 #:phases
5456 (modify-phases %standard-phases
5457 (delete 'configure) ; no configure script
5458 (replace 'check
5459 (lambda _
5460 (setenv "CC" "gcc")
5461 (invoke "make" "test"))))))
5462 (inputs
5463 `(("libyaml" ,libyaml)))
5464 (native-inputs
5465 `(("pkg-config" ,pkg-config)))
5466 (synopsis "C library for reading and writing YAML")
5467 (description
5468 "LibCYAML is a C library written in ISO C11 for reading and writing
5469structured YAML documents. The fundamental idea behind CYAML is to allow
5470applications to construct schemas which describe both the permissible
5471structure of the YAML documents to read/write, and the C data structure(s)
5472in which the loaded data is arranged in memory.")
5473 (home-page "https://github.com/tlsa/libcyaml")
5474 (license license:isc)))
5475
5476(define-public libdom 5408(define-public libdom
5477 (package 5409 (package
5478 (name "libdom") 5410 (name "libdom")
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 09:46:23 +0000