From patchwork Tue Oct 5 02:23:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Chernyak X-Patchwork-Id: 33620 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 0E2D327BBE3; Tue, 5 Oct 2021 13:12:15 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,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 111ED27BBE1 for ; Tue, 5 Oct 2021 13:12:14 +0100 (BST) Received: from localhost ([::1]:38720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXjIr-00017G-1M for patchwork@mira.cbaines.net; Tue, 05 Oct 2021 08:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXb0r-0006LR-4e for guix-patches@gnu.org; Mon, 04 Oct 2021 23:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXb0o-0001x3-DB for guix-patches@gnu.org; Mon, 04 Oct 2021 23:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mXb0o-00048q-AZ for guix-patches@gnu.org; Mon, 04 Oct 2021 23:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51022] [PATCH] Update direnv to 2.28.0 Resent-From: Artem Chernyak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Oct 2021 03:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51022@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163340402115851 (code B ref -1); Tue, 05 Oct 2021 03:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Oct 2021 03:20:21 +0000 Received: from localhost ([127.0.0.1]:38734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXb07-00047a-Ot for submit@debbugs.gnu.org; Mon, 04 Oct 2021 23:20:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:59410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXa7Y-0002jx-Jq for submit@debbugs.gnu.org; Mon, 04 Oct 2021 22:23:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXa7U-0006Zi-Ua for guix-patches@gnu.org; Mon, 04 Oct 2021 22:23:53 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXa7J-0000R6-Jq for guix-patches@gnu.org; Mon, 04 Oct 2021 22:23:49 -0400 Received: by mail-wr1-x42a.google.com with SMTP id e12so14149962wra.4 for ; Mon, 04 Oct 2021 19:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=qkrlYVFyHAKPWXhjFGAMSA/WpL6LzhKeRs92WZ2vmyk=; b=OlPd/u07DeTRyOZ6ezB23ueX4JqJbH/FwUB5dAA+atbsR3pHUh8Z9NgqeLl5fJD2kk slkJnUAZH4UFA7js4hUm8VOMiagmkeiQ38MeLxCwnEC2OLLYa5cQf9JEsGL170r1be4E zD7HNlkdAvY98jA78LfCelqCjN4JCfisi6krmhbzoFKj+rXjR6FqfKhWYOGQQAsvNzC/ EJA6qiTZmZQtaQZXF/smpXZRW0aHBu5CRXUQe3952gQ9QgN+2zlh5MndPn2BtoTfKPAv vl+Z8I/TjuQ7gbwecXbXTni3Lv8ZsO2XisU6tDgwffv90PgnbHNkhpKhy+pefL1TMmCh N2oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=qkrlYVFyHAKPWXhjFGAMSA/WpL6LzhKeRs92WZ2vmyk=; b=RAmTIBLRiT0pR2738oyWSDQ4K3YWRB3v9ClmEdSGkQKAqNiIhy73KNp3rUHASrqv4V Zwl3UerjlLy2SSeCk+cRv4Ai40anvY0WWRPyFMcEkc7r0btvsfvTl6Zhf000WiIWIouP W/XnvnSsdfxdCbdFHljVru32pXhobZtfOc6tneuneLR/XMkjLT9tCGQlOKVNK45Rz0l4 viUM/ewyDJELt+grZbjiy0wTWm7qrnah4TsFGYOmV5nRrcuCAj3SvuBb8+ZWmEcz/Qjl 8/ZyxIXGDKDku6j2/QY9oo2nCGvz9hBwdmYK6aAxak3A8tHep3MYC2b7a41CYcSzJ0fr yuDA== X-Gm-Message-State: AOAM530rmkdmvCIf6WQ6Ct3Qc8H94p63I+MmdNdj2+a8YPijCZEqHorE TY8k46m9Z+/BwdWFbjp5Ic1j109UmcRwwEyfnkpzYWhN+fSp1A== X-Google-Smtp-Source: ABdhPJxOv7NKmkF2Chi1uCSqY7T+o6ZWX583gsK1ku78Ic0TpQBr8Wmih/cfvK7/jQuf0UrOXPo5aUsUIdSIxaiYS30= X-Received: by 2002:adf:fc07:: with SMTP id i7mr18081729wrr.351.1633400616085; Mon, 04 Oct 2021 19:23:36 -0700 (PDT) MIME-Version: 1.0 From: Artem Chernyak Date: Mon, 4 Oct 2021 21:23:25 -0500 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=artemchernyak@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 04 Oct 2021 23:20:18 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 05 Oct 2021 08:11:51 -0400 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 This patch includes an update to direnv. As part of the updated a few extra changes were necessary to support the new version: - Addition of go-golang-org-x-mod as a new dependency. - Removal of the delete-vendor step since direnv no longer depends on vendor files. - Removal of the test run. The new tests depend on https://github.com/golangci/golangci-lint which requires a lot of othe dependencies. Since it's only needed for tests, maybe we can handle it in a separate patch or once golangci-lint becomes needed in other places. From ced4b50ad1dda92e7ba58bebbe702b9dd7a3dae9 Mon Sep 17 00:00:00 2001 From: hackeryarn Date: Mon, 4 Oct 2021 21:08:46 -0500 Subject: [PATCH] Update direnv to 2.28.0 --- gnu/packages/golang.scm | 37 +++++++++++++++++++++++++++++++++++++ gnu/packages/shellutils.scm | 13 +++++-------- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a96f743f68..3e4e691631 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2669,6 +2669,43 @@ time.") (home-page "https://godoc.org/golang.org/x/xerrors") (license license:bsd-3)))) +(define-public go-golang-org-x-mod + (let ((commit "0f08993efd8a8ec67e75bcccf86b0e1569b0ab0a") + (revision "0")) + (package + (name "go-golang-org-x-mod") + (version (git-version "0.5.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/x/mod") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pl0jc5jvg7hxj4z66zg6kglnq5g7li09f3k9klwvyr4jx5dw88k")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/mod/" + #:tests? #f + #:phases + (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (home-page "https://golang.org/x/mod") + (synopsis "Tools to work directly with Go module mechanics") + (description + "This repository holds packages for writing tools that work directly +with Go module mechanics. That is, it is for direct manipulation of Go modules +themselves. +It is NOT about supporting general development tools that need to do things +like load packages in module mode. That use case, where modules are incidental +rather than the focus, should remain in x/tools, specifically +x/tools/go/packages. +The specific case of loading packages should still be done by invoking the go +command, which remains the single point of truth for package loading algorithms.") + (license license:bsd-3)))) + (define-public go-github-com-burntsushi-toml (package (name "go-github-com-burntsushi-toml") diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 94b5536df7..a8f0956913 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -239,7 +239,7 @@ are already there.") (define-public direnv (package (name "direnv") - (version "2.15.2") + (version "2.28.0") (source (origin (method git-fetch) (uri (git-reference @@ -248,18 +248,13 @@ are already there.") (file-name (git-file-name name version)) (sha256 (base32 - "1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w")))) + "0yk53jn7wafklixclka17wyjjs2g5giigjr2bd0xzy10nrzwp7c9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/direnv/direnv" + #:tests? #f ;; TODO fix tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-vendor - (lambda _ - ;; Using a snippet causes issues with the name of the directory, - ;; so delete the extra source code here. - (delete-file-recursively "src/github.com/direnv/direnv/vendor") - #t)) (add-after 'install 'install-manpages (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -285,6 +280,8 @@ are already there.") (native-inputs `(("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml) ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv) + ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-golang-org-x-mod" ,go-golang-org-x-mod) ("which" ,which))) (home-page "https://direnv.net/") (synopsis "Environment switcher for the shell") -- 2.33.0