From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sree Harsha Totakura Subject: [PATCH 2/2] gnu: curl: Fix tests. Date: Tue, 18 Feb 2014 21:45:58 +0100 Message-ID: <1392756358-15898-3-git-send-email-sreeharsha@totakura.in> References: <1392756358-15898-1-git-send-email-sreeharsha@totakura.in> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFrYZ-00072G-Te for guix-devel@gnu.org; Tue, 18 Feb 2014 15:46:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFrYU-0005Ju-JK for guix-devel@gnu.org; Tue, 18 Feb 2014 15:46:19 -0500 Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8]:44624 helo=smtp1.informatik.tu-muenchen.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFrYU-0005Io-D2 for guix-devel@gnu.org; Tue, 18 Feb 2014 15:46:14 -0500 In-Reply-To: <1392756358-15898-1-git-send-email-sreeharsha@totakura.in> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/curl.scm (curl): Add a new phase and python-2 to native-inputs. --- gnu/packages/curl.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index ea7dbf6..747535d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages ssh)) (define-public curl @@ -59,9 +60,20 @@ `(("perl" ,perl) ;; to enable the --manual option and make test 1026 pass ("groff" ,groff) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-2))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi"))) + `(#:configure-flags '("--with-gnutls" "--with-gssapi") + ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl + #:phases + (alist-cons-before + 'check 'patch-runtests + (lambda _ + (with-directory-excursion "tests" + (substitute* "runtests.pl" + (("/bin/sh") + (which "sh"))))) + %standard-phases))) (synopsis "curl, command line tool for transferring data with URL syntax") (description "curl is a command line tool for transferring data with URL syntax, -- 1.8.5.3