From patchwork Thu Oct 14 23:39:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Chernyak X-Patchwork-Id: 33853 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 6A67A27BBE3; Fri, 15 Oct 2021 00:40:30 +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 EF01127BBE1 for ; Fri, 15 Oct 2021 00:40:29 +0100 (BST) Received: from localhost ([::1]:36596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbAKq-0005n2-QZ for patchwork@mira.cbaines.net; Thu, 14 Oct 2021 19:40:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbAKQ-0005lR-St for guix-patches@gnu.org; Thu, 14 Oct 2021 19:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbAKQ-00028v-Ji for guix-patches@gnu.org; Thu, 14 Oct 2021 19:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbAKQ-0005VE-GS for guix-patches@gnu.org; Thu, 14 Oct 2021 19:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51022] [PATCH] gnu: Update direnv to 2.28.0 References: In-Reply-To: Resent-From: Artem Chernyak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Oct 2021 23:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51022@debbugs.gnu.org Received: via spool by 51022-submit@debbugs.gnu.org id=B51022.163425478021080 (code B ref 51022); Thu, 14 Oct 2021 23:40:02 +0000 Received: (at 51022) by debbugs.gnu.org; 14 Oct 2021 23:39:40 +0000 Received: from localhost ([127.0.0.1]:37349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbAK4-0005Tw-IQ for submit@debbugs.gnu.org; Thu, 14 Oct 2021 19:39:40 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:42646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbAK2-0005TU-Q4 for 51022@debbugs.gnu.org; Thu, 14 Oct 2021 19:39:39 -0400 Received: by mail-wr1-f52.google.com with SMTP id v17so23112256wrv.9 for <51022@debbugs.gnu.org>; Thu, 14 Oct 2021 16:39: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=IgasAjHpr2OaQqtatkjk3uBbvHJbwMGfe3547WtUFIs=; b=HdVzCsENkjyWuebLdS0QsnuxnT1ZOZWLr0hEwjLwc/Hk0pSwzQDNa6btXD2Cw1Dmq9 Wve2TiTsua08mV2o/9HYHHFOCPGKhOsk4ZYLp3Xd7CDKsEXpVCoUG75GuMTExnHoLb/Z 73w4kgJcqmkUI0bPUXWjcfS/sHnNyOKQg1iIHy6aLnFR4huP0OlCnw590p5aXNDohZHf u0ITQAFnK3+JrcHgF0h6p5pf4ILhXjuJYOcZthrXrFmkQsM06MfNmGC1EK5ywNIGZl4/ 4VZANAbbTNBKydS541QqQGrNMuNvzGZGTLKoq4SAgT+jlOLD2zvb3DcCvavvJjxh0IhV eczA== 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=IgasAjHpr2OaQqtatkjk3uBbvHJbwMGfe3547WtUFIs=; b=aC5t1QHjLMn2+jMxKmTluiUDRP7+yXIQEq/GHrRWx6i67NJ5ClO/rMzHxqruHG3hy3 vQpFeX4LSsiwJ7D3b5sHx+LmhuxrAL5rvRrkU1q0YgPZTKSblBGCiII4DkJtkAdC7XaX CWIKwNBPPqmWrwk6IZ7RGZa0YInpJxVea4PecKY83rzmm9yiZKM3GyFRk0KMChALRL/1 Uvupj3YDihCDqSiAy3WzqZCvKmuErkPCtJ04HqP0xlhJQoZ0RGCIgh7hyubyJ74y01l5 u9/hJhehgRDj81B5mNRK7A3G0ZbHOqiyU4VipyEpB+JFB6JLzEH+6OK2RjaqFEfqRYRQ UalQ== X-Gm-Message-State: AOAM533qUVMhmvqgSHNkyk3TQ+vo3MRf45PPFlFN5HTgbU2X+cQoRXz6 KXutH9slUbP6jjynz3CuUht7Qn++JxBgzl9JteWJfOiUsDP8Uw== X-Google-Smtp-Source: ABdhPJylXOW0P1SXI3gXk0KXYDQKFfuB9ZE5Gbw8ux0Vm/68pK0SQ7OvEf7mNwMSe98IJzaRHiQHwJ2zafSYU3YZKC8= X-Received: by 2002:adf:9d47:: with SMTP id o7mr10576664wre.50.1634254772471; Thu, 14 Oct 2021 16:39:32 -0700 (PDT) MIME-Version: 1.0 From: Artem Chernyak Date: Thu, 14 Oct 2021 18:39:21 -0500 Message-ID: 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 Hi Ludovic, Thanks for the feedback. I was able to figure out that the make test process, used previously, tried to install Go modules. That seemed to cause the error with the tests. The test ran fine when executed directly with Go. Also, thank you for the feedback on my patch formatting. Hope I got it right this time. I would appreciate any additional feedback you may have since it's my first contribution to guix and first time contributing using patches (not using github or gitlab.) From 5a3079f17a056c59c5fbc3cb5e4490170c8adabf Mon Sep 17 00:00:00 2001 From: Artem Chernyak Date: Mon, 4 Oct 2021 21:08:46 -0500 Subject: [PATCH] gnu: Update direnv to 2.28.0 * gnu/packages/shellutils.scm (direnv): Update to 2.28.0 --- gnu/packages/shellutils.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 9a364d0ade..70236d9e5c 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -292,7 +292,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 @@ -301,18 +301,12 @@ 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" #: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")) @@ -330,7 +324,9 @@ are already there.") ;; The following file needs to be writable so it can be ;; modified by the testsuite. (make-file-writable "test/scenarios/base/.envrc") - (invoke "make" "test") + ;; We need to manually run test because make test + ;; tries to use go modules + (invoke "go" "test" "./...") ;; Clean up from the tests, especially so that the extra ;; direnv executable that's generated is removed. (invoke "make" "clean"))) @@ -338,6 +334,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