From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:55853) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jI1rH-0007C7-VR for guix-patches@gnu.org; Fri, 27 Mar 2020 23:10:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jI1rG-0003bI-K8 for guix-patches@gnu.org; Fri, 27 Mar 2020 23:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55838) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jI1rG-0003aN-GK for guix-patches@gnu.org; Fri, 27 Mar 2020 23:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jI1rG-0005Mf-8O for guix-patches@gnu.org; Fri, 27 Mar 2020 23:10:02 -0400 Subject: [bug#39796] [PATCH v2] gnu: Add guile-websocket. Resent-Message-ID: From: Evan Straw References: <87o8tlewxf.fsf@gmail.com> <20200315183607.GF5561@jasmine.lan> <87d091ljwg.fsf@gnu.org> Date: Fri, 27 Mar 2020 20:09:04 -0700 In-Reply-To: <87d091ljwg.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 24 Mar 2020 18:53:03 +0100") Message-ID: <87k1356ur3.fsf_-_@gmail.com> 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" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 39796@debbugs.gnu.org, Leo Famulari --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello, > > Leo Famulari skribis: > >> On Tue, Feb 25, 2020 at 09:31:56PM -0800, Evan Straw wrote: >>> From ba695ba2cbf27014e1ed95da8a0620988f03fa54 Mon Sep 17 00:00:00 2001 >>> From: Evan Straw >>> Date: Tue, 25 Feb 2020 12:08:46 -0800 >>> Subject: [PATCH] gnu: Add guile-websocket. >>>=20 >>> * gnu/packages/guile-xyz.scm (guile-websocket): New variable. >> >> Thanks for this patch! >> >> Overall looks good, but the hash of the source code is not correct for >> me: >> >> ------ >> r:sha256 hash mismatch for /gnu/store/f4gz64dfsqmhbbg24ggzf9ffcr6k2znf-g= uile-websocket-0.1-checkout: >> expected hash: 10r8384frlyrljjdyzilrh8hzi60v9hisx4fxjs7rmg9g01cs77k >> actual hash: 1hymvsfrmq9qxr5cxnsgdz7y757yp1cpsgxmdp3f5wxxxpqgsmzx >> hash mismatch for store item '/gnu/store/f4gz64dfsqmhbbg24ggzf9ffcr6k2zn= f-guile-websocket-0.1-checkout' >> build of /gnu/store/n6kxplhzysqq4d82p1m2wa2y48lbgswb-guile-websocket-0.1= -checkout.drv failed >> ------ >> >> My guess is that you already had something corresponding to the expected >> hash in /gnu/store, and so Guix did not even try to clone the upstream >> repo. Probably another commit of guile-websocket, assuming the package >> did build for you. >> >> Can you take a look and send a revised patch? Fixed this, apologies for the long delay, had some things come up rather suddenly.=20 > > Also, it should be called =E2=80=9Cguile3.0-websocket=E2=80=9D. > Also fixed this. A revised patch should be attached to this email. Thanks everyone for pointing these out! =2D- Evan --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-guile3.0-websocket.patch Content-Transfer-Encoding: quoted-printable Content-Description: Updated patch for guile3.0-websocket From=2025993e9705306516e393105e761488630d519354 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Fri, 27 Mar 2020 19:58:39 -0700 Subject: [PATCH] gnu: Add guile3.0-websocket. * gnu/packages/guile-xyz.scm (guile3.0-websocket): New variable. =2D-- gnu/packages/guile-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 09427da487..6b489203b1 100644 =2D-- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3241,3 +3241,45 @@ according to Bitorrent BEP003.") Relay Chat} (IRC).") ;; Some file headers incorrectly say LGPLv2+. (license license:lgpl2.1+)))) + +(define-public guile3.0-websocket + (let ((commit "c854e0f84a40d972cbd532bbb89c97ca0126a7cf")) + (package + (name "guile3.0-websocket") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://dthompson.us/guile-websocket.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hymvsfrmq9qxr5cxnsgdz7y757yp1cpsgxmdp3f5wxxxpqgsmzx")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=3D0") + #:phases + (modify-phases %standard-phases + ;; The package was developed for Guile 2.0 and has this version + ;; hardcoded in the configure.ac and Makefile.am files. Substit= ute + ;; 3.0 instead so it can support Guile 3.0. + (add-after 'unpack 'update-guile-version + (lambda _ + (substitute* "configure.ac" + (("2.0.9") "3.0.0")) + (substitute* "Makefile.am" + (("2.0") "3.0")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("guile" ,guile-next))) + (synopsis "Websocket server/client for Guile") + (description "Guile-websocket provides an implementation of the +WebSocket protocol as defined by RFC 6455.") + (home-page "https://git.dthompson.us/guile-websocket.git") + (license license:lgpl3+)))) =2D-=20 2.20.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE6f/SZXb4DLdwy+VR9TDDtKKp8G0FAl5+v9AACgkQ9TDDtKKp 8G15+RAAvX9gTDrL7D9p2CqnhV9EZjIZ1U3dRaFC6HRNlrDfTWeZXSD7oB0bKIZV vjjJgdPJRRZ3j0HYH2Jv3k0FX1z+CjI5KsqMElBLFB/Rv9hDCQ+DdhyD4vvMXRRd UL+qBsGQV5XSo0Wra/FaGY6TnQaKFOYk3m+iQuWbQALKTi3dq241KQlpymbcco7c bFOCgqt9ordUgNo/HSDyzX4w5sgS+OGTIXN6ShjEpXWz/KHrSEd6kstDRNyXzx14 wN+ELTNFfHkkcs/WYqfleVCTwBKQenjcNK3BDn3Q6gF9L47QlRc3JHMYTpDH1vHV mKfeAuGko2QBH1fmrN8maLY8qPyrUuhayzpKGocdiXTIKkFsqIG7wXMqdUD43w/X d2F1z/vgAaT41TFdCsymXYmBOyWBQWXZY7RQ+ZYExs2XxzyHlsut6XR9cMk51zJV JqvEO29MTu8cwYL4gJ1PAFHczSlG/0s5tkd0owgP70TTXQwkeY8aMiRuCgn7gGfY 6d+baqJ6hSKtt6pLGqLYONnMftp1Sr19oyaMqrLUUsDWepWua+gO/jlRSlSSNSXH qZ4TFS/t2Xuge9w329hVJ0Bx11NZFdNEzGU7jGfKxMU2SBHrGpXBPyXgtcd3k0BN ag3J0TVKDVBVfQPaNfbHarCSY/sn3VzFHyysbUH7fnWt5eWtly8= =oUNS -----END PGP SIGNATURE----- --==-=-=--