From patchwork Fri May 3 18:30:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gabriel Hondet X-Patchwork-Id: 13886 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D06D916F97; Fri, 3 May 2019 19:31:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0002E16F92 for ; Fri, 3 May 2019 19:31:07 +0100 (BST) Received: from localhost ([127.0.0.1]:45747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMcxe-0000MO-Ao for patchwork@mira.cbaines.net; Fri, 03 May 2019 14:31:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMcxb-0000ME-Ub for guix-patches@gnu.org; Fri, 03 May 2019 14:31:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMcxa-0000QQ-Ox for guix-patches@gnu.org; Fri, 03 May 2019 14:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMcxa-0000Pr-9a for guix-patches@gnu.org; Fri, 03 May 2019 14:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMcxa-0001SW-1k for guix-patches@gnu.org; Fri, 03 May 2019 14:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113. References: <87d0ni28fk.fsf@gmail.com> In-Reply-To: <87d0ni28fk.fsf@gmail.com> Resent-From: Gabriel Hondet Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 18:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34627@debbugs.gnu.org Received: via spool by 34627-submit@debbugs.gnu.org id=B34627.15569082345570 (code B ref 34627); Fri, 03 May 2019 18:31:01 +0000 Received: (at 34627) by debbugs.gnu.org; 3 May 2019 18:30:34 +0000 Received: from localhost ([127.0.0.1]:49648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMcx7-0001Rl-ST for submit@debbugs.gnu.org; Fri, 03 May 2019 14:30:34 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:52078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMcx5-0001RZ-Tc for 34627@debbugs.gnu.org; Fri, 03 May 2019 14:30:32 -0400 Received: by mail-wm1-f47.google.com with SMTP id t76so8219911wmt.1 for <34627@debbugs.gnu.org>; Fri, 03 May 2019 11:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:date:message-id:mime-version; bh=CUGsv8wh9RXcvyv0yBkinauRhvXkNUPyjfBG5aQFZ2Q=; b=FuVO8yn9VeNB99z653uEiShUGvW6g5WvYV+2tuY8UfAjZmeOI1oDJ61CFxMFt1QKSq r6qg8erciMayaQ/+Ocp97BBKx1B5CFRWGvhoN3oHeKMqdMv7lOW/iLUjZHWCq1QkNIIc VA69fceQLi7sT/KZXCIzTif4YoFwoMmh6hCOGX05yxB/CDdVwUX4YwP2PizzLJ2pba/Z 9b9MB8pH5zrf/U84oUNqBEC56qT7z7Cxq3cOpOPmFN+uqrq929wASj20vwCKXCQsxwjm I+2UICrzcKBaLE/GBRqQc0BgDTh0UhfDfY4ssYPW5gxO9m2YHY6rnPWZfGOzkBfu41Ur uLQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=CUGsv8wh9RXcvyv0yBkinauRhvXkNUPyjfBG5aQFZ2Q=; b=YEafW6/jXX399M/xDdbYatfOELCBq39GRlY7AOVkq9iLa0kmtVakryRhq5dhMIxkJn nRV7oQHO2D+AbNvu25wQMrGFzfFoqMDA+HxyrnZFtJmmnjHNmOqtdWBS7uXuRCfbAYw5 9FzyFXkQTDv4edtk54QmdEu5NTBIbAfTOLTKRT3QTViaTMQ2JDnRPozR0sukGTON4rut x+9RMdW4NMiL+yFCAvUHgkdeH3sm/bZDCoHAV0eTqkwZrzXI5YOMSAuN5g6YhG4W1cjW YXnScdLy7pXvcjndrHeWL4oSCBd8wOdE5evWEldQaItkJ7w3QzfVCB5iX4Jj7pLvrh+J ox7A== X-Gm-Message-State: APjAAAUoV30q9DUxuO7a3ZCXY4/jno6FD/a5cLmHq/xYojBunil8ZjFu lihMMPevQ5HIN+Sa5ljjeZ/GBHKg X-Google-Smtp-Source: APXvYqy+jxh29BBO6hHqcxcL3tLps1Xq3rTWLEDyus0kZgW69OHL8aXWatVEP4HUospeo+l06OFk7w== X-Received: by 2002:a1c:730c:: with SMTP id d12mr6967936wmb.47.1556908226061; Fri, 03 May 2019 11:30:26 -0700 (PDT) Received: from glht-aurore.gmail.com (2a01cb04062c860082fa5bfffe3823d7.ipv6.abo.wanadoo.fr. [2a01:cb04:62c:8600:82fa:5bff:fe38:23d7]) by smtp.gmail.com with ESMTPSA id n2sm4323973wra.89.2019.05.03.11.30.24 for <34627@debbugs.gnu.org> (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 03 May 2019 11:30:25 -0700 (PDT) User-agent: mu4e 1.2.0; emacs 26.2 From: Gabriel Hondet Date: Fri, 03 May 2019 20:30:18 +0200 Message-ID: <87zho3xuf9.fsf@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi everyone, I submit back a patch which seems to have been forgotten. It has been revised. Cheers, Gabriel From 00f2ab14431a9e95cea9ae9e6e8dca974fbd53b7 Mon Sep 17 00:00:00 2001 From: gabrielhdt Date: Fri, 3 May 2019 20:25:04 +0200 Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113. * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113. --- gnu/packages/ocaml.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 33acbbec4e..6e69be3f19 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -756,35 +756,33 @@ Emacs.") (define-public ocaml-menhir (package (name "ocaml-menhir") - (version "20161115") - (source (origin - (method url-fetch) - (uri (string-append - "http://gallium.inria.fr/~fpottier/menhir/" - "menhir-" version ".tar.gz")) - (sha256 - (base32 - "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k")))) - (build-system gnu-build-system) + (version "20181113") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/fpottier/menhir.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr")))) + (build-system ocaml-build-system) (inputs `(("ocaml" ,ocaml))) (native-inputs `(("ocamlbuild" ,ocamlbuild))) (arguments - `(#:parallel-build? #f ; Parallel build causes failure + `(#:make-flags `("USE_OCAMLFIND=true" + ,(string-append "PREFIX=" (assoc-ref %outputs "out"))) #:tests? #f ; No check target #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "PREFIX" out)) - #t))))) - (home-page "http://gallium.inria.fr/~fpottier/menhir") + (delete 'configure)))) + (home-page "http://gallium.inria.fr/~fpottier/menhir/") (synopsis "Parser generator") (description "Menhir is a parser generator. It turns high-level grammar specifications, decorated with semantic actions expressed in the OCaml -programming language into parsers, again expressed in OCaml. It is based on +programming language into parsers, again expressed in OCaml. It is based on Knuth’s LR(1) parser construction technique.") ;; The file src/standard.mly and all files listed in src/mnehirLib.mlpack ;; that have an *.ml or *.mli extension are GPL licensed. All other files -- 2.21.0