From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4EouGz+oyl+EHgAA0tVLHw (envelope-from ) for ; Fri, 04 Dec 2020 21:21:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wOqdFj+oyl8QLwAA1q6Kng (envelope-from ) for ; Fri, 04 Dec 2020 21:21:03 +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 15D639402A5 for ; Fri, 4 Dec 2020 21:21:03 +0000 (UTC) Received: from localhost ([::1]:60762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klIVi-0007Uc-17 for larch@yhetil.org; Fri, 04 Dec 2020 16:21:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klI5e-0004LE-KS for guix-patches@gnu.org; Fri, 04 Dec 2020 15:54:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klI5a-0000d9-L8 for guix-patches@gnu.org; Fri, 04 Dec 2020 15:54:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klI5a-0004Va-Ij for guix-patches@gnu.org; Fri, 04 Dec 2020 15:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45043] [PATCH] gnu: git-open: Remove unnecessary propagated input. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Dec 2020 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45043@debbugs.gnu.org Cc: EuAndreh X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160711522717290 (code B ref -1); Fri, 04 Dec 2020 20:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Dec 2020 20:53:47 +0000 Received: from localhost ([127.0.0.1]:45967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klI5K-0004Uo-VM for submit@debbugs.gnu.org; Fri, 04 Dec 2020 15:53:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:37256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klI5G-0004Ud-6y for submit@debbugs.gnu.org; Fri, 04 Dec 2020 15:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klI5F-00044a-Td for guix-patches@gnu.org; Fri, 04 Dec 2020 15:53:41 -0500 Received: from box.euandre.org ([46.101.160.115]:47925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klI5D-0000VC-1R for guix-patches@gnu.org; Fri, 04 Dec 2020 15:53:41 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 840B2FC3D0; Fri, 4 Dec 2020 17:53:35 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1607115216; bh=5vNTKXU8kTT0/XUgdTWGNWOeO9cDx3NvBW/7zrMrrDQ=; h=From:To:Cc:Subject:Date:From; b=VQ1ExT9hDl4+x4rzlP90GyQgCq47xzRAVjXl3T6hr/RxP90/cm3zU0jC2Kj5aqLYg XfhsW+92aBpL1EMeEUKVRJxinEwA9DGAFqko4tpK32KIpQqLNrOUsNqHms8OUE/mCb e0e0X9IAAaV7wtH9MptEjdhIk8e+tiTfBe9jpwSpu6faD4/7dT/lbvHX6crchZcS6P h/NJVVzi6nRcIL8IekElCammQzSDzjXlwbW5+braCyAwLSkwU1K0MnVIGz5AMUIrcL zFgzrSuV+ZuhOWr5PmhmDqHxBEprJYUpi0/20ogqCdE1R8av1TT2Gf4xDfxFHLt5D2 1UoEkBbNyDp5A== Date: Fri, 4 Dec 2020 17:53:32 -0300 Message-Id: <20201204205332.28505-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=46.101.160.115; envelope-from=eu@euandre.org; helo=box.euandre.org 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: EuAndreh , EuAndreh via Guix-patches From: EuAndreh via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 1.21 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=euandre.org header.s=mail header.b=VQ1ExT9h; 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: 15D639402A5 X-Spam-Score: 1.21 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: 91whH26TOJ88 * gnu/packages/version-control.scm (git-open): Stop propagating xdg-utils package, and replace the runtime dependency by wrapping xdg-utils in the derivation. Also use copy-build-system instead of trivial-build-system. --- gnu/packages/version-control.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a8e6d2c4b9..eec57b3b6d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -55,6 +55,7 @@ #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -2733,20 +2734,20 @@ file contents on a remote server.") (file-name (git-file-name name version)) (sha256 (base32 "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0")))) - (build-system trivial-build-system) - (propagated-inputs + (build-system copy-build-system) + (inputs `(("xdg-utils" ,xdg-utils))) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((source (assoc-ref %build-inputs "source")) - (out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/bin")) - (copy-file (string-append source "/git-open") - (string-append out "/bin/git-open")) - #t)))) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (xdg-utils (assoc-ref inputs "xdg-utils"))) + (wrap-program (string-append out "/bin/git-open") + `("PATH" ":" prefix (,(string-append xdg-utils "/bin")))))))) + #:install-plan + '(("git-open" "bin/git-open")))) (home-page "https://github.com/paulirish/git-open") (synopsis "Open a Git repository's homepage from the command-line") (description -- 2.29.2