From patchwork Thu Oct 1 13:41:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24405 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 576BC27BBE9; Thu, 1 Oct 2020 14:50:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 91A8927BBE8 for ; Thu, 1 Oct 2020 14:49:56 +0100 (BST) Received: from localhost ([::1]:37040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyy3-00035i-Ok for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxC-0002ZU-0o for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxB-0002wc-Mz for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxB-0001yX-M8 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 01/27] gnu: unison: Build with ocaml-4.09. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015600967327 (code B ref 43745); Thu, 01 Oct 2020 13:49:01 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:16 +0000 Received: from localhost ([127.0.0.1]:34884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywL-0001sp-NT for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:16 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywG-0001sR-2B for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:07 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id c2eb7b06 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=EwRuLPrd2+LUBZlOIdbI5P9Lk mKac9Ww8FSAdvZyn4g=; b=Mwkmb0A08ICl0hnE6yaI81hK5qKk7jZly2OkE5eu9 KVjAwtmrltVTwnBDoucDXAXIUezbBgmSOelVnaYeUUU5aRdRhoO4NWcjnCUotHh0 Gh2djXKB3ryKNgEnqfP9dZAUx1RS68Ji9i6VLV16k5+X4Q9mr5BgOV53OOpBJutK TSU4c6tAyLHbi8HtdxuBlgt9GKTPCoN5v9gGz+TxtwK0N8zenAr/N1xcNlf3FFti JT0lT1Y8RcpqasDzr2N+/XZ7wpNV86hzToZLRQyAEwUQrd4aQds3wMbvzunzdzLV Mj/WtrVOMeA/ROBh084qjpIe+4RZxDkYt2XGbbf8g4z7Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7354fb81 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:07 +0200 Message-Id: <20201001134133.32105-1-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001153909.296c8d3e@tachikoma.lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (unison)[sources]: Add an upstream patch. [native-inputs]: Use ocaml-4.09. * gnu/packages/patches/unison-fix-ocaml-4.08.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/ocaml.scm | 5 +- .../patches/unison-fix-ocaml-4.08.patch | 76 +++++++++++++++++++ 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/unison-fix-ocaml-4.08.patch diff --git a/gnu/local.mk b/gnu/local.mk index a278c83553..2a1a0ae059 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1633,6 +1633,7 @@ dist_patch_DATA = \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ + %D%/packages/patches/unison-fix-ocaml-4.08.patch \ %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d61948afc3..394db50150 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -861,12 +861,13 @@ libpanel, librsvg and quartz.") (file-name (git-file-name name version)) (sha256 (base32 - "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")))) + "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")) + (patches (search-patches "unison-fix-ocaml-4.08.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.9 MiB of documentation (native-inputs - `(("ocaml" ,ocaml-4.07) + `(("ocaml" ,ocaml-4.09) ;; For documentation ("ghostscript" ,ghostscript) ("texlive" ,texlive-tiny) diff --git a/gnu/packages/patches/unison-fix-ocaml-4.08.patch b/gnu/packages/patches/unison-fix-ocaml-4.08.patch new file mode 100644 index 0000000000..4b6e6b6564 --- /dev/null +++ b/gnu/packages/patches/unison-fix-ocaml-4.08.patch @@ -0,0 +1,76 @@ +diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml +index 7cefa2e..378fc8b 100644 +--- a/src/Makefile.OCaml ++++ b/src/Makefile.OCaml +@@ -272,7 +272,7 @@ endif + + # Gtk GUI + ifeq ($(UISTYLE), gtk) +- CAMLFLAGS+=-I +lablgtk ++ CAMLFLAGS+=-I $(LABLGTKLIB) + OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo + OCAMLLIBS+=lablgtk.cma + endif +@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) + + ifeq ($(UISTYLE), gtk2) + ifndef OCAMLFIND +- CAMLFLAGS+=-I +lablgtk2 ++ CAMLFLAGS+=-I $(LABLGTK2LIB) + else + CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 ) + endif +diff --git a/src/files.ml b/src/files.ml +index 5ff1881..1d1fbcc 100644 +--- a/src/files.ml ++++ b/src/files.ml +@@ -734,7 +734,7 @@ let get_files_in_directory dir = + with End_of_file -> + dirh.System.closedir () + end; +- Sort.list (<) !files ++ List.sort String.compare !files + + let ls dir pattern = + Util.convertUnixErrorsToTransient +diff --git a/src/recon.ml b/src/recon.ml +index 2c619bb..2412c18 100644 +--- a/src/recon.ml ++++ b/src/recon.ml +@@ -661,8 +661,8 @@ let rec reconcile + + (* Sorts the paths so that they will be displayed in order *) + let sortPaths pathUpdatesList = +- Sort.list +- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) ++ List.sort ++ Path.compare + pathUpdatesList + + let rec enterPath p1 p2 t = +diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml +index 453027d..c2288b8 100755 +--- a/src/system/system_generic.ml ++++ b/src/system/system_generic.ml +@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen + let chmod = Unix.chmod + let chown = Unix.chown + let utimes = Unix.utimes +-let link = Unix.link ++let link s d = Unix.link s d + let openfile = Unix.openfile + let opendir f = + let h = Unix.opendir f in +diff --git a/src/uigtk2.ml b/src/uigtk2.ml +index fbc5d8f..4e82cc2 100644 +--- a/src/uigtk2.ml ++++ b/src/uigtk2.ml +@@ -94,7 +94,7 @@ let icon = + let icon = + let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in + Gpointer.blit +- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); ++ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + p + + let leftPtrWatch = From patchwork Thu Oct 1 13:41:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24401 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 1138D27BBE8; Thu, 1 Oct 2020 14:49:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A040227BBE9 for ; Thu, 1 Oct 2020 14:49:20 +0100 (BST) Received: from localhost ([::1]:36156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyxT-0002ay-NH for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxC-0002Za-C8 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxC-0002wg-2U for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxC-0001ye-1s for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 02/27] gnu: camlp5: Update to 7.13. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015600977341 (code B ref 43745); Thu, 01 Oct 2020 13:49:02 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:17 +0000 Received: from localhost ([127.0.0.1]:34900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywS-0001u8-8r for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:16 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywK-0001sR-8D for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:08 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ab93d4e1 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=5Ox5n5Pi9mUBD8YfD4cRC1Tdm qx9Oh1fCPFyg853jt0=; b=Ym77SYN1sRnR1t3NuMnxA0/geoht2nsXQmGXzuY9W ANVzWA9EVi+49XrLH9JNbeeyQy+h02H6UtmrZx+aQ080i4Tk0c+C6LK9gAwzUmKM J1QfyGvw6f/ZBA0Ff/wPMnp+O3B8s6cb0uqYNvBAfwuqa0hMpcCanjq8A9b5QfYK fFOUmxsvXqQERpe42gdCLgMgvXDaNj9IaYFtLHWOtrArwi2l8l+lrJEDMzULrQEY fm3OgoOiPZ8qxk/7vhxZ6euPastiJc3Kf9n8PUrnzBWJ8rU+0TdxolV+aZWEDctu IrCfzviVIGwdk1Gx/U86/8mVXjvXZ7d1WKyprKIzAVooQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 30c14487 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:02 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:08 +0200 Message-Id: <20201001134133.32105-2-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (camlp5): Update to 7.13. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 394db50150..f5d7799ae5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -541,7 +541,7 @@ Git-friendly development workflow.") (define-public camlp5 (package (name "camlp5") - (version "7.12") + (version "7.13") (source (origin (method git-fetch) @@ -550,7 +550,7 @@ Git-friendly development workflow.") (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf")))) + (base32 "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) From patchwork Thu Oct 1 13:41:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24400 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 D93FE27BBEA; Thu, 1 Oct 2020 14:49:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9092927BBE8 for ; Thu, 1 Oct 2020 14:49:20 +0100 (BST) Received: from localhost ([::1]:36160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyxT-0002b5-KF for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxC-0002Zz-O0 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxC-0002wl-FF for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxC-0001yl-Ej for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 03/27] gnu: ocaml-mccs: Update to 1.1+11. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015600977359 (code B ref 43745); Thu, 01 Oct 2020 13:49:02 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:17 +0000 Received: from localhost ([127.0.0.1]:34904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywS-0001uN-Qn for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:17 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywK-0001sY-FG for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:09 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fb59b818 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=46NQuSP1v2cavmIhyfs82nn4D 80zhD+K8ITUMQoF5R4=; b=evw1CmCNmKDkXjhs3W6kNblAsWD3o5yKnadHfxN69 l6EMfCjZS4ekQKSNpgFND/NH9Q7a+IUrUHN3gDKTOm9x825Apl8z1B8SQmMRIPNo ReiEXUQrXwrmFmdrVt+Nwxjscqx1kssN3/TPXt+Ocqcm9Lx0UDmEFJ3yPtNOta30 Wr2QX5P7x9D7DHVTnJs2vLxCF4a/QOAakmMP6EO7DjUH2oRWnKJ49lR62uUbKVDX +Gx+qy/yrnFHe2NSVHNnCgG3oHlFvwhKWV/GPgEuMiEBSJy71/e9f5hJ2qhTtSwg O9Qlz4MR69LZiaxwwZ0EXSfWOQpgio9XEorKEZltAOnYw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 18da3de3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:02 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:09 +0200 Message-Id: <20201001134133.32105-3-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mccs: Update to 1.1+11. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f5d7799ae5..521df69d59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -329,7 +329,7 @@ Software distribution.") (define-public ocaml-mccs (package (name "ocaml-mccs") - (version "1.1+9") + (version "1.1+11") (source (origin (method git-fetch) (uri (git-reference @@ -338,7 +338,7 @@ Software distribution.") (file-name (git-file-name name version)) (sha256 (base32 - "1i0hhkrqi7rqlainlg5pc4hibbx6b5dp3x99gmav8c3sbfvlk9mc")))) + "1gsad5cj03256i36wdjqk5pg51pyd48rpjazf0gfaakrn8lk438g")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-cudf" ,ocaml-cudf))) (home-page "https://www.i3s.unice.fr/~cpjm/misc/") From patchwork Thu Oct 1 13:41:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24409 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 E6BB927BBE9; Thu, 1 Oct 2020 14:50:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B079727BBE8 for ; Thu, 1 Oct 2020 14:50:22 +0100 (BST) Received: from localhost ([::1]:38290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyT-0003eC-SQ for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxD-0002a2-4P for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxC-0002ws-Ri for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxC-0001yt-R0 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 04/27] gnu: ocaml-migrate-parsetree: Update to 1.7.3. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601037392 (code B ref 43745); Thu, 01 Oct 2020 13:49:02 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:23 +0000 Received: from localhost ([127.0.0.1]:34907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywT-0001ue-CH for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:23 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywK-0001sR-Ti for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:12 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 69d58322 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=0X+voh8berMAfZIIE8o0PAfrY 2TmMThrPeq/4fLMaZw=; b=SP20t/ePIZktyOaaGuN47D8mDY/05eSyZwQyy8v1K LbeKGvjK1/HlkoYv94cNG0khP4ij3VyJ5BfZlXXi3aLA3YOi3J7HPBQ5uwrLOP7P b0mqpizwC24rceqsIX1SgAcJcZtqAXx50f1q3n6vusE/3wpglJGdHbuN5hII1XvS XYk1UQSjtmX4OxOVqDeVL+4muwG6o8SHnqwJ1LKq5yMNbWzIXtVGwb7F2zuuwtHR dH6B4DBtVhQEKZjtnwVR0YaSEp8PGbBNZHqrxia/lZVJSxebM1NgUr8xaeCHANum pSdbaZRO8Cfd8nR7AZ6UYiStmdhgdlDYKOZiHXSF0sXww== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2fc85840 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:03 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:10 +0200 Message-Id: <20201001134133.32105-4-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-migrate-parsetree): Update to 1.7.3. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 521df69d59..ed692230bc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1292,7 +1292,7 @@ following a very simple s-expression syntax.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.4.0") + (version "1.7.3") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin @@ -1303,7 +1303,7 @@ following a very simple s-expression syntax.") (file-name (git-file-name name version)) (sha256 (base32 - "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2")))) + "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx")))) (build-system dune-build-system) (arguments `(#:tests? #f)) From patchwork Thu Oct 1 13:41:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24413 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 58FC227BBE9; Thu, 1 Oct 2020 14:50:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D14827BBE8 for ; Thu, 1 Oct 2020 14:50:41 +0100 (BST) Received: from localhost ([::1]:39190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyym-000430-AV for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxD-0002a5-Gc for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxD-0002wy-7q for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxD-0001z0-6t for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 05/27] gnu: ocaml-ppx-tools-versioned: Update to 5.4.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601037399 (code B ref 43745); Thu, 01 Oct 2020 13:49:03 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:23 +0000 Received: from localhost ([127.0.0.1]:34915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywZ-0001vB-D7 for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:23 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywL-0001sY-Tw for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:12 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 280e3875 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=4hHcDp/4LTQc6RCLQEozsd8kb Vv6QzcxK95uVsYXqwA=; b=L7aMINsaeSHtGU1QVchfSWIJdlw4/vW9J/dF4TupO 3+cQd8MGAOdMpXONXjozsqIMlBjThNpH+ZfktSPajqTwf80kC6UlK22IPRQyc5ds JljdJZchHCDo1h8mI7H97Pts3qXCBif7MwsaLpF8bwSAaexQtppeQlHm5aoYG4C2 MGIsHLESRCF++p5xt5YnW0Kcb/g/4a4Xi7bxPBsUJXM69JkFojfG69v9eTc0lYVB uXYLeNI9xJGdMfUotg2sek/uhpLlSOP10BdcsUKtKvMYn8Q4AAQIp3vweeIGa9JN 4Zo70CTPVanvcKVhhAy57TPmG7448w7LM8QL10Xdpvf9g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ca0ea835 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:03 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:11 +0200 Message-Id: <20201001134133.32105-5-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-ppx-tools-versioned): Update to 5.4.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ed692230bc..9ec9c82b16 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1321,7 +1321,7 @@ functions to the next and/or previous version.") (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned") - (version "5.2.3") + (version "5.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -1330,7 +1330,7 @@ functions to the next and/or previous version.") (file-name (git-file-name name version)) (sha256 (base32 - "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y")))) + "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) (build-system dune-build-system) (arguments `(#:test-target ".")) From patchwork Thu Oct 1 13:41:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24416 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 E049427BBE9; Thu, 1 Oct 2020 14:51:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D67B27BBE8 for ; Thu, 1 Oct 2020 14:51:08 +0100 (BST) Received: from localhost ([::1]:39984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzD-0004T2-Qu for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxD-0002a6-TL for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxD-0002x4-K7 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxD-0001z7-JV for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 06/27] gnu: ocaml-qtest: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601037407 (code B ref 43745); Thu, 01 Oct 2020 13:49:03 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:23 +0000 Received: from localhost ([127.0.0.1]:34917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywZ-0001vI-K6 for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:23 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywO-0001sR-NS for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:13 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 7f4fd7aa for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=594pNpLMvQ+xP6yiVk6ND91FW 8FiOHpcok60h0VojwU=; b=Uaf0b1USsmJrXLeIckUr30t3rBOj6DZWbJoW32CMY U5OpIzR7+SeTF1txj6bQVQoep2PPy0ecGyaYWny1fBUqyTU+oPC5sGGFbGCieON5 QNzQLIa2/mQKYyvQOyKEUjtY5Dat+j/wy+TMYE6IISwl3J3qx1sXmIEiusmzecdV NDZ5j3QrlCdg744RvCstP9kI132pCdNjZR7KgcW/EepM1wh4Kr4hVL4QUALpc3wP cRkTnA8D+s2Rwqwb39gim7GU1vQ/5P07klvKfoWdVnHQbXNJmuawE3gkEgiIAOBb h11E+8uAXu4ZqhFNvvRsS7OeQlnIJ0UiFzDMKPGA7WUbw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ca425e18 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:04 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:12 +0200 Message-Id: <20201001134133.32105-6-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-qtest): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9ec9c82b16..97b5b26c70 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1213,8 +1213,7 @@ instances and printing them.") "0gddzan4vzs0vklsxhirdjrvx3rp7hhh2yr20vi13nq8rwkn9w29")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:test-target "tests")) + `(#:test-target "tests")) (propagated-inputs `(("ounit" ,ocaml-ounit) ("qcheck" ,ocaml-qcheck))) From patchwork Thu Oct 1 13:41:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24403 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 E5F5D27BBEA; Thu, 1 Oct 2020 14:49:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 938A327BBE8 for ; Thu, 1 Oct 2020 14:49:54 +0100 (BST) Received: from localhost ([::1]:36962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyy1-00033q-Jg for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxE-0002a7-Af for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxE-0002x8-0F for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxD-0001zF-Vo for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 07/27] gnu: ocaml-bitstring: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601077422 (code B ref 43745); Thu, 01 Oct 2020 13:49:03 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:27 +0000 Received: from localhost ([127.0.0.1]:34919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywZ-0001vQ-QA for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:27 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywP-0001sY-07 for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:13 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 01283897 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=YlJf8ZABiXWOkfT+rmjpxxGGh hYeJPVoTwrN7A6/HRQ=; b=ICocTlzBQkjOmQ/nR1MbBdPQV0Jhs01hf5Pj1SHoH /d0QKSYUOr2VS0f6+7MKlt3zgDUtjmASdBBh3kZ05pQllWAjA9mzI5rG5JKJli/S V/YvUQS3Bl1vtfbrEDb4XHdS2Xva8n8F0PjoDaa3vyEEydLigZF+T1mbnrRXdv3/ SYkVyOE0WUlQHUArlOVu0P+/AL+cN7u9Tgp8dXyLOmA3pfhvXFUNp04/57kgCoBa qliqbLd6/SN3ZTLnWZVXVIY528awX77uRYzCQngU45gadNEkF8UHkzqaOfDZfeQI +4dUvNfBR58J+h5+RG9bQqlahKt6pChUfl3Y+JEfypiKg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b59f2653 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:04 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:13 +0200 Message-Id: <20201001134133.32105-7-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bitstring): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 97b5b26c70..e85a73365d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1362,8 +1362,8 @@ ocaml-migrate-parsetree") (propagated-inputs `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) (arguments - `(#:tests? #f; Tests fail to build - #:jbuild? #t)) + `(#:package "bitstring" + #:tests? #f)); Tests fail to build (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as From patchwork Thu Oct 1 13:41:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24419 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 92A1427BBF3; Thu, 1 Oct 2020 14:51:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2C3F727BBEC for ; Thu, 1 Oct 2020 14:51:21 +0100 (BST) Received: from localhost ([::1]:40680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzQ-0004m2-Bu for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxE-0002ah-Mm for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxE-0002xC-DE for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxE-0001zM-Cb for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 08/27] gnu: ocaml-lwt-log: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601077429 (code B ref 43745); Thu, 01 Oct 2020 13:49:04 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:27 +0000 Received: from localhost ([127.0.0.1]:34921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywd-0001vf-3F for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:27 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywP-0001sR-Br for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:13 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 06931a56 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=RxnQqN/Xh7dMLWlnRARyHhsjo bn/NJSygcr6/4rxQvo=; b=lBB8Cr3JYBhG38AqnGSq4wjukVqqynfmOkSMbVR2w hCJdbqEUJCNU7iporFjE30cd4U7aRev517/YBY8Ct6y+37JzEl0llCaoSiNOQsgd vvftC2ZVPjFkBJVYyNmSAAgrzwPMhfifbW8tpRB0Yp5wNfk7dcfgBFdV7ZvPRReN rWj8q8i0xlKulH/CRvN0DDYISeI2N7qJwKSC9Z7IRFMHg83FTfoL/rmnab0XNh4q tmuovAeMIo+fz3mz7w33svIOMVuNfCZglXoryG7VJpEBt/uUuDKI3n3M/FB0GHj3 2RCEh3CLGOz6b+9RumRHXrBU7H74Oe2AK94/P6PoJJIsw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 04ee43da (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:05 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:14 +0200 Message-Id: <20201001134133.32105-8-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-lwt-log): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e85a73365d..13c31ef939 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1866,8 +1866,7 @@ locks or other synchronization primitives.") "1n12i1rmn9cjn6p8yr6qn5dwbrwvym7ckr7bla04a1xnq8qlcyj7")))) (build-system dune-build-system) (arguments - `(#:tests? #f; require lwt_ppx - #:jbuild? #t)) + `(#:tests? #f)); require lwt_ppx (propagated-inputs `(("lwt" ,ocaml-lwt))) (properties `((upstream-name . "lwt_log"))) From patchwork Thu Oct 1 13:41:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24407 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 77F6227BBEA; Thu, 1 Oct 2020 14:50:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 22CC827BBE8 for ; Thu, 1 Oct 2020 14:50:16 +0100 (BST) Received: from localhost ([::1]:37820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyN-0003Rn-4G for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002ak-33 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51650) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxE-0002xG-Pg for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxE-0001zT-PJ for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 09/27] gnu: ocaml-easy-format: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601077436 (code B ref 43745); Thu, 01 Oct 2020 13:49:04 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:27 +0000 Received: from localhost ([127.0.0.1]:34923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywd-0001vm-Ge for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:27 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywP-0001t4-FK for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b3640936 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=/HSTA9ZsxLFG7hECfRnGQiSo/ 8Ung//cQXHKDHRKHFQ=; b=cFyJfC76tk0OZD8F4n6wMJ4GfGyg9FXJObJa+RcZD 24YBD4mErjvbQvCDPImNF071wNb0bjz5ICH/wrbDHDSCYA/b+QcG7Kpvud+Ybd7s 9P+8mVSycUtFuhxi6xZwUaB+8xAFi3hwUwT3RDNjhI1UIdbpgU/rDfzmMNNy5IbC JmWYUsQNj/sx+oamnBO2uNcSbv6XQVswZ+3mb+Bf84alLVUQeQid+9VrHy1i2seV pUg3Q4/RFZEgIflsD2ggBbQ7kbjXAFNyLADqRhugiluzd9I0gcsXOsR688H5jIHz JNsbp0QvjQp9rUlnVVJoduvO6NjgQVV3/zCzQPAqucapg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ea4605ef (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:05 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:15 +0200 Message-Id: <20201001134133.32105-9-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-easy-format): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 13c31ef939..5aa95bf569 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2817,7 +2817,7 @@ JSON.") "1fc95q2ypck6m6rv3kiawwilh5ac93v2hcp823mj608d5kj79xkb")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t + `(#:package "easy-format" #:phases (modify-phases %standard-phases (add-before 'build 'make-writable From patchwork Thu Oct 1 13:41:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24408 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 B02B927BBE8; Thu, 1 Oct 2020 14:50:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 959B727BBE9 for ; Thu, 1 Oct 2020 14:50:16 +0100 (BST) Received: from localhost ([::1]:37928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyN-0003UW-Nt for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002ao-FY for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002xL-69 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxF-0001zb-5a for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 10/27] gnu: ocaml4.07-zed: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601087443 (code B ref 43745); Thu, 01 Oct 2020 13:49:05 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:28 +0000 Received: from localhost ([127.0.0.1]:34925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywd-0001vt-Pl for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:27 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywP-0001sY-Nv for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 94ef3b20 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=1r2DPFZMTbmbX6MW7GFnVhAR8 Mo+nxDfswW2kIFCwRU=; b=h7MjiIv7biFwuK1FI+l+WoWv1pv7VvRAHGF9b6M9Z crhCwzUEIZGy+dIT/I/DyRrJcgLjC7de/cmIzBgK5H9vCKd7qWhmX+eWHpUGf3e9 uTC6U4Ol/i/iS5KR/jZPKoQTzxiMJOP3kzfp4Qf/C7XivtXYAd8/LqGmfjLeJLoj 4yoxgly6N/BebXZ/YSu9CxhZAExzQBaoVqolo/qakLpNvEGdJ6I8EZuMk7mWBMH2 WaxTtzs8wCRal7FudFMNjjmIlJpI6Eo/CuVFiSt7pKUtw+aUwk5TfcldMo5AuOeu 069WQaj9n337WiqPtKnJumSsb4KsyMuMr1H6DdUACVfYA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f5def1ef (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:06 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:16 +0200 Message-Id: <20201001134133.32105-10-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (ocaml4.07-zed): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5aa95bf569..bad755516d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3146,8 +3146,7 @@ function that follows the prototype of POSIX's wcwidth.") (base32 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:test-target "." + `(#:test-target "." #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (propagated-inputs From patchwork Thu Oct 1 13:41:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24410 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 9C93127BBE9; Thu, 1 Oct 2020 14:50:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7078227BBE8 for ; Thu, 1 Oct 2020 14:50:34 +0100 (BST) Received: from localhost ([::1]:38704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyf-0003pa-Fs for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002b4-SC for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002xP-JJ for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxF-0001zi-IA for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 11/27] gnu: ocaml4.07-utop: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601087451 (code B ref 43745); Thu, 01 Oct 2020 13:49:05 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:28 +0000 Received: from localhost ([127.0.0.1]:34927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywe-0001w0-0w for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:28 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywQ-0001sR-58 for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id acab45d5 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=ZxzCuF9+use2uFE/a9UEmcDLW 5759al8YV8Moo2kZpo=; b=T2Qyaoj8hNy4oiM4l7ewKyzq6HnjemlW7iyNT3KY7 7BEUMAAFqV07/Qtsb1e8Li8SfziT6jzkANX3YY40yWDUToUPx+Bpff4X8ww8dffl 7NTOiQ3esezXqtawyxe57JudH26faNtkVhkodn4PmeYuwsdPc8EvtvQVyF04C2jW 4mHBAtIqmZ9PShtt5HyCDf/TYLf8y01iT+LoYJ7sFUw0oc0RiaLI+azglU4H2oqN JoZDPe07kZkuywSxJ1DEMaPJvmEdStIObrLckXcCzicUETRmGmg1IsLDvR4X/Fpm 7sthgT5n0cSg/Vr+nqgXH1ZZfZ9WirfF8BpqZnxzZDESw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6b1ea7b8 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:07 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:17 +0200 Message-Id: <20201001134133.32105-11-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (ocaml4.07-utop): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bad755516d..50bfc10fc3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3211,8 +3211,7 @@ instead of bindings to a C library.") (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:test-target "." + `(#:test-target "." #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (native-inputs From patchwork Thu Oct 1 13:41:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24404 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 25B7027BBE8; Thu, 1 Oct 2020 14:49:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C71FC27BBE9 for ; Thu, 1 Oct 2020 14:49:54 +0100 (BST) Received: from localhost ([::1]:36978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyy1-00034H-Vz for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxG-0002bT-9U for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002xY-VO for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxF-0001zp-Uu for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 12/27] gnu: ocaml4.07-merlin: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601087458 (code B ref 43745); Thu, 01 Oct 2020 13:49:05 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:28 +0000 Received: from localhost ([127.0.0.1]:34929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywe-0001w8-Aq for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:28 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywQ-0001t4-Eg for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 422a41a8 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=WB1IgpV9SBme30YCDBvSnaREW wURBOejbBS8o1LMSO8=; b=E28wNx36A9QHYJpQrZm6CiCx5VH+x6KwYSVqhsgfi QeJERqyg/EPHEZZGJhAOJsWM8SpxYk35lBTP+aGByseTa7EEeNPPjkWODfAjmeNq QyvYjBwYo4stZZduw4pqY5KCum7cNseanSYN9a52R98KHv4W7NwdGKNCLsIVTVlb vFoEY78u7pY4TSfY6lwiEgMoOlicr9dijATNAveG99E5R7Lf3hoS+xSHjsWZ5tVF zbf5hxXqb5jIaSToBIDUjTAVSSqFraGJGksiUHt/ftirPq9ycxRJOIqnGD2JtAjc FaCEcbTPpwgvdGDh1LQdf4FGQ/fs0Y8AcGjeUNOMBgZOg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id afc2b549 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:07 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:18 +0200 Message-Id: <20201001134133.32105-12-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (ocaml4.07-merlin): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 50bfc10fc3..0515dc097c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3761,7 +3761,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (native-inputs `(("ocaml-findlib" ,ocaml-findlib))) (arguments - `(#:jbuild? #t + `(#:package "merlin" #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) From patchwork Thu Oct 1 13:41:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24421 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 740E627BBE9; Thu, 1 Oct 2020 14:51:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46CC827BBE8 for ; Thu, 1 Oct 2020 14:51:38 +0100 (BST) Received: from localhost ([::1]:41316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzh-00051d-HA for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002cU-9u for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxG-0002xe-CZ for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxG-0001zx-BE for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 13/27] gnu: ocaml4.07-ppx-expect: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601087465 (code B ref 43745); Thu, 01 Oct 2020 13:49:06 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:28 +0000 Received: from localhost ([127.0.0.1]:34931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywe-0001wF-Ie for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:28 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywQ-0001sY-JP for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id dc0eb518 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=905ihNbF0TIRfbkVKiXp8z3KL NK+4DhL0///y25AWng=; b=RE1DtDRlW+0WJ3SIUjW0qZ///1UB//KcvbbET/boG w2lTJYBqfn9d2DOkanGv/A97VFVMBh0Fe1SYytE61iXnXvNpd4Wp9JyiHI79U5xL YvPlDc1ew3at3uaTAHy9G1dj/WuqVq92JFmgKLcbeRnZJj2ETk2d5xt2c8LTZq5u pqc3NNHM0VHHZYtldl0HlS2B8Qqx0uRz2SCz7D6gFSuYh78vabhPueKXtK62TCjj wUbaCt/Lx57oUvYBwQo9HRv58zNab/msZPIz7kEq4fexlfyr+RG3L2rql/Tn+bQ4 DJBPgqs8J1rYU8p5C0MYCkoo24Dko3iIdcnrWrUad6Ftw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2a196997 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:08 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:19 +0200 Message-Id: <20201001134133.32105-13-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (ocaml4.07-ppx-expect): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0515dc097c..4dce8bbe1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4864,8 +4864,7 @@ useful errors on failure.") "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - #:ocaml ,ocaml-4.07 + `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) From patchwork Thu Oct 1 13:41:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24402 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 AF43E27BBE9; Thu, 1 Oct 2020 14:49:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7222427BBE8 for ; Thu, 1 Oct 2020 14:49:21 +0100 (BST) Received: from localhost ([::1]:36226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyxU-0002eP-EX for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002cV-A2 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxG-0002xh-Nk for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxG-000204-Na for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 14/27] gnu: ocaml4.07-core: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601097474 (code B ref 43745); Thu, 01 Oct 2020 13:49:06 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:29 +0000 Received: from localhost ([127.0.0.1]:34933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywe-0001wM-RF for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:29 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywQ-0001sR-RK for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:15 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id daaa1979 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=kcCBauvQky4lBseMZZJ3vcuaG TIXBLSZ5zGLwRSdrDk=; b=fkG54mgOInqoW/GAI3ATNL12iRXbaNgkaIqIMyu0g 7wr0dAYvINVGdLKP2GudzH7mOMNOI0OED6SYyJPhpkI+cHGmksosICkih2QppVJe WQQl7SLLFHQdfki/5qc5X1wof1KCC9KFE0koLrW33IGLYh7HYE93zXPy76iqoCAN uSkx3MykAvVVkD7FR9OCu8EJdhS+BZEoI5CkG2A4vBFQQspU4JipQ6ufMTumxjZ+ BoFZ32qvWqkkOzA/r0aLBLmRtAOUaV5MeHeoZ6F6YswFoJz5ov0BEJDZqITrqZSs I6vwBRe+f/LADXTw1nsRy+GHm+rXljC6nnyDJ2F4Ta6xA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a11fb9b8 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:08 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:20 +0200 Message-Id: <20201001134133.32105-14-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (ocaml4.07-core): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4dce8bbe1c..3910f5c20f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5221,9 +5221,8 @@ thousands of times faster than fork. "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t - ;; Require a cyclic dependency: core_extended - #:tests? #f + `(#:package "core" + #:tests? #f; Require a cyclic dependency: core_extended #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib)) (propagated-inputs From patchwork Thu Oct 1 13:41:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24423 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 F215827BBE9; Thu, 1 Oct 2020 14:51:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BA2F927BBE8 for ; Thu, 1 Oct 2020 14:51:49 +0100 (BST) Received: from localhost ([::1]:41784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzs-0005FY-Tx for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002dA-GG for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002xq-5F for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxH-00020C-3h for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 15/27] gnu: ocaml-tyxml: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601097482 (code B ref 43745); Thu, 01 Oct 2020 13:49:07 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:29 +0000 Received: from localhost ([127.0.0.1]:34935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywf-0001wV-2b for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:29 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywR-0001t4-4k for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:15 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 256aa207 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=lGf3GtN20syqHOoIcoWUs1eW/ s/IJ/5EvOXvPcTJtC4=; b=GJJ51S/rQeZANwPHpV35IU1OsGJ11ib09Qqf1XF18 ggNvK8i6cbuyyXplPLtVleHyHfdbT5iDIlJHbay5jFQtlpd2G5S7EvA/8tcKA3uR I49EYwvS6zjfzMNaGRBSfK3nZMTlht+Vf5Bdl/fHpWz9t+tUguWHOE/8r/4txfiu 3EEQlcr18ZqN0XC9jTTx4ILWeh8okgCbZHbyytV0VRWgaxV09l8xIsXAgzRqqKrc yHL4GxKX4MFkZ612hLBKHFHUBfiAzsjkfrOlvCJvLGWOIBhsHmThox6jx3EQk4d4 xn6xPmFXiSis0mZLtJktsPqH8nAA22ZMQdchSu1K42SNg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5a526d2a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:09 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:21 +0200 Message-Id: <20201001134133.32105-15-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-tyxml): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3910f5c20f..aa9230cd9e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5370,7 +5370,7 @@ stream, and convert everything to UTF-8.") ("ocaml-markup" ,ocaml-markup))) (native-inputs `(("ocaml-alcotest" ,ocaml-alcotest))) - (arguments `(#:jbuild? #t)) + (arguments `(#:package "tyxml")) (home-page "https://github.com/ocsigen/tyxml/") (synopsis "TyXML is a library for building correct HTML and SVG documents") (description "TyXML provides a set of convenient combinators that uses the From patchwork Thu Oct 1 13:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24414 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 6296927BBE9; Thu, 1 Oct 2020 14:50:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F53427BBE8 for ; Thu, 1 Oct 2020 14:50:45 +0100 (BST) Received: from localhost ([::1]:39594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyq-0004FJ-Bg for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002db-Py for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002y6-G8 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxH-00020J-Fe for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 16/27] gnu: Add ocaml-stdlib-shims. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601097489 (code B ref 43745); Thu, 01 Oct 2020 13:49:07 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:29 +0000 Received: from localhost ([127.0.0.1]:34937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywf-0001wd-Ap for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:29 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywR-0001sY-9O for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:15 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9c7842df for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=oNhGVtr5/v96CYobu0vjyDPFF m7ZKP2Okh59BV01OkE=; b=DtlnMb07/2Zc85Usyh7b88aCxV9FHvRhpAyKuYQHR 9nRR32bcaVpOY3m2EmhA4W/AQUrsLZR/LxyNxwaeebMb3A08oXWDzaJbeqK4tSmP 4+N97MKog7xymiUKu61tuR8otzFRjQPTAap1SwrzmvDzLY/nvNzgsIqE3AxItyuL F2zfO2VhcGBQ52IMHjJ+W4eX5S4KmgMsm4x+gQkwQiDYxM33C9B5r86fgrrHxhQ4 gzgtV2QDUWvpdL5/krqKF/M7QxTL8zmz8pI+hsOAtrMrY3JoWK5FAfRQv8QlJpvO 11WNNELt/99BFv6sv52jJkvHb+FOzWhYX724/iwFGkmUg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 028b458e (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:09 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:22 +0200 Message-Id: <20201001134133.32105-16-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-stdlib-shims): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa9230cd9e..7f402e0a47 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -265,6 +265,30 @@ functional, imperative and object-oriented styles of programming.") for building OCaml library and programs.") (license license:lgpl2.1+))) +(define-public ocaml-stdlib-shims + (package + (name "ocaml-stdlib-shims") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/stdlib-shims") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk")))) + (build-system dune-build-system) + (home-page "https://github.com/ocaml/stdlib-shims") + (synopsis "Backport of some of the new stdlib features to older OCaml") + (description "This package backports some of the new stdlib features to +older OCaml compiler, such as the Stdlib module. + +This allows projects that require compatibility with older compilers to +use these new features in their code.") + ;; Same as the OCaml compiler + (license (list license:qpl license:lgpl2.0)))) + (define-public ocaml-extlib (package (name "ocaml-extlib") From patchwork Thu Oct 1 13:41:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24406 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 3A57127BBEA; Thu, 1 Oct 2020 14:50:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 49B8D27BBEC for ; Thu, 1 Oct 2020 14:50:16 +0100 (BST) Received: from localhost ([::1]:37850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyN-0003SX-AY for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxI-0002eW-5Z for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxH-0002yF-Rw for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxH-00020Q-RS for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 17/27] gnu: opam: Update to 2.0.7. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601097496 (code B ref 43745); Thu, 01 Oct 2020 13:49:07 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:29 +0000 Received: from localhost ([127.0.0.1]:34939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywf-0001wk-JF for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:29 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywR-0001sR-GC for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:15 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ed0dddc9 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=sdhyiD68AlHX7JA9Mhx5EkNIf fzzp1jnnrqesvzBWjo=; b=F3fufG0d3UZAwr1kZF8PKv26lOuWL5JiIVAX8ji6n q2LZWX1Bebe6ZE7S+znQK+RysQB+uP1ciL5cKbqf9QFAdApejYkiwkrDJE5zbze9 b9MdNYuKyNl40L0Q4y1nG8D+NoQqXd/d0oO/WJAN9YVnA3gIEHyrJ9Fc0L+kmrD9 +67bu+QsrIdSWEywQiV+w3nt/25tkwZgnv3gHu1VBZEMrAk84Oe8QIjaPl9LopM8 YiJXj7KX4EQpUodvvDB75bNjt8r1ILGe/SbuQOJE1jHAZcxsXeKc0MJnmgWgHeSo JpYlfrimbTh0E6NOVsesh4+MZg2ax6ccg6zcRnZmMC6qA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7f35683a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:10 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:23 +0200 Message-Id: <20201001134133.32105-17-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (opam): Update to 2.0.7. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7f402e0a47..181cd679d4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -460,7 +460,7 @@ the opam file format.") (define-public opam (package (name "opam") - (version "2.0.6") + (version "2.0.7") (source (origin (method git-fetch) (uri (git-reference @@ -469,7 +469,7 @@ the opam file format.") (file-name (git-file-name name version)) (sha256 (base32 - "1vyga2jllsfsikppxyzljm4isfnnnl8k0rb44h8xaddjzdg1d4m8")))) + "1p719ccn9wnzk6impsnwr809yh507h8f37dx9nn64b1hsyb5z8ax")))) (build-system ocaml-build-system) (arguments `(#:configure-flags From patchwork Thu Oct 1 13:41:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24417 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 953FC27BBEA; Thu, 1 Oct 2020 14:51:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 375C227BBE9 for ; Thu, 1 Oct 2020 14:51:18 +0100 (BST) Received: from localhost ([::1]:40418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzN-0004fb-Ba for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxI-0002eh-Gw for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxI-0002yJ-7T for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxI-00020Y-7A for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 18/27] gnu: ocaml-base64: Update to 3.4.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601107503 (code B ref 43745); Thu, 01 Oct 2020 13:49:08 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:30 +0000 Received: from localhost ([127.0.0.1]:34941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywf-0001wr-Sz for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:30 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywR-0001t4-Qt for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:16 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 02b0020a for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=kCgZaxcUksdQ2qgwYalbg8RzV d9JLCg3ndM/SwXUqCI=; b=Pk1zTpYDBBYg4WQdxaKNWE+gELcCeaDQ7iqemFkQj 1TzTZv5mN24djiVkNsXHteOoss0brLMq2Fm6ILPXDKQ8W6i1RdWC4TiDzL6vveG5 HYRUXIOStJXSG1rsnxovFb5x+nDRir3pJLyKyrhOMVAVtP+wCed4aCc/yc3k86fK GstqUXngCwdTEqc4jnBX5khaoyeCqw52S9Q/lWgVoBPwh9jsTcYmkn9sp9O80/OF nmOPsEB+IflhrMaBfI95QvEVeC1/u7IFRLeLRv51ViRXLiTzu6XV93CmNVCZnqYL zdlkEn8CN3cfAwV4Q2J/eYEfnWzDtgpJMbCNSfoPVlGjg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2d1796c4 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:10 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:24 +0200 Message-Id: <20201001134133.32105-18-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-base64): Update to 3.4.0. --- gnu/packages/ocaml.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 181cd679d4..07270f329d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2257,7 +2257,7 @@ multitude of other network protocols (FTP/SMTP/RTSP/etc).") (define-public ocaml-base64 (package (name "ocaml-base64") - (version "3.2.0") + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -2266,8 +2266,19 @@ multitude of other network protocols (FTP/SMTP/RTSP/etc).") (file-name (git-file-name name version)) (sha256 (base32 - "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy")))) + "0aa1m1sr8p1hgc10p96mij7p22r3qcysvzy6fz2jqamfgswchgqc")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dune + (lambda _ + ;; This package expects dune 2, which unbundled its configurator + ;; module. We still use dune 1, so we need to let it know we need + ;; its internal module. + (substitute* "config/dune" + (("dune-configurator") "dune.configurator")) + #t))))) (native-inputs `(("ocaml-alcotest" ,ocaml-alcotest) ("ocaml-bos" ,ocaml-bos) From patchwork Thu Oct 1 13:41:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24411 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 4142227BBE9; Thu, 1 Oct 2020 14:50:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0E57727BBE8 for ; Thu, 1 Oct 2020 14:50:35 +0100 (BST) Received: from localhost ([::1]:38732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyg-0003qM-45 for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxN-0002ez-Fj for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxI-0002yR-W2 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxI-00020n-VU for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 19/27] gnu: ocaml-logs: Update to 0.7.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601107518 (code B ref 43745); Thu, 01 Oct 2020 13:49:08 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:30 +0000 Received: from localhost ([127.0.0.1]:34945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywg-0001x6-CJ for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:30 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywS-0001sY-3U for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:17 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 987f2a9d for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=vv5hDT9AkwGg7ZaHDnqyrrD/9 Jm0IkuqlwDm368L3J0=; b=iCOTc9kNGvO194ts16FHcaGTM2e2nb019hQOXKvtu YUf+VHPUBTZpVDjTQBJVl2dReCj2e+yOsplaIS1mwdutE7XcgbyD09uG4dS18HWa x0iIxr5Ppx0Y0gOjJJaSViaiOPsxC4GcQ1TbLwLjIDCLL9HYH9VUrBXiCRsiCOeV zsKoF7u6hVEu5BHEIoXlNTXfG12FBMz8Y5B3vYYLKwSWBMDf3mgCLSDRug5p8dzl 1uXSpNUW8dIPW8xLudMUqCQPdIz7DqjEgNekL4SEMLLb0ailyb4ka3iHJDwTk7rA IyYgeUmxD2xLKodAuTseJtGss/13TEWQiG1MwtS8Ti8Rw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f55ed22f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:11 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:25 +0200 Message-Id: <20201001134133.32105-19-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-logs): Update to 0.7.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 07270f329d..cd14f0b578 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1903,14 +1903,14 @@ ocaml lwt.") (define-public ocaml-logs (package (name "ocaml-logs") - (version "0.6.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/logs/releases/" "logs-" version ".tbz")) (sha256 (base32 - "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853")))) + "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46")))) (build-system ocaml-build-system) (arguments `(#:tests? #f From patchwork Thu Oct 1 13:41:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24420 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 6B00527BBE8; Thu, 1 Oct 2020 14:51:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B0D6027BBEA for ; Thu, 1 Oct 2020 14:51:25 +0100 (BST) Received: from localhost ([::1]:41068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzU-0004vc-TG for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxI-0002ek-UX for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxI-0002yN-K0 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxI-00020g-JB for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 20/27] gnu: ocaml-fmt: Update to 0.8.9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601107511 (code B ref 43745); Thu, 01 Oct 2020 13:49:08 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:30 +0000 Received: from localhost ([127.0.0.1]:34943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywg-0001wy-3k for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:30 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywS-0001sR-6r for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:16 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2129051c for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=thCsHjsvkEJGH8LhKta9GAgzr aO+CbEqERakRd1VWzA=; b=Wl5726aE/OYnHuvMZdbRxxbhJciQolRPEgurQndRx mW0zWt5xfxzZarAgiBEczPonshcP3rYk/I2D87F7sLgycHxxtXPQQkZzg7z27h7D x8VM5kIo2naP6Si4GRL1fu8DU9/xt8iLx4iWOTpzWF1+iDDnIri+Oiek51sdX6ww ngfbekpoNEHoaPEDmamzYc+Cob9mqK+1ErVss3b9xGWK4BS1J8qvIxoqrR+VsfIO JACXdCsUQIQDuA9CWey9PEbd/hnfRJik/ps5gn2PjealxYVYkIquPhtHZHDPhVhE hh1ucg6vagugyR5vskuZlRJrDsEqvbWoEYbCty1RLolJg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id eb578d5f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:11 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:26 +0200 Message-Id: <20201001134133.32105-20-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-fmt): Update to 0.8.9. --- gnu/packages/ocaml.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cd14f0b578..365c87d8b2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1618,23 +1618,23 @@ most of the POSIX and GNU conventions.") (define-public ocaml-fmt (package (name "ocaml-fmt") - (version "0.8.5") + (version "0.8.9") (source (origin (method url-fetch) (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" version ".tbz")) (sha256 (base32 - "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060")))) + "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild) ("opam" ,opam) ("topkg" ,ocaml-topkg))) (propagated-inputs - `(("result" ,ocaml-result) - ("ocaml-uchar" ,ocaml-uchar) - ("cmdliner" ,ocaml-cmdliner))) + `(("cmdliner" ,ocaml-cmdliner) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-uchar" ,ocaml-uchar))) (arguments `(#:tests? #f #:build-flags (list "build" "--with-base-unix" "true" "--with-cmdliner" "true") From patchwork Thu Oct 1 13:41:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24415 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 AF1AD27BBE9; Thu, 1 Oct 2020 14:50:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6D1DB27BBE8 for ; Thu, 1 Oct 2020 14:50:45 +0100 (BST) Received: from localhost ([::1]:39638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyq-0004Gy-IS for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxN-0002fC-LR for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxJ-0002yS-Cv for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxJ-00020u-BQ for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 21/27] gnu: ocaml-alcotest: Update to 1.0.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601107525 (code B ref 43745); Thu, 01 Oct 2020 13:49:09 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:30 +0000 Received: from localhost ([127.0.0.1]:34947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywg-0001xD-JV for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:30 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywS-0001t4-Jx for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:17 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3e8be617 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=v4XF6SUJKBzf6EfSrQgEmTLvh L3CJvouHN2cDiwoXGw=; b=MyDKt5iZIIwVq9N67Qls1PiOCd6TOvrar1RNkzmx+ 8Nw7ry67Icv23hDLtXoRLBNUWPaBVqjqtlftLZO9jjET7RhUZiDFHchKgHOCOr9F vhGdo6r8q6AqYSmrqms9alJ0r39YD3f11oeKaDtf3W1ky1/GsYU3p+2QBu/JA6F8 kExa9a3P1eLwxgxEDskroIk2FaBRstj4vG5EKMHs+TP/OpG/MGjad969W1THPgqa kCiejaTzoH4kjbNNjNH3kz0dQhLUIPUgLCC+prsB4FnYLbx9IU5z6VJmxzJcYlzU poXaT6exy4AALmQid+j6awjbHMZ0FvhyvBxULw06MgllQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f2da56cd (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:12 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:27 +0200 Message-Id: <20201001134133.32105-21-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 365c87d8b2..9633dc30fb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1683,14 +1683,14 @@ immutability.") (define-public ocaml-alcotest (package (name "ocaml-alcotest") - (version "0.8.5") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mirage/alcotest/releases/" "download/" version "/alcotest-" version ".tbz")) (sha256 (base32 - "0szwjxvaahgynsx0apj81jxj3ki6yz4is9mh2wkcbx66qy7n6fvb")))) + "1a43ilhwnj58pq3bi78ni46l9wh6klmmgfc93i94mvyx48bzzayx")))) (build-system dune-build-system) (arguments `(#:package "alcotest" @@ -1701,8 +1701,10 @@ immutability.") `(("ocaml-astring" ,ocaml-astring) ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-fmt" ,ocaml-fmt) - ("ocaml-result" ,ocaml-result) - ("ocaml-uuidm" ,ocaml-uuidm))) + ("ocaml-re" ,ocaml-re) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-uuidm" ,ocaml-uuidm) + ("ocaml-uutf" ,ocaml-uutf))) (home-page "https://github.com/mirage/alcotest") (synopsis "Lightweight OCaml test framework") (description "Alcotest exposes simple interface to perform unit tests. It From patchwork Thu Oct 1 13:41:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24422 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 A1C4527BBE9; Thu, 1 Oct 2020 14:51:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F59B27BBE8 for ; Thu, 1 Oct 2020 14:51:47 +0100 (BST) Received: from localhost ([::1]:41590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzq-00058q-KN for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxN-0002f9-KY for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxJ-0002yV-PO for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxJ-000212-Om for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 22/27] gnu: ocaml-result: Update to 1.5. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601117532 (code B ref 43745); Thu, 01 Oct 2020 13:49:09 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:31 +0000 Received: from localhost ([127.0.0.1]:34949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywg-0001xK-Qt for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:31 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywT-0001sR-88 for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:17 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 184a995a for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=CxypD5HFenh10Lo0ejJ+zHzgl SGpzdpU/+82HF8t14k=; b=mQ0RD9QX63C0x2T/UjTJBafqarMuLQgVT6ByHUozs C3iA3CAxsIc9zxfBOYzk07FedFio1w536fUa0I0gxScn1V+aEQUphSSVmhCzQ1IH Ouj6lpCbFY1J0TmaQ5F1esWTC9LgWkPL/xAAAh3Y4s1G6A9hg1WDVQCBWl+k0VnS dz7dzZnlxtTonqchjpD8wvx702wpfFl4m+hrteuZnzIu1yIsJGYOshXeVAnSg83p EJxQEa0ppbTX7a113i0h7bEdJWksG7wOxl35gePcxAx4EHU/c9nq24c5YTintDKY mdAmzSPtHr3yoURLBkyGEAV0oen0Bq7C3NNfvhmRAmJsA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d3c19160 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:12 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:28 +0200 Message-Id: <20201001134133.32105-22-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-result): Update to 1.5. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9633dc30fb..ee82f9ca32 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1400,7 +1400,7 @@ powerful.") (define-public ocaml-result (package (name "ocaml-result") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) (uri (git-reference @@ -1409,7 +1409,7 @@ powerful.") (file-name (git-file-name name version)) (sha256 (base32 - "0hir97k9i72nfkm6kncxnqpyk400wlsxysbldgcvk0fd9pjnsc3p")))) + "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments `(#:test-target ".")) From patchwork Thu Oct 1 13:41:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24424 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 82F3527BBE9; Thu, 1 Oct 2020 14:51:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 421CF27BBE8 for ; Thu, 1 Oct 2020 14:51:56 +0100 (BST) Received: from localhost ([::1]:42222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzz-0005QL-Ev for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxO-0002gl-AH for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxK-0002yb-W6 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxK-00021O-Uw for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 23/27] gnu: Add ocaml-csexp. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601127556 (code B ref 43745); Thu, 01 Oct 2020 13:49:10 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:32 +0000 Received: from localhost ([127.0.0.1]:34955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywi-0001xj-6v for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:32 -0400 Received: from lepiller.eu ([89.234.186.109]:51936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywT-0001sY-E6 for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:24 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9757fda9 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=WA7Ey3jM2p3GOttpGMHbhC2cr nsElX+COULvaStlyPQ=; b=JDlVoRyq/u9O2QxaY5XsRfm41AecYrHMOBsqon6aj yaH9PQnJE1KIJz5v4A15FGOhUviFPgaNk4baX27wy2p77oxxdQS7iijP/F6eFduz /1cJjyTlP5v29Id8QcxmCuWDQ9t/ZYAApz+AzfvybrwJvhDOEAB4E83VHrCyOzVw hdDU2NmdoeOqGC7dLGyaPJVp5Jj7W4la7g3Fb57MidhynbsQUCirgQHnLtGfvCi5 MKuNkM+zcfIl2hzec1h9UptEXXQfFPnZZ//Y8cm0mwOeQUURO8Dg4efrrL2ByCSq LJ6grcM/j/gnadXMDF2prikr9adIMdvX6i/f51oVvZl5g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 97c0c8f2 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:29 +0200 Message-Id: <20201001134133.32105-23-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-csexp): New variable. --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ee82f9ca32..55496f8ca4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1312,6 +1312,47 @@ following a very simple s-expression syntax.") (define-public ocaml4.07-dune (package-with-ocaml4.07 dune)) +(define-public ocaml-csexp + (package + (name "ocaml-csexp") + (version "1.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-dune/csexp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "190zppgvdjgghmrnx67ayzzk86qdjy3yn5fcrcw08wsh93384pl0")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f; FIXME: needs ppx_expect, but which version? + #:phases + (modify-phases %standard-phases + (add-before 'build 'chmod + (lambda _ + (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) + #t))))) + (propagated-inputs + `(("dune" ,dune) + ("ocaml-result" ,ocaml-result))) + (home-page "https://github.com/ocaml-dune/csexp") + (synopsis "Parsing and printing of S-expressions in Canonical form") + (description "This library provides minimal support for Canonical +S-expressions. Canonical S-expressions are a binary encoding of +S-expressions that is super simple and well suited for communication +between programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions.") + (license #f))) + (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") From patchwork Thu Oct 1 13:41:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24412 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 CD51727BBE9; Thu, 1 Oct 2020 14:50:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 891E927BBE8 for ; Thu, 1 Oct 2020 14:50:35 +0100 (BST) Received: from localhost ([::1]:38754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyyg-0003r6-JC for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:50:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxN-0002fe-Po for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxK-0002yW-6R for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxK-000219-5Z for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 24/27] gnu: ocaml-compiler-libs: Build only with OCaml 4.07. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601117540 (code B ref 43745); Thu, 01 Oct 2020 13:49:10 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:31 +0000 Received: from localhost ([127.0.0.1]:34951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywh-0001xR-2c for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:31 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywT-0001t4-QK for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:18 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 41758fba for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=vQC2lkzo9YE81ld9uLzQSQCsE gL4jqnV+eC2wCGvUiQ=; b=Li7S0oa0TdR3iUHJT30Gf7k3uuyLBnW7LhCwISxFT 3Ixr7ODHMf8/hwfPmXrMbVB0Ab4IDKDSrPYJexWl51Q4axwV+lXLr323UgDdBkIm zUcpVmiiSFNcqwmK023kiaSOSSDkIwBmp9J6zwZHb20ywjxT5j9X2Lp0LmbUoYkv NtWBsLGLWylVGaO4+TtTuc41OIOeJwrCBABSAXodjsXekU7LU66UPuTficy0P25H HjzMLtHqTY9eMJuvjOi46mgFm7g6XW72Y7NsjX+l34JEJTFZhDGPkXq8cofAzVRM U2oBpmuPWV8JwFogL3yWCMegP4PTkxXLf5JznX3TaLOeg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 8a2c2841 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:13 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:30 +0200 Message-Id: <20201001134133.32105-24-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-compiler-libs): Rename to... (ocaml4.07-compiler-libs): ...to this. Use OCaml 4.07. --- gnu/packages/ocaml.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 55496f8ca4..96ef6fbd17 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3598,7 +3598,7 @@ syntax checking on dedukti files.") `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) + ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,ocaml4.07-sexplib0) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4116,9 +4116,9 @@ provided by companion libraries such as @url{https://github.com/janestreet/stdio, ocaml-stdio}.") (license license:expat))) -(define-public ocaml-compiler-libs +(define-public ocaml4.07-compiler-libs (package - (name "ocaml-compiler-libs") + (name "ocaml4.07-compiler-libs") (version "0.11.0") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source @@ -4133,7 +4133,10 @@ provided by companion libraries such as "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) (build-system dune-build-system) (arguments - '(#:tests? #f)) ;no tests + `(#:tests? #f ;no tests + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ocaml-compiler-libs"))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries @@ -4216,7 +4219,7 @@ as part of the same ocaml-migrate-parsetree driver.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) + ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) From patchwork Thu Oct 1 13:41:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24426 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 3BABA27BBE9; Thu, 1 Oct 2020 15:07:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E29E227BBE8 for ; Thu, 1 Oct 2020 15:07:34 +0100 (BST) Received: from localhost ([::1]:57434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNzF8-0004ss-3f for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 10:07:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNzEf-0004gL-EN for guix-patches@gnu.org; Thu, 01 Oct 2020 10:07:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNzEc-0005lP-2q for guix-patches@gnu.org; Thu, 01 Oct 2020 10:07:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNzEb-0003AK-TQ for guix-patches@gnu.org; Thu, 01 Oct 2020 10:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 25/27] gnu: ocaml-jane-street-headers: Build only with OCaml 4.07. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 14:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.160156116112079 (code B ref 43745); Thu, 01 Oct 2020 14:07:01 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 14:06:01 +0000 Received: from localhost ([127.0.0.1]:37834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNzDd-00038e-45 for submit@debbugs.gnu.org; Thu, 01 Oct 2020 10:06:01 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywU-0001sR-4y for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:18 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1c3774a5 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=i2nu5NptuWF5hwCWEaKEYicKD UC33jp+HIqJW2v4ECI=; b=DcAbPj/uxJW83a3lgpRRU82LENsDko/mTEK32/ztb lbsSBSJEUJzj4GXHOdQPURbFdm1c/2f+1ZtszPthNEqCIK3+XsUWfMrLRdKqOFIt 0MltMZ3T8c6zpHBj08nPRQgT40D/qdFc360G7oB87OWp4wuRfpnelemxp5Ry3O0G UfHXLxYunszB+ZqPvn6eftMDv2lS3RzBh3uyx2si2y9M8TMgKjbZ8jGdy9WEQhZI FVnWKk9HLEPMOxtmMedHyH1+6dWp8n1Q7AWafv/5RZT9bZAIC3MpArD01Z3TGGbJ SXDzxNwxEOAVyDiewx7kHZ87kM3Y+r2W/oQpqWy/lTdlg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3be9e534 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:14 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:31 +0200 Message-Id: <20201001134133.32105-25-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-jane-street-headers): Rename to... (ocaml4.07-jane-street-headers): ...to this. Use OCaml 4.07. --- gnu/packages/ocaml.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 96ef6fbd17..1a08bc9531 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5182,9 +5182,9 @@ This library implements a splittable pseudo-random number generator that sacrifi cryptographic-quality randomness in favor of performance.") (license license:asl2.0))) -(define-public ocaml-jane-street-headers +(define-public ocaml4.07-jane-street-headers (package - (name "ocaml-jane-street-headers") + (name "ocaml4.07-jane-street-headers") (version "0.11.0") (source (origin (method url-fetch) @@ -5196,7 +5196,10 @@ cryptographic-quality randomness in favor of performance.") "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) + `(#:test-target "." + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (home-page "https://github.com/janestreet/jane-street-headers") (synopsis "Jane Street C header files") (description "This package provides C header files shared between the @@ -5350,8 +5353,7 @@ standard library that was developed by Jane Street.") ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) - ("ocaml-jane-street-headers" - ,(package-with-ocaml4.07 ocaml-jane-street-headers)) + ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) From patchwork Thu Oct 1 13:41:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24418 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 1A18527BBE9; Thu, 1 Oct 2020 14:51:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3468127BBE8 for ; Thu, 1 Oct 2020 14:51:17 +0100 (BST) Received: from localhost ([::1]:40338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyzM-0004d0-DC for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxN-0002gA-UO for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxK-0002yX-IZ for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxK-00021H-I6 for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 26/27] gnu: ocaml-4.07: Ensure build with ocaml4.7-dune. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601127550 (code B ref 43745); Thu, 01 Oct 2020 13:49:10 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:32 +0000 Received: from localhost ([127.0.0.1]:34953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywh-0001xZ-Ai for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:32 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywU-0001t4-Io for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:19 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f1395cd9 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=jQMGPcWbZ20saA+6u1ca5BOxU rvMemJcTtmTFJee5zE=; b=Fwr7QNrfZ+wjL6f5jq178qGtBW968TdLZrgeN2p6C zipImdLX6uvbeTCsrB6mvYDRwk6YbJa1xYeZoDIfInBGytqa7xpBqgWuco8cxqDH Nlvu83Ooj5f7Cied8XlAiM1ya7WLjzlbODN+8OF9H+ib1+ABF5DwHNDEi5RmYBjV U3HuXIAJSPVRcRllwgdkGEVyfi0T1ON8C2FdRHvUej8UodMatNHAxSIMhBAWqouH 2f5LEw9TeTa94NBp/rQ96J30nef3TQKwpETd9kP3ynAl2J4hjrVYynlQorQfYAJ6 YxjuKcd4BCRGYFJBBVj6N1jcD8Qx0RxO0hEPnqHJeaYmA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 31e7cc50 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:14 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:32 +0200 Message-Id: <20201001134133.32105-26-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (ocaml4.07-gen, ocaml4.07-sedlex) (ocaml4.07-ezjsonm, ocaml4.07-uri, ocaml4.07-charinfo-width) (ocaml4.07-zed, ocaml4.07-lambda-term, ocaml4.07-utop) (ocaml4.07-ppx-inline-test, ocaml4.07-earley, ocaml4.07-merlin) (ocaml4.07-sexplib0, ocaml4.07-parsexp, ocaml4.07-sexplib) (ocaml4.07-base, ocaml4.07-stdio, ocaml4.07-ppxlib, ocaml4.07-ppx-compare) (ocaml4.07-fieldslib, ocaml4.07-variantslib, ocaml4.07-ppx-fields-conv) (ocaml4.07-ppx-sexp-conv, ocaml4.07-ppx-variants-conv) (ocaml4.07-ppx-custom-printf, ocaml4.07-bin-prot, ocaml4.07-ppx-hash) (ocaml4.07-ppx-enumerate, ocaml4.07-ppx-bench, ocaml4.07-ppx-here) (ocaml4.07-ppx-typerep, ocaml4.07-ppx-sexp-value, ocaml4.07-ppx-sexp-message) (ocaml4.07-ppx-pipebang, ocaml4.07-ppx-optional, ocaml4.07-ppx-optcomp) (ocaml4.07-ppx-let, ocaml4.07-ppx-fail, ocaml4.07-ppx-assert) (ocaml4.07-ppx-expect, ocaml4.07-ppx-js-style, ocaml4.07-ppx-typerep-conv) (ocaml4.07-ppx-base, ocaml4.07-ppx-bin-prot, ocaml4.07-ppx-jane) (ocaml4.07-splittable-random, ocaml4.07-configurator, ocaml4.07-spawn) (ocaml4.07-core, ocaml4.07-core-kernel)[arguments]: Use ocaml4.07-dune. --- gnu/packages/ocaml.scm | 147 +++++++++++++++++++++++++++-------------- 1 file changed, 98 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1a08bc9531..d2e2e61863 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2092,7 +2092,8 @@ representation of the data.") `(#:tests? #f; no tests #:package "gen" #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-odoc" ,ocaml4.07-odoc))) (native-inputs @@ -2137,7 +2138,8 @@ and consumable.") (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs @@ -2829,7 +2831,8 @@ writing to these structures, and they are accessed via the Bigarray module.") `(#:package "ezjsonm" #:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)))) (propagated-inputs @@ -2867,7 +2870,8 @@ JSON.") (substitute* "lib/uri.ml" (("Re.get") "Re.Group.get"))))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) @@ -3195,7 +3199,8 @@ library is currently designed for Unicode Standard 3.2.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) @@ -3226,7 +3231,8 @@ function that follows the prototype of POSIX's wcwidth.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width) @@ -3256,7 +3262,8 @@ connect an engine to your inputs and rendering functions to get an editor.") `(#:build-flags (list "--profile" "release") #:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt)) ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) @@ -3291,7 +3298,8 @@ instead of bindings to a C library.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("cppo" ,(package-with-ocaml4.07 ocaml-cppo)))) (propagated-inputs @@ -3593,7 +3601,8 @@ syntax checking on dedukti files.") ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -3666,7 +3675,8 @@ or quantified formulas.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Parsing library based on Earley Algorithm") (description "Earley is a parser combinator library base on Earley's algorithm. It is intended to be used in conjunction with an OCaml syntax @@ -3842,7 +3852,8 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") `(#:package "merlin" #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. @@ -3988,7 +3999,8 @@ exclusion algorithms are typical examples of such systems.") (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of @@ -4014,7 +4026,8 @@ that was developed by Jane Street, the largest industrial user of OCaml.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) (synopsis "S-expression parsing library") @@ -4063,7 +4076,8 @@ parsexp_io.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) ("ocaml-parsexp" ,ocaml4.07-parsexp) @@ -4101,7 +4115,8 @@ functionality for parsing and pretty-printing s-expressions.") (lambda _ (invoke "dune" "build" "@install" "--profile=release")))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Full standard library replacement for OCaml") (description @@ -4166,7 +4181,8 @@ is now @code{Ocaml_common.Ast_helper}.") (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4247,7 +4263,8 @@ as part of the same ocaml-migrate-parsetree driver.") all)))) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (synopsis "Base library and tools for ppx rewriters") (description @@ -4286,7 +4303,8 @@ OCaml AST in the OCaml syntax; ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_compare"))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") @@ -4315,7 +4333,8 @@ by making sure that you only compare comparable values.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4346,7 +4365,8 @@ of a record and create new record values.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4380,7 +4400,8 @@ standard library.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_fields_conv"))) (home-page "https://github.com/janestreet/ppx_fields_conv") (synopsis "Generation of accessor and iteration functions for ocaml records") @@ -4411,7 +4432,8 @@ new record values.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_sexp_conv"))) (home-page "https://github.com/janestreet/ppx_sexp_conv") (synopsis "Generation of S-expression conversion functions from type definitions") @@ -4441,7 +4463,8 @@ definitions.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_variants_conv"))) (home-page @@ -4473,7 +4496,8 @@ variant types.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_custom_printf"))) (home-page "https://github.com/janestreet/ppx_custom_printf") (synopsis "Printf-style format-strings for user-defined string conversion") @@ -4505,7 +4529,8 @@ string conversion.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") @@ -4571,7 +4596,8 @@ storage of large amounts of data.") ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (properties `((upstream-name . "ppx_hash"))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") @@ -4596,7 +4622,8 @@ hash functions from type exrpessions and definitions.") (arguments `(#:tests? #f; no test suite #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4627,7 +4654,8 @@ many values).") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" @@ -4656,7 +4684,8 @@ many values).") ;; broken tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4685,7 +4714,8 @@ many values).") (arguments `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") @@ -4707,7 +4737,8 @@ many values).") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4737,7 +4768,8 @@ ocaml values.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4771,7 +4803,8 @@ context such as function arguments.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4800,7 +4833,8 @@ context such as function arguments.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4829,7 +4863,8 @@ else expression.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-stdio" ,ocaml4.07-stdio) @@ -4857,7 +4892,8 @@ size, the version of the compiler, ...") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -4885,7 +4921,8 @@ match expressions, and if expressions.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -4914,7 +4951,8 @@ position.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) @@ -4946,7 +4984,8 @@ useful errors on failure.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) @@ -4989,7 +5028,8 @@ to denote the expected output.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-migrate-parsetree" @@ -5021,7 +5061,8 @@ packages.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-typerep" ,ocaml4.07-typerep) @@ -5051,7 +5092,8 @@ from type definitions.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) @@ -5088,7 +5130,8 @@ verification tool.") ;; Cyclic dependency with ocaml-ppx-jane `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) @@ -5119,7 +5162,8 @@ functions from type definitions.") (arguments `(#:test-target "." #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) @@ -5164,7 +5208,8 @@ driver including all standard Jane Street ppx rewriters.") (build-system dune-build-system) (arguments `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) @@ -5223,7 +5268,8 @@ various Jane Street packages.") ;; No tests `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-stdio" ,ocaml4.07-stdio))) @@ -5266,7 +5312,8 @@ Configurator allows one to: (("/bin/echo") (which "echo"))) #t))) #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) (home-page "https://github.com/janestreet/spawn") @@ -5308,7 +5355,8 @@ thousands of times faster than fork. `(#:package "core" #:tests? #f; Require a cyclic dependency: core_extended #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-configurator" ,ocaml4.07-configurator) @@ -5347,7 +5395,8 @@ standard library that was developed by Jane Street.") ;; Cyclic dependency with ocaml-core `(#:tests? #f #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) From patchwork Thu Oct 1 13:41:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24425 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 94D3C27BBE9; Thu, 1 Oct 2020 15:07:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0448027BBE8 for ; Thu, 1 Oct 2020 15:07:27 +0100 (BST) Received: from localhost ([::1]:57042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNzF0-0004hx-5X for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 10:07:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNzEf-0004gK-Dr for guix-patches@gnu.org; Thu, 01 Oct 2020 10:07:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNzEc-0005lQ-ET for guix-patches@gnu.org; Thu, 01 Oct 2020 10:07:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNzEc-0003AR-9I for guix-patches@gnu.org; Thu, 01 Oct 2020 10:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 27/27] gnu: dune: Update to 2.7.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 14:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.160156116212095 (code B ref 43745); Thu, 01 Oct 2020 14:07:02 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 14:06:02 +0000 Received: from localhost ([127.0.0.1]:37836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNzDd-00038m-GT for submit@debbugs.gnu.org; Thu, 01 Oct 2020 10:06:01 -0400 Received: from lepiller.eu ([89.234.186.109]:51934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywU-0001sR-RT for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:19 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 64e7708c for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=ndF97yeqBY3jbn56lczEQDkvW /+TXPcq3uzhfoHbsno=; b=W6qKV8XwpkNAD7WCir84IL1z+zLNoxJarTHqjEQy9 DfJNg1EiYSlczzxOTyHHwfQTO04btoQtAnKD1c6ACE1PdVCmyv9NDbb0FP+ULKOP MTruklvdoJXdyUXat89VOzSos9IoTRcFlh36Xc+5fsuO5S3oEHEKw3tkWcK22UHU FYgctSF6qhonvmrCP3mkXXVih7iXQhzPVlS3Qudu67y+kqxx1nWutjTx+1PeBqEv DWDFWRTSdKCu/6NTPK2CyfmHZUjpQi8RFkFYwb2qKTjJxC1Hmcb+MrQWkdMkyQ1n tBdFKk/SY0sjwmY5jKwgt43MtGMWJy2pIdyl/g3mZdDHw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 37e7bf35 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:14 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:33 +0200 Message-Id: <20201001134133.32105-27-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (dune): Update to 2.7.1. (ocaml4.07-dune): Keep version 1.11.3. (ocaml-result, ocaml-csexp): Use the bootstrap dune on dune dependencies. (ocaml-craml, ocaml-bitstring): Run "dune upgrade" before building. --- gnu/packages/ocaml.scm | 67 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d2e2e61863..025badb031 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1277,10 +1277,10 @@ full_split, cut, rcut, etc..") ;; where it says `mit'. (license license:expat))) -(define-public dune +(define dune-bootstrap (package (name "dune") - (version "1.11.3") + (version "2.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -1289,17 +1289,19 @@ full_split, cut, rcut, etc..") (file-name (git-file-name name version)) (sha256 (base32 - "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))) + "10qgx83fq8b522y9mpllrp0l5cgmr2bs5s7aix5img21hlbm34in")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + #:make-flags (list "release" + (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=" (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p "src/dune") (invoke "./configure") #t))))) (home-page "https://github.com/ocaml/dune") @@ -1309,8 +1311,41 @@ release of Jane Street packages. It reads metadata from @file{dune} files following a very simple s-expression syntax.") (license license:expat))) +(define-public dune-configurator + (package + (inherit dune-bootstrap) + (name "dune-configurator") + (build-system dune-build-system) + (arguments + `(#:package "dune-configurator" + #:dune ,dune-bootstrap + ; require ppx_expect + #:tests? #f)) + (propagated-inputs + `(("ocaml-csexp" ,ocaml-csexp))) + (synopsis "") + (description ""))) + +(define-public dune + (package + (inherit dune-bootstrap) + (propagated-inputs + `(("dune-configurator" ,dune-configurator))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)))))) + (define-public ocaml4.07-dune - (package-with-ocaml4.07 dune)) + (package + (inherit (package-with-ocaml4.07 dune-bootstrap)) + (version "1.11.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/dune") + (commit version))) + (file-name (git-file-name "dune" version)) + (sha256 + (base32 + "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))))) (define-public ocaml-csexp (package @@ -1328,6 +1363,7 @@ following a very simple s-expression syntax.") (build-system dune-build-system) (arguments `(#:tests? #f; FIXME: needs ppx_expect, but which version? + #:dune ,dune-bootstrap #:phases (modify-phases %standard-phases (add-before 'build 'chmod @@ -1335,8 +1371,7 @@ following a very simple s-expression syntax.") (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) #t))))) (propagated-inputs - `(("dune" ,dune) - ("ocaml-result" ,ocaml-result))) + `(("ocaml-result" ,ocaml-result))) (home-page "https://github.com/ocaml-dune/csexp") (synopsis "Parsing and printing of S-expressions in Canonical form") (description "This library provides minimal support for Canonical @@ -1428,7 +1463,13 @@ ocaml-migrate-parsetree") `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) (arguments `(#:package "bitstring" - #:tests? #f)); Tests fail to build + #:tests? #f; Tests fail to build + #:phases + (modify-phases %standard-phases + (add-before 'build 'upgrade + (lambda _ + (invoke "dune" "upgrade") + #t))))) (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as @@ -1453,7 +1494,8 @@ powerful.") "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q")))) (build-system dune-build-system) (arguments - `(#:test-target ".")) + `(#:test-target "." + #:dune ,dune-bootstrap)) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") (description "Uses the new result type defined in OCaml >= 4.03 while @@ -3813,6 +3855,13 @@ serializers and deserializers from type definitions.") (base32 "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'upgrade + (lambda _ + (invoke "dune" "upgrade") + #t))))) (inputs `(("ocaml-fmt" ,ocaml-fmt) ("ocaml-astring" ,ocaml-astring)