From patchwork Sat Sep 25 01:39:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Paul Weber X-Patchwork-Id: 33276 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 BC2CF27BBE5; Sat, 25 Sep 2021 02:40:19 +0100 (BST) 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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 79A9827BBE1 for ; Sat, 25 Sep 2021 02:40:19 +0100 (BST) Received: from localhost ([::1]:56304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTwfq-0000b5-Ib for patchwork@mira.cbaines.net; Fri, 24 Sep 2021 21:40:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTwfb-0000aN-EU for guix-patches@gnu.org; Fri, 24 Sep 2021 21:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTwfb-0000Li-77 for guix-patches@gnu.org; Fri, 24 Sep 2021 21:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTwfb-0006SM-50 for guix-patches@gnu.org; Fri, 24 Sep 2021 21:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50793] [PATCH 1/2] gnu: Add JSON.sh References: <20210925013848.GA2384@singpolyma-beefy.lan> In-Reply-To: <20210925013848.GA2384@singpolyma-beefy.lan> Resent-From: Stephen Paul Weber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Sep 2021 01:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50793@debbugs.gnu.org Cc: Stephen Paul Weber Received: via spool by 50793-submit@debbugs.gnu.org id=B50793.163253398524764 (code B ref 50793); Sat, 25 Sep 2021 01:40:03 +0000 Received: (at 50793) by debbugs.gnu.org; 25 Sep 2021 01:39:45 +0000 Received: from localhost ([127.0.0.1]:59756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTwfI-0006RH-Hr for submit@debbugs.gnu.org; Fri, 24 Sep 2021 21:39:44 -0400 Received: from singpolyma.net ([192.99.233.116]:49443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTwfE-0006Qo-7W for 50793@debbugs.gnu.org; Fri, 24 Sep 2021 21:39:41 -0400 Received: by singpolyma.net (Postfix, from userid 1000) id E65144861689; Sat, 25 Sep 2021 01:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=singpolyma.net; s=iweb; t=1632533979; bh=jPVWIXxQZ18+K1pGgNHlOqfl7bHGIDPDzs3rXLfVTOA=; h=From:To:Cc:Subject:Date:From; b=HpfaX3gcUwFVIcKXtPSz9hmJmsMY0L4d3NcdQIMD8z+AZ1nbK0QMQGpvszDhsj+FM A1tsdcatrQLvpiLqzpEScn3dV9zqGrMX+gJt9mGnGXy8iaR0HjyaXmCPn2Cw0S5MQu f3k4IAHT3EaNz5apx6qLM/tGskCLMzf2YHwIoGIA= From: Stephen Paul Weber Date: Fri, 24 Sep 2021 20:39:33 -0500 Message-Id: <20210925013934.2763-1-singpolyma@singpolyma.net> X-Mailer: git-send-email 2.20.1 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/serialization.scm (JSON.sh): New variable. --- gnu/packages/serialization.scm | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 196141ace8..f5677d9e5f 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -34,10 +34,13 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -458,6 +461,48 @@ it a convenient format to store user input files.") (base32 "1180ln8blrb0mwzpcf78k49hlki6di65q77rsvglf83kfcyh4d7z")))))) +(define-public JSON.sh + (package + (name "JSON.sh") + (version "0d5e5c7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominictarr/JSON.sh") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14lxvp5xbdk0dcwkjbdp098z1108j8z48zaibndh4i731kkcz43i")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("JSON.sh" "bin/")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda _ + (invoke "./all-tests.sh") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") "/bin/JSON.sh") + `("PATH" ":" prefix + (,(string-join + (map (lambda (in) (string-append (assoc-ref inputs in) "/bin")) + '("grep" "coreutils")) + ":"))))))))) + (inputs + `(("bash-minimal" ,bash-minimal) + ("grep" ,grep) + ("coreutils" ,coreutils))) + (synopsis + "Pipeable JSON parser written in shell") + (description + "JSON parser written in shell, compatible with ash, bash, dash and zsh") + (home-page "https://github.com/dominictarr/JSON.sh") + (license license:asl2.0))) + (define-public capnproto (package (name "capnproto") From patchwork Sat Sep 25 01:39:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Paul Weber X-Patchwork-Id: 33277 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 3784527BBE1; Sat, 25 Sep 2021 02:40:20 +0100 (BST) 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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 B262527BBE3 for ; Sat, 25 Sep 2021 02:40:19 +0100 (BST) Received: from localhost ([::1]:56298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTwfq-0000ay-QM for patchwork@mira.cbaines.net; Fri, 24 Sep 2021 21:40:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTwfb-0000aF-1P for guix-patches@gnu.org; Fri, 24 Sep 2021 21:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTwfa-0000LY-Qp for guix-patches@gnu.org; Fri, 24 Sep 2021 21:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTwfa-0006SE-Nl for guix-patches@gnu.org; Fri, 24 Sep 2021 21:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50793] [PATCH 2/2] gnu: Add cloudflare-cli Resent-From: Stephen Paul Weber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Sep 2021 01:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50793@debbugs.gnu.org Cc: Stephen Paul Weber Received: via spool by 50793-submit@debbugs.gnu.org id=B50793.163253398424758 (code B ref 50793); Sat, 25 Sep 2021 01:40:02 +0000 Received: (at 50793) by debbugs.gnu.org; 25 Sep 2021 01:39:44 +0000 Received: from localhost ([127.0.0.1]:59754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTwfI-0006RF-7W for submit@debbugs.gnu.org; Fri, 24 Sep 2021 21:39:44 -0400 Received: from singpolyma.net ([192.99.233.116]:50493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTwfE-0006Qp-AE for 50793@debbugs.gnu.org; Fri, 24 Sep 2021 21:39:40 -0400 Received: by singpolyma.net (Postfix, from userid 1000) id 12884486168A; Sat, 25 Sep 2021 01:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=singpolyma.net; s=iweb; t=1632533980; bh=iTxKdYxqtfnOmeCPtmvT1LjdlbceHS8pM1TZTVaFFLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OVqjKFcVnhTcQuyN9pTmoYNmWr206ukId5fOadFU01m9Tha4M8XkbtBjFMPtx9qqN X9AQM2UV3zJfNrJN5wMvjZPmIutjC+P6tR88mijBmmIx4HYntdEjumnRCpSQ64fHUX 6zk+IC9oawp6PAcQVsrJpnaLp4WqgkMDdpO057Mc= From: Stephen Paul Weber Date: Fri, 24 Sep 2021 20:39:34 -0500 Message-Id: <20210925013934.2763-2-singpolyma@singpolyma.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210925013934.2763-1-singpolyma@singpolyma.net> References: <20210925013934.2763-1-singpolyma@singpolyma.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dns.scm (cloudflare-cli): New variable. --- gnu/packages/dns.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 45e250138e..9e68d76a93 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages certs) #:use-module (gnu packages check) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages compression) @@ -69,6 +70,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ragel) + #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) @@ -82,11 +84,61 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system trivial)) +(define-public cloudflare-cli + (package + (name "cloudflare-cli") + (version "2d986d3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/earlchew/cloudflare-cli") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f86g6n86kwykl3jnhqjrdfy8ybkp03ghr3dlr70q2552qw4axw2")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("cloudflare-cli" "bin/") ("cloudflare-cli.sh" "bin/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-jsonsh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cloudflare-cli.sh" + (("\\$\\{0%/\\*\\}/jsonsh") + (string-append (assoc-ref inputs "JSON.sh") "/bin/JSON.sh"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") "/bin/cloudflare-cli") + `("PATH" ":" prefix + (,(string-join + (map (lambda (in) (string-append (assoc-ref inputs in) "/bin")) + '("grep" "curl" "coreutils")) + ":"))))))))) + (inputs + `(("bash-minimal" ,bash-minimal) + ("coreutils" ,coreutils) + ("curl" ,curl) + ("grep" ,grep) + ("JSON.sh" ,JSON.sh))) + (synopsis + "CLI to edit Cloudflare DNS records") + (description + "This command line tool to update Cloudfare DNS records is useful in the +following scenarios: +* Keeping dynamic DNS records up to date +* Updating DNS records as part of the ACME DNS-01 protocol") + (home-page "https://github.com/earlchew/cloudflare-cli") + (license license:expat))) + (define-public ldns (package (name "ldns")