From patchwork Sat Feb 23 08:50:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gabriel Hondet X-Patchwork-Id: 1224 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 31E0D16C2C; Sat, 23 Feb 2019 08:53:10 +0000 (GMT) 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=unavailable 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 B27E616AA7 for ; Sat, 23 Feb 2019 08:53:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:34890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxT3U-00076J-V0 for patchwork@mira.cbaines.net; Sat, 23 Feb 2019 03:53:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxT3P-00075x-Ue for guix-patches@gnu.org; Sat, 23 Feb 2019 03:53:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxT3O-0008NJ-Po for guix-patches@gnu.org; Sat, 23 Feb 2019 03:53:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxT3O-0008N2-L6 for guix-patches@gnu.org; Sat, 23 Feb 2019 03:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxT3O-0004oo-Ig for guix-patches@gnu.org; Sat, 23 Feb 2019 03:53:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113. Resent-From: Gabriel Hondet Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Feb 2019 08:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34627@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155091196818497 (code B ref -1); Sat, 23 Feb 2019 08:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Feb 2019 08:52:48 +0000 Received: from localhost ([127.0.0.1]:48836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxT3A-0004oH-Cw for submit@debbugs.gnu.org; Sat, 23 Feb 2019 03:52:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxT38-0004o4-3C for submit@debbugs.gnu.org; Sat, 23 Feb 2019 03:52:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:46304) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxT32-0008Df-ST for submit@debbugs.gnu.org; Sat, 23 Feb 2019 03:52:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxT31-00073s-Q0 for guix-patches@gnu.org; Sat, 23 Feb 2019 03:52:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxT30-0008Cn-NI for guix-patches@gnu.org; Sat, 23 Feb 2019 03:52:39 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41440) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxT30-0008Br-FA for guix-patches@gnu.org; Sat, 23 Feb 2019 03:52:38 -0500 Received: by mail-wr1-x441.google.com with SMTP id n2so4766924wrw.8 for ; Sat, 23 Feb 2019 00:52:38 -0800 (PST) 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=liZa6+mW54RyVBhrFfw42461grJsZixB8NHz77TiPCw=; b=aNnerDTvmAS88D3YR0gw7DyFx0SlNr6DvXordkQ5HgnkU9bQaVPLfh13hgxDQs7M4B o9tbOiq6rYCWaF5gAn8Ms+X7TBkA/pGkmOXIUpRHz9xC8RD2iPKW4YKHBKlYh9TQYF3I 7ShVnrrM7Wbee1VQjRqkwgSIew1KU05bvr/r1J2LEKtfSEkk2sFO8jrwYr9uu/VYDjBb wCeioJ3OfyHd4NUXVYSFQCRJ8WFDON+1Lwh18ZC+EViIfoKthNzCy3zkWQBk0QPeIrkX 26fSzYajbsxMNHhla2t3Y+b0FokMrvlbUPi4KLHPGzg7H85HbrT5JYMgi8BDM8fBBO1/ /qFw== 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=liZa6+mW54RyVBhrFfw42461grJsZixB8NHz77TiPCw=; b=h9I+7UZPCeHi83nz0D353O6Iu4CmqE1meVe52df1c3mCOdyJtGz5wIyHlWgo5SsG2s B82JW1eG+WTwDNRJ6oXoBVjTK+MB4ZzNB+EqPQ9WBWeXKCXYCzRTm4wFLyie3JumiDKR 4j3O3E1UmccYHCtwGUjEOrs+IUQHqNuEFYVOnE/+3Bg0qAoxAVJE4KXYIOV7v5VTiahc CjMVJhCOV3QFmfzzKNGVQ1uhgErcPTPLVCw5oVvjvbitzOKLbkwLSg3socTrZVKIOPot FgJtYz14ZGuty+aAtbgc7VcBs2HdjLdI6HX6bY4J+QMxniHlrYOjXOfz+814L7nBdOus Gq7g== X-Gm-Message-State: AHQUAuZNq15/Mf9NepjEMipQ9VL2Yv15QeePDNzU35dO+LtyxnxssRZ2 3QZDBaS6Z0pZ2zA+mPFDUiINq26N X-Google-Smtp-Source: AHgI3IYcmvVxgteWfvntoD55IgCesXyZasnzA6Z1gb+nA0D1ArmpHrixbHUd8aYm7ajYWr+9R8C9TA== X-Received: by 2002:a5d:574b:: with SMTP id q11mr5591863wrw.41.1550911956937; Sat, 23 Feb 2019 00:52:36 -0800 (PST) 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 h9sm8322809wrv.11.2019.02.23.00.52.35 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 23 Feb 2019 00:52:36 -0800 (PST) User-agent: mu4e 1.0; emacs 26.1 From: Gabriel Hondet Date: Sat, 23 Feb 2019 09:50:38 +0100 Message-ID: <87d0ni28fk.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113. --- gnu/packages/ocaml.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9a807a4cb6..31e9a697a2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -639,37 +639,43 @@ Emacs.") (define-public ocaml-menhir (package (name "ocaml-menhir") - (version "20161115") + (version "20181113") (source (origin - (method url-fetch) - (uri (string-append - "http://gallium.inria.fr/~fpottier/menhir/" - "menhir-" version ".tar.gz")) + (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 - "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k")))) - (build-system gnu-build-system) - (inputs - `(("ocaml" ,ocaml))) + "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr")))) + (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild))) (arguments - `(#:parallel-build? #f ; Parallel build causes failure - #:tests? #f ; No check target + `(#: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)) + (replace 'build + (lambda _ + (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all") + #t)) + (replace 'install + (lambda _ + (invoke "make" "-f" "Makefile" "install") #t))))) (properties `((ocaml4.02-variant . ,(delay ocaml4.02-menhir)))) - (home-page "http://gallium.inria.fr/~fpottier/menhir") + (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