From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oGNpAegBKWEW1gAAgWs5BA (envelope-from ) for ; Fri, 27 Aug 2021 17:16:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kJnFOOcBKWFNJgAA1q6Kng (envelope-from ) for ; Fri, 27 Aug 2021 15:16:55 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 997477DA0 for ; Fri, 27 Aug 2021 17:16:55 +0200 (CEST) Received: from localhost ([::1]:41676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJdbC-0000pX-Pd for larch@yhetil.org; Fri, 27 Aug 2021 11:16:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJdYR-0006v4-M0 for guix-patches@gnu.org; Fri, 27 Aug 2021 11:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJdYR-0007zW-Eo for guix-patches@gnu.org; Fri, 27 Aug 2021 11:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJdYR-000743-An for guix-patches@gnu.org; Fri, 27 Aug 2021 11:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50227] [PATCH 3/3] gnu: go-gotest-tools-assert: Provide internal inputs with the source. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Aug 2021 15:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50227@debbugs.gnu.org Received: via spool by 50227-submit@debbugs.gnu.org id=B50227.163007723927123 (code B ref 50227); Fri, 27 Aug 2021 15:14:03 +0000 Received: (at 50227) by debbugs.gnu.org; 27 Aug 2021 15:13:59 +0000 Received: from localhost ([127.0.0.1]:52705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJdYI-00073L-Cu for submit@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJdYC-00072k-Dd for 50227@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50754) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJdY7-0007lW-97 for 50227@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:43 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:38006 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJdY6-00024p-Nw for 50227@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:42 -0400 From: Marius Bakke Date: Fri, 27 Aug 2021 17:13:30 +0200 Message-Id: <20210827151330.13112-3-marius@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827151330.13112-1-marius@gnu.org> References: <20210827151330.13112-1-marius@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630077415; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=SFki2zZpOAGfve8QBYoliHkpyPjtwnCKfiqoE+mAWX8=; b=DroV6IY2r5gZevNP9adSdefCgpE1fSZ2qklEvomueNTMAlkP4cGabmDcZvhy8DsN9NdUYQ rE64oJVNdXNDfBPIcaphgTEEsYlbHVWQb7rw/d0oo9hlklR5HcdAXNRF7nTXYAy5wkWXx8 T2254AvPuUX8xeO2Evy3TZZFW/DllPHgpUtcnEQAMHVTO6L7VpfDnoc0q65XnZaodeMsGr fCW0sexAnclszkOHWZyYaTcJ/erjo5T1x4ZTTcI3st06SDdGOeMTw0nJSN5EUOhwCzpflU keiY/cCFoNR8JOOY3k2ri9v87bqzSa1R11wg1iiBW8MX0X8qC5IgQwjKX2Y9dg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630077415; a=rsa-sha256; cv=none; b=uVWVf91AENRgiYBGBgjVN3hQYdELVO73Qk70pWq95phSbOtq5q2romJL+uECaeOmvYfHGs TWATCG4B8lWCDELjUZN5Ad5TIg3eoJI6fEw7g7sUpepgCOERnwv21qw3j439pq8ZGnu9ud 13FczdS7YebY5xBHzbsT500c0SlMyDWs99zySEhDE33y8jOFy5rQ9Rc9c/tSjo6LFCuAik E9v1R2aILuPDWTxNXO1ZEK9pc1A28PfpJ+P8VYkQsF/yh1qzepjGJD04Tiz7/dPJ7PJCWz zjmnWlK/Cg1lAjA0GYPCTetE4TAilgjouQgHJ5jCE+UKQH333Ty2YWVdevfwOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.93 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 997477DA0 X-Spam-Score: -1.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: TFqpkQL6cTUn * gnu/packages/golang.scm (go-gotest-tools-assert)[inputs]: Add GO-GOTEST-TOOLS-INTERNAL-FORMAT, GO-GOTEST-TOOLS-INTERNAL-DIFFLIB, and GO-GOTEST-TOOLS-INTERNAL-SOURCE. [arguments]: Add phase to install a union of the above inputs. * gnu/packages/golang.scm (gotestsum)[native-inputs]: Don't add the above mentioned inputs. --- gnu/packages/golang.scm | 45 +++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3a5c6ddc3f..295b442a2a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Ryan Prior -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Ricardo Wurmus @@ -5945,9 +5945,35 @@ gotest-tools."))) (arguments `(#:tests? #f ; Test failure concerning message formatting (FIXME) #:import-path "gotest.tools/assert" - #:unpack-path "gotest.tools")) - ;(propagated-inputs - ; `(("go-gotest-tools-internal-format" ,go-gotest-tools-internal-format))) + #:unpack-path "gotest.tools" + #:modules ((ice-9 match) + (srfi srfi-26) + ,@%go-build-system-modules) + #:phases + (modify-phases (@ (guix build go-build-system) %standard-phases) + (add-before 'install 'install-internal-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The Go compiler does not permit importing libraries with + ;; "internal" in the path from anywhere except below the + ;; package that uses them. Thus, install these inputs + ;; alongside this package. + (union-build + out + (match (filter (lambda (input) + (string-prefix? "go-gotest-tools-internal" + (car input))) + inputs) + (((names . directories) ...) directories)) + #:create-all-directories? #t + #:log-port (%make-void-port "w")))))))) + (inputs + `(("go-gotest-tools-internal-format" + ,go-gotest-tools-internal-format) + ("go-gotest-tools-internal-difflib" + ,go-gotest-tools-internal-difflib) + ("go-gotest-tools-internal-source" + ,go-gotest-tools-internal-source))) (native-inputs `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) ("go-github-com-google-go-cmp-cmp" @@ -5985,17 +6011,6 @@ test when a comparison fails.") ,go-github-com-jonboulle-clockwork) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-gotest-tools-assert" ,go-gotest-tools-assert) - ("go-github-com-google-go-cmp-cmp" - ,go-github-com-google-go-cmp-cmp) - ;; TODO: This would be better as a propagated-input of - ;; go-gotest-tools-assert, but that does not work for - ;; some reason. - ("go-gotest-tools-internal-format" - ,go-gotest-tools-internal-format) - ("go-gotest-tools-internal-difflib" - ,go-gotest-tools-internal-difflib) - ("go-gotest-tools-internal-source" - ,go-gotest-tools-internal-source) ("go-github-com-google-go-cmp-cmp" ,go-github-com-google-go-cmp-cmp))) (synopsis "Go test runner with output optimized for humans") -- 2.31.1