From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCsY4-00078F-De for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCsY2-00039f-Ij for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCsY2-00039Y-EU for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gCsY2-0006tC-Bs for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:06 -0400 Subject: [bug#33079] [PATCH 09/34] gnu: camlp5: Update to 7.06. Resent-Message-ID: From: Julien Lepiller Date: Wed, 17 Oct 2018 22:34:17 +0200 Message-Id: <20181017203442.7075-9-julien@lepiller.eu> In-Reply-To: <20181017203442.7075-1-julien@lepiller.eu> References: <20181017223130.775b25fc@lepiller.eu> <20181017203442.7075-1-julien@lepiller.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33079@debbugs.gnu.org * gnu/packages/ocaml.scm (camlp5): Update to 7.06. --- gnu/packages/ocaml.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0b0ee92a9..9db79d823 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -473,14 +473,15 @@ syntax of OCaml.") (define-public camlp5 (package (name "camlp5") - (version "6.14") + (version "7.06") (source (origin (method url-fetch) - (uri (string-append "http://camlp5.gforge.inria.fr/distrib/src/" - name "-" version ".tgz")) + (uri (string-append "https://github.com/camlp5/camlp5/archive/rel" + (string-delete #\. version) ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89")))) + "08kr0h2rq3jh3kzqh5f6pr589bqw3y76z8k59ad2kdh50fjgp8xy")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) @@ -497,6 +498,11 @@ syntax of OCaml.") (invoke "./configure" "--prefix" out "--mandir" mandir)))) + (add-before 'build 'fix-/bin-references + (lambda _ + (substitute* "config/Makefile" + (("/bin/rm") "rm")) + #t)) (replace 'build (lambda _ (invoke "make" "-j" (number->string -- 2.18.0