From patchwork Sun Sep 26 01:29:45 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: 33293 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 1B73727BBE3; Sun, 26 Sep 2021 02:30:58 +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 CAF3327BBE1 for ; Sun, 26 Sep 2021 02:30:57 +0100 (BST) Received: from localhost ([::1]:56984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUJ0K-0003o8-UG for patchwork@mira.cbaines.net; Sat, 25 Sep 2021 21:30:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUIzT-0003ea-Ri for guix-patches@gnu.org; Sat, 25 Sep 2021 21:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUIzT-0000KG-KD for guix-patches@gnu.org; Sat, 25 Sep 2021 21:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUIzS-0005Rz-GE for guix-patches@gnu.org; Sat, 25 Sep 2021 21:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50793] [PATCH v2 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: Sun, 26 Sep 2021 01:30: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.163261979720910 (code B ref 50793); Sun, 26 Sep 2021 01:30:02 +0000 Received: (at 50793) by debbugs.gnu.org; 26 Sep 2021 01:29:57 +0000 Received: from localhost ([127.0.0.1]:35201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUIzN-0005RB-DX for submit@debbugs.gnu.org; Sat, 25 Sep 2021 21:29:57 -0400 Received: from singpolyma.net ([192.99.233.116]:41933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUIzL-0005Qz-Tw for 50793@debbugs.gnu.org; Sat, 25 Sep 2021 21:29:56 -0400 Received: by singpolyma.net (Postfix, from userid 1000) id 3CB47486167C; Sun, 26 Sep 2021 01:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=singpolyma.net; s=iweb; t=1632619795; bh=4T9TQ6QWmVM5oSF0nkP6zKNIWa7OcmcvqYgrCDvgItA=; h=From:To:Cc:Subject:Date:From; b=YsKahkBcUMOp5H1jPWEbdjl+X6zIT5FnRDVsdGp494M7qYUznx/gbPRSyIgFqGIGE /6HEslAuse8kBYgGH7IM08eu8mHLRn5R/vz9I/DfndIhgE3OqzdyT03CcT3BOJ+xtt hsn7z8RAhGf7hc2ss0kDeeMl3Ocqp8quNYrIGB+g= From: Stephen Paul Weber Date: Sat, 25 Sep 2021 20:29:45 -0500 Message-Id: <20210926012946.621-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 | 51 ++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 196141ace8..b8cdfdc048 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,54 @@ it a convenient format to store user input files.") (base32 "1180ln8blrb0mwzpcf78k49hlki6di65q77rsvglf83kfcyh4d7z")))))) +(define-public json.sh + (let ((commit "0d5e5c77365f63809bf6e77ef44a1f34b0e05840") + (revision "1")) + (package + (name "json.sh") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominictarr/JSON.sh") + (commit commit))) + (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* (#:key tests? #:allow-other-keys) + (when tests? (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" "sed" "coreutils")) + ":")))) + #t))))) + (inputs + `(("bash-minimal" ,bash-minimal) + ("grep" ,grep) + ("sed" ,sed) + ("coreutils" ,coreutils))) + (synopsis + "Pipeable JSON parser written in shell") + (description + "A JSON parser written in shell, compatible with ash, bash, dash and zsh. +Pipe json to it, and it traverses the json objects and prints out the path to +the current object (as a JSON array) and then the object, without whitespace.") + (home-page "https://github.com/dominictarr/JSON.sh") + (license (list license:expat license:asl2.0))))) + (define-public capnproto (package (name "capnproto") From patchwork Sun Sep 26 01:29:46 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: 33292 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 6F55827BBE3; Sun, 26 Sep 2021 02:30:17 +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 1D03F27BBE1 for ; Sun, 26 Sep 2021 02:30:17 +0100 (BST) Received: from localhost ([::1]:56776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUIzg-0003ek-6J for patchwork@mira.cbaines.net; Sat, 25 Sep 2021 21:30:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUIzT-0003eT-Ih for guix-patches@gnu.org; Sat, 25 Sep 2021 21:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUIzT-0000Ja-BB for guix-patches@gnu.org; Sat, 25 Sep 2021 21:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUIzT-0005S8-1C for guix-patches@gnu.org; Sat, 25 Sep 2021 21:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50793] [PATCH v2 2/2] gnu: Add cloudflare-cli Resent-From: Stephen Paul Weber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Sep 2021 01:30: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.163261979820917 (code B ref 50793); Sun, 26 Sep 2021 01:30:02 +0000 Received: (at 50793) by debbugs.gnu.org; 26 Sep 2021 01:29:58 +0000 Received: from localhost ([127.0.0.1]:35203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUIzN-0005RD-N9 for submit@debbugs.gnu.org; Sat, 25 Sep 2021 21:29:58 -0400 Received: from singpolyma.net ([192.99.233.116]:56357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUIzL-0005Qy-Tu for 50793@debbugs.gnu.org; Sat, 25 Sep 2021 21:29:56 -0400 Received: by singpolyma.net (Postfix, from userid 1000) id 5B658486168A; Sun, 26 Sep 2021 01:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=singpolyma.net; s=iweb; t=1632619795; bh=cRPFdkbZLBLrXzlstS8c4NEosyEh8V7PiBg542ee0jM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cWktJbB0TorjVzONYrTGpNog73uK32D0a/Zu05M64gyUTgkSY+Ndvrej+iaNw0XVT Xfxyemd7bbdrQ9Vapk8F+34acoVZKYSOFhotNqqMWqab5NbHxozPTj3z1TAMxjokTX r6mLs1A9ZE+byOzvoCcIU1K6RX1kOsYXN+BNtYq4= From: Stephen Paul Weber Date: Sat, 25 Sep 2021 20:29:46 -0500 Message-Id: <20210926012946.621-2-singpolyma@singpolyma.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210926012946.621-1-singpolyma@singpolyma.net> References: <20210926012946.621-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 | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 45e250138e..d9ef88af99 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,63 @@ #: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 + (let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392") + (revision "1")) + (package + (name "cloudflare-cli") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/earlchew/cloudflare-cli") + (commit commit))) + (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")) + ":")))) + #t))))) + (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 for tasks +such as updating dynamic DNS records or updating DNS records for the ACME DNS-01 +protocol.") + (home-page "https://github.com/earlchew/cloudflare-cli") + (license license:expat)))) + (define-public ldns (package (name "ldns")