From patchwork Fri Apr 8 13:22:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38404 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 1C4FA27BBEA; Fri, 8 Apr 2022 14:26:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB0FF27BBE9 for ; Fri, 8 Apr 2022 14:26:46 +0100 (BST) Received: from localhost ([::1]:34834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodS-0006nd-0x for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoao-0002MZ-RI for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoao-0001Pi-5F for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoao-0007rw-25 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 01/25] gnu: ocaml-odoc: Update to 2.2.0-alpha. References: <20220208210815.7ae6484d@tachikoma.lepiller.eu> In-Reply-To: <20220208210815.7ae6484d@tachikoma.lepiller.eu> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: pukkamustard Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421429924 (code B ref 53882); Fri, 08 Apr 2022 13:24:02 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:34 +0000 Received: from localhost ([127.0.0.1]:34219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007ma-9V for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:37503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaK-0007ln-1M for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:32 -0400 Received: by mail-wm1-f44.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125649wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X0627M+mvPZUQUEyfxINxxlZPwERrL4xOD4cFA6DgLg=; b=YILLK4iNhZNRRqs6tGiH/q+iXDrnIkx3usFT2s6EBnpXZCRoOf4M3qUytdcDRnbu6u 1b8ylgHTWsBcBPcj7LeMVZHBNZhAPCTSRVxdx5QJHbYYXv3L0hF1ZIhVJlRpyrp9Ezi7 Hyk5tIxVbZ4Wmj6fJsAMPi4QyG6rEC3vro5RUc3UvvRHah9Ky81VTc9bjiprAabvjXh2 rRWInCdpVf4rrJY+MMI4JtssCXAxJj+9T1/Z5KuwjOvTC5onKjiuS+Fw6KEXfoJGyQZh GURIQuTq+P0ktPPaX5Br6OHqGNU+R5J/rlzJT3r38cGE3RSjplHmfLw/aVKoMprqVrkp 3KsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X0627M+mvPZUQUEyfxINxxlZPwERrL4xOD4cFA6DgLg=; b=2jv1MaPSt9Jhsmm3VHuG+uc4tVNtAA1HRItS1RVOaPYBE/Eq78bWB94iFzOAGRHaYv 2EpL1MY3+tDO9bf0tGEYsDeHmsoE6XT5LyxhiIBEyWL0f0dYyd0Mx3dta4OXAitgUHLp f3msOHLyNmrUIvzFKG4bH0rNiWRyYy9kYo1itPYb2+LaVw26MhRMCvVJ1ERt6A/i0FsQ NnH9nqDZZMIdmN4sPrdi0uJUk389Lvn0n7FteOQvAgg+uJ1L45Yrb4cPsxKJZnQHfVco dI55Ao+F+lhQKT4yButpnosxLyWh0JzyeFridrLkFMrwCeoFzzw1kUmxx8ut4pPEJQlG Dndg== X-Gm-Message-State: AOAM531k8xbhL/+Q70/AZlVcU4M1/Uzs/ca8UrGPF4SpQTSararTpTsf J/r/Yas5O3Y+P0igBWtbajqWBjDXfCI= X-Google-Smtp-Source: ABdhPJz5HBEmoIJt8f0/vrGEWrSQ1KqfVEMRDS7Kw86kQQI1Xr9U/k2lO7xwGfO7P+xypJkq19GtrQ== X-Received: by 2002:a7b:c219:0:b0:38e:7a12:1b59 with SMTP id x25-20020a7bc219000000b0038e7a121b59mr16794581wmi.87.1649424206256; Fri, 08 Apr 2022 06:23:26 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:25 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:41 +0200 Message-Id: <20220408132305.3301350-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 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 From: pukkamustard * gnu/packages/ocaml.scm (ocaml-odoc): Update to 2.2.0-alpha. --- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 78eab203de..cb461bf257 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6766,7 +6766,9 @@ (define-public ocaml4.07-bisect-ppx (define-public ocaml-odoc (package (name "ocaml-odoc") - (version "2.1.0") + ;; 2.2.0-alpha contains fixes for Dune 3.0 compatibility + ;; (https://github.com/ocaml/odoc/commit/6ac97f3148f7791ec7451785ef4dbd9ca0daf2d1) + (version "2.2.0-alpha") (source (origin (method git-fetch) @@ -6775,7 +6777,7 @@ (define-public ocaml-odoc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ycb468pc6vsvqj176j99bmbkrr9saxvyn9qhpazi01abbcq5d90")))) + (base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag")))) (build-system dune-build-system) (arguments `(#:phases From patchwork Fri Apr 8 13:22:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38389 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 AFD0827BBEA; Fri, 8 Apr 2022 14:24:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 88ADB27BBE9 for ; Fri, 8 Apr 2022 14:24:46 +0100 (BST) Received: from localhost ([::1]:56860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobV-0002PP-LD for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:24:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoao-0002Ma-SJ for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40390) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoao-0001Pj-Hg for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoao-0007s3-Eg for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 02/25] import: opam: Accept tabulations. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421629976 (code B ref 53882); Fri, 08 Apr 2022 13:24:02 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:36 +0000 Received: from localhost ([127.0.0.1]:34226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007nO-K6 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:36 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:46031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaK-0007lo-A5 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:33 -0400 Received: by mail-wr1-f48.google.com with SMTP id w4so12770559wrg.12 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=njhE0Wp9ks/wa54lZfJG8fhoghy4v0Z7ewVX6M9Qv9g=; b=m8KFzLiJirQShx06AtLE79MayBLQPjhrWDpI/bb3mnRP4fHSOLUeXo5Rhbs1gEeGig nLkLxaUtHQ8uvOt3pMGl6+nQ+mHyZPqixojvBiy2afVsZui7u9DGv34BpSbmJQHrqgLb eEE4eRSMUSWrfBBm43X7gpdjDhFJkdiCTBQyUfOP87y8cOx0PKIFJuYqaUPqxCpgT+We 5tmH/12oXydAcFmPcAtl6FgsD9/VeHaU+1bxR0nL28YpVMmPMlPNjqOjTvwUNXQSYwlf dJFMcNASJ6AzKFyRlYuWNMVpaD80k9M9yXHMiLp0T7jKNFXBzegzY5bu2yxDTjBJp33P KhNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=njhE0Wp9ks/wa54lZfJG8fhoghy4v0Z7ewVX6M9Qv9g=; b=BoFrVeAId2roC1YYgcTfscVo91VAvDkzywmMxFHEp3nyPQNlfuwDMLzP0K/zNITxHm v7ZHy0fbHd5QwuqnFGEN22wpGZZzhcT91GCwaxm3dTrZdljLVnNOWd4VQYpPBDObhcel ZwY2i7S7sudcJ1Z0kV4D7mN7q137z7fGw7bQSKeXKOJYoM25D9pP5kvjRmYlhbNlMTU1 xamJbKt+WrLscLRx/iFaRcjF6L4n3L67bPWgwradOHnd3jPaTasrFigIwwWv/rXYHrPi tOkh/JinPRg5eKHVBHPkwPpjVMhTV8pkmbrfz9BuoSF8P0Tl4x1UEkFhaE1iYUQJ+SVu D9vg== X-Gm-Message-State: AOAM533NQ1sSSypaOMAPndVPYZrtNCC/41PrUx/dEh81Yx7sbA6rvosK LuIuek/j7+6MvQ6ippGKWT3jmjMzv7U= X-Google-Smtp-Source: ABdhPJxDslTd7Iw+0TMBL26ffbgORcFzESS+sjzHtsA0reoJZFejaRT2Tt9uOszULqBWsbmh4k6SJw== X-Received: by 2002:a5d:5982:0:b0:204:1b19:40da with SMTP id n2-20020a5d5982000000b002041b1940damr14510467wri.23.1649424206676; Fri, 08 Apr 2022 06:23:26 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:26 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:42 +0200 Message-Id: <20220408132305.3301350-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * guix/import/opam.scm (SP, SP2): Accept tabulation as whitespace. --- guix/import/opam.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index f569c921b1..f51d17dea4 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -61,8 +61,8 @@ (define-module (guix import opam) ;; Define a PEG parser for the opam format (define-peg-pattern comment none (and "#" (* COMMCHR) "\n")) -(define-peg-pattern SP none (or " " "\n" comment)) -(define-peg-pattern SP2 body (or " " "\n")) +(define-peg-pattern SP none (or " " "\n" "\t" comment)) +(define-peg-pattern SP2 body (or " " "\n" "\t")) (define-peg-pattern QUOTE none "\"") (define-peg-pattern QUOTE2 body "\"") (define-peg-pattern COLON none ":") From patchwork Fri Apr 8 13:22:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38399 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 E20CD27BBEA; Fri, 8 Apr 2022 14:26:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5FE8F27BBE9 for ; Fri, 8 Apr 2022 14:26:27 +0100 (BST) Received: from localhost ([::1]:33076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncod8-0005bt-F5 for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoap-0002Mb-6P for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40391) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoao-0001Ps-UT for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoao-0007sA-RU for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 03/25] import: opam: Factor out source import. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421729991 (code B ref 53882); Fri, 08 Apr 2022 13:24:02 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:37 +0000 Received: from localhost ([127.0.0.1]:34228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007nR-Qn for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:44813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaK-0007lq-OH for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:33 -0400 Received: by mail-wm1-f49.google.com with SMTP id v20-20020a05600c15d400b0038e9a88aee7so2390202wmf.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BUJtkYFdetVaPu6l8TfFFtPl0IRzAI6UAoMdeWnnqFI=; b=GvH3IAxhlMATlgi5aHlpmd0ZIHOM/BUgMiiN4wiMfdJaKHKxGT4JB0+MFwPdiBII2j 2oblEa0waF8HH1z5apw+IPlEUQyWuiOjA64W57yPlftP4LgAsbVzaywr+h/L6n2cCkmM 0cWRYIPR9JK/5RDBRiafEjxjBKop3+GikPrsF2RC0vHWQz2IkxN5kiJqJzbRtJjY+dC/ q+TIdzFC9xjFJ+Enp5Lywi7B6y7IiRCyWNigbv1sxpG0GjBcdyfDs3SKcq8O3alYAIob numzx38HbL3ndnTtj7G2WYFF2pvKO+dqAX81t1boUQlztWEAcGOH1lRLs012a0cYef7H dAtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BUJtkYFdetVaPu6l8TfFFtPl0IRzAI6UAoMdeWnnqFI=; b=FDPjFs4OfEKze5Y8ZuUTnyYPGv5b+nteMpb7VdZlsbu/7S05ChHwlFVDcEjRX76Vd3 yPWscSWPOrFwRRHK/D4Nxf/hYGXfK7NezCIDzR5b894ykt7FL7QPv2EJ9arZCFja6Tx2 tlVLSCxPclbZP/w1RESVaZpg+TxOD1ef+xsHdGxNjuRg7M9+IOH0TLUvso3b3sewygbK OZHfM2Nb+Wgh2Go5emTDHEoEt1856DmLZvpKJ+MsQaothlnhs2/fmLs8CWjBqybCS9AJ Of05qmKV2hqUPEn2XhJjA8YiP0g/e+oBXyuE9Iu94CdySFqUWfyhIk3ceRK+F28bh5dE trOA== X-Gm-Message-State: AOAM530c4cnhmW3Kc+QT/7hJPKsIxMwGngGUkNXdko3D7ma1U61IKzyV LxmPaleW/BprZ+HAtXR/NdQhE0VOHHU= X-Google-Smtp-Source: ABdhPJyokck7FkX40ojzOKikwyETUG0EuB+DQjwkxTI8t8mgv6juS1A94wKKVBPIC4EScvTUfkLwlQ== X-Received: by 2002:a05:600c:d8:b0:38e:785a:2fc7 with SMTP id u24-20020a05600c00d800b0038e785a2fc7mr17019251wmm.59.1649424207151; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:26 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:43 +0200 Message-Id: <20220408132305.3301350-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller This also ensures a package can be imported even when it does not specify a URL. * guix/import/opam.scm (opam->guix-source): New procedure. (opam->guix-package): Use it. --- guix/import/opam.scm | 81 +++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index f51d17dea4..b4b5a6eaad 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -324,6 +324,20 @@ (define* (opam-fetch name #:optional (repositories-specs '("opam"))) (filter-map get-opam-repository repositories-specs)) (warning (G_ "opam: package '~a' not found~%") name))) +(define (opam->guix-source url-dict) + (let ((source-url (and url-dict + (or (metadata-ref url-dict "src") + (metadata-ref url-dict "archive"))))) + (if source-url + (call-with-temporary-output-file + (lambda (temp port) + (and (url-fetch source-url temp) + `(origin + (method url-fetch) + (uri ,source-url) + (sha256 (base32 ,(guix-hash-url temp))))))) + 'no-source-information))) + (define* (opam->guix-package name #:key (repo 'opam) version) "Import OPAM package NAME from REPOSITORY (a directory name) or, if REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp @@ -332,9 +346,7 @@ (define* (opam->guix-package name #:key (repo 'opam) version) (opam-file (opam-fetch name with-opam)) (version (assoc-ref opam-file "version")) (opam-content (assoc-ref opam-file "metadata")) - (url-dict (metadata-ref opam-content "url")) - (source-url (or (metadata-ref url-dict "src") - (metadata-ref url-dict "archive"))) + (source (opam->guix-source (metadata-ref opam-content "url"))) (requirements (metadata-ref opam-content "depends")) (names (dependency-list->names requirements)) (dependencies (filter-dependencies names)) @@ -348,41 +360,34 @@ (define* (opam->guix-package name #:key (repo 'opam) version) (not (member name '("dune" "jbuilder")))) native-dependencies)))) (let ((use-dune? (member "dune" names))) - (call-with-temporary-output-file - (lambda (temp port) - (and (url-fetch source-url temp) - (values - `(package - (name ,(ocaml-name->guix-name name)) - (version ,version) - (source - (origin - (method url-fetch) - (uri ,source-url) - (sha256 (base32 ,(guix-hash-url temp))))) - (build-system ,(if use-dune? - 'dune-build-system - 'ocaml-build-system)) - ,@(if (null? inputs) - '() - `((propagated-inputs (list ,@inputs)))) - ,@(if (null? native-inputs) - '() - `((native-inputs (list ,@native-inputs)))) - ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) - '() - `((properties - ,(list 'quasiquote `((upstream-name . ,name)))))) - (home-page ,(metadata-ref opam-content "homepage")) - (synopsis ,(metadata-ref opam-content "synopsis")) - (description ,(beautify-description - (metadata-ref opam-content "description"))) - (license ,(spdx-string->license - (metadata-ref opam-content "license")))) - (filter - (lambda (name) - (not (member name '("dune" "jbuilder")))) - dependencies)))))))) + (values + `(package + (name ,(ocaml-name->guix-name name)) + (version ,version) + (source ,source) + (build-system ,(if use-dune? + 'dune-build-system + 'ocaml-build-system)) + ,@(if (null? inputs) + '() + `((propagated-inputs (list ,@inputs)))) + ,@(if (null? native-inputs) + '() + `((native-inputs (list ,@native-inputs)))) + ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) + '() + `((properties + ,(list 'quasiquote `((upstream-name . ,name)))))) + (home-page ,(metadata-ref opam-content "homepage")) + (synopsis ,(metadata-ref opam-content "synopsis")) + (description ,(beautify-description + (metadata-ref opam-content "description"))) + (license ,(spdx-string->license + (metadata-ref opam-content "license")))) + (filter + (lambda (name) + (not (member name '("dune" "jbuilder")))) + dependencies))))) (define* (opam-recursive-import package-name #:key repo) (recursive-import package-name From patchwork Fri Apr 8 13:22:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38393 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 C5FCF27BBEB; Fri, 8 Apr 2022 14:25:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B30127BBE9 for ; Fri, 8 Apr 2022 14:25:07 +0100 (BST) Received: from localhost ([::1]:58588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobq-0003gi-Bb for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NN-SQ for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoap-0001Q3-NS for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoap-0007sP-Jr for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 04/25] gnu: Add ocaml-spawn. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421930019 (code B ref 53882); Fri, 08 Apr 2022 13:24:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:39 +0000 Received: from localhost ([127.0.0.1]:34235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007nn-Sj for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:36367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaL-0007lr-6M for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: by mail-wr1-f53.google.com with SMTP id u3so12852597wrg.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b0WR+cuwMGuGdS8A+evQ6tLLmsAp0EIkDu2FbrLlZ5s=; b=Wfj3/QMgdQQXpE1Ofc3rAJxmQoxXrd5XT7/qcJXp0X4YZqnFXBRDfyI3yeyKC9w5un so253lkuyN4uKxvSTyVfGJ+GaAKS3pZ0EDAuLrCpDYqWwUZnZi1Fx0s/rsi1cqUqJRuH 9Fkv7vdZgnyH1JFoTMd3E2LEBZK3OHiAimwqvJ9aBmds/I2/ISpdbBzhzjiQuyGOCa09 2VGYuQj/d07b4gM98ShkDg6EFNhqqKQSKgy8/8qvboL9coCnOME2FN6BUqENEaeEsyTW S9LBH6BKUmfsJ3v2Ik5kSVj50EfIlNAZDBJj2p4bY9j+8xD488b2s4kK8aSybPFDivZZ Ms+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b0WR+cuwMGuGdS8A+evQ6tLLmsAp0EIkDu2FbrLlZ5s=; b=oo1JELQsc6UWkGsRYnwqI87p1Jc4xxepTT97GU9ujRdLwZH7QxpiGJYjMNU+DWkN2A cr33hgSTy9/qrwby5JRzCg75+kxmODlIHojzAXpDgXloUjCp+zl3mGi+qSO5dcjlJJTM qtBYa8zePbF4ofSKzmQaMcK2YHVJd1udKHzB0Fa5Oz657n/r1CPMMgFWCDt58Y0CRBod hLYNfIC5oLbQi5MHDISOoYUT83azRrScrPchPKdmk8jZ3JuZrN3op8BlGr40f7opYNvt cH4Bptedr6jEiYFyntriimt5iaKSztW7OM9GKBJyJWvlDxqTUQ9P1te0l5+ITjI/Zt/l k1sg== X-Gm-Message-State: AOAM531KsoDOQJztnbf/C7Zcu9XaH5PJpf0ym9PRRhY8mL4iandknM1H kTe0Xv1jdgae0l1eZn+caAIIBsjCtB8= X-Google-Smtp-Source: ABdhPJzSoiJ4Cfdo4R8CT8cy0Kg2gTMC6YQTSkhnVf/wX47O1Hbt0vJboRo4pLeChd6jMVn5w9o2zQ== X-Received: by 2002:adf:d081:0:b0:1ef:9378:b7cc with SMTP id y1-20020adfd081000000b001ef9378b7ccmr14875836wrh.407.1649424207580; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:27 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:44 +0200 Message-Id: <20220408132305.3301350-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-spawn): New variable. (ocaml4.07-spawn): Inherit from it. --- gnu/packages/ocaml.scm | 55 ++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cb461bf257..6690fab76d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6446,10 +6446,10 @@ (define-public ocaml4.07-configurator @end itemize") (license license:asl2.0))) -(define-public ocaml4.07-spawn +(define-public ocaml-spawn (package - (name "ocaml4.07-spawn") - (version "0.13.0") + (name "ocaml-spawn") + (version "0.15.0") (source (origin (method git-fetch) (uri (git-reference @@ -6458,22 +6458,12 @@ (define-public ocaml4.07-spawn (file-name (git-file-name name version)) (sha256 (base32 - "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf")))) + "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p")))) (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* "test/tests.ml" - (("/bin/pwd") (which "pwd")) - (("/bin/echo") (which "echo"))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (native-inputs - `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) + (propagated-inputs (list ocaml-odoc)) + (native-inputs (list ocaml-ppx-expect)) + (properties + `((ocaml4.07-variant . ,(delay ocaml4.07-spawn)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description @@ -6495,6 +6485,35 @@ (define-public ocaml4.07-spawn @end itemize") (license license:asl2.0))) +(define-public ocaml4.07-spawn + (package-with-ocaml4.07 + (package + (inherit ocaml-spawn) + (version "0.13.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/spawn") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-spawn" version)) + (sha256 + (base32 + "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-tests + (lambda _ + (substitute* "test/tests.ml" + (("/bin/pwd") (which "pwd")) + (("/bin/echo") (which "echo"))) + #t))) + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) + (propagated-inputs '()) + (properties '())))) + (define-public ocaml4.07-core (package (name "ocaml4.07-core") From patchwork Fri Apr 8 13:22:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38402 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 42E5427BBEB; Fri, 8 Apr 2022 14:26:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C759527BBE9 for ; Fri, 8 Apr 2022 14:26:37 +0100 (BST) Received: from localhost ([::1]:33952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodI-0006CZ-VT for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoap-0002Mc-Iw for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoap-0001Py-Am for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoap-0007sI-7g for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 05/25] gnu: Add ocaml-typerep. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421829998 (code B ref 53882); Fri, 08 Apr 2022 13:24:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:38 +0000 Received: from localhost ([127.0.0.1]:34232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007ng-CV for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:34512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaL-0007lt-Ld for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: by mail-wr1-f47.google.com with SMTP id m30so12871413wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7d0FIh4LkaY+v1twwCL9krmU3xIWstuR44m91v5X0cM=; b=YbT5S1/nSW+JUa8JXRaZ6vJYRFvoJr7erbOEb7Qjsm3gi5sTSAHYZkb7aEi0o0H2Ns BAjADEiuoOHf6MoYwiKdHjgPjtV2LKCoS1zJO3bCWxKD+s1ZGYTLXtok2hOpuy20JnqR 5dxq3yNlvpDGNLgTwrV2g44GdeFS24BLq5Zu4I7wC2svmpYUk2sYgCmCT9VL95geloL2 7zyOb0G6oV9YWZShkR1GmQJIiMtAPCV/Kh8agTCWsoDlnNgktErFyigN7Zefaw8pN+vM ThCawsmprcXm4r5rULFR7dVmnxHphesGPi57521kspUAYyqYbdCoRuH74oxKfiNlP6Oc q3Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7d0FIh4LkaY+v1twwCL9krmU3xIWstuR44m91v5X0cM=; b=P1IQVDMLhA5sTV5Y4ddP+AjON2LT1pYXJb2oOTxKqHM36fy16ZKD0I+E/cF34AIkA6 A+evShPMymQfRmRkR4whRC3Ru3/GDIS+YQXowv1hCH5ZjTXWBqpJ5ReR/4UOteO1aJ/j ARAIKcYATe/OqqgFCVm1FX8FjrXZ4K8pD5bBZ5amCIHp03LDuJB5Aer1lNz3bs1Bd/xX 3rYQ2aLzZ7xscYxesohximYlWt5ujeQEcHrNcoln6yY1pcruf5ti6MeVDJDDF/3WwBqY z0nEj4ylaDEcsM1SL/Ripbg0Gky7cpU8JUzg81FZEG+VpLLQXHIntAGnuvKeRjzbcEMH P9Fg== X-Gm-Message-State: AOAM532JtL6mDTgsc46UAd5Thx0JgxmdeMSS/RzeYOUEU8lP9unJH/JR 986I0iA5WBgX0edBynVHLloUoG9CUNg= X-Google-Smtp-Source: ABdhPJyOwLV2iAXo5NRhQor4sE4KjwbvtTZILxs8YHVvXFJ4e0TpcT5WIX9iXfDQOuJsr3kWUgq7UQ== X-Received: by 2002:adf:ef11:0:b0:205:b266:68eb with SMTP id e17-20020adfef11000000b00205b26668ebmr15149052wro.310.1649424207995; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:27 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:45 +0200 Message-Id: <20220408132305.3301350-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-typerep): New variable. (ocaml4.07-typerep): Inherit from it. --- gnu/packages/ocaml.scm | 50 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6690fab76d..8c464147f5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5786,29 +5786,43 @@ (define-public ocaml4.07-ppx-here "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")) (properties `((upstream-name . "ppx_here")))))) -(define-public ocaml4.07-typerep +(define-public ocaml-typerep (package - (name "ocaml4.07-typerep") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/typerep-v" version ".tar.gz")) - (sha256 - (base32 - "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) + (name "ocaml-typerep") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/typerep") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wc7h853ka3s3lxxgm61ypidl0lzgc9abdkil6f72anl0c417y90")))) (build-system dune-build-system) - (arguments - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)))) + (arguments `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-base)) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-typerep)))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-typerep + (package-with-ocaml4.07 + (package + (inherit ocaml-typerep) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/typerep-v" version ".tar.gz")) + (sha256 + (base32 + "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-sexp-value (package From patchwork Fri Apr 8 13:22:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38395 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 E3F6427BBEB; Fri, 8 Apr 2022 14:25:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6D2AC27BBE9 for ; Fri, 8 Apr 2022 14:25:46 +0100 (BST) Received: from localhost ([::1]:59544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncocT-0004Jz-Jm for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NQ-U6 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaq-0001Q5-Eq for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoaq-0007se-BY for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 06/25] gnu: Add ocaml-ppx-typerep-conv. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422130056 (code B ref 53882); Fri, 08 Apr 2022 13:24:04 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:41 +0000 Received: from localhost ([127.0.0.1]:34243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007oR-Vo for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:37512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007lu-3p for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wm1-f51.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125730wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=TCwEpYcWGAsrVMndqKis1XYkn9bGhsciv7jGhCKMfvToec2rahyyFYYuy8NuQ8yFdW vP1Ai9fMib6yOIsVzWK5bMSzs00gdLUovJ3gqAna9nDCQ1v3V4U7eIPvFP9XGR1hUH2E a5co0ZwzjQcb8mnQH0AT184sYF9w1akAC7xPK63qEcAaD6s1uwxszadM+uSX9XKpA42N 0QYWnf35oMMBFCjM7I8XykYl1/4lzZEkztFh8+/D62pkQCRbgnEZuYTWIElIQjPhBwyp BRTB/2huSDE2Fm0JrCZZTISb0ndBHq0BHObbZp2ShxINCeWV4DbZ5RWHCvPgq0bN6UXU qV7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=NPmXDkL3cgDNtGV/62iQ2pC17yGTv6kjWZoxoIDX2oaIGQCMgV982KvcsbHRSLGjV/ hwv5qfInJlVjKwXtCJGzwpiUQHjCBkZrLVuTAB7d7ElcH7HoYMlIea/asCETFYVEVdge kZR19oWTBJwwe3yxBZU5lj/HMiDsXNMPw57+75b0r2wP+94ZA6PkN6CQv1z4oJ4eExAK oiYjvIx6g33xaTKtVq7swIAVphH5fmYQHz1G6G9zyI30OjS3oPdvGDmn7W8Xm41eNjfZ 8m0b/J38R1mh4hCeYHDhp1lTx5u0oFJRyhmO1VL4pft5fAT4OP3KNH5mZ/r/A2reAgea uwZQ== X-Gm-Message-State: AOAM5309q2iLmiGmimv7S5ir9ohVez1ISKXqjRHJjoRbaEQvWDuVX5BU EC3jgMTErClVW4oJRfdMdlYbFpeokhU= X-Google-Smtp-Source: ABdhPJwc+QFYH/a8UaSHz1rt4+9x50kOjMoifqZZiaX7/oZWVF/NL/mQsfGIS4kWwuWk5OsbNh4+vw== X-Received: by 2002:a05:600c:154d:b0:38c:e9b8:d13f with SMTP id f13-20020a05600c154d00b0038ce9b8d13fmr16936991wmg.183.1649424208478; Fri, 08 Apr 2022 06:23:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:28 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:46 +0200 Message-Id: <20220408132305.3301350-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-typerep-conv): New variable. (ocaml4.07-ppx-typerep-conv): Inherit from it. --- gnu/packages/ocaml.scm | 60 +++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8c464147f5..8ec5953730 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6203,37 +6203,49 @@ (define-public ocaml4.07-ppx-js-style "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) (properties `((upstream-name . "ppx_js_style")))))) -(define-public ocaml4.07-ppx-typerep-conv +(define-public ocaml-ppx-typerep-conv (package - (name "ocaml4.07-ppx-typerep-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_typerep_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (name "ocaml-ppx-typerep-conv") + (version "0.14.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yk9vkpnwr8labgfncqdi4rfkj88d8mb3cr8m4gdqpi3f2r27hf0")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_typerep_conv"))) + `(#:test-target ".")) + (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) + (properties `((upstream-name . "ppx_typerep_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") (description "This package can automatically generate runtime types from type definitions.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-typerep-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-typerep-conv) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-ppx-typerep-conv" version)) + (sha256 + (base32 + "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (properties '()) + (propagated-inputs + (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) + (license license:asl2.0)))) (define-public ocaml-ppx-base (package From patchwork Fri Apr 8 13:22:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38405 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 DAD5B27BBEA; Fri, 8 Apr 2022 14:26:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB97727BBE9 for ; Fri, 8 Apr 2022 14:26:49 +0100 (BST) Received: from localhost ([::1]:35140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodU-0006zn-Pz for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NO-U1 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaq-0001Q4-2g for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoap-0007sW-VZ for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 07/25] gnu: Add ocaml-ppx-string. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422030038 (code B ref 53882); Fri, 08 Apr 2022 13:24:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:40 +0000 Received: from localhost ([127.0.0.1]:34240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007o8-2P for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:47094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007lv-Go for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wr1-f42.google.com with SMTP id v2so1958881wrv.13 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WQVs6QwcBtaKjP068RGbZQTAh8TvjZBrOmKbxaphYVw=; b=Ps3SpH5NK8YuqA8ociL2cy7dICFUW7bBbyzgbrs5eIaMOTbEikHWp7RqrzxzIB5QyC ymIPqwR+cda0XrtQZZeA6I/83R/4flb0ksi5Nq9bROodreJiz3s1/M3Zo3cg2qlgJyC0 mcSBLGm2vAM9wubqEvuK2jWSBjqQbnoFI/hJ9OnUb1QasSbFmK31S5WSWXRBUrQJ6KTf bS48Jt2y6lbVaxi8vSMospj4rdAwAtK9gSGR3GDWIvRsX3Ttjv0uewOJlUS44K3nIIvI ZWNJTLirr7i39EaKmVQCj/0rTWfP0z/zmGWUx4x5qzPUk57TRiW7t90Y4eiPABbAXoBT 6bkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WQVs6QwcBtaKjP068RGbZQTAh8TvjZBrOmKbxaphYVw=; b=sCTL5ZHZBbKPrr9YsFqpyapzKLv5r+uP0hcyY3oGbQNAToQoTOw+mGTI9pSTmoPzOm r8Bkij/GOkG5xaujgIuyPKX5GxqSxx+D1cogH/ZAdgIkMO1EtVfevHm0HB0bpo5uPubh trILVKiJrAJSipkgeCuRGXkIsfCZiAyqjTg5Af7xoUHoxT84owNJH2vAgw4zIFVSXUH9 MixlxFlUeNdPqdNWJ9DOc2HTHfjgstiGSDZpE4kTqwzYfcm03bhNGSsXP8d7IZEKJ6Bw r7o5pEA5jI0l/8dVhy/Syk92tp1fdJCF08ZzWbx2lxOSCferwmdf/g5fv7HqfAhqGX17 s0Fw== X-Gm-Message-State: AOAM5312lu0Bs1yv90+K0l+dmlOLcCTkm/eksDYbmuOAw6jTHEMxhXF7 tSJs3Do1oQA42/71DgXBnvwnojcnciw= X-Google-Smtp-Source: ABdhPJwb5RGsA0yUzRlDNM5rJvv7NlDEf9kCA039aqGwLpVfoxL2rodaGub3aWCRjMgHyuAEGPNrMw== X-Received: by 2002:a5d:6d0f:0:b0:207:990e:8e6 with SMTP id e15-20020a5d6d0f000000b00207990e08e6mr2002777wrq.384.1649424208888; Fri, 08 Apr 2022 06:23:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:28 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:47 +0200 Message-Id: <20220408132305.3301350-7-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-string): New variable. --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ec5953730..f8f815b358 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6247,6 +6247,29 @@ (define-public ocaml4.07-ppx-typerep-conv (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) (license license:asl2.0)))) +(define-public ocaml-ppx-string + (package + (name "ocaml-ppx-string") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_string") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a8khmg0y32kyn3q6idwgh0d6d1s6ms1w75gj3dzng0v7y4h6jx4")))) + (build-system dune-build-system) + (arguments `(#:tests? #f)); no tests + (propagated-inputs + (list ocaml-base ocaml-ppx-base ocaml-stdio ocaml-ppxlib)) + (properties `((upstream-name . "ppx_string"))) + (home-page "https://github.com/janestreet/ppx_string") + (synopsis "Ppx extension for string interpolation") + (description "This extension provides a syntax for string interpolation.") + (license license:expat))) + (define-public ocaml-ppx-base (package (name "ocaml-ppx-base") From patchwork Fri Apr 8 13:22:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38390 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 82EA227BBEA; Fri, 8 Apr 2022 14:24:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4D1DD27BBE9 for ; Fri, 8 Apr 2022 14:24:47 +0100 (BST) Received: from localhost ([::1]:56880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobW-0002QZ-CM for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:24:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NM-SQ for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaq-0001Q6-Qx for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoaq-0007sl-Nh for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 08/25] gnu: Add ocaml-ppx-stable. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422130067 (code B ref 53882); Fri, 08 Apr 2022 13:24:04 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:41 +0000 Received: from localhost ([127.0.0.1]:34246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007oj-MH for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:46594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007ly-UX for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wr1-f54.google.com with SMTP id v2so1958916wrv.13 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yROuKoLy6S8jbN4BhLTEsATZkhh+KlOTwdAyBMmkN10=; b=Qeqj07uX1VDZjHF1eLkG2kSDTrteTArAWW2sP4TZe0WHpJRP4fdJ0eP4tfHaS6kq7u hurBEyf9j34DB3o8JZuobu/PpxNqjPXaT2K8ROTVxDqxF/jdnls2HAdZRYmTQd0TpzPS X7I7Na1S5xtiJW5yANMwcQ7WCJHdbiGdxn7i1lAPe9J2jJtSckITUq7ndZn71DNCtN2D XDgsMREzw7cNerc3jnqI6GfJGiJt6B2u5DMEGE1pMumCdGzAX3FQVO2QFGL42XsKzuOc urCWDkhB+LZ8Tk5Uto9B4U3VnJs+WPjNA1kUZcG0OUvEyXEcebTGjlR+9gHmHUPIqm6P FqQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yROuKoLy6S8jbN4BhLTEsATZkhh+KlOTwdAyBMmkN10=; b=eMduq8HPv8+PI7ItXDF+KDpzkRdp+s9eZJ3SZETS+H4cxfJTj/cKpPxgzhicOiAoGG xMaEpsmTx2DBxky+x7GQxQmf1JtjcjjjCAsf/IoTyAmEu/yixWXtIcfNhV0NSKtgJY8A QKW0+QpGWdZ78Dm7H1o1u8ftSufa0n8vNL8mlrFBgX1aYAAlnBGxj7Jy3RrStxdfROR+ Vx3oCK1ZyFucM4tGUvQrINIxlJQsLEMCVExYPX4c5d8apqRNAN5dLAmDRdhUYHtGa53a qpv66d297reFyGZ3THdQVyIBlOUK55FSEUq8rntOOcN+zFo5Ju5nEJ+ACguOcFuWBWSf 3Hnw== X-Gm-Message-State: AOAM530lfK7FT+gyKIIepx0H77nFhp3R+gq9RxLGvQfR/rq1/sT7k8HU miO0FIj4XXJsnp0Ka1H9KiVItnc5pvI= X-Google-Smtp-Source: ABdhPJwlWPryB267St6CH1IbQCZ6hkjZHFnjsrzoKNB4BCIMcWxZQ4GCjtJijs6r+YNqScSVLe2IAA== X-Received: by 2002:adf:cd91:0:b0:206:1c09:cdb1 with SMTP id q17-20020adfcd91000000b002061c09cdb1mr14889023wrj.502.1649424209305; Fri, 08 Apr 2022 06:23:29 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:48 +0200 Message-Id: <20220408132305.3301350-8-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-stable): 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 f8f815b358..d202d45474 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6270,6 +6270,30 @@ (define-public ocaml-ppx-string (description "This extension provides a syntax for string interpolation.") (license license:expat))) +(define-public ocaml-ppx-stable + (package + (name "ocaml-ppx-stable") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_stable") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sp1kn23qr0pfypa4ilvhqq5y11y13xpfygfl582ra9kik5xqfa1")))) + (build-system dune-build-system) + (arguments + `(#:test-target "tests")) + (propagated-inputs (list ocaml-base ocaml-ppxlib)) + (properties `((upstream-name . "ppx_stable"))) + (home-page "https://github.com/janestreet/ppx_stable") + (synopsis "Stable types conversions generator") + (description "This package is a ppx extension for easier implementation of +conversion functions between almost identical types.") + (license license:expat))) + (define-public ocaml-ppx-base (package (name "ocaml-ppx-base") From patchwork Fri Apr 8 13:22:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38394 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 1213E27BBE9; Fri, 8 Apr 2022 14:25:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5895927BBEA for ; Fri, 8 Apr 2022 14:25:07 +0100 (BST) Received: from localhost ([::1]:58694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobq-0003l3-E3 for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NP-U1 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoar-0001Q8-7O for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoar-0007st-3w for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 09/25] gnu: Add ocaml-ppx-pipebang. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422230093 (code B ref 53882); Fri, 08 Apr 2022 13:24:05 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:42 +0000 Received: from localhost ([127.0.0.1]:34251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007or-B2 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:37504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaN-0007lz-B5 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wm1-f41.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125774wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WXfElVCScCEx98D8qp6txU/aNzVk+aO7Y3gp9femPAk=; b=C6jLyLgePtr3sbygIJSNbBp8gavSVUi9TRC4sQSY34Cp1c6Ey3bwRtNZQPC8ajdu53 +yhYqqI66mVrN+OY+aqCbqkFTxa4j9cWW8/epIf7tfeZlNEDaS2SiEEqzI6uf3kTRBik AueXgk0XLbgYPG+VkX3YjRn1a+fOUjXYMJS+lqi7vF+nmjrw+5oDUV2DdKuXkNc3gfHX NNXydlm/qNdGNKwFqYVYp3LOJhlVs/NOTnzhUywxBsOTZeqisLNa5tD9bSy3Bn2lzCB9 lhOG8bWqQkRvdUa+gSu1ZFSdKnSB9lnV2+Q8A/xUOHrt26RB8sm61AOMX7vgzUaCThOI FibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WXfElVCScCEx98D8qp6txU/aNzVk+aO7Y3gp9femPAk=; b=mGjhjKJj8DAsYQQXcf0Wx1jxf0Vgpru18uN4Fwe3dFsaxd94R7FckAIiWezwBky1Ch s1FKEcxCMCEfWoLznFo2qEUYxXv6vt/THKMvasGsiwE+zTJn8/MN+D3CN/kFK3TYXEKB dDrOWEXJ7/9suZSToOSDWnILvGsrm3sd+IWlASe1Ep689vfuvjdv5hjLIGy+bDYPnfEi GUilGwHiCcW/C843D4HDuNm0sAudNq/fIE6/uf+loYiVcUTQW+13/mkmIv7j55ByeQl/ RvkHWaABi2NiE0epJ5hlygs71fL6Ss3RQWI4M/3efTYpl2baim8BZ1GXt3PksJ56Kikr 5wRg== X-Gm-Message-State: AOAM533uZTI4FefG8zMsbMpame7OBawinEPoOQkLdbsId2aZWEdH8qXh lzTxJH6IWrpDWqI0ceOZ2p+ebDpu3bk= X-Google-Smtp-Source: ABdhPJwgOihb5BibhFb9hldYrR7oUNFChAhRGWlKveCgxBV0SYZL3u0BB50IDSD6Shqe4JNLcsYJBQ== X-Received: by 2002:a7b:cb84:0:b0:382:a9b9:2339 with SMTP id m4-20020a7bcb84000000b00382a9b92339mr17298911wmi.91.1649424209764; Fri, 08 Apr 2022 06:23:29 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:49 +0200 Message-Id: <20220408132305.3301350-9-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-pipebang): New variable. (ocaml4.07-ppx-pipebang): Inherit from it. --- gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d202d45474..c2924fc59d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5888,35 +5888,46 @@ (define-public ocaml4.07-ppx-sexp-message context such as function arguments.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-pipebang +(define-public ocaml-ppx-pipebang (package - (name "ocaml4.07-ppx-pipebang") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_pipebang-v" version ".tar.gz")) - (sha256 - (base32 - "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (name "ocaml-ppx-pipebang") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_pipebang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf")))) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_pipebang"))) + (arguments `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-ppxlib)) + (properties `((upstream-name . "ppx_pipebang") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-pipebang)))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-pipebang + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-pipebang) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_pipebang-v" version ".tar.gz")) + (sha256 + (base32 + "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (propagated-inputs (list ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-optional (package From patchwork Fri Apr 8 13:22:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38391 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 2F26E27BBEA; Fri, 8 Apr 2022 14:24:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EDB4727BBE9 for ; Fri, 8 Apr 2022 14:24:56 +0100 (BST) Received: from localhost ([::1]:57716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobg-00036t-1l for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:24:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NR-Tv for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoar-0001Q9-J3 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoar-0007t0-Fc for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 10/25] gnu: Add ocaml-ppx-module-timer. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422330109 (code B ref 53882); Fri, 08 Apr 2022 13:24:05 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:43 +0000 Received: from localhost ([127.0.0.1]:34255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaU-0007pJ-Co for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:43 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:34525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaN-0007m1-Nn for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:36 -0400 Received: by mail-wr1-f54.google.com with SMTP id m30so12871568wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jh2ZhJGr/8QL6cTKKwt2uODqLJpp8dcmbTrTemri3Hw=; b=SdhZNroa67Qh7LjdN7662PsF9J/lBSo4a1w5yroZ+xuw/mGOnKp5vA+GUdayFBkB1W 6YAoyMosulvDOAFEGqHcQ8TiUjDSkg1Q1zeR/2VwAh1eghG+p0u0LJsDWgrezW8D+uxf IZMXY/KERRSpAfZ9m9BiTY9CyNiWWRp8fQdl27PM0lKf8r86HUBziPXp8/aO+XsV+ZvT sIpHz+U9aTBCNqZr6sddSW/yAAXPLnGJTUCQgcR3nag70yxVKyLuejf/jUzlX/qgIeMm InZl1YYO/0C7oi8cSv7eQCCmjEUFFan5LqZJyB86IFZMFe4qzw9KqeFE9kMazfYGCLzU vEcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jh2ZhJGr/8QL6cTKKwt2uODqLJpp8dcmbTrTemri3Hw=; b=o60gWYxeM7fuJVCBeHSVMRyX6Rsc8YBcaSpC7Psqhxrl01dpDX+vab9TkrXxC8s9JE f/G+5swD39DOBND1bevM3uTdAtyG4PKtcxur694xs0vRhyJlIEn8zp0TEIzaZX428TrG mex+kSopk+91qeaGYSJWRkUt62Cg1ZOcGaAsFxC0l0NpmBHSR06sPJLR+rN2HfatwZek brO3YGgQk1ijocCD4+YvSNFyMqY9HiskXITAnLZcSugHgCTr4kdrzr6WVdG/LYVriI4C OrBvNhZs2f3BtZ2XI74roZu2kDmX3Ok3vY9QX4WGHt+WfeqReMeetylsr1MvBs5Y+aP+ USQQ== X-Gm-Message-State: AOAM532hYK1pbRHlRKP8DPvwgftBA8oX4ahMm+01c7vFARD/1aaRkWPF +kVPqBbhJTLKawd1wRv4UkvdHBPYsgk= X-Google-Smtp-Source: ABdhPJxDigfGiykOwHdg7JUaHFlFs4sgP329jqSda8ynqQ1C/YbBSJJOoHa6Pv5vvmc+WQEDt5G/ZQ== X-Received: by 2002:a5d:6981:0:b0:205:e04a:e20f with SMTP id g1-20020a5d6981000000b00205e04ae20fmr14587851wru.6.1649424210173; Fri, 08 Apr 2022 06:23:30 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:50 +0200 Message-Id: <20220408132305.3301350-10-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-module-timer): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c2924fc59d..a5f57fe36f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5929,6 +5929,31 @@ (define-public ocaml4.07-ppx-pipebang (properties '()) (license license:asl2.0)))) +(define-public ocaml-ppx-module-timer + (package + (name "ocaml-ppx-module-timer") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_module_timer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f)); no tests + (propagated-inputs + (list ocaml-base ocaml-ppx-base ocaml-stdio ocaml-time-now ocaml-ppxlib)) + (properties `((upstream-name . "ppx_module_timer"))) + (home-page "https://github.com/janestreet/ppx_module_timer") + (synopsis "Ppx rewriter that records top-level module startup times") + (description "Modules using @samp{ppx_module_timer} have instrumentation +to record their startup time.") + (license license:expat))) + (define-public ocaml-ppx-optional (package (name "ocaml-ppx-optional") From patchwork Fri Apr 8 13:22:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38408 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 3C3D727BBEB; Fri, 8 Apr 2022 14:27:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0311F27BBE9 for ; Fri, 8 Apr 2022 14:27:17 +0100 (BST) Received: from localhost ([::1]:36754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodw-00084K-5C for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoas-0002NT-7c for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoar-0001Qc-Vh for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoar-0007t7-SB for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 11/25] gnu: Add ocaml-ppx-fixed-literal. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422830130 (code B ref 53882); Fri, 08 Apr 2022 13:24:05 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:48 +0000 Received: from localhost ([127.0.0.1]:34258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaa-0007ps-3t for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:48 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:43874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007m2-7G for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:36 -0400 Received: by mail-wm1-f52.google.com with SMTP id m67-20020a1ca346000000b0038e6a1b218aso5552547wme.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TJuA+okP7VtBn/go+iop0Nr2GAjZke7U8us0FID8cEM=; b=IAxkubcdtQkxSzFA+ueL9nFnx0ZLmmlFzB5ym2LT4rLSBsH3bOrm0IbmI5VVlKD1aW imXlGxPS32ATeBbHHGLt3/SXw8RJ/J1oIvb7fssQ/EvjfMXfVFlHjEu8+1sHwfHSMh/j mlXFKVGJ4ofadWvEg47u59GFw5qQa2fMlmZ9g0BHMyv4468OlzHZK4Qr40Lj0R6Eip+F MgpwklFUg9u1mcv2WkPEqOPd4/a0ip1hvUYqKkSyUJFzM8jPD7Vfu3QjX2+lOK8qBFM9 GpKSw/utcQr3kTqF/PSXfCDhYN43TZzjZg9GFJWxCe5450kKggqyG6DGB3lZ+MeRFJdU GGnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TJuA+okP7VtBn/go+iop0Nr2GAjZke7U8us0FID8cEM=; b=B+ENtoHPRFNSYbjrNtG+EaGGgiytjHqBcfHbzzjpcdfsQaswNccuYovPgnXPdG9ERN JWMzMrKN6L9gvyJ79q4fVprqTG2ud7qaHDRxeBlnC6Du60mmO51U7zjmPC+ADN3w+CqD Bo60LtOUIQk2os+jKt7NSEF5d0vop7KqTzS7azsrms8x7Nt4eeviBEGnNCYe1DYbH7wJ taeTdWchBFVmoUwiecnvu9Ph+GlySSfujPFwhBtKC24Hy12/ma7IoiDPi1qp1SLoHWZv nXvo1FWdU0laQw7DXb0+60jLVf52TnxipN7+zVWydH/LwSKUyc/n43mJf3SPgNBPvK+f opzw== X-Gm-Message-State: AOAM531YG7NCiHTqHe8BdLqdw3V8I9U0PEuwMxRc+1ZtuiXCm1tZV5R6 DsgxSTk2/bpoNk1fEuKcec/GNXpDhAE= X-Google-Smtp-Source: ABdhPJwdGMNbL5h2GellbHd+t1rt92aMSyEOJFxTsdTVW9YWjNpKwNY6d0VNMI54DIMce5pED4XOGw== X-Received: by 2002:a05:600c:228f:b0:38e:74f7:a0fb with SMTP id 15-20020a05600c228f00b0038e74f7a0fbmr17064529wmf.39.1649424210665; Fri, 08 Apr 2022 06:23:30 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:30 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:51 +0200 Message-Id: <20220408132305.3301350-11-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-fixed-literal): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a5f57fe36f..67902f58b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5954,6 +5954,31 @@ (define-public ocaml-ppx-module-timer to record their startup time.") (license license:expat))) +(define-public ocaml-ppx-fixed-literal + (package + (name "ocaml-ppx-fixed-literal") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_fixed_literal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s7rb4dhz4ibhh42a9sfxjj3zbwfyfmaihr92hpdv5j9xqn3n8mi")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-base ocaml-ppxlib)) + (properties `((upstream-name . "ppx_fixed_literal"))) + (home-page "https://github.com/janestreet/ppx_fixed_literal") + (synopsis "Simpler notation for fixed point literals") + (description + "@samp{ppx-fixed-literal} is a ppx rewriter that rewrites fixed point +literal of the form 1.0v to conversion functions currently in scope.") + (license license:expat))) + (define-public ocaml-ppx-optional (package (name "ocaml-ppx-optional") From patchwork Fri Apr 8 13:22:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38396 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 3B50927BBE9; Fri, 8 Apr 2022 14:25:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A4F2027BBEA for ; Fri, 8 Apr 2022 14:25:46 +0100 (BST) Received: from localhost ([::1]:59542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncocT-0004Jx-QF for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002NW-4R for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoas-0001Qh-CA for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoas-0007tF-8n for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 12/25] gnu: Add ocaml-bin-prot. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422930137 (code B ref 53882); Fri, 08 Apr 2022 13:24:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaa-0007pv-I9 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:48 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:37603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007m3-O6 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: by mail-wr1-f45.google.com with SMTP id z1so12837077wrg.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dB91o/yMhIHd22oFn8cYthbo0LDD4SS3RPwLKcg3qUQ=; b=lvF22GKs+q5gnsVcEdL1nyIzCSJ2OY8igKeqWVAHDpcHHT73p46+UUiR5iVzHE0M0G dBleQcQq1MNSlvIDzlttgkVQmzaelTVb02VFp2dvl8gBHo+TorunuCTFyBwMhYej33Ci 6tS6TDYBInnJf8JTQSUDqMBZ3iU6aBqcNZ0+KbbL1tOJrKnA8DzpYkJp3f2e//j3vqbX eqEmCgyNdwiH2CygmZmBbfrPfWIaQCPW2tSRktVEywWQg0eYaDTHx1MrHShwmF8OhW6T oCDJP+8oxTBvw1zpJNDo+P8CmF9z9RFuJAkLirktYHofH8lMcv8yXPVJxtDIDbWr6ylS vtvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dB91o/yMhIHd22oFn8cYthbo0LDD4SS3RPwLKcg3qUQ=; b=guCbqZAsvpHv4csCeYqmoIcWg0U90ZF4PK6IwHMRn1P+KduZ4HcebZoLFwLBDsoUkd HQ7I2gvsVL6pSddX04O2uLlcMLidBv70Qz4mpDVZcN5g6vBvcSjhUltw/HmRH1iwUWKq PcWcRKP3G7kIcHEDCM0jp8lkjoJ121yPx3tJ5gp46GWGqvv+RsfYufoOQVJH/h7RX5CS RoDcI2pHfrmgo92wAloZCv9Af/p4FsCElXp0n8/8GyaY302dMVjdve3k1EtPmkebAvWl bNwEuMVIJR7aFIOa1EK5nx5OR8XgoRvYwRXOHN5C/qBxE+RiHtRT4Ww8IuZR51NFFCsN oiMg== X-Gm-Message-State: AOAM531zqDjaGEbSb97RcUEZ152lXbG7XFRa6gIgUMVuFe33JqDDodxA qYJznzR16ox29EppZOx3TFlM74D2eKo= X-Google-Smtp-Source: ABdhPJyg3tDP89UaOtq/rr0RlIYOW8VwmzJ1G/BiHOG2HdBq3zdwmQ1x+E+pZY1NGJgWjR7wIgNMmA== X-Received: by 2002:adf:bc0d:0:b0:206:14a6:817f with SMTP id s13-20020adfbc0d000000b0020614a6817fmr14835585wrg.136.1649424211096; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:30 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:52 +0200 Message-Id: <20220408132305.3301350-12-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-bin-prot): New variable. (ocaml4.07-bin-prot): Inherit from it. --- gnu/packages/ocaml.scm | 75 ++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 67902f58b3..fbe07fbb21 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5580,33 +5580,30 @@ (define-public ocaml4.07-ppx-custom-printf "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) (properties `((upstream-name . "ppx_custom_printf")))))) -(define-public ocaml4.07-bin-prot +(define-public ocaml-bin-prot (package - (name "ocaml4.07-bin-prot") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/bin_prot-v" version ".tar.gz")) - (sha256 - (base32 - "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (name "ocaml-bin-prot") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr")))) (build-system dune-build-system) - (inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "bin_prot"))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-compare + ocaml-ppx-custom-printf + ocaml-ppx-fields-conv + ocaml-ppx-optcomp + ocaml-ppx-sexp-conv + ocaml-ppx-variants-conv)) + (properties `((upstream-name . "bin_prot") + (ocaml4.07-variant . ,(delay ocaml4.07-bin-prot)))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") (description "This library contains functionality for reading and writing @@ -5615,9 +5612,31 @@ (define-public ocaml4.07-bin-prot structured values at speeds sufficient to saturate a gigabit connection. The protocol is also heavily optimized for size, making it ideal for long-term storage of large amounts of data.") - (license (list - license:asl2.0 - license:bsd-3)))) + (license license:expat))) + +(define-public ocaml4.07-bin-prot + (package-with-ocaml4.07 + (package + (inherit ocaml-bin-prot) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/bin_prot-v" version ".tar.gz")) + (sha256 + (base32 + "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (propagated-inputs (list ocaml-base + ocaml-ppx-compare + ocaml-ppx-custom-printf + ocaml-ppx-fields-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree)) + (properties '()) + (license (list + license:asl2.0 + license:bsd-3))))) (define-public ocaml-octavius (package From patchwork Fri Apr 8 13:22:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38407 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 D1CAC27BBE9; Fri, 8 Apr 2022 14:27:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1761C27BBEA for ; Fri, 8 Apr 2022 14:27:10 +0100 (BST) Received: from localhost ([::1]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodp-0007Z7-8H for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002NX-7A for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoas-0001Qj-Po for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoas-0007tN-Ko for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 13/25] gnu: Add ocaml-ppx-bin-prot. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422930144 (code B ref 53882); Fri, 08 Apr 2022 13:24:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007q2-04 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:49 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:43873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007m5-3Q for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: by mail-wm1-f49.google.com with SMTP id m67-20020a1ca346000000b0038e6a1b218aso5552589wme.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tc4+nvws21rYmo9rGHp397Id9+YFKbxzZR5cwvia4Po=; b=mlPA06sFwLX0ELVmX60zKCbOm7MaBrRV0sl3VAdGWAnsyqRcORvseuu5xneC9wogO7 8f5wqG2K4XEDPDM0F71qBJGwpLVoWnzG1mNjtH72P1O6jRY44g4+eZZ9SN+VwpB/9odx iRmSFNWJsWQVveAIEX6HGud3VeY2mpX62S7l3BnpB5d+EWFYAWHFEbNjTkyprLgex6+T L15ppsLb5BKB0wavf2tT+ExUG4jUX92JOb1UrsbnmmMOx4bJTrO5lv+aTSHgvIxzW42Z deX6UzyfbD28b0ernyD1otI35H68kqAosKY2WGGaI2cgMw4wWAaei809KPff6M0CnfoP 6sow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tc4+nvws21rYmo9rGHp397Id9+YFKbxzZR5cwvia4Po=; b=l7+UYe37SiJge+D3EFzytzW7G3XfGbU/YDlZTuQubTPtRIIXBOiuOnCLmTIcCVmMYo xeywyVvwgsicTZSnrH21IPaBWE8U3585gUzy3TyynZkpcW96GRvXYAJnmOcEL9PpXyHd 7ylthhRKIfi00ngYpinsRsL15wZ+Vns9YM0xn3laL3bIWdgWsGP038Sc34FhLw1OSjPg zNiy/kyI3QHW/vbLWB2Go1yxwU6shajTC2xV6FeI0AX3q/3MT2492xe1zC7yssnUtCm3 1NdM3FjH0t8OgXZIWYVkoSXw7y/ehk1YyvCmBMjpbaCwUIFGFqIaMfzoEUFtKwKbIDKl A9WA== X-Gm-Message-State: AOAM530QHbfkzG//mk8zaWzjpp0e9uaTX+gbGkW5mFIZPBjYO8CWOHYv GXz2P0Xvlk0Q9CT5d4U05JZHW1I4uL4= X-Google-Smtp-Source: ABdhPJxGeyBSaEz3CmStbxdwqQjqkzVvVFDnr4bQCCvehzME8lxKx0L2mF5zXigXGTkuoEELIoxtZA== X-Received: by 2002:a1c:218b:0:b0:38e:aa07:62a8 with SMTP id h133-20020a1c218b000000b0038eaa0762a8mr1630833wmh.172.1649424211576; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:31 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:53 +0200 Message-Id: <20220408132305.3301350-13-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-bin-prot): New variable. (ocaml4.07-ppx-bin-prot): Inherit from it. --- gnu/packages/ocaml.scm | 64 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fbe07fbb21..14e945df56 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6423,39 +6423,55 @@ (define-public ocaml4.07-ppx-base ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_base")))))) -(define-public ocaml4.07-ppx-bin-prot +(define-public ocaml-ppx-bin-prot (package - (name "ocaml4.07-ppx-bin-prot") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_bin_prot") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (name "ocaml-ppx-bin-prot") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qryjxhyz3kn5jz5wm62j59lhjhd1mp7nbsj0np9qnbpapnnr1zg")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-ppx-jane - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_bin_prot"))) + (list ocaml-base ocaml-bin-prot ocaml-ppx-here ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bin_prot") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bin-prot)))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") (description "Generation of binary serialization and deserialization functions from type definitions.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-bin-prot + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-bin-prot) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-ppx-bin-prot" version)) + (sha256 + (base32 + "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (propagated-inputs + (list ocaml-base + ocaml-bin-prot + ocaml-ppx-here + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-jane (package From patchwork Fri Apr 8 13:22:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38392 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 B8A2E27BBEA; Fri, 8 Apr 2022 14:24:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4572B27BBE9 for ; Fri, 8 Apr 2022 14:24:57 +0100 (BST) Received: from localhost ([::1]:57768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobg-00039n-CG for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:24:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002NZ-DR for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoat-0001Qv-5F for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoat-0007tU-2O for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 14/25] gnu: Add ocaml-ppx-bench. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422930152 (code B ref 53882); Fri, 08 Apr 2022 13:24:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007q9-DM for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:49 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:39790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007m6-LH for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: by mail-wm1-f54.google.com with SMTP id bi13-20020a05600c3d8d00b0038c2c33d8f3so7546843wmb.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CqO0qMWTGWBbrCNLxMwBhRF8l41mLpiCKCxYHT8/7w=; b=M6N0d7JaKFa8KiQcf9Uy0B5gtPn8VSjXAclh8MPRtm6ZEBhff5sQjnFFCaWGkFg9Dc NQG5XQwz1iHBxAhhEJEWBo5TtC9JzH2TAXfRTc/f3JSgtHfOEYWA6yrYjSOWKBwWs6xn kIEz/nbqonlEiGKjmX+fYFVS6NFC96rh5j8wcePSYqdt0u3WExuv0OGqNarP0uRGajWF N2Sio2N83pANaPfy9OC3mT6hVcksILVWN02LPZJfIhh9d2agVTSebaAbSP+6Dk7PzdIy fT3ZaheikwWV0diFPZaDE4mIY7Gg84jOOV3Und+KPdTyHdNz9PJOYZ6kEMc3Rq7R6o4R TDYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9CqO0qMWTGWBbrCNLxMwBhRF8l41mLpiCKCxYHT8/7w=; b=v5HqoV4LpTia7Ge1keu2/rm5tCwHNE2K9LebPeFwfOjLmcqYTXYhcXQhyIZ1fUy36c oGzs+n0I+NckrYntjxYYkKOCxxC1WmlQe6ZS1lZGuFxcum8M1apoJJOrFOJjDQ5wm0MM i8u7N7yxv07EzJXfEWIfUcBr6LPqCW4Y1Will5mStqgbRrpW9ruJTulM2OryCsylAZlo qb5f88yPygVfBge2zFpZcHAPhBVaOzrl7yPph/TC1uPBEd3JYPGmf0WkPDUl5Lm4A4Te WrMuYN81nAtvPhij5C2J185xbSaHjAjKkh6zILGGmV286YG0W9frl2BUTkaQUmhx6f/h VzYg== X-Gm-Message-State: AOAM531HSS+TMIZ3/gGBwZEKpM3mPB+livEWXE6oIheee5XiKWHedcW+ s6g5eYIw3hZS0wpyiV0VIuZ5WyfSUIE= X-Google-Smtp-Source: ABdhPJzj/jCWBEjE1h8/7P0zCbbkRUgXMc6bVlAjAEOQQB+gcvP+dj69BxwdnTkxpqVecTnbqzWJVw== X-Received: by 2002:a7b:cf23:0:b0:38e:7df5:b492 with SMTP id m3-20020a7bcf23000000b0038e7df5b492mr17171671wmg.49.1649424211997; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:31 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:54 +0200 Message-Id: <20220408132305.3301350-14-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-bench): New variable. (ocaml4.07-ppx-bench): Inherit from it. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 14e945df56..baa269c8ce 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5744,35 +5744,48 @@ (define-public ocaml4.07-ppx-enumerate "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (properties `((upstream-name . "ppx_enumerate")))))) -(define-public ocaml4.07-ppx-bench +(define-public ocaml-ppx-bench (package - (name "ocaml4.07-ppx-bench") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_bench-v" version ".tar.gz")) - (sha256 - (base32 - "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (name "ocaml-ppx-bench") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bench") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12r7jgqgpb4i4cry3rgyl2nmxcscs5w7mmk06diz7i49r27p96im")))) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_bench"))) + `(#:tests? #f)) + (propagated-inputs (list ocaml-ppx-inline-test ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bench") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bench)))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-bench + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-bench) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_bench-v" version ".tar.gz")) + (sha256 + (base32 + "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (propagated-inputs + (list ocaml-ppx-inline-test ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-here (package From patchwork Fri Apr 8 13:22:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38397 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 DDF7B27BBEA; Fri, 8 Apr 2022 14:26:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1898527BBE9 for ; Fri, 8 Apr 2022 14:26:00 +0100 (BST) Received: from localhost ([::1]:60392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoch-0004vp-68 for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoau-0002Nc-6s for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoat-0001R7-UV for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoat-0007tj-Qy for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 15/25] gnu: Add ocaml-ppx-sexp-value. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423030167 (code B ref 53882); Fri, 08 Apr 2022 13:24:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:50 +0000 Received: from localhost ([127.0.0.1]:34268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoac-0007qO-76 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:50 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:55167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mD-2E for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: by mail-wm1-f41.google.com with SMTP id r64so5461424wmr.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=iG+/k+hqiR8XOv0NIW48Wo8zVNPy7E7au07p1k7UPQ3fZ9BPFvK5bfvhE7IeVSJ0M9 M+P9MzuX9SThjDrfRfPyX1p514NETUI36n68UhVf4k5FuJM5Yjg5TVLi3xWoJ8ECZTPw I0VeYlvK6DEOaxmx8tUdzk+Ic4+GoJqiXC/LsAW59fR2KaQILh0PKz0gDvXvTC3O/GCm RZpZp4Qt8S+jnCZbKYROj9qKCJmUpKqY/ztY2KJx/hghY2qeFuLIPrx5OlSM4Pz4f/1p Vy/gmEmk3kafWv0BBKO8swbgcIqqUjodx262HEfJYQIDQDBPcGKyhelUNZIh7L63RsOd P6NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=1XdxpMWujw+jI5AcQ/3d4eQaWvWJt7+4MlKlvgm6neqpwptq4oCkboToLvEQ2reZhJ bKdv2UyrdwcwWsCuhC11b9fvhidla84ePr6SrhqmhZHAvPMimotmX7l6+hpl5XFAI83V 14gZO0Vnj7WPvPV7xYAHWV3Q5YJvQTPXF0+4mVdcy4pTKXD2ofITv2vKFSVUGIc9hoix qO17yL8rh46FXPoryPOej9+mKd+buJ291jvtSph9J12gQGrtWyFZ5/4o+WpfMS272OQO Qxg4OTioGdNghdsKlH+99olHcaZOPS4Fd0MP3vggfOJm9vdy7NrFHl9B5ucCGjeLQgXT MNPg== X-Gm-Message-State: AOAM532RyE78Fm46o2uCohBmQqLifw6+s/f4vORgRXnzLRRSSHTajnRS 4ggHcbvKsQWBCo68+b66e2LDbKJ3OL0= X-Google-Smtp-Source: ABdhPJyMLqSoeBULMBkvnOrvPSFZaLEK9JEqzdAX2FnN6FSgfRAp27VnvbPfKGg5KqBTLHZA51Uwrg== X-Received: by 2002:a05:600c:1909:b0:38c:e8f3:8e3d with SMTP id j9-20020a05600c190900b0038ce8f38e3dmr16672112wmq.152.1649424212470; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:32 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:55 +0200 Message-Id: <20220408132305.3301350-15-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-sexp-value): New variable. (ocaml4.07-ppx-sexp-value): Inherit from it. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index baa269c8ce..ab97ee27d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5856,36 +5856,51 @@ (define-public ocaml4.07-typerep (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-sexp-value +(define-public ocaml-ppx-sexp-value (package - (name "ocaml4.07-ppx-sexp-value") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_value-v" version ".tar.gz")) - (sha256 - (base32 - "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (name "ocaml-ppx-sexp-value") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_value") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_sexp_value"))) + (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) + (properties `((upstream-name . "ppx_sexp_value") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-value)))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") - (description "A ppx rewriter that simplifies building s-expressions from -ocaml values.") - (license license:asl2.0))) + (description "@samp{ppx-sexp-value} is a ppx rewriter that simplifies +building s-expressions from ocaml values.") + (license license:expat))) + +(define-public ocaml4.07-ppx-sexp-value + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-value) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_value-v" version ".tar.gz")) + (sha256 + (base32 + "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-here + ocaml-ppx-sexp-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-sexp-message (package From patchwork Fri Apr 8 13:22:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38411 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 3541127BBE9; Fri, 8 Apr 2022 14:27:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B58AB27BBEA for ; Fri, 8 Apr 2022 14:27:24 +0100 (BST) Received: from localhost ([::1]:37278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoe3-0008Pg-TJ for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002Nb-W2 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoat-0001R1-Hx for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoat-0007tc-EY for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 16/25] gnu: Add ocaml-ppx-sexp-message. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423030159 (code B ref 53882); Fri, 08 Apr 2022 13:24:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:50 +0000 Received: from localhost ([127.0.0.1]:34266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007qH-Ql for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:50 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:41802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mF-Di for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: by mail-wr1-f54.google.com with SMTP id k23so12818580wrd.8 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xq7lqdfwOg1CSLhfmg5mb5EzYvpYtmj69a+diYN9ylA=; b=Ubj8pLPAcEDfOPhkK7zvuuMuzt19jS60JbkRtG/tnqTGo/t8GWyf1HhIKCpmydPx+t QsYh52T0C67RFMNH5I/jf+dbVgvigf3Ut68E4VqtngAvnqpVDiUq2YOpymLQ2WKlvlKQ slyErskEdUmJtT78kuzASBCv5Op6m/nfGyiawr9DAf1fi5nNS+NjK8+MTLA42X0Ng8yX kqiVSU8Li6eXdUOPOOs015/FGfkjVy+PUOPgDg04LzGRFrkavUu8qhHD6qNSRPB055qG kYXLDJqNZ2I+YYfjDlAMA8YlxMlDPWJ/CsRd6qJPHZZoU53uRcmlury93YdfMC07TLqs 9LXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xq7lqdfwOg1CSLhfmg5mb5EzYvpYtmj69a+diYN9ylA=; b=JI3IPh6m/4FJD8Io8CwyHre8XXmchH7jwoHJUV7GIgSi/4fjNq9UX8KNTMxpQCS0va Mo94sjs0yoE7C/+2BpXO7VWGXlIkrRbBjb0VIxqbsfOqN3P3MYelXUw6uorilXGzZb4/ C97rv+z4g3xYwot8Hsf4dIMbvFKaQwVI5qm7GcUC2/lzzlGQyE1/VwyIvY8Rgkn+owgk /EufWRkwthT9IWxfZItC4R1WeXV2FH1ZwtX4wIPUYIvhFGoSAKocAsWAMh7jqdn4cIpL LKk8lvmcMomFKBCsKfIMrTiYTykaB+8IrQVIvP8VH7LvVmC5vE1B6q6TJD/9kFe6DXxO p8TA== X-Gm-Message-State: AOAM532nvrETZ/vdgenvvq8XFVU3UgYdrRuzRDqONBu1hP4X1EKguyrD LSpR9IrseBX1vvkyLBUssApoYjQzwfM= X-Google-Smtp-Source: ABdhPJyQfTOC6qlmu2un2ck4bApVGIhKyWQ6Oh/KycIQ+hcMadbffPHgm5I+TebXyd4o9oBrliFZzw== X-Received: by 2002:a05:6000:1848:b0:204:e90:cb55 with SMTP id c8-20020a056000184800b002040e90cb55mr14731985wri.58.1649424212902; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:32 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:56 +0200 Message-Id: <20220408132305.3301350-16-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-sexp-message): New variable. (ocaml4.07-ppx-sexp-message): Inherit from it. --- gnu/packages/ocaml.scm | 61 ++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ab97ee27d6..942bcab4ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5902,38 +5902,53 @@ (define-public ocaml4.07-ppx-sexp-value (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-sexp-message +(define-public ocaml-ppx-sexp-message (package - (name "ocaml4.07-ppx-sexp-message") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_message-v" version ".tar.gz")) - (sha256 - (base32 - "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (name "ocaml-ppx-sexp-message") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_message") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_sexp_message"))) + (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) + (properties `((upstream-name . "ppx_sexp_message") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-message)))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "Ppx rewriter for easy construction of s-expressions") (description "Ppx_sexp_message aims to ease the creation of s-expressions in OCaml. This is mainly motivated by writing error and debugging messages, where one needs to construct a s-expression based on various element of the context such as function arguments.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-sexp-message + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-message) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_message-v" version ".tar.gz")) + (sha256 + (base32 + "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-here + ocaml-ppx-sexp-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-pipebang (package From patchwork Fri Apr 8 13:22:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38403 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 B3C3027BBE9; Fri, 8 Apr 2022 14:26:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E40E27BBEA for ; Fri, 8 Apr 2022 14:26:38 +0100 (BST) Received: from localhost ([::1]:34022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodJ-0006F6-9V for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002XP-4t for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40405) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoau-0001RG-AB for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoau-0007tq-6q for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 17/25] gnu: Add ocaml-splittable-random. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423130174 (code B ref 53882); Fri, 08 Apr 2022 13:24:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoac-0007qW-KK for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:42604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mS-T4 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: by mail-wm1-f45.google.com with SMTP id n126-20020a1c2784000000b0038e8af3e788so4002254wmn.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zZyG06khIBMo+p31W/MZpooh5jmkdeIQGrbvRE/KRXM=; b=oP/edgp2qF2uzpLxdD1meB2Gk/XvC+C+ydDhFayH0/gLbs5k4Fg4NUtRDTg4cpScL5 5qSjBvh70Jv8wNds6+s2nwgA1tTcrHlv9K60oJYZ1QX0HT6ckvzuMCOOFZdSXoXWijHw net1M94HLGAupqMBSgkszmuujQ9QS+PTLggXObYbTGovNxIqDaiXe4s397bShGoxOUUW vOF51Avmch/TbBK1DGXvk/u+IOijAsnsjHHVTqeXrkTMvys85vu57+3PjNsAFtaIC+CN WZ3Wsv484W6Ls9VgPv/l+PTM6sji6BzefU+MfkOAq0FAKs6/+4V4ITd6qSkW/uGXfKIn AZng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zZyG06khIBMo+p31W/MZpooh5jmkdeIQGrbvRE/KRXM=; b=ynnQyQN6sf56tGBulzEE2HLs8d1sxebYNpL9pqxcFRTFq5ntlrEE9/RsrBiLyuitC6 YpHjLwqwGMNO2tbtdT77YCYiOlJCv3LEfLLMmqRWdYZbPc85lv/9BtaAGNuU4kRS+IxT jXUJD4wj5768dBdUZf/06q2pv4zwW1TYjEj3tmjTkpXRad11y2MVWjuZl8ovIrz/PXEm dV0hkKgirqBHqkYCZfti095VBqvG4xAOxDz7A/iaPnwj8aQ5saRHv/SeY1O5oVSS9AeR AOFJ/elGYDtuwXaHnUwUQeVc3bVNXyS0Iq1q88T1V6dC84z0NhnxeQWrQNYuYQUA3dVd CgAg== X-Gm-Message-State: AOAM530s4RFwVuWH6nMAVjaNnogHtuBWgOAXp+6MXWKLhBLN7dSakp58 zXR91To9vA+uFdT0Ad8OiMGibj8k+D8= X-Google-Smtp-Source: ABdhPJzNDiKyBjaKyKIF8K7z4/cpVVge0uP0d+ZLrDUH0xBPCC8x7nKb/hIg8uwbEYY7747mzJlHsg== X-Received: by 2002:a7b:c922:0:b0:383:e7e2:4a1a with SMTP id h2-20020a7bc922000000b00383e7e24a1amr17401698wml.51.1649424213325; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:57 +0200 Message-Id: <20220408132305.3301350-17-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-splittable-random): New variable. (ocaml4.07-splittable-random): Inherit from it. --- gnu/packages/ocaml.scm | 59 +++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 942bcab4ad..ec2d8ab12e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6563,29 +6563,28 @@ (define-public ocaml4.07-ppx-jane driver including all standard Jane Street ppx rewriters.") (license license:asl2.0))) -(define-public ocaml4.07-splittable-random +(define-public ocaml-splittable-random (package - (name "ocaml4.07-splittable-random") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/splittable_random-v" version ".tar.gz")) - (sha256 - (base32 - "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (name "ocaml-splittable-random") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/splittable_random") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ax988b1wc7km8khg4s6iphbz16y1rssh7baigxfyw3ldp0agk14")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (properties `((upstream-name . "splittable_random"))) + (list ocaml-base + ocaml-ppx-assert + ocaml-ppx-bench + ocaml-ppx-inline-test + ocaml-ppx-sexp-message)) + (properties `((upstream-name . "splittable_random") + (ocaml-4.07-variant . ,(delay ocaml4.07-splittable-random)))) (home-page "https://github.com/janestreet/splittable_random") (synopsis "PRNG that can be split into independent streams") (description "This package provides a splittable @@ -6595,7 +6594,25 @@ (define-public ocaml4.07-splittable-random This library implements a splittable pseudo-random number generator that sacrifices cryptographic-quality randomness in favor of performance.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-splittable-random + (package-with-ocaml4.07 + (package + (inherit ocaml-splittable-random) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/splittable_random-v" version ".tar.gz")) + (sha256 + (base32 + "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (propagated-inputs + (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-jane-street-headers (package From patchwork Fri Apr 8 13:22:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38410 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 D973027BBEB; Fri, 8 Apr 2022 14:27:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A9A0F27BBE9 for ; Fri, 8 Apr 2022 14:27:24 +0100 (BST) Received: from localhost ([::1]:37284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoe3-0008Pp-PG for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Ye-CM for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoau-0001RI-O7 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoau-0007ty-KE for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 18/25] gnu: Add ocaml-base-quickcheck. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423130181 (code B ref 53882); Fri, 08 Apr 2022 13:24:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qd-1N for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:38902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007mU-78 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: by mail-wm1-f44.google.com with SMTP id r206-20020a1c44d7000000b0038ccb70e239so13578wma.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rSvVR82WVj/5hQdo0DRyr41ihpoVOERcjMoFilSYtlc=; b=X/2HoF3z4eDlDq8+e11hrhs0rw4+t8Ex9u4hUZS5DclesidWDA0x4FBvMgk3oUBLJ4 fnuKtDsP85f/OMJcwuY2tvme5oxqXOT/VnNMcsxw0TrVyX8lC4ed61PClaP6VmGXRZqj JF0XfQANnG6wKggKS7qUJKCiBfC7SWuAWPlr5tTJjH933Ix8aRUpqTemhyaN9UWfgQLR 3F+NVi1njOgAJASoVyzEbPvdMnGi+JB+Yg4leC0/KVxLwXI9gT8XSCC4TZu5+T6yRhhW bA9yI06yJwAc+Mtx2hIYUWbTm2FgARFduORz4Wmym6/Tc5RafxJT4CRQcbncKm86YxX4 kygw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rSvVR82WVj/5hQdo0DRyr41ihpoVOERcjMoFilSYtlc=; b=vRFBn8DzgOtLEsoTSb2NHbV7UuXiAZgO8JmhWr+ZmAY5vavYMLDwir8QRBOGLzDzjz jBLskfr8Nlj8b5p39KAQ42ls493zvfmQzfZkbehCTuzGsGbsm7HPCpOFZwyIimSbYSTx rDLaCpT73mfQy0CuhTl0dw/5nFbr5Y5k310HNEOcEYvkFU5H1rQrx0Y1L0MiBJ48Urt6 6+eiygIuEJONNcajvSKP/Tv/fsTcA7Tzep8Q+CXWjA118AobBPe4EvPQlioH+VATHeMX VJt+188hPdLWRL1jmbVBW3Wq/PhIPyA7WxDOHayYPgC4TuqwKQeP1f6oLRVqbZPdSp7B meOQ== X-Gm-Message-State: AOAM530b1pZ1Q4LXkaGHZ7AykMWrfEexzpK0Gz4Wq2CT+ZzrcKmM0IYL gNjKqwZxaMSnbCEOATdQGXpixa/t71E= X-Google-Smtp-Source: ABdhPJx0vrM/XV1bViHEsncpmjPEi1k6u/ZH/BkzbX112TylYZAilC7gxPQeiMkNGoR4WEC3FSMiQw== X-Received: by 2002:a05:600c:3d0e:b0:38c:9b5e:52c0 with SMTP id bh14-20020a05600c3d0e00b0038c9b5e52c0mr16525010wmb.3.1649424213732; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:58 +0200 Message-Id: <20220408132305.3301350-18-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-base-quickcheck): New variable. --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ec2d8ab12e..a57ec2b05f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6614,6 +6614,39 @@ (define-public ocaml4.07-splittable-random (properties '()) (license license:asl2.0)))) +(define-public ocaml-base-quickcheck + (package + (name "ocaml-base-quickcheck") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/base_quickcheck") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0apq3d9xb0zdaqsl4cjk5skyig57ff1plndb2mh0nn3czvfhifxs")))) + (build-system dune-build-system) + (propagated-inputs + (list ocaml-base + ocaml-ppx-base + ocaml-ppx-fields-conv + ocaml-ppx-let + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-splittable-random + ocaml-ppxlib)) + (properties `((upstream-name . "base_quickcheck"))) + (home-page "https://github.com/janestreet/base_quickcheck") + (synopsis + "Randomized testing framework, designed for compatibility with Base") + (description + "@samp{base-quickcheck} provides randomized testing in the style of +Haskell's Quickcheck library, with support for built-in types as well as +types provided by Base.") + (license license:expat))) + (define-public ocaml4.07-jane-street-headers (package (name "ocaml4.07-jane-street-headers") From patchwork Fri Apr 8 13:22:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38412 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 501E527BBEA; Fri, 8 Apr 2022 14:27:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D435B27BBE9 for ; Fri, 8 Apr 2022 14:27:30 +0100 (BST) Received: from localhost ([::1]:37730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoeA-0000Is-1J for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Yg-CP for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaw-0001RT-0P for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoav-0007uK-T9 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 19/25] gnu: Add ocaml-ppx-fail. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423230203 (code B ref 53882); Fri, 08 Apr 2022 13:24:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:52 +0000 Received: from localhost ([127.0.0.1]:34278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007qz-7w for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:35587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007n0-MJ for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wm1-f54.google.com with SMTP id c190-20020a1c35c7000000b0038e37907b5bso7604163wma.0 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pIwenH/jQAUEcsV8zPPh3QXVQf1xLTD7q8WKZclQgeA=; b=HrwVMDsvx8XIE4gVT5utUOWcpsmY9p1Q11z4ap9CcTT1cCUwQWgM3S3h8VaMJrPApO 5MlM9TFJkx7s/scdbMAVP7epO/JLp97pa3738UwNXqgZWowq8pJewXQoapphOAW1xMO+ jN4NapE78J6CLJArwt1mLG5aFsjarHzenJnkpREFXlvMIMrSIcSGoswZ85i6zAZ7yWkt 45i+TsRUnIOrTCSQsq76e7cXdoqAV3jq9KcSk7hhP0dtaEJxeNs6ROt5dROCXQjKH4fv dM9uEeCndJkCja+q+l8XxifjZHLPjZOCE+O9tx0byxEnbk5B0y1rUcYgsStjdcU+DPnF BoRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pIwenH/jQAUEcsV8zPPh3QXVQf1xLTD7q8WKZclQgeA=; b=6W3T7Zt7nDklMmZiHuKM6+kEhHlm/xRdF1GtHY+lpt9Mtk7ilHED8JZb4cmPCFM0ms ZorCM6sRq+tnTHj8VgmazJo6+0Vu54O+sKXeC4l0Z9sOnrpp6r4TlTk/YkiJFlwt3dit FcKGmWIiMrGw5kYHuKvWS+i6VkKqeC+zG89X3HuGxXRnmJ1FM1+qPLEodOkUAuZNGW4K c9ywKhdYqYWNMBU6WM1Gjlhb0Stze9hZgtlO0WqVjlmWhkvrkzIT3XgZOxmOU+rpDacY W9Z+bv1wPlj5H0/QqXUiXuseWv07KCbLVib61gJvp8wri8galSzv7h6fWB0NRM2GkMCa bQQw== X-Gm-Message-State: AOAM532ieBbmoZXb9t/oXyqnGYTW72f3Dl7OxzmguXbV6TbwIZYVPtQD DNLsC6sTDQUIYVShqhWroty7JAN8PpY= X-Google-Smtp-Source: ABdhPJxfcFpSjmjn64aIumMsFv7NUlHzRlGNI2vRAnOeYv212q1AJv7SgSIHZq1LHubLBD9+0giRiA== X-Received: by 2002:a05:600c:1990:b0:38c:c0a2:c0ab with SMTP id t16-20020a05600c199000b0038cc0a2c0abmr16893959wmq.72.1649424214158; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:59 +0200 Message-Id: <20220408132305.3301350-19-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-fail): New variable. (ocaml4.07-ppx-fail): Inherit from it. --- gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a57ec2b05f..1c81f2de1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6139,35 +6139,46 @@ (define-public ocaml4.07-ppx-let (properties `((upstream-name . "ppx_let")))))) -(define-public ocaml4.07-ppx-fail +(define-public ocaml-ppx-fail (package - (name "ocaml4.07-ppx-fail") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_fail-v" version ".tar.gz")) - (sha256 - (base32 - "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (name "ocaml-ppx-fail") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_fail") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "012p9gv7w4sk3b4x0sdmqrmr2856w8xc424waxb6vrybid7qjs95")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_fail"))) + (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppxlib)) + (properties `((upstream-name . "ppx_fail") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fail)))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") (description "Syntax extension that makes [failwiths] always include a position.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-fail + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-fail) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_fail-v" version ".tar.gz")) + (sha256 + (base32 + "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (propagated-inputs + (list ocaml-base ocaml-ppx-here ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-cold (package From patchwork Fri Apr 8 13:23:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38401 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 C1D1127BBEA; Fri, 8 Apr 2022 14:26:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1181427BBE9 for ; Fri, 8 Apr 2022 14:26:28 +0100 (BST) Received: from localhost ([::1]:33136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncod9-0005e7-7Y for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002YM-9Y for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoav-0001RR-Jo for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoav-0007uC-G7 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 20/25] gnu: Add ocaml-ppx-jane. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423230196 (code B ref 53882); Fri, 08 Apr 2022 13:24:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:52 +0000 Received: from localhost ([127.0.0.1]:34276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qr-My for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007mo-5s for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wr1-f48.google.com with SMTP id m30so12871879wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IpWM8UyStZSBEUb0q8kjHmur0Gic88vS+p9k93ygsPU=; b=N9dOoWmAmtuK8SYQSkrn4TDN5Z67Ka2dEDPJ0jmxhjuZphlPhmxocOsYkDmj4qzJQO lzAjsDsVLQEpFGm3AqOkkw3zH81oKQPC4CQQ5+C4VAihGSkNqAgnLdTISiWinwgQooIG P/t/TnoQcjsgJ7h61asjD+e408g70onmvhr3Un4dMYG/XbUZ/oJxbMbqP1yHukTdkWG5 2Pi/T3maa5VuO0v8GoHjo9qUQHI5FLJfx41Gf/stN2at3WPtNVsa2/cRRDPoSDZE44wh ZuFlEmVqbFOObT2a/v+UrvjaPjRYMtx6Gzi7rAOV1yM9NxLq+1+hLGkrKCJBXycgr8Jm 5RCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IpWM8UyStZSBEUb0q8kjHmur0Gic88vS+p9k93ygsPU=; b=CaeSET6lYYDgvMRnj88xU9XrxQg9hJ0qChNDwdxpoVkPTfNRuk4TNWwvW5PhFhya2J IJatm2+OBIXiZXk8c/kN0Ovk2K2Bp/rEdhqWrrdokMHY/W9nTAfBS1CZD1VJnztBwmX1 lIpjfAf5/84oDze4CpG1VxD1BpwbiNf7tN8+bEPyVU5VfO5pJMHZ/Fo5TNrXraWpe0jk w+Fu+vTnogp6gw2PyBvbqV6RPpcsvrkVNjXISbQV20dY+oG2QaapDQ3RdWnLZErfMKRV AKehQ+Xt+kprAygr8290JxziaRSHj+nfQ3pyn9pV3TBWbXY6BsJf0eSnYkS3BJiwt1hU gT3Q== X-Gm-Message-State: AOAM530P3gTHimAQ8iG/aACYvIy5HxXUE7YWowTO6iHcUrl6cQvOAH9v fpFDkZR7CYJZrUXlSY07yJf4aFXayJ8= X-Google-Smtp-Source: ABdhPJwhhRZGbpMlIujlBYtk05vURUO2G5/icPSG4wpKXv3xSKh7DM8brLpdpYPZnCXU0b2wYHJHaQ== X-Received: by 2002:adf:9b9e:0:b0:206:e5b:63f2 with SMTP id d30-20020adf9b9e000000b002060e5b63f2mr14838476wrc.46.1649424214578; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:34 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:00 +0200 Message-Id: <20220408132305.3301350-20-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-jane): New variable. (ocaml4.07-ppx-jane): Inherit from it. --- gnu/packages/ocaml.scm | 116 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 39 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1c81f2de1c..3e5c7e8bf2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6527,52 +6527,90 @@ (define-public ocaml4.07-ppx-bin-prot (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-jane +(define-public ocaml-ppx-jane (package - (name "ocaml4.07-ppx-jane") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_jane-v" version ".tar.gz")) - (sha256 - (base32 - "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (name "ocaml-ppx-jane") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_jane") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) - ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) - ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) - ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) - ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_jane"))) + (list ocaml-base-quickcheck + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fields-conv + ocaml-ppx-fixed-literal + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-module-timer + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-stable + ocaml-ppx-string + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-ppxlib)) + (properties `((upstream-name . "ppx_jane") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-jane)))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-jane + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-jane) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_jane-v" version ".tar.gz")) + (sha256 + (base32 + "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (propagated-inputs + (list ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fail + ocaml-ppx-fields-conv + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-splittable-random (package @@ -6621,7 +6659,7 @@ (define-public ocaml4.07-splittable-random (base32 "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) (propagated-inputs - (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (list ocaml-base ocaml-ppx-jane ocaml-migrate-parsetree)) (properties '()) (license license:asl2.0)))) From patchwork Fri Apr 8 13:23:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38409 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 6A84E27BBE9; Fri, 8 Apr 2022 14:27:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 235F827BBEA for ; Fri, 8 Apr 2022 14:27:17 +0100 (BST) Received: from localhost ([::1]:36750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodw-00084J-7q for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002YG-A3 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoav-0001RN-5w for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoav-0007u5-1m for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 21/25] gnu: Add ocaml-base-bigstring. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423130189 (code B ref 53882); Fri, 08 Apr 2022 13:24:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qk-Dl for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:55181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007mu-Kt for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wm1-f53.google.com with SMTP id r64so5461493wmr.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RRJABVQ4G1Q9XJ+bmUC50WovglKRd86dk6V9D88DzKA=; b=gmjGUXHiKBG95l39ZDVn339kHj05jL0DcudFRSTh8dCyHHa6/0WUrA9SmiX9BGbB9z 9eF3ue64KNzV+mQxL84c7GGY7Wnqn1S7Dqp+kibFJ5t5Pixab3tvhLk14JAZ3XzvL3IW cgHPXiVhSr3S2IKYXDDlZUTAbVTYOdk/Ep6pztPz5dgJzeO5VtymFFOwOHg3EKCkSqPB BfxMB0/RSYLAoU5QRSuiwz4hG7DMUMpjJzkahKS2fscPWB/whnHG9gGDoUPiXkV9VCLs 1xYGb/pTAeHEW6ZirwjXwOCU3SgbqWsCg8V/tNk3XRnqgmvhAiL+O9A3c9mPkuD4YvBM V3RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RRJABVQ4G1Q9XJ+bmUC50WovglKRd86dk6V9D88DzKA=; b=WVmavxqkCdcdp/SkCn8PYYMZSUChWMuDy5oeu/86MX8wSfjOJNwS+uyE/92UN+Orkm xpuR9SMZFQdYgLDLHZsryuyGmS3BJxPwS8VT9KX9NfYo0dE9WAQZKxDkGKievyD53WcW Ao1cKb78bHPESSFULCk5Ir/bW/cF+vEZRgjAk0yyI1Lk7E407lcYo3xExp2YyAFwcLIx BfifeOEv4Cl3LnDGDK5G3dzG9gyjD4vSkOk0FuB+ibS1ox5Yo0h1hlofWfpdHPmrgghA MVOxNFxv04TdDeU8uNG+s+SmqlQXvPbZKmV0f2drZ0l+P5O0jADma2SuON0aU3Xryo9D EyOg== X-Gm-Message-State: AOAM531TM+aN4PX/rIGjQvRgQbufxhd4jJDHUCbm4EQeN85rQK7Xz/vC C6g7F/z35zXJTGhNQcyhF6JOguIbO5Y= X-Google-Smtp-Source: ABdhPJwhnK55aeO4TDP3JtUnmLBP5G2JfW5dDVIHmOBisNcleSUhRRjTr0zpGz4Jb84j1HZstd7MRg== X-Received: by 2002:a05:600c:4e8b:b0:38c:90cf:1158 with SMTP id f11-20020a05600c4e8b00b0038c90cf1158mr17367073wmq.107.1649424215063; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:34 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:01 +0200 Message-Id: <20220408132305.3301350-21-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-base-bigstring): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3e5c7e8bf2..ba21f76759 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6612,6 +6612,28 @@ (define-public ocaml4.07-ppx-jane (properties '()) (license license:asl2.0)))) +(define-public ocaml-base-bigstring + (package + (name "ocaml-base-bigstring") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/base_bigstring") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ald2m7qywhxbygv58dzpgaj54p38zn0aiqd1z7i95kf3bsnsjqa")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base ocaml-ppx-jane)) + (properties `((upstream-name . "base_bigstring"))) + (home-page "https://github.com/janestreet/base_bigstring") + (synopsis "String type based on [Bigarray], for use in I/O and C-bindings") + (description "This package provides string type based on [Bigarray], for +use in I/O and C-bindings.") + (license license:expat))) + (define-public ocaml-splittable-random (package (name "ocaml-splittable-random") From patchwork Fri Apr 8 13:23:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38398 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 CA77A27BBEA; Fri, 8 Apr 2022 14:26:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4122D27BBE9 for ; Fri, 8 Apr 2022 14:26:04 +0100 (BST) Received: from localhost ([::1]:60464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncocj-0004y4-TG for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Xk-58 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaw-0001RX-RU for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoaw-0007uZ-ON for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 22/25] gnu: Add ocaml-core-kernel. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423330218 (code B ref 53882); Fri, 08 Apr 2022 13:24:10 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:53 +0000 Received: from localhost ([127.0.0.1]:34282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007rE-Ur for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:53 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007n8-5W for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wr1-f46.google.com with SMTP id m30so12871922wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z0T9ACY2rx/RRj1XnAu281QCAB3eI3/k33Y3QS8mFbc=; b=WAuMrGFe6ukMS9CZhP8tm9nBwBIbTViL1fm3n1cMEgbCj8zmS361wQWj3VAFM7H8jd fiy0nMe/coRSiasHnARPObIBilVT+ewvJ/0X2Biui4JrPz9Sgrxr3RfqkAqWeCnsUaQx dSc2OIluozg7iBNIxN2xpzrjVGKwKko3EputcOpbG3MJftW+MvTSQw+p/evUTd9I2oyX RRijdLtn3bcRWQh79LX28oijooA2w/UCSn2rzdRmfb+QyJVBko9H7UM8g9gNAQro0mUe fUHYoO5UKzzZrEEWyI3e1zxqAOKU7Bbw53f4SiEahYem1gJ37meO1J44ePZEA+DQKskq zBog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z0T9ACY2rx/RRj1XnAu281QCAB3eI3/k33Y3QS8mFbc=; b=BRi9i9bi2nquPqgeMDp7NerJ0N51EGUzcJ6nWjOU3zv0eHEe7x3+VMNNqE8NzEKqTx YhD9N/bMGPuCxA7iVdEQMMZbebN+1uWcvXG8/7dv42E7cXz99ai1A8UK49LfHJNeTvV4 2KXlkCvH7FOK9+KS7YD/gkMWk+Nr5qW2tHQxWynaE+litUgEYtuE3+QAfzpcHMrj0kUG q1cTRtVU4lerDeq6Dk3XRS8i9beZJi+U/JnVqg9FwwXWKnHUR4/ipwJuFyA4ExyJ3QUw nV5Oby5dkUC7TO6mb7n+DjZFTwWRwNmxW68GOrXI3Q1vYELF76r/6c5YVE7zagKX/3Ga BRxQ== X-Gm-Message-State: AOAM530HRRTY4IL0zOVN50l932Pb194BzSEUZNjtnWPfMYYAs4ANDyiT Y+HoBcDygHt543Qhdc1JJBM/ra4Cxnw= X-Google-Smtp-Source: ABdhPJwtvanXr3/08PlbX/yH+NYxROR130AtL8mwbS/GqTCtster8CvRnJ12Ud197yMtfL+AoCzGug== X-Received: by 2002:adf:e301:0:b0:205:db69:6dba with SMTP id b1-20020adfe301000000b00205db696dbamr15266950wrj.605.1649424215492; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:35 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:02 +0200 Message-Id: <20220408132305.3301350-22-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-core-kernel): New variable. (ocaml4.07-core-kernel): Inherit from it. --- gnu/packages/ocaml.scm | 118 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 41 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ba21f76759..be6477edbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6887,58 +6887,94 @@ (define-public ocaml4.07-core ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). (license license:asl2.0))) -(define-public ocaml4.07-core-kernel +(define-public ocaml-core-kernel (package - (name "ocaml4.07-core-kernel") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core_kernel") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (name "ocaml-core-kernel") + (version "0.14.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vxv9rq6m52n60gprm4sqjj1i1p4dd4sgns068hkp9g558d8zdjx")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-core - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) - ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (properties `((upstream-name . "core_kernel"))) + (list ocaml-base + ocaml-base-bigstring + ocaml-base-quickcheck + ocaml-bin-prot + ocaml-fieldslib + ocaml-jane-street-headers + ocaml-jst-config + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-hash + ocaml-ppx-inline-test + ocaml-ppx-jane + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-message + ocaml-sexplib + ocaml-splittable-random + ocaml-stdio + ocaml-time-now + ocaml-typerep + ocaml-variantslib + ocaml-ppx-optcomp)) + (properties `((upstream-name . "core_kernel") + (ocaml4.07-variant . ,(delay ocaml4.07-core-kernel)))) (home-page "https://github.com/janestreet/core_kernel") (synopsis "Portable standard library for OCaml") (description "Core is an alternative to the OCaml standard library. Core_kernel is the system-independent part of Core. It is aimed for cases when the full Core is not available, such as in Javascript.") - (license (list - ;; this package and parts of OCaml, relicensed by janestreet - license:asl2.0 - ;; MLton and sjs - license:expat)))) + (license license:expat))) + +(define-public ocaml4.07-core-kernel + (package-with-ocaml4.07 + (package + (inherit ocaml-core-kernel) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-core-kernel" version)) + (sha256 + (base32 + "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (propagated-inputs + (list ocaml-base + ocaml-bin-prot + ocaml4.07-configurator + ocaml-fieldslib + ocaml-jane-street-headers + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-hash + ocaml-ppx-inline-test + ocaml-ppx-jane + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-message + ocaml-sexplib + ocaml-splittable-random + ocaml-stdio + ocaml-typerep + ocaml-variantslib + ocaml-migrate-parsetree)) + (properties '()) + (license (list + ;; this package and parts of OCaml, relicensed by janestreet + license:asl2.0 + ;; MLton and sjs + license:expat))))) (define-public ocaml-markup (package From patchwork Fri Apr 8 13:23:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38413 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 DA4CA27BBEA; Fri, 8 Apr 2022 14:27:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AD4BB27BBE9 for ; Fri, 8 Apr 2022 14:27:36 +0100 (BST) Received: from localhost ([::1]:37970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoeF-0000TT-SK for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Yf-Cr for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoaw-0001RW-Dj for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoaw-0007uR-AT for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 23/25] gnu: Add ocaml-timezone. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423330211 (code B ref 53882); Fri, 08 Apr 2022 13:24:10 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:53 +0000 Received: from localhost ([127.0.0.1]:34280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007r6-K4 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:34392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007nI-I3 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wm1-f42.google.com with SMTP id j5-20020a05600c1c0500b0038ea8b53580so730908wms.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B3ol157kZvtDLYuqouI0E9YCzD/MgaXqGSmeiVU5y/4=; b=RBUsjvPb8yraVzi9tYItotfGCLbtkFw0CFXrXPv0LABCuI/46nLrJcXTCjt3Xcz2RO oO73mKo2DnvWryplSy3w2UPBLjFTNqYxtNVXqD9K+DhmiSr1p3XYN3v87iRyFoYgc4vN 3zPO8Txf5z037V3BWvmtbI7yIUR6TlYMKCLuKGHZzpmem6EV7r+Lx6eGbwSiEUmf+QLs un0VZ+9aGBcUmVrVHT+sJ9MZlUMLh0rS8RQb363hzbDWy2y+GLSOVshCcTcCirEWIErU tgMl0HwFfFPwX+my065m9K1r72Nhscf5FOo0cIhfItW+nI9O2DW/Gl851zfe5+YDxIAt 1iCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B3ol157kZvtDLYuqouI0E9YCzD/MgaXqGSmeiVU5y/4=; b=NsZXFUCn/I9RHgpPrDpZy92cQ6EvqDxFabIm9kmNf21+0zI67Y6VppH6UqROOUxjXc Cw8mNLu2hqkznedSCjnlUvTAWUmSSUQLsbpjgFDT5t93TG9P0fLQURgG0xXF+HTppYll IdvtdqQu30kbs9bcZpM0dqeGLqJzJZRAkfXwwneube2fvDxP2+uaoEeXJj2FhIvtdoWt QatPD0WlCmcKPEM3MoMqchnfOqvxslxMHzqjWxokwo/rKrdc2RmrE2QAGMBBdsr2C+Sr Twy96f0ptZ/iQtDWBZQAyuPk+peWNNVHhBVxA9/AkKDwmhbgXKqyadNtmWvUqg2aLksP 9TXw== X-Gm-Message-State: AOAM533iGfZe/v+uw0Rcw02vd6MJz00BhEuy52bjkqFr+aP582S1Dyam uwmjsP4Ge0XdtY2CBDxWx1dwaErKl5Y= X-Google-Smtp-Source: ABdhPJzmDccHqNpYaa3oB/yf8nppNhIL7ZsbogUiZWQ6n1014C9V9SxP70yiMI6YODoCxlA5K13xpw== X-Received: by 2002:a05:600c:3486:b0:38e:98bf:ba15 with SMTP id a6-20020a05600c348600b0038e98bfba15mr6451557wmq.13.1649424215968; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:35 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:03 +0200 Message-Id: <20220408132305.3301350-23-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-timezone): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index be6477edbe..c1e30ba88f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6976,6 +6976,28 @@ (define-public ocaml4.07-core-kernel ;; MLton and sjs license:expat))))) +(define-public ocaml-timezone + (package + (name "ocaml-timezone") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/timezone") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zf075k94nk2wxnzpxia7pnm655damwp1b58xf2s9disia1ydxg7")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core-kernel ocaml-ppx-jane)) + (home-page "https://github.com/janestreet/timezone") + (synopsis "Time-zone handling") + (description + "Timezone handles parsing timezone data and create @code{Timezone.t} +that can later be used to manipulate time in core_kernel or core.") + (license license:expat))) + (define-public ocaml-markup (package (name "ocaml-markup") From patchwork Fri Apr 8 13:23:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38400 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 69EFE27BBEB; Fri, 8 Apr 2022 14:26:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2FDC627BBEA for ; Fri, 8 Apr 2022 14:26:28 +0100 (BST) Received: from localhost ([::1]:33140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncod9-0005eQ-BG for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002YF-AE for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoax-0001RY-8m for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoax-0007ug-5M for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 24/25] gnu: ocaml-jane-street-headers: Add variant. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423430226 (code B ref 53882); Fri, 08 Apr 2022 13:24:11 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:54 +0000 Received: from localhost ([127.0.0.1]:34284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaf-0007rL-In for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:53 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:52904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007nP-W2 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wm1-f43.google.com with SMTP id r7so5476975wmq.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+LBqQrDM10mf/YiI4srEGPqioPIgWsIzRYopBKpMZ8E=; b=nAzJtNWUlqUFmvYGHjOYElFhwzDZYlC/0Qni40GRq9AlfCmcjY0N4a+6fSWQGuFcYi T9PrxD5vLAzZWqm0WUnDJLH+zXMc7FCWDCrdgXuojrj3rIkf0iFohWJBx0CnF11eYVMC ve2NlQMjIM07xV2uryG/aTbL2sEp+ZffNcEvJiUbvT5KF+U5W2HXpUl5wSssDf9GH2/T 7MGEGL43OyLR6J49/b0p146udbQgo/lWZp0D0vx2GLjuhznHtQleHUNTShaRo8lCkF7N hdA/c8RbdTsTBo51N9o8h7oLJJpNo3NsumRA3oqKid4P2QP7Zo8Y7Ll204U8OisMeh3w bVwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+LBqQrDM10mf/YiI4srEGPqioPIgWsIzRYopBKpMZ8E=; b=FX5jlQacgkoYeAETYhpIKr/lPFPmngQHnuwBifJVNzUMCyalLqQv+kW6sGdLYje3Gn gSbGqPI3bb5z4BnleCNUj7S2Tpv/oSpahXWAsood1oHJliroHdqmbMbXGyrvtRqfWUQQ zsk9xGq3xSA+fKZZot1T4xqH3ByCEyIzU0JemLNmyQ6WSxT8xdi4SHWvrlAHP6YN/UAv 1Pozs15hbhdIO0hkeLYxehh7x+wlZbdnOa/TiCt/t9B6WBRjFSTG60nO/z2G9iujqV61 pEWFLbcVBmBi6jeyUC0LN1i42FXClkVX+P1uXFZ9SDsng4lxOM4o8+6Ff/W4QUHEpoGO 731w== X-Gm-Message-State: AOAM532V/4IyScxP7S22uL388jrABlyiko361t4wwyAz6ZFvVzm1VqTn F3v+sYEF0tfgBf769Qx1w69oy2noyRQ= X-Google-Smtp-Source: ABdhPJxbkY6m6GL8ocrSuqlI9mb8HVkOdTylx+ch/nWIsPx6gWiq8jYuf6y0wWpTvOwdrysLDMMBmQ== X-Received: by 2002:a05:600c:209:b0:38e:8c24:ebdd with SMTP id 9-20020a05600c020900b0038e8c24ebddmr8941046wmi.128.1649424216380; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:36 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:04 +0200 Message-Id: <20220408132305.3301350-24-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-jane-street-heaers)[properties]: Add ocaml4.07 variant. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c1e30ba88f..e3092e8434 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4476,6 +4476,7 @@ (define-public ocaml-jane-street-headers "028yxb4h3iy025iy89v8653m5brh7flrjshghs4x99pd690pmfs7")) (build-system dune-build-system) (arguments '(#:tests? #f)) ; no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-jane-street-headers)))) (home-page "https://github.com/janestreet/jane-street-headers") (synopsis "Jane Street C header files") (description "C header files shared between the various Jane Street From patchwork Fri Apr 8 13:23:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38406 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 B491527BBEB; Fri, 8 Apr 2022 14:27:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 02B5927BBE9 for ; Fri, 8 Apr 2022 14:27:10 +0100 (BST) Received: from localhost ([::1]:36028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodp-0007aH-6I for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002Y8-86 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoax-0001Ra-Lr for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoax-0007un-Ie for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 25/25] gnu: Add ocaml-core. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942423430233 (code B ref 53882); Fri, 08 Apr 2022 13:24:11 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:54 +0000 Received: from localhost ([127.0.0.1]:34286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaf-0007rS-TT for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:54 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:42780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaU-0007nZ-DL for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:43 -0400 Received: by mail-wr1-f54.google.com with SMTP id r13so12806899wrr.9 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=KJRHJl4aIXze9WRWly0L7qRoJRW3NY3ta635bwt1a4Qo6I/9d2u/2Z3FVga5CQesbQ wsSA1Z+waqxiH5deSaZA/d1rv3n5SZ5ArjYMjYO07vLdlZiFVuyD/BihyRXNHtXG+jdq tohbPwEFz2QlH1/hukI+uxU+xMbfgkQlSHc3TJmPO9czKmFgZqWXnN+bWp1s55a/H9cp t/k3iAgwtjkop8rt4spdLbgK064J7oY35iSvFc945T6QihPzvwSjL234SYzY+zE3hwY7 CHPF/Qq1D5nZ7ErnkoyVrIyJeOU7rMAM6+nodBwDHs8g6cUzMLHmLbGR4JhOBIsQc3h5 MU4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=bkeIwgoa2+nSsnLtqkBTKSAB/Gp5qowJSHrRRV98T4yGrztTC5P1gBOFZ1DQplqMna Bta/z9zI+Hl9X6DwrM9IRZPwkf7+CgK59H+t07TAQSQ0EHDnFTJxbv9gBZjwkDLmGy5q jATKnVlfJR/vGO4tf3XUgrEr7V7m9/o8+MpS3pU0pod31gW6MV03/IbJ1CYxfkXOPeE8 CXHhwyp02PWfPr2Ll+kiUFUwgF5q++Uv83jaOmSnSWWTP0QppDbrbFOojbN0vE3FOOkI M0IVDG9yosd8BuWmvUe0EnheuY+QyCqDUMDppJXWcZbG7BUUV7AKCXq8uxi7Hzk1ZZgc xZoQ== X-Gm-Message-State: AOAM533MEX1oygxEKuBrz6mP2nKQuuKwIqrqUe97HHzZKHg+1MkAEFYj SWudviMZL3kCGn4mrJBYiRSK/3aoU6Q= X-Google-Smtp-Source: ABdhPJw79UoTw0Ya1IXQfIedmthMH9+ZV/arDlbG0iamHCiXfdFrYsSpaZr3la3GuyPP3yMx0hxnCA== X-Received: by 2002:a5d:64a2:0:b0:207:8c2d:122b with SMTP id m2-20020a5d64a2000000b002078c2d122bmr5745087wrp.93.1649424216840; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:36 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:05 +0200 Message-Id: <20220408132305.3301350-25-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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 From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-core): New variable. (ocaml4.07-core): Inherit from it. --- gnu/packages/ocaml.scm | 79 ++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e3092e8434..2cfe94106d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6848,45 +6848,66 @@ (define-public ocaml4.07-spawn (propagated-inputs '()) (properties '())))) -(define-public ocaml4.07-core +(define-public ocaml-core (package - (name "ocaml4.07-core") - (version "0.11.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (name "ocaml-core") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1isrcl07nkmdm6akqsqs9z8s6zvva2lvg47kaagy7gsbyszrqb82")))) (build-system dune-build-system) (arguments `(#:package "core" - #:tests? #f; Require a cyclic dependency: core_extended - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #:tests? #f)); Require a cyclic dependency: core_extended (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) + (list ocaml-core-kernel + ocaml-jst-config + ocaml-ppx-jane + ocaml-sexplib + ocaml-timezone + ocaml-spawn)) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's standard library that was developed by Jane Street.") - ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; Also contains parts of OCaml, relicensed to expat, as permitted ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-core + (package-with-ocaml4.07 + (package + (inherit ocaml-core) + (version "0.11.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-core" version)) + (sha256 + (base32 + "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (propagated-inputs + (list ocaml-base + ocaml4.07-configurator + ocaml-core-kernel + ocaml-ppx-assert + ocaml-ppx-jane + ocaml-sexplib + ocaml-spawn + ocaml-stdio + ocaml-migrate-parsetree + ocaml-ppxlib)) + ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). + (license license:asl2.0)))) (define-public ocaml-core-kernel (package