From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id OD18BLKHhV9RHwAA0tVLHw (envelope-from ) for ; Tue, 13 Oct 2020 10:55:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uAJAALKHhV8HPQAAbx9fmQ (envelope-from ) for ; Tue, 13 Oct 2020 10:55:46 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 61BF294051E for ; Tue, 13 Oct 2020 10:55:45 +0000 (UTC) Received: from localhost ([::1]:37228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSHy2-00055K-Kl for larch@yhetil.org; Tue, 13 Oct 2020 06:55:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSHwQ-0003cR-FW for guix-patches@gnu.org; Tue, 13 Oct 2020 06:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSHwQ-0005t8-5c for guix-patches@gnu.org; Tue, 13 Oct 2020 06:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kSHwQ-00067W-3T for guix-patches@gnu.org; Tue, 13 Oct 2020 06:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43809] [PATCH v2] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Oct 2020 10:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43809 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 43809@debbugs.gnu.org Received: via spool by 43809-submit@debbugs.gnu.org id=B43809.160258640123476 (code B ref 43809); Tue, 13 Oct 2020 10:54:02 +0000 Received: (at 43809) by debbugs.gnu.org; 13 Oct 2020 10:53:21 +0000 Received: from localhost ([127.0.0.1]:45316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSHvl-00066a-08 for submit@debbugs.gnu.org; Tue, 13 Oct 2020 06:53:21 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSHvg-00066K-VC for 43809@debbugs.gnu.org; Tue, 13 Oct 2020 06:53:19 -0400 Received: by mail-wm1-f66.google.com with SMTP id p15so20462822wmi.4 for <43809@debbugs.gnu.org>; Tue, 13 Oct 2020 03:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=CBOXF9iSybZ8F2e+F+ZSAzWkDcAsQP6URNeZnmEE9w4=; b=nVKa+R1ZoCnIgMNam1OzEaW8sCnKdjy0VliFT2J/HGp2Y4/KdkdtnmBY8A4PnOMZvi LzFzM5Gmw9/tcJQ+rC9gqmOj5Y9EFrRz59f7cTJEcg12LlS2cEwCe7MPGBYYtY6p3D5Q JLfRF7ZOzFCXAldzdkfxTLBeH4wzzHnOq1AwP7oll5mruvmzsIWHoPJ1qq6iNHeCihth d9jXqew3/sHm1P6GpN91VZbMw8zSEAUTVSrxCHIMwQ61f6gFFUpCzfr05uVuOmJbaTI+ nAxJeHHdUCLJsBtOqILLCAPYcnXktaJqjEnvv/aH13AYbRVaGUglloq3CfND2N68F0nj TLng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=CBOXF9iSybZ8F2e+F+ZSAzWkDcAsQP6URNeZnmEE9w4=; b=iJUIS+qedbDaNWxHICsnjTpTqwkBzemKwCNhjwqVMl8ewPoNkX3YluVTctYVbbocUt WocWSS+pmCmS7OZSh0Ea1aMKk2B2hPcNMd6OUmmw6qUmGc6YH0R2h//CyYAyLnQQXfw6 2A9r8T9S233Sec5S29mnK7AsWA+0cp36pJyqAt6LUPgx7ex5OQkdXiM+55VEbkyTnsN/ WgwAB+iEJuFfsWEynLT49Lo0BqZEOJlVA6k1/Gjk7zkmUqCkH0xm8W0ECfhHPRzUTXhz Rx5DKj2DLRZsaMU3SmGwNB+GlzQMxtZTvWunaduN6ssegBFz+lrBh/ETgjM7pNKZpvdH Ia8w== X-Gm-Message-State: AOAM533agCBT449/28bHL45O2G36PQQGVlj0rzQHByL9fOSo8o5v5xPp OiaN9yNUIXaB2wesDLBibzfEHvNdcQ8= X-Google-Smtp-Source: ABdhPJwLwL5SFg/GvmwmmmOkgc81p9K8Kr46ogOHAxJp5UAxWenw7O/A1VmlcAIx45H8sfhyRN2QzA== X-Received: by 2002:a7b:c4c3:: with SMTP id g3mr15763754wmk.128.1602586390749; Tue, 13 Oct 2020 03:53:10 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id b25sm23633235wmj.21.2020.10.13.03.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 03:53:10 -0700 (PDT) From: zimoun In-Reply-To: <871ri25uyg.fsf@nicolasgoaziou.fr> References: <20201005072342.17369-1-zimon.toutoune@gmail.com> <20201008222532.19034-1-zimon.toutoune@gmail.com> <87a6wq60rw.fsf@nicolasgoaziou.fr> <871ri25uyg.fsf@nicolasgoaziou.fr> Date: Tue, 13 Oct 2020 12:53:08 +0200 Message-ID: <86pn5mmm7f.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=nVKa+R1Z; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: adrbrpMD1ozf --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Nicolas, Please find attached the v3 tweaking the =E2=80=99revision=E2=80=99 =E2=80= =9C0=E2=80=9D. On Tue, 13 Oct 2020 at 11:36, Nicolas Goaziou wrot= e: >>> I assume emacs-build-system is not an option, right? [...] > AFAICT, I see mostly elisp files in the repository, and all the > additional phases in the package are already handled by Emacs build > system. So, I thought using emacs-build-system would be enough. I didn't > try it, tho. I tried and I do not know=E2=80=A6 It seems building successfully. Even if= I have not checked if the result is functional. However, the =E2=80=99check= =E2=80=99 phase needs revamp, I guess. Well, the replacement needs more care than a simple drop-in. :-) All the best, simon -- >8 -- --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=v3-0001-gnu-emacs-tuareg-Update-to-2.2.0-0.ccde45b.patch Content-Transfer-Encoding: quoted-printable Content-Description: v3.patch >From 8c7d3838648e5f5b1d6dc6292550e35cf9413f82 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 5 Oct 2020 09:14:54 +0200 Subject: [PATCH v3] gnu: emacs-tuareg: Update to 2.2.0-0.ccde45b. * gnu/packages/ocaml.scm (emacs-tuareg): Update to 2.2.0-0.ccde45b. --- gnu/packages/ocaml.scm | 88 ++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d61948afc3..2abe63238e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -15,6 +15,7 @@ ;;; Copyright =C2=A9 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2020 Brett Gilio ;;; Copyright =C2=A9 2020 Marius Bakke +;;; Copyright =C2=A9 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -672,49 +673,54 @@ the OCaml core distribution.") (license license:lgpl2.1+))); with linking exception =20 (define-public emacs-tuareg - (package - (name "emacs-tuareg") - (version "2.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml/tuareg") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6")))) - (build-system gnu-build-system) - (native-inputs `(("emacs" ,emacs-minimal) - ("opam" ,opam))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (delete 'configure) - (add-before 'install 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/emacs/site-lisp") - (string-append (assoc-ref %outputs "out") - "/share/emacs/site-lisp/"))) - #t)) - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (symlink "tuareg.el" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/" - "tuareg-autoloads.el")) - #t))))) - (home-page "https://github.com/ocaml/tuareg") - (synopsis "OCaml programming mode, REPL, debugger for Emacs") - (description "Tuareg helps editing OCaml code, to highlight important + ;; Last upstream release on Sept., 14th, 2018, since then "Package cl + ;; deprecated" or 'lexical-binding' and others had been fixed. + (let ((commit "ccde45bbc292123ec20617f1af7f7e19f7481545") + (revision "0")) + (package + (name "emacs-tuareg") + (version (git-version "2.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/tuareg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"))= )) + (build-system gnu-build-system) + (native-inputs + `(("emacs" ,emacs-minimal) + ("opam" ,opam))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (delete 'configure) + (add-before 'install 'fix-install-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/emacs/site-lisp") + (string-append (assoc-ref %outputs "out") + "/share/emacs/site-lisp/"))) + #t)) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (symlink "tuareg.el" + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/" + "tuareg-autoloads.el")) + #t))))) + (home-page "https://github.com/ocaml/tuareg") + (synopsis "OCaml programming mode, REPL, debugger for Emacs") + (description "Tuareg helps editing OCaml code, to highlight important parts of the code, to run an OCaml REPL, and to run the OCaml debugger wit= hin Emacs.") - (license license:gpl2+))) + (license license:gpl2+)))) =20 (define-public ocaml-menhir (package --=20 2.28.0 --=-=-=--