From patchwork Mon Oct 12 03:50:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 24585 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 6174527BBEA; Mon, 12 Oct 2020 04:51:12 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 00DE627BBEB for ; Mon, 12 Oct 2020 04:51:11 +0100 (BST) Received: from localhost ([::1]:46078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRore-00062B-55 for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 23:51:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRorW-000610-JA for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRorW-0007ah-A0 for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRorW-00040M-6a for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43937] [PATCH 1/4] gnu: Add go-golang-org-x-xerrors. References: <20201012031606.14643-1-rprior@protonmail.com> In-Reply-To: <20201012031606.14643-1-rprior@protonmail.com> Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Oct 2020 03:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43937@debbugs.gnu.org Received: via spool by 43937-submit@debbugs.gnu.org id=B43937.160247462515314 (code B ref 43937); Mon, 12 Oct 2020 03:51:02 +0000 Received: (at 43937) by debbugs.gnu.org; 12 Oct 2020 03:50:25 +0000 Received: from localhost ([127.0.0.1]:41300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRoqp-0003yp-Ry for submit@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:25 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:36574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRoqn-0003yU-G5 for 43937@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:18 -0400 Date: Mon, 12 Oct 2020 03:50:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1602474610; bh=R3xRGzY17hkGC52JZ7WwLTapBx6AfyhVZ/2lyc4OfAI=; h=Date:To:From:Reply-To:Subject:From; b=QC5DSnuoVvb7XqL9WxKizWwGDX1E1XrxGF/Prw02O3+3aAerkOt2u+MtjcvzF39LL rGskf+SUfbYQw2irpLOy3+2vG+iA/4zPIWA9cKX8LW03Eya+1HKunqSuNRKHmJfZ1M 2QVAnlu2gfs9vBvAg0O8jFb64zaWGORdpJMJ2IUk= Message-ID: <20201012034957.15477-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/golang.scm (go-golang-org-x-xerrors): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b89b62cea2..166e7a265f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -939,6 +940,30 @@ time.") spec in Go.") (license license:bsd-3)))) +(define-public go-golang-org-x-xerrors + (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca") + (revision "0")) + (package + (name "go-golang-org-x-xerrors") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/xerrors") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/xerrors")) + (synopsis "Go 1.13 error values") + (description + "This package holds the transition packages for the new Go 1.13 error values.") + (home-page "https://godoc.org/golang.org/x/xerrors") + (license license:bsd-3)))) + (define-public go-github-com-burntsushi-toml (package (name "go-github-com-burntsushi-toml") From patchwork Mon Oct 12 03:50:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 24584 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 CB3A927BBEC; Mon, 12 Oct 2020 04:51:10 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 19AD527BBEB for ; Mon, 12 Oct 2020 04:51:10 +0100 (BST) Received: from localhost ([::1]:46066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRord-00061S-8j for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 23:51:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRorX-00061K-CN for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRorX-0007aq-2M for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRorX-00040a-1c for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43937] [PATCH 2/4] gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.2. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Oct 2020 03:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43937@debbugs.gnu.org Received: via spool by 43937-submit@debbugs.gnu.org id=B43937.160247463015343 (code B ref 43937); Mon, 12 Oct 2020 03:51:02 +0000 Received: (at 43937) by debbugs.gnu.org; 12 Oct 2020 03:50:30 +0000 Received: from localhost ([127.0.0.1]:41306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRor0-0003zK-1O for submit@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:30 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:27727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRoqx-0003yt-Ut for 43937@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:28 -0400 Date: Mon, 12 Oct 2020 03:50:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1602474621; bh=yx3pRBo4dTskVV4REu3A2hW66723SYCiH0pgWW/uTYI=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=boQ+x3mKrJz4KX17JhE7yzC80f04Ui9/UIVfylCpZQTyFJAHhSJJ/rRmk+FXwS/qA 2i6vTHABTHr/KJqE5t62LZ/HRmka8o6zJ1F9qE+aY1JEyIsOQ79I5Lwk/DdgiF3nUY 67dD/joJBkk3RXULggKVr3NMVXCH1M8EMoomSS3s= Message-ID: <20201012034957.15477-2-rprior@protonmail.com> In-Reply-To: <20201012034957.15477-1-rprior@protonmail.com> References: <20201012034957.15477-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/golang.scm: (go-github-com-google-go-cmp-cmp): Update to 0.5.2. --- gnu/packages/golang.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 166e7a265f..343363d23c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4046,7 +4046,7 @@ colorized or SGR defined output to the standard output.") (define-public go-github-com-google-go-cmp-cmp (package (name "go-github-com-google-go-cmp-cmp") - (version "0.3.1") + (version "0.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -4055,11 +4055,13 @@ colorized or SGR defined output to the standard output.") (file-name (git-file-name name version)) (sha256 (base32 - "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1")))) + "0qchy411jm9q2l9mf7x3ry2ycaqp9xdhf2nx14qrpzcxfigv2705")))) (build-system go-build-system) (arguments '(#:import-path "github.com/google/go-cmp/cmp" #:unpack-path "github.com/google/go-cmp")) + (propagated-inputs + `(("go-golang-org-x-xerrors" ,go-golang-org-x-xerrors))) (synopsis "Determine equality of values in Go") (description "This package provides a more powerful and safer alternative to @code{reflect.DeepEqual} for comparing whether two values From patchwork Mon Oct 12 03:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 24586 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 9DFA427BBEC; Mon, 12 Oct 2020 04:51:11 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 9FAA427BBEA for ; Mon, 12 Oct 2020 04:51:10 +0100 (BST) Received: from localhost ([::1]:46072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRord-00061o-Oh for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 23:51:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRorW-000618-Vt for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRorW-0007am-ML for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRorW-00040T-LN for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43937] [PATCH 3/4] gnu: Add go-github-com-frankban-quicktest. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Oct 2020 03:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43937@debbugs.gnu.org Received: via spool by 43937-submit@debbugs.gnu.org id=B43937.160247463015337 (code B ref 43937); Mon, 12 Oct 2020 03:51:02 +0000 Received: (at 43937) by debbugs.gnu.org; 12 Oct 2020 03:50:30 +0000 Received: from localhost ([127.0.0.1]:41304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRoqz-0003zI-Qi for submit@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:29 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:10900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRoqx-0003ys-St for 43937@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:28 -0400 Date: Mon, 12 Oct 2020 03:50:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1602474621; bh=dB8CwtOpG5ysi9TJL8PejYi7o9Bl01xvS4xbZdzGDOc=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=jm+OeRciIAja+oYIOhuvjoLdYAdVVvtTjQDaONkcV7kvpC33XFRrwtzUbDgjmDeNh WqHeTYkDVFlX3CLowt9GOKz/j10ce2Pmrv5wBdzXoSFgvpZzq2L2N5d0Epi4t6Ho3r yF4basLUUrCvzlOKsxXKYMZFCpuBPy25JmBqOB3c= Message-ID: <20201012034957.15477-3-rprior@protonmail.com> In-Reply-To: <20201012034957.15477-1-rprior@protonmail.com> References: <20201012034957.15477-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/golang.scm (go-github-com-frankban-quicktest): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 343363d23c..df6fbdfa94 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5845,3 +5845,30 @@ Included are the following: except that it adds convenience functions that use the fmt package to format error messages.") (license license:bsd-3))) + +(define-public go-github-com-frankban-quicktest + (package + (name "go-github-com-frankban-quicktest") + (version "1.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/frankban/quicktest") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/frankban/quicktest")) + (propagated-inputs + `(("go-github-com-google-go-cmp-cmp" ,go-github-com-google-go-cmp-cmp) + ("go-github-com-kr-pretty" ,go-github-com-kr-pretty))) + (home-page "https://github.com/frankban/quicktest") + (synopsis "Quick helpers for testing Go applications") + (description + "Package quicktest provides a collection of Go helpers for writing +tests.") + (license license:expat))) From patchwork Mon Oct 12 03:50:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 24587 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 0A83427BBEB; Mon, 12 Oct 2020 04:51: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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 7B0DE27BBEA for ; Mon, 12 Oct 2020 04:51:16 +0100 (BST) Received: from localhost ([::1]:46658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRorj-0006IW-M2 for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 23:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRorX-00061Q-NG for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57999) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRorX-0007av-E1 for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRorX-00040i-Dh for guix-patches@gnu.org; Sun, 11 Oct 2020 23:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43937] [PATCH 4/4] gnu: Add go-github-com-bep-golibsass. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Oct 2020 03:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43937@debbugs.gnu.org Received: via spool by 43937-submit@debbugs.gnu.org id=B43937.160247463815365 (code B ref 43937); Mon, 12 Oct 2020 03:51:03 +0000 Received: (at 43937) by debbugs.gnu.org; 12 Oct 2020 03:50:38 +0000 Received: from localhost ([127.0.0.1]:41309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRor8-0003zk-Bq for submit@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:38 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:33904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRor7-0003zX-15 for 43937@debbugs.gnu.org; Sun, 11 Oct 2020 23:50:37 -0400 Date: Mon, 12 Oct 2020 03:50:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1602474630; bh=1i279iOFLVbExdpWeqDDU4xce6SgwDqZSMO5i5F0uco=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=tg9QFDPKx4E0sgDDqWcKVEj2T6mvqPI2f4PAbLSyWp1ZXZYW3iSURWqwgE8sb4Wdg pzpy8Jg9Uis6XahgfhlLFwsGLSfIVbgg5CuUKc5YzSMAjtXlQ8WFvgtGlR66MBaRVA u5E3+vakAFYozpRrHOPJKHRsOF4vQtA2n4N87cFM= Message-ID: <20201012034957.15477-4-rprior@protonmail.com> In-Reply-To: <20201012034957.15477-1-rprior@protonmail.com> References: <20201012034957.15477-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/golang.scm: (go-github-com-bep-golibsass): New variable. --- gnu/packages/golang.scm | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index df6fbdfa94..c87a712d11 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages web) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -5872,3 +5873,61 @@ error messages.") "Package quicktest provides a collection of Go helpers for writing tests.") (license license:expat))) + +(define-public go-github-com-bep-golibsass + (package + (name "go-github-com-bep-golibsass") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bep/golibsass") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "libsass_src") + #t)))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/bep/golibsass/libsass" + #:unpack-path "github.com/bep/golibsass" + ;; The dev build tag modifies the build to link to system libsass + ;; instead of including the bundled one (which we remove.) + ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go + #:build-flags '("-tags" "dev") + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-bindings + ;; Generate bindings for system libsass, replacing the + ;; pre-generated bindings. + (lambda* (#:key inputs unpack-path #:allow-other-keys) + (mkdir-p (string-append "src/" unpack-path "/internal/libsass")) + (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src"))) + (substitute* (string-append "src/" unpack-path "/gen/main.go") + (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)") + (string-append "\"" libsass-src "\"")) + (("../../libsass_src/src/") + libsass-src))) + (invoke "go" "generate" (string-append unpack-path "/gen")) + #t)) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (if tests? + (invoke "go" "test" import-path "-tags" "dev")) + #t))))) + (propagated-inputs + `(("libsass" ,libsass))) + (native-inputs + `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest) + ("libsass-src" ,(package-source libsass)))) + (home-page "https://github.com/bep/golibsass") + (synopsis "Easy to use Go bindings for LibSass") + (description + "This package provides SCSS compiler support for Go applications.") + (license license:expat)))