From patchwork Tue Feb 8 20:14:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 175 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 1C71027BBEA; Tue, 8 Feb 2022 21:11:35 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 DA4CC27BBE9 for ; Tue, 8 Feb 2022 21:11:34 +0000 (GMT) Received: from localhost ([::1]:48390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXlt-0000uY-Vv for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:11:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0000Zi-5t for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuA-0007Vx-Ha for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuA-0002Zm-CA for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 01/24] import: opam: Accept tabulations. References: <20220208210815.7ae6484d@tachikoma.lepiller.eu> In-Reply-To: <20220208210815.7ae6484d@tachikoma.lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513049546 (code B ref 53882); Tue, 08 Feb 2022 20:16:02 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:04 +0000 Received: from localhost ([127.0.0.1]:48768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtB-0002TF-Hw for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:04 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWt8-0002Sz-V1 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:00 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id e4819911 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=xHQWhwH/XjDtMuuy04bcGXc+oVCE6+O7FS7Bc/kBOII=; b=Jwjq GxE6sn+bSgQ/7wMaByiz/A32OxbSc/H680tbOjEPAUD7phw9RYVuMMiaQ9W02QQU YrSGyMGR7PRxQSfu3VmJ+hep2v3kddSuqWw0UrQD99Zl6CvW811RV1fvNkIMCy+4 GAgoKiPCgHG+11Vsj15sLkcn6mphLz1yAOXPWLkTbM9UgUyHyRLFSaljs0bjf9zK wasDT7H1gCMHzRgLhibLQ6aY9lkP4TTqEZ99bDoWNN1Y9xP89MOgWYmoBZ0Lw4cJ d8cPmY5/rv7TMGnBjk7DvjTC4Z2W8CrQH4iltby3nCaQcb1s1jR8n/93ojTDKEkG qZG8zKO0mHmkOHEolQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e6c8db04 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:27 +0100 Message-Id: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> 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 * 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 Tue Feb 8 20:14:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 171 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 56B1E27BBEA; Tue, 8 Feb 2022 20:47:45 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 D2A8A27BBE9 for ; Tue, 8 Feb 2022 20:47:44 +0000 (GMT) Received: from localhost ([::1]:43210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXOp-0000kC-V0 for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:47:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0000ae-AH for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0007WQ-0B for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuA-0002Zz-Oi for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 02/24] import: opam: Factor out source import. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513059565 (code B ref 53882); Tue, 08 Feb 2022 20:16:02 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:05 +0000 Received: from localhost ([127.0.0.1]:48772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtE-0002Tv-QL for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:05 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtA-0002Sz-9i for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:01 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id dfa9c805 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=NW/BuvfwAu23TkC40qntIHC3E PDjCeTLtn4+PcWHNws=; b=kcbDyFRE1bAlwny4UJqbIX4fU5sF91XzTeCJycOD/ uwG6Tp6v5X3wldu+ct+2M2BTmWI40RlPSYeU0q6lYyZBwP1JYQ8XCAS4JkygOw/U r8tYdfuOLMCvsyYxqGitvwFlywNxFI0odlPnd/tZTsQyM7nJhBeZJpKiEjYZRNBC L1VmswkNcu2hkMJANKOwAvvA9p1t8DxG4y/QGVuFDKrWTz9vTGPWf4DtdG1WJo8O FKh1sKSHuCoMXzUILxdqGzw0PF+K7E8SFJViNzkiLauvSwxz4oyChyQWdwVqF4tt +MCx0a8EoQNTIhhw99h8rSsNgkqNzjlOBL6ipGhPNj5Sw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ab1367bd (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:28 +0100 Message-Id: <81d0041fc5805bbb9a23b4c9e1bc59f5be8d5351.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 Tue Feb 8 20:14:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 170 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 09A6027BBEA; Tue, 8 Feb 2022 20:46:46 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 BEA6A27BBE9 for ; Tue, 8 Feb 2022 20:46:45 +0000 (GMT) Received: from localhost ([::1]:42444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXNs-0000C9-T0 for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:46:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0000b3-Th for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54942) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0007Wu-Ju for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuB-0002aK-Gw for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 03/24] gnu: Add ocaml-spawn. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513129661 (code B ref 53882); Tue, 08 Feb 2022 20:16:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:12 +0000 Received: from localhost ([127.0.0.1]:48780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtH-0002Ud-01 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:11 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtB-0002Sz-CQ for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 96891bdd for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Vudsk9kTANNKyb7jyUwgRkanT UXpuRVpN0SeCoeBni4=; b=W9R9NDN0SoC9qRQfCwGjQ1Nk23cLSFf8TD8OmwM8A Bp1poYc7Mgay+3+BfdV2+4Uy1bP43h+a1A3YSDV7OyvIIIK3slWuFTVJKf3S6jbM i6oA1vHOPpMs2svu+cvy3TnPBIGQYggLc0WhGWeYEgjDgCSva81RqKkrR/3/aQpo rr6krlVUujyOjKSXaWvWkDirLNSnu6oNy0dK/Hor2HsuXnS8HtrIo7TZGhvH4bnt MzkV+71nx6QpIJ7tvCb23e0yzI/cFsIB4IG/LqzdA2kMUG4W2UHvOH+kSysBwRNi YvInWXefSaSqV5yguuBZnc+OBAMH/kko8tAj2JjPPIYoQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d4eb5e9c (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:29 +0100 Message-Id: <7cf7c54676b6caea71a2b9f6654f6ac32ecc3bcd.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 d0cfafbab4..ad2e5fc158 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6448,10 +6448,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 @@ -6460,22 +6460,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 @@ -6497,6 +6487,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 Tue Feb 8 20:14:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 176 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 B893F27BBEA; Tue, 8 Feb 2022 21:12:16 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 174C827BBE9 for ; Tue, 8 Feb 2022 21:12:16 +0000 (GMT) Received: from localhost ([::1]:49094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXmZ-0001Oz-4n for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:12:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0000ay-HJ for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuB-0007Wm-7q for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuB-0002aC-4q for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 04/24] gnu: Add ocaml-typerep. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513079590 (code B ref 53882); Tue, 08 Feb 2022 20:16:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:07 +0000 Received: from localhost ([127.0.0.1]:48777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtG-0002UW-K8 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:06 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtB-0002TE-W4 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f14801b6 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=g+16FiX4nVvlY8IfkYX8+xG1W wgaoJSZNlFWkYYokFA=; b=e1TsXQIMAvJkHpTLW01DahfOJWIMOljC/0bPvPwu3 PZm8rRUMi8WX+Q47LqPD0gGAjBSs877yCm1si+s3Q4jQSPPbYYugqiMwcnt+690t twYFMKftngiNrm1i+5zHPCP7hxv38BjiEjF1Fr0+Izt3H/UNPN8wFIIE9oW4D/Pw zApw6oWgJm5FLCv3HEnzcjI/TAhgPBVstdtOxPlBw9/Zp4bXwMo4fvm83WsCM9hC nfwYMZr5llq21fLKm8WcecFJ0Wc9b5zXdt7pjhZgUcHxK81cgFxhbmEZImt3EVI7 XEWH5mzbDmaa/aBk3dIp3MOnbxcvnyM3kKnoV8qxrPmkg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5a5c40e3 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:30 +0100 Message-Id: <9b8b11fe1c21aa453a62a6f6b010349387bac11e.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 ad2e5fc158..d88fea9804 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5788,29 +5788,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 Tue Feb 8 20:14:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 177 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 B4F4627BBEB; Tue, 8 Feb 2022 21:12:25 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 55D0427BBE9 for ; Tue, 8 Feb 2022 21:12:25 +0000 (GMT) Received: from localhost ([::1]:49946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXmi-0001za-Ez for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:12:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuC-0000bS-AN for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuC-0007X8-05 for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuB-0002aR-TI for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 05/24] gnu: Add ocaml-ppx-typerep-conv. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513139693 (code B ref 53882); Tue, 08 Feb 2022 20:16:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:13 +0000 Received: from localhost ([127.0.0.1]:48795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtL-0002Vm-Rw for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:13 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtF-0002TE-Hx for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2bcd2082 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=/vkQNMl+U/GZUd+gNjb40lCd1 ARn8ua0AEkU07BseT8=; b=hH/tWAw3Dk1baxWSYff5D7CvzHxNR61mjviGc56iC y19Puw4Hgdk8wS1Qr4qf/fF5a5V4oKROlxkvgT0TaZGbPyVRlcFnlczec8Apu5Fs RgmJKJa7ixHai6IFy+gMo3u85WsnEvaf9upTjshX5xwguzIRr28jimzpC1Ir14uC ibxESUTV6kVFJkETIhhSiaRAKCHrI8JKhhT0cD9fDse1evWysa8uSMuqDklYgLrv faIyHwAWVBnUMB+0a1FItx4iPKN1FJBrnynMy9taRqL16zaz1nMOse7b1rzttF1L lfEWmh69efv4AT/ZMv/MYte+YqWdQ+zKhdCegs+SGRyBA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 74492867 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:56 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:31 +0100 Message-Id: <811562283fa707e56679de1da9e6d8c7e941f76b.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-typerep-conv): New variable. (ocaml4.07-ppx-typerep-conv): Inherit from it. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d88fea9804..43b26b32da 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6205,37 +6205,46 @@ (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 url-fetch) + (uri "https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz") + (sha256 + (base32 "1g1sb3prscpa7jwnk08f50idcgyiiv0b9amkl0kymj5cghkdqw0n")))) (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 Tue Feb 8 20:14:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 178 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 9C5A127BBEA; Tue, 8 Feb 2022 21:12:34 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 5E60827BBE9 for ; Tue, 8 Feb 2022 21:12:34 +0000 (GMT) Received: from localhost ([::1]:50788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXmr-0002Z6-Fo for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:12:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuC-0000by-MQ for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54944) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuC-0007XR-CI for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuC-0002aY-9F for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 06/24] gnu: Add ocaml-ppx-string. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513169713 (code B ref 53882); Tue, 08 Feb 2022 20:16:04 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:16 +0000 Received: from localhost ([127.0.0.1]:48800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtQ-0002Wa-2m for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:16 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtF-0002Sz-N0 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ede43b40 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=DJqm5KRg7xLwzuGm9PqWPtMRF RCzmEYHmFtav8XaH+0=; b=CRqWDwg60pU/KNP0Qph8pcB2wuD3GikYeUCkDMOeQ 6B/eOOvq9IOwTPjQnjJjqF+iKdJNA41Yx0KwDSv/J/jE6oeeqggD37LbeUK2ZNQi cAgJGdUs6LisyvUnye6Ye6goiZjah6VAvOYK854eIfdPJjv1BGJjiylRphIYjWa+ QvLRgqFKitdJPcL0ANJMHtGvrAy5P18XjO7Ejd2zUnglru27P5pD6xje4egM8a/v tS6SYN4aAVvN7Lz/zniVZ/5zt0ylzvrBr3r9d5lk0vKYDmAGD4ujxU/YBlAiN8y/ fnK12mFKYPRWw1dRddEwLqub0lPJUOR8CqYUIFQ3d3ZtA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 565b38f9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:32 +0100 Message-Id: <141aa5b5e6c7e31afd43eb087bd856fc52c3b379.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 43b26b32da..44db4c0b12 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6246,6 +6246,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 Tue Feb 8 20:14:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 165 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 2E83827BBE9; Tue, 8 Feb 2022 20:17:06 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 BC54827BBEA for ; Tue, 8 Feb 2022 20:17:05 +0000 (GMT) Received: from localhost ([::1]:39054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWvA-0001JH-Uf for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:17:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuD-0000cK-1J for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuC-0007Xb-Nw for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuC-0002ah-Kt for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 07/24] gnu: Add ocaml-ppx-stable. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513169721 (code B ref 53882); Tue, 08 Feb 2022 20:16:04 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:16 +0000 Received: from localhost ([127.0.0.1]:48802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtQ-0002Wc-Cm for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:16 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtG-0002TE-9A for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 6f3480a8 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=PESF3jc3d7uOTscsu98kcF7L5 cELxoZVq+7oJerQEqk=; b=giFIc3OlhWL5LQX2fADpKiYZE/hppyozi7zPqBnZQ s1pMrizeGAO9PTPukq4QRummMwJ5Wzjk4cFGJijO6+YKb+VYOWcscpDJOaQnsjBq /cIPs1ZxYtd7WJM+PQxuaOURH2ivUl9BACdC9bfWoFc/nKSh/yWT0dCgfI9rbb/x gezKyIa+fnDCIv+UxhzsH5fHYCbKGz8taCesxsnjfYdQRKNirRVsMWHwhUnmau4r nOViLsDEAQbalYHV84RTqy+bkfVCOs61Fy2+vHzfOtL3w4ZJUJCThrcluTaf6Qkm PKFVIBdH/P6IlH3pgI24HX3bz6FMyIrBalCRfeQcXIZJA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id bd5ad6fd (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:33 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-stable): 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 44db4c0b12..1c87a35886 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6269,6 +6269,31 @@ (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 + "ppx_stable 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 Tue Feb 8 20:14:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 179 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 5708627BBEA; Tue, 8 Feb 2022 21:13:02 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 1796A27BBE9 for ; Tue, 8 Feb 2022 21:13:02 +0000 (GMT) Received: from localhost ([::1]:51618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXnJ-00037V-4w for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:13:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuD-0000cL-EK for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54946) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuD-0007Xk-4n for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuD-0002ao-0A for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 08/24] gnu: Add ocmal-ppx-pipebang. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513179728 (code B ref 53882); Tue, 08 Feb 2022 20:16:04 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:17 +0000 Received: from localhost ([127.0.0.1]:48804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtQ-0002Wk-LY for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:17 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtG-0002Sz-Ly for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ca7b69f6 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=WI+YEDXa29K9NtxiJ2eWyLyDN XrgLUNNg4xy+YdKGQE=; b=G0Are6Anw/ewJshuT2LHBFDLJ2XpKNxjNXMb4QEdk Fe+tzCmsAav5Uz9WQqX/VKCPMIJQ76ARpCxKTP6nkBrevTw64GXxrjXPJjHI7i5e l7Yj5JzMLwCDJmqbP48/aeNrKeeG0DAj9yK8yHTi12xEkdXanR5ydYv8zau/siaj J4AQg1JGfzYUF+u0Pc6UQeCL1hNaujb8ojsRNBhrBWyEY97mPhxrVG5bpCzF+LE5 HV74/AyzEyX3YHzJmZeptVm6ywwpecG9e6A0UC5qTVPpdvs/22GtycUz7ZqERVU0 YpJusDRfcwKhC6HBMyc9ssKUrT9JnL3bxt04wQ5n1pmkg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 40348c72 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:34 +0100 Message-Id: <3ee64b46a6035d96b8401a278ec31a482c935595.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 1c87a35886..c2ee95a263 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5890,35 +5890,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 Tue Feb 8 20:14:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 180 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 77D1227BBEA; Tue, 8 Feb 2022 21:13:17 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 4350C27BBE9 for ; Tue, 8 Feb 2022 21:13:17 +0000 (GMT) Received: from localhost ([::1]:52396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXnY-0003g5-Bd for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:13:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0000dL-8Q for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuD-0007Y6-Tl for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuD-0002b3-Pw for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 09/24] gnu: Add ocaml-ppx-module-timer. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513179743 (code B ref 53882); Tue, 08 Feb 2022 20:16:05 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:17 +0000 Received: from localhost ([127.0.0.1]:48808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtR-0002Wy-Ct for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:17 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtG-0002TE-WC for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:08 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 620e71f3 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=NJb1dqdsc19DxYqHQFcnGEHK5 bw9K5bSjWSUFAjX58Q=; b=M0zS5TAt+Jw2HYYJ/apIPWC0G5v7qf0Mny//Zh2Iz CtLsLtGSqcf1ZKU7lZY/Chk9GtQ0SkiEGoSJYRO7lNYVpwJHNrlAdOfbIQDWbr7c mx8i/lT8fREVg/l0UfAc0AuNTJh2XTyqpoIFkOzJ4v1/Vk1cVdss7WluhgXfryIV iMrJKSMe0yCz2eht9fmBD1GebuexEdV5WP3KLU6lWpaMnCUD0RLODz/BelaIjOva 6yc3C7kFe3U8avrQDHTdak0ZruMqGU3p5TOElMIwA+SYvNVU03fe4mD6ajFqcnMG CyjPaiOIkDe/OelBpgOMdqR0saGZQ5xacV1wbPWlfX2uQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id badbcad4 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:35 +0100 Message-Id: <78b2d7e4ea74487d224db536b2dc8862683fb8ac.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 c2ee95a263..b638f59544 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5931,6 +5931,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 Tue Feb 8 20:14:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 167 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 3505127BBEA; Tue, 8 Feb 2022 20:17:41 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 08A1327BBE9 for ; Tue, 8 Feb 2022 20:17:41 +0000 (GMT) Received: from localhost ([::1]:39912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWvk-0001tk-62 for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:17:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuD-0000cP-Qz for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuD-0007Xv-HY for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuD-0002av-Dr for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 10/24] gnu: Add ocaml-ppx-fixed-literal. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513179735 (code B ref 53882); Tue, 08 Feb 2022 20:16:05 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:17 +0000 Received: from localhost ([127.0.0.1]:48806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtR-0002Wr-29 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:17 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtG-0002UV-WE for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2964b3cd for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=qDvRTfDwHSysJAUskFnKZEEv2 t8CQbfrnDLQM/nCzSI=; b=juu7kRKiDp0cl2h7BshWqr5i43HSKlPVGtFi8C3CX DKKiR/rwkB1XH1UST/aJr2LN1ZzaXhbpTP4ePt+8UcIg9wI1UR3yuClNyv0Uz/NG NFNcNnsCeYOwN6pe6aQAfniheTCDZ0huyHNUQgbojumWMyhlFmU8MtH9AB2YMfs1 ASqYMmUThkvuBgj1aWIMVjZw6fxG6S9HwKXE0sCjoJ96eH7SSizmud1i5vfFTVRG McbJFq3XAjdBG8K7S2iSEEaRyINf9xRUz/G5Bl4wlECOf/1I0RgWwkIakf78nZd7 QcHcRCgZu6U6ESGpQddAlYo0o+aftoQhuRHG/NlcWTD4A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 22d9100a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:36 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 b638f59544..b1d9b73b90 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5956,6 +5956,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 Tue Feb 8 20:14:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 181 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 4C56327BBEC; Tue, 8 Feb 2022 21:13:29 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 65B1427BBE9 for ; Tue, 8 Feb 2022 21:13:28 +0000 (GMT) Received: from localhost ([::1]:53278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXnj-0004G8-Gs for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:13:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0000dV-If for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0007YO-94 for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuE-0002bA-5Y for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 11/24] gnu: Add ocaml-bin-prot. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513189750 (code B ref 53882); Tue, 08 Feb 2022 20:16:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:18 +0000 Received: from localhost ([127.0.0.1]:48810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtR-0002X6-MI for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:18 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtH-0002Sz-PI for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:08 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 943161f6 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=qoiiuPhzL1z+V04L/6Ej6PnJm kdAiI5HakU9FU6/O/E=; b=bA9m/l9gEygQjGso5VAvbL0HstYfMtvqI6jxBLCdB 6Wab4qE1YaFFC9l2Lq0I6O18Kk7JqPyhhN2Rt5PbniFNBHsroE729CHLtxBinwUS BfpPW1XzibGskzu7v7sRkA8TdUUZT10hv+Vo3kr+gWv/uPVeYJZ9LNl2cfhO1QMK 8RFRXj/dOBE6RAk6mAy9l1l743RrJQEnj1SG3lHXdzluYe0f77f9IOSP7W/prrfL cDSjNfyTqM4TyrBe+RZbYHadN9NB4bB0S4EdcP8vQX/iN4b9M+/IgnKg0NoZoQCq uZXE1/JxC+4xhvaAE6nhNGTLV+xaZdaM8sbTWTAgWPENA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 82a84870 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:37 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 b1d9b73b90..cc2b05266a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5582,33 +5582,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 @@ -5617,9 +5614,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 Tue Feb 8 20:14:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 182 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 13B9B27BBEA; Tue, 8 Feb 2022 21:13:42 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 CA38E27BBE9 for ; Tue, 8 Feb 2022 21:13:41 +0000 (GMT) Received: from localhost ([::1]:54150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXnw-0004sY-WB for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:13:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0000dW-Uk for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0007YV-LI for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuE-0002bH-IK for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 12/24] gnu: Add ocaml-ppx-bin-prot. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513189757 (code B ref 53882); Tue, 08 Feb 2022 20:16:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:18 +0000 Received: from localhost ([127.0.0.1]:48812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtS-0002XD-4H for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:18 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtI-0002UV-7K for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:08 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a54fc547 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=lDAyUkxGrbYOQqySma1JhTB2w gVg3R8me01rZX1oUuo=; b=XRob1iInjg1dscptznWLvjZ3DV73bTBeU8FIqwx9L 3EZ3+QVnl0zIxVdHKdXV2E5TYfpVcIt0TPbartlOBeQQbxNq8u/pDllJ4PSmnEG9 3mssDaRJuCAvQdbNIaeP3W7xiBepPkTXu89lDi5W7eoxVRcIR+mt7cD5GBNjQqUS JCiZ3VZvoJrdv8EJYKI76D1cHRRsKG4iWC1rrp1eWu+Hl7Fe69ff1ZqlrcyKtDt3 81p8gHDp8Uu7BHHlxj3Qg7s46sW0QUCBuTjtzoeRq9/+Oa77tNINWD2U918AqCvp EPNhfD6maPKuAZHGqSCGHVS+z0PBmajGZohI/QGFy6F8g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 24d59b42 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:38 +0100 Message-Id: <39cb1fe9d5b089a9bfad82f1ce032b0064f84ee3.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 cc2b05266a..1fa229486d 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 Tue Feb 8 20:14:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 168 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 F36F527BBEA; Tue, 8 Feb 2022 20:18:31 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 B46E927BBE9 for ; Tue, 8 Feb 2022 20:18:31 +0000 (GMT) Received: from localhost ([::1]:40734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWwY-0002Uw-OP for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:18:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0000de-By for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0007Yd-2U for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuE-0002bP-VC for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 13/24] gnu: Add ocaml-ppx-bench. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513199765 (code B ref 53882); Tue, 08 Feb 2022 20:16:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:19 +0000 Received: from localhost ([127.0.0.1]:48814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtS-0002XK-Gq for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:18 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtI-0002TE-9S for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:09 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 651d433e for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=uylSKvMcDtWnUUQyF81J8ShBf EeZfbGguqRqI1xCHYg=; b=LAckuTFtnGRri8psKWNyakXIIA8rNELIWSpx0ognL tSTlkYW0oiMl0O46WtSBmqCxqI3vyfhG0n6GxmMc5yB0N2G6bU8GXCOIy8MX/j0Z aaAp99REUN7CU65SylE19pWeXF3d/nwjCOl5kG88eyCSb4EJywGvyA+qkzNH9ivv EarnATilDBcrM8EoVHE59Pvxri3MCuZqxNBKfnuOjjlJdhwEV7pYxH0uW/9gKlAK +YNjMzxAibzyHPE+FFYPMHE7mSRzS+bTRugYCj/RbFDEzgZSV2d+kcGr8fFD9w64 nGbO753BgTChaxM8EhJ5eO3fkr2Uo129vvhWShCZ/+Mew== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a3b65d1e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:39 +0100 Message-Id: <3a01e4d0f5ea613832347e709e4c02aad7e44476.1644350657.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 1fa229486d..8f8b4ca32f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5746,35 +5746,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 Tue Feb 8 20:14:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 183 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 093BB27BBEA; Tue, 8 Feb 2022 21:14:46 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 B8B6C27BBE9 for ; Tue, 8 Feb 2022 21:14:45 +0000 (GMT) Received: from localhost ([::1]:54940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXoy-0005Oj-Sk for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:14:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0000df-Ow for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0007Yj-G4 for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuF-0002bW-CH for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 14/24] gnu: Add ocaml-ppx-sexp-value. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513199774 (code B ref 53882); Tue, 08 Feb 2022 20:16:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:19 +0000 Received: from localhost ([127.0.0.1]:48816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtS-0002XS-Un for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:19 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtJ-0002Sz-8F for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:09 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 6cb6554e for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=+bBn6iNxgJ/hkTFPdq8Y5Qmrj tYwqy9t2md7UMby340=; b=DXVFxeDUUzAN17JRBzcHNh5PJwzjM6Z9/sSVL2K4r XBfuKvM6iXn92Y2iSTMjetBwFQ0vwAraSsHAS7MqM98ND0GDtmi8osHV+gfxZFSK OpjR4JdkLo6NW+yY329KonzwbDR96YSFnxjjbZ1iZE7V6BZHgvGj5aervsTho68I xoP0QJzRD41x3dKehkWckhzTANN39cxVQ/RH4WfbZNbur6JAJDdZnhfKh4cSKKsZ Xcrsg9X8govfZDftim7bFkPyFL79AVPFfKZ1Kg6F/8LpP7ei72VVUsG5Qg8I098Z tHT8iL3+/7Nlnbj+XfDQnlR3DLuCpHSKHV+EsKtA/pn5Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 657fec0e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:40 +0100 Message-Id: <48e71696a6d1549da42ee156e746867741c8ffa6.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 8f8b4ca32f..bb29f3334d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5858,36 +5858,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 Tue Feb 8 20:14:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 164 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 8603927BBEA; Tue, 8 Feb 2022 20:16:48 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 43DD127BBE9 for ; Tue, 8 Feb 2022 20:16:48 +0000 (GMT) Received: from localhost ([::1]:38728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWut-00012p-CZ for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:16:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuG-0000em-Pa for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54953) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0007Yp-Uc for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuF-0002be-Qi for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 15/24] gnu: Add ocaml-ppx-sexp-message. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513209782 (code B ref 53882); Tue, 08 Feb 2022 20:16:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:20 +0000 Received: from localhost ([127.0.0.1]:48818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtT-0002Xb-E5 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:19 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtJ-0002UV-94 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:09 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a8d8844e for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=/wQHx8ghcw/tovK4wI3YL6sn9 cZif8aw6LkHlyxaXnk=; b=XeQCNeRTzL0THqvxaVdZ1ZuejFNRmlUL/NgUKihN0 OjczbK6bRRR6j/JMoUKDlu9sfPSCIVxKUzC9/ZkZN4Hgazzig/C+ZiaIGGbO/ISa xsD7VjGO1VB/BiWTT7YzWiLIofpT45CtrpgMo5fSSkGZ43A3lpkeF+Z8GSLgiyXe 8ofMTW3skcAomSIpIR5xRXAu3JlrW+mqM4lHvbRQd88geBngdcDADznO+cIXYltm qXtFJu5DAp6gadxAZ/9YKe3E7aOa7DpcJGBqdcYDNqTHlez1yVaF0oKZwzdwE4YH w/C1Pz6nYb7uYo3v9Xfp/+eVKjo+rz6S1fwN2E7Rgeh3w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6a26ee82 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:41 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 bb29f3334d..7888f21cd8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5904,38 +5904,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 Tue Feb 8 20:14:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 172 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 76B0927BBEA; Tue, 8 Feb 2022 20:47:58 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 E42A427BBE9 for ; Tue, 8 Feb 2022 20:47:57 +0000 (GMT) Received: from localhost ([::1]:43966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXP3-0001Iz-3S for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:47:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuG-0000en-Pa for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuG-0007Yr-Aj for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuG-0002bm-6X for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 16/24] gnu: Add ocaml-splittable-random. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513209789 (code B ref 53882); Tue, 08 Feb 2022 20:16:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:20 +0000 Received: from localhost ([127.0.0.1]:48820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtT-0002Xj-ST for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:20 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtJ-0002TE-E0 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:10 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fce946fa for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=1RbNj7aSe5gg9kCv4XNsG6Zgl IGLse0D9PNCyKNgt4c=; b=g7p16q8EIzWdQJb3+PETUQ1WiICjCr45ZCnvzbGEv cOfZUrLEDA3NZ9lxK44LprGmucGckWmXhmo3y3VktCySDiwbhUiTJR9HR1vL7rra FUSmJgCsuobJg8ms2hdAtjsCfYJKqPJ5CWEoAg9Wc55J99pZ6Ob8fevONlNA+ztT lPX5RGJTbyiuUui0H3qM0tTh4glUsroS3s2DwFIp6LTWX2PXiAbm54Ix/PB6pQ76 nBB4+eFIDYIUQ6nDOOOIYs6fFuQ7DcrPz67g5jZkosonck4xiC6xB+AEFwFGqegK B3v46Rw/OnzeUgVSrw8yLSoQO2b3PSkDhG/FsQ0dHIeIw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id badd3723 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:42 +0100 Message-Id: <7a0f1d4d46a0fe84b016fd108bd5b160eaf8ebc8.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 7888f21cd8..901f54c864 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 Tue Feb 8 20:14:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 185 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 2929F27BBEA; Tue, 8 Feb 2022 21:16:48 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 C27E527BBE9 for ; Tue, 8 Feb 2022 21:16:47 +0000 (GMT) Received: from localhost ([::1]:55998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXqw-0006D3-Nk for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:16:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0000ep-07 for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuG-0007ZB-Mr for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuG-0002bt-Jr for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 17/24] gnu: Add ocaml-base-quickcheck. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513209796 (code B ref 53882); Tue, 08 Feb 2022 20:16:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:20 +0000 Received: from localhost ([127.0.0.1]:48822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtU-0002Xq-7Y for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:20 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtK-0002Sz-7G for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:11 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id e5a8e8d3 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=qg8kBTrD9iWexfuyV+cKC6HHH RwjZ33JD3khmRP0OZc=; b=U7bGwQBdZZgNHZ+rOTB3OboXLHo+WoimF41+/dAO9 XeGfBWr9H+pkboZcMW1DKdyQKYrcLEv7Qzt8MrWOc3kgWZylPjVQ57OfkqVJMFa4 8+e7p2p5LhcuGJjNA16++SkESO/4oI1OjeOCfaBJzNLP9igmOVmD46+3sISww2xm KCHH0QKqUuaFjnjbMNdAHAs1tUM0UJIV9bMrYbqTTyW6Iu96/EUoP9B2re3JiPBr 0hWub93HIH3/thVqjQo36vA+SdflCuq2MTBjm3cOlT5Q3HMnxL0QkskKnEnyomLd SblQXRqYAmqQXgdSHh7BFFlZAahjBkDhbq+RLjPN66F1w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ed0bdcbc (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:43 +0100 Message-Id: <59d494d0fe94a539d032e2a9fbadff07d96e6aec.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 901f54c864..d969e69384 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 Tue Feb 8 20:14:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 184 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 C28FA27BBEA; Tue, 8 Feb 2022 21:14:59 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 818AF27BBE9 for ; Tue, 8 Feb 2022 21:14:59 +0000 (GMT) Received: from localhost ([::1]:55564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXpC-0005tS-Nu for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:14:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0000er-EC for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0007ZH-4A for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuH-0002c0-0e for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 18/24] gnu: Add ocaml-ppx-fail. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513219804 (code B ref 53882); Tue, 08 Feb 2022 20:16:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:21 +0000 Received: from localhost ([127.0.0.1]:48824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtU-0002Xx-H6 for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:20 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtK-0002UV-87 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:11 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 20789254 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=TMQtXFZpBSK1WSba+CUd6zE6M U0IbfYPdCKESGaufqY=; b=DqMtK3NTxyor6DI38sOlQAE1FeGDxAmDgHcRz6RTJ eAJgs9piaSxkMe/WY4ByXZDpNVPmr5MsGWPUx1z83H9OS2aeyD/CV8HR/1EWHpq/ 6mwHsbm8e60XaX/gg8OXEpCYSGO9xL/qgO0RontgR3xLYGz4lheSpQAuTtmtbvnX tpLRirePzkNc42d4rUbGZ3wmEm6eAdHmArnvTf8+LNfLwkdYLnGM+jLkLClpupFG bP8RRkTGQcQp0MlrhQVe5l64Fmwwv69i2UPuQp+nYmwc14KHm02EOPtjFKgSLpe6 lSn2fPDCHeMQQFh6kPRHgia8T0LJcOeOlgoyfriXS07aQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0504fc60 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:44 +0100 Message-Id: <88f1724d45da07d7314aa3d7f3e0f4811b81d52a.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 d969e69384..ec05987e2c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6141,35 +6141,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 Tue Feb 8 20:14:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 166 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 C35B027BBEA; Tue, 8 Feb 2022 20:17:29 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 3DCE727BBE9 for ; Tue, 8 Feb 2022 20:17:29 +0000 (GMT) Received: from localhost ([::1]:39614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWvU-0001iB-4H for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:17:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0000et-QM for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0007ZN-GO for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuH-0002c7-DI for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 19/24] gnu: Add ocmal-ppx-jane. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513219811 (code B ref 53882); Tue, 08 Feb 2022 20:16:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:21 +0000 Received: from localhost ([127.0.0.1]:48826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtU-0002Y4-TV for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:21 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtK-0002TE-Tj for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:11 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4d19649b for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=JeyvD+br8Qcpbtidvf88e6qlG Ir+6KQ7mOnTTXekcHs=; b=GE6k6byYuMDqE71beZkKFEb6cgubpvRFQ9tsfTYQR 7GlKbO0CjVBJZvPQzY8X5EDPBFrZeh58MzojCW8MXjetROk04ogYwGc52NAwM/vZ bYXMCN7IyfA4ZY4b/VpL5AchxeanNMkhyWB4ObO6JriX3mKozuUAdGIFJfrg7cGU nMSzXgBBRQS1QD6iwCVYQ7yPqMoDUyWsMhiew8cXdNq44sFnDS93rTpq4UbpfBTT dTWhQq9c6SviBw6aTC+HqyVs7prhp3S9QUHH6TXrSY+u9D/6unvaMqfnLZYkyoIj G7K5Ow4BW+/MgNTTUR37BJiia4ZSuQagtUA8YFMOOfpdw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 13958be0 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:45 +0100 Message-Id: <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-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 ec05987e2c..259b6551f2 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 Tue Feb 8 20:14:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 169 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 D52CE27BBEA; Tue, 8 Feb 2022 20:18:50 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 A778F27BBE9 for ; Tue, 8 Feb 2022 20:18:50 +0000 (GMT) Received: from localhost ([::1]:41408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWwr-00031E-Pl for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:18:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuI-0000gC-FO for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuH-0007ZS-Uu for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuH-0002cE-R2 for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 20/24] gnu: Add ocaml-base-bigstring. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513219818 (code B ref 53882); Tue, 08 Feb 2022 20:16:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:21 +0000 Received: from localhost ([127.0.0.1]:48828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtV-0002YC-Cm for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:21 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtL-0002UV-AN for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:12 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id d4baacb8 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=PypWP6DsXupQp3wamzzv6BUxY hR5X0+rFUSOgxnz8l4=; b=Bp6RTxPm7t7pmFIK0L49j7QfSGBj8/YiPefMl9cAY A513u6pw35y6XKcnF2QtMC8fRgilawgt75aIp5sKtScJDHC4myyj31jsYi7NtX7P bqyD371mSx+K4zJJQYbJvds2S37RVq/xDzDEZfqFXktYWY5udqS9To/OJfKpKzr2 bRTs1YPB56nUGzzoBr4w9zWlvNy5CywfkpchGbyb2l7kaXrhb/EtiT2ogCofQGbP xGQp6flu6Y+iGmkr8sPVHpI+ZC9ZLgyqXBlBiJ02/ibqXcLWMU82NlGhB5HyPE2N hoeaXLVL2SJ/w3JuET2wFlebmn2LaGrcotBhkDdSpQ1/A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3282a5d5 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:59 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:46 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 259b6551f2..6493613bfa 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 + " 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 Tue Feb 8 20:14:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 186 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 A50D127BBEA; Tue, 8 Feb 2022 21:17:35 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 2197D27BBE9 for ; Tue, 8 Feb 2022 21:17:35 +0000 (GMT) Received: from localhost ([::1]:56640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXri-0006rb-1Y for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:17:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuI-0000gD-Lq for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuI-0007Zc-Bo for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuI-0002cL-8d for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 21/24] gnu: Add ocaml-core-kernel. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513229826 (code B ref 53882); Tue, 08 Feb 2022 20:16:10 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:22 +0000 Received: from localhost ([127.0.0.1]:48830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtV-0002YJ-Kk for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:22 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtL-0002Sz-AR for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:12 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id d69d7cf1 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=mFbYOlxPD0Zfa3vNfE7yTZhZG O6jO2s+JtdPnWTOQHk=; b=nCZJJs0NH5cUjBxY9fqVrjQrtkuAuiyoXO1YfPE4J 3fxuThbX8+rxwyAuloeUxiEEf6U768ugawN+1QrNhXQWNwPyVRnU3t1NCGi4LHc3 Zo4ik0/i7hmZrqyQ/Xo6Xivi7LIPVhgpZqMXsU8qsgw7yxTtzdRE7zu5XHl7/oRu 0C0DA0X7qHWSWkGJEsggon5DE4Pp/9TYP4DWGOowtAJpLoSx5oaRZ20lRaxZFuon +giXi87vGPOmoZ+Nt37OKTQ61JSSJTTAfxT5ckkDALTEzS5l7XgOzikV/ZzUDK4Z jwwnn7+QkXTNiKKmFv4Qc1E6gLw12JW6vmQACD7GwszuA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0b6d5751 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:59 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:47 +0100 Message-Id: <84b05a81d6e195a11a234750e8f26a2711c0cbef.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 6493613bfa..040c91e440 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 Tue Feb 8 20:14:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 173 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 5D07527BBEA; Tue, 8 Feb 2022 20:48:31 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 28FC227BBE9 for ; Tue, 8 Feb 2022 20:48:31 +0000 (GMT) Received: from localhost ([::1]:44780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXPa-0001pe-6j for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:48:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuJ-0000gF-0y for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuI-0007Zi-OI for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuI-0002cS-Ko for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 22/24] gnu: Add ocaml-timezone. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513229833 (code B ref 53882); Tue, 08 Feb 2022 20:16:10 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:22 +0000 Received: from localhost ([127.0.0.1]:48832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtW-0002YR-3I for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:22 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtM-0002TE-7n for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:12 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b56f0a1a for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=8JHyaPzzPbC6ILcoE5NHBe66x OB9pcKnijMJBXrOEBU=; b=kgd8WhC1ZPVC6eoNAAwgMg6o7ObhhxyhsTIF0PkWO iPTdJHiVmJZNfZQhbpuSnQA5TrRbA0dsn4FwmYmW1Fe76NRgbXhqpPgvAxTHdDnM dnn/tHclFG6GT8BPRwpZnta+6Py1mh5dU+IDCGcbsNNxShunDedyCpDMFlgFn/Qh AB3Z22z4iNN6Gzq2vwSWRxQjVUnk5xnWqaL6I55lF2196RcwQRkr1mkI4VoThTMG Wm09Go8cXpfZ4h+R+1/L0vBYKj1keVHlvxYkf7sjjpNzXpvNo3XArKWsW6GxFTC1 TAPKJN4aAm/gOpmZymJiFoZHum8SCzSSCFCjE9Ur66Q3Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 09adbd14 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:59 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:48 +0100 Message-Id: <314b9e476c3040de08a665dbc61146f9c1fd0d96.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 040c91e440..f9fc02474a 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 Tue Feb 8 20:14:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 174 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 EFF1427BBEA; Tue, 8 Feb 2022 20:48:49 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 C8AD627BBE9 for ; Tue, 8 Feb 2022 20:48:49 +0000 (GMT) Received: from localhost ([::1]:45504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXPs-0002Lg-VM for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:48:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuJ-0000gG-Dz for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuJ-0007Zn-4T for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuJ-0002ca-0z for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 23/24] gnu: ocaml-jane-street-headers: Add variant. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513229840 (code B ref 53882); Tue, 08 Feb 2022 20:16:10 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:22 +0000 Received: from localhost ([127.0.0.1]:48834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtW-0002YY-CL for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:22 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtM-0002UV-Cj for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:13 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 93785a2e for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=bF0A2hDqgWq8OtgL+oCgHSpcY T6tVX88GmOl4XB5ygw=; b=SB4QnpT3R4MweptADQH8/qdDBBPfyaAui+yR3Biem 3OfxYtja2EzQEc3oerIzYWEgPkRNaW/0c4MzG7k3fv91dJb/B1wgcWmisiveUdj0 zQ+6B1bWx+DhoPgpebl6MngK7CHuUqheLjKuoWvcD5AdvBnPpdrPbqS/Dx1w/aNE M9eRbM5fdc5YOBE0ZkRwfCC4ThOdKWaiDWL/7qj/DUGGYdb2bO6vGiYt1Kr9fSYJ BplE/us6QVGN1W7nFInTnVgVkcCz053t3Esin0JXd3Nutamg7uqrmttLu13LsPbX n16TxMnF0hcIn/t0GmkhOJ8dONxe9/9worTCvL/dEcZtQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b365d71b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:59 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:49 +0100 Message-Id: <9943824f0b6543d8ab9caa71a19ff54972a985d7.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-jane-street-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 f9fc02474a..b01b598f5f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4468,6 +4468,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 Tue Feb 8 20:14:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 187 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 1E16927BBEA; Tue, 8 Feb 2022 21:17:46 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 9C69C27BBE9 for ; Tue, 8 Feb 2022 21:17:45 +0000 (GMT) Received: from localhost ([::1]:57174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXrs-0007Gn-Pn for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 16:17:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuK-0000gK-7e for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuJ-0007Zs-Gf for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuJ-0002ch-DG for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 24/24] gnu: Add ocaml-core. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513239847 (code B ref 53882); Tue, 08 Feb 2022 20:16:11 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:23 +0000 Received: from localhost ([127.0.0.1]:48836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtW-0002Yf-LY for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:23 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtM-0002Sz-Vt for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:13 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fb5f5739 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=pCIPMHT9oP7Y5S0GuoBF6kS2j jYo/wUnZ2WZ2pN5lOI=; b=PdwxCv9PKcoM91EapNFUNsp5tFGF2u7CRXGdcgkEU 8ziaAOHBaTiNoxNPZHairTHMilS1VMGU4KGMkTq1MCLlay0D9a0D6c4BH1/sxc7O ue5lIlCvdsRcJ+iuwrgVwx7JTSj86UUUXYHeb+ci95zBgE26P6etvtK0w8SiRlY1 Oy46awQUOGnaFlv+sQaMG/LZxTjXVIJJm/AltsMOAypHfIzutSed8oqdjTy+WWXq JXS0PZd0SA4MP20NqbC4byJRatGqmsTrQJyDUEsvX8moXV+MLS9diGgqgH99VKS5 S4kjquqqF/kdFoE0mqSsGLwH+N1OW8RdmY1uIKDp6m7YA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 549823d2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:59 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:50 +0100 Message-Id: <80dbbdafe5be728aa5387fb9937a959095a4ffd0.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-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 b01b598f5f..d829b1e2cd 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