From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Subject: [PATCH] gnu: python-git-review: Wrap it so 'git', 'ssh' and 'scp' are found. Date: Sat, 10 Sep 2016 23:13:32 +0200 Message-ID: <20160910211332.27106-1-clement@lassieur.org> References: <20160910190536.GA6073@macbook42.flashner.co.il> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bipb6-0004Bp-FM for guix-devel@gnu.org; Sat, 10 Sep 2016 17:14:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bipb2-0001T5-7K for guix-devel@gnu.org; Sat, 10 Sep 2016 17:13:59 -0400 Received: from mail.lassieur.org ([83.152.10.219]:35880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bipb1-0001SW-Vk for guix-devel@gnu.org; Sat, 10 Sep 2016 17:13:56 -0400 Received: from localhost.localdomain (rke75-1-81-57-64-9.fbx.proxad.net [81.57.64.9]) by mail.lassieur.org (Postfix) with ESMTPSA id 35F1D6400D9 for ; Sat, 10 Sep 2016 23:13:51 +0200 (CEST) In-Reply-To: <20160910190536.GA6073@macbook42.flashner.co.il> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/openstack.scm (python-git-review)[arguments]: Add 'wrap-program' phase. [inputs]: Add openssh. --- gnu/packages/openstack.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 4cb38a9..62f1e84 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -20,6 +20,7 @@ (define-module (gnu packages openstack) #:use-module (gnu packages python) + #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (guix build-system python) @@ -796,12 +797,26 @@ permanence.") (base32 "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8")))) (build-system python-build-system) - (arguments `(#:tests? #f)) ; tests require a running Gerrit server + (arguments + '(#:tests? #f ; tests require a running Gerrit server + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (git (assoc-ref inputs "git")) + (openssh (assoc-ref inputs "openssh"))) + (wrap-program (string-append out "/bin/git-review") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list git openssh)))))))))) (native-inputs `(("python-pbr" ,python-pbr))) (inputs `(("python-requests" ,python-requests) - ("git" ,git))) + ("git" ,git) + ("openssh" ,openssh))) (home-page "http://docs.openstack.org/infra/git-review/") (synopsis "Command-line tool for Gerrit") (description -- 2.10.0