From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33261) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j21rP-0006E5-Ik for guix-patches@gnu.org; Wed, 12 Feb 2020 18:56:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j21rO-00012X-C9 for guix-patches@gnu.org; Wed, 12 Feb 2020 18:56:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53237) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j21rN-00011S-W8 for guix-patches@gnu.org; Wed, 12 Feb 2020 18:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j21rN-0006qD-VH for guix-patches@gnu.org; Wed, 12 Feb 2020 18:56:01 -0500 Subject: bug#39574: [PATCH] gnu: Add libcyaml. References: <5794eac4fb9ef5e9215527c24cecfb7fc362d6a7.camel@zrythm.org> In-Reply-To: <5794eac4fb9ef5e9215527c24cecfb7fc362d6a7.camel@zrythm.org> Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Thu, 13 Feb 2020 00:56:07 +0100 Message-ID: <87y2t7e4x4.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via To: 39574-done@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; format=flowed Alexandros, Pushed as eb642f3d247ee0c74122017354c57bdce028eb57, with the indentation tweaks below (C-M-q in emacs, and moving the comment in-line). Thanks! T G-R --=-=-= Content-Type: text/patch Content-Disposition: inline diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 18e392f857..7f67dd764e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1441,15 +1441,14 @@ hash/signatures.") (name "libcyaml") (version "1.0.1") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tlsa/libcyaml.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tlsa/libcyaml.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -1457,20 +1456,19 @@ hash/signatures.") (string-append "CC=gcc")) #:phases (modify-phases %standard-phases - ;; no configure script - (delete 'configure) + (delete 'configure) ; no configure script (replace 'check (lambda _ (setenv "CC" "gcc") (invoke "make" "test")))))) (inputs - `(("libyaml" ,libyaml))) + `(("libyaml" ,libyaml))) (native-inputs - `(("pkg-config", pkg-config) - ("git", git))) + `(("git", git) + ("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 + "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) --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfo+u0AlEeO9y5k0W2Imw8BjFSTwFAl5EkJcACgkQ2Imw8BjF STw0KQ//fR/9RJumwGTfpSJfM3u1Chm433fqRzgRN/QFdtndOcqCPvVWNVvRhwHj wGrQKwhZ9i1es1B72qSB5JKc/dC6o6pW133+0uzEGJwLhncMtsCc2gyZPU7haeEU XpRVOhyiNmKxM2L9HCqOZaHKxe/m3FDlzgzSxk2iR3ZSlayvqsuZXO3Xq818Fxz+ HmAbdE4Tsjpcuw64hpBnzHAIGwP3sd/MtSvlsMqja5FHQ7neLOMX5ECMCCNCb+v4 fvopOhiB5xOrm+QC2dweeGuT6GsV64ze6/KmbLVFtfn6CUqbEgHc2Iy+1ZR33oZQ jkLB12BGXi9+NcZMPGi0QRso+Kh6SPLS6zgeGcUa/npMX4fxkAxD7xA//ER0B0IW 04xF727IFMEdBga+xj551LxSV+manmNPbUnuz40pZ0gHjCVNqI+395eNUPrX5F8f 7hhsKkKrHQkDgPc5vtONH0ESrlV6Dk3EB9RKaFmXHAuF79VDsTDoyGjR0G/Hb6PZ YGm+pl4AA/EX3ZcpPC3roL07HzjrbWvPhLci5r1ApHG8h0PSiiDXXj6NVps7cASx dTRV10FiRa7wweNEZNvGitLFaFDLWA0Mu/M4Pg5454S7Y595L+73/UfXBXizm02E AJUAMugPZ94xOZyPD9bqzDw6BjSt/TXInejR9/5945aieEqN0js= =yVUg -----END PGP SIGNATURE----- --==-=-=--