From patchwork Mon Jan 4 01:46:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 26210 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4492F27BC09; Mon, 4 Jan 2021 01:47:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 17D7227BC0A for ; Mon, 4 Jan 2021 01:47:18 +0000 (GMT) Received: from localhost ([::1]:44400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwExp-0001BD-6W for patchwork@mira.cbaines.net; Sun, 03 Jan 2021 20:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwExa-0001AK-B8 for guix-patches@gnu.org; Sun, 03 Jan 2021 20:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwExa-0005sR-3X for guix-patches@gnu.org; Sun, 03 Jan 2021 20:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kwExa-0004b9-25 for guix-patches@gnu.org; Sun, 03 Jan 2021 20:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45601] [PATCH 1/2] gnu: Add picoev. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 01:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45601@debbugs.gnu.org Received: via spool by 45601-submit@debbugs.gnu.org id=B45601.160972479917627 (code B ref 45601); Mon, 04 Jan 2021 01:47:02 +0000 Received: (at 45601) by debbugs.gnu.org; 4 Jan 2021 01:46:39 +0000 Received: from localhost ([127.0.0.1]:39019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwExC-0004a9-IA for submit@debbugs.gnu.org; Sun, 03 Jan 2021 20:46:38 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:13889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwEx9-0004Zo-GD for 45601@debbugs.gnu.org; Sun, 03 Jan 2021 20:46:36 -0500 Date: Mon, 04 Jan 2021 01:46:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609724788; bh=F/PfAWFBKivJtuHe4rv4J9q+HSIPxrOVMXdHfup9KdI=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=W0mkWuuMAoyiQz8nErC9bkwbUZKc7D4DRh7LZI2C+F/u7mJrtAk6B2lq7UpjIthdM bLxrwbSDmo6V/m2RT7eqeFcU1P8VGSJUh6F0ch4vGlloPwapy5UvzZ1bkzQN14/Blf 2VbhT8EXBOUNg4+kUXSUxS0j/NDuDCDC7t1C1Ay0= Message-ID: <20210104014620.19614-2-rprior@protonmail.com> In-Reply-To: <20210104014620.19614-1-rprior@protonmail.com> References: <20210104014620.19614-1-rprior@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: Ryan Prior X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (picoev): New variable. --- gnu/packages/networking.scm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8c9db0c6b4..42eb7b3c59 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1828,6 +1828,57 @@ passphrase can be recovered and the AP's wireless settings can be reconfigured.") (license license:gpl2+))) +(define-public picoev + (let ((commit "ff85d9ef578842a40f7c91d2544b7932cec74b9d") + (revision "0")) + (package + (name "picoev") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kazuho/picoev") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11ga0hyx6r229wvmds4gaq0ilrcb1j84gri7gxcnv7910yf1sv61")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests available + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + "LINUX_BUILD=1") + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (string-append (assoc-ref outputs "out"))) + (src (string-append out "/include")) + (lib (string-append out "/lib")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (mkdir-p src) + (mkdir-p lib) + (mkdir-p doc) + (for-each (cut install-file <> src) + '("picoev.h" + "picoev_epoll.c" + "picoev_kqueue.c" + "picoev_select.c")) + (install-file "libpicoev.so" lib) + (install-file "README.md" doc)) + #t))))) + (home-page "https://github.com/kazuho/picoev") + (synopsis "Tiny portable event loop library.") + (description + "This library provides a tiny event loop with a simple design, +supporting only @code{select(2)}, @code{epoll(2)}, and @code{kqueue(2)}.") + (license license:expat)))) + (define-public perl-danga-socket (package (name "perl-danga-socket") From patchwork Mon Jan 4 01:46:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 26209 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B827027BC0B; Mon, 4 Jan 2021 01:47:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 093A727BC09 for ; Mon, 4 Jan 2021 01:47:18 +0000 (GMT) Received: from localhost ([::1]:44392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwExp-0001B7-68 for patchwork@mira.cbaines.net; Sun, 03 Jan 2021 20:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwExa-0001AQ-NY for guix-patches@gnu.org; Sun, 03 Jan 2021 20:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwExa-0005sV-GV for guix-patches@gnu.org; Sun, 03 Jan 2021 20:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kwExa-0004bG-Et for guix-patches@gnu.org; Sun, 03 Jan 2021 20:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45601] [PATCH 2/2] gnu: vlang: Use system picoenv. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jan 2021 01:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45601@debbugs.gnu.org Received: via spool by 45601-submit@debbugs.gnu.org id=B45601.160972480617647 (code B ref 45601); Mon, 04 Jan 2021 01:47:02 +0000 Received: (at 45601) by debbugs.gnu.org; 4 Jan 2021 01:46:46 +0000 Received: from localhost ([127.0.0.1]:39022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwExJ-0004aY-V3 for submit@debbugs.gnu.org; Sun, 03 Jan 2021 20:46:46 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:27912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwExI-0004aF-LM for 45601@debbugs.gnu.org; Sun, 03 Jan 2021 20:46:45 -0500 Date: Mon, 04 Jan 2021 01:46:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609724798; bh=B30fK8lHaVZLqv+afh/nE3jOII7eLogb/3hoLGtz3B8=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=n8uWomfKeXgxVtVAlCXZNFDj6SAqHzErW+OmCk/+pMEqvQRFV0sV/DNplzPWPaooa YfaguoU969JhRGWpEUBlvxGLp1WfjJ5Jgcaoie6KjyyPcr408nEZb6bx6xsVrWM3Hk 0a95v56CasHZeEvpdZJf1dSLqRbc89Hf8EIsLTgA= Message-ID: <20210104014620.19614-3-rprior@protonmail.com> In-Reply-To: <20210104014620.19614-1-rprior@protonmail.com> References: <20210104014620.19614-1-rprior@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: Ryan Prior X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vlang.scm (vlang): Use system picoenv. --- gnu/packages/vlang.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index dd970e643a..c3f439fce6 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -24,6 +24,7 @@ #:use-module (gnu packages javascript) #:use-module (gnu packages linux) #:use-module (gnu packages maths) + #:use-module (gnu packages networking) #:use-module (gnu packages node) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) @@ -74,6 +75,7 @@ (for-each delete-file-recursively '("thirdparty/bignum" "thirdparty/cJSON" + "thirdparty/picoev" "thirdparty/wyhash")))))) (build-system gnu-build-system) (arguments @@ -102,7 +104,10 @@ (assoc-ref inputs "cJSON"))) (substitute* "vlib/hash/wyhash.c.v" (("@VROOT/thirdparty/wyhash") - (string-append (assoc-ref inputs "wyhash") "/include"))))) + (string-append (assoc-ref inputs "wyhash") "/include"))) + (substitute* "vlib/picoev/picoev.v" + (("@VROOT/thirdparty/picoev") + (string-append (assoc-ref inputs "picoev") "/include"))))) (add-before 'build 'patch-cc (lambda _ (let* ((bin "tmp/bin") @@ -164,6 +169,7 @@ `(("glib" ,glib) ("tiny-bignum" ,tiny-bignum) ("cJSON" ,(package-source cjson)) + ("picoev" ,picoev) ("wyhash" ,wyhash))) (native-inputs `(("vc"