From patchwork Fri Feb 1 12:46:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 940 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 4243516B3E; Fri, 1 Feb 2019 12:47:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A982916A92 for ; Fri, 1 Feb 2019 12:47:08 +0000 (GMT) Received: from localhost ([127.0.0.1]:53088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYDq-0002lC-M7 for patchwork@mira.cbaines.net; Fri, 01 Feb 2019 07:47:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYDo-0002k5-3r for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYDm-0004ZQ-9K for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54542) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gpYDm-0004ZM-5n for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gpYDl-0004Vt-W4 for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34271] [PATCH 1/2] gnu: Add go-github-com-direnv-go-dotenv. References: <20190201124118.GA8184@jasmine.lan> In-Reply-To: <20190201124118.GA8184@jasmine.lan> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Feb 2019 12:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34271 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 34271@debbugs.gnu.org Received: via spool by 34271-submit@debbugs.gnu.org id=B34271.154902521717325 (code B ref 34271); Fri, 01 Feb 2019 12:47:01 +0000 Received: (at 34271) by debbugs.gnu.org; 1 Feb 2019 12:46:57 +0000 Received: from localhost ([127.0.0.1]:53819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gpYDf-0004VJ-Ja for submit@debbugs.gnu.org; Fri, 01 Feb 2019 07:46:55 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:40965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gpYDd-0004V5-GD for 34271@debbugs.gnu.org; Fri, 01 Feb 2019 07:46:53 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 4B41B21BAD; Fri, 1 Feb 2019 07:46:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 01 Feb 2019 07:46:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=88hgad6i8sz8aP25PIcLK0B AaKvgcV7xlehepavw/FQ=; b=pm96ZY7c25u4n5+TfHhSQztE9Sak37f8QaH22w6 zH5a3d0Kjdr5dKFssiF0CRYmf87R1+bjqwRPJyCs8q1fA5OqKrAuMjZCCa8bEPa/ H95UiroUZoLWDByS8RhmsIG6cuEbqhPATIdEQEPxihWDGwb01BzcpuObrvHPNzqR fRbA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=88hgad6i8sz8aP25P IcLK0BAaKvgcV7xlehepavw/FQ=; b=Y8hO2x2uXFIvPjnNc2r00cjUSdSNXjNIu AqzKYQ+LeUZVKg1aZpCztE7o2j5IIxlX0Orx2a7uYtiHTywvKi5ssYoJa676ncnB EBMN2TU8YLx41dRHQcdaAqSF6ZWNaei7ylC4Obxmm4TZ8TorO7zqUeCEvgeikFf7 9U/3vZi2AmxNCaiIiKtDWQvWMvyzlF7CS3BpnikmPNm11Vsq7MDCAxQePGdmr+CJ W/ZK7MF8/77DljYnzkNCZUJJFSjUdyKqCXH5lyCb7j4ZMuMI/1OOdo1HEz+X/SqQ id5QQ1axJKPey5xYSbFf6QyDoKMNMk0Y/tj0NdGnJH/+sFRel50Ag== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeekgdeghecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucenucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepnfgvoh cuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuffhomhgr ihhnpehgihhthhhusgdrtghomhenucfkphepjeekrddvledrvddufedrudeinecurfgrrh grmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgvnecuvehluhhs thgvrhfuihiivgeptd X-ME-Proxy: Received: from jasmine.lan (cable-78.29.213.16.coditel.net [78.29.213.16]) by mail.messagingengine.com (Postfix) with ESMTPA id 6CCEDE409D for <34271@debbugs.gnu.org>; Fri, 1 Feb 2019 07:46:47 -0500 (EST) From: Leo Famulari Date: Fri, 1 Feb 2019 13:46:40 +0100 Message-Id: <271701d6c65ad6565dc18f648b7de248e8e7d414.1549025201.git.leo@famulari.name> 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/golang.scm (go-github-com-direnv-go-dotenv): 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 e6269f526f..cedfabe5bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3365,3 +3365,28 @@ have super fancy logs.") (synopsis "Filesystem-related functions for Go") (description "Package fs provides filesystem-related functions.") (license license:bsd-3)))) + +(define-public go-github-com-direnv-go-dotenv + (let ((commit "4cce6d1a66f7bc8dc730eab85cab6af1b801abed") + (revision "0")) + (package + (name "go-github-com-direnv-go-dotenv") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/direnv/go-dotenv") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00wn4fc2lma0csf6ryvlc6k9jbpbifm4n7i3kkd2xrfw5qlm29b6")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/direnv/go-dotenv")) + (home-page "https://github.com/direnv/go-dotenv") + (synopsis "Go dotenv parsing library") + (description "This package provides a library for parsing the dotenv +format in Go.") + (license license:expat)))) From patchwork Fri Feb 1 12:46:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 941 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 E046716B3E; Fri, 1 Feb 2019 12:47:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7D8DE16A92 for ; Fri, 1 Feb 2019 12:47:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:53090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYDt-0002ls-2t for patchwork@mira.cbaines.net; Fri, 01 Feb 2019 07:47:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpYDo-0002kV-T2 for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpYDm-0004Zk-Kz for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54543) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gpYDm-0004Za-HI for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gpYDm-0004W1-EW for guix-patches@gnu.org; Fri, 01 Feb 2019 07:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34271] [PATCH 2/2] gnu: direnv: Update to 2.15.2. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Feb 2019 12:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34271 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 34271@debbugs.gnu.org Received: via spool by 34271-submit@debbugs.gnu.org id=B34271.154902522017341 (code B ref 34271); Fri, 01 Feb 2019 12:47:02 +0000 Received: (at 34271) by debbugs.gnu.org; 1 Feb 2019 12:47:00 +0000 Received: from localhost ([127.0.0.1]:53823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gpYDj-0004Vd-LB for submit@debbugs.gnu.org; Fri, 01 Feb 2019 07:47:00 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gpYDh-0004VA-H4 for 34271@debbugs.gnu.org; Fri, 01 Feb 2019 07:46:57 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 65F9A2206A; Fri, 1 Feb 2019 07:46:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 01 Feb 2019 07:46:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=ifmaxKF3Qa BupblylTvwVesIBgOw+VlWiac19LoeCIE=; b=lxOG9zzwwB25kDYwqc9hQMaamm zAsFyf80zuxxLv6r7ugDbYKFJB9PuE3QXNkvs6ocE9dpayH6NwrZ11ODVtptvd1/ XFIDBHcKmheh8VbMztXEumLCrRTq2E8Bu4YOU4KQSt6sSeZ6vhAlEQWhm82KAUqs eXFftsVbK/GXrq57o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=ifmaxKF3QaBupblylTvwVesIBgOw+VlWiac19LoeCIE=; b=m6FTRJ/P gizPczu5cmc/R5nrS+xNzWDRh7iMyosXsR7SyyDsXA5TboEXEfcla9nGM871DP0f PE2+V1+TPh7e3ojEZKB3JpHWWFi+0OyxH6PO/ZFmBm1nZ/rhW5zsb4DQWq9XbLJz SaRYvd2Zm4PrFNKeKHAO3Lb/mO2ouqCbmj0ik9nVW1ejMFNIt6EyBYiPoSvjiMPy 9R0mqLxG0ZiOQfC1IwXLZkHr1cW2LirqV6x1oeqgJcg7MYGW6gL2CQkWDfosu4x4 2rytHhk2uVMFSzv0UbSalobgrZlvONhBVT8X62LRO51Fjt3uTg4QbYb1lXeuFhaV K6wNPHCjYhPqig== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeekgdeghecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepnf gvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuffho mhgrihhnpehgihhthhhusgdrtghomhdpughirhgvnhhvrdhnvghtnecukfhppeejkedrvd elrddvudefrdduieenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgr rhhirdhnrghmvgenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from jasmine.lan (cable-78.29.213.16.coditel.net [78.29.213.16]) by mail.messagingengine.com (Postfix) with ESMTPA id B9425E4438 for <34271@debbugs.gnu.org>; Fri, 1 Feb 2019 07:46:48 -0500 (EST) From: Leo Famulari Date: Fri, 1 Feb 2019 13:46:41 +0100 Message-Id: <5324e0d0162e57d5ad2399ae932a79a2db403fc3.1549025201.git.leo@famulari.name> X-Mailer: git-send-email 2.20.1 In-Reply-To: <271701d6c65ad6565dc18f648b7de248e8e7d414.1549025201.git.leo@famulari.name> References: <271701d6c65ad6565dc18f648b7de248e8e7d414.1549025201.git.leo@famulari.name> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/shellutils.scm (direnv): Update to 2.15.2. [inputs]: Use the default Go compiler. Add go-github-com-burntsushi-toml and go-github-com-direnv-go-dotenv. [arguments]: Add a 'setup-go-environment' phase. --- gnu/packages/shellutils.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 0978300c9b..a672aa041a 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages pkg-config) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python)) (define-public envstore @@ -102,7 +103,7 @@ are already there.") (define-public direnv (package (name "direnv") - (version "2.11.3") + (version "2.15.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/direnv/" name @@ -110,14 +111,26 @@ are already there.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01mhwzq9ss2qlnn8aahvwsgnspq8hbz0qfknf290aicngwx10d1d")))) + "1hhmc6rb7b1d4s4kgb4blrq35h388ax37ap88dq3dgfcw9w6j1rm")))) (build-system gnu-build-system) (arguments - '(#:test-target "test" + `(#:test-target "test" #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) - #:phases (modify-phases %standard-phases (delete 'configure)))) + #:modules ((guix build gnu-build-system) + ((guix build go-build-system) #:prefix go:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build go-build-system)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + ;; Help the build scripts find the Go language dependencies. + (add-after 'unpack 'setup-go-environment + (assoc-ref go:%standard-phases 'setup-environment))))) (inputs - `(("go" ,go-1.9))) + `(("go" ,go) + ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) + ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv))) (native-inputs `(("which" ,which))) (home-page "https://direnv.net/")